diff options
Diffstat (limited to 'CPP/7zip/Archive/Zip/ZipCompressionMode.h')
-rwxr-xr-x | CPP/7zip/Archive/Zip/ZipCompressionMode.h | 56 |
1 files changed, 37 insertions, 19 deletions
diff --git a/CPP/7zip/Archive/Zip/ZipCompressionMode.h b/CPP/7zip/Archive/Zip/ZipCompressionMode.h index 7ef7cfb2..5be33166 100755 --- a/CPP/7zip/Archive/Zip/ZipCompressionMode.h +++ b/CPP/7zip/Archive/Zip/ZipCompressionMode.h @@ -5,36 +5,54 @@ #include "Common/MyString.h" +#ifndef _7ZIP_ST +#include "../../../Windows/System.h" +#endif + +#include "../Common/HandlerOut.h" + namespace NArchive { namespace NZip { -struct CCompressionMethodMode +struct CBaseProps { - CRecordVector<Byte> MethodSequence; - UString MatchFinder; - UInt32 Algo; - UInt32 NumPasses; - UInt32 NumFastBytes; - bool NumMatchFinderCyclesDefined; - UInt32 NumMatchFinderCycles; - UInt32 DicSize; - UInt32 MemSize; - UInt32 Order; + CMethodProps MethodInfo; + Int32 Level; #ifndef _7ZIP_ST UInt32 NumThreads; + bool NumThreadsWasChanged; #endif - bool PasswordIsDefined; - AString Password; bool IsAesMode; Byte AesKeyMode; + + void Init() + { + MethodInfo.Clear(); + Level = -1; + #ifndef _7ZIP_ST + NumThreads = NWindows::NSystem::GetNumberOfProcessors();; + NumThreadsWasChanged = false; + #endif + IsAesMode = false; + AesKeyMode = 3; + } +}; + +struct CCompressionMethodMode: public CBaseProps +{ + CRecordVector<Byte> MethodSequence; + bool PasswordIsDefined; + AString Password; + + UInt64 _dataSizeReduce; + bool _dataSizeReduceDefined; - CCompressionMethodMode(): - NumMatchFinderCyclesDefined(false), - PasswordIsDefined(false), - IsAesMode(false), - AesKeyMode(3) - {} + CCompressionMethodMode(): PasswordIsDefined(false) + { + _dataSizeReduceDefined = false; + _dataSizeReduce = 0; + } }; }} |