9.21

CPP/7zip/Bundles/LzmaCon/LzmaAlone.cpp

@@ -49,6 +49,8 @@ enum Enum
 {
   kHelp1 = 0,
   kHelp2,
+  kMethod,
+  kLevel,
   kAlgo,
   kDict,
   kFb,
@@ -69,6 +71,8 @@ static const CSwitchForm kSwitchForms[] =
 {
   { L"?",  NSwitchType::kSimple, false },
   { L"H",  NSwitchType::kSimple, false },
+  { L"MM", NSwitchType::kUnLimitedPostString, false, 1 },
+  { L"X", NSwitchType::kUnLimitedPostString, false, 1 },
   { L"A", NSwitchType::kUnLimitedPostString, false, 1 },
   { L"D", NSwitchType::kUnLimitedPostString, false, 1 },
   { L"FB", NSwitchType::kUnLimitedPostString, false, 1 },
@@ -186,7 +190,7 @@ int main2(int numArgs, const char *args[])
     IncorrectCommand();
   }
 
-  if(parser[NKey::kHelp1].ThereIs || parser[NKey::kHelp2].ThereIs)
+  if (parser[NKey::kHelp1].ThereIs || parser[NKey::kHelp2].ThereIs)
   {
     PrintHelp();
     return 0;
@@ -198,21 +202,38 @@ int main2(int numArgs, const char *args[])
     IncorrectCommand();
   const UString &command = nonSwitchStrings[paramIndex++];
 
+  CObjectVector<CProperty> props;
   bool dictDefined = false;
-  UInt32 dict = (UInt32)-1;
-  if(parser[NKey::kDict].ThereIs)
+  UInt32 dict = (UInt32)(Int32)-1;
+  if (parser[NKey::kDict].ThereIs)
   {
     UInt32 dicLog;
-    if (!GetNumber(parser[NKey::kDict].PostStrings[0], dicLog))
+    const UString &s = parser[NKey::kDict].PostStrings[0];
+    if (!GetNumber(s, dicLog))
       IncorrectCommand();
     dict = 1 << dicLog;
     dictDefined = true;
+    CProperty prop;
+    prop.Name = L"d";
+    prop.Value = s;
+    props.Add(prop);
+  }
+  if (parser[NKey::kLevel].ThereIs)
+  {
+    UInt32 level = 5;
+    const UString &s = parser[NKey::kLevel].PostStrings[0];
+    if (!GetNumber(s, level))
+      IncorrectCommand();
+    CProperty prop;
+    prop.Name = L"x";
+    prop.Value = s;
+    props.Add(prop);
   }
   UString mf = L"BT4";
   if (parser[NKey::kMatchFinder].ThereIs)
     mf = parser[NKey::kMatchFinder].PostStrings[0];
 
-  UInt32 numThreads = (UInt32)-1;
+  UInt32 numThreads = (UInt32)(Int32)-1;
 
   #ifndef _7ZIP_ST
   if (parser[NKey::kMultiThread].ThereIs)
@@ -224,9 +245,24 @@ int main2(int numArgs, const char *args[])
     else
       if (!GetNumber(s, numThreads))
         IncorrectCommand();
+    CProperty prop;
+    prop.Name = L"mt";
+    prop.Value = s;
+    props.Add(prop);
   }
   #endif
 
+  if (parser[NKey::kMethod].ThereIs)
+  {
+    UString s = parser[NKey::kMethod].PostStrings[0];
+    if (s.IsEmpty() || s[0] != '=')
+      IncorrectCommand();
+    CProperty prop;
+    prop.Name = L"m";
+    prop.Value = s.Mid(1);
+    props.Add(prop);
+  }
+
   if (command.CompareNoCase(L"b") == 0)
   {
     const UInt32 kNumDefaultItereations = 1;
@@ -236,10 +272,19 @@ int main2(int numArgs, const char *args[])
         if (!GetNumber(nonSwitchStrings[paramIndex++], numIterations))
           numIterations = kNumDefaultItereations;
     }
-    return LzmaBenchCon(stderr, numIterations, numThreads, dict);
+    HRESULT res = BenchCon(props, numIterations, stderr);
+    if (res != S_OK)
+    {
+      if (res != E_ABORT)
+      {
+        PrintMessage("Benchmark Error");
+        return 1;
+      }
+    }
+    return 0;
   }
 
-  if (numThreads == (UInt32)-1)
+  if (numThreads == (UInt32)(Int32)-1)
     numThreads = 1;
 
   bool encodeMode = false;
@@ -267,7 +312,7 @@ int main2(int numArgs, const char *args[])
     const UString &inputName = nonSwitchStrings[paramIndex++];
     inStreamSpec = new CInFileStream;
     inStream = inStreamSpec;
