Update to 7-Zip Version 21.03

CPP/7zip/UI/GUI/CompressDialog.cpp

@@ -83,6 +83,8 @@ static const unsigned kHistorySize = 20;
 static const UInt32 kNoSolidBlockSize = 0;
 static const UInt32 kSolidBlockSize = 64;
 
+static const UInt32 kLzmaMaxDictSize = (UInt32)15 << 28;
+
 static LPCSTR const kExeExt = ".exe";
 
 #define k7zFormat "7z"
@@ -375,18 +377,20 @@ static bool IsMethodSupportedBySfx(int methodID)
   return false;
 }
 
-static bool GetMaxRamSizeForProgram(UInt64 &physSize)
+static bool GetMaxRamSizeForProgram(UInt64 &ramSize, UInt64 &size)
 {
-  physSize = (UInt64)(sizeof(size_t)) << 29;
-  bool ramSize_Defined = NSystem::GetRamSize(physSize);
+  size = (UInt64)(sizeof(size_t)) << 29;
+  bool ramSize_Defined = NSystem::GetRamSize(size);
+  ramSize = size;
+  size = size / 16 * 15;
   const UInt64 kMinSysSize = (1 << 24);
-  if (physSize <= kMinSysSize)
-    physSize = 0;
+  if (size <= kMinSysSize)
+    size = 0;
   else
-    physSize -= kMinSysSize;
+    size -= kMinSysSize;
   const UInt64 kMinUseSize = (1 << 24);
-  if (physSize < kMinUseSize)
-    physSize = kMinUseSize;
+  if (size < kMinUseSize)
+    size = kMinUseSize;
   return ramSize_Defined;
 }
 
@@ -535,7 +539,7 @@ bool CCompressDialog::OnInit()
   SetSolidBlockSize();
   SetNumThreads();
 
-  TCHAR s[40] = { TEXT('/'), TEXT(' '), 0 };
+  TCHAR s[32] = { TEXT('/'), TEXT(' '), 0 };
   ConvertUInt32ToString(NSystem::GetNumberOfProcessors(), s + 2);
   SetItemText(IDT_COMPRESS_HARDWARE_THREADS, s);
 
@@ -780,6 +784,48 @@ static bool IsAsciiString(const UString &s)
   return true;
 }
 
+
+static void AddSize_MB(UString &s, UInt64 size)
+{
+  char temp[32];
+  ConvertUInt64ToString((size + (1 << 20) - 1) >> 20, temp);
+  s += temp;
+  s += " MB";
+}
+
+
+void SetErrorMessage_MemUsage(UString &s, UInt64 reqSize, UInt64 ramSize, UInt64 ramLimit, const UString &usageString)
+{
+  s += "The operation was blocked by 7-Zip";
+  s.Add_LF();
+  s += "The operation can require big amount of RAM (memory):";
+  s.Add_LF();
+  s.Add_LF();
+  AddSize_MB(s, reqSize);
+
+  if (!usageString.IsEmpty())
+  {
+    s += " : ";
+    s += usageString;
+  }
+
+  s.Add_LF();
+  AddSize_MB(s, ramSize);
+  s += " : RAM";
+
+  if (ramLimit != 0)
+  {
+    s.Add_LF();
+    AddSize_MB(s, ramLimit);
+    s += " : 7-Zip limit";
+  }
+  
+  s.Add_LF();
+  s.Add_LF();
+  s += LangString(IDS_MEM_ERROR);
+}
+
+
 void CCompressDialog::OnOK()
 {
   _password1Control.GetText(Info.Password);
@@ -811,6 +857,24 @@ void CCompressDialog::OnOK()
     }
   }
 
