9.04 beta

This commit is contained in:
Igor Pavlov
2009-06-02 00:00:00 +00:00
committed by Kornel Lesiński
parent 8874e4fbc9
commit 829409452d
440 changed files with 19803 additions and 9941 deletions

View File

@@ -3,7 +3,6 @@
#ifndef __EXTRACT_H
#define __EXTRACT_H
#include "Common/Wildcard.h"
#include "Windows/FileFind.h"
#include "../../Archive/IArchive.h"
@@ -15,17 +14,16 @@
#include "../Common/LoadCodecs.h"
class CExtractOptions
struct CExtractOptions
{
public:
bool StdInMode;
bool StdOutMode;
bool TestMode;
NExtract::NPathMode::EEnum PathMode;
UString OutputDir;
bool YesToAll;
UString DefaultItemName;
NWindows::NFile::NFind::CFileInfoW ArchiveFileInfo;
bool TestMode;
bool CalcCrc;
NExtract::NPathMode::EEnum PathMode;
NExtract::NOverwriteMode::EEnum OverwriteMode;
UString OutputDir;
// bool ShowDialog;
// bool PasswordEnabled;
@@ -34,24 +32,19 @@ public:
CObjectVector<CProperty> Properties;
#endif
NExtract::NOverwriteMode::EEnum OverwriteMode;
#ifdef EXTERNAL_CODECS
CCodecs *Codecs;
#endif
CExtractOptions():
StdInMode(false),
StdOutMode(false),
YesToAll(false),
TestMode(false),
CalcCrc(false),
PathMode(NExtract::NPathMode::kFullPathnames),
OverwriteMode(NExtract::NOverwriteMode::kAskBefore)
{}
/*
bool FullPathMode() const { return (ExtractMode == NExtractMode::kTest) ||
(ExtractMode == NExtractMode::kFullPath); }
*/
};
struct CDecompressStat
@@ -61,7 +54,13 @@ struct CDecompressStat
UInt64 PackSize;
UInt64 NumFolders;
UInt64 NumFiles;
void Clear() { NumArchives = PackSize = UnpackSize = NumFolders = NumFiles = 0; }
UInt32 CrcSum;
void Clear()
{
NumArchives = UnpackSize = PackSize = NumFolders = NumFiles = 0;
CrcSum = 0;
}
};
HRESULT DecompressArchives(