Update LZMA SDK to 18.05.

Downloaded from https://www.7-zip.org/a/lzma1805.7z

Test: mma
Change-Id: I95bf31512854191c040e94cc677794f9abc4c46a

1 files changed, 62 insertions, 57 deletions

diff --git a/CPP/7zip/UI/Console/Main.cpp b/CPP/7zip/UI/Console/Main.cpp
index f54e9c3..8f2825c 100644
--- a/CPP/7zip/UI/Console/Main.cpp
+++ b/CPP/7zip/UI/Console/Main.cpp
@@ -10,10 +10,6 @@
 

 #include "../../../../C/CpuArch.h"

 

-#if defined( _7ZIP_LARGE_PAGES)

-#include "../../../../C/Alloc.h"

-#endif

-

 #include "../../../Common/MyInitGuid.h"

 

 #include "../../../Common/CommandLineParser.h"

@@ -25,10 +21,6 @@
 

 #include "../../../Windows/ErrorMsg.h"

 

-#ifdef _WIN32

-#include "../../../Windows/MemoryLock.h"

-#endif

-

 #include "../../../Windows/TimeUtils.h"

 

 #include "../Common/ArchiveCommandLine.h"

@@ -64,6 +56,8 @@ using namespace NCommandLineParser;
 HINSTANCE g_hInstance = 0;

 #endif

 

+extern bool g_LargePagesMode;

+

 extern CStdOutStream *g_StdStream;

 extern CStdOutStream *g_ErrStream;

 

@@ -73,24 +67,19 @@ extern const CCodecInfo *g_Codecs[];
 extern unsigned g_NumHashers;

 extern const CHasherInfo *g_Hashers[];

 

-static const char *kCopyrightString = "\n7-Zip"

-#ifndef EXTERNAL_CODECS

-#ifdef PROG_VARIANT_R

-" (r)"

-#else

-" (a)"

-#endif

-#endif

-

-#ifdef MY_CPU_64BIT

-" [64]"

-#elif defined MY_CPU_32BIT

-" [32]"

-#endif

+static const char * const kCopyrightString = "\n7-Zip"

+  #ifndef EXTERNAL_CODECS

+    #ifdef PROG_VARIANT_R

+      " (r)"

+    #else

+      " (a)"

+    #endif

+  #endif

 

-" " MY_VERSION_COPYRIGHT_DATE "\n\n";

+  " " MY_VERSION_CPU

+  " : " MY_COPYRIGHT_DATE "\n\n";

 

-static const char *kHelpString =

+static const char * const kHelpString =

     "Usage: 7z"

 #ifndef EXTERNAL_CODECS

 #ifdef PROG_VARIANT_R

@@ -100,7 +89,6 @@ static const char *kHelpString =
 #endif

 #endif

     " <command> [<switches>...] <archive_name> [<file_names>...]\n"

-    "       [<@listfiles...>]\n"

     "\n"

     "<Commands>\n"

     "  a : Add files to archive\n"

@@ -117,6 +105,7 @@ static const char *kHelpString =
     "\n"

     "<Switches>\n"

     "  -- : Stop switches parsing\n"

+    "  @listfile : set path to listfile that contains file names\n"

     "  -ai[r[-|0]]{@listfile|!wildcard} : Include archives\n"

     "  -ax[r[-|0]]{@listfile|!wildcard} : eXclude archives\n"

     "  -ao{a|s|t|u} : set Overwrite mode\n"

@@ -128,6 +117,7 @@ static const char *kHelpString =
     "  -i[r[-|0]]{@listfile|!wildcard} : Include filenames\n"

     "  -m{Parameters} : set compression Method\n"

     "    -mmt[N] : set number of CPU threads\n"

+    "    -mx[N] : set compression level: -mx1 (fastest) ... -mx9 (ultra)\n"

     "  -o{Directory} : set Output directory\n"

     #ifndef _NO_CRYPTO

     "  -p{Password} : set Password\n"

@@ -152,6 +142,7 @@ static const char *kHelpString =
     "  -spe : eliminate duplication of root folder for extract command\n"

     "  -spf : use fully qualified file paths\n"

     "  -ssc[-] : set sensitive case mode\n"

