Merge pull request #50 from szcnick/dev

update master branch to new version

.github/workflows/ubuntu.yml

@@ -1,5 +1,6 @@
 name: Ubuntu
 on: 
+  pull_request:
   push:
     paths-ignore:
       - 'README.md'
@@ -42,6 +43,6 @@ jobs:
       - name: check
         run: |
              cd ./check
-             bash check.sh `pwd`/../bin/7za
+             bash check.sh `pwd`/../bin/7z
              cd ..
 

C/7zVersion.h

@@ -1,14 +1,14 @@
-#define MY_VER_MAJOR 16
+#define MY_VER_MAJOR 17
 #define MY_VER_MINOR 02
 #define MY_VER_BUILD 0
-#define MY_VERSION_NUMBERS "17.01"
-#define MY_VERSION "17.01"
-#define MY_DATE "2020-04-20"
+#define MY_VERSION_NUMBERS "17.02 beta"
+#define MY_VERSION "17.02"
+#define MY_DATE "2017-08-28"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_AUTHOR_NAME "Igor Pavlov"
 #define MY_COPYRIGHT_PD "Igor Pavlov : Public domain"
-#define MY_COPYRIGHT_CR "Copyright (c) 1999-2016 Igor Pavlov"
+#define MY_COPYRIGHT_CR "Copyright (c) 1999-2020 Igor Pavlov"
 
 #ifdef USE_COPYRIGHT_CR
   #define MY_COPYRIGHT MY_COPYRIGHT_CR
@@ -18,5 +18,5 @@
 
 #define MY_VERSION_COPYRIGHT_DATE MY_VERSION " : " MY_COPYRIGHT " : " MY_DATE
 
-#define P7ZIP_VERSION "17.01"
+#define P7ZIP_VERSION "17.02"
 

CPP/7zip/Archive/7z/7zCompressionMode.h

@@ -13,9 +13,6 @@ struct CMethodFull: public CMethodProps
 {
   CMethodId Id;
   UInt32 NumStreams;
-  int CodecIndex;
-
-  CMethodFull(): CodecIndex(-1) {}
 
   bool IsSimpleCoder() const { return NumStreams == 1; }
 };

CPP/7zip/Archive/7z/7zDecode.cpp

