1721299233

Author: Oleh Kulykov

src/CPP/7zip/Archive/ArchiveExports.cpp

@@ -21,6 +21,65 @@
 
 #include "IArchive.h"
 
+
+#ifdef _WIN32
+
+#if defined(_UNICODE) && !defined(_WIN64) && !defined(UNDER_CE)
+#define NT_CHECK_FAIL_ACTION return FALSE;
+#endif
+
+static
+HINSTANCE g_hInstance;
+
+extern "C"
+BOOL WINAPI DllMain(
+  #ifdef UNDER_CE
+  HANDLE
+  #else
+  HINSTANCE
+  #endif
+  hInstance, DWORD dwReason, LPVOID /*lpReserved*/);
+
+extern "C"
+BOOL WINAPI DllMain(
+  #ifdef UNDER_CE
+  HANDLE
+  #else
+  HINSTANCE
+  #endif
+  hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
+{
+  if (dwReason == DLL_PROCESS_ATTACH)
+  {
+    // OutputDebugStringA("7z.dll DLL_PROCESS_ATTACH");
+    g_hInstance = (HINSTANCE)hInstance;
+    NT_CHECK
+  }
+  /*
+  if (dwReason == DLL_PROCESS_DETACH)
+  {
+    OutputDebugStringA("7z.dll DLL_PROCESS_DETACH");
+  }
+  */
+  return TRUE;
+}
+
+#else //  _WIN32
+
+#include "../../Common/StringConvert.h"
+// #include <stdio.h>
+
+// STDAPI LibStartup();
+static __attribute__((constructor)) void Init_ForceToUTF8();
+static __attribute__((constructor)) void Init_ForceToUTF8()
+{
+  g_ForceToUTF8 = IsNativeUTF8();
+  // printf("\nDLLExports2.cpp::Init_ForceToUTF8 =%d\n", g_ForceToUTF8 ? 1 : 0);
+}
+
+#endif // _WIN32
+
+
 Z7_DEFINE_GUID(CLSID_CArchiveHandler,
     k_7zip_GUID_Data1,
     k_7zip_GUID_Data2,

src/CPP/7zip/Archive/DllExports2.cpp

@@ -175,8 +175,8 @@ namespace NArchive
 }
 
 #define Z7_IFACEM_IArchiveOpenCallback(x) \
-x(SetTotal(const UInt64 *files, const UInt64 *bytes)); \
-x(SetCompleted(const UInt64 *files, const UInt64 *bytes)); \
+  x(SetTotal(const UInt64 *files, const UInt64 *bytes)) \
+  x(SetCompleted(const UInt64 *files, const UInt64 *bytes)) \
 
 Z7_IFACE_CONSTR_ARCHIVE(IArchiveOpenCallback, 0x10)
 
@@ -232,9 +232,9 @@ SetOperationResult()
 // INTERFACE_IProgress(x)
 
 #define Z7_IFACEM_IArchiveExtractCallback(x) \
-x(GetStream(UInt32 index, ISequentialOutStream **outStream, Int32 askExtractMode)) \
-x(PrepareOperation(Int32 askExtractMode)) \
-x(SetOperationResult(Int32 opRes)) \
+  x(GetStream(UInt32 index, ISequentialOutStream **outStream, Int32 askExtractMode)) \
+  x(PrepareOperation(Int32 askExtractMode)) \
+  x(SetOperationResult(Int32 opRes)) \
 
 Z7_IFACE_CONSTR_ARCHIVE_SUB(IArchiveExtractCallback, IProgress, 0x20)
 
@@ -565,6 +565,56 @@ Z7_IFACE_CONSTR_ARCHIVE(IArchiveKeepModeForNextOpen, 0x04)
 Z7_IFACE_CONSTR_ARCHIVE(IArchiveAllowTail, 0x05)
 
 
+namespace NRequestMemoryUseFlags
+{
+  const UInt32 k_AllowedSize_WasForced    = 1 << 0;  // (*allowedSize) was forced by -mmemx or -smemx
+  const UInt32 k_DefaultLimit_Exceeded    = 1 << 1;  // default limit of archive format was exceeded
+  const UInt32 k_MLimit_Exceeded          = 1 << 2;  // -mmemx value was exceeded
+  const UInt32 k_SLimit_Exceeded          = 1 << 3;  // -smemx value was exceeded
+  
+  const UInt32 k_NoErrorMessage           = 1 << 10; // do not show error message, and show only request
+  const UInt32 k_IsReport                 = 1 << 11; // only report is required, without user request
+  
+  const UInt32 k_SkipArc_IsExpected       = 1 << 12; // NRequestMemoryAnswerFlags::k_SkipArc flag answer is expected
+  const UInt32 k_Report_SkipArc           = 1 << 13; // report about SkipArc operation
+
+  // const UInt32 k_SkipBigFile_IsExpected   = 1 << 14; // NRequestMemoryAnswerFlags::k_SkipBigFiles flag answer is expected (unused)
+  // const UInt32 k_Report_SkipBigFile       = 1 << 15; // report about SkipFile operation (unused)
+
+  // const UInt32 k_SkipBigFiles_IsExpected  = 1 << 16; // NRequestMemoryAnswerFlags::k_SkipBigFiles flag answer is expected (unused)
+  // const UInt32 k_Report_SkipBigFiles      = 1 << 17; // report that all big files will be skipped (unused)
+}
+
+namespace NRequestMemoryAnswerFlags
+{
+  const UInt32 k_Allow          = 1 << 0;  // allow further archive extraction
+  const UInt32 k_Stop           = 1 << 1;  // for exit (and return_code == E_ABORT is used)
+  const UInt32 k_SkipArc        = 1 << 2;  // skip current archive extraction
+  // const UInt32 k_SkipBigFile    = 1 << 4;  // skip extracting of files that exceed limit (unused)
+  // const UInt32 k_SkipBigFiles   = 1 << 5;  // skip extracting of files that exceed limit (unused)
+  const UInt32 k_Limit_Exceeded  = 1 << 10;  // limit was exceeded
+}
+
+/*
+  *allowedSize is in/out:
+    in  : default allowed memory usage size or forced size, if it was changed by switch -mmemx.
+    out : value specified by user or unchanged value.
+
+  *answerFlags is in/out:
+    *answerFlags must be set by caller before calling for default action,
+
+  indexType : must be set with NEventIndexType::* constant
+          (indexType == kNoIndex), if request for whole archive.
+  index : must be set for some (indexType) types (if
+          fileIndex , if (indexType == NEventIndexType::kInArcIndex)
+          0, if       if (indexType == kNoIndex)
+  path : NULL can be used for any indexType.
+*/
+#define Z7_IFACEM_IArchiveRequestMemoryUseCallback(x) \
+  x(RequestMemoryUse(UInt32 flags, UInt32 indexType, UInt32 index, const wchar_t *path, \
+    UInt64 requiredSize, UInt64 *allowedSize, UInt32 *answerFlags))
+Z7_IFACE_CONSTR_ARCHIVE(IArchiveRequestMemoryUseCallback, 0x09)
+
 
 struct CStatProp
 {

src/CPP/7zip/Archive/DllExports2.h

@@ -80,31 +80,26 @@ class CDecoder Z7_final
 {
   CMyComPtr<ISequentialOutStream> _bcjStream;
   CFilterCoder *_filterCoder;
-  CMyComPtr<ICompressCoder> _lzmaDecoder;
 public:
-  NCompress::NLzma::CDecoder *_lzmaDecoderSpec;
+  CMyComPtr2<ICompressCoder, NCompress::NLzma::CDecoder> _lzmaDecoder;
 
   ~CDecoder();
   HRESULT Create(bool filtered, ISequentialInStream *inStream);
 
   HRESULT Code(const CHeader &header, ISequentialOutStream *outStream, ICompressProgressInfo *progress);
 
-  UInt64 GetInputProcessedSize() const { return _lzmaDecoderSpec->GetInputProcessedSize(); }
+  UInt64 GetInputProcessedSize() const { return _lzmaDecoder->GetInputProcessedSize(); }
 
-  void ReleaseInStream() { if (_lzmaDecoder) _lzmaDecoderSpec->ReleaseInStream(); }
+  void ReleaseInStream() { if (_lzmaDecoder) _lzmaDecoder->ReleaseInStream(); }
 
   HRESULT ReadInput(Byte *data, UInt32 size, UInt32 *processedSize)
-    { return _lzmaDecoderSpec->ReadFromInputStream(data, size, processedSize); }
+    { return _lzmaDecoder->ReadFromInputStream(data, size, processedSize); }
 };
 
 HRESULT CDecoder::Create(bool filteredMode, ISequentialInStream *inStream)
 {
-  if (!_lzmaDecoder)
-  {
-    _lzmaDecoderSpec = new NCompress::NLzma::CDecoder;
-    _lzmaDecoderSpec->FinishStream = true;
-    _lzmaDecoder = _lzmaDecoderSpec;
-  }
+  _lzmaDecoder.Create_if_Empty();
+  _lzmaDecoder->FinishStream = true;
 
   if (filteredMode)
   {
@@ -117,7 +112,7 @@ HRESULT CDecoder::Create(bool filteredMode, ISequentialInStream *inStream)
     }
   }
 
-  return _lzmaDecoderSpec->SetInStream(inStream);
+  return _lzmaDecoder->SetInStream(inStream);
 }
 
 CDecoder::~CDecoder()
@@ -131,7 +126,7 @@ HRESULT CDecoder::Code(const CHeader &header, ISequentialOutStream *outStream,
   if (header.FilterID > 1)
     return E_NOTIMPL;
 
-  RINOK(_lzmaDecoderSpec->SetDecoderProperties2(header.LzmaProps, 5))
+  RINOK(_lzmaDecoder->SetDecoderProperties2(header.LzmaProps, 5))
 
   bool filteredMode = (header.FilterID == 1);
 
@@ -143,7 +138,7 @@ HRESULT CDecoder::Code(const CHeader &header, ISequentialOutStream *outStream,
   }
 
   const UInt64 *Size = header.HasSize() ? &header.Size : NULL;
-  HRESULT res = _lzmaDecoderSpec->CodeResume(outStream, Size, progress);
+  HRESULT res = _lzmaDecoder->CodeResume(outStream, Size, progress);
 
   if (filteredMode)
   {
@@ -160,7 +155,7 @@ HRESULT CDecoder::Code(const CHeader &header, ISequentialOutStream *outStream,
   RINOK(res)
 
   if (header.HasSize())
-    if (_lzmaDecoderSpec->GetOutputProcessedSize() != header.Size)
+    if (_lzmaDecoder->GetOutputProcessedSize() != header.Size)
       return S_FALSE;
 
   return S_OK;
@@ -170,11 +165,7 @@ HRESULT CDecoder::Code(const CHeader &header, ISequentialOutStream *outStream,
 Z7_CLASS_IMP_CHandler_IInArchive_1(
   IArchiveOpenSeq
 )
-  CHeader _header;
   bool _lzma86;
-  CMyComPtr<IInStream> _stream;
-  CMyComPtr<ISequentialInStream> _seqStream;
-  
   bool _isArc;
   bool _needSeekToStart;
   bool _dataAfterEnd;
@@ -186,6 +177,10 @@ Z7_CLASS_IMP_CHandler_IInArchive_1(
   bool _unpackSize_Defined;
   bool _numStreams_Defined;
 
+  CHeader _header;
+  CMyComPtr<IInStream> _stream;
+  CMyComPtr<ISequentialInStream> _seqStream;
+  
   UInt64 _packSize;
   UInt64 _unpackSize;
   UInt64 _numStreams;
@@ -220,6 +215,7 @@ Z7_COM7F_IMF(CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value))
       prop = v;
       break;
     }
+    default: break;
   }
   prop.Detach(value);
   return S_OK;
@@ -288,6 +284,7 @@ Z7_COM7F_IMF(CHandler::GetProperty(UInt32 /* index */, PROPID propID, PROPVARIAN
     case kpidSize: if (_stream && _header.HasSize()) prop = _header.Size; break;
     case kpidPackSize: if (_packSize_Defined) prop = _packSize; break;
     case kpidMethod: GetMethod(prop); break;
+    default: break;
   }
   prop.Detach(value);
   return S_OK;
@@ -366,7 +363,6 @@ Z7_COM7F_IMF(CHandler::Open(IInStream *inStream, const UInt64 *, IArchiveOpenCal
       )
     return S_FALSE;
 
-  CDecoder state;
   const UInt32 outLimit = 1 << 11;
   Byte outBuf[outLimit];
 
@@ -452,9 +448,10 @@ Z7_COM7F_IMF(CHandler::Extract(const UInt32 *indices, UInt32 numItems,
     return E_INVALIDARG;
 
   if (_packSize_Defined)
-    extractCallback->SetTotal(_packSize);
+    RINOK(extractCallback->SetTotal(_packSize))
 
-  
+  Int32 opResult;
+ {
   CMyComPtr<ISequentialOutStream> realOutStream;
   const Int32 askMode = testMode ?
       NExtract::NAskMode::kTest :
@@ -463,16 +460,14 @@ Z7_COM7F_IMF(CHandler::Extract(const UInt32 *indices, UInt32 numItems,
   if (!testMode && !realOutStream)
     return S_OK;
 
-  extractCallback->PrepareOperation(askMode);
+  RINOK(extractCallback->PrepareOperation(askMode))
 
-  CDummyOutStream *outStreamSpec = new CDummyOutStream;
-  CMyComPtr<ISequentialOutStream> outStream(outStreamSpec);
-  outStreamSpec->SetStream(realOutStream);
-  outStreamSpec->Init();
+  CMyComPtr2_Create<ISequentialOutStream, CDummyOutStream> outStream;
+  outStream->SetStream(realOutStream);
+  outStream->Init();
   realOutStream.Release();
 
-  CLocalProgress *lps = new CLocalProgress;
-  CMyComPtr<ICompressProgressInfo> progress = lps;
+  CMyComPtr2_Create<ICompressProgressInfo, CLocalProgress> lps;
   lps->Init(extractCallback, true);
 
   if (_needSeekToStart)
@@ -485,8 +480,7 @@ Z7_COM7F_IMF(CHandler::Extract(const UInt32 *indices, UInt32 numItems,
     _needSeekToStart = true;
 
   CDecoder decoder;
-  HRESULT result = decoder.Create(_lzma86, _seqStream);
-  RINOK(result)
+  RINOK(decoder.Create(_lzma86, _seqStream))
 
   bool firstItem = true;
 
@@ -496,6 +490,8 @@ Z7_COM7F_IMF(CHandler::Extract(const UInt32 *indices, UInt32 numItems,
 
   bool dataAfterEnd = false;
 
+  HRESULT hres = S_OK;
+
   for (;;)
   {
     lps->InSize = packSize;
@@ -523,32 +519,32 @@ Z7_COM7F_IMF(CHandler::Extract(const UInt32 *indices, UInt32 numItems,
     numStreams++;
     firstItem = false;
 
-    result = decoder.Code(st, outStream, progress);
+    hres = decoder.Code(st, outStream, lps);
 
     packSize = decoder.GetInputProcessedSize();
-    unpackSize = outStreamSpec->GetSize();
+    unpackSize = outStream->GetSize();
 
-    if (result == E_NOTIMPL)
+    if (hres == E_NOTIMPL)
     {
       _unsupported = true;
-      result = S_FALSE;
+      hres = S_FALSE;
       break;
     }
-    if (result == S_FALSE)
+    if (hres == S_FALSE)
       break;
-    RINOK(result)
+    RINOK(hres)
   }
 
   if (firstItem)
   {
     _isArc = false;
-    result = S_FALSE;
+    hres = S_FALSE;
   }
-  else if (result == S_OK || result == S_FALSE)
+  else if (hres == S_OK || hres == S_FALSE)
   {
     if (dataAfterEnd)
       _dataAfterEnd = true;
-    else if (decoder._lzmaDecoderSpec->NeedsMoreInput())
+    else if (decoder._lzmaDecoder->NeedsMoreInput())
       _needMoreInput = true;
 
     _packSize = packSize;
@@ -560,7 +556,7 @@ Z7_COM7F_IMF(CHandler::Extract(const UInt32 *indices, UInt32 numItems,
     _numStreams_Defined = true;
   }
 
-  Int32 opResult = NExtract::NOperationResult::kOK;
+  opResult = NExtract::NOperationResult::kOK;
 
   if (!_isArc)
     opResult = NExtract::NOperationResult::kIsNotArc;
@@ -570,14 +566,15 @@ Z7_COM7F_IMF(CHandler::Extract(const UInt32 *indices, UInt32 numItems,
     opResult = NExtract::NOperationResult::kUnsupportedMethod;
   else if (_dataAfterEnd)
     opResult = NExtract::NOperationResult::kDataAfterEnd;
-  else if (result == S_FALSE)
+  else if (hres == S_FALSE)
     opResult = NExtract::NOperationResult::kDataError;
-  else if (result == S_OK)
+  else if (hres == S_OK)
     opResult = NExtract::NOperationResult::kOK;
   else
-    return result;
+    return hres;
 
-  outStream.Release();
+  // outStream.Release();
+ }
   return extractCallback->SetOperationResult(opResult);
 
   COM_TRY_END