+    "  -sse : stop archive creating, if it can't open some input file\n"

     "  -ssw : compress shared files\n"

     "  -stl : set archive timestamp from the most recently modified file\n"

     "  -stm{HexMask} : set CPU thread affinity mask (hexadecimal number)\n"

@@ -166,13 +157,13 @@ static const char *kHelpString =
 // ---------------------------

 // exception messages

 

-static const char *kEverythingIsOk = "Everything is Ok";

-static const char *kUserErrorMessage = "Incorrect command line";

-static const char *kNoFormats = "7-Zip cannot find the code that works with archives.";

-static const char *kUnsupportedArcTypeMessage = "Unsupported archive type";

-// static const char *kUnsupportedUpdateArcType = "Can't create archive for that type";

+static const char * const kEverythingIsOk = "Everything is Ok";

+static const char * const kUserErrorMessage = "Incorrect command line";

+static const char * const kNoFormats = "7-Zip cannot find the code that works with archives.";

+static const char * const kUnsupportedArcTypeMessage = "Unsupported archive type";

+// static const char * const kUnsupportedUpdateArcType = "Can't create archive for that type";

 

-static CFSTR kDefaultSfxModule = FTEXT("7zCon.sfx");

+#define kDefaultSfxModule "7zCon.sfx"

 

 static void ShowMessageAndThrowException(LPCSTR message, NExitCode::EEnum code)

 {

@@ -204,9 +195,9 @@ static void ShowCopyrightAndHelp(CStdOutStream *so, bool needHelp)
 }

 

 

-static void PrintStringRight(CStdOutStream &so, const AString &s, unsigned size)

