seven-zip 1.4.2 → 1.7.0.rc1

data/ext/p7zip/CPP/7zip/Compress/Lzham/makefile.list

@@ -0,0 +1,129 @@
+
+
+# WARNING : automatically generated by utils/generate.py
+
+PROG=../../../../bin/Codecs/Lzham.so
+
+all: $(PCH_NAME) $(PROG)
+
+LOCAL_FLAGS=$(TARGET_FLAGS) \
+  -DEXTERNAL_CODECS \
+  -D_FILE_OFFSET_BITS=64 \
+  -D_LARGEFILE_SOURCE \
+  -D_REENTRANT \
+  -DENV_UNIX \
+  -DBREAK_HANDLER \
+  -DUNICODE \
+  -D_UNICODE \
+  -DUNIX_USE_WIN_FILE \
+
+SRCS=\
+  ../../../../CPP/7zip/Common/StreamUtils.cpp \
+  ../../../../CPP/7zip/Compress/CodecExports.cpp \
+  ../../../../CPP/7zip/Compress/DllExportsCompress.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/LzhamRegister.cpp \
+  ../../../../CPP/Common/MyWindows.cpp \
+  ../../../../CPP/Windows/System.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzbase.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_internal.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_state.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_match_accel.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_pthreads_threading.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_assert.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_checksum.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_huffman_codes.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecomp.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecompbase.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_mem.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_platform.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_prefix_coding.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_symbol_codec.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_timer.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_vector.cpp \
+  ../../../../CPP/7zip/Compress/Lzham/lzhamlib/lzham_lib.cpp \
+
+SRCS_C=\
+  ../../../../C/Alloc.c \
+
+StdAfx.h.gch : ../../../myWindows/StdAfx.h
+	rm -f StdAfx.h.gch
+	$(CXX) $(CXXFLAGS) ../../../myWindows/StdAfx.h -o StdAfx.h.gch
+Alloc.o : ../../../../C/Alloc.c
+	$(CC) $(CFLAGS) ../../../../C/Alloc.c
+StreamUtils.o : ../../../../CPP/7zip/Common/StreamUtils.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Common/StreamUtils.cpp
+CodecExports.o : ../../../../CPP/7zip/Compress/CodecExports.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/CodecExports.cpp
+DllExportsCompress.o : ../../../../CPP/7zip/Compress/DllExportsCompress.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/DllExportsCompress.cpp
+LzhamRegister.o : ../../../../CPP/7zip/Compress/Lzham/LzhamRegister.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/LzhamRegister.cpp
+MyWindows.o : ../../../../CPP/Common/MyWindows.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/Common/MyWindows.cpp
+System.o : ../../../../CPP/Windows/System.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/Windows/System.cpp
+lzham_lzbase.o : ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzbase.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzbase.cpp
+lzham_lzcomp.o : ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp.cpp
+lzham_lzcomp_internal.o : ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_internal.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_internal.cpp
+lzham_lzcomp_state.o : ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_state.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_lzcomp_state.cpp
+lzham_match_accel.o : ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_match_accel.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_match_accel.cpp
+lzham_pthreads_threading.o : ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_pthreads_threading.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamcomp/lzham_pthreads_threading.cpp
+lzham_assert.o : ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_assert.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_assert.cpp
+lzham_checksum.o : ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_checksum.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_checksum.cpp
+lzham_huffman_codes.o : ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_huffman_codes.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_huffman_codes.cpp
+lzham_lzdecomp.o : ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecomp.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecomp.cpp
+lzham_lzdecompbase.o : ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecompbase.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_lzdecompbase.cpp
+lzham_mem.o : ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_mem.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_mem.cpp
+lzham_platform.o : ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_platform.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_platform.cpp
+lzham_prefix_coding.o : ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_prefix_coding.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_prefix_coding.cpp
+lzham_symbol_codec.o : ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_symbol_codec.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_symbol_codec.cpp
+lzham_timer.o : ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_timer.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_timer.cpp
+lzham_vector.o : ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_vector.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamdecomp/lzham_vector.cpp
+lzham_lib.o : ../../../../CPP/7zip/Compress/Lzham/lzhamlib/lzham_lib.cpp
+	$(CXX) $(CXXFLAGS) ../../../../CPP/7zip/Compress/Lzham/lzhamlib/lzham_lib.cpp
+
+OBJS=\
+ Alloc.o \
+ StreamUtils.o \
+ CodecExports.o \
+ DllExportsCompress.o \
+ LzhamRegister.o \
+ MyWindows.o \
+ System.o \
+ lzham_lzbase.o \
+ lzham_lzcomp.o \
+ lzham_lzcomp_internal.o \
+ lzham_lzcomp_state.o \
+ lzham_match_accel.o \
+ lzham_pthreads_threading.o \
+ lzham_assert.o \
+ lzham_checksum.o \
+ lzham_huffman_codes.o \
+ lzham_lzdecomp.o \
+ lzham_lzdecompbase.o \
+ lzham_mem.o \
+ lzham_platform.o \
+ lzham_prefix_coding.o \
+ lzham_symbol_codec.o \
+ lzham_timer.o \
+ lzham_vector.o \
+ lzham_lib.o \
+

