react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.cpp

@@ -11,7 +11,7 @@
 #include "../../../Windows/ErrorMsg.h"
 #include "../../../Windows/PropVariantConv.h"
 
-#ifndef Z7_ST
+#ifndef _7ZIP_ST
 #include "../../../Windows/Synchronization.h"
 #endif
 
@@ -56,27 +56,19 @@ HRESULT CExtractScanConsole::ScanProgress(const CDirItemsStat &st, const FString
 
 HRESULT CExtractScanConsole::ScanError(const FString &path, DWORD systemError)
 {
-  // 22.00:
-  // ScanErrors.AddError(path, systemError);
-
   ClosePercentsAndFlush();
   
   if (_se)
   {
     *_se << endl << kError << NError::MyFormatMessage(systemError) << endl;
-    _se->NormalizePrint_UString_Path(fs2us(path));
+    _se->NormalizePrint_UString(fs2us(path));
     *_se << endl << endl;
     _se->Flush();
   }
   return HRESULT_FROM_WIN32(systemError);
-
-  // 22.00: commented
-  // CommonError(path, systemError, true);
-  // return S_OK;
 }
 
 
-void Print_UInt64_and_String(AString &s, UInt64 val, const char *name);
 void Print_UInt64_and_String(AString &s, UInt64 val, const char *name)
 {
   char temp[32];
@@ -86,7 +78,6 @@ void Print_UInt64_and_String(AString &s, UInt64 val, const char *name)
   s += name;
 }
 
-void PrintSize_bytes_Smart(AString &s, UInt64 val);
 void PrintSize_bytes_Smart(AString &s, UInt64 val)
 {
   Print_UInt64_and_String(s, val, "bytes");
@@ -102,10 +93,10 @@ void PrintSize_bytes_Smart(AString &s, UInt64 val)
   temp[0] = c;
   s += " (";
   Print_UInt64_and_String(s, ((val + ((UInt64)1 << numBits) - 1) >> numBits), temp);
-  s.Add_Char(')');
+  s += ')';
 }
 
-static void PrintSize_bytes_Smart_comma(AString &s, UInt64 val)
+void PrintSize_bytes_Smart_comma(AString &s, UInt64 val)
 {
   if (val == (UInt64)(Int64)-1)
     return;
@@ -115,7 +106,6 @@ static void PrintSize_bytes_Smart_comma(AString &s, UInt64 val)
 
 
 
-void Print_DirItemsStat(AString &s, const CDirItemsStat &st);
 void Print_DirItemsStat(AString &s, const CDirItemsStat &st)
 {
   if (st.NumDirs != 0)
@@ -134,7 +124,6 @@ void Print_DirItemsStat(AString &s, const CDirItemsStat &st)
 }
 
 
-void Print_DirItemsStat2(AString &s, const CDirItemsStat2 &st);
 void Print_DirItemsStat2(AString &s, const CDirItemsStat2 &st)
 {
   Print_DirItemsStat(s, (CDirItemsStat &)st);
@@ -183,7 +172,7 @@ void CExtractScanConsole::PrintStat(const CDirItemsStat &st)
 
 
 
-#ifndef Z7_ST
+#ifndef _7ZIP_ST
 static NSynchronization::CCriticalSection g_CriticalSection;
 #define MT_LOCK NSynchronization::CCriticalSectionLock lock(g_CriticalSection);
 #else
@@ -194,11 +183,10 @@ static NSynchronization::CCriticalSection g_CriticalSection;
 static const char * const kTestString    =  "T";
 static const char * const kExtractString =  "-";
 static const char * const kSkipString    =  ".";
-static const char * const kReadString    =  "H";
 
-// static const char * const kCantAutoRename = "cannot create file with auto name\n";
-// static const char * const kCantRenameFile = "cannot rename existing file\n";
-// static const char * const kCantDeleteOutputFile = "cannot 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 * const kMemoryExceptionMessage = "Can't allocate required memory!";
 
@@ -235,7 +223,7 @@ static const char * const k_ErrorFlagsMessages[] =
   , "CRC Error"
 };
 
-Z7_COM7F_IMF(CExtractCallbackConsole::SetTotal(UInt64 size))
+STDMETHODIMP CExtractCallbackConsole::SetTotal(UInt64 size)
 {
   MT_LOCK
 
@@ -247,7 +235,7 @@ Z7_COM7F_IMF(CExtractCallbackConsole::SetTotal(UInt64 size))
   return CheckBreak2();
 }
 
-Z7_COM7F_IMF(CExtractCallbackConsole::SetCompleted(const UInt64 *completeValue))
+STDMETHODIMP CExtractCallbackConsole::SetCompleted(const UInt64 *completeValue)
 {
   MT_LOCK
 
@@ -265,7 +253,7 @@ static const char * const kTab = "  ";
 static void PrintFileInfo(CStdOutStream *_so, const wchar_t *path, const FILETIME *ft, const UInt64 *size)
 {
   *_so << kTab << "Path:     ";
-  _so->NormalizePrint_wstr_Path(path);
+  _so->NormalizePrint_wstr(path);
   *_so << endl;
   if (size && *size != (UInt64)(Int64)-1)
   {
@@ -281,14 +269,14 @@ static void PrintFileInfo(CStdOutStream *_so, const wchar_t *path, const FILETIM
   }
 }
 
-Z7_COM7F_IMF(CExtractCallbackConsole::AskOverwrite(
+STDMETHODIMP CExtractCallbackConsole::AskOverwrite(
     const wchar_t *existName, const FILETIME *existTime, const UInt64 *existSize,
     const wchar_t *newName, const FILETIME *newTime, const UInt64 *newSize,
-    Int32 *answer))
+    Int32 *answer)
 {
   MT_LOCK
   
-  RINOK(CheckBreak2())
+  RINOK(CheckBreak2());
 
   ClosePercentsAndFlush();
 
@@ -302,7 +290,7 @@ Z7_COM7F_IMF(CExtractCallbackConsole::AskOverwrite(
   
   NUserAnswerMode::EEnum overwriteAnswer = ScanUserYesNoAllQuit(_so);
   
-  switch ((int)overwriteAnswer)
+  switch (overwriteAnswer)
   {
     case NUserAnswerMode::kQuit:  return E_ABORT;
     case NUserAnswerMode::kNo:     *answer = NOverwriteAnswer::kNo; break;
@@ -325,7 +313,7 @@ Z7_COM7F_IMF(CExtractCallbackConsole::AskOverwrite(
   return CheckBreak2();
 }
 
-Z7_COM7F_IMF(CExtractCallbackConsole::PrepareOperation(const wchar_t *name, Int32 isFolder, Int32 askExtractMode, const UInt64 *position))
+STDMETHODIMP CExtractCallbackConsole::PrepareOperation(const wchar_t *name, Int32 /* isFolder */, Int32 askExtractMode, const UInt64 *position)
 {
   MT_LOCK
   
@@ -339,11 +327,10 @@ Z7_COM7F_IMF(CExtractCallbackConsole::PrepareOperation(const wchar_t *name, Int3
     case NArchive::NExtract::NAskMode::kExtract: s = kExtractString; break;
     case NArchive::NExtract::NAskMode::kTest:    s = kTestString; break;
     case NArchive::NExtract::NAskMode::kSkip:    s = kSkipString; requiredLevel = 2; break;
-    case NArchive::NExtract::NAskMode::kReadExternal: s = kReadString; requiredLevel = 0; break;
     default: s = "???"; requiredLevel = 2;
-  }
+  };
 
-  const bool show2 = (LogLevel >= requiredLevel && _so);
+  bool show2 = (LogLevel >= requiredLevel && _so);
 
   if (show2)
   {
@@ -358,13 +345,7 @@ Z7_COM7F_IMF(CExtractCallbackConsole::PrepareOperation(const wchar_t *name, Int3
     if (name)
     {
       _tempU = name;
-      _so->Normalize_UString_Path(_tempU);
-      // 21.04
-      if (isFolder)
-      {
-        if (!_tempU.IsEmpty() && _tempU.Back() != WCHAR_PATH_SEPARATOR)
-          _tempU.Add_PathSepar();
-      }
+      _so->Normalize_UString(_tempU);
     }
     _so->PrintUString(_tempU, _tempA);
     if (position)
@@ -373,7 +354,6 @@ Z7_COM7F_IMF(CExtractCallbackConsole::PrepareOperation(const wchar_t *name, Int3
  
     if (NeedFlush)
       _so->Flush();
-    // _so->Flush();  // for debug only
   }
 
   if (NeedPercents())
@@ -395,11 +375,11 @@ Z7_COM7F_IMF(CExtractCallbackConsole::PrepareOperation(const wchar_t *name, Int3
   return CheckBreak2();
 }
 
-Z7_COM7F_IMF(CExtractCallbackConsole::MessageError(const wchar_t *message))
+STDMETHODIMP CExtractCallbackConsole::MessageError(const wchar_t *message)
 {
   MT_LOCK
   
-  RINOK(CheckBreak2())
+  RINOK(CheckBreak2());
 
   NumFileErrors_in_Current++;
   NumFileErrors++;
@@ -414,7 +394,6 @@ Z7_COM7F_IMF(CExtractCallbackConsole::MessageError(const wchar_t *message))
   return CheckBreak2();
 }
 
-void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, AString &dest);
 void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, AString &dest)
 {
   dest.Empty();
@@ -449,7 +428,6 @@ void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, AString &dest)
       case NArchive::NExtract::NOperationResult::kWrongPassword:
         s = kWrongPassword;
         break;
-      default: break;
     }
     
     dest += kError;
@@ -458,11 +436,11 @@ void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, AString &dest)
     else
     {
       dest += "Error #";
-      dest.Add_UInt32((UInt32)opRes);
+      dest.Add_UInt32(opRes);
     }
 }
 
-Z7_COM7F_IMF(CExtractCallbackConsole::SetOperationResult(Int32 opRes, Int32 encrypted))
+STDMETHODIMP CExtractCallbackConsole::SetOperationResult(Int32 opRes, Int32 encrypted)
 {
   MT_LOCK
   
@@ -491,7 +469,7 @@ Z7_COM7F_IMF(CExtractCallbackConsole::SetOperationResult(Int32 opRes, Int32 encr
       if (!_currentName.IsEmpty())
       {
         *_se << " : ";
-        _se->NormalizePrint_UString_Path(_currentName);
+        _se->NormalizePrint_UString(_currentName);
       }
       *_se << endl;
       _se->Flush();
@@ -501,7 +479,7 @@ Z7_COM7F_IMF(CExtractCallbackConsole::SetOperationResult(Int32 opRes, Int32 encr
   return CheckBreak2();
 }
 
-Z7_COM7F_IMF(CExtractCallbackConsole::ReportExtractResult(Int32 opRes, Int32 encrypted, const wchar_t *name))
+STDMETHODIMP CExtractCallbackConsole::ReportExtractResult(Int32 opRes, Int32 encrypted, const wchar_t *name)
 {
   if (opRes != NArchive::NExtract::NOperationResult::kOK)
   {
@@ -514,7 +492,7 @@ Z7_COM7F_IMF(CExtractCallbackConsole::ReportExtractResult(Int32 opRes, Int32 enc
 
 
 
-#ifndef Z7_NO_CRYPTO
+#ifndef _NO_CRYPTO
 
 HRESULT CExtractCallbackConsole::SetPassword(const UString &password)
 {
@@ -523,7 +501,7 @@ HRESULT CExtractCallbackConsole::SetPassword(const UString &password)
   return S_OK;
 }
 
-Z7_COM7F_IMF(CExtractCallbackConsole::CryptoGetTextPassword(BSTR *password))
+STDMETHODIMP CExtractCallbackConsole::CryptoGetTextPassword(BSTR *password)
 {
   COM_TRY_BEGIN
   MT_LOCK
@@ -533,101 +511,9 @@ Z7_COM7F_IMF(CExtractCallbackConsole::CryptoGetTextPassword(BSTR *password))
 
 #endif
 
-
-#ifndef Z7_SFX
-
-void CExtractCallbackConsole::PrintTo_se_Path_WithTitle(const UString &path, const char *title)
-{
-  *_se << title;
-  _se->NormalizePrint_UString_Path(path);
-  *_se << endl;
-}
-
-void CExtractCallbackConsole::Add_ArchiveName_Error()
-{
-  if (_needWriteArchivePath)
-  {
-    PrintTo_se_Path_WithTitle(_currentArchivePath, "Archive: ");
-    _needWriteArchivePath = false;
-  }
-}
-
-
-Z7_COM7F_IMF(CExtractCallbackConsole::RequestMemoryUse(
-    UInt32 flags, UInt32 /* indexType */, UInt32 /* index */, const wchar_t *path,
-    UInt64 requiredSize, UInt64 *allowedSize, UInt32 *answerFlags))
-{
-  if ((flags & NRequestMemoryUseFlags::k_IsReport) == 0
-      && requiredSize <= *allowedSize)
-  {
-#if 0
-    // it's expected, that *answerFlags was set to NRequestMemoryAnswerFlags::k_Allow already,
-    // because it's default answer for (requiredSize <= *allowedSize) case.
-    // optional code:
-    *answerFlags = NRequestMemoryAnswerFlags::k_Allow;
-#endif
-  }
-  else
-  {
-    if ((flags & NRequestMemoryUseFlags::k_NoErrorMessage) == 0)
-    if (_se)
-    {
-      const UInt64 num_GB_allowed  = (*allowedSize + ((1u << 30) - 1)) >> 30;
-      const UInt64 num_GB_required = (requiredSize + ((1u << 30) - 1)) >> 30;
-      ClosePercentsAndFlush();
-      Add_ArchiveName_Error();
-      if (path)
-        PrintTo_se_Path_WithTitle(path, "File: ");
-      *_se << "The extraction operation requires big amount memory (RAM):" << endl
-        << "  " << num_GB_required  << " GB : required memory usage size" << endl
-        << "  " << num_GB_allowed   << " GB : allowed memory usage limit" << endl
-        << "  Use -smemx{size}g switch to set allowed memory usage limit for extraction." << endl;
-      *_se << "ERROR: Memory usage limit was exceeded." << endl;
-      const char *m = NULL;
-      // if (indexType == NArchive::NEventIndexType::kNoIndex)
-           if ((flags & NRequestMemoryUseFlags::k_SkipArc_IsExpected) ||
-               (flags & NRequestMemoryUseFlags::k_Report_SkipArc))
-          m = "Archive unpacking was skipped.";
-/*
-      else if ((flags & NRequestMemoryUseFlags::k_SkipBigFiles_IsExpected) ||
-               (flags & NRequestMemoryUseFlags::k_Report_SkipBigFiles))
-          m = "Extraction for some files will be skipped.";
-      else if ((flags & NRequestMemoryUseFlags::k_SkipBigFile_IsExpected) ||
-               (flags & NRequestMemoryUseFlags::k_Report_SkipBigFile))
-          m = "File extraction was skipped.";
-*/
-      if (m)
-        *_se << m;
-      _se->Flush();
-    }
-
-    if ((flags & NRequestMemoryUseFlags::k_IsReport) == 0)
-    {
-      // default answer can be k_Allow, if limit was not forced,
-      // so we change answer to non-allowed here.
-      *answerFlags = NRequestMemoryAnswerFlags::k_Limit_Exceeded;
-           if (flags & NRequestMemoryUseFlags::k_SkipArc_IsExpected)
-        *answerFlags |= NRequestMemoryAnswerFlags::k_SkipArc;
-/*
-      else if (flags & NRequestMemoryUseFlags::k_SkipBigFile_IsExpected)
-        *answerFlags |= NRequestMemoryAnswerFlags::k_SkipBigFile;
-      else if (flags & NRequestMemoryUseFlags::k_SkipBigFiles_IsExpected)
-        *answerFlags |= NRequestMemoryAnswerFlags::k_SkipBigFiles;
-*/
-    }
-  }
-  return CheckBreak2();
-}
-
-#endif
-
-
 HRESULT CExtractCallbackConsole::BeforeOpen(const wchar_t *name, bool testMode)
 {
-  _currentArchivePath = name;
-  _needWriteArchivePath = true;
-
-  RINOK(CheckBreak2())
+  RINOK(CheckBreak2());
 
   NumTryArcs++;
   ThereIsError_in_Current = false;
@@ -638,7 +524,7 @@ HRESULT CExtractCallbackConsole::BeforeOpen(const wchar_t *name, bool testMode)
   if (_so)
   {
     *_so << endl << (testMode ? kTesting : kExtracting);
-    _so->NormalizePrint_wstr_Path(name);
+    _so->NormalizePrint_wstr(name);
     *_so << endl;
   }
 
@@ -654,7 +540,7 @@ static AString GetOpenArcErrorMessage(UInt32 errorFlags)
 {
   AString s;
   
-  for (unsigned i = 0; i < Z7_ARRAY_SIZE(k_ErrorFlagsMessages); i++)
+  for (unsigned i = 0; i < ARRAY_SIZE(k_ErrorFlagsMessages); i++)
   {
     UInt32 f = (1 << i);
     if ((errorFlags & f) == 0)
@@ -680,7 +566,6 @@ static AString GetOpenArcErrorMessage(UInt32 errorFlags)
   return s;
 }
 
-void PrintErrorFlags(CStdOutStream &so, const char *s, UInt32 errorFlags);
 void PrintErrorFlags(CStdOutStream &so, const char *s, UInt32 errorFlags)
 {
   if (errorFlags == 0)
@@ -688,7 +573,7 @@ void PrintErrorFlags(CStdOutStream &so, const char *s, UInt32 errorFlags)
   so << s << endl << GetOpenArcErrorMessage(errorFlags) << endl;
 }
 
-static void Add_Messsage_Pre_ArcType(UString &s, const char *pre, const wchar_t *arcType)
+void Add_Messsage_Pre_ArcType(UString &s, const char *pre, const wchar_t *arcType)
 {
   s.Add_LF();
   s += pre;
@@ -697,13 +582,12 @@ static void Add_Messsage_Pre_ArcType(UString &s, const char *pre, const wchar_t
   s += "] archive";
 }
 
-void Print_ErrorFormatIndex_Warning(CStdOutStream *_so, const CCodecs *codecs, const CArc &arc);
 void Print_ErrorFormatIndex_Warning(CStdOutStream *_so, const CCodecs *codecs, const CArc &arc)
 {
   const CArcErrorInfo &er = arc.ErrorInfo;
   
   *_so << "WARNING:\n";
-  _so->NormalizePrint_UString_Path(arc.Path);
+  _so->NormalizePrint_UString(arc.Path);
   UString s;
   if (arc.FormatIndex == er.ErrorFormatIndex)
   {
@@ -712,7 +596,7 @@ void Print_ErrorFormatIndex_Warning(CStdOutStream *_so, const CCodecs *codecs, c
   }
   else
   {
-    Add_Messsage_Pre_ArcType(s, "Cannot open the file", codecs->GetFormatNamePtr(er.ErrorFormatIndex));
+    Add_Messsage_Pre_ArcType(s, "Can not open the file", codecs->GetFormatNamePtr(er.ErrorFormatIndex));
     Add_Messsage_Pre_ArcType(s, "The file is open", codecs->GetFormatNamePtr(arc.FormatIndex));
   }
   
@@ -724,9 +608,6 @@ HRESULT CExtractCallbackConsole::OpenResult(
     const CCodecs *codecs, const CArchiveLink &arcLink,
     const wchar_t *name, HRESULT result)
 {
-  _currentArchivePath = name;
-  _needWriteArchivePath = true;
-
   ClosePercents();
 
   if (NeedPercents())
@@ -753,7 +634,7 @@ HRESULT CExtractCallbackConsole::OpenResult(
         *_se << endl;
         if (level != 0)
         {
-          _se->NormalizePrint_UString_Path(arc.Path);
+          _se->NormalizePrint_UString(arc.Path);
           *_se << endl;
         }
       }
@@ -790,7 +671,7 @@ HRESULT CExtractCallbackConsole::OpenResult(
         *_so << endl;
         if (level != 0)
         {
-          _so->NormalizePrint_UString_Path(arc.Path);
+          _so->NormalizePrint_UString(arc.Path);
           *_so << endl;
         }
       }
@@ -836,7 +717,7 @@ HRESULT CExtractCallbackConsole::OpenResult(
   {
     if (_so)
     {
-      RINOK(Print_OpenArchive_Props(*_so, codecs, arcLink))
+      RINOK(Print_OpenArchive_Props(*_so, codecs, arcLink));
       *_so << endl;
     }
   }
@@ -848,10 +729,10 @@ HRESULT CExtractCallbackConsole::OpenResult(
     if (_se)
     {
       *_se << kError;
-      _se->NormalizePrint_wstr_Path(name);
+      _se->NormalizePrint_wstr(name);
       *_se << endl;
-      const HRESULT res = Print_OpenArchive_Error(*_se, codecs, arcLink);
-      RINOK(res)
+      HRESULT res = Print_OpenArchive_Error(*_se, codecs, arcLink);
+      RINOK(res);
       if (result == S_FALSE)
       {
       }
@@ -924,11 +805,9 @@ HRESULT CExtractCallbackConsole::ExtractResult(HRESULT result)
   }
   else
   {
-    // we don't update NumArcsWithError, if error is not related to archive data.
-    if (result == E_ABORT
-        || result == HRESULT_FROM_WIN32(ERROR_DISK_FULL))
-      return result;
     NumArcsWithError++;
+    if (result == E_ABORT || result == ERROR_DISK_FULL)
+      return result;
     
     if (_se)
     {

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Console/ExtractCallbackConsole.h

@@ -1,7 +1,7 @@
 // ExtractCallbackConsole.h
 
-#ifndef ZIP7_INC_EXTRACT_CALLBACK_CONSOLE_H
-#define ZIP7_INC_EXTRACT_CALLBACK_CONSOLE_H
+#ifndef __EXTRACT_CALLBACK_CONSOLE_H
+#define __EXTRACT_CALLBACK_CONSOLE_H
 
 #include "../../../Common/StdOutStream.h"
 
@@ -15,36 +15,13 @@
 
 #include "OpenCallbackConsole.h"
 
-/*
-struct CErrorPathCodes2
+class CExtractScanConsole: public IDirItemsCallback
 {
-  FStringVector Paths;
-  CRecordVector<DWORD> Codes;
-
-  void AddError(const FString &path, DWORD systemError)
-  {
-    Paths.Add(path);
-    Codes.Add(systemError);
-  }
-  void Clear()
-  {
-    Paths.Clear();
-    Codes.Clear();
-  }
-};
-*/
-
-class CExtractScanConsole Z7_final: public IDirItemsCallback
-{
-  Z7_IFACE_IMP(IDirItemsCallback)
-
   CStdOutStream *_so;
   CStdOutStream *_se;
   CPercentPrinter _percent;
 
-  // CErrorPathCodes2 ScanErrors;
-
-  bool NeedPercents() const { return _percent._so && !_percent.DisablePrint; }
+  bool NeedPercents() const { return _percent._so != NULL; }
   
   void ClosePercentsAndFlush()
   {
@@ -55,23 +32,19 @@ class CExtractScanConsole Z7_final: public IDirItemsCallback
   }
 
 public:
-
-  void Init(
-      CStdOutStream *outStream,
-      CStdOutStream *errorStream,
-      CStdOutStream *percentStream,
-      bool disablePercents)
+  void Init(CStdOutStream *outStream, CStdOutStream *errorStream, CStdOutStream *percentStream)
   {
     _so = outStream;
     _se = errorStream;
     _percent._so = percentStream;
-    _percent.DisablePrint = disablePercents;
   }
   
   void SetWindowWidth(unsigned width) { _percent.MaxLen = width - 1; }
 
   void StartScanning();
   
+  INTERFACE_IDirItemsCallback(;)
+
   void CloseScanning()
   {
     if (NeedPercents())
@@ -84,65 +57,21 @@ public:
 
 
 
-class CExtractCallbackConsole Z7_final:
-  public IFolderArchiveExtractCallback,
+class CExtractCallbackConsole:
   public IExtractCallbackUI,
   // public IArchiveExtractCallbackMessage,
   public IFolderArchiveExtractCallback2,
- #ifndef Z7_NO_CRYPTO
+  #ifndef _NO_CRYPTO
   public ICryptoGetTextPassword,
- #endif
- #ifndef Z7_SFX
-  public IArchiveRequestMemoryUseCallback,
- #endif
-
+  #endif
   public COpenCallbackConsole,
   public CMyUnknownImp
 {
-  Z7_COM_QI_BEGIN2(IFolderArchiveExtractCallback)
-  // Z7_COM_QI_ENTRY(IArchiveExtractCallbackMessage)
-  Z7_COM_QI_ENTRY(IFolderArchiveExtractCallback2)
- #ifndef Z7_NO_CRYPTO
-  Z7_COM_QI_ENTRY(ICryptoGetTextPassword)
- #endif
- #ifndef Z7_SFX
-  Z7_COM_QI_ENTRY(IArchiveRequestMemoryUseCallback)
- #endif
-
-  Z7_COM_QI_END
-  Z7_COM_ADDREF_RELEASE
-
-  Z7_IFACE_COM7_IMP(IProgress)
-  Z7_IFACE_COM7_IMP(IFolderArchiveExtractCallback)
-  Z7_IFACE_IMP(IExtractCallbackUI)
-  // Z7_IFACE_COM7_IMP(IArchiveExtractCallbackMessage)
-  Z7_IFACE_COM7_IMP(IFolderArchiveExtractCallback2)
- #ifndef Z7_NO_CRYPTO
-  Z7_IFACE_COM7_IMP(ICryptoGetTextPassword)
- #endif
- #ifndef Z7_SFX
-  Z7_IFACE_COM7_IMP(IArchiveRequestMemoryUseCallback)
- #endif
-
-  bool _needWriteArchivePath;
-
-public:
-  bool ThereIsError_in_Current;
-  bool ThereIsWarning_in_Current;
-  bool NeedFlush;
-
-private:
   AString _tempA;
   UString _tempU;
 
-  UString _currentArchivePath;
   UString _currentName;
 
-#ifndef Z7_SFX
-  void PrintTo_se_Path_WithTitle(const UString &path, const char *title);
-  void Add_ArchiveName_Error();
-#endif
-
   void ClosePercents_for_so()
   {
     if (NeedPercents() && _so == _percent._so)
@@ -156,9 +85,37 @@ private:
     if (_so)
       _so->Flush();
   }
+
 public:
+  MY_QUERYINTERFACE_BEGIN2(IFolderArchiveExtractCallback)
+  // MY_QUERYINTERFACE_ENTRY(IArchiveExtractCallbackMessage)
+  MY_QUERYINTERFACE_ENTRY(IFolderArchiveExtractCallback2)
+  #ifndef _NO_CRYPTO
+  MY_QUERYINTERFACE_ENTRY(ICryptoGetTextPassword)
+  #endif
+  MY_QUERYINTERFACE_END
+  MY_ADDREF_RELEASE
+
+  STDMETHOD(SetTotal)(UInt64 total);
+  STDMETHOD(SetCompleted)(const UInt64 *completeValue);
+
+  INTERFACE_IFolderArchiveExtractCallback(;)
+
+  INTERFACE_IExtractCallbackUI(;)
+  // INTERFACE_IArchiveExtractCallbackMessage(;)
+  INTERFACE_IFolderArchiveExtractCallback2(;)
+
+  #ifndef _NO_CRYPTO
+
+  STDMETHOD(CryptoGetTextPassword)(BSTR *password);
+
+  #endif
+  
   UInt64 NumTryArcs;
   
+  bool ThereIsError_in_Current;
+  bool ThereIsWarning_in_Current;
+
   UInt64 NumOkArcs;
   UInt64 NumCantOpenArcs;
   UInt64 NumArcsWithError;
@@ -170,11 +127,11 @@ public:
   UInt64 NumFileErrors;
   UInt64 NumFileErrors_in_Current;
 
+  bool NeedFlush;
   unsigned PercentsNameLevel;
   unsigned LogLevel;
 
   CExtractCallbackConsole():
-      _needWriteArchivePath(true),
       NeedFlush(false),
       PercentsNameLevel(1),
       LogLevel(0)
@@ -182,13 +139,9 @@ public:
 
   void SetWindowWidth(unsigned width) { _percent.MaxLen = width - 1; }
 
-  void Init(
-      CStdOutStream *outStream,
-      CStdOutStream *errorStream,
-      CStdOutStream *percentStream,
-      bool disablePercents)
+  void Init(CStdOutStream *outStream, CStdOutStream *errorStream, CStdOutStream *percentStream)
   {
-    COpenCallbackConsole::Init(outStream, errorStream, percentStream, disablePercents);
+    COpenCallbackConsole::Init(outStream, errorStream, percentStream);
 
     NumTryArcs = 0;