react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/FileManager/ExtractCallback.cpp

@@ -2,6 +2,7 @@
 
 #include "StdAfx.h"
 
+
 #include "../../../Common/ComTry.h"
 #include "../../../Common/IntToString.h"
 #include "../../../Common/Lang.h"
@@ -16,7 +17,7 @@
 #include "../../Common/StreamUtils.h"
 #include "../Common/ExtractingFilePath.h"
 
-#ifndef Z7_SFX
+#ifndef _SFX
 #include "../Common/ZipRegistry.h"
 #endif
 
@@ -26,9 +27,8 @@
 #include "ExtractCallback.h"
 #include "FormatUtils.h"
 #include "LangUtils.h"
-#include "MemDialog.h"
 #include "OverwriteDialog.h"
-#ifndef Z7_NO_CRYPTO
+#ifndef _NO_CRYPTO
 #include "PasswordDialog.h"
 #endif
 #include "PropertyName.h"
@@ -37,20 +37,17 @@ using namespace NWindows;
 using namespace NFile;
 using namespace NFind;
 
-extern bool g_DisableUserQuestions;
-
 CExtractCallbackImp::~CExtractCallbackImp() {}
 
 void CExtractCallbackImp::Init()
 {
-  LangString(IDS_PROGRESS_EXTRACTING, _lang_Extracting);
-  LangString(IDS_PROGRESS_TESTING, _lang_Testing);
-  LangString(IDS_PROGRESS_SKIPPING, _lang_Skipping);
-  _lang_Reading = "Reading";
+  _lang_Extracting = LangString(IDS_PROGRESS_EXTRACTING);
+  _lang_Testing = LangString(IDS_PROGRESS_TESTING);
+  _lang_Skipping = LangString(IDS_PROGRESS_SKIPPING);
 
   NumArchiveErrors = 0;
   ThereAreMessageErrors = false;
-  #ifndef Z7_SFX
+  #ifndef _SFX
   NumFolders = NumFiles = 0;
   NeedAddFile = false;
   #endif
@@ -62,34 +59,29 @@ void CExtractCallbackImp::AddError_Message(LPCWSTR s)
   ProgressDialog->Sync.AddError_Message(s);
 }
 
-void CExtractCallbackImp::AddError_Message_ShowArcPath(LPCWSTR s)
-{
-  Add_ArchiveName_Error();
-  AddError_Message(s);
-}
-
-
-#ifndef Z7_SFX
+#ifndef _SFX
 
-Z7_COM7F_IMF(CExtractCallbackImp::SetNumFiles(UInt64 numFiles))
+STDMETHODIMP CExtractCallbackImp::SetNumFiles(UInt64
+  #ifndef _SFX
+  numFiles
+  #endif
+  )
 {
- #ifdef Z7_SFX
-  UNUSED_VAR(numFiles)
- #else
+  #ifndef _SFX
   ProgressDialog->Sync.Set_NumFilesTotal(numFiles);
- #endif
+  #endif
   return S_OK;
 }
 
 #endif
 
-Z7_COM7F_IMF(CExtractCallbackImp::SetTotal(UInt64 total))
+STDMETHODIMP CExtractCallbackImp::SetTotal(UInt64 total)
 {
   ProgressDialog->Sync.Set_NumBytesTotal(total);
   return S_OK;
 }
 
-Z7_COM7F_IMF(CExtractCallbackImp::SetCompleted(const UInt64 *value))
+STDMETHODIMP CExtractCallbackImp::SetCompleted(const UInt64 *value)
 {
   return ProgressDialog->Sync.Set_NumBytesCur(value);
 }
@@ -106,19 +98,19 @@ HRESULT CExtractCallbackImp::Open_SetTotal(const UInt64 *files, const UInt64 *by
   {
     if (files)
     {
-      _totalFiles_Defined = true;
+      _totalFilesDefined = true;
       // res = ProgressDialog->Sync.Set_NumFilesTotal(*files);
     }
     else
-      _totalFiles_Defined = false;
+      _totalFilesDefined = false;
 
     if (bytes)
     {
-      _totalBytes_Defined = true;
+      _totalBytesDefined = true;
       ProgressDialog->Sync.Set_NumBytesTotal(*bytes);
     }
     else
-      _totalBytes_Defined = false;
+      _totalBytesDefined = false;
   }
 
   return res;
@@ -146,7 +138,7 @@ HRESULT CExtractCallbackImp::Open_Finished()
   return ProgressDialog->Sync.CheckStop();
 }
 
-#ifndef Z7_NO_CRYPTO
+#ifndef _NO_CRYPTO
 
 HRESULT CExtractCallbackImp::Open_CryptoGetTextPassword(BSTR *password)
 {
@@ -175,8 +167,8 @@ void CExtractCallbackImp::Open_Clear_PasswordWasAsked_Flag()
 #endif
 
 
-#ifndef Z7_SFX
-Z7_COM7F_IMF(CExtractCallbackImp::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize))
+#ifndef _SFX
+STDMETHODIMP CExtractCallbackImp::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize)
 {
   ProgressDialog->Sync.Set_Ratio(inSize, outSize);
   return S_OK;
@@ -184,13 +176,13 @@ Z7_COM7F_IMF(CExtractCallbackImp::SetRatioInfo(const UInt64 *inSize, const UInt6
 #endif
 
 /*
-Z7_COM7F_IMF(CExtractCallbackImp::SetTotalFiles(UInt64 total)
+STDMETHODIMP CExtractCallbackImp::SetTotalFiles(UInt64 total)
 {
   ProgressDialog->Sync.SetNumFilesTotal(total);
   return S_OK;
 }
 
-Z7_COM7F_IMF(CExtractCallbackImp::SetCompletedFiles(const UInt64 *value)
+STDMETHODIMP CExtractCallbackImp::SetCompletedFiles(const UInt64 *value)
 {
   if (value != NULL)
     ProgressDialog->Sync.SetNumFilesCur(*value);
@@ -198,25 +190,23 @@ Z7_COM7F_IMF(CExtractCallbackImp::SetCompletedFiles(const UInt64 *value)
 }
 */
 
-Z7_COM7F_IMF(CExtractCallbackImp::AskOverwrite(
+STDMETHODIMP CExtractCallbackImp::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)
 {
   COverwriteDialog dialog;
 
-  dialog.OldFileInfo.SetTime2(existTime);
-  dialog.OldFileInfo.SetSize2(existSize);
-  dialog.OldFileInfo.Path = existName;
-  dialog.OldFileInfo.Is_FileSystemFile = true;
+  dialog.OldFileInfo.SetTime(existTime);
+  dialog.OldFileInfo.SetSize(existSize);
+  dialog.OldFileInfo.Name = existName;
 
-  dialog.NewFileInfo.SetTime2(newTime);
-  dialog.NewFileInfo.SetSize2(newSize);
-  dialog.NewFileInfo.Path = newName;
-  dialog.NewFileInfo.Is_FileSystemFile = Src_Is_IO_FS_Folder;
+  dialog.NewFileInfo.SetTime(newTime);
+  dialog.NewFileInfo.SetSize(newSize);
+  dialog.NewFileInfo.Name = newName;
   
   ProgressDialog->WaitCreating();
-  const INT_PTR writeAnswer = dialog.Create(*ProgressDialog);
+  INT_PTR writeAnswer = dialog.Create(*ProgressDialog);
   
   switch (writeAnswer)
   {
@@ -232,7 +222,7 @@ Z7_COM7F_IMF(CExtractCallbackImp::AskOverwrite(
 }
 
 
-Z7_COM7F_IMF(CExtractCallbackImp::PrepareOperation(const wchar_t *name, Int32 isFolder, Int32 askExtractMode, const UInt64 * /* position */))
+STDMETHODIMP CExtractCallbackImp::PrepareOperation(const wchar_t *name, Int32 isFolder, Int32 askExtractMode, const UInt64 * /* position */)
 {
   _isFolder = IntToBool(isFolder);
   _currentFilePath = name;
@@ -243,14 +233,13 @@ Z7_COM7F_IMF(CExtractCallbackImp::PrepareOperation(const wchar_t *name, Int32 is
     case NArchive::NExtract::NAskMode::kExtract: msg = &_lang_Extracting; break;
     case NArchive::NExtract::NAskMode::kTest:    msg = &_lang_Testing; break;
     case NArchive::NExtract::NAskMode::kSkip:    msg = &_lang_Skipping; break;
-    case NArchive::NExtract::NAskMode::kReadExternal: msg = &_lang_Reading; break;
     // default: s = "Unknown operation";
   }
 
   return ProgressDialog->Sync.Set_Status2(*msg, name, IntToBool(isFolder));
 }
 
-Z7_COM7F_IMF(CExtractCallbackImp::MessageError(const wchar_t *s))
+STDMETHODIMP CExtractCallbackImp::MessageError(const wchar_t *s)
 {
   AddError_Message(s);
   return S_OK;
@@ -263,9 +252,9 @@ HRESULT CExtractCallbackImp::MessageError(const char *message, const FString &pa
   return S_OK;
 }
 
-#ifndef Z7_SFX
+#ifndef _SFX
 
-Z7_COM7F_IMF(CExtractCallbackImp::ShowMessage(const wchar_t *s))
+STDMETHODIMP CExtractCallbackImp::ShowMessage(const wchar_t *s)
 {
   AddError_Message(s);
   return S_OK;
@@ -273,7 +262,6 @@ Z7_COM7F_IMF(CExtractCallbackImp::ShowMessage(const wchar_t *s))
 
 #endif
 
-void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, const wchar_t *fileName, UString &s);
 void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, const wchar_t *fileName, UString &s)
 {
   s.Empty();
@@ -281,33 +269,25 @@ void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, const wchar_t *fileNam
   if (opRes == NArchive::NExtract::NOperationResult::kOK)
     return;
 
- #ifndef Z7_SFX
   UINT messageID = 0;
- #endif
   UINT id = 0;
 
   switch (opRes)
   {
     case NArchive::NExtract::NOperationResult::kUnsupportedMethod:
-     #ifndef Z7_SFX
       messageID = IDS_EXTRACT_MESSAGE_UNSUPPORTED_METHOD;
-     #endif
       id = IDS_EXTRACT_MSG_UNSUPPORTED_METHOD;
       break;
     case NArchive::NExtract::NOperationResult::kDataError:
-     #ifndef Z7_SFX
       messageID = encrypted ?
           IDS_EXTRACT_MESSAGE_DATA_ERROR_ENCRYPTED:
           IDS_EXTRACT_MESSAGE_DATA_ERROR;
-     #endif
       id = IDS_EXTRACT_MSG_DATA_ERROR;
       break;
     case NArchive::NExtract::NOperationResult::kCRCError:
-     #ifndef Z7_SFX
       messageID = encrypted ?
           IDS_EXTRACT_MESSAGE_CRC_ERROR_ENCRYPTED:
           IDS_EXTRACT_MESSAGE_CRC_ERROR;
-     #endif
       id = IDS_EXTRACT_MSG_CRC_ERROR;
       break;
     case NArchive::NExtract::NOperationResult::kUnavailable:
@@ -336,19 +316,18 @@ void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, const wchar_t *fileNam
   }
 
   UString msg;
-
- #ifndef Z7_SFX
   UString msgOld;
- #ifdef Z7_LANG
+
+  #ifndef _SFX
   if (id != 0)
     LangString_OnlyFromLangFile(id, msg);
   if (messageID != 0 && msg.IsEmpty())
     LangString_OnlyFromLangFile(messageID, msgOld);
- #endif
+  #endif
+
   if (msg.IsEmpty() && !msgOld.IsEmpty())
     s = MyFormatNew(msgOld, fileName);
   else
- #endif
   {
     if (msg.IsEmpty() && id != 0)
       LangString(id, msg);
@@ -357,7 +336,7 @@ void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, const wchar_t *fileNam
     else
     {
       s += "Error #";
-      s.Add_UInt32((UInt32)opRes);
+      s.Add_UInt32(opRes);
     }
 
     if (encrypted && opRes != NArchive::NExtract::NOperationResult::kWrongPassword)
@@ -372,7 +351,7 @@ void SetExtractErrorMessage(Int32 opRes, Int32 encrypted, const wchar_t *fileNam
   }
 }
 
-Z7_COM7F_IMF(CExtractCallbackImp::SetOperationResult(Int32 opRes, Int32 encrypted))
+STDMETHODIMP CExtractCallbackImp::SetOperationResult(Int32 opRes, Int32 encrypted)
 {
   switch (opRes)
   {
@@ -382,12 +361,12 @@ Z7_COM7F_IMF(CExtractCallbackImp::SetOperationResult(Int32 opRes, Int32 encrypte
     {
       UString s;
       SetExtractErrorMessage(opRes, encrypted, _currentFilePath, s);
-      AddError_Message_ShowArcPath(s);
+      Add_ArchiveName_Error();
+      AddError_Message(s);
     }
   }
   
-  _currentFilePath.Empty();
-  #ifndef Z7_SFX
+  #ifndef _SFX
   if (_isFolder)
     NumFolders++;
   else
@@ -398,13 +377,14 @@ Z7_COM7F_IMF(CExtractCallbackImp::SetOperationResult(Int32 opRes, Int32 encrypte
   return S_OK;
 }
 
-Z7_COM7F_IMF(CExtractCallbackImp::ReportExtractResult(Int32 opRes, Int32 encrypted, const wchar_t *name))
+STDMETHODIMP CExtractCallbackImp::ReportExtractResult(Int32 opRes, Int32 encrypted, const wchar_t *name)
 {
   if (opRes != NArchive::NExtract::NOperationResult::kOK)
   {
     UString s;
     SetExtractErrorMessage(opRes, encrypted, name, s);
-    AddError_Message_ShowArcPath(s);
+    Add_ArchiveName_Error();
+    AddError_Message(s);
   }
   return S_OK;
 }
@@ -414,29 +394,28 @@ Z7_COM7F_IMF(CExtractCallbackImp::ReportExtractResult(Int32 opRes, Int32 encrypt
 
 HRESULT CExtractCallbackImp::BeforeOpen(const wchar_t *name, bool /* testMode */)
 {
-  _currentArchivePath = name;
-  _needWriteArchivePath = true;
-  #ifndef Z7_SFX
-  RINOK(ProgressDialog->Sync.CheckStop())
+  #ifndef _SFX
+  RINOK(ProgressDialog->Sync.CheckStop());
   ProgressDialog->Sync.Set_TitleFileName(name);
   #endif
+  _currentArchivePath = name;
   return S_OK;
 }
 
 HRESULT CExtractCallbackImp::SetCurrentFilePath2(const wchar_t *path)
 {
   _currentFilePath = path;
-  #ifndef Z7_SFX
+  #ifndef _SFX
   ProgressDialog->Sync.Set_FilePath(path);
   #endif
   return S_OK;
 }
 
-#ifndef Z7_SFX
+#ifndef _SFX
 
-Z7_COM7F_IMF(CExtractCallbackImp::SetCurrentFilePath(const wchar_t *path))
+HRESULT CExtractCallbackImp::SetCurrentFilePath(const wchar_t *path)
 {
-  #ifndef Z7_SFX
+  #ifndef _SFX
   if (NeedAddFile)
     NumFiles++;
   NeedAddFile = true;
@@ -470,17 +449,16 @@ static void AddNewLineString(UString &s, const UString &m)
   s.Add_LF();
 }
 
-UString GetOpenArcErrorMessage(UInt32 errorFlags);
 UString GetOpenArcErrorMessage(UInt32 errorFlags)
 {
   UString s;
 
-  for (unsigned i = 0; i < Z7_ARRAY_SIZE(k_ErrorFlagsIds); i++)
+  for (unsigned i = 0; i < ARRAY_SIZE(k_ErrorFlagsIds); i++)
   {
-    const UInt32 f = (UInt32)1 << i;
+    UInt32 f = ((UInt32)1 << i);
     if ((errorFlags & f) == 0)
       continue;
-    const UInt32 id = k_ErrorFlagsIds[i];
+    UInt32 id = k_ErrorFlagsIds[i];
     UString m = LangString(id);
     if (m.IsEmpty())
       continue;
@@ -511,8 +489,8 @@ UString GetOpenArcErrorMessage(UInt32 errorFlags)
 
 static void ErrorInfo_Print(UString &s, const CArcErrorInfo &er)
 {
-  const UInt32 errorFlags = er.GetErrorFlags();
-  const UInt32 warningFlags = er.GetWarningFlags();
+  UInt32 errorFlags = er.GetErrorFlags();
+  UInt32 warningFlags = er.GetWarningFlags();
 
   if (errorFlags != 0)
     AddNewLineString(s, GetOpenArcErrorMessage(errorFlags));
@@ -523,7 +501,7 @@ static void ErrorInfo_Print(UString &s, const CArcErrorInfo &er)
   if (warningFlags != 0)
   {
     s += GetNameOfProperty(kpidWarningFlags, L"Warnings");
-    s.Add_Colon();
+    s += ":";
     s.Add_LF();
     AddNewLineString(s, GetOpenArcErrorMessage(warningFlags));
   }
@@ -541,11 +519,10 @@ static UString GetBracedType(const wchar_t *type)
 {
   UString s ('[');
   s += type;
-  s.Add_Char(']');
+  s += ']';
   return s;
 }
 
-void OpenResult_GUI(UString &s, const CCodecs *codecs, const CArchiveLink &arcLink, const wchar_t *name, HRESULT result);
 void OpenResult_GUI(UString &s, const CCodecs *codecs, const CArchiveLink &arcLink, const wchar_t *name, HRESULT result)
 {
   FOR_VECTOR (level, arcLink.Arcs)
@@ -652,16 +629,10 @@ void CExtractCallbackImp::Add_ArchiveName_Error()
 
 HRESULT CExtractCallbackImp::ExtractResult(HRESULT result)
 {
-  #ifndef Z7_SFX
-  ProgressDialog->Sync.Set_FilePath(L"");
-  #endif
-
   if (result == S_OK)
     return result;
   NumArchiveErrors++;
-  if (result == E_ABORT
-      || result == HRESULT_FROM_WIN32(ERROR_DISK_FULL)
-      )
+  if (result == E_ABORT || result == ERROR_DISK_FULL)
     return result;
 
   Add_ArchiveName_Error();
@@ -671,7 +642,7 @@ HRESULT CExtractCallbackImp::ExtractResult(HRESULT result)
   return S_OK;
 }
 
-#ifndef Z7_NO_CRYPTO
+#ifndef _NO_CRYPTO
 
 HRESULT CExtractCallbackImp::SetPassword(const UString &password)
 {
@@ -680,14 +651,14 @@ HRESULT CExtractCallbackImp::SetPassword(const UString &password)
   return S_OK;
 }
 
-Z7_COM7F_IMF(CExtractCallbackImp::CryptoGetTextPassword(BSTR *password))
+STDMETHODIMP CExtractCallbackImp::CryptoGetTextPassword(BSTR *password)
 {
   PasswordWasAsked = true;
   if (!PasswordIsDefined)
   {
     CPasswordDialog dialog;
-    #ifndef Z7_SFX
-    const bool showPassword = NExtract::Read_ShowPassword();
+    #ifndef _SFX
+    bool showPassword = NExtract::Read_ShowPassword();
     dialog.ShowPassword = showPassword;
     #endif
     ProgressDialog->WaitCreating();
@@ -695,7 +666,7 @@ Z7_COM7F_IMF(CExtractCallbackImp::CryptoGetTextPassword(BSTR *password))
       return E_ABORT;
     Password = dialog.Password;
     PasswordIsDefined = true;
-    #ifndef Z7_SFX
+    #ifndef _SFX
     if (dialog.ShowPassword != showPassword)
       NExtract::Save_ShowPassword(dialog.ShowPassword);
     #endif
@@ -705,24 +676,24 @@ Z7_COM7F_IMF(CExtractCallbackImp::CryptoGetTextPassword(BSTR *password))
 
 #endif
 
-#ifndef Z7_SFX
+#ifndef _SFX
 
-Z7_COM7F_IMF(CExtractCallbackImp::AskWrite(
+STDMETHODIMP CExtractCallbackImp::AskWrite(
     const wchar_t *srcPath, Int32 srcIsFolder,
     const FILETIME *srcTime, const UInt64 *srcSize,
     const wchar_t *destPath,
     BSTR *destPathResult,
-    Int32 *writeAnswer))
+    Int32 *writeAnswer)
 {
   UString destPathResultTemp = destPath;
 
   // RINOK(StringToBstr(destPath, destPathResult));
 
-  *destPathResult = NULL;
+  *destPathResult = 0;
   *writeAnswer = BoolToInt(false);
 
   FString destPathSys = us2fs(destPath);
-  const bool srcIsFolderSpec = IntToBool(srcIsFolder);
+  bool srcIsFolderSpec = IntToBool(srcIsFolder);
   CFileInfo destFileInfo;
   
   if (destFileInfo.Find(destPathSys))
@@ -731,7 +702,7 @@ Z7_COM7F_IMF(CExtractCallbackImp::AskWrite(
     {
       if (!destFileInfo.IsDir())
       {
-        RINOK(MessageError("Cannot replace file with folder with same name", destPathSys))
+        RINOK(MessageError("can not replace file with folder with same name", destPathSys));
         return E_ABORT;
       }
       *writeAnswer = BoolToInt(false);
@@ -740,12 +711,12 @@ Z7_COM7F_IMF(CExtractCallbackImp::AskWrite(
   
     if (destFileInfo.IsDir())
     {
-      RINOK(MessageError("Cannot replace folder with file with same name", destPathSys))
+      RINOK(MessageError("can not replace folder with file with same name", destPathSys));
       *writeAnswer = BoolToInt(false);
       return S_OK;
     }
 
-    switch ((int)OverwriteMode)
+    switch (OverwriteMode)
     {
       case NExtract::NOverwriteMode::kSkip:
         return S_OK;
@@ -753,8 +724,8 @@ Z7_COM7F_IMF(CExtractCallbackImp::AskWrite(
       {
         Int32 overwriteResult;
         UString destPathSpec = destPath;
-        const int slashPos = destPathSpec.ReverseFind_PathSepar();
-        destPathSpec.DeleteFrom((unsigned)(slashPos + 1));
+        int slashPos = destPathSpec.ReverseFind_PathSepar();
+        destPathSpec.DeleteFrom(slashPos + 1);
         destPathSpec += fs2us(destFileInfo.Name);
 
         RINOK(AskOverwrite(
@@ -762,7 +733,7 @@ Z7_COM7F_IMF(CExtractCallbackImp::AskWrite(
             &destFileInfo.MTime, &destFileInfo.Size,
             srcPath,
             srcTime, srcSize,
-            &overwriteResult))
+            &overwriteResult));
         
         switch (overwriteResult)
         {
@@ -775,28 +746,25 @@ Z7_COM7F_IMF(CExtractCallbackImp::AskWrite(
           default:
             return E_FAIL;
         }
-        break;
       }
-      default:
-        break;
     }
     
     if (OverwriteMode == NExtract::NOverwriteMode::kRename)
     {
       if (!AutoRenamePath(destPathSys))
       {
-        RINOK(MessageError("Cannot create name for file", destPathSys))
+        RINOK(MessageError("can not create name for file", destPathSys));
         return E_ABORT;
       }
       destPathResultTemp = fs2us(destPathSys);
     }
     else
     {
-      if (NFind::DoesFileExist_Raw(destPathSys))
+      if (NFind::DoesFileExist(destPathSys))
       if (!NDir::DeleteFileAlways(destPathSys))
       if (GetLastError() != ERROR_FILE_NOT_FOUND)
       {
-        RINOK(MessageError("Cannot delete output file", destPathSys))
+        RINOK(MessageError("can not delete output file", destPathSys));
         return E_ABORT;
       }
     }
@@ -806,7 +774,7 @@ Z7_COM7F_IMF(CExtractCallbackImp::AskWrite(
 }
 
 
-Z7_COM7F_IMF(CExtractCallbackImp::UseExtractToStream(Int32 *res))
+STDMETHODIMP CExtractCallbackImp::UseExtractToStream(Int32 *res)
 {
   *res = BoolToInt(StreamMode);
   return S_OK;
@@ -816,7 +784,7 @@ static HRESULT GetTime(IGetProp *getProp, PROPID propID, FILETIME &ft, bool &ftD
 {
   ftDefined = false;
   NCOM::CPropVariant prop;
-  RINOK(getProp->GetProp(propID, &prop))
+  RINOK(getProp->GetProp(propID, &prop));
   if (prop.vt == VT_FILETIME)
   {
     ft = prop.filetime;
@@ -832,7 +800,7 @@ static HRESULT GetItemBoolProp(IGetProp *getProp, PROPID propID, bool &result)
 {
   NCOM::CPropVariant prop;
   result = false;
-  RINOK(getProp->GetProp(propID, &prop))
+  RINOK(getProp->GetProp(propID, &prop));
   if (prop.vt == VT_BOOL)
     result = VARIANT_BOOLToBool(prop.boolVal);
   else if (prop.vt != VT_EMPTY)
@@ -841,45 +809,44 @@ static HRESULT GetItemBoolProp(IGetProp *getProp, PROPID propID, bool &result)
 }
 
 
-Z7_COM7F_IMF(CExtractCallbackImp::GetStream7(const wchar_t *name,
+STDMETHODIMP CExtractCallbackImp::GetStream7(const wchar_t *name,
     Int32 isDir,
     ISequentialOutStream **outStream, Int32 askExtractMode,
-    IGetProp *getProp))
+    IGetProp *getProp)
 {
   COM_TRY_BEGIN
-  *outStream = NULL;
+  *outStream = 0;
   _newVirtFileWasAdded = false;
-  _hashStream_WasUsed = false;
+  _hashStreamWasUsed = false;
   _needUpdateStat = false;
-  _isFolder = IntToBool(isDir);
-  _curSize_Defined = false;
-  _curSize = 0;
 
   if (_hashStream)
-    _hashStream->ReleaseStream();
+    _hashStreamSpec->ReleaseStream();
+
+  GetItemBoolProp(getProp, kpidIsAltStream, _isAltStream);
+
+  if (!ProcessAltStreams && _isAltStream)
+    return S_OK;
 
   _filePath = name;
+  _isFolder = IntToBool(isDir);
+  _curSize = 0;
+  _curSizeDefined = false;
 
   UInt64 size = 0;
-  bool size_Defined;
+  bool sizeDefined;
   {
     NCOM::CPropVariant prop;
-    RINOK(getProp->GetProp(kpidSize, &prop))
-    size_Defined = ConvertPropVariantToUInt64(prop, size);
+    RINOK(getProp->GetProp(kpidSize, &prop));
+    sizeDefined = ConvertPropVariantToUInt64(prop, size);
   }
-  if (size_Defined)
+
+  if (sizeDefined)
   {
     _curSize = size;
-    _curSize_Defined = true;
+    _curSizeDefined = true;
   }
 
-  GetItemBoolProp(getProp, kpidIsAltStream, _isAltStream);
-  if (!ProcessAltStreams && _isAltStream)
-    return S_OK;
-
-  if (isDir) // we don't support dir items extraction in this code
-    return S_OK;
-
   if (askExtractMode != NArchive::NExtract::NAskMode::kExtract &&
       askExtractMode != NArchive::NExtract::NAskMode::kTest)
     return S_OK;
@@ -890,64 +857,40 @@ Z7_COM7F_IMF(CExtractCallbackImp::GetStream7(const wchar_t *name,
   
   if (VirtFileSystem && askExtractMode == NArchive::NExtract::NAskMode::kExtract)
   {
-    if (!VirtFileSystemSpec->Files.IsEmpty())
-      VirtFileSystemSpec->MaxTotalAllocSize -= VirtFileSystemSpec->Files.Back().Data.Size();
-    CVirtFile &file = VirtFileSystemSpec->Files.AddNew();
+    CVirtFile &file = VirtFileSystemSpec->AddNewFile();
     _newVirtFileWasAdded = true;
-    // file.IsDir = _isFolder;
+    file.Name = name;
+    file.IsDir = IntToBool(isDir);
     file.IsAltStream = _isAltStream;
-    file.WrittenSize = 0;
-    file.ExpectedSize = 0;
-    if (size_Defined)
-      file.ExpectedSize = size;
+    file.Size = 0;
 
-    if (VirtFileSystemSpec->Index_of_MainExtractedFile_in_Files < 0)
-      if (!file.IsAltStream || VirtFileSystemSpec->IsAltStreamFile)
-        VirtFileSystemSpec->Index_of_MainExtractedFile_in_Files =
-            (int)(VirtFileSystemSpec->Files.Size() - 1);
+    RINOK(GetTime(getProp, kpidCTime, file.CTime, file.CTimeDefined));
+    RINOK(GetTime(getProp, kpidATime, file.ATime, file.ATimeDefined));
+    RINOK(GetTime(getProp, kpidMTime, file.MTime, file.MTimeDefined));
 
-    /* if we open only AltStream, then (name) contains only name without "fileName:" prefix */
-    file.BaseName = name;
-
-    if (file.IsAltStream
-        && !VirtFileSystemSpec->IsAltStreamFile
-        && file.BaseName.IsPrefixedBy_NoCase(VirtFileSystemSpec->FileName))
-    {
-      const unsigned colonPos = VirtFileSystemSpec->FileName.Len();
-      if (file.BaseName[colonPos] == ':')
-      {
-        file.ColonWasUsed = true;
-        file.AltStreamName = name + (size_t)colonPos + 1;
-        file.BaseName.DeleteFrom(colonPos);
-        if (Is_ZoneId_StreamName(file.AltStreamName))
-        {
-          if (VirtFileSystemSpec->Index_of_ZoneBuf_AltStream_in_Files < 0)
-            VirtFileSystemSpec->Index_of_ZoneBuf_AltStream_in_Files =
-              (int)(VirtFileSystemSpec->Files.Size() - 1);
-        }
-      }
-    }
-    RINOK(GetTime(getProp, kpidCTime, file.CTime, file.CTime_Defined))
-    RINOK(GetTime(getProp, kpidATime, file.ATime, file.ATime_Defined))
-    RINOK(GetTime(getProp, kpidMTime, file.MTime, file.MTime_Defined))
+    NCOM::CPropVariant prop;
+    RINOK(getProp->GetProp(kpidAttrib, &prop));
+    if (prop.vt == VT_UI4)
     {
-      NCOM::CPropVariant prop;
-      RINOK(getProp->GetProp(kpidAttrib, &prop))
-      if (prop.vt == VT_UI4)
-      {
-        file.Attrib = prop.ulVal;
-        file.Attrib_Defined = true;
-      }
+      file.Attrib = prop.ulVal;
+      file.AttribDefined = true;
     }
+    // else if (isDir) file.Attrib = FILE_ATTRIBUTE_DIRECTORY;
+
+    file.ExpectedSize = 0;
+    if (sizeDefined)
+      file.ExpectedSize = size;
     outStreamLoc = VirtFileSystem;
   }
 
   if (_hashStream)
   {
-    _hashStream->SetStream(outStreamLoc);
-    outStreamLoc = _hashStream;
-    _hashStream->Init(true);
-    _hashStream_WasUsed = true;
+    {
+      _hashStreamSpec->SetStream(outStreamLoc);
+      outStreamLoc = _hashStream;
+      _hashStreamSpec->Init(true);
+      _hashStreamWasUsed = true;
+    }
   }
 
   if (outStreamLoc)
@@ -956,14 +899,12 @@ Z7_COM7F_IMF(CExtractCallbackImp::GetStream7(const wchar_t *name,
   COM_TRY_END
 }
 
-Z7_COM7F_IMF(CExtractCallbackImp::PrepareOperation7(Int32 askExtractMode))
+STDMETHODIMP CExtractCallbackImp::PrepareOperation7(Int32 askExtractMode)
 {
   COM_TRY_BEGIN
   _needUpdateStat = (
-         askExtractMode == NArchive::NExtract::NAskMode::kExtract
-      || askExtractMode == NArchive::NExtract::NAskMode::kTest
-      || askExtractMode == NArchive::NExtract::NAskMode::kReadExternal
-      );
+      askExtractMode == NArchive::NExtract::NAskMode::kExtract ||
+      askExtractMode == NArchive::NExtract::NAskMode::kTest);
 
   /*
   _extractMode = false;
@@ -981,27 +922,27 @@ Z7_COM7F_IMF(CExtractCallbackImp::PrepareOperation7(Int32 askExtractMode))
   COM_TRY_END
 }
 
-Z7_COM7F_IMF(CExtractCallbackImp::SetOperationResult8(Int32 opRes, Int32 encrypted, UInt64 size))
+STDMETHODIMP CExtractCallbackImp::SetOperationResult7(Int32 opRes, Int32 encrypted)
 {
   COM_TRY_BEGIN
   if (VirtFileSystem && _newVirtFileWasAdded)
   {
     // FIXME: probably we must request file size from VirtFileSystem
     // _curSize = VirtFileSystem->GetLastFileSize()
-    // _curSize_Defined = true;
-    RINOK(VirtFileSystemSpec->CloseMemFile())
+    // _curSizeDefined = true;
+    RINOK(VirtFileSystemSpec->CloseMemFile());
   }
-  if (_hashStream && _hashStream_WasUsed)
+  if (_hashStream && _hashStreamWasUsed)
   {
-    _hashStream->_hash->Final(_isFolder, _isAltStream, _filePath);
-    _curSize = _hashStream->GetSize();
-    _curSize_Defined = true;
-    _hashStream->ReleaseStream();
-    _hashStream_WasUsed = false;
+    _hashStreamSpec->_hash->Final(_isFolder, _isAltStream, _filePath);
+    _curSize = _hashStreamSpec->GetSize();
+    _curSizeDefined = true;
+    _hashStreamSpec->ReleaseStream();
+    _hashStreamWasUsed = false;
   }
   else if (_hashCalc && _needUpdateStat)
   {
-    _hashCalc->SetSize(size); // (_curSize) before 21.04
+    _hashCalc->SetSize(_curSize);
     _hashCalc->Final(_isFolder, _isAltStream, _filePath);
   }
   return SetOperationResult(opRes, encrypted);
@@ -1009,262 +950,86 @@ Z7_COM7F_IMF(CExtractCallbackImp::SetOperationResult8(Int32 opRes, Int32 encrypt
 }
 
 
-Z7_COM7F_IMF(CExtractCallbackImp::RequestMemoryUse(
-    UInt32 flags, UInt32 indexType, UInt32 /* index */, const wchar_t *path,
-    UInt64 requiredSize, UInt64 *allowedSize, UInt32 *answerFlags))
-{
-  UInt32 limit_GB = (UInt32)((*allowedSize + ((1u << 30) - 1)) >> 30);
-
-  if ((flags & NRequestMemoryUseFlags::k_IsReport) == 0)
-  {
-    UInt64 limit_bytes = *allowedSize;
-    const UInt32 limit_GB_Registry = NExtract::Read_LimitGB();
-    if (limit_GB_Registry != 0 && limit_GB_Registry != (UInt32)(Int32)-1)
-    {
-      const UInt64 limit_bytes_Registry = (UInt64)limit_GB_Registry << 30;
-      // registry_WasForced = true;
-      if ((flags & NRequestMemoryUseFlags::k_AllowedSize_WasForced) == 0
-          || limit_bytes < limit_bytes_Registry)
-      {
-        limit_bytes = limit_bytes_Registry;
-        limit_GB = limit_GB_Registry;
-      }
-    }
-    *allowedSize = limit_bytes;
-    if (requiredSize <= limit_bytes)
-    {
-      *answerFlags = NRequestMemoryAnswerFlags::k_Allow;
-      return S_OK;
-    }
-    // default answer can be k_Allow, if limit was not forced,
-    // so we change answer to non-allowed here,
-    // because user has chance to change limit in GUI.
-    *answerFlags = NRequestMemoryAnswerFlags::k_Limit_Exceeded;
-    if (flags & NRequestMemoryUseFlags::k_SkipArc_IsExpected)
-      *answerFlags |= NRequestMemoryAnswerFlags::k_SkipArc;
-  }
-
-  const UInt32 required_GB = (UInt32)((requiredSize + ((1u << 30) - 1)) >> 30);
-
-  CMemDialog dialog;
-  dialog.Limit_GB = limit_GB;
-  dialog.Required_GB = required_GB;
-  dialog.TestMode = TestMode;
-  if (MultiArcMode)
-    dialog.ArcPath = _currentArchivePath;
-  if (path)
-    dialog.FilePath = path;
-  
-  if (!g_DisableUserQuestions
-      && (flags & NRequestMemoryUseFlags::k_IsReport) == 0)
-  {
-    if (_remember)
-      dialog.SkipArc = _skipArc;
-    else
-    {
-      dialog.ShowRemember =
-        (MultiArcMode
-          || indexType != NArchive::NEventIndexType::kNoIndex
-          || path);
-      ProgressDialog->WaitCreating();
-      if (dialog.Create(*ProgressDialog) != IDCONTINUE)
-      {
-        *answerFlags = NRequestMemoryAnswerFlags::k_Stop;
-        return E_ABORT;
-      }
-      if (dialog.NeedSave)
-        NExtract::Save_LimitGB(dialog.Limit_GB);
-      if (dialog.Remember)
-      {
-        _remember = true;
-        _skipArc = dialog.SkipArc;
-      }
-    }
-    
-    *allowedSize = (UInt64)dialog.Limit_GB << 30;
-    if (!dialog.SkipArc)
-    {
-      *answerFlags = NRequestMemoryAnswerFlags::k_Allow;
-      return S_OK;
-    }
-    *answerFlags =
-        NRequestMemoryAnswerFlags::k_SkipArc
-      | NRequestMemoryAnswerFlags::k_Limit_Exceeded;
-    flags |= NRequestMemoryUseFlags::k_Report_SkipArc;
-  }
-  
-  if ((flags & NRequestMemoryUseFlags::k_NoErrorMessage) == 0)
-  {
-    UString s ("ERROR: ");
-    dialog.AddInfoMessage_To_String(s);
-    s.Add_LF();
-    // if (indexType == NArchive::NEventIndexType::kNoIndex)
-    if ((flags & NRequestMemoryUseFlags::k_SkipArc_IsExpected) ||
-        (flags & NRequestMemoryUseFlags::k_Report_SkipArc))
-      AddLangString(s, IDS_MSG_ARC_UNPACKING_WAS_SKIPPED);
-/*
-    else
-      AddLangString(, IDS_MSG_ARC_FILES_UNPACKING_WAS_SKIPPED);
-*/
-    AddError_Message_ShowArcPath(s);
-  }
-  
-/*
-  if ((flags & NRequestMemoryUseFlags::k_IsReport) == 0)
-    *answerFlags |= NRequestMemoryAnswerFlags::k_Limit_Exceeded;
-*/
-  return S_OK;
-}
+static const size_t k_SizeT_MAX = (size_t)((size_t)0 - 1);
 
+static const UInt32 kBlockSize = ((UInt32)1 << 31);
 
-Z7_COM7F_IMF(CVirtFileSystem::Write(const void *data, UInt32 size, UInt32 *processedSize))
+STDMETHODIMP CVirtFileSystem::Write(const void *data, UInt32 size, UInt32 *processedSize)
 {
   if (processedSize)
     *processedSize = 0;
   if (size == 0)
     return S_OK;
-  if (!_wasSwitchedToFsMode)
+  if (!_fileMode)
   {
     CVirtFile &file = Files.Back();
-    const size_t rem = file.Data.Size() - file.WrittenSize;
+    size_t rem = file.Data.Size() - (size_t)file.Size;
     bool useMem = true;
     if (rem < size)
     {
       UInt64 b = 0;
       if (file.Data.Size() == 0)
         b = file.ExpectedSize;
-      UInt64 a = (UInt64)file.WrittenSize + size;
+      UInt64 a = file.Size + size;
       if (b < a)
         b = a;
       a = (UInt64)file.Data.Size() * 2;
       if (b < a)
         b = a;
       useMem = false;
-      if (b <= MaxTotalAllocSize)
-        useMem = file.Data.ReAlloc_KeepData((size_t)b, file.WrittenSize);
+      if (b <= k_SizeT_MAX && b <= MaxTotalAllocSize)
+        useMem = file.Data.ReAlloc_KeepData((size_t)b, (size_t)file.Size);
     }
-
-#if 0 // 1 for debug : FLUSHING TO FS
-    useMem = false;
-#endif
-
     if (useMem)
     {
-      memcpy(file.Data + file.WrittenSize, data, size);
-      file.WrittenSize += size;
+      memcpy(file.Data + file.Size, data, size);
+      file.Size += size;
       if (processedSize)
         *processedSize = (UInt32)size;
       return S_OK;
     }
-    _wasSwitchedToFsMode = true;
-  }
-  
-  if (!_newVirtFileStream_IsReadyToWrite) // we check for _newVirtFileStream_IsReadyToWrite to optimize execution
-  {
-    RINOK(FlushToDisk(false))
+    _fileMode = true;
   }
-
-  if (_needWriteToRealFile)
-    return _outFileStream.Interface()->Write(data, size, processedSize);
-  if (processedSize)
-    *processedSize = size;
-  return S_OK;
+  RINOK(FlushToDisk(false));
+  return _outFileStream->Write(data, size, processedSize);
 }
 
-
 HRESULT CVirtFileSystem::FlushToDisk(bool closeLast)
 {
+  if (!_outFileStream)
+  {
+    _outFileStreamSpec = new COutFileStream;
+    _outFileStream = _outFileStreamSpec;
+  }
   while (_numFlushed < Files.Size())
   {
-    CVirtFile &file = Files[_numFlushed];
-    const FString basePath = DirPrefix + us2fs(Get_Correct_FsFile_Name(file.BaseName));
-    FString path = basePath;
-
-    if (file.ColonWasUsed)
+    const CVirtFile &file = Files[_numFlushed];
+    const FString path = DirPrefix + us2fs(Get_Correct_FsFile_Name(file.Name));
+    if (!_fileIsOpen)
     {
-      if (ZoneBuf.Size() != 0
-          && Is_ZoneId_StreamName(file.AltStreamName))
+      if (!_outFileStreamSpec->Create(path, false))
       {
-        // it's expected that
-        // CArchiveExtractCallback::GetStream() have excluded
-        // ZoneId alt stream from extraction already.
-        // But we exclude alt stream extraction here too.
-        _numFlushed++;
-        continue;
+        _outFileStream.Release();
+        return E_FAIL;
+        // MessageBoxMyError(UString("Can't create file ") + fs2us(tempFilePath));
       }
-      path.Add_Colon();
-      path += us2fs(Get_Correct_FsFile_Name(file.AltStreamName));
+      _fileIsOpen = true;
+      RINOK(WriteStream(_outFileStream, file.Data, (size_t)file.Size));
     }
-
-    if (!_newVirtFileStream_IsReadyToWrite)
-    {
-      if (file.ColonWasUsed)
-      {
-        NFind::CFileInfo parentFi;
-        if (parentFi.Find(basePath)
-            && parentFi.IsReadOnly())
-        {
-          _altStream_NeedRestore_Attrib_bool = true;
-          _altStream_NeedRestore_AttribVal = parentFi.Attrib;
-          NDir::SetFileAttrib(basePath, parentFi.Attrib & ~(DWORD)FILE_ATTRIBUTE_READONLY);
-        }
-      }
-      _outFileStream.Create_if_Empty();
-      _needWriteToRealFile = _outFileStream->Create_NEW(path);
-      if (!_needWriteToRealFile)
-      {
-        if (!file.ColonWasUsed)
-          return GetLastError_noZero_HRESULT(); // it's main file and we can't ignore such error.
-        // (file.ColonWasUsed == true)
-        // So it's additional alt stream.
-        // And we ignore file creation error for additional alt stream.
-        // ShowErrorMessage(UString("Can't create file ") + fs2us(path));
-      }
-      _newVirtFileStream_IsReadyToWrite = true;
-      // _openFilePath = path;
-      HRESULT hres = S_OK;
-      if (_needWriteToRealFile)
-        hres = WriteStream(_outFileStream, file.Data, file.WrittenSize);
-      // we free allocated memory buffer after data flushing:
-      file.WrittenSize = 0;
-      file.Data.Free();
-      RINOK(hres)
-    }
-    
     if (_numFlushed == Files.Size() - 1 && !closeLast)
       break;
-    
-    if (_needWriteToRealFile)
-    {
-      if (file.CTime_Defined ||
-          file.ATime_Defined ||
-          file.MTime_Defined)
-        _outFileStream->SetTime(
-          file.CTime_Defined ? &file.CTime : NULL,
-          file.ATime_Defined ? &file.ATime : NULL,
-          file.MTime_Defined ? &file.MTime : NULL);
-      _outFileStream->Close();
-    }
-    
+    if (file.CTimeDefined ||
+        file.ATimeDefined ||
+        file.MTimeDefined)
+      _outFileStreamSpec->SetTime(
+          file.CTimeDefined ? &file.CTime : NULL,
+          file.ATimeDefined ? &file.ATime : NULL,
+          file.MTimeDefined ? &file.MTime : NULL);
+    _outFileStreamSpec->Close();
     _numFlushed++;
-    _newVirtFileStream_IsReadyToWrite = false;
-
-    if (_needWriteToRealFile)
-    {
-      if (!file.ColonWasUsed
-          && ZoneBuf.Size() != 0)
-        WriteZoneFile_To_BaseFile(path, ZoneBuf);
-      if (file.Attrib_Defined)
-        NDir::SetFileAttrib_PosixHighDetect(path, file.Attrib);
-      // _openFilePath.Empty();
-      _needWriteToRealFile = false;
-    }
-      
-    if (_altStream_NeedRestore_Attrib_bool)
-    {
-      _altStream_NeedRestore_Attrib_bool = false;
-      NDir::SetFileAttrib(basePath, _altStream_NeedRestore_AttribVal);
-    }
+    _fileIsOpen = false;
+    if (file.AttribDefined)
+      NDir::SetFileAttrib_PosixHighDetect(path, file.Attrib);
   }
   return S_OK;
 }