Update LZMA SDK to 18.05.

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

Test: mma
Change-Id: I95bf31512854191c040e94cc677794f9abc4c46a

13 files changed, 398 insertions, 196 deletions

diff --git a/CPP/7zip/UI/Console/Console.manifest b/CPP/7zip/UI/Console/Console.manifest
new file mode 100644
index 0000000..77ecaad
--- /dev/null
+++ b/CPP/7zip/UI/Console/Console.manifest
@@ -0,0 +1,13 @@
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">

+<assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="7z" type="win32"></assemblyIdentity>

+<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">

+<security><requestedPrivileges><requestedExecutionLevel level="asInvoker" uiAccess="false">

+</requestedExecutionLevel></requestedPrivileges></security></trustInfo>

+<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"><application>

+<!-- Vista   --> <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/>

+<!-- Win 7   --> <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>

+<!-- Win 8   --> <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>

+<!-- Win 8.1 --> <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>

+<!-- Win 10  --> <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>

+</application></compatibility>

+</assembly>
\ No newline at end of file
diff --git a/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp b/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp
index cc82770..bdf9549 100644
--- a/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp
+++ b/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp
@@ -32,7 +32,7 @@ static HRESULT CheckBreak2()
   return NConsoleClose::TestBreakSignal() ? E_ABORT : S_OK;

 }

 

-static const char *kError = "ERROR: ";

+static const char * const kError = "ERROR: ";

 

 

 void CExtractScanConsole::StartScanning()

@@ -60,8 +60,9 @@ HRESULT CExtractScanConsole::ScanError(const FString &path, DWORD systemError)
   

   if (_se)

   {

-    *_se << endl << kError << NError::MyFormatMessage(systemError) << endl <<

-        fs2us(path) << endl << endl;

+    *_se << endl << kError << NError::MyFormatMessage(systemError) << endl;

+    _se->NormalizePrint_UString(fs2us(path));

+    *_se << endl << endl;

     _se->Flush();

   }

   return HRESULT_FROM_WIN32(systemError);

@@ -95,6 +96,16 @@ void PrintSize_bytes_Smart(AString &s, UInt64 val)
   s += ')';

 }

 

+void PrintSize_bytes_Smart_comma(AString &s, UInt64 val)

+{

+  if (val == (UInt64)(Int64)-1)

+    return;

+  s += ", ";

+  PrintSize_bytes_Smart(s, val);

+}

+

+

+

 void Print_DirItemsStat(AString &s, const CDirItemsStat &st)

 {

   if (st.NumDirs != 0)

@@ -103,17 +114,48 @@ void Print_DirItemsStat(AString &s, const CDirItemsStat &st)
     s += ", ";

   }

   Print_UInt64_and_String(s, st.NumFiles, st.NumFiles == 1 ? "file" : "files");

-  s += ", ";

-  PrintSize_bytes_Smart(s, st.FilesSize);

+  PrintSize_bytes_Smart_comma(s, st.FilesSize);

   if (st.NumAltStreams != 0)

   {

     s.Add_LF();

     Print_UInt64_and_String(s, st.NumAltStreams, "alternate streams");

-    s += ", ";

-    PrintSize_bytes_Smart(s, st.AltStreamsSize);

+    PrintSize_bytes_Smart_comma(s, st.AltStreamsSize);

   }

 }

 

+

+void Print_DirItemsStat2(AString &s, const CDirItemsStat2 &st)

+{

+  Print_DirItemsStat(s, (CDirItemsStat &)st);

+  bool needLF = true;

+  if (st.Anti_NumDirs != 0)

+  {

+    if (needLF)

+      s.Add_LF();

+    needLF = false;

+    Print_UInt64_and_String(s, st.Anti_NumDirs, st.Anti_NumDirs == 1 ? "anti-folder" : "anti-folders");

+  }

+  if (st.Anti_NumFiles != 0)

+  {

+    if (needLF)

+      s.Add_LF();

+    else

+      s += ", ";

+    needLF = false;

+    Print_UInt64_and_String(s, st.Anti_NumFiles, st.Anti_NumFiles == 1 ? "anti-file" : "anti-files");

+  }

+  if (st.Anti_NumAltStreams != 0)

+  {

+    if (needLF)

+      s.Add_LF();

+    else

+      s += ", ";

+    needLF = false;

+    Print_UInt64_and_String(s, st.Anti_NumAltStreams, "anti-alternate-streams");

+  }

+}

+