@@ -226,11 +226,13 @@ HRESULT CDecoder::Decode(
 
     , ISequentialOutStream *outStream
     , ICompressProgressInfo *compressProgress
+
     , ISequentialInStream **
+        #ifdef USE_MIXER_ST
+        inStreamMainRes
+        #endif
 
-    #ifdef USE_MIXER_ST
-    inStreamMainRes
-    #endif
+    , bool &dataAfterEnd_Error
 
     _7Z_DECODER_CRYPRO_VARS_DECL
 
@@ -239,6 +241,8 @@ HRESULT CDecoder::Decode(
     #endif
     )
 {
+  dataAfterEnd_Error = false;
+
   const UInt64 *packPositions = &folders.PackPositions[folders.FoStartPackStreamIndex[folderIndex]];
   CFolderEx folderInfo;
   folders.ParseFolderEx(folderIndex, folderInfo);
@@ -415,12 +419,14 @@ HRESULT CDecoder::Decode(
     }
     #endif
 
+    bool finishMode = false;
     {
       CMyComPtr<ICompressSetFinishMode> setFinishMode;
       decoder->QueryInterface(IID_ICompressSetFinishMode, (void **)&setFinishMode);
       if (setFinishMode)
       {
-        RINOK(setFinishMode->SetFinishMode(BoolToInt(fullUnpack)));
+        finishMode = fullUnpack;
+        RINOK(setFinishMode->SetFinishMode(BoolToInt(finishMode)));
       }
     }
 
@@ -450,7 +456,7 @@ HRESULT CDecoder::Decode(
             unpackSize :
             &folders.CoderUnpackSizes[unpackStreamIndexStart + i];
 
-    _mixer->SetCoderInfo(i, unpackSizesPointer, packSizesPointers);
+    _mixer->SetCoderInfo(i, unpackSizesPointer, packSizesPointers, finishMode);
   }
 
   if (outStream)
@@ -530,7 +536,9 @@ HRESULT CDecoder::Decode(
       progress2 = new CDecProgress(compressProgress);
 
     ISequentialOutStream *outStreamPointer = outStream;
-    return _mixer->Code(inStreamPointers, &outStreamPointer, progress2 ? (ICompressProgressInfo *)progress2 : compressProgress);
+    return _mixer->Code(inStreamPointers, &outStreamPointer,
+        progress2 ? (ICompressProgressInfo *)progress2 : compressProgress,
+        dataAfterEnd_Error);
   }
 
   #ifdef USE_MIXER_ST

CPP/7zip/Archive/7z/7zDecode.h

@@ -53,7 +53,9 @@ class CDecoder
 
       , ISequentialOutStream *outStream
       , ICompressProgressInfo *compressProgress
+
       , ISequentialInStream **inStreamMainRes
+      , bool &dataAfterEnd_Error
 
       _7Z_DECODER_CRYPRO_VARS_DECL
 

CPP/7zip/Archive/7z/7zEncode.cpp

@@ -154,22 +154,10 @@ HRESULT CEncoder::CreateMixerCoder(
 
     CCreatedCoder cod;
 
-    // RINOK(CreateCoder(
-    //     EXTERNAL_CODECS_LOC_VARS
-    //     methodFull.Id, true, cod));
-
-    if (methodFull.CodecIndex >= 0)
-    {
-      RINOK(CreateCoder_Index(
-        EXTERNAL_CODECS_LOC_VARS
-        methodFull.CodecIndex, true, cod));
-    }
-    else
-    {
-      RINOK(CreateCoder_Id(
+    RINOK(CreateCoder(
         EXTERNAL_CODECS_LOC_VARS
         methodFull.Id, true, cod));
-    }
+
     if (cod.NumStreams != methodFull.NumStreams)
       return E_FAIL;
     if (!cod.Coder && !cod.Coder2)
@@ -345,7 +333,7 @@ HRESULT CEncoder::Encode(
   }
 
   for (i = 0; i < numMethods; i++)
-    _mixer->SetCoderInfo(i, NULL, NULL);
+    _mixer->SetCoderInfo(i, NULL, NULL, false);
 
 
   /* inStreamSize can be used by BCJ2 to set optimal range of conversion.
@@ -382,6 +370,17 @@ HRESULT CEncoder::Encode(
       resetInitVector->ResetInitVector();
     }
 
+    {
+      CMyComPtr<ICompressSetCoderPropertiesOpt> optProps;
+      coder->QueryInterface(IID_ICompressSetCoderPropertiesOpt, (void **)&optProps);
+      if (optProps)
+      {
+        PROPID propID = NCoderPropID::kExpectedDataSize;
+        NWindows::NCOM::CPropVariant prop = (UInt64)unpackSize;
+        RINOK(optProps->SetCoderPropertiesOpt(&propID, &prop, 1));
+      }
+    }
+
     CMyComPtr<ICompressWriteCoderProperties> writeCoderProperties;
     coder->QueryInterface(IID_ICompressWriteCoderProperties, (void **)&writeCoderProperties);
 
@@ -392,7 +391,7 @@ HRESULT CEncoder::Encode(
       CDynBufSeqOutStream *outStreamSpec = new CDynBufSeqOutStream;
       CMyComPtr<ISequentialOutStream> dynOutStream(outStreamSpec);
       outStreamSpec->Init();
-      writeCoderProperties->WriteCoderProperties(dynOutStream);
+      RINOK(writeCoderProperties->WriteCoderProperties(dynOutStream));
       outStreamSpec->CopyToBuffer(props);
     }
     else
@@ -441,10 +440,12 @@ HRESULT CEncoder::Encode(
   for (i = 1; i < _bindInfo.PackStreams.Size(); i++)
     outStreamPointers.Add(tempBuffers[i - 1]);
 
+  bool dataAfterEnd_Error;
+
   RINOK(_mixer->Code(
       &inStreamPointer,
       &outStreamPointers.Front(),
-      mtProgress ? (ICompressProgressInfo *)mtProgress : compressProgress));
+      mtProgress ? (ICompressProgressInfo *)mtProgress : compressProgress, dataAfterEnd_Error));
 
   if (_bindInfo.PackStreams.Size() != 0)
     packSizes.Add(outStreamSizeCountSpec->GetSize());

CPP/7zip/Archive/7z/7zExtract.cpp

@@ -348,6 +348,8 @@ STDMETHODIMP CHandler::Extract(const UInt32 *indices, UInt32 numItems,
       #endif
 
 
+      bool dataAfterEnd_Error = false;
+
       HRESULT result = decoder.Decode(
           EXTERNAL_CODECS_VARS
           _inStream,
@@ -358,20 +360,27 @@ STDMETHODIMP CHandler::Extract(const UInt32 *indices, UInt32 numItems,
           outStream,
           progress,
           NULL // *inStreamMainRes
+          , dataAfterEnd_Error
 
           _7Z_DECODER_CRYPRO_VARS
           #if !defined(_7ZIP_ST) && !defined(_SFX)
             , true, _numThreads
           #endif
           );
 
-      if (result == S_FALSE || result == E_NOTIMPL)
+      if (result == S_FALSE || result == E_NOTIMPL || dataAfterEnd_Error)
       {
         bool wasFinished = folderOutStream->WasWritingFinished();
-
-        int resOp = (result == S_FALSE ?
-            NExtract::NOperationResult::kDataError :
-            NExtract::NOperationResult::kUnsupportedMethod);
+
+        int resOp = NExtract::NOperationResult::kDataError;
+
+        if (result != S_FALSE)
+        {
+          if (result == E_NOTIMPL)
+            resOp = NExtract::NOperationResult::kUnsupportedMethod;
+          else if (wasFinished && dataAfterEnd_Error)
+            resOp = NExtract::NOperationResult::kDataAfterEnd;
+        }
 
         RINOK(folderOutStream->FlushCorrupted(resOp));
 

CPP/7zip/Archive/7z/7zFolderInStream.cpp

@@ -80,14 +80,17 @@ STDMETHODIMP CFolderInStream::Read(void *data, UInt32 size, UInt32 *processedSiz
   {
     if (_stream)
     {
-      UInt32 processed2;
-      RINOK(_stream->Read(data, size, &processed2));
-      if (processed2 != 0)
+      UInt32 cur = size;
+      const UInt32 kMax = (UInt32)1 << 20;
+      if (cur > kMax)
+        cur = kMax;
+      RINOK(_stream->Read(data, cur, &cur));
+      if (cur != 0)
       {
-        _crc = CrcUpdate(_crc, data, processed2);
-        _pos += processed2;
+        _crc = CrcUpdate(_crc, data, cur);
+        _pos += cur;
         if (processedSize)
-          *processedSize = processed2;
+          *processedSize = cur;
         return S_OK;
       }