+  {
+    UInt64 ramSize;
+    UInt64 maxRamSize;
+    const bool maxRamSize_Defined = GetMaxRamSizeForProgram(ramSize, maxRamSize);
+    UInt64 decompressMem;
+    const UInt64 memUsage = GetMemoryUsage_DecompMem(decompressMem);
+    if (maxRamSize_Defined && memUsage > maxRamSize)
+    {
+      UString s;
+      UString s2 = LangString(IDT_COMPRESS_MEMORY);
+      if (s2.IsEmpty())
+        GetItemText(IDT_COMPRESS_MEMORY, s2);
+      SetErrorMessage_MemUsage(s, memUsage, ramSize, maxRamSize, s2);
+      MessageBoxError(s);
+      return;
+    }
+  }
+
   SaveOptionsInMem();
   {
     UString s;
@@ -829,7 +893,7 @@ void CCompressDialog::OnOK()
   Info.PathMode = (NWildcard::ECensorPathMode)k_PathMode_Vals[m_PathMode.GetCurSel()];
 
   Info.Level = GetLevelSpec();
-  Info.Dictionary = GetDictionarySpec();
+  Info.Dict64 = GetDictSpec();
   Info.Order = GetOrderSpec();
   Info.OrderMode = GetOrderMode();
   Info.NumThreads = GetNumThreadsSpec();
@@ -1372,22 +1436,28 @@ UString CCompressDialog::GetEncryptionMethodSpec()
   return s;
 }
 