+

 void CExtractScanConsole::PrintStat(const CDirItemsStat &st)

 {

   if (_so)

@@ -138,33 +180,33 @@ static NSynchronization::CCriticalSection g_CriticalSection;
 #endif

 

 

-static const char *kTestString    =  "T";

-static const char *kExtractString =  "-";

-static const char *kSkipString    =  ".";

+static const char * const kTestString    =  "T";

+static const char * const kExtractString =  "-";

+static const char * const kSkipString    =  ".";

 

-// static const char *kCantAutoRename = "can not create file with auto name\n";

-// static const char *kCantRenameFile = "can not rename existing file\n";

-// static const char *kCantDeleteOutputFile = "can not delete output file ";

+// static const char * const kCantAutoRename = "can not create file with auto name\n";

+// static const char * const kCantRenameFile = "can not rename existing file\n";

+// static const char * const kCantDeleteOutputFile = "can not delete output file ";

 

-static const char *kMemoryExceptionMessage = "Can't allocate required memory!";

+static const char * const kMemoryExceptionMessage = "Can't allocate required memory!";

 

-static const char *kExtracting = "Extracting archive: ";

-static const char *kTesting = "Testing archive: ";

+static const char * const kExtracting = "Extracting archive: ";

+static const char * const kTesting = "Testing archive: ";

 

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

-static const char *kNoFiles = "No files to process";

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

+static const char * const kNoFiles = "No files to process";

 

-static const char *kUnsupportedMethod = "Unsupported Method";

-static const char *kCrcFailed = "CRC Failed";

-static const char *kCrcFailedEncrypted = "CRC Failed in encrypted file. Wrong password?";

-static const char *kDataError = "Data Error";

-static const char *kDataErrorEncrypted = "Data Error in encrypted file. Wrong password?";

-static const char *kUnavailableData = "Unavailable data";

-static const char *kUnexpectedEnd = "Unexpected end of data";

-static const char *kDataAfterEnd = "There are some data after the end of the payload data";

-static const char *kIsNotArc = "Is not archive";

-static const char *kHeadersError = "Headers Error";

-static const char *kWrongPassword = "Wrong password";

+static const char * const kUnsupportedMethod = "Unsupported Method";

+static const char * const kCrcFailed = "CRC Failed";

+static const char * const kCrcFailedEncrypted = "CRC Failed in encrypted file. Wrong password?";

+static const char * const kDataError = "Data Error";

+static const char * const kDataErrorEncrypted = "Data Error in encrypted file. Wrong password?";

+static const char * const kUnavailableData = "Unavailable data";

+static const char * const kUnexpectedEnd = "Unexpected end of data";

+static const char * const kDataAfterEnd = "There are some data after the end of the payload data";

+static const char * const kIsNotArc = "Is not archive";

+static const char * const kHeadersError = "Headers Error";

+static const char * const kWrongPassword = "Wrong password";

 

 static const char * const k_ErrorFlagsMessages[] =

 {

@@ -206,12 +248,14 @@ STDMETHODIMP CExtractCallbackConsole::SetCompleted(const UInt64 *completeValue)
   return CheckBreak2();

 }

 

-static const char *kTab = "  ";

+static const char * const kTab = "  ";

 

 static void PrintFileInfo(CStdOutStream *_so, const wchar_t *path, const FILETIME *ft, const UInt64 *size)

 {

-  *_so << kTab << "Path:     " << path << endl;

-  if (size)

+  *_so << kTab << "Path:     ";

+  _so->NormalizePrint_wstr(path);

+  *_so << endl;

+  if (size && *size != (UInt64)(Int64)-1)

   {

     AString s;

     PrintSize_bytes_Smart(s, *size);

@@ -220,10 +264,8 @@ static void PrintFileInfo(CStdOutStream *_so, const wchar_t *path, const FILETIM
   if (ft)

   {

     char temp[64];

-    FILETIME locTime;

-    if (FileTimeToLocalFileTime(ft, &locTime))

-      if (ConvertFileTimeToString(locTime, temp, true, true))

-        *_so << kTab << "Modified: " << temp << endl;

+    if (ConvertUtcFileTimeToString(*ft, temp, kTimestampPrintLevel_SEC))

+      *_so << kTab << "Modified: " << temp << endl;

   }

 }

 

@@ -256,6 +298,8 @@ STDMETHODIMP CExtractCallbackConsole::AskOverwrite(
     case NUserAnswerMode::kYesAll: *answer = NOverwriteAnswer::kYesToAll; break;

     case NUserAnswerMode::kYes:    *answer = NOverwriteAnswer::kYes; break;

     case NUserAnswerMode::kAutoRenameAll: *answer = NOverwriteAnswer::kAutoRename; break;

+    case NUserAnswerMode::kEof:  return E_ABORT;

+    case NUserAnswerMode::kError:  return E_FAIL;

     default: return E_FAIL;

   }

   

@@ -299,7 +343,10 @@ STDMETHODIMP CExtractCallbackConsole::PrepareOperation(const wchar_t *name, Int3
 

     _tempU.Empty();

     if (name)

+    {

       _tempU = name;

+      _so->Normalize_UString(_tempU);

+    }

     _so->PrintUString(_tempU, _tempA);

     if (position)

       *_so << " <" << *position << ">";

@@ -388,10 +435,8 @@ void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, AString &dest)
       dest += s;

     else

     {

-      char temp[16];

-      ConvertUInt32ToString(opRes, temp);

       dest += "Error #";

-      dest += temp;

+      dest.Add_UInt32(opRes);

     }

 }

 

@@ -422,7 +467,10 @@ STDMETHODIMP CExtractCallbackConsole::SetOperationResult(Int32 opRes, Int32 encr
       

       *_se << s;

       if (!_currentName.IsEmpty())

-        *_se << " : " << _currentName;

+      {

+        *_se << " : ";

+        _se->NormalizePrint_UString(_currentName);

+      }

       *_se << endl;

       _se->Flush();

     }

@@ -474,7 +522,11 @@ HRESULT CExtractCallbackConsole::BeforeOpen(const wchar_t *name, bool testMode)
   

   ClosePercents_for_so();

   if (_so)

-    *_so << endl << (testMode ? kTesting : kExtracting) << name << endl;

+  {

+    *_so << endl << (testMode ? kTesting : kExtracting);

+    _so->NormalizePrint_wstr(name);

+    *_so << endl;

+  }

 

   if (NeedPercents())

     _percent.Command = "Open";

@@ -524,22 +576,23 @@ void PrintErrorFlags(CStdOutStream &so, const char *s, UInt32 errorFlags)
 void Add_Messsage_Pre_ArcType(UString &s, const char *pre, const wchar_t *arcType)

 {

   s.Add_LF();

-  s.AddAscii(pre);

-  s.AddAscii(" as [");

+  s += pre;

+  s += " as [";

   s += arcType;

-  s.AddAscii("] archive");

+  s += "] archive";

 }

 

 void Print_ErrorFormatIndex_Warning(CStdOutStream *_so, const CCodecs *codecs, const CArc &arc)

 {

   const CArcErrorInfo &er = arc.ErrorInfo;

   

-  UString s = L"WARNING:\n";

-  s += arc.Path;

+  *_so << "WARNING:\n";

+  _so->NormalizePrint_UString(arc.Path);

+  UString s;

   if (arc.FormatIndex == er.ErrorFormatIndex)

   {

     s.Add_LF();

-    s.AddAscii("The archive is open with offset");

+    s += "The archive is open with offset";

   }

   else

   {

@@ -580,7 +633,10 @@ HRESULT CExtractCallbackConsole::OpenResult(
       {

         *_se << endl;

         if (level != 0)

-          *_se << arc.Path << endl;

+        {

+          _se->NormalizePrint_UString(arc.Path);

+          *_se << endl;

+        }

       }

       

       if (errorFlags != 0)

@@ -614,7 +670,10 @@ HRESULT CExtractCallbackConsole::OpenResult(
       {

         *_so << endl;

         if (level != 0)

-          *_so << arc.Path << endl;

+        {

+          _so->NormalizePrint_UString(arc.Path);

+          *_so << endl;

+        }

       }

       

       if (warningFlags != 0)

@@ -669,7 +728,9 @@ HRESULT CExtractCallbackConsole::OpenResult(
       _so->Flush();

     if (_se)

     {

-      *_se << kError << name << endl;

+      *_se << kError;

+      _se->NormalizePrint_wstr(name);

+      *_se << endl;

       HRESULT res = Print_OpenArchive_Error(*_se, codecs, arcLink);

       RINOK(res);

       if (result == S_FALSE)

diff --git a/CPP/7zip/UI/Console/HashCon.cpp b/CPP/7zip/UI/Console/HashCon.cpp
index 863c5e5..ec8e6dc 100644
--- a/CPP/7zip/UI/Console/HashCon.cpp
+++ b/CPP/7zip/UI/Console/HashCon.cpp
@@ -7,9 +7,9 @@
 #include "ConsoleClose.h"

 #include "HashCon.h"

 

-static const wchar_t *kEmptyFileAlias = L"[Content]";

+static const char * const kEmptyFileAlias = "[Content]";

 

-static const char *kScanningMessage = "Scanning";

+static const char * const kScanningMessage = "Scanning";

 

 static HRESULT CheckBreak2()

 {

@@ -168,7 +168,7 @@ HRESULT CHashCallbackConsole::BeforeFirstFile(const CHashBundle &hb)
     if (PrintSize)

     {

       _s.Add_Space();

-      const AString s2 = "Size";

+      const AString s2 ("Size");

       AddSpaces_if_Positive(_s, (int)kSizeField_Len - (int)s2.Len());

       _s += s2;

     }

@@ -269,7 +269,7 @@ HRESULT CHashCallbackConsole::SetOperationResult(UInt64 fileSize, const CHashBun
       if (_fileName.IsEmpty())

         *_so << kEmptyFileAlias;

       else

-        *_so << _fileName;

+        _so->NormalizePrint_UString(_fileName);

     }

     *_so << endl;

   }

diff --git a/CPP/7zip/UI/Console/List.cpp b/CPP/7zip/UI/Console/List.cpp
index 77168c9..ebcabb6 100644
--- a/CPP/7zip/UI/Console/List.cpp
+++ b/CPP/7zip/UI/Console/List.cpp
@@ -128,14 +128,14 @@ static const char * const kPropIdToName[] =
 

 static const char kEmptyAttribChar = '.';

 

-static const char *kListing = "Listing archive: ";

+static const char * const kListing = "Listing archive: ";

 

-static const char *kString_Files = "files";

-static const char *kString_Dirs = "folders";

-static const char *kString_AltStreams = "alternate streams";

-static const char *kString_Streams = "streams";

+static const char * const kString_Files = "files";

+static const char * const kString_Dirs = "folders";

+static const char * const kString_AltStreams = "alternate streams";

+static const char * const kString_Streams = "streams";

 

-static const char *kError = "ERROR: ";

+static const char * const kError = "ERROR: ";

 

 static void GetAttribString(UInt32 wa, bool isDir, bool allAttribs, char *s)

 {

@@ -417,9 +417,8 @@ static void GetPropName(PROPID propID, const wchar_t *name, AString &nameA, UStr
     nameU = name;

   else

   {

-    char s[16];

-    ConvertUInt32ToString(propID, s);

-    nameA = s;

+    nameA.Empty();

+    nameA.Add_UInt32(propID);

   }

 }

 

@@ -429,7 +428,7 @@ void CFieldPrinter::AddProp(const wchar_t *name, PROPID propID, bool isRawProp)
   f.PropID = propID;

   f.IsRawProp = isRawProp;

   GetPropName(propID, name, f.NameA, f.NameU);

-  f.NameU.AddAscii(" = ");

+  f.NameU += " = ";

   if (!f.NameA.IsEmpty())

     f.NameA += " = ";

   else

@@ -499,10 +498,7 @@ static void PrintTime(char *dest, const FILETIME *ft)
   *dest = 0;

   if (ft->dwLowDateTime == 0 && ft->dwHighDateTime == 0)

     return;

-  FILETIME locTime;

-  if (!FileTimeToLocalFileTime(ft, &locTime))

-    throw 20121211;

-  ConvertFileTimeToString(locTime, dest, true, true);

+  ConvertUtcFileTimeToString(*ft, dest, kTimestampPrintLevel_SEC);

 }

 

 #ifndef _SFX

@@ -564,7 +560,7 @@ HRESULT CFieldPrinter::PrintItemInfo(UInt32 index, const CListStat &st)
     {

       if (!techMode)

         g_StdOut << temp;

-      g_StdOut.PrintUString(FilePath, TempAString);

+      g_StdOut.NormalizePrint_UString(FilePath, TempWString, TempAString);

       if (techMode)

         g_StdOut << MY_ENDL;

       continue;

@@ -675,9 +671,10 @@ HRESULT CFieldPrinter::PrintItemInfo(UInt32 index, const CListStat &st)
       else if (prop.vt == VT_BSTR)

       {

         TempWString.SetFromBstr(prop.bstrVal);

+        // do we need multi-line support here ?

+        g_StdOut.Normalize_UString(TempWString);

         if (techMode)

         {

-          // replace CR/LF here.

           g_StdOut.PrintUString(TempWString, TempAString);

         }

         else

@@ -686,7 +683,7 @@ HRESULT CFieldPrinter::PrintItemInfo(UInt32 index, const CListStat &st)
       else

       {

         char s[64];

-        ConvertPropertyToShortString(s, prop, f.PropID);

+        ConvertPropertyToShortString2(s, prop, f.PropID);

         if (techMode)

           g_StdOut << s;

         else

@@ -819,25 +816,81 @@ static void PrintPropNameAndNumber_Signed(CStdOutStream &so, PROPID propID, Int6
   so << val << endl;

 }

 

-static void PrintPropPair(CStdOutStream &so, const char *name, const wchar_t *val)

+

+static void UString_Replace_CRLF_to_LF(UString &s)

+{

+  // s.Replace(L"\r\n", L"\n");

+  wchar_t *src = s.GetBuf();

+  wchar_t *dest = src;

+  for (;;)

+  {

+    wchar_t c = *src++;

+    if (c == 0)

+      break;

+    if (c == '\r' && *src == '\n')

+    {

+      src++;

+      c = '\n';

+    }

+    *dest++ = c;

+  }

+  s.ReleaseBuf_SetEnd((unsigned)(dest - s.GetBuf()));

+}

+

+

+static void PrintPropVal_MultiLine(CStdOutStream &so, const wchar_t *val)

 {

-  so << name << " = " << val << endl;

+  UString s = val;

+  if (s.Find(L'\n') >= 0)

+  {

+    so << endl;

+    so << "{";

+    so << endl;

+    UString_Replace_CRLF_to_LF(s);

+    so.Normalize_UString__LF_Allowed(s);

+    so << s;

+    so << endl;

+    so << "}";

+  }

+  else

+  {

+    so.Normalize_UString(s);

+    so << s;

+  }

+  so << endl;

+}

+

+

+static void PrintPropPair(CStdOutStream &so, const char *name, const wchar_t *val, bool multiLine)

+{

+  so << name << " = ";

+  if (multiLine)

+  {

+    PrintPropVal_MultiLine(so, val);

+    return;

+  }

+  UString s = val;

+  so.Normalize_UString(s);

+  so << s;

+  so << endl;

 }

 

 

 static void PrintPropertyPair2(CStdOutStream &so, PROPID propID, const wchar_t *name, const CPropVariant &prop)

 {

   UString s;

-  ConvertPropertyToString(s, prop, propID);

+  ConvertPropertyToString2(s, prop, propID);

   if (!s.IsEmpty())

   {

     AString nameA;

     UString nameU;

     GetPropName(propID, name, nameA, nameU);

     if (!nameA.IsEmpty())

-      PrintPropPair(so, nameA, s);

+      so << nameA;

     else

-      so << nameU << " = " << s << endl;

+      so << nameU;

+    so << " = ";

+    PrintPropVal_MultiLine(so, s);

   }

 }

 

@@ -866,11 +919,11 @@ static void ErrorInfo_Print(CStdOutStream &so, const CArcErrorInfo &er)
 {

   PrintErrorFlags(so, "ERRORS:", er.GetErrorFlags());

   if (!er.ErrorMessage.IsEmpty())

-    PrintPropPair(so, "ERROR", er.ErrorMessage);

+    PrintPropPair(so, "ERROR", er.ErrorMessage, true);

   

   PrintErrorFlags(so, "WARNINGS:", er.GetWarningFlags());

   if (!er.WarningMessage.IsEmpty())

-    PrintPropPair(so, "WARNING", er.WarningMessage);

+    PrintPropPair(so, "WARNING", er.WarningMessage, true);

 }

 

 HRESULT Print_OpenArchive_Props(CStdOutStream &so, const CCodecs *codecs, const CArchiveLink &arcLink)

@@ -881,7 +934,7 @@ HRESULT Print_OpenArchive_Props(CStdOutStream &so, const CCodecs *codecs, const
     const CArcErrorInfo &er = arc.ErrorInfo;

     

     so << "--\n";

-    PrintPropPair(so, "Path", arc.Path);

+    PrintPropPair(so, "Path", arc.Path, false);

     if (er.ErrorFormatIndex >= 0)

     {

       if (er.ErrorFormatIndex == arc.FormatIndex)

@@ -889,7 +942,7 @@ HRESULT Print_OpenArchive_Props(CStdOutStream &so, const CCodecs *codecs, const
       else

         PrintArcTypeError(so, codecs->GetFormatNamePtr(er.ErrorFormatIndex), true);

     }

-    PrintPropPair(so, "Type", codecs->GetFormatNamePtr(arc.FormatIndex));

+    PrintPropPair(so, "Type", codecs->GetFormatNamePtr(arc.FormatIndex), false);

     

     ErrorInfo_Print(so, er);

     

@@ -947,7 +1000,8 @@ HRESULT Print_OpenArchive_Error(CStdOutStream &so, const CCodecs *codecs, const
   {

     if (arcLink.NonOpen_ErrorInfo.ErrorFormatIndex >= 0)

     {

-      so << arcLink.NonOpen_ArcPath << endl;

+      so.NormalizePrint_UString(arcLink.NonOpen_ArcPath);

+      so << endl;

       PrintArcTypeError(so, codecs->Formats[arcLink.NonOpen_ErrorInfo.ErrorFormatIndex].Name, false);

     }

     else

@@ -1018,15 +1072,18 @@ HRESULT ListArchives(CCodecs *codecs,
           errorCode = ERROR_FILE_NOT_FOUND;

         lastError = HRESULT_FROM_WIN32(lastError);;

         g_StdOut.Flush();

-        *g_ErrStream << endl << kError << NError::MyFormatMessage(errorCode) <<

-              endl << arcPath << endl << endl;

+        *g_ErrStream << endl << kError << NError::MyFormatMessage(errorCode) << endl;

+        g_ErrStream->NormalizePrint_UString(arcPath);

+        *g_ErrStream << endl << endl;

         numErrors++;

         continue;

       }

       if (fi.IsDir())

       {

         g_StdOut.Flush();

-        *g_ErrStream << endl << kError << arcPath << " is not a file" << endl << endl;

+        *g_ErrStream << endl << kError;

+        g_ErrStream->NormalizePrint_UString(arcPath);

+        *g_ErrStream << " is not a file" << endl << endl;

         numErrors++;

         continue;

       }

@@ -1065,7 +1122,9 @@ HRESULT ListArchives(CCodecs *codecs,
 

     if (enableHeaders)

     {

-      g_StdOut << endl << kListing << arcPath << endl << endl;

+      g_StdOut << endl << kListing;

+      g_StdOut.NormalizePrint_UString(arcPath);

+      g_StdOut << endl << endl;

     }

     

     HRESULT result = arcLink.Open_Strict(options, &openCallback);

@@ -1075,7 +1134,9 @@ HRESULT ListArchives(CCodecs *codecs,
       if (result == E_ABORT)

         return result;

       g_StdOut.Flush();

-      *g_ErrStream << endl << kError << arcPath << " : ";

+      *g_ErrStream << endl << kError;

+      g_ErrStream->NormalizePrint_UString(arcPath);

+      *g_ErrStream << " : ";

       if (result == S_FALSE)

       {

         Print_OpenArchive_Error(*g_ErrStream, codecs, arcLink);

@@ -1259,7 +1320,7 @@ HRESULT ListArchives(CCodecs *codecs,
       if (arcLink.NonOpen_ErrorInfo.ErrorFormatIndex >= 0)

       {

         g_StdOut << "----------\n";

-        PrintPropPair(g_StdOut, "Path", arcLink.NonOpen_ArcPath);

+        PrintPropPair(g_StdOut, "Path", arcLink.NonOpen_ArcPath, false);

         PrintArcTypeError(g_StdOut, codecs->Formats[arcLink.NonOpen_ErrorInfo.ErrorFormatIndex].Name, false);

       }

     }

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 += ')';

         }

       }

       

diff --git a/CPP/7zip/UI/Console/MainAr.cpp b/CPP/7zip/UI/Console/MainAr.cpp
index 311c575..fdac643 100644
--- a/CPP/7zip/UI/Console/MainAr.cpp
+++ b/CPP/7zip/UI/Console/MainAr.cpp
@@ -24,12 +24,12 @@ extern int Main2(
   #endif

 );

 

-static const char *kException_CmdLine_Error_Message = "Command Line Error:";

-static const char *kExceptionErrorMessage = "ERROR:";

-static const char *kUserBreakMessage  = "Break signaled";

-static const char *kMemoryExceptionMessage = "ERROR: Can't allocate required memory!";

-static const char *kUnknownExceptionMessage = "Unknown Error";

-static const char *kInternalExceptionMessage = "\n\nInternal Error #";

+static const char * const kException_CmdLine_Error_Message = "Command Line Error:";

+static const char * const kExceptionErrorMessage = "ERROR:";

+static const char * const kUserBreakMessage  = "Break signaled";

+static const char * const kMemoryExceptionMessage = "ERROR: Can't allocate required memory!";

+static const char * const kUnknownExceptionMessage = "Unknown Error";

+static const char * const kInternalExceptionMessage = "\n\nInternal Error #";

 

 static void FlushStreams()

 {

@@ -79,7 +79,7 @@ int MY_CDECL main
     PrintError(kUserBreakMessage);

     return (NExitCode::kUserBreak);

   }

-  catch(const CArcCmdLineException &e)

+  catch(const CMessagePathException &e)

   {

     PrintError(kException_CmdLine_Error_Message);

     if (g_ErrStream)

diff --git a/CPP/7zip/UI/Console/OpenCallbackConsole.cpp b/CPP/7zip/UI/Console/OpenCallbackConsole.cpp
index f1a1688..6e58c1f 100644
--- a/CPP/7zip/UI/Console/OpenCallbackConsole.cpp
+++ b/CPP/7zip/UI/Console/OpenCallbackConsole.cpp
@@ -32,13 +32,17 @@ HRESULT COpenCallbackConsole::Open_SetTotal(const UInt64 *files, const UInt64 *b
 

     if (bytes)

     {

-      _totalBytesDefined = true;

-      // _totalBytes = *bytes;

+      // _totalBytesDefined = true;

+      _totalBytes = *bytes;

       if (!files)

         _percent.Total = *bytes;

     }

     else

-      _totalBytesDefined = false;

+    {

+      // _totalBytesDefined = false;

+      if (!files)

+        _percent.Total = _totalBytes;

+    }

   }

 

   return CheckBreak2();

@@ -83,7 +87,7 @@ HRESULT COpenCallbackConsole::Open_CryptoGetTextPassword(BSTR *password)
   if (!PasswordIsDefined)

   {

     ClosePercents();

-    Password = GetPassword(_so);

+    RINOK(GetPassword_HRESULT(_so, Password));

     PasswordIsDefined = true;

   }

   return StringToBstr(Password, password);

diff --git a/CPP/7zip/UI/Console/OpenCallbackConsole.h b/CPP/7zip/UI/Console/OpenCallbackConsole.h
index fd07b98..b9270f8 100644
--- a/CPP/7zip/UI/Console/OpenCallbackConsole.h
+++ b/CPP/7zip/UI/Console/OpenCallbackConsole.h
@@ -18,9 +18,9 @@ protected:
   CStdOutStream *_se;

 

   bool _totalFilesDefined;

-  bool _totalBytesDefined;

+  // bool _totalBytesDefined;

   // UInt64 _totalFiles;

-  // UInt64 _totalBytes;

+  UInt64 _totalBytes;

 

   bool NeedPercents() const { return _percent._so != NULL; }

 

@@ -36,7 +36,8 @@ public:
 

   COpenCallbackConsole():

       _totalFilesDefined(false),

-      _totalBytesDefined(false),

+      // _totalBytesDefined(false),

+      _totalBytes(0),

       MultiArcMode(false)

       

       #ifndef _NO_CRYPTO

diff --git a/CPP/7zip/UI/Console/PercentPrinter.cpp b/CPP/7zip/UI/Console/PercentPrinter.cpp
index f94d827..20249ed 100644
--- a/CPP/7zip/UI/Console/PercentPrinter.cpp
+++ b/CPP/7zip/UI/Console/PercentPrinter.cpp
@@ -141,8 +141,9 @@ void CPercentPrinter::Print()
   {

     _s += ' ';

 

-    StdOut_Convert_UString_to_AString(FileName, _temp);

-    _temp.Replace('\n', ' ');

+    _tempU = FileName;

+    _so->Normalize_UString(_tempU);

+    StdOut_Convert_UString_to_AString(_tempU, _temp);

     if (_s.Len() + _temp.Len() > MaxLen)

     {

       unsigned len = FileName.Len();

@@ -153,8 +154,9 @@ void CPercentPrinter::Print()
           delta = 1;

         len -= delta;

         _tempU = FileName;

-        _tempU.Delete(len / 2, FileName.Len() - len);

+        _tempU.Delete(len / 2, _tempU.Len() - len);

         _tempU.Insert(len / 2, L" . ");

+        _so->Normalize_UString(_tempU);

         StdOut_Convert_UString_to_AString(_tempU, _temp);

         if (_s.Len() + _temp.Len() <= MaxLen)

           break;

diff --git a/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp b/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp
index d43a490..46ffaba 100644
--- a/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp
+++ b/CPP/7zip/UI/Console/UpdateCallbackConsole.cpp
@@ -23,15 +23,15 @@ static NSynchronization::CCriticalSection g_CriticalSection;
 #define MT_LOCK

 #endif

 

-static const wchar_t *kEmptyFileAlias = L"[Content]";

+static const wchar_t * const kEmptyFileAlias = L"[Content]";

 

-static const char *kOpenArchiveMessage = "Open archive: ";

-static const char *kCreatingArchiveMessage = "Creating archive: ";

-static const char *kUpdatingArchiveMessage = "Updating archive: ";

-static const char *kScanningMessage = "Scanning the drive:";

+static const char * const kOpenArchiveMessage = "Open archive: ";

+static const char * const kCreatingArchiveMessage = "Creating archive: ";

+static const char * const kUpdatingArchiveMessage = "Updating archive: ";

+static const char * const kScanningMessage = "Scanning the drive:";

 

-static const char *kError = "ERROR: ";

-static const char *kWarning = "WARNING: ";

+static const char * const kError = "ERROR: ";

+static const char * const kWarning = "WARNING: ";

 

 static HRESULT CheckBreak2()

 {

@@ -143,7 +143,9 @@ HRESULT CUpdateCallbackConsole::OpenResult(
       _so->Flush();

     if (_se)

     {

-      *_se << kError << name << endl;

+      *_se << kError;

+      _se->NormalizePrint_wstr(name);

+      *_se << endl;

       HRESULT res = Print_OpenArchive_Error(*_se, codecs, arcLink);

       RINOK(res);

       _se->Flush();

@@ -185,7 +187,9 @@ void CCallbackConsoleBase::CommonError(const FString &path, DWORD systemError, b
 

     *_se << endl << (isWarning ? kWarning : kError)

         << NError::MyFormatMessage(systemError)

-        << endl << fs2us(path) << endl << endl;

+        << endl;

+    _se->NormalizePrint_UString(fs2us(path));

+    *_se << endl << endl;

     _se->Flush();

   }

 }

@@ -241,6 +245,7 @@ static void PrintPropPair(AString &s, const char *name, UInt64 val)
 

 void PrintSize_bytes_Smart(AString &s, UInt64 val);

 void Print_DirItemsStat(AString &s, const CDirItemsStat &st);

+void Print_DirItemsStat2(AString &s, const CDirItemsStat2 &st);

 

 HRESULT CUpdateCallbackConsole::FinishScanning(const CDirItemsStat &st)

 {

@@ -259,7 +264,7 @@ HRESULT CUpdateCallbackConsole::FinishScanning(const CDirItemsStat &st)
   return S_OK;

 }

 

-static const char *k_StdOut_ArcName = "StdOut";

+static const char * const k_StdOut_ArcName = "StdOut";

 

 HRESULT CUpdateCallbackConsole::StartOpenArchive(const wchar_t *name)

 {

@@ -280,8 +285,8 @@ HRESULT CUpdateCallbackConsole::StartArchive(const wchar_t *name, bool updating)
   if (_so)

   {

     *_so << (updating ? kUpdatingArchiveMessage : kCreatingArchiveMessage);

-    if (name != 0)

-      *_so << name;

+    if (name)

+      _so->NormalizePrint_wstr(name);

     else

       *_so << k_StdOut_ArcName;

    *_so << endl << endl;

@@ -316,7 +321,7 @@ HRESULT CUpdateCallbackConsole::WriteSfx(const wchar_t *name, UInt64 size)
   {

     *_so << "Write SFX: ";

     *_so << name;

-    AString s = " : ";

+    AString s (" : ");

     PrintSize_bytes_Smart(s, size);

     *_so << s << endl;

   }

@@ -342,6 +347,7 @@ HRESULT CUpdateCallbackConsole::DeletingAfterArchiving(const FString &path, bool
         _tempA.Add_Space();

         *_so << _tempA;

         _tempU = fs2us(path);

+        _so->Normalize_UString(_tempU);

         _so->PrintUString(_tempU, _tempA);

         *_so << endl;

         if (NeedFlush)

@@ -398,14 +404,31 @@ HRESULT CUpdateCallbackConsole::Finalize()
 }

 */

 

-HRESULT CUpdateCallbackConsole::SetNumItems(UInt64 numItems)

+

+void static PrintToDoStat(CStdOutStream *_so, const CDirItemsStat2 &stat, const char *name)

+{

+  AString s;

+  Print_DirItemsStat2(s, stat);

+  *_so << name << ": " << s << endl;

+}

+

+HRESULT CUpdateCallbackConsole::SetNumItems(const CArcToDoStat &stat)

 {

   if (_so)

   {

     ClosePercents_for_so();

-    AString s;

-    PrintPropPair(s, "Items to compress", numItems);

-    *_so << s << endl << endl;

+    if (!stat.DeleteData.IsEmpty())

+    {

+      *_so << endl;

+      PrintToDoStat(_so, stat.DeleteData, "Delete data from archive");

+    }

+    if (!stat.OldData.IsEmpty())

+      PrintToDoStat(_so, stat.OldData, "Keep old data in archive");

+    // if (!stat.NewData.IsEmpty())

+    {

+      PrintToDoStat(_so, stat.NewData, "Add new data to archive");

+    }

+    *_so << endl;

   }

   return S_OK;

 }

@@ -457,7 +480,10 @@ HRESULT CCallbackConsoleBase::PrintProgress(const wchar_t *name, const char *com
 

     _tempU.Empty();

     if (name)

+    {

       _tempU = name;

+      _so->Normalize_UString(_tempU);

+    }

     _so->PrintUString(_tempU, _tempA);

     *_so << endl;

     if (NeedFlush)

@@ -550,7 +576,9 @@ HRESULT CUpdateCallbackConsole::ReportExtractResult(Int32 opRes, Int32 isEncrypt
 

       AString s;

       SetExtractErrorMessage(opRes, isEncrypted, s);

-      *_se << s << " : " << endl << name << endl << endl;

+      *_se << s << " : " << endl;

+      _se->NormalizePrint_wstr(name);

+      *_se << endl << endl;

       _se->Flush();

     }

     return S_OK;

@@ -622,7 +650,7 @@ HRESULT CUpdateCallbackConsole::CryptoGetTextPassword2(Int32 *passwordIsDefined,
   {

     if (AskPassword)

     {

-      Password = GetPassword(_so);

+      RINOK(GetPassword_HRESULT(_so, Password));

       PasswordIsDefined = true;

     }

   }

@@ -649,7 +677,7 @@ HRESULT CUpdateCallbackConsole::CryptoGetTextPassword(BSTR *password)
   if (!PasswordIsDefined)

   {

     {

-      Password = GetPassword(_so);

+      RINOK(GetPassword_HRESULT(_so, Password))

       PasswordIsDefined = true;

     }

   }

diff --git a/CPP/7zip/UI/Console/UserInputUtils.cpp b/CPP/7zip/UI/Console/UserInputUtils.cpp
index d45e840..7bdafda 100644
--- a/CPP/7zip/UI/Console/UserInputUtils.cpp
+++ b/CPP/7zip/UI/Console/UserInputUtils.cpp
@@ -14,8 +14,8 @@ static const char kNoAll = 's';
 static const char kAutoRenameAll = 'u';

 static const char kQuit = 'q';

 

-static const char *kFirstQuestionMessage = "? ";

-static const char *kHelpQuestionMessage =

+static const char * const kFirstQuestionMessage = "? ";

+static const char * const kHelpQuestionMessage =

   "(Y)es / (N)o / (A)lways / (S)kip all / A(u)to rename all / (Q)uit? ";

 

 // return true if pressed Quite;

@@ -31,9 +31,16 @@ NUserAnswerMode::EEnum ScanUserYesNoAllQuit(CStdOutStream *outStream)
       *outStream << kHelpQuestionMessage;

       outStream->Flush();

     }

-    AString scannedString = g_StdIn.ScanStringUntilNewLine();

+    AString scannedString;

+    if (!g_StdIn.ScanAStringUntilNewLine(scannedString))

+      return NUserAnswerMode::kError;

+    if (g_StdIn.Error())

+      return NUserAnswerMode::kError;

     scannedString.Trim();

-    if (!scannedString.IsEmpty())

+    if (scannedString.IsEmpty() && g_StdIn.Eof())

+      return NUserAnswerMode::kEof;

+

+    if (scannedString.Len() == 1)

       switch (::MyCharLower_Ascii(scannedString[0]))

       {

         case kYes:    return NUserAnswerMode::kYes;

@@ -52,7 +59,7 @@ NUserAnswerMode::EEnum ScanUserYesNoAllQuit(CStdOutStream *outStream)
 #endif

 #endif

 

-UString GetPassword(CStdOutStream *outStream)

+static bool GetPassword(CStdOutStream *outStream, UString &psw)

 {

   if (outStream)

   {

@@ -72,19 +79,32 @@ UString GetPassword(CStdOutStream *outStream)
   if (console != INVALID_HANDLE_VALUE && console != 0)

     if (GetConsoleMode(console, &mode))

       wasChanged = (SetConsoleMode(console, mode & ~ENABLE_ECHO_INPUT) != 0);

-  UString res = g_StdIn.ScanUStringUntilNewLine();

+  bool res = g_StdIn.ScanUStringUntilNewLine(psw);

   if (wasChanged)

     SetConsoleMode(console, mode);

+  

+  #else

+  

+  bool res = g_StdIn.ScanUStringUntilNewLine(psw);

+  

+  #endif

+

   if (outStream)

   {

     *outStream << endl;

     outStream->Flush();

   }

+

   return res;

-  

-  #else

-  

-  return g_StdIn.ScanUStringUntilNewLine();

-  

-  #endif

+}

+

+HRESULT GetPassword_HRESULT(CStdOutStream *outStream, UString &psw)

+{

+  if (!GetPassword(outStream, psw))

+    return E_INVALIDARG;

+  if (g_StdIn.Error())

+    return E_FAIL;

+  if (g_StdIn.Eof() && psw.IsEmpty())

+    return E_ABORT;

+  return S_OK;

 }

diff --git a/CPP/7zip/UI/Console/UserInputUtils.h b/CPP/7zip/UI/Console/UserInputUtils.h
index df2773d..ebe09c1 100644
--- a/CPP/7zip/UI/Console/UserInputUtils.h
+++ b/CPP/7zip/UI/Console/UserInputUtils.h
@@ -14,11 +14,14 @@ enum EEnum
   kYesAll,

   kNoAll,

   kAutoRenameAll,

-  kQuit

+  kQuit,

+  kEof,

+  kError

 };

 }

 

 NUserAnswerMode::EEnum ScanUserYesNoAllQuit(CStdOutStream *outStream);

-UString GetPassword(CStdOutStream *outStream);

+// bool GetPassword(CStdOutStream *outStream, UString &psw);

+HRESULT GetPassword_HRESULT(CStdOutStream *outStream, UString &psw);

 

 #endif

diff --git a/CPP/7zip/UI/Console/resource.rc b/CPP/7zip/UI/Console/resource.rc
index 20dfee1..8d721f5 100644
--- a/CPP/7zip/UI/Console/resource.rc
+++ b/CPP/7zip/UI/Console/resource.rc
@@ -1,3 +1,7 @@
 #include "../../MyVersionInfo.rc"

 

-MY_VERSION_INFO_APP("7-Zip Console", "7z")

+MY_VERSION_INFO_APP("7-Zip Console" , "7z")

+

+#ifndef UNDER_CE

+1  24  MOVEABLE PURE   "Console.manifest"

+#endif