1 files changed, 63 insertions, 66 deletions

diff --git a/CPP/7zip/UI/GUI/CompressDialog.cpp b/CPP/7zip/UI/GUI/CompressDialog.cpp
index 85d7186..53e56fe 100644
--- a/CPP/7zip/UI/GUI/CompressDialog.cpp
+++ b/CPP/7zip/UI/GUI/CompressDialog.cpp
@@ -506,8 +506,7 @@ bool CCompressDialog::OnInit()
     {
       const unsigned arcIndex = ArcIndices[i];
       const CArcInfoEx &ai = (*ArcFormats)[arcIndex];
-      const int index = (int)m_Format.AddString(ai.Name);
-      m_Format.SetItemData(index, (LPARAM)arcIndex);
+      const int index = (int)m_Format.AddString_SetItemData(ai.Name, (LPARAM)arcIndex);
       if (!needSetMain)
       {
         if (Info.FormatIndex == (int)arcIndex)
@@ -540,11 +539,6 @@ bool CCompressDialog::OnInit()
   AddComboItems(m_PathMode, k_PathMode_IDs, Z7_ARRAY_SIZE(k_PathMode_IDs),
       k_PathMode_Vals, Info.PathMode);
 
-
-  TCHAR s[32] = { TEXT('/'), TEXT(' '), 0 };
-  ConvertUInt32ToString(NSystem::GetNumberOfProcessors(), s + 2);
-  SetItemText(IDT_COMPRESS_HARDWARE_THREADS, s);
-
   CheckButton(IDX_COMPRESS_SHARED, Info.OpenShareForWrite);
   CheckButton(IDX_COMPRESS_DEL, Info.DeleteAfterCompressing);
 
@@ -653,7 +647,19 @@ void CCompressDialog::EnableMultiCombo(unsigned id)
   EnableItem(id, enable);
 }
 
-static LRESULT ComboBox_AddStringAscii(NControl::CComboBox &cb, const char *s);
+static LRESULT ComboBox_AddStringAscii(NControl::CComboBox &cb, const char *s)
+{
+  return cb.AddString((CSysString)s);
+}
+
+static LRESULT ComboBox_AddStringAscii_SetItemData(NControl::CComboBox &cb,
+    const char *s, LPARAM lParam)
+{
+  const LRESULT index = ComboBox_AddStringAscii(cb, s);
+  if (index >= 0) // optional check
+    cb.SetItemData((int)index, lParam);
+  return index;
+}
 
 static void Combine_Two_BoolPairs(const CBoolPair &b1, const CBoolPair &b2, CBool1 &res)
 {
@@ -1604,20 +1610,14 @@ void CCompressDialog::SetLevel2()
             AddLangString(s, langID);
           }
       }
-      const int index = (int)m_Level.AddString(s);
-      m_Level.SetItemData(index, (LPARAM)i);
+      m_Level.AddString_SetItemData(s, (LPARAM)i);
     }
   }
   SetNearestSelectComboBox(m_Level, level);
 }
 
 
-static LRESULT ComboBox_AddStringAscii(NControl::CComboBox &cb, const char *s)
-{
-  return cb.AddString((CSysString)s);
-}
-
-static const char *k_Auto_Prefix = "*  ";
+static const char * const k_Auto_Prefix = "*  ";
 
 static void Modify_Auto(AString &s)
 {
@@ -1690,8 +1690,8 @@ void CCompressDialog::SetMethod2(int keepMethodId)
       writtenMethodId = -1;
       Modify_Auto(s);
     }
