react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/GUI/ExtractDialog.cpp

@@ -9,7 +9,7 @@
 #include "../../../Windows/FileDir.h"
 #include "../../../Windows/ResourceString.h"
 
-#ifndef Z7_NO_REGISTRY
+#ifndef NO_REGISTRY
 #include "../FileManager/HelpUtils.h"
 #endif
 
@@ -28,8 +28,6 @@ using namespace NName;
 
 extern HINSTANCE g_hInstance;
 
-#ifndef Z7_SFX
-
 static const UInt32 kPathMode_IDs[] =
 {
   IDS_EXTRACT_PATHS_FULL,
@@ -46,6 +44,8 @@ static const UInt32 kOverwriteMode_IDs[] =
   IDS_EXTRACT_OVERWRITE_RENAME_EXISTING
 };
 
+#ifndef _SFX
+
 static const
   // NExtract::NPathMode::EEnum
   int
@@ -70,7 +70,7 @@ static const
 
 #endif
 
-#ifdef Z7_LANG
+#ifdef LANG
 
 static const UInt32 kLangIDs[] =
 {
@@ -87,23 +87,22 @@ static const UInt32 kLangIDs[] =
 
 // static const int kWildcardsButtonIndex = 2;
 
-#ifndef Z7_NO_REGISTRY
+#ifndef NO_REGISTRY
 static const unsigned kHistorySize = 16;
 #endif
 
-#ifndef Z7_SFX
+#ifndef _SFX
 
 // it's used in CompressDialog also
-void AddComboItems(NControl::CComboBox &combo, const UInt32 *langIDs, unsigned numItems, const int *values, int curVal);
 void AddComboItems(NControl::CComboBox &combo, const UInt32 *langIDs, unsigned numItems, const int *values, int curVal)
 {
-  unsigned curSel = 0;
+  int curSel = 0;
   for (unsigned i = 0; i < numItems; i++)
   {
     UString s = LangString(langIDs[i]);
     s.RemoveChar(L'&');
-    const int index = (int)combo.AddString(s);
-    combo.SetItemData(index, (LPARAM)i);
+    int index = (int)combo.AddString(s);
+    combo.SetItemData(index, i);
     if (values[i] == curVal)
       curSel = i;
   }
@@ -111,7 +110,6 @@ void AddComboItems(NControl::CComboBox &combo, const UInt32 *langIDs, unsigned n
 }
 
 // it's used in CompressDialog also
-bool GetBoolsVal(const CBoolPair &b1, const CBoolPair &b2);
 bool GetBoolsVal(const CBoolPair &b1, const CBoolPair &b2)
 {
   if (b1.Def) return b1.Val;
@@ -126,8 +124,8 @@ void CExtractDialog::CheckButton_TwoBools(UINT id, const CBoolPair &b1, const CB
 
 void CExtractDialog::GetButton_Bools(UINT id, CBoolPair &b1, CBoolPair &b2)
 {
-  const bool val = IsButtonCheckedBool(id);
-  const bool oldVal = GetBoolsVal(b1, b2);
+  bool val = IsButtonCheckedBool(id);
+  bool oldVal = GetBoolsVal(b1, b2);
   if (val != oldVal)
     b1.Def = b2.Def = true;
   b1.Val = b2.Val = val;
@@ -137,7 +135,7 @@ void CExtractDialog::GetButton_Bools(UINT id, CBoolPair &b1, CBoolPair &b2)
 
 bool CExtractDialog::OnInit()
 {
-  #ifdef Z7_LANG
+  #ifdef LANG
   {
     UString s;
     LangString_OnlyFromLangFile(IDD_EXTRACT, s);
@@ -150,18 +148,18 @@ bool CExtractDialog::OnInit()
     }
     SetText(s);
     // LangSetWindowText(*this, IDD_EXTRACT);
-    LangSetDlgItems(*this, kLangIDs, Z7_ARRAY_SIZE(kLangIDs));
+    LangSetDlgItems(*this, kLangIDs, ARRAY_SIZE(kLangIDs));
   }
   #endif
   
-  #ifndef Z7_SFX
+  #ifndef _SFX
   _passwordControl.Attach(GetItem(IDE_EXTRACT_PASSWORD));
   _passwordControl.SetText(Password);
   _passwordControl.SetPasswordChar(TEXT('*'));
   _pathName.Attach(GetItem(IDE_EXTRACT_NAME));
   #endif
 
-  #ifdef Z7_NO_REGISTRY
+  #ifdef NO_REGISTRY
   
   PathMode = NExtract::NPathMode::kFullPaths;
   OverwriteMode = NExtract::NOverwriteMode::kAsk;
@@ -191,7 +189,7 @@ bool CExtractDialog::OnInit()
 
   UString pathPrefix = DirPath;
 
-  #ifndef Z7_SFX
+  #ifndef _SFX
   
   if (_info.SplitDest.Val)
   {
@@ -210,7 +208,7 @@ bool CExtractDialog::OnInit()
 
   _path.SetText(pathPrefix);
 
-  #ifndef Z7_NO_REGISTRY
+  #ifndef NO_REGISTRY
   for (unsigned i = 0; i < _info.Paths.Size() && i < kHistorySize; i++)
     _path.AddString(_info.Paths[i]);
   #endif
@@ -222,13 +220,13 @@ bool CExtractDialog::OnInit()
     _path.SetCurSel(-1);
   */
 
-  #ifndef Z7_SFX
+  #ifndef _SFX
 
   _pathMode.Attach(GetItem(IDC_EXTRACT_PATH_MODE));
   _overwriteMode.Attach(GetItem(IDC_EXTRACT_OVERWRITE_MODE));
 
-  AddComboItems(_pathMode, kPathMode_IDs, Z7_ARRAY_SIZE(kPathMode_IDs), kPathModeButtonsVals, PathMode);
-  AddComboItems(_overwriteMode, kOverwriteMode_IDs, Z7_ARRAY_SIZE(kOverwriteMode_IDs), kOverwriteButtonsVals, OverwriteMode);
+  AddComboItems(_pathMode, kPathMode_IDs, ARRAY_SIZE(kPathMode_IDs), kPathModeButtonsVals, PathMode);
+  AddComboItems(_overwriteMode, kOverwriteMode_IDs, ARRAY_SIZE(kOverwriteMode_IDs), kOverwriteButtonsVals, OverwriteMode);
 
   #endif
 
@@ -243,7 +241,7 @@ bool CExtractDialog::OnInit()
   return CModalDialog::OnInit();
 }
 
-#ifndef Z7_SFX
+#ifndef _SFX
 void CExtractDialog::UpdatePasswordControl()
 {
   _passwordControl.SetPasswordChar(IsShowPasswordChecked() ? 0 : TEXT('*'));
@@ -253,14 +251,14 @@ void CExtractDialog::UpdatePasswordControl()
 }
 #endif
 
-bool CExtractDialog::OnButtonClicked(unsigned buttonID, HWND buttonHWND)
+bool CExtractDialog::OnButtonClicked(int buttonID, HWND buttonHWND)
 {
   switch (buttonID)
   {
     case IDB_EXTRACT_SET_PATH:
       OnButtonSetPath();
       return true;
-    #ifndef Z7_SFX
+    #ifndef _SFX
     case IDX_EXTRACT_NAME_ENABLE:
       ShowItem_Bool(IDE_EXTRACT_NAME, IsButtonCheckedBool(IDX_EXTRACT_NAME_ENABLE));
       return true;
@@ -282,13 +280,12 @@ void CExtractDialog::OnButtonSetPath()
   UString resultPath;
   if (!MyBrowseForFolder(*this, title, currentPath, resultPath))
     return;
-  #ifndef Z7_NO_REGISTRY
+  #ifndef NO_REGISTRY
   _path.SetCurSel(-1);
   #endif
   _path.SetText(resultPath);
 }
 
-void AddUniqueString(UStringVector &list, const UString &s);
 void AddUniqueString(UStringVector &list, const UString &s)
 {
   FOR_VECTOR (i, list)
@@ -299,7 +296,7 @@ void AddUniqueString(UStringVector &list, const UString &s)
 
 void CExtractDialog::OnOK()
 {
-  #ifndef Z7_SFX
+  #ifndef _SFX
   int pathMode2 = kPathModeButtonsVals[_pathMode.GetCurSel()];
   if (PathMode != NExtract::NPathMode::kCurPaths ||
       pathMode2 != NExtract::NPathMode::kFullPaths)
@@ -313,7 +310,7 @@ void CExtractDialog::OnOK()
 
   #endif
 
-  #ifndef Z7_NO_REGISTRY
+  #ifndef NO_REGISTRY
 
   // GetButton_Bools(IDX_EXTRACT_ALT_STREAMS, AltStreams, _info.AltStreams);
   GetButton_Bools(IDX_EXTRACT_NT_SECUR,    NtSecurity, _info.NtSecurity);
@@ -350,7 +347,7 @@ void CExtractDialog::OnOK()
   
   UString s;
   
-  #ifdef Z7_NO_REGISTRY
+  #ifdef NO_REGISTRY
   
   _path.GetText(s);
   
@@ -360,7 +357,7 @@ void CExtractDialog::OnOK()
   if (currentItem == CB_ERR)
   {
     _path.GetText(s);
-    if (_path.GetCount() >= (int)kHistorySize)
+    if (_path.GetCount() >= kHistorySize)
       currentItem = _path.GetCount() - 1;
   }
   else
@@ -371,9 +368,9 @@ void CExtractDialog::OnOK()
   s.Trim();
   NName::NormalizeDirPathPrefix(s);
   
-  #ifndef Z7_SFX
+  #ifndef _SFX
   
-  const bool splitDest = IsButtonCheckedBool(IDX_EXTRACT_NAME_ENABLE);
+  bool splitDest = IsButtonCheckedBool(IDX_EXTRACT_NAME_ENABLE);
   if (splitDest)
   {
     UString pathName;
@@ -392,9 +389,9 @@ void CExtractDialog::OnOK()
 
   DirPath = s;
   
-  #ifndef Z7_NO_REGISTRY
+  #ifndef NO_REGISTRY
   _info.Paths.Clear();
-  #ifndef Z7_SFX
+  #ifndef _SFX
   AddUniqueString(_info.Paths, s);
   #endif
   for (int i = 0; i < _path.GetCount(); i++)
@@ -411,7 +408,7 @@ void CExtractDialog::OnOK()
   CModalDialog::OnOK();
 }
 
-#ifndef Z7_NO_REGISTRY
+#ifndef NO_REGISTRY
 #define kHelpTopic "fm/plugins/7-zip/extract.htm"
 void CExtractDialog::OnHelp()
 {

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/GUI/ExtractDialog.h

@@ -1,7 +1,7 @@
 // ExtractDialog.h
 
-#ifndef ZIP7_INC_EXTRACT_DIALOG_H
-#define ZIP7_INC_EXTRACT_DIALOG_H
+#ifndef __EXTRACT_DIALOG_H
+#define __EXTRACT_DIALOG_H
 
 #include "ExtractDialogRes.h"
 
@@ -12,7 +12,7 @@
 
 #include "../FileManager/DialogSize.h"
 
-#ifndef Z7_NO_REGISTRY
+#ifndef NO_REGISTRY
 #include "../Common/ZipRegistry.h"
 #endif
 
@@ -33,20 +33,20 @@ namespace NExtractionDialog
 
 class CExtractDialog: public NWindows::NControl::CModalDialog
 {
-  #ifdef Z7_NO_REGISTRY
+  #ifdef NO_REGISTRY
   NWindows::NControl::CDialogChildControl _path;
   #else
   NWindows::NControl::CComboBox _path;
   #endif
 
-  #ifndef Z7_SFX
+  #ifndef _SFX
   NWindows::NControl::CEdit _pathName;
   NWindows::NControl::CEdit _passwordControl;
   NWindows::NControl::CComboBox _pathMode;
   NWindows::NControl::CComboBox _overwriteMode;
   #endif
 
-  #ifndef Z7_SFX
+  #ifndef _SFX
   // int GetFilesMode() const;
   void UpdatePasswordControl();
   #endif
@@ -55,13 +55,13 @@ class CExtractDialog: public NWindows::NControl::CModalDialog
 
   void CheckButton_TwoBools(UINT id, const CBoolPair &b1, const CBoolPair &b2);
   void GetButton_Bools(UINT id, CBoolPair &b1, CBoolPair &b2);
-  virtual bool OnInit() Z7_override;
-  virtual bool OnButtonClicked(unsigned buttonID, HWND buttonHWND) Z7_override;
-  virtual void OnOK() Z7_override;
+  virtual bool OnInit();
+  virtual bool OnButtonClicked(int buttonID, HWND buttonHWND);
+  virtual void OnOK();
   
-  #ifndef Z7_NO_REGISTRY
+  #ifndef NO_REGISTRY
 
-  virtual void OnHelp() Z7_override;
+  virtual void OnHelp();
 
   NExtract::CInfo _info;
   
@@ -76,7 +76,7 @@ public:
   UString DirPath;
   UString ArcPath;
 
-  #ifndef Z7_SFX
+  #ifndef _SFX
   UString Password;
   #endif
   bool PathMode_Force;
@@ -84,16 +84,16 @@ public:
   NExtract::NPathMode::EEnum PathMode;
   NExtract::NOverwriteMode::EEnum OverwriteMode;
 
-  #ifndef Z7_SFX
+  #ifndef _SFX
   // CBoolPair AltStreams;
   CBoolPair NtSecurity;
   #endif
 
   CBoolPair ElimDup;
 
-  INT_PTR Create(HWND aWndParent = NULL)
+  INT_PTR Create(HWND aWndParent = 0)
   {
-    #ifdef Z7_SFX
+    #ifdef _SFX
     BIG_DIALOG_SIZE(240, 64);
     #else
     BIG_DIALOG_SIZE(300, 160);

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/GUI/ExtractGUI.cpp

@@ -36,15 +36,17 @@ using namespace NDir;
 
 static const wchar_t * const kIncorrectOutDir = L"Incorrect output directory path";
 
-#ifndef Z7_SFX
+#ifndef _SFX
 
 static void AddValuePair(UString &s, UINT resourceID, UInt64 value, bool addColon = true)
 {
   AddLangString(s, resourceID);
   if (addColon)
-    s.Add_Colon();
+    s += ':';
   s.Add_Space();
-  s.Add_UInt64(value);
+  char sz[32];
+  ConvertUInt64ToString(value, sz);
+  s += sz;
   s.Add_LF();
 }
 
@@ -60,14 +62,8 @@ static void AddSizePair(UString &s, UINT resourceID, UInt64 value)
 
 class CThreadExtracting: public CProgressThreadVirt
 {
-  HRESULT ProcessVirt() Z7_override;
+  HRESULT ProcessVirt();
 public:
-  /*
-  #ifdef Z7_EXTERNAL_CODECS
-  const CExternalCodecs *externalCodecs;
-  #endif
-  */
-
   CCodecs *codecs;
   CExtractCallbackImp *ExtractCallbackSpec;
   const CObjectVector<COpenType> *FormatIndices;
@@ -78,19 +74,19 @@ public:
   const NWildcard::CCensorNode *WildcardCensor;
   const CExtractOptions *Options;
 
-  #ifndef Z7_SFX
+  #ifndef _SFX
   CHashBundle *HashBundle;
-  virtual void ProcessWasFinished_GuiVirt() Z7_override;
+  virtual void ProcessWasFinished_GuiVirt();
   #endif
 
-  CMyComPtr<IFolderArchiveExtractCallback> FolderArchiveExtractCallback;
+  CMyComPtr<IExtractCallbackUI> ExtractCallback;
   UString Title;
 
   CPropNameValPairs Pairs;
 };
 
 
-#ifndef Z7_SFX
+#ifndef _SFX
 void CThreadExtracting::ProcessWasFinished_GuiVirt()
 {
   if (HashBundle && !Pairs.IsEmpty())
@@ -102,30 +98,23 @@ HRESULT CThreadExtracting::ProcessVirt()
 {
   CDecompressStat Stat;
   
-  #ifndef Z7_SFX
+  #ifndef _SFX
   /*
   if (HashBundle)
     HashBundle->Init();
   */
   #endif
 
-  HRESULT res = Extract(
-      /*
-      #ifdef Z7_EXTERNAL_CODECS
-      externalCodecs,
-      #endif
-      */
-      codecs,
+  HRESULT res = Extract(codecs,
       *FormatIndices, *ExcludedFormatIndices,
       *ArchivePaths, *ArchivePathsFull,
-      *WildcardCensor, *Options,
-      ExtractCallbackSpec, ExtractCallbackSpec, FolderArchiveExtractCallback,
-      #ifndef Z7_SFX
+      *WildcardCensor, *Options, ExtractCallbackSpec, ExtractCallback,
+      #ifndef _SFX
         HashBundle,
       #endif
       FinalMessage.ErrorMessage.Message, Stat);
   
-  #ifndef Z7_SFX
+  #ifndef _SFX
   if (res == S_OK && ExtractCallbackSpec->IsOK())
   {
     if (HashBundle)
@@ -165,7 +154,6 @@ HRESULT CThreadExtracting::ProcessVirt()
 
 
 HRESULT ExtractGUI(
-    // DECL_EXTERNAL_CODECS_LOC_VARS
     CCodecs *codecs,
     const CObjectVector<COpenType> &formatIndices,
     const CIntVector &excludedFormatIndices,
@@ -173,7 +161,7 @@ HRESULT ExtractGUI(
     UStringVector &archivePathsFull,
     const NWildcard::CCensorNode &wildcardCensor,
     CExtractOptions &options,
-    #ifndef Z7_SFX
+    #ifndef _SFX
     CHashBundle *hb,
     #endif
     bool showDialog,
@@ -184,11 +172,6 @@ HRESULT ExtractGUI(
   messageWasDisplayed = false;
 
   CThreadExtracting extracter;
-  /*
-  #ifdef Z7_EXTERNAL_CODECS
-  extracter.externalCodecs = _externalCodecs;
-  #endif
-  */
   extracter.codecs = codecs;
   extracter.FormatIndices = &formatIndices;
   extracter.ExcludedFormatIndices = &excludedFormatIndices;
@@ -223,7 +206,7 @@ HRESULT ExtractGUI(
       if (archivePathsFull.Size() == 1)
         dialog.ArcPath = archivePathsFull[0];
 
-      #ifndef Z7_SFX
+      #ifndef _SFX
       // dialog.AltStreams = options.NtOptions.AltStreams;
       dialog.NtSecurity = options.NtOptions.NtSecurity;
       if (extractCallback->PasswordIsDefined)
@@ -239,7 +222,7 @@ HRESULT ExtractGUI(
       options.PathMode = dialog.PathMode;
       options.ElimDup = dialog.ElimDup;
       
-      #ifndef Z7_SFX
+      #ifndef _SFX
       // options.NtOptions.AltStreams = dialog.AltStreams;
       options.NtOptions.NtSecurity = dialog.NtSecurity;
       extractCallback->Password = dialog.Password;
@@ -259,7 +242,7 @@ HRESULT ExtractGUI(
     {
       UString s = GetUnicodeString(NError::MyFormatMessage(GetLastError()));
       UString s2 = MyFormatNew(IDS_CANNOT_CREATE_FOLDER,
-      #ifdef Z7_LANG
+      #ifdef LANG
       0x02000603,
       #endif
       options.OutputDir);
@@ -276,7 +259,7 @@ HRESULT ExtractGUI(
   extracter.Title = title;
   extracter.ExtractCallbackSpec = extractCallback;
   extracter.ExtractCallbackSpec->ProgressDialog = &extracter;
-  extracter.FolderArchiveExtractCallback = extractCallback;
+  extracter.ExtractCallback = extractCallback;
   extracter.ExtractCallbackSpec->Init();
 
   extracter.CompressingMode = false;
@@ -285,13 +268,13 @@ HRESULT ExtractGUI(
   extracter.ArchivePathsFull = &archivePathsFull;
   extracter.WildcardCensor = &wildcardCensor;
   extracter.Options = &options;
-  #ifndef Z7_SFX
+  #ifndef _SFX
   extracter.HashBundle = hb;
   #endif
 
   extracter.IconID = IDI_ICON;
 
-  RINOK(extracter.Create(title, hwndParent))
+  RINOK(extracter.Create(title, hwndParent));
   messageWasDisplayed = extracter.ThreadFinishedOK && extracter.MessagesDisplayed;
   return extracter.Result;
 }

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/GUI/ExtractGUI.h

@@ -1,7 +1,7 @@
 // GUI/ExtractGUI.h
 
-#ifndef ZIP7_INC_EXTRACT_GUI_H
-#define ZIP7_INC_EXTRACT_GUI_H
+#ifndef __EXTRACT_GUI_H
+#define __EXTRACT_GUI_H
 
 #include "../Common/Extract.h"
 
@@ -20,7 +20,6 @@
 */
 
 HRESULT ExtractGUI(
-    // DECL_EXTERNAL_CODECS_LOC_VARS
     CCodecs *codecs,
     const CObjectVector<COpenType> &formatIndices,
     const CIntVector &excludedFormatIndices,
@@ -28,7 +27,7 @@ HRESULT ExtractGUI(
     UStringVector &archivePathsFull,
     const NWildcard::CCensorNode &wildcardCensor,
     CExtractOptions &options,
-    #ifndef Z7_SFX
+    #ifndef _SFX
     CHashBundle *hb,
     #endif
     bool showDialog,

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/GUI/HashGUI.h

@@ -1,7 +1,7 @@
 // HashGUI.h
 
-#ifndef ZIP7_INC_HASH_GUI_H
-#define ZIP7_INC_HASH_GUI_H
+#ifndef __HASH_GUI_H
+#define __HASH_GUI_H
 
 #include "../Common/HashCalc.h"
 #include "../Common/Property.h"