diff options
Diffstat (limited to 'CPP/7zip/Archive/7z/7zHandler.h')
-rwxr-xr-x | CPP/7zip/Archive/7z/7zHandler.h | 87 |
1 files changed, 12 insertions, 75 deletions
diff --git a/CPP/7zip/Archive/7z/7zHandler.h b/CPP/7zip/Archive/7z/7zHandler.h index 77e4d25c..95e53340 100755 --- a/CPP/7zip/Archive/7z/7zHandler.h +++ b/CPP/7zip/Archive/7z/7zHandler.h @@ -9,12 +9,12 @@ #include "7zCompressionMode.h" -#ifdef COMPRESS_MT -#include "../../../Windows/System.h" -#endif - #include "../../Common/CreateCoder.h" +#ifndef EXTRACT_ONLY +#include "../Common/HandlerOut.h" +#endif + namespace NArchive { namespace N7z { @@ -44,15 +44,6 @@ struct CVolume }; #endif -#ifndef EXTRACT_ONLY - -struct COneMethodInfo -{ - CObjectVector<CProperty> CoderProperties; - UString MethodName; -}; -#endif - // {23170F69-40C1-278A-1000-000110070000} DEFINE_GUID(CLSID_CFormat7z, 0x23170F69, 0x40C1, 0x278A, 0x10, 0x00, 0x00, 0x01, 0x10, 0x07, 0x00, 0x00); @@ -71,6 +62,9 @@ DEFINE_GUID(CLSID_CFormat7z, class CHandler: + #ifndef EXTRACT_ONLY + public NArchive::COutHandler, + #endif public IInArchive, #ifdef _7Z_VOL public IInArchiveGetStream, @@ -137,8 +131,6 @@ public: // ISetProperties - HRESULT SetSolidSettings(const UString &s); - HRESULT SetSolidSettings(const PROPVARIANT &value); #endif DECL_ISetCompressCodecsInfo @@ -154,37 +146,15 @@ private: NArchive::N7z::CArchiveDatabaseEx _database; #endif - + #ifdef EXTRACT_ONLY + #ifdef COMPRESS_MT UInt32 _numThreads; #endif - - #ifndef EXTRACT_ONLY - CObjectVector<COneMethodInfo> _methods; + + #else + CRecordVector<CBind> _binds; - bool _removeSfxBlock; - UInt64 _numSolidFiles; - UInt64 _numSolidBytes; - bool _numSolidBytesDefined; - bool _solidExtension; - - bool _compressHeaders; - bool _encryptHeaders; - - bool WriteModified; - bool WriteCreated; - bool WriteAccessed; - - - bool _autoFilter; - UInt32 _level; - - bool _volumeMode; - - DECL_EXTERNAL_CODECS_VARS - - HRESULT SetParam(COneMethodInfo &oneMethodInfo, const UString &name, const UString &value); - HRESULT SetParams(COneMethodInfo &oneMethodInfo, const UString &srcString); HRESULT SetPassword(CCompressionMethodMode &methodMode, IArchiveUpdateCallback *updateCallback); @@ -208,39 +178,6 @@ private: void FillPopIDs(); #endif - - #ifndef EXTRACT_ONLY - - void InitSolidFiles() { _numSolidFiles = UInt64(Int64(-1)); } - void InitSolidSize() { _numSolidBytes = UInt64(Int64(-1)); } - void InitSolid() - { - InitSolidFiles(); - InitSolidSize(); - _solidExtension = false; - _numSolidBytesDefined = false; - } - - void Init() - { - _removeSfxBlock = false; - _compressHeaders = true; - _encryptHeaders = false; - - WriteModified = true; - WriteCreated = false; - WriteAccessed = false; - - #ifdef COMPRESS_MT - _numThreads = NWindows::NSystem::GetNumberOfProcessors(); - #endif - - _level = 5; - _autoFilter = true; - _volumeMode = false; - InitSolid(); - } - #endif }; }} |