-    const int itemIndex = (int)ComboBox_AddStringAscii(m_Method, s);
-    m_Method.SetItemData(itemIndex, writtenMethodId);
+    const int itemIndex = (int)ComboBox_AddStringAscii_SetItemData(m_Method,
+          s, writtenMethodId);
     if (keepMethodId == methodID)
     {
       m_Method.SetCurSel(itemIndex);
@@ -1731,7 +1731,7 @@ void CCompressDialog::SetEncryptionMethod()
   }
   else if (ai.Is_Zip())
   {
-    int index = FindRegistryFormat(ai.Name);
+    const int index = FindRegistryFormat(ai.Name);
     UString encryptionMethod;
     if (index >= 0)
     {
@@ -1836,9 +1836,7 @@ static int Combo_AddDict2(NWindows::NControl::CComboBox &cb, size_t sizeReal, si
   s.Add_Char('B');
   if (sizeReal == k_Auto_Dict)
     Modify_Auto(s);
-  const int index = (int)ComboBox_AddStringAscii(cb, s);
-  cb.SetItemData(index, (LPARAM)sizeReal);
-  return index;
+  return (int)ComboBox_AddStringAscii_SetItemData(cb, s, (LPARAM)sizeReal);
 }
 
 int CCompressDialog::AddDict2(size_t sizeReal, size_t sizeShow)
@@ -2201,9 +2199,7 @@ int CCompressDialog::AddOrder(UInt32 size)
 {
   char s[32];
   ConvertUInt32ToString(size, s);
-  const int index = (int)ComboBox_AddStringAscii(m_Order, s);
-  m_Order.SetItemData(index, (LPARAM)size);
-  return index;
+  return (int)ComboBox_AddStringAscii_SetItemData(m_Order, s, (LPARAM)size);
 }
 
 int CCompressDialog::AddOrder_Auto()
@@ -2211,9 +2207,7 @@ int CCompressDialog::AddOrder_Auto()
   AString s;
   s.Add_UInt32(_auto_Order);
   Modify_Auto(s);
-  int index = (int)ComboBox_AddStringAscii(m_Order, s);
-  m_Order.SetItemData(index, (LPARAM)(INT_PTR)(-1));
-  return index;
+  return (int)ComboBox_AddStringAscii_SetItemData(m_Order, s, (LPARAM)(INT_PTR)(-1));
 }
 
 void CCompressDialog::SetOrder2()
@@ -2490,9 +2484,7 @@ void CCompressDialog::SetSolidBlockSize2()
     AString s;
     Add_Size(s, _auto_Solid);
     Modify_Auto(s);
-    const int index = (int)ComboBox_AddStringAscii(m_Solid, s);
-    m_Solid.SetItemData(index, (LPARAM)(UInt32)(Int32)-1);
-    curSel = index;
+    curSel = (int)ComboBox_AddStringAscii_SetItemData(m_Solid, s, (LPARAM)(UInt32)(Int32)-1);
   }
 
   if (is7z)
@@ -2501,8 +2493,7 @@ void CCompressDialog::SetSolidBlockSize2()
     // kSolidLog_NoSolid = 0 for xz means default blockSize
     if (is7z)
       LangString(IDS_COMPRESS_NON_SOLID, s);
-    const int index = (int)m_Solid.AddString(s);
-    m_Solid.SetItemData(index, (LPARAM)(UInt32)kSolidLog_NoSolid);
+    const int index = (int)m_Solid.AddString_SetItemData(s, (LPARAM)(UInt32)kSolidLog_NoSolid);
     if (defaultBlockSize == kSolidLog_NoSolid)
       curSel = index;
   }
@@ -2511,16 +2502,15 @@ void CCompressDialog::SetSolidBlockSize2()
   {
     AString s;
     Add_Size(s, (UInt64)1 << i);
-    const int index = (int)ComboBox_AddStringAscii(m_Solid, s);
-    m_Solid.SetItemData(index, (LPARAM)(UInt32)i);
+    const int index = (int)ComboBox_AddStringAscii_SetItemData(m_Solid, s, (LPARAM)(UInt32)i);
     if (defaultBlockSize != (UInt32)(Int32)-1)
       if (i <= defaultBlockSize || index <= 1)
         curSel = index;
   }
   
   {
-    const int index = (int)m_Solid.AddString(LangString(IDS_COMPRESS_SOLID));
-    m_Solid.SetItemData(index, (LPARAM)kSolidLog_FullSolid);
+    const int index = (int)m_Solid.AddString_SetItemData(
+        LangString(IDS_COMPRESS_SOLID), (LPARAM)kSolidLog_FullSolid);
     if (defaultBlockSize == kSolidLog_FullSolid)
       curSel = index;
   }
@@ -2564,7 +2554,7 @@ static bool Is_Zstd_Mt_Supported()
 }
 */
 
