Update to 7-Zip 17.00 Beta

CPP/7zip/UI/Common/CompressCall2.cpp

@@ -59,9 +59,9 @@ static void ThrowException_if_Error(HRESULT res)
  
 UString GetQuotedString(const UString &s)
 {
-  UString s2 = L'\"';
+  UString s2 ('\"');
   s2 += s;
-  s2 += L'\"';
+  s2 += '\"';
   return s2;
 }
 
@@ -145,6 +145,7 @@ HRESULT CompressFiles(
   return S_OK;
 }
 
+
 static HRESULT ExtractGroupCommand(const UStringVector &arcPaths,
     bool showDialog, const UString &outFolder, bool testMode, bool elimDup = false)
 {
@@ -192,10 +193,14 @@ static HRESULT ExtractGroupCommand(const UStringVector &arcPaths,
   censor.AddPathsToCensor(NWildcard::k_RelatPath);
 
   bool messageWasDisplayed = false;
+
+  ecs->MultiArcMode = (arcPathsSorted.Size() > 1);
+
   result = ExtractGUI(codecs,
       formatIndices, CIntVector(),
       arcPathsSorted, arcFullPathsSorted,
       censor.Pairs.Front().Head, eo, NULL, showDialog, messageWasDisplayed, ecs, g_HWND);
+
   if (result != S_OK)
   {
     if (result != E_ABORT && messageWasDisplayed)
@@ -260,8 +265,8 @@ void Benchmark(bool totalMode)
   if (totalMode)
   {
     CProperty prop;
-    prop.Name = L"m";
-    prop.Value = L"*";
+    prop.Name = "m";
+    prop.Value = "*";
     props.Add(prop);
   }
   result = Benchmark(EXTERNAL_CODECS_VARS_L props, g_HWND);