-void CCompressDialog::AddDictionarySize(UInt32 size)
+void CCompressDialog::AddDict2(size_t sizeReal, size_t sizeShow)
 {
   Byte c = 0;
   unsigned moveBits = 0;
-  if ((size & 0xFFFFF) == 0)    { moveBits = 20; c = 'M'; }
-  else if ((size & 0x3FF) == 0) { moveBits = 10; c = 'K'; }
-  TCHAR s[40];
-  ConvertUInt32ToString(size >> moveBits, s);
+  if ((sizeShow & 0xFFFFF) == 0)    { moveBits = 20; c = 'M'; }
+  else if ((sizeShow & 0x3FF) == 0) { moveBits = 10; c = 'K'; }
+  TCHAR s[32];
+  ConvertUInt64ToString(sizeShow >> moveBits, s);
   unsigned pos = MyStringLen(s);
   s[pos++] = ' ';
   if (moveBits != 0)
     s[pos++] = c;
   s[pos++] = 'B';
   s[pos++] = 0;
-  int index = (int)m_Dictionary.AddString(s);
-  m_Dictionary.SetItemData(index, size);
+  const int index = (int)m_Dictionary.AddString(s);
+  m_Dictionary.SetItemData(index, sizeReal);
+}
+
+
+void CCompressDialog::AddDict(size_t size)
+{
+  AddDict2(size, size);
 }
 
 typedef enum {
@@ -1435,7 +1505,7 @@ void CCompressDialog::SetDictionary()
 {
   m_Dictionary.ResetContent();
   const CArcInfoEx &ai = (*ArcFormats)[GetFormatIndex()];
-  int index = FindRegistryFormat(ai.Name);
+  const int index = FindRegistryFormat(ai.Name);
   UInt32 defaultDict = (UInt32)(Int32)-1;
   
   if (index >= 0)
@@ -1445,12 +1515,13 @@ void CCompressDialog::SetDictionary()
       defaultDict = fo.Dictionary;
   }
   
-  int methodID = GetMethodID();
+  const int methodID = GetMethodID();
   UInt32 level = GetLevel2();
   if (methodID < 0)
     return;
+  UInt64 ramSize;
   UInt64 maxRamSize;
-  bool maxRamSize_Defined = GetMaxRamSizeForProgram(maxRamSize);
+  const bool maxRamSize_Defined = GetMaxRamSizeForProgram(ramSize, maxRamSize);
   
   switch (methodID)
   {
@@ -1460,38 +1531,44 @@ void CCompressDialog::SetDictionary()
       if (defaultDict == (UInt32)(Int32)-1)
       {
         defaultDict =
-              ( level <= 3 ? (1 << (level * 2 + 16)) :
-              ( level <= 6 ? (1 << (level + 19)) :
-              ( level <= 7 ? (1 << 25) : (1 << 26)
-              )));
+            ( level <= 3 ? ((UInt32)1 << (level * 2 + 16)) :
+            ( level <= 6 ? ((UInt32)1 << (level + 19)) :
+            ( level <= 7 ? ((UInt32)1 << 25) : ((UInt32)1 << 26)
+            )));
       }
-      AddDictionarySize(1 << 16);
-      AddDictionarySize(1 << 18);
-      m_Dictionary.SetCurSel(m_Dictionary.GetCount() - 1);
-      
-      for (unsigned i = 20; i <= 31; i++)
-        for (unsigned j = 0; j < 2; j++)
-        {
-          if (i == 20 && j > 0)
-            continue;
-          UInt32 dict = ((UInt32)(2 + j) << (i - 1));
-          
-          if (dict >
-            #ifdef MY_CPU_64BIT
-              (3 << 29)
-            #else
-              (1 << 26)
-            #endif
-            )
-            continue;
-          
-          AddDictionarySize(dict);
-          UInt64 decomprSize;
-          UInt64 requiredComprSize = GetMemoryUsage(dict, decomprSize);
-          if (dict <= defaultDict && (!maxRamSize_Defined || requiredComprSize <= maxRamSize))
-            m_Dictionary.SetCurSel(m_Dictionary.GetCount() - 1);
-        }
 
+      // we use threshold 3.75 GiB to switch to kLzmaMaxDictSize.
+      if (defaultDict >= ((UInt32)15 << 28))
+        defaultDict = kLzmaMaxDictSize;
+      
+      const size_t kLzmaMaxDictSize_Up = (size_t)1 << (20 + sizeof(size_t) / 4 * 6);
+      
+      int curSel = 0;
+
+      for (unsigned i = (16 - 1) * 2; i <= (32 - 1) * 2; i++)
+      {
+        if (i < (20 - 1) * 2
+            && i != (16 - 1) * 2
+            && i != (18 - 1) * 2)
+          continue;
+        if (i == (20 - 1) * 2 + 1)
+          continue;
+        const size_t dict_up = (size_t)(2 + (i & 1)) << (i / 2);
+        size_t dict = dict_up;
+        if (dict_up >= kLzmaMaxDictSize)
+          dict = kLzmaMaxDictSize; // we reduce dictionary
+        
+        AddDict(dict);
+        // AddDict2(dict, dict_up); // for debug : we show 4 GB
+
+        const UInt64 memUsage = GetMemoryUsageComp_Dict(dict);
+        if (dict <= defaultDict && (!maxRamSize_Defined || memUsage <= maxRamSize))
+          curSel = m_Dictionary.GetCount() - 1;
+        if (dict_up >= kLzmaMaxDictSize_Up)
+          break;
+      }
+      
+      m_Dictionary.SetCurSel(curSel);
       // SetNearestSelectComboBox(m_Dictionary, defaultDict);
       break;
     }
@@ -1519,10 +1596,9 @@ void CCompressDialog::SetDictionary()
           )
           continue;
 
-        AddDictionarySize(dict);
-        UInt64 decomprSize;
-        UInt64 requiredComprSize = GetMemoryUsage(dict, decomprSize);
-        if (dict <= defaultDict && (!maxRamSize_Defined || requiredComprSize <= maxRamSize))
+        AddDict(dict);
+        const UInt64 memUsage = GetMemoryUsageComp_Dict(dict);
+        if (dict <= defaultDict && (!maxRamSize_Defined || memUsage <= maxRamSize))
           m_Dictionary.SetCurSel(m_Dictionary.GetCount() - 1);
       }
 