data/ext/p7zip/CPP/7zip/Compress/Lzma2Decoder.cpp

@@ -10,7 +10,7 @@
 
 static HRESULT SResToHRESULT(SRes res)
 {
-  switch(res)
+  switch (res)
   {
     case SZ_OK: return S_OK;
     case SZ_ERROR_MEM: return E_OUTOFMEMORY;
@@ -24,32 +24,40 @@ static HRESULT SResToHRESULT(SRes res)
 namespace NCompress {
 namespace NLzma2 {
 
-static const UInt32 kInBufSize = 1 << 20;
-
-CDecoder::CDecoder(): _inBuf(0), _outSizeDefined(false)
+CDecoder::CDecoder():
+    _inBuf(NULL),
+    _inBufSize(0),
+    _inBufSizeNew(1 << 20),
+    _outStepSize(1 << 22),
+    _outSizeDefined(false),
+    _finishMode(false)
 {
   Lzma2Dec_Construct(&_state);
 }
 
-static void *SzAlloc(void *p, size_t size) { p = p; return MyAlloc(size); }
-static void SzFree(void *p, void *address) { p = p; MyFree(address); }
-static ISzAlloc g_Alloc = { SzAlloc, SzFree };
+STDMETHODIMP CDecoder::SetInBufSize(UInt32 , UInt32 size) { _inBufSizeNew = size; return S_OK; }
+STDMETHODIMP CDecoder::SetOutBufSize(UInt32 , UInt32 size) { _outStepSize = size; return S_OK; }
 
 CDecoder::~CDecoder()
 {
   Lzma2Dec_Free(&_state, &g_Alloc);
-  MyFree(_inBuf);
+  MidFree(_inBuf);
 }
 
 STDMETHODIMP CDecoder::SetDecoderProperties2(const Byte *prop, UInt32 size)
 {
-  if (size != 1) return SZ_ERROR_UNSUPPORTED;
+  if (size != 1)
+    return E_NOTIMPL;
+  
   RINOK(SResToHRESULT(Lzma2Dec_Allocate(&_state, prop[0], &g_Alloc)));
-  if (_inBuf == 0)
+  if (!_inBuf || _inBufSize != _inBufSizeNew)
   {
-    _inBuf = (Byte *)MyAlloc(kInBufSize);
-    if (_inBuf == 0)
+    MidFree(_inBuf);
+    _inBufSize = 0;
+    _inBuf = (Byte *)MidAlloc(_inBufSizeNew);
+    if (!_inBuf)
       return E_OUTOFMEMORY;
+    _inBufSize = _inBufSizeNew;
   }
 
   return S_OK;
@@ -62,6 +70,7 @@ STDMETHODIMP CDecoder::ReleaseInStream() { _inStream.Release(); return S_OK; }
 STDMETHODIMP CDecoder::SetOutStreamSize(const UInt64 *outSize)
 {
   _outSizeDefined = (outSize != NULL);
+  _outSize = 0;
   if (_outSizeDefined)
     _outSize = *outSize;
 
@@ -72,39 +81,55 @@ STDMETHODIMP CDecoder::SetOutStreamSize(const UInt64 *outSize)
   return S_OK;
 }
 
+STDMETHODIMP CDecoder::SetFinishMode(UInt32 finishMode)
+{
+  _finishMode = (finishMode != 0);
+  return S_OK;
+}
+
 STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream,
-    ISequentialOutStream *outStream, const UInt64 * /* inSize */,
+    ISequentialOutStream *outStream, const UInt64 *inSize,
     const UInt64 *outSize, ICompressProgressInfo *progress)
 {
-  if (_inBuf == 0)
+  if (!_inBuf)
     return S_FALSE;
   SetOutStreamSize(outSize);
 
+  UInt32 step = _outStepSize;
+  const UInt32 kOutStepSize_Min = 1 << 12;
+  if (step < kOutStepSize_Min)
+    step = kOutStepSize_Min;
+  
+  SizeT wrPos = _state.decoder.dicPos;
+
+  SizeT next = (_state.decoder.dicBufSize - _state.decoder.dicPos < step) ?
+      _state.decoder.dicBufSize :
+      _state.decoder.dicPos + step;
+
+  HRESULT hres = S_OK;
+
   for (;;)
   {
     if (_inPos == _inSize)
     {
       _inPos = _inSize = 0;
-      RINOK(inStream->Read(_inBuf, kInBufSize, &_inSize));
+      hres = inStream->Read(_inBuf, _inBufSize, &_inSize);
+      if (hres != S_OK)
+        break;
     }
 
     SizeT dicPos = _state.decoder.dicPos;
-    SizeT curSize = _state.decoder.dicBufSize - dicPos;
-    const UInt32 kStepSize = ((UInt32)1 << 22);
-    if (curSize > kStepSize)
-      curSize = (SizeT)kStepSize;
-    
+    SizeT curSize = next - dicPos;
+   
     ELzmaFinishMode finishMode = LZMA_FINISH_ANY;
     if (_outSizeDefined)
     {
       const UInt64 rem = _outSize - _outSizeProcessed;
-      if (rem < curSize)
+      if (curSize >= rem)
       {
         curSize = (SizeT)rem;
-        /*
-        // finishMode = LZMA_FINISH_END;
-        we can't use LZMA_FINISH_END here to allow partial decoding
-        */
+        if (_finishMode)
+          finishMode = LZMA_FINISH_END;
       }
     }
 
@@ -117,71 +142,123 @@ STDMETHODIMP CDecoder::Code(ISequentialInStream *inStream,
     SizeT outSizeProcessed = _state.decoder.dicPos - dicPos;
     _outSizeProcessed += outSizeProcessed;
 
-    bool finished = (inSizeProcessed == 0 && outSizeProcessed == 0);
-    bool stopDecoding = (_outSizeDefined && _outSizeProcessed >= _outSize);
+    bool finished = (inSizeProcessed == 0 && outSizeProcessed == 0
+        || status == LZMA_STATUS_FINISHED_WITH_MARK);
+    bool outFinished = (_outSizeDefined && _outSizeProcessed >= _outSize);
 
-    if (res != 0 || _state.decoder.dicPos == _state.decoder.dicBufSize || finished || stopDecoding)
+    if (res != 0
+        || _state.decoder.dicPos >= next
+        || finished
+        || outFinished)
     {
-      HRESULT res2 = WriteStream(outStream, _state.decoder.dic, _state.decoder.dicPos);
+      HRESULT res2 = WriteStream(outStream, _state.decoder.dic + wrPos, _state.decoder.dicPos - wrPos);
+
+      if (_state.decoder.dicPos == _state.decoder.dicBufSize)
+        _state.decoder.dicPos = 0;
+      
+      wrPos = _state.decoder.dicPos;
+
+      next = (_state.decoder.dicBufSize - _state.decoder.dicPos < step) ?
+          _state.decoder.dicBufSize :
+          _state.decoder.dicPos + step;
+
       if (res != 0)
         return S_FALSE;
       RINOK(res2);
-      if (stopDecoding)
-        return S_OK;
+
       if (finished)
-        return (status == LZMA_STATUS_FINISHED_WITH_MARK ? S_OK : S_FALSE);
-    }
-    if (_state.decoder.dicPos == _state.decoder.dicBufSize)
-      _state.decoder.dicPos = 0;
+      {
+        if (status == LZMA_STATUS_FINISHED_WITH_MARK)
+        {
+          if (_finishMode && inSize && *inSize != _inSizeProcessed)
+            return S_FALSE;
+          if (finishMode == LZMA_FINISH_END && !outFinished)
+            return S_FALSE;
+          return S_OK;
+        }
+        return (finishMode == LZMA_FINISH_END) ? S_FALSE : S_OK;
+      }
 
-    if (progress != NULL)
+      if (outFinished && finishMode == LZMA_FINISH_ANY)
+        return S_OK;
+    }
+    
+    if (progress)
     {
       RINOK(progress->SetRatioInfo(&_inSizeProcessed, &_outSizeProcessed));
     }
   }
+
+  HRESULT res2 = WriteStream(outStream, _state.decoder.dic + wrPos, _state.decoder.dicPos - wrPos);
+  if (hres != S_OK)
+    return hres;
+  return res2;
 }
 
 #ifndef NO_READ_FROM_CODER
 
 STDMETHODIMP CDecoder::Read(void *data, UInt32 size, UInt32 *processedSize)
 {
+  UInt32 totalProcessed = 0;
+
   if (processedSize)
     *processedSize = 0;
-  do
+
+  for (;;)
   {
     if (_inPos == _inSize)
     {
       _inPos = _inSize = 0;
-      RINOK(_inStream->Read(_inBuf, kInBufSize, &_inSize));
+      RINOK(_inStream->Read(_inBuf, _inBufSize, &_inSize));
     }
     {
-      SizeT inProcessed = _inSize - _inPos;
-
+      ELzmaFinishMode finishMode = LZMA_FINISH_ANY;
       if (_outSizeDefined)
       {
         const UInt64 rem = _outSize - _outSizeProcessed;
-        if (rem < size)
+        if (rem <= size)
+        {
           size = (UInt32)rem;
+          if (_finishMode)
+            finishMode = LZMA_FINISH_END;
+        }
       }
 
       SizeT outProcessed = size;
+      SizeT inProcessed = _inSize - _inPos;
+      
       ELzmaStatus status;
       SRes res = Lzma2Dec_DecodeToBuf(&_state, (Byte *)data, &outProcessed,
-          _inBuf + _inPos, &inProcessed, LZMA_FINISH_ANY, &status);
+          _inBuf + _inPos, &inProcessed, finishMode, &status);
+
       _inPos += (UInt32)inProcessed;
       _inSizeProcessed += inProcessed;
       _outSizeProcessed += outProcessed;
       size -= (UInt32)outProcessed;
       data = (Byte *)data + outProcessed;
+      
+      totalProcessed += (UInt32)outProcessed;
       if (processedSize)
-        *processedSize += (UInt32)outProcessed;
-      RINOK(SResToHRESULT(res));
+        *processedSize = totalProcessed;
+
+      if (res != SZ_OK)
+      {
+        if (totalProcessed != 0)
+          return S_OK;
+        return SResToHRESULT(res);
+      }
+      
       if (inProcessed == 0 && outProcessed == 0)
         return S_OK;
+      if (status == LZMA_STATUS_FINISHED_WITH_MARK)
+        return S_OK;
+      if (outProcessed != 0)
+      {
+        if (finishMode != LZMA_FINISH_END || _outSize != _outSizeProcessed)
+          return S_OK;
+      }
     }
   }
-  while (size != 0);
-  return S_OK;
 }
 
 #endif

data/ext/p7zip/CPP/7zip/Compress/Lzma2Decoder.h

@@ -15,7 +15,9 @@ namespace NLzma2 {
 class CDecoder:
   public ICompressCoder,
   public ICompressSetDecoderProperties2,
+  public ICompressSetFinishMode,
   public ICompressGetInStreamProcessedSize,
+  public ICompressSetBufSize,
   #ifndef NO_READ_FROM_CODER
   public ICompressSetInStream,
   public ICompressSetOutStreamSize,
@@ -27,36 +29,49 @@ class CDecoder:
   Byte *_inBuf;
   UInt32 _inPos;
   UInt32 _inSize;
-  CLzma2Dec _state;
+
+  bool _finishMode;
   bool _outSizeDefined;
   UInt64 _outSize;
+
   UInt64 _inSizeProcessed;
   UInt64 _outSizeProcessed;
+  
+  UInt32 _inBufSize;
+  UInt32 _inBufSizeNew;
+  UInt32 _outStepSize;
+
+  CLzma2Dec _state;
 public:
 
+  MY_QUERYINTERFACE_BEGIN2(ICompressCoder)
+  MY_QUERYINTERFACE_ENTRY(ICompressSetDecoderProperties2)
+  MY_QUERYINTERFACE_ENTRY(ICompressSetFinishMode)
+  MY_QUERYINTERFACE_ENTRY(ICompressGetInStreamProcessedSize)
+  MY_QUERYINTERFACE_ENTRY(ICompressSetBufSize)
   #ifndef NO_READ_FROM_CODER
-  MY_UNKNOWN_IMP5(
-      ICompressSetDecoderProperties2,
-      ICompressGetInStreamProcessedSize,
-      ICompressSetInStream,
-      ICompressSetOutStreamSize,
-      ISequentialInStream)
-  #else
-  MY_UNKNOWN_IMP2(
-      ICompressSetDecoderProperties2,
-      ICompressGetInStreamProcessedSize)
+  MY_QUERYINTERFACE_ENTRY(ICompressSetInStream)
+  MY_QUERYINTERFACE_ENTRY(ICompressSetOutStreamSize)
+  MY_QUERYINTERFACE_ENTRY(ISequentialInStream)
   #endif
+  MY_QUERYINTERFACE_END
+  MY_ADDREF_RELEASE
 
-  STDMETHOD(Code)(ISequentialInStream *inStream,
-      ISequentialOutStream *outStream, const UInt64 *_inSize, const UInt64 *outSize,
-      ICompressProgressInfo *progress);
+  STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
+      const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
 
   STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size);
 
+  STDMETHOD(SetFinishMode)(UInt32 finishMode);
+
   STDMETHOD(GetInStreamProcessedSize)(UInt64 *value);
 
+  STDMETHOD(SetInBufSize)(UInt32 streamIndex, UInt32 size);
+  STDMETHOD(SetOutBufSize)(UInt32 streamIndex, UInt32 size);
+
   STDMETHOD(SetInStream)(ISequentialInStream *inStream);
   STDMETHOD(ReleaseInStream)();
+  
   STDMETHOD(SetOutStreamSize)(const UInt64 *outSize);
 
   #ifndef NO_READ_FROM_CODER

data/ext/p7zip/CPP/7zip/Compress/Lzma2Encoder.cpp

@@ -19,14 +19,6 @@ HRESULT SetLzmaProp(PROPID propID, const PROPVARIANT &prop, CLzmaEncProps &ep);
 
 namespace NLzma2 {
 
-static void *SzBigAlloc(void *, size_t size) { return BigAlloc(size); }
-static void SzBigFree(void *, void *address) { BigFree(address); }
-static ISzAlloc g_BigAlloc = { SzBigAlloc, SzBigFree };
-
-static void *SzAlloc(void *, size_t size) { return MyAlloc(size); }
-static void SzFree(void *, void *address) { MyFree(address); }
-static ISzAlloc g_Alloc = { SzAlloc, SzFree };
-
 CEncoder::CEncoder()
 {
   _encoder = 0;
@@ -46,7 +38,20 @@ HRESULT SetLzma2Prop(PROPID propID, const PROPVARIANT &prop, CLzma2EncProps &lzm
   switch (propID)
   {
     case NCoderPropID::kBlockSize:
-      if (prop.vt != VT_UI4) return E_INVALIDARG; lzma2Props.blockSize = prop.ulVal; break;
+    {
+      if (prop.vt == VT_UI4)
+        lzma2Props.blockSize = prop.ulVal;
+      else if (prop.vt == VT_UI8)
+      {
+        size_t v = (size_t)prop.uhVal.QuadPart;
+        if (v != prop.uhVal.QuadPart)
+          return E_INVALIDARG;
+        lzma2Props.blockSize = v;
+      }
+      else
+        return E_INVALIDARG;
+      break;
+    }
     case NCoderPropID::kNumThreads:
       if (prop.vt != VT_UI4) return E_INVALIDARG; lzma2Props.numTotalThreads = (int)(prop.ulVal); break;
     default:

data/ext/p7zip/CPP/7zip/Compress/Lzma2Encoder.h

@@ -20,7 +20,7 @@ class CEncoder:
 {
   CLzma2EncHandle _encoder;
 public:
-  MY_UNKNOWN_IMP2(ICompressSetCoderProperties, ICompressWriteCoderProperties)
+  MY_UNKNOWN_IMP3(ICompressCoder, ICompressSetCoderProperties, ICompressWriteCoderProperties)
  
   STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
       const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);

data/ext/p7zip/CPP/7zip/Compress/Lzma2Register.cpp

@@ -6,15 +6,17 @@
 
 #include "Lzma2Decoder.h"
 
-static void *CreateCodec() { return (void *)(ICompressCoder *)(new NCompress::NLzma2::CDecoder); }
 #ifndef EXTRACT_ONLY
 #include "Lzma2Encoder.h"
-static void *CreateCodecOut() { return (void *)(ICompressCoder *)(new NCompress::NLzma2::CEncoder);  }
-#else
-#define CreateCodecOut 0
 #endif
 
-static CCodecInfo g_CodecInfo =
-  { CreateCodec, CreateCodecOut, 0x21, L"LZMA2", 1, false };
+namespace NCompress {
+namespace NLzma2 {
 
-REGISTER_CODEC(LZMA2)
+REGISTER_CODEC_E(LZMA2,
+    CDecoder(),
+    CEncoder(),
+    0x21,
+    "LZMA2")
+
+}}

data/ext/p7zip/CPP/7zip/Compress/LzmaDecoder.cpp

@@ -10,7 +10,7 @@
 
 static HRESULT SResToHRESULT(SRes res)
 {
-  switch(res)
+  switch (res)
   {
     case SZ_OK: return S_OK;
     case SZ_ERROR_MEM: return E_OUTOFMEMORY;
@@ -25,19 +25,16 @@ namespace NCompress {
 namespace NLzma {
 
 CDecoder::CDecoder(): _inBuf(0), _propsWereSet(false), _outSizeDefined(false),
-  _inBufSize(1 << 20),
-  _outBufSize(1 << 22),
-  FinishStream(false)
+    _inBufSize(1 << 20),
+    _outBufSize(1 << 22),
+    FinishStream(false),
+    NeedMoreInput(false)
 {
   _inSizeProcessed = 0;
   _inPos = _inSize = 0;
   LzmaDec_Construct(&_state);
 }
 
-static void *SzAlloc(void *p, size_t size) { p = p; return MyAlloc(size); }
-static void SzFree(void *p, void *address) { p = p; MyFree(address); }
-static ISzAlloc g_Alloc = { SzAlloc, SzFree };
-
 CDecoder::~CDecoder()
 {
   LzmaDec_Free(&_state, &g_Alloc);
@@ -81,10 +78,17 @@ STDMETHODIMP CDecoder::SetOutStreamSize(const UInt64 *outSize)
 {
   _inSizeProcessed = 0;
   _inPos = _inSize = 0;
+  NeedMoreInput = false;
   SetOutStreamSizeResume(outSize);
   return S_OK;
 }
 
+STDMETHODIMP CDecoder::SetFinishMode(UInt32 finishMode)
+{
+  FinishStream = (finishMode != 0);
+  return S_OK;
+}
+
 HRESULT CDecoder::CodeSpec(ISequentialInStream *inStream, ISequentialOutStream *outStream, ICompressProgressInfo *progress)
 {
   if (_inBuf == 0 || !_propsWereSet)
@@ -144,9 +148,21 @@ HRESULT CDecoder::CodeSpec(ISequentialInStream *inStream, ISequentialOutStream *
         return S_FALSE;
       RINOK(res2);
       if (stopDecoding)
+      {
+        if (status == LZMA_STATUS_NEEDS_MORE_INPUT)
+          NeedMoreInput = true;
+        if (FinishStream &&
+              status != LZMA_STATUS_FINISHED_WITH_MARK &&
+              status != LZMA_STATUS_MAYBE_FINISHED_WITHOUT_MARK)
+          return S_FALSE;
         return S_OK;
+      }
       if (finished)
+      {
+        if (status == LZMA_STATUS_NEEDS_MORE_INPUT)
+          NeedMoreInput = true;
         return (status == LZMA_STATUS_FINISHED_WITH_MARK ? S_OK : S_FALSE);
+      }
     }
     if (progress)
     {

data/ext/p7zip/CPP/7zip/Compress/LzmaDecoder.h

@@ -14,6 +14,7 @@ namespace NLzma {
 class CDecoder:
   public ICompressCoder,
   public ICompressSetDecoderProperties2,
+  public ICompressSetFinishMode,
   public ICompressSetBufSize,
   #ifndef NO_READ_FROM_CODER
   public ICompressSetInStream,
@@ -45,6 +46,7 @@ class CDecoder:
 public:
   MY_QUERYINTERFACE_BEGIN2(ICompressCoder)
   MY_QUERYINTERFACE_ENTRY(ICompressSetDecoderProperties2)
+  MY_QUERYINTERFACE_ENTRY(ICompressSetFinishMode)
   MY_QUERYINTERFACE_ENTRY(ICompressSetBufSize)
   #ifndef NO_READ_FROM_CODER
   MY_QUERYINTERFACE_ENTRY(ICompressSetInStream)
@@ -57,6 +59,7 @@ public:
   STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
       const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
   STDMETHOD(SetDecoderProperties2)(const Byte *data, UInt32 size);
+  STDMETHOD(SetFinishMode)(UInt32 finishMode);
   STDMETHOD(SetOutStreamSize)(const UInt64 *outSize);
   STDMETHOD(SetInBufSize)(UInt32 streamIndex, UInt32 size);
   STDMETHOD(SetOutBufSize)(UInt32 streamIndex, UInt32 size);
@@ -73,10 +76,14 @@ public:
 
   #endif
 
-  bool FinishStream;
+  bool FinishStream; // set it before decoding, if you need to decode full LZMA stream
+  
+  bool NeedMoreInput; // it's set by decoder, if it needs more input data to decode stream
 
   CDecoder();
   virtual ~CDecoder();
+
+  UInt64 GetOutputProcessedSize() const { return _outSizeProcessed; }
 };
 
 }}