+static void PrintStringRight(CStdOutStream &so, const char *s, unsigned size)

 {

-  unsigned len = s.Len();

+  unsigned len = MyStringLen(s);

   for (unsigned i = len; i < size; i++)

     so << ' ';

   so << s;

@@ -245,7 +236,8 @@ static void PrintWarningsPaths(const CErrorPathCodes &pc, CStdOutStream &so)
 {

   FOR_VECTOR(i, pc.Paths)

   {

-    so << pc.Paths[i] << " : ";

+    so.NormalizePrint_UString(pc.Paths[i]);

+    so << " : ";

     so << NError::MyFormatMessage(pc.Codes[i]) << endl;

   }

   so << "----------------" << endl;

@@ -279,7 +271,7 @@ static int WarningsCheck(HRESULT result, const CCallbackConsoleBase &callback,
       UString message;

       if (!errorInfo.Message.IsEmpty())

       {

-        message.AddAscii(errorInfo.Message);

+        message += errorInfo.Message.Ptr();

         message.Add_LF();

       }

       {

@@ -384,11 +376,14 @@ static void PrintMemUsage(const char *s, UInt64 val)
   *g_StdStream << "    " << s << " Memory =";

   PrintNum(SHIFT_SIZE_VALUE(val, 20), 7);

   *g_StdStream << " MB";

+  if (g_LargePagesMode)

+    *g_StdStream << " (LP)";

 }

 

 EXTERN_C_BEGIN

 typedef BOOL (WINAPI *Func_GetProcessMemoryInfo)(HANDLE Process,

     PPROCESS_MEMORY_COUNTERS ppsmemCounters, DWORD cb);

+typedef BOOL (WINAPI *Func_QueryProcessCycleTime)(HANDLE Process, PULONG64 CycleTime);

 EXTERN_C_END

 

 #endif

@@ -415,6 +410,8 @@ static void PrintStat()
   PROCESS_MEMORY_COUNTERS m;

   memset(&m, 0, sizeof(m));

   BOOL memDefined = FALSE;

+  BOOL cycleDefined = FALSE;

+  ULONG64 cycleTime = 0;

   {

     /* NT 4.0: GetProcessMemoryInfo() in Psapi.dll

        Win7: new function K32GetProcessMemoryInfo() in kernel32.dll

@@ -425,8 +422,9 @@ static void PrintStat()
        // memDefined = GetProcessMemoryInfo(GetCurrentProcess(), &m, sizeof(m));

     */

 

+    HMODULE kern = ::GetModuleHandleW(L"kernel32.dll");

     Func_GetProcessMemoryInfo my_GetProcessMemoryInfo = (Func_GetProcessMemoryInfo)

-        ::GetProcAddress(::GetModuleHandleW(L"kernel32.dll"), "K32GetProcessMemoryInfo");

+        ::GetProcAddress(kern, "K32GetProcessMemoryInfo");

     if (!my_GetProcessMemoryInfo)

     {

       HMODULE lib = LoadLibraryW(L"Psapi.dll");

@@ -436,6 +434,11 @@ static void PrintStat()
     if (my_GetProcessMemoryInfo)

       memDefined = my_GetProcessMemoryInfo(GetCurrentProcess(), &m, sizeof(m));

     // FreeLibrary(lib);

+

+    Func_QueryProcessCycleTime my_QueryProcessCycleTime = (Func_QueryProcessCycleTime)

+        ::GetProcAddress(kern, "QueryProcessCycleTime");

+    if (my_QueryProcessCycleTime)

+      cycleDefined = my_QueryProcessCycleTime(GetCurrentProcess(), &cycleTime);

   }

 

   #endif

@@ -448,6 +451,16 @@ static void PrintStat()
   UInt64 totalTime = curTime - creationTime;

   

   PrintTime("Kernel ", kernelTime, totalTime);

+

+  #ifndef UNDER_CE

+  if (cycleDefined)

+  {

+    *g_StdStream << " ";

+    PrintNum(cycleTime / 1000000, 22);

+    *g_StdStream << " MCycles";

+  }

+  #endif

+

   PrintTime("User   ", userTime, totalTime);

   

   PrintTime("Process", kernelTime + userTime, totalTime);

@@ -470,6 +483,7 @@ static void PrintHexId(CStdOutStream &so, UInt64 id)
   PrintStringRight(so, s, 8);

 }

 

+

 int Main2(

   #ifndef _WIN32

   int numArgs, char *args[]

@@ -488,20 +502,25 @@ int Main2(
   GetArguments(numArgs, args, commandStrings);

   #endif

 

-  if (commandStrings.Size() == 1)

+  #ifndef UNDER_CE

+  if (commandStrings.Size() > 0)

+    commandStrings.Delete(0);

+  #endif

+

+  if (commandStrings.Size() == 0)

   {

     ShowCopyrightAndHelp(g_StdStream, true);

     return 0;

   }

 

-  commandStrings.Delete(0);

-

   CArcCmdLineOptions options;

 

   CArcCmdLineParser parser;

 

   parser.Parse1(commandStrings, options);

 

+  g_StdOut.IsTerminalMode = options.IsStdOutTerminal;

+  g_StdErr.IsTerminalMode = options.IsStdErrTerminal;

 

   if (options.Number_for_Out != k_OutStream_stdout)

     g_StdStream = (options.Number_for_Out == k_OutStream_stderr ? &g_StdErr : NULL);

@@ -519,20 +538,6 @@ int Main2(
     return 0;

   }

 

-  #if defined(_WIN32) && !defined(UNDER_CE)

-  NSecurity::EnablePrivilege_SymLink();

-  #endif

-  

-  #ifdef _7ZIP_LARGE_PAGES

-  if (options.LargePages)

-  {

-    SetLargePageSize();

-    #if defined(_WIN32) && !defined(UNDER_CE)

-    NSecurity::EnablePrivilege_LockMemory();

-    #endif

-  }

-  #endif

-

   if (options.EnableHeaders)

     ShowCopyrightAndHelp(g_StdStream, false);

 

@@ -579,7 +584,7 @@ int Main2(
     #ifdef EXTERNAL_CODECS

     if (!codecs->MainDll_ErrorPath.IsEmpty())

     {

-      UString s = L"Can't load module ";

+      UString s ("Can't load module: ");

       s += fs2us(codecs->MainDll_ErrorPath);

       throw s;

     }

@@ -639,7 +644,7 @@ int Main2(
 

     so << endl << "Formats:" << endl;

     

-    const char *kArcFlags = "KSNFMGOPBELH";

+    const char * const kArcFlags = "KSNFMGOPBELH";

     const unsigned kNumArcFlags = (unsigned)strlen(kArcFlags);

     

     for (i = 0; i < codecs->Formats.Size(); i++)

@@ -673,9 +678,9 @@ int Main2(
         s += ext.Ext;

         if (!ext.AddExt.IsEmpty())

         {

-          s += L" (";

+          s += " (";

           s += ext.AddExt;

-          s += L')';

+          s += ')';

         }

       }