@@ -1532,46 +1608,63 @@ void CCompressDialog::SetDictionary()
     case kPPMd:
     {
       if (defaultDict == (UInt32)(Int32)-1)
-      {
         defaultDict = (UInt32)1 << (level + 19);
-      }
 
-      for (unsigned i = 20; i < 31; i++)
-        for (unsigned j = 0; j < 2; j++)
-        {
-          if (i == 20 && j > 0)
-            continue;
-          UInt32 dict = ((UInt32)(2 + j) << (i - 1));
-          if (dict >
-            #ifdef MY_CPU_64BIT
-              (1 << 30)
-            #else
-              (1 << 29)
-            #endif
-            )
-            continue;
-          AddDictionarySize(dict);
-          UInt64 decomprSize;
-          UInt64 requiredComprSize = GetMemoryUsage(dict, decomprSize);
-          if ((dict <= defaultDict && (!maxRamSize_Defined || requiredComprSize <= maxRamSize))
-              || m_Dictionary.GetCount() == 1)
-            m_Dictionary.SetCurSel(m_Dictionary.GetCount() - 1);
-        }
+      const UInt32 kPpmd_Default_4g = (UInt32)0 - ((UInt32)1 << 10);
+      const size_t kPpmd_MaxDictSize_Up = (size_t)1 << (29 + sizeof(size_t) / 8);
+
+      if (defaultDict >= ((UInt32)15 << 28)) // threshold
+        defaultDict = kPpmd_Default_4g;
+
+      int curSel = 0;
+      for (unsigned i = (20 - 1) * 2; i <= (32 - 1) * 2; i++)
+      {
+        if (i == (20 - 1) * 2 + 1)
+          continue;
+
+        const size_t dict_up = (size_t)(2 + (i & 1)) << (i / 2);
+        size_t dict = dict_up;
+        if (dict_up >= kPpmd_Default_4g)
+          dict = kPpmd_Default_4g;
+
+        AddDict2(dict, dict_up);
+        // AddDict2((UInt32)((UInt32)0 - 2), dict_up); // for debug
+        // AddDict(dict_up); // for debug
+        const UInt64 memUsage = GetMemoryUsageComp_Dict(dict);
+        if (dict <= defaultDict && (!maxRamSize_Defined || memUsage <= maxRamSize))
+          curSel = m_Dictionary.GetCount() - 1;
+        if (dict_up >= kPpmd_MaxDictSize_Up)
+          break;
+      }
+      m_Dictionary.SetCurSel(curSel);
+      // SetNearestSelectComboBox(m_Dictionary, defaultDict);
+      break;
+    }
+
+    case kPPMdZip:
+    {
+      if (defaultDict == (UInt32)(Int32)-1)
+        defaultDict = (UInt32)1 << (level + 19);
       
+      int curSel = 0;
+      for (unsigned i = 20; i <= 28; i++)
+      {
+        const UInt32 dict = (UInt32)1 << i;
+        AddDict(dict);
+        const UInt64 memUsage = GetMemoryUsageComp_Dict(dict);
+        if ((dict <= defaultDict && (!maxRamSize_Defined || memUsage <= maxRamSize)))
+          curSel = m_Dictionary.GetCount() - 1;
+      }
+      m_Dictionary.SetCurSel(curSel);
       // SetNearestSelectComboBox(m_Dictionary, defaultDict);
       break;
     }
 
     case kDeflate:
-    {
-      AddDictionarySize(32 << 10);
-      m_Dictionary.SetCurSel(0);
-      break;
-    }
-    
     case kDeflate64:
     {
-      AddDictionarySize(64 << 10);
+      const UInt32 dict = (methodID == kDeflate ? (UInt32)(1 << 15) : (UInt32)(1 << 16));
+      AddDict(dict);
       m_Dictionary.SetCurSel(0);
       break;
     }
@@ -1585,39 +1678,22 @@ void CCompressDialog::SetDictionary()
         else                 defaultDict = (100 << 10);
       }
       
+      int curSel = 0;
       for (unsigned i = 1; i <= 9; i++)
       {
-        UInt32 dict = ((UInt32)i * 100) << 10;
-        AddDictionarySize(dict);
-        if (dict <= defaultDict || m_Dictionary.GetCount() == 0)
-          m_Dictionary.SetCurSel(m_Dictionary.GetCount() - 1);
+        const UInt32 dict = ((UInt32)i * 100) << 10;
+        AddDict(dict);
+        // AddDict2(i * 100000, dict);
+        if (i <= defaultDict / 100000)
+          curSel = m_Dictionary.GetCount() - 1;
       }
-      
-      break;
-    }
-    
-    case kPPMdZip:
-    {
-      if (defaultDict == (UInt32)(Int32)-1)
-        defaultDict = (UInt32)1 << (level + 19);
-      
-      for (unsigned i = 20; i <= 28; i++)
-      {
-        UInt32 dict = (1 << i);
-        AddDictionarySize(dict);
-        UInt64 decomprSize;
-        UInt64 requiredComprSize = GetMemoryUsage(dict, decomprSize);
-        if ((dict <= defaultDict && (!maxRamSize_Defined || requiredComprSize <= maxRamSize))
-            || m_Dictionary.GetCount() == 1)
-          m_Dictionary.SetCurSel(m_Dictionary.GetCount() - 1);
-      }
-      
-      // SetNearestSelectComboBox(m_Dictionary, defaultDict);
+      m_Dictionary.SetCurSel(curSel);
       break;
     }
   }
 }
 
+
 UInt32 CCompressDialog::GetComboValue(NWindows::NControl::CComboBox &c, int defMax)
 {
   if (c.GetCount() <= defMax)
@@ -1625,6 +1701,15 @@ UInt32 CCompressDialog::GetComboValue(NWindows::NControl::CComboBox &c, int defM
   return (UInt32)c.GetItemData_of_CurSel();
 }
 
+
+UInt64 CCompressDialog::GetComboValue_64(NWindows::NControl::CComboBox &c, int defMax)
+{
+  if (c.GetCount() <= defMax)
+    return (UInt64)(Int64)-1;
+  // LRESULT is signed. so we cast it to unsigned size_t at first:
+  return (UInt64)(size_t)c.GetItemData_of_CurSel();
+}
+
 UInt32 CCompressDialog::GetLevel2()
 {
   UInt32 level = GetLevel();
@@ -1635,7 +1720,7 @@ UInt32 CCompressDialog::GetLevel2()
 
 int CCompressDialog::AddOrder(UInt32 size)
 {
-  TCHAR s[40];
+  TCHAR s[32];
   ConvertUInt32ToString(size, s);
   int index = (int)m_Order.AddString(s);
   m_Order.SetItemData(index, size);
@@ -1761,7 +1846,7 @@ bool CCompressDialog::GetOrderMode()
 }
 
 
-static UInt64 Get_Lzma2_ChunkSize(UInt32 dict)
+static UInt64 Get_Lzma2_ChunkSize(UInt64 dict)
 {
   // we use same default chunk sizes as defined in 7z encoder and lzma2 encoder
   UInt64 cs = (UInt64)dict << 2;
@@ -1787,8 +1872,8 @@ void CCompressDialog::SetSolidBlockSize(bool useDictionary)
   if (level == 0)
     return;
 
-  UInt32 dict = GetDictionarySpec();
-  if (dict == (UInt32)(Int32)-1)
+  UInt64 dict = GetDictSpec();
+  if (dict == (UInt64)(Int64)-1)
     dict = 1;
 
   UInt32 defaultBlockSize = (UInt32)(Int32)-1;
@@ -1847,7 +1932,7 @@ void CCompressDialog::SetSolidBlockSize(bool useDictionary)
     if (defaultBlockSize == (UInt32)(Int32)-1 && ((UInt64)1 << i) >= blockSize)
       defaultBlockSize = i;
 
-    TCHAR s[40];
+    TCHAR s[32];
     char post;
     ConvertUInt32ToString(1 << (i % 10), s);
          if (i < 20) post = 'K';
@@ -1918,7 +2003,7 @@ void CCompressDialog::SetNumThreads()
     numAlgoThreadsMax = 128;
   for (UInt32 i = 1; i <= numHardwareThreads * 2 && i <= numAlgoThreadsMax; i++)
   {
-    TCHAR s[40];
+    TCHAR s[32];
     ConvertUInt32ToString(i, s);
     int index = (int)m_NumThreads.AddString(s);
     m_NumThreads.SetItemData(index, (UInt32)i);
@@ -1926,7 +2011,8 @@ void CCompressDialog::SetNumThreads()
   SetNearestSelectComboBox(m_NumThreads, defaultValue);
 }
 
-UInt64 CCompressDialog::GetMemoryUsage(UInt32 dict, UInt64 &decompressMemory)
+
+UInt64 CCompressDialog::GetMemoryUsage_Dict_DecompMem(UInt64 dict64, UInt64 &decompressMemory)
 {
   decompressMemory = UInt64(Int64(-1));
   UInt32 level = GetLevel2();
@@ -1959,6 +2045,7 @@ UInt64 CCompressDialog::GetMemoryUsage(UInt32 dict, UInt64 &decompressMemory)
     case kLZMA:
     case kLZMA2:
     {
+      const UInt32 dict = (dict64 >= kLzmaMaxDictSize ? kLzmaMaxDictSize : (UInt32)dict64);
       UInt32 hs = dict - 1;
       hs |= (hs >> 1);
       hs |= (hs >> 2);
@@ -2010,7 +2097,15 @@ UInt64 CCompressDialog::GetMemoryUsage(UInt32 dict, UInt64 &decompressMemory)
       }
 
       if (chunkSize == 0)
-        size += numBlockThreads * (size1 + (UInt64)dict * 3 / 2);
+      {
+        const UInt32 kBlockSizeMax = (UInt32)0 - (UInt32)(1 << 16);
+        UInt64 blockSize = (UInt64)dict + (1 << 16)
+          + (numThreads1 > 1 ? (1 << 20) : 0);
+        blockSize += (blockSize >> (blockSize < ((UInt32)1 << 30) ? 1 : 2));
+        if (blockSize >= kBlockSizeMax)
+          blockSize = kBlockSizeMax;
+        size += numBlockThreads * (size1 + blockSize);
+      }
       else
       {
         size += numBlockThreads * (size1 + chunkSize);
@@ -2024,6 +2119,7 @@ UInt64 CCompressDialog::GetMemoryUsage(UInt32 dict, UInt64 &decompressMemory)
 
     case kFLZMA2:
     {
+      const UInt32 dict = (dict64 >= kLzmaMaxDictSize ? kLzmaMaxDictSize : (UInt32)dict64);
       if (level > FL2_MAX_7Z_CLEVEL)
         level = FL2_MAX_7Z_CLEVEL;
       /* dual buffer is enabled in Lzma2Encoder.cpp so size is dict * 6 */
@@ -2049,7 +2145,7 @@ UInt64 CCompressDialog::GetMemoryUsage(UInt32 dict, UInt64 &decompressMemory)
 
     case kPPMd:
     {
-      decompressMemory = dict + (2 << 20);
+      decompressMemory = dict64 + (2 << 20);
       return size + decompressMemory;
     }
 
@@ -2077,7 +2173,7 @@ UInt64 CCompressDialog::GetMemoryUsage(UInt32 dict, UInt64 &decompressMemory)
 
     case kPPMdZip:
     {
-      decompressMemory = dict + (2 << 20);
+      decompressMemory = dict64 + (2 << 20);
       return size + (UInt64)decompressMemory * numThreads;
     }
   }
@@ -2085,9 +2181,15 @@ UInt64 CCompressDialog::GetMemoryUsage(UInt32 dict, UInt64 &decompressMemory)
   return (UInt64)(Int64)-1;
 }
 
-UInt64 CCompressDialog::GetMemoryUsage(UInt64 &decompressMemory)
+UInt64 CCompressDialog::GetMemoryUsage_DecompMem(UInt64 &decompressMemory)
 {
-  return GetMemoryUsage(GetDictionary(), decompressMemory);
+  return GetMemoryUsage_Dict_DecompMem(GetDict(), decompressMemory);
+}
+
+UInt64 CCompressDialog::GetMemoryUsageComp_Dict(UInt64 dict64)
+{
+  UInt64 decompressMemory;
+  return GetMemoryUsage_Dict_DecompMem(dict64, decompressMemory);
 }
 
 void CCompressDialog::PrintMemUsage(UINT res, UInt64 value)
@@ -2097,7 +2199,7 @@ void CCompressDialog::PrintMemUsage(UINT res, UInt64 value)
     SetItemText(res, TEXT("?"));
     return;
   }
-  TCHAR s[40];
+  TCHAR s[32];
   if (value <= ((UInt64)16 << 30))
   {
     value = (value + (1 << 20) - 1) >> 20;
@@ -2116,7 +2218,7 @@ void CCompressDialog::PrintMemUsage(UINT res, UInt64 value)
 void CCompressDialog::SetMemoryUsage()
 {
   UInt64 decompressMem;
-  UInt64 memUsage = GetMemoryUsage(decompressMem);
+  const UInt64 memUsage = GetMemoryUsage_DecompMem(decompressMem);
   PrintMemUsage(IDT_COMPRESS_MEMORY_VALUE, memUsage);
   PrintMemUsage(IDT_COMPRESS_MEMORY_DE_VALUE, decompressMem);
 }
@@ -2125,7 +2227,7 @@ void CCompressDialog::SetParams()
 {
   const CArcInfoEx &ai = (*ArcFormats)[GetFormatIndex()];
   m_Params.SetText(TEXT(""));
-  int index = FindRegistryFormat(ai.Name);
+  const int index = FindRegistryFormat(ai.Name);
   if (index >= 0)
   {
     const NCompression::CFormatOptions &fo = m_RegistryInfo.Formats[index];
@@ -2137,7 +2239,7 @@ void CCompressDialog::SetParams()
 void CCompressDialog::SaveOptionsInMem()
 {
   const CArcInfoEx &ai = (*ArcFormats)[Info.FormatIndex];
-  int index = FindRegistryFormatAlways(ai.Name);
+  const int index = FindRegistryFormatAlways(ai.Name);
   m_Params.GetText(Info.Options);
   m_Volume.GetText(Info.SplitVolume);
   Info.Options.Trim();
@@ -2146,12 +2248,32 @@ void CCompressDialog::SaveOptionsInMem()
   fo.Options = Info.Options;
   fo.SplitVolume = Info.SplitVolume;
   fo.Level = GetLevelSpec();
-  fo.Dictionary = GetDictionarySpec();
   fo.Order = GetOrderSpec();
   fo.Method = GetMethodSpec();
   fo.EncryptionMethod = GetEncryptionMethodSpec();
   fo.NumThreads = GetNumThreadsSpec();
   fo.BlockLogSize = GetBlockSizeSpec();
+  {
+    const UInt64 dict64 = GetDictSpec();
+    UInt32 dict32;
+    if (dict64 == (UInt64)(Int64)-1)
+      dict32 = (UInt32)(Int32)-1;
+    else
+    {
+      dict32 = (UInt32)dict64;
+      if (dict64 != dict32)
+      {
+        /* here we must write 32-bit value for registry that indicates big_value
+           (UInt32)(Int32)-1  : is used as marker for default size
+           (UInt32)(Int32)-2  : it can be used to indicate big value (4 GiB)
+           the value must be larger than threshold
+        */
+        dict32 = (UInt32)(Int32)-2;
+        // dict32 = kLzmaMaxDictSize; // it must be larger than threshold
+      }
+    }
+    fo.Dictionary = dict32;
+  }
 }
 
 unsigned CCompressDialog::GetFormatIndex()