-static const char *k_ST_Threads = " (ST)";
+static const char * const k_ST_Threads = " (ST)";
 
 void CCompressDialog::SetNumThreads2()
 {
@@ -2575,15 +2565,31 @@ void CCompressDialog::SetNumThreads2()
   if (!fi.MultiThread_())
     return;
 
-  const UInt32 numHardwareThreads = NSystem::GetNumberOfProcessors();
-    // 64; // for debug:
+  UInt32 numCPUs = 1;            // process threads
+  UInt32 numHardwareThreads = 1; // system threads
+  NSystem::CProcessAffinity threadsInfo;
+  threadsInfo.InitST();
+#ifndef Z7_ST
+  threadsInfo.Get_and_return_NumProcessThreads_and_SysThreads(numCPUs, numHardwareThreads);
+#endif
 
-  UInt32 defaultValue = numHardwareThreads;
+  AString s ("/ ");
+  {
+    s.Add_UInt32(numCPUs);
+    if (numCPUs != numHardwareThreads)
+    {
+      s += " / ";
+      s.Add_UInt32(numHardwareThreads);
+    }
+    SetItemTextA(IDT_COMPRESS_HARDWARE_THREADS, s.Ptr());
+  }
+
+  UInt32 defaultValue = numCPUs;
   bool useAutoThreads = true;
 
   {
     const CArcInfoEx &ai = Get_ArcInfoEx();
-    int index = FindRegistryFormat(ai.Name);
+    const int index = FindRegistryFormat(ai.Name);
     if (index >= 0)
     {
       const NCompression::CFormatOptions &fo = m_RegistryInfo.Formats[index];
@@ -2597,19 +2603,19 @@ void CCompressDialog::SetNumThreads2()
 
   // const UInt32 num_ZSTD_threads_MAX = Is_Zstd_Mt_Supported() ? MY_ZSTDMT_NBWORKERS_MAX : 0;
 
-  UInt32 numAlgoThreadsMax = numHardwareThreads * 2;
   const int methodID = GetMethodID();
-
   const bool isZip = IsZipFormat();
+
+  UInt32 numAlgoThreadsMax = numHardwareThreads * 2; // for unknow methods
   if (isZip)
     numAlgoThreadsMax =
         8 << (sizeof(size_t) / 2); // 32 threads for 32-bit : 128 threads for 64-bit
   else if (IsXzFormat())
-    numAlgoThreadsMax = 256 * 2;
+    numAlgoThreadsMax = 256 * 2; // MTCODER_THREADS_MAX * 2
   else switch (methodID)
   {
     case kLZMA: numAlgoThreadsMax = 2; break;
-    case kLZMA2: numAlgoThreadsMax = 256; break;
+    case kLZMA2: numAlgoThreadsMax = 256 * 2; break; // MTCODER_THREADS_MAX * 2
     case kBZip2: numAlgoThreadsMax = 64; break;
     // case kZSTD: numAlgoThreadsMax = num_ZSTD_threads_MAX; break;
     case kCopy:
@@ -2619,9 +2625,9 @@ void CCompressDialog::SetNumThreads2()
     case kPPMdZip:
       numAlgoThreadsMax = 1;
   }
-  UInt32 autoThreads = numHardwareThreads;
+  UInt32 autoThreads = numCPUs;
   if (autoThreads > numAlgoThreadsMax)
-    autoThreads = numAlgoThreadsMax;
+      autoThreads = numAlgoThreadsMax;
 
   const UInt64 memUse_Limit = Get_MemUse_Bytes();
 
@@ -2676,13 +2682,12 @@ void CCompressDialog::SetNumThreads2()
 
   int curSel = -1;
   {
-    AString s;
+    s.Empty();
     s.Add_UInt32(autoThreads);
     if (autoThreads == 0) s += k_ST_Threads;
     Modify_Auto(s);
-    const int index = (int)ComboBox_AddStringAscii(m_NumThreads, s);
-    m_NumThreads.SetItemData(index, (LPARAM)(INT_PTR)(-1));
-    // m_NumThreads.SetItemData(index, autoThreads);
+    const int index = (int)ComboBox_AddStringAscii_SetItemData(m_NumThreads,
+        s, (LPARAM)(INT_PTR)(-1));
     if (useAutoThreads)
       curSel = index;
   }
@@ -2693,11 +2698,11 @@ void CCompressDialog::SetNumThreads2()
       1;
       i <= numHardwareThreads * 2 && i <= numAlgoThreadsMax; i++)
   {
-    AString s;
+    s.Empty();
     s.Add_UInt32(i);
     if (i == 0) s += k_ST_Threads;
-    const int index = (int)ComboBox_AddStringAscii(m_NumThreads, s);
-    m_NumThreads.SetItemData(index, (LPARAM)(UInt32)i);
+    const int index = (int)ComboBox_AddStringAscii_SetItemData(m_NumThreads,
+        s, (LPARAM)(UInt32)i);
     if (!useAutoThreads && i == defaultValue)
       curSel = index;
   }
@@ -2754,9 +2759,7 @@ int CCompressDialog::AddMemComboItem(UInt64 val, bool isPercent, bool isDefault)
         sRegistry.DeleteBack();
   }
   const unsigned dataIndex = _memUse_Strings.Add(sRegistry);
-  const int index = (int)m_MemUse.AddString(sUser);
-  m_MemUse.SetItemData(index, (LPARAM)dataIndex);
-  return index;
+  return (int)m_MemUse.AddString_SetItemData(sUser, (LPARAM)dataIndex);
 }
 
 
@@ -3439,11 +3442,7 @@ static const unsigned kTimePrec_1ns  = 3;
 static void AddTimeOption(UString &s, UInt32 val, const UString &unit, const char *sys = NULL)
 {
   // s += " : ";
-  {
-    AString s2;
-    s2.Add_UInt32(val);
-    s += s2;
-  }
+  s.Add_UInt32(val);
   s.Add_Space();
   s += unit;
   if (sys)
@@ -3476,9 +3475,7 @@ int COptionsDialog::AddPrec(unsigned prec, bool isDefault)
   }
   else
     s.Add_UInt32(prec);
-  const int index = (int)m_Prec.AddString(s);
-  m_Prec.SetItemData(index, (LPARAM)writePrec);
-  return index;
+  return (int)m_Prec.AddString_SetItemData(s, (LPARAM)writePrec);
 }