17.0017.00

1 files changed, 26 insertions, 29 deletions

diff --git a/CPP/7zip/Compress/DeflateDecoder.h b/CPP/7zip/Compress/DeflateDecoder.h
index 09f84eb4..0a724247 100644
--- a/CPP/7zip/Compress/DeflateDecoder.h
+++ b/CPP/7zip/Compress/DeflateDecoder.h
@@ -23,6 +23,7 @@ const int kLenIdNeedInit = -2;
 
 class CCoder:
   public ICompressCoder,
+  public ICompressSetFinishMode,
   public ICompressGetInStreamProcessedSize,
   #ifndef NO_READ_FROM_CODER
   public ICompressSetInStream,
@@ -54,6 +55,13 @@ class CCoder:
   Int32 _remainLen;
   UInt32 _rep0;
 
+  bool _outSizeDefined;
+  UInt64 _outSize;
+  UInt64 _outStartPos;
+
+  void SetOutStreamSizeResume(const UInt64 *outSize);
+  UInt64 GetOutProcessedCur() const { return m_OutWindowStream.GetProcessedSize() - _outStartPos; }
+
   UInt32 ReadBits(unsigned numBits);
 
   bool DecodeLevels(Byte *levels, unsigned numSymbols);
@@ -74,7 +82,7 @@ class CCoder:
   };
   friend class CCoderReleaser;
 
-  HRESULT CodeSpec(UInt32 curSize, bool finishInputStream);
+  HRESULT CodeSpec(UInt32 curSize, bool finishInputStream, UInt32 inputProgressLimit = 0);
 public:
   bool ZlibMode;
   Byte ZlibFooter[4];
@@ -90,26 +98,28 @@ public:
   bool IsFinished() const { return _remainLen == kLenIdFinished;; }
   bool IsFinalBlock() const { return m_FinalBlock; }
 
-  HRESULT CodeReal(ISequentialOutStream *outStream,
-      const UInt64 *outSize, ICompressProgressInfo *progress);
+  HRESULT CodeReal(ISequentialOutStream *outStream, ICompressProgressInfo *progress);
+
+  MY_QUERYINTERFACE_BEGIN2(ICompressCoder)
+  MY_QUERYINTERFACE_ENTRY(ICompressSetFinishMode)
+  MY_QUERYINTERFACE_ENTRY(ICompressGetInStreamProcessedSize)
 
   #ifndef NO_READ_FROM_CODER
-  MY_UNKNOWN_IMP5(
-      ICompressCoder,
-      ICompressGetInStreamProcessedSize,
-      ICompressSetInStream,
-      ICompressSetOutStreamSize,
-      ISequentialInStream
-      )
-  #else
-  MY_UNKNOWN_IMP2(
-      ICompressCoder,
-      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(SetFinishMode)(UInt32 finishMode);
+  STDMETHOD(GetInStreamProcessedSize)(UInt64 *value);
+
   STDMETHOD(SetInStream)(ISequentialInStream *inStream);
   STDMETHOD(ReleaseInStream)();
   STDMETHOD(SetOutStreamSize)(const UInt64 *outSize);
@@ -118,19 +128,9 @@ public:
   STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
   #endif
 
-  STDMETHOD(CodeResume)(ISequentialOutStream *outStream, const UInt64 *outSize, ICompressProgressInfo *progress);
+  HRESULT CodeResume(ISequentialOutStream *outStream, const UInt64 *outSize, ICompressProgressInfo *progress);
 
-  HRESULT InitInStream(bool needInit)
-  {
-    if (!m_InBitStream.Create(1 << 17))
-      return E_OUTOFMEMORY;
-    if (needInit)
-    {
-      m_InBitStream.Init();
-      _needInitInStream = false;
-    }
-    return S_OK;
-  }
+  HRESULT InitInStream(bool needInit);
 
   void AlignToByte() { m_InBitStream.AlignToByte(); }
   Byte ReadAlignedByte();
@@ -143,9 +143,6 @@ public:
 
   UInt64 GetStreamSize() const { return m_InBitStream.GetStreamSize(); }
   UInt64 GetInputProcessedSize() const { return m_InBitStream.GetProcessedSize(); }
-
-  // IGetInStreamProcessedSize
-  STDMETHOD(GetInStreamProcessedSize)(UInt64 *value);
 };
 
 class CCOMCoder     : public CCoder { public: CCOMCoder(): CCoder(false) {} };