Update to 7-Zip 17.01 Beta from Igor Pavlov

- Minor speed optimization for LZMA2 (xz and 7z) multi-threading compression.
  7-Zip now uses additional memory buffers for multi-block LZMA2 compression.
  CPU utilization was slightly improved.
- 7-zip now creates multi-block xz archives by default. Block size can be
  specified with -ms[Size]{m|g} switch.
- xz decoder now can unpack random block from multi-block xz archives.  7-Zip
  File Manager now can open nested multi-block xz archives (for example,
  image.iso.xz) without full unpacking of xz archive.
- 7-Zip now can create zip archives from stdin to stdout.
- 7-Zip command line: @listfile now doesn't work after -- switch.  Use
  -i@listfile before -- switch instead.

fixed bugs:
- 7-Zip could add unrequired alternate file streams to WIM archives, for
  commands that contain filename wildcards and -sns switch.
- 7-Zip 17.00 beta crashed for commands that write anti-item to 7z archive.
- 7-Zip 17.00 beta ignored "Use large memory pages" option.

CPP/7zip/Common/CWrappers.cpp

@@ -28,13 +28,17 @@ HRESULT SResToHRESULT(SRes res) throw()
   switch (res)
   {
     case SZ_OK: return S_OK;
+    case SZ_ERROR_DATA: return S_FALSE;
+    case SZ_ERROR_CRC: return S_FALSE;
     case SZ_ERROR_MEM: return E_OUTOFMEMORY;
     case SZ_ERROR_PARAM: return E_INVALIDARG;
     case SZ_ERROR_PROGRESS: return E_ABORT;
-    case SZ_ERROR_DATA: return S_FALSE;
     case SZ_ERROR_UNSUPPORTED: return E_NOTIMPL;
-    // case SZ_ERROR_READ: return E_NOTIMPL;
+    // case SZ_ERROR_THREAD: return E_FAIL;
+    // case SZ_ERROR_READ: return E_FAIL;
   }
+  if (res < 0)
+    return res;
   return E_FAIL;
 }
 

CPP/7zip/Common/MethodProps.cpp

@@ -42,6 +42,14 @@ unsigned ParseStringToUInt32(const UString &srcString, UInt32 &number)
   return (unsigned)(end - start);
 }
 
+static unsigned ParseStringToUInt64(const UString &srcString, UInt64 &number)
+{
+  const wchar_t *start = srcString;
+  const wchar_t *end;
+  number = ConvertStringToUInt64(start, &end);
+  return (unsigned)(end - start);
+}
+
 HRESULT ParsePropToUInt32(const UString &name, const PROPVARIANT &prop, UInt32 &resValue)
 {
   // =VT_UI4
@@ -263,7 +271,11 @@ static const CNameToPropID g_NameToPropID[] =
   { VT_UI4, "mt" },
   { VT_BOOL, "eos" },
   { VT_UI4, "x" },
-  { VT_UI4, "reduceSize" }
+  { VT_UI8, "reduce" },
+  { VT_UI8, "expect" },
+  { VT_UI4, "b" },
+  { VT_UI4, "check" },
+  { VT_BSTR, "filter" }
 };
 
 static int FindPropIdExact(const UString &name)
@@ -345,7 +357,8 @@ static bool IsLogSizeProp(PROPID propid)
     case NCoderPropID::kDictionarySize:
     case NCoderPropID::kUsedMemorySize:
     case NCoderPropID::kBlockSize:
-    case NCoderPropID::kReduceSize:
+    case NCoderPropID::kBlockSize2:
+    // case NCoderPropID::kReduceSize:
       return true;
   }
   return false;
@@ -378,9 +391,22 @@ HRESULT CMethodProps::SetParam(const UString &name, const UString &value)
     }
     else if (!value.IsEmpty())
     {
-      UInt32 number;
-      if (ParseStringToUInt32(value, number) == value.Len())
-        propValue = number;
+      if (nameToPropID.VarType == VT_UI4)
+      {
+        UInt32 number;
+        if (ParseStringToUInt32(value, number) == value.Len())
+          propValue = number;
+        else
+          propValue = value;
+      }
+      else if (nameToPropID.VarType == VT_UI8)
+      {
+        UInt64 number;
+        if (ParseStringToUInt64(value, number) == value.Len())
+          propValue = number;
+        else
+          propValue = value;
+      }
       else
         propValue = value;
     }

CPP/7zip/Common/MethodProps.h

@@ -4,6 +4,7 @@
 #define __7Z_METHOD_PROPS_H
 
 #include "../../Common/MyString.h"
+#include "../../Common/Defs.h"
 
 #include "../../Windows/Defs.h"
 
@@ -133,38 +134,50 @@ public:
     return 2;
   }
 
-  UInt32 Get_Lzma2_NumThreads(bool &fixedNumber) const
+  int Get_Xz_NumThreads(UInt32 &lzmaThreads) const
   {
-    fixedNumber = false;
+    lzmaThreads = 1;
     int numThreads = Get_NumThreads();
-    if (numThreads >= 0)
-    {
-      fixedNumber = true;
-      if (numThreads < 1) return 1;
-      const unsigned kNumLzma2ThreadsMax = 32;
-      if (numThreads > kNumLzma2ThreadsMax) return kNumLzma2ThreadsMax;
-      return numThreads;
-    }
-    return 1;
+    if (numThreads >= 0 && numThreads <= 1)
+      return 1;
+    if (Get_Lzma_Algo() != 0)
+      lzmaThreads = 2;
+    return numThreads;
   }
 
-  UInt64 Get_Lzma2_BlockSize() const
+  UInt64 GetProp_BlockSize(PROPID id) const
   {
-    int i = FindProp(NCoderPropID::kBlockSize);
+    int i = FindProp(id);
     if (i >= 0)
     {
       const NWindows::NCOM::CPropVariant &val = Props[i].Value;
-      if (val.vt == VT_UI4) return val.ulVal;
-      if (val.vt == VT_UI8) return val.uhVal.QuadPart;
+      if (val.vt == VT_UI4) { return val.ulVal; }
+      if (val.vt == VT_UI8) { return val.uhVal.QuadPart; }
     }
+    return 0;
+  }
 
-    UInt32 dictSize = Get_Lzma_DicSize();
-    UInt64 blockSize = (UInt64)dictSize << 2;
+  UInt64 Get_Xz_BlockSize() const
+  {
+    {
+      UInt64 blockSize1 = GetProp_BlockSize(NCoderPropID::kBlockSize);
+      UInt64 blockSize2 = GetProp_BlockSize(NCoderPropID::kBlockSize2);
+      UInt64 minSize = MyMin(blockSize1, blockSize2);
+      if (minSize != 0)
+        return minSize;
+      UInt64 maxSize = MyMax(blockSize1, blockSize2);
+      if (maxSize != 0)
+        return maxSize;
+    }
     const UInt32 kMinSize = (UInt32)1 << 20;
     const UInt32 kMaxSize = (UInt32)1 << 28;
+    UInt32 dictSize = Get_Lzma_DicSize();
+    UInt64 blockSize = (UInt64)dictSize << 2;
     if (blockSize < kMinSize) blockSize = kMinSize;
     if (blockSize > kMaxSize) blockSize = kMaxSize;
     if (blockSize < dictSize) blockSize = dictSize;
+    blockSize += (kMinSize - 1);
+    blockSize &= ~(UInt64)(kMinSize - 1);
     return blockSize;
   }