-    if (!inStreamSpec->Open(GetSystemString(inputName)))
+    if (!inStreamSpec->Open(us2fs(inputName)))
     {
       fprintf(stderr, "\nError: can not open input file %s\n",
           (const char *)GetOemString(inputName));
@@ -289,7 +334,7 @@ int main2(int numArgs, const char *args[])
     const UString &outputName = nonSwitchStrings[paramIndex++];
     outStreamSpec = new COutFileStream;
     outStream = outStreamSpec;
-    if (!outStreamSpec->Create(GetSystemString(outputName), true))
+    if (!outStreamSpec->Create(us2fs(outputName), true))
     {
       fprintf(stderr, "\nError: can not open output file %s\n",
         (const char *)GetOemString(outputName));
@@ -398,7 +443,7 @@ int main2(int numArgs, const char *args[])
       if (!GetNumber(parser[NKey::kMc].PostStrings[0], mc))
         IncorrectCommand();
     
-    PROPID propIDs[] =
+    const PROPID propIDs[] =
     {
       NCoderPropID::kDictionarySize,
       NCoderPropID::kPosStateBits,
@@ -512,7 +557,7 @@ int main2(int numArgs, const char *args[])
 int MY_CDECL main(int numArgs, const char *args[])
 {
   try { return main2(numArgs, args); }
-  catch(const char *s)
+  catch (const char *s)
   {
     fprintf(stderr, "\nError: %s\n", s);
     return 1;

CPP/7zip/Bundles/LzmaCon/LzmaCon.dsp

@@ -132,6 +132,14 @@ SOURCE=..\..\..\Windows\FileIO.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\Windows\PropVariant.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\Windows\PropVariant.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\Windows\Synchronization.cpp
 # End Source File
 # Begin Source File
@@ -280,6 +288,14 @@ SOURCE=..\..\Common\FilterCoder.h
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Common\MethodProps.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Common\MethodProps.h
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Common\StreamUtils.cpp
 # End Source File
 # Begin Source File

CPP/7zip/Bundles/LzmaCon/makefile

@@ -21,6 +21,7 @@ COMMON_OBJS = \
 
 WIN_OBJS = \
   $O\FileIO.obj \
+  $O\PropVariant.obj \
   $O\System.obj
 
 7ZIP_COMMON_OBJS = \
@@ -28,6 +29,7 @@ WIN_OBJS = \
   $O\CreateCoder.obj \
   $O\FileStreams.obj \
   $O\FilterCoder.obj \
+  $O\MethodProps.obj \
   $O\OutBuffer.obj \
   $O\StreamUtils.obj \
 

CPP/7zip/Bundles/LzmaCon/makefile.gcc

@@ -30,15 +30,18 @@ OBJS = \
   CWrappers.o \
   FileStreams.o \
   FilterCoder.o \
+  MethodProps.o \
   StreamUtils.o \
   $(FILE_IO).o \
   CommandLineParser.o \
   CRC.o \
   IntToString.o \
   MyString.o \
+  MyVector.o \
+  MyWindows.o \
   StringConvert.o \
   StringToInt.o \
-  MyVector.o \
+  PropVariant.o \
   7zCrc.o \
   7zCrcOpt.o \
   Alloc.o \
@@ -89,6 +92,9 @@ FileStreams.o: ../../Common/FileStreams.cpp
 FilterCoder.o: ../../Common/FilterCoder.cpp
 	$(CXX) $(CFLAGS) ../../Common/FilterCoder.cpp
 
+MethodProps.o: ../../Common/MethodProps.cpp
+	$(CXX) $(CFLAGS) ../../Common/MethodProps.cpp
+
 StreamUtils.o: ../../Common/StreamUtils.cpp
 	$(CXX) $(CFLAGS) ../../Common/StreamUtils.cpp
 
@@ -102,23 +108,26 @@ CommandLineParser.o: ../../../Common/CommandLineParser.cpp
 CRC.o: ../../../Common/CRC.cpp
 	$(CXX) $(CFLAGS) ../../../Common/CRC.cpp
 
-MyWindows.o: ../../../Common/MyWindows.cpp
-	$(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp
-
 IntToString.o: ../../../Common/IntToString.cpp
 	$(CXX) $(CFLAGS) ../../../Common/IntToString.cpp
 
 MyString.o: ../../../Common/MyString.cpp
 	$(CXX) $(CFLAGS) ../../../Common/MyString.cpp
 
+MyVector.o: ../../../Common/MyVector.cpp
+	$(CXX) $(CFLAGS) ../../../Common/MyVector.cpp
+
+MyWindows.o: ../../../Common/MyWindows.cpp
+	$(CXX) $(CFLAGS) ../../../Common/MyWindows.cpp
+
 StringConvert.o: ../../../Common/StringConvert.cpp
 	$(CXX) $(CFLAGS) ../../../Common/StringConvert.cpp
 
 StringToInt.o: ../../../Common/StringToInt.cpp
 	$(CXX) $(CFLAGS) ../../../Common/StringToInt.cpp
 
-MyVector.o: ../../../Common/MyVector.cpp
-	$(CXX) $(CFLAGS) ../../../Common/MyVector.cpp
+PropVariant.o: ../../../Windows/PropVariant.cpp
+	$(CXX) $(CFLAGS) ../../../Windows/PropVariant.cpp
 
 7zCrc.o: ../../../../C/7zCrc.c
 	$(CXX_C) $(CFLAGS) ../../../../C/7zCrc.c