react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXWin/SFXWin.dsp

@@ -44,7 +44,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gz /MD /W4 /WX /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "Z7_EXTRACT_ONLY" /D "Z7_NO_REGISTRY" /D "Z7_NO_READ_FROM_CODER" /D "Z7_SFX" /D "Z7_NO_LONG_PATH" /D "Z7_NO_LARGE_PAGES" /Yu"StdAfx.h" /FD /c
+# ADD CPP /nologo /Gz /MD /W4 /WX /GX /O1 /D "NDEBUG" /D "_SFXWIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "NO_REGISTRY" /D "NO_READ_FROM_CODER" /D "_SFX" /Yu"StdAfx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
@@ -71,7 +71,7 @@ LINK32=link.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /Gz /MTd /W4 /WX /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "Z7_EXTRACT_ONLY" /D "Z7_NO_REGISTRY" /D "Z7_NO_READ_FROM_CODER" /D "Z7_SFX" /D "Z7_NO_LONG_PATH" /D "Z7_NO_LARGE_PAGES" /Yu"StdAfx.h" /FD /GZ /c
+# ADD CPP /nologo /Gz /MTd /W4 /WX /Gm /GX /ZI /Od /D "_DEBUG" /D "_SFXWIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "NO_REGISTRY" /D "NO_READ_FROM_CODER" /D "_SFX" /Yu"StdAfx.h" /FD /GZ /c
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
@@ -97,8 +97,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "SFXWin___Win32_ReleaseD"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "Z7_EXTRACT_ONLY" /D "Z7_NO_REGISTRY" /D "Z7_SFX" /Yu"StdAfx.h" /FD /c
-# ADD CPP /nologo /Gz /MD /W4 /WX /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "Z7_EXTRACT_ONLY" /D "Z7_NO_REGISTRY" /D "Z7_NO_READ_FROM_CODER" /D "Z7_SFX" /D "Z7_NO_LONG_PATH" /D "Z7_NO_LARGE_PAGES" /Yu"StdAfx.h" /FD /c
+# ADD BASE CPP /nologo /Gz /MT /W3 /GX /O1 /I "..\..\..\\" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "EXCLUDE_COM" /D "NO_REGISTRY" /D "_SFX" /Yu"StdAfx.h" /FD /c
+# ADD CPP /nologo /Gz /MD /W4 /WX /GX /O1 /D "NDEBUG" /D "_SFXWIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "NO_REGISTRY" /D "NO_READ_FROM_CODER" /D "_SFX" /Yu"StdAfx.h" /FD /c
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
@@ -221,10 +221,6 @@ SOURCE=..\..\Compress\Bcj2Coder.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Compress\Bcj2Coder.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Compress\Bcj2Register.cpp
 # End Source File
 # Begin Source File
@@ -233,10 +229,6 @@ SOURCE=..\..\Compress\BcjCoder.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Compress\BcjCoder.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Compress\BcjRegister.cpp
 # End Source File
 # Begin Source File
@@ -257,10 +249,6 @@ SOURCE=..\..\Compress\CopyCoder.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Compress\CopyCoder.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Compress\CopyRegister.cpp
 # End Source File
 # Begin Source File
@@ -289,10 +277,6 @@ SOURCE=..\..\Compress\PpmdDecoder.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Compress\PpmdDecoder.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Compress\PpmdRegister.cpp
 # End Source File
 # End Group
@@ -553,14 +537,6 @@ SOURCE=..\..\..\Windows\Control\ListView.h
 # End Group
 # Begin Source File
 
-SOURCE=..\..\..\Windows\Clipboard.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Windows\Clipboard.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Windows\CommonDialog.cpp
 # End Source File
 # Begin Source File
@@ -617,14 +593,6 @@ SOURCE=..\..\..\Windows\FileName.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Windows\MemoryGlobal.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Windows\MemoryGlobal.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Windows\PropVariant.cpp
 # End Source File
 # Begin Source File
@@ -673,14 +641,6 @@ SOURCE=..\..\..\Windows\System.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Windows\TimeUtils.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Windows\TimeUtils.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Windows\Window.cpp
 # End Source File
 # Begin Source File
@@ -701,10 +661,6 @@ SOURCE=..\..\..\Common\CommandLineParser.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Common.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\CRC.cpp
 # End Source File
 # Begin Source File
@@ -745,10 +701,6 @@ SOURCE=..\..\..\Common\NewHandler.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Sha256Prepare.cpp
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\StringConvert.cpp
 # End Source File
 # Begin Source File
@@ -879,15 +831,6 @@ SOURCE=..\..\..\..\C\7zCrcOpt.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\7zStream.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\7zWindows.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\C\Aes.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
@@ -939,10 +882,6 @@ SOURCE=..\..\..\..\C\BraIA64.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Compiler.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\C\CpuArch.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
@@ -1021,11 +960,6 @@ SOURCE=..\..\..\..\C\Sha256.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Sha256Opt.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\C\Threads.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
@@ -1034,33 +968,13 @@ SOURCE=..\..\..\..\C\Threads.c
 SOURCE=..\..\..\..\C\Threads.h
 # End Source File
 # End Group
-# Begin Group "7zip"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\Archive\IArchive.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\ICoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IDecl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IPassword.h
-# End Source File
 # Begin Source File
 
-SOURCE=..\..\IProgress.h
+SOURCE=.\7z.ico
 # End Source File
-# End Group
 # Begin Source File
 
-SOURCE=.\7z.ico
+SOURCE=.\7z1.ico
 # End Source File
 # Begin Source File
 

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXWin/SfxWin.cpp

@@ -4,13 +4,7 @@
 
 #include "../../../Common/MyWindows.h"
 
-#if defined(__MINGW32__) || defined(__MINGW64__)
-#include <shlwapi.h>
-#else
 #include <Shlwapi.h>
-#endif
-
-#include "../../../../C/DllSecur.h"
 
 #include "../../../Common/MyInitGuid.h"
 
@@ -34,78 +28,61 @@
 #include "../../UI/GUI/ExtractGUI.h"
 #include "../../UI/GUI/ExtractRes.h"
 
+#include "../../../../C/DllSecur.h"
+
 using namespace NWindows;
 using namespace NFile;
 using namespace NDir;
 
-extern
-HINSTANCE g_hInstance;
 HINSTANCE g_hInstance;
-extern
-bool g_DisableUserQuestions;
-bool g_DisableUserQuestions;
 
 #ifndef UNDER_CE
 
-#if !defined(Z7_WIN32_WINNT_MIN) || Z7_WIN32_WINNT_MIN < 0x0500 // win2000
-#define Z7_USE_DYN_ComCtl32Version
-#endif
-
-#ifdef Z7_USE_DYN_ComCtl32Version
-Z7_DIAGNOSTIC_IGNORE_CAST_FUNCTION
+DWORD g_ComCtl32Version;
 
 static DWORD GetDllVersion(LPCTSTR dllName)
 {
   DWORD dwVersion = 0;
-  const HINSTANCE hinstDll = LoadLibrary(dllName);
+  HINSTANCE hinstDll = LoadLibrary(dllName);
   if (hinstDll)
   {
-    const
-    DLLGETVERSIONPROC func_DllGetVersion = Z7_GET_PROC_ADDRESS(
-    DLLGETVERSIONPROC, hinstDll, "DllGetVersion");
-    if (func_DllGetVersion)
+    DLLGETVERSIONPROC pDllGetVersion = (DLLGETVERSIONPROC)GetProcAddress(hinstDll, "DllGetVersion");
+    if (pDllGetVersion)
     {
       DLLVERSIONINFO dvi;
       ZeroMemory(&dvi, sizeof(dvi));
       dvi.cbSize = sizeof(dvi);
-      const HRESULT hr = func_DllGetVersion(&dvi);
+      HRESULT hr = (*pDllGetVersion)(&dvi);
       if (SUCCEEDED(hr))
-        dwVersion = (DWORD)MAKELONG(dvi.dwMinorVersion, dvi.dwMajorVersion);
+        dwVersion = MAKELONG(dvi.dwMinorVersion, dvi.dwMajorVersion);
     }
     FreeLibrary(hinstDll);
   }
   return dwVersion;
 }
 
-#endif
 #endif
 
-extern
-bool g_LVN_ITEMACTIVATE_Support;
 bool g_LVN_ITEMACTIVATE_Support = true;
 
 static const wchar_t * const kUnknownExceptionMessage = L"ERROR: Unknown Error!";
 
-static void ErrorMessageForHRESULT(HRESULT res)
+void ErrorMessageForHRESULT(HRESULT res)
 {
   ShowErrorMessage(HResultToMessage(res));
 }
 
-static int APIENTRY WinMain2()
+int APIENTRY WinMain2()
 {
   // OleInitialize is required for ProgressBar in TaskBar.
-#ifndef UNDER_CE
+  #ifndef UNDER_CE
   OleInitialize(NULL);
-#endif
+  #endif
 
-#ifndef UNDER_CE
-#ifdef Z7_USE_DYN_ComCtl32Version
-  {
-    const DWORD g_ComCtl32Version = ::GetDllVersion(TEXT("comctl32.dll"));
-    g_LVN_ITEMACTIVATE_Support = (g_ComCtl32Version >= MAKELONG(71, 4));
-  }
-#endif
-#endif
+  #ifndef UNDER_CE
+  g_ComCtl32Version = ::GetDllVersion(TEXT("comctl32.dll"));
+  g_LVN_ITEMACTIVATE_Support = (g_ComCtl32Version >= MAKELONG(71, 4));
+  #endif
   
   UString password;
   bool assumeYes = false;
@@ -124,7 +101,7 @@ static int APIENTRY WinMain2()
     const UString &s = commandStrings[i];
     if (s.Len() > 1 && s[0] == '-')
     {
-      const wchar_t c = MyCharLower_Ascii(s[1]);
+      wchar_t c = MyCharLower_Ascii(s[1]);
       if (c == 'y')
       {
         assumeYes = true;
@@ -147,8 +124,6 @@ static int APIENTRY WinMain2()
     }
   }
 
-  g_DisableUserQuestions = assumeYes;
-
   FString path;
   NDLL::MyGetModuleFileName(path);
 
@@ -177,7 +152,7 @@ static int APIENTRY WinMain2()
   CMyComPtr<IFolderArchiveExtractCallback> extractCallback = ecs;
   ecs->Init();
 
-  #ifndef Z7_NO_CRYPTO
+  #ifndef _NO_CRYPTO
   ecs->PasswordIsDefined = !password.IsEmpty();
   ecs->Password = password;
   #endif
@@ -203,7 +178,7 @@ static int APIENTRY WinMain2()
   v1.Add(fs2us(fullPath));
   v2.Add(fs2us(fullPath));
   NWildcard::CCensorNode wildcardCensor;
-  wildcardCensor.Add_Wildcard();
+  wildcardCensor.AddItem(true, L"*", true, true, true, true);
 
   bool messageWasDisplayed = false;
   result = ExtractGUI(codecs,
@@ -231,9 +206,7 @@ static int APIENTRY WinMain2()
   return NExitCode::kFatalError;
 }
 
-#if defined(_WIN32) && defined(_UNICODE) && !defined(_WIN64) && !defined(UNDER_CE)
 #define NT_CHECK_FAIL_ACTION ShowErrorMessage(L"Unsupported Windows version"); return NExitCode::kFatalError;
-#endif
 
 int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
   #ifdef UNDER_CE

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXWin/StdAfx.h

@@ -1,6 +1,14 @@
 // StdAfx.h
 
-#if _MSC_VER >= 1800
-#pragma warning(disable : 4464) // relative include path contains '..'
+#ifndef __STDAFX_H
+#define __STDAFX_H
+
+#include "../../../Common/Common.h"
+
+#include <commctrl.h>
+#include <ShlObj.h>
+
+// #define printf(x) NO_PRINTF_(x)
+// #define sprintf(x) NO_SPRINTF_(x)
+
 #endif
-#include "../../UI/FileManager/StdAfx.h"

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXWin/makefile

@@ -2,12 +2,10 @@ PROG = 7z.sfx
 MY_FIXED = 1
 
 CFLAGS = $(CFLAGS) \
-  -DZ7_NO_REGISTRY \
-  -DZ7_EXTRACT_ONLY \
-  -DZ7_NO_READ_FROM_CODER \
-  -DZ7_SFX \
-  -DZ7_NO_LONG_PATH \
-  -DZ7_NO_LARGE_PAGES \
+  -DNO_REGISTRY \
+  -DEXTRACT_ONLY \
+  -DNO_READ_FROM_CODER \
+  -D_SFX \
 
 !IFDEF UNDER_CE
 LIBS = $(LIBS) ceshell.lib Commctrl.lib
@@ -33,7 +31,6 @@ COMMON_OBJS = \
   $O\Wildcard.obj \
 
 WIN_OBJS = \
-  $O\Clipboard.obj \
   $O\CommonDialog.obj \
   $O\DLL.obj \
   $O\ErrorMsg.obj \
@@ -41,14 +38,12 @@ WIN_OBJS = \
   $O\FileFind.obj \
   $O\FileIO.obj \
   $O\FileName.obj \
-  $O\MemoryGlobal.obj \
   $O\PropVariant.obj \
   $O\PropVariantConv.obj \
   $O\ResourceString.obj \
   $O\Shell.obj \
   $O\Synchronization.obj \
   $O\System.obj \
-  $O\TimeUtils.obj \
   $O\Window.obj \
 
 WIN_CTRL_OBJS = \
@@ -134,7 +129,6 @@ CRYPTO_OBJS = \
   $O\MyAes.obj \
   
 C_OBJS = \
-  $O\7zStream.obj \
   $O\Alloc.obj \
   $O\Bcj2.obj \
   $O\Bra.obj \
@@ -149,11 +143,11 @@ C_OBJS = \
   $O\MtDec.obj \
   $O\Ppmd7.obj \
   $O\Ppmd7Dec.obj \
+  $O\Sha256.obj \
   $O\Threads.obj \
 
 !include "../../Aes.mak"
 !include "../../Crc.mak"
 !include "../../LzmaDec.mak"
-!include "../../Sha256.mak"
 
 !include "../../7zip.mak"

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXWin/resource.rc

@@ -48,8 +48,3 @@ STRINGTABLE DISCARDABLE
 BEGIN
   IDS_PROP_MTIME        "Modified"
 END
-
-
-#ifndef UNDER_CE
-1 24 MOVEABLE PURE "../../UI/GUI/7zG.exe.manifest"
-#endif