react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXSetup/SFXSetup.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 /MT /W4 /WX /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "Z7_EXTRACT_ONLY" /D "Z7_NO_REGISTRY" /D "Z7_SFX" /D "Z7_NO_CRYPTO" /D "Z7_NO_LONG_PATH" /D "Z7_NO_LARGE_PAGES" /Yu"StdAfx.h" /FD /c
+# ADD CPP /nologo /Gz /MT /W4 /WX /GX /O1 /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "NO_REGISTRY" /D "_SFX" /D "_NO_CRYPTO" /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_SFX" /D "Z7_NO_CRYPTO" /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 "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "NO_REGISTRY" /D "_SFX" /D "_NO_CRYPTO" /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 "ReleaseD"
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
-# ADD BASE CPP /nologo /MD /W3 /GX /O1 /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_SFX" /D "Z7_NO_CRYPTO" /D "Z7_NO_LONG_PATH" /D "Z7_NO_LARGE_PAGES" /Yu"StdAfx.h" /FD /c
+# ADD BASE CPP /nologo /MD /W3 /GX /O1 /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 "WIN32" /D "_WINDOWS" /D "_MBCS" /D "EXTRACT_ONLY" /D "NO_REGISTRY" /D "_SFX" /D "_NO_CRYPTO" /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
@@ -301,10 +289,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
@@ -321,10 +305,6 @@ SOURCE=..\..\..\Common\IntToString.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\MyCom.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\MyString.cpp
 # End Source File
 # Begin Source File
@@ -477,14 +457,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
@@ -492,7 +464,7 @@ SOURCE=..\..\..\Windows\Window.cpp
 SOURCE=..\..\..\Windows\Window.h
 # End Source File
 # End Group
-# Begin Group "7zip Common"
+# Begin Group "7z Common"
 
 # PROP Default_Filter ""
 # Begin Source File
@@ -695,19 +667,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\7zTypes.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\..\C\7zWindows.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\C\Alloc.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
@@ -745,10 +704,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
@@ -820,30 +775,6 @@ 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
-# End Source File
-# End Group
 # Begin Source File
 
 SOURCE=.\ExtractCallbackSfx.cpp

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/SFXSetup/SfxSetup.cpp

@@ -2,9 +2,8 @@
 
 #include "StdAfx.h"
 
-#include "../../../../C/DllSecur.h"
-
 #include "../../../Common/MyWindows.h"
+
 #include "../../../Common/MyInitGuid.h"
 
 #include "../../../Common/CommandLineParser.h"
@@ -24,22 +23,19 @@
 
 #include "ExtractEngine.h"
 
+#include "../../../../C/DllSecur.h"
+
 #include "resource.h"
 
 using namespace NWindows;
 using namespace NFile;
 using namespace NDir;
 
-extern
-HINSTANCE g_hInstance;
 HINSTANCE g_hInstance;
-extern
-bool g_DisableUserQuestions;
-bool g_DisableUserQuestions;
 
 static CFSTR const kTempDirPrefix = FTEXT("7zS");
 
-#define MY_SHELL_EXECUTE
+#define _SHELL_EXECUTE
 
 static bool ReadDataString(CFSTR fileName, LPCSTR startID,
     LPCSTR endID, AString &stringResult)
@@ -48,44 +44,44 @@ static bool ReadDataString(CFSTR fileName, LPCSTR startID,
   NIO::CInFile inFile;
   if (!inFile.Open(fileName))
     return false;
-  const size_t kBufferSize = (1 << 12);
+  const int kBufferSize = (1 << 12);
 
   Byte buffer[kBufferSize];
-  const unsigned signatureStartSize = MyStringLen(startID);
-  const unsigned signatureEndSize = MyStringLen(endID);
+  int signatureStartSize = MyStringLen(startID);
+  int signatureEndSize = MyStringLen(endID);
   
-  size_t numBytesPrev = 0;
+  UInt32 numBytesPrev = 0;
   bool writeMode = false;
   UInt64 posTotal = 0;
   for (;;)
   {
     if (posTotal > (1 << 20))
       return (stringResult.IsEmpty());
-    const size_t numReadBytes = kBufferSize - numBytesPrev;
-    size_t processedSize;
-    if (!inFile.ReadFull(buffer + numBytesPrev, numReadBytes, processedSize))
+    UInt32 numReadBytes = kBufferSize - numBytesPrev;
+    UInt32 processedSize;
+    if (!inFile.Read(buffer + numBytesPrev, numReadBytes, processedSize))
       return false;
     if (processedSize == 0)
       return true;
-    const size_t numBytesInBuffer = numBytesPrev + processedSize;
+    UInt32 numBytesInBuffer = numBytesPrev + processedSize;
     UInt32 pos = 0;
     for (;;)
     {
       if (writeMode)
       {
-        if (pos + signatureEndSize > numBytesInBuffer)
+        if (pos > numBytesInBuffer - signatureEndSize)
           break;
         if (memcmp(buffer + pos, endID, signatureEndSize) == 0)
           return true;
-        const Byte b = buffer[pos];
+        char b = buffer[pos];
         if (b == 0)
           return false;
-        stringResult += (char)b;
+        stringResult += b;
         pos++;
       }
       else
       {
-        if (pos + signatureStartSize > numBytesInBuffer)
+        if (pos > numBytesInBuffer - signatureStartSize)
           break;
         if (memcmp(buffer + pos, startID, signatureStartSize) == 0)
         {
@@ -105,28 +101,26 @@ static bool ReadDataString(CFSTR fileName, LPCSTR startID,
 static char kStartID[] = { ',','!','@','I','n','s','t','a','l','l','@','!','U','T','F','-','8','!', 0 };
 static char kEndID[]   = { ',','!','@','I','n','s','t','a','l','l','E','n','d','@','!', 0 };
 
-static struct CInstallIDInit
+struct CInstallIDInit
 {
   CInstallIDInit()
   {
     kStartID[0] = ';';
     kEndID[0] = ';';
-  }
+  };
 } g_CInstallIDInit;
 
 
-#if defined(_WIN32) && defined(_UNICODE) && !defined(_WIN64) && !defined(UNDER_CE)
 #define NT_CHECK_FAIL_ACTION ShowErrorMessage(L"Unsupported Windows version"); return 1;
-#endif
 
 static void ShowErrorMessageSpec(const UString &name)
 {
   UString message = NError::MyFormatMessage(::GetLastError());
-  const int pos = message.Find(L"%1");
+  int pos = message.Find(L"%1");
   if (pos >= 0)
   {
-    message.Delete((unsigned)pos, 2);
-    message.Insert((unsigned)pos, name);
+    message.Delete(pos, 2);
+    message.Insert(pos, name);
   }
   ShowErrorMessage(NULL, message);
 }
@@ -150,7 +144,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
   // InitCommonControls();
 
   UString archiveName, switches;
-  #ifdef MY_SHELL_EXECUTE
+  #ifdef _SHELL_EXECUTE
   UString executeFile, executeParameters;
   #endif
   NCommandLineParser::SplitCommandLine(GetCommandLineW(), archiveName, switches);
@@ -187,23 +181,23 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
         ShowErrorMessage(L"Config failed");
       return 1;
     }
-    const UString friendlyName = GetTextConfigValue(pairs, "Title");
-    const UString installPrompt = GetTextConfigValue(pairs, "BeginPrompt");
-    const UString progress = GetTextConfigValue(pairs, "Progress");
+    UString friendlyName = GetTextConfigValue(pairs, "Title");
+    UString installPrompt = GetTextConfigValue(pairs, "BeginPrompt");
+    UString progress = GetTextConfigValue(pairs, "Progress");
     if (progress.IsEqualTo_Ascii_NoCase("no"))
       showProgress = false;
-    const int index = FindTextConfigItem(pairs, "Directory");
+    int index = FindTextConfigItem(pairs, "Directory");
     if (index >= 0)
       dirPrefix = pairs[index].String;
     if (!installPrompt.IsEmpty() && !assumeYes)
     {
-      if (MessageBoxW(NULL, installPrompt, friendlyName, MB_YESNO |
+      if (MessageBoxW(0, installPrompt, friendlyName, MB_YESNO |
           MB_ICONQUESTION) != IDYES)
         return 0;
     }
     appLaunched = GetTextConfigValue(pairs, "RunProgram");
     
-    #ifdef MY_SHELL_EXECUTE
+    #ifdef _SHELL_EXECUTE
     executeFile = GetTextConfigValue(pairs, "ExecuteFile");
     executeParameters = GetTextConfigValue(pairs, "ExecuteParameters");
     #endif
@@ -213,23 +207,23 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
   if (!tempDir.Create(kTempDirPrefix))
   {
     if (!assumeYes)
-      ShowErrorMessage(L"Cannot create temp folder archive");
+      ShowErrorMessage(L"Can not create temp folder archive");
     return 1;
   }
 
   CCodecs *codecs = new CCodecs;
   CMyComPtr<IUnknown> compressCodecsInfo = codecs;
   {
-    const HRESULT result = codecs->Load();
+    HRESULT result = codecs->Load();
     if (result != S_OK)
     {
-      ShowErrorMessage(L"Cannot load codecs");
+      ShowErrorMessage(L"Can not load codecs");
       return 1;
     }
   }
 
   const FString tempDirPath = tempDir.GetPath();
-  // tempDirPath = "M:\\1\\"; // to test low disk space
+  // tempDirPath = L"M:\\1\\"; // to test low disk space
   {
     bool isCorrupt = false;
     UString errorMessage;
@@ -249,7 +243,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
         {
           if (errorMessage.IsEmpty())
             errorMessage = NError::MyFormatMessage(result);
-          ::MessageBoxW(NULL, errorMessage, NWindows::MyLoadString(IDS_EXTRACTION_ERROR_TITLE), MB_ICONERROR);
+          ::MessageBoxW(0, errorMessage, NWindows::MyLoadString(IDS_EXTRACTION_ERROR_TITLE), MB_ICONERROR);
         }
       }
       return 1;
@@ -262,8 +256,8 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
     return 1;
   #endif
   
-  HANDLE hProcess = NULL;
-#ifdef MY_SHELL_EXECUTE
+  HANDLE hProcess = 0;
+#ifdef _SHELL_EXECUTE
   if (!executeFile.IsEmpty())
   {
     CSysString filePath (GetSystemString(executeFile));
@@ -284,7 +278,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
       executeParameters += switches;
     }
 
-    const CSysString parametersSys (GetSystemString(executeParameters));
+    CSysString parametersSys (GetSystemString(executeParameters));
     if (parametersSys.IsEmpty())
       execInfo.lpParameters = NULL;
     else
@@ -292,13 +286,13 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
 
     execInfo.lpDirectory = NULL;
     execInfo.nShow = SW_SHOWNORMAL;
-    execInfo.hProcess = NULL;
+    execInfo.hProcess = 0;
     /* BOOL success = */ ::ShellExecuteEx(&execInfo);
     UINT32 result = (UINT32)(UINT_PTR)execInfo.hInstApp;
     if (result <= 32)
     {
       if (!assumeYes)
-        ShowErrorMessage(L"Cannot open file");
+        ShowErrorMessage(L"Can not open file");
       return 1;
     }
     hProcess = execInfo.hProcess;
@@ -308,11 +302,11 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
   {
     if (appLaunched.IsEmpty())
     {
-      appLaunched = "setup.exe";
-      if (!NFind::DoesFileExist_FollowLink(us2fs(appLaunched)))
+      appLaunched = L"setup.exe";
+      if (!NFind::DoesFileExist(us2fs(appLaunched)))
       {
         if (!assumeYes)
-          ShowErrorMessage(L"Cannot find setup.exe");
+          ShowErrorMessage(L"Can not find setup.exe");
         return 1;
       }
     }
@@ -323,7 +317,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
       appLaunched.Replace(L"%%T" WSTRING_PATH_SEPARATOR, fs2us(s2));
     }
     
-    const UString appNameForError = appLaunched; // actually we need to rtemove parameters also
+    UString appNameForError = appLaunched; // actually we need to rtemove parameters also
 
     appLaunched.Replace(L"%%T", fs2us(tempDirPath));
 
@@ -334,21 +328,20 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
     }
     STARTUPINFO startupInfo;
     startupInfo.cb = sizeof(startupInfo);
-    startupInfo.lpReserved = NULL;
-    startupInfo.lpDesktop = NULL;
-    startupInfo.lpTitle = NULL;
+    startupInfo.lpReserved = 0;
+    startupInfo.lpDesktop = 0;
+    startupInfo.lpTitle = 0;
     startupInfo.dwFlags = 0;
     startupInfo.cbReserved2 = 0;
-    startupInfo.lpReserved2 = NULL;
+    startupInfo.lpReserved2 = 0;
     
     PROCESS_INFORMATION processInformation;
     
-    const CSysString appLaunchedSys (GetSystemString(dirPrefix + appLaunched));
+    CSysString appLaunchedSys (GetSystemString(dirPrefix + appLaunched));
     
-    const BOOL createResult = CreateProcess(NULL,
-        appLaunchedSys.Ptr_non_const(),
-        NULL, NULL, FALSE, 0, NULL, NULL /*tempDir.GetPath() */,
-        &startupInfo, &processInformation);
+    BOOL createResult = CreateProcess(NULL, (LPTSTR)(LPCTSTR)appLaunchedSys,
+      NULL, NULL, FALSE, 0, NULL, NULL /*tempDir.GetPath() */,
+      &startupInfo, &processInformation);
     if (createResult == 0)
     {
       if (!assumeYes)
@@ -362,7 +355,7 @@ int APIENTRY WinMain(HINSTANCE hInstance, HINSTANCE /* hPrevInstance */,
     ::CloseHandle(processInformation.hThread);
     hProcess = processInformation.hProcess;
   }
-  if (hProcess)
+  if (hProcess != 0)
   {
     WaitForSingleObject(hProcess, INFINITE);
     ::CloseHandle(hProcess);

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

@@ -1,6 +1,13 @@
 // 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>
+
+// #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/SFXSetup/makefile

@@ -2,13 +2,11 @@ PROG = 7zS.sfx
 MY_FIXED = 1
 
 CFLAGS = $(CFLAGS) \
-  -DZ7_NO_REGISTRY \
-  -DZ7_EXTRACT_ONLY \
-  -DZ7_NO_READ_FROM_CODER \
-  -DZ7_SFX \
-  -DZ7_NO_CRYPTO \
-  -DZ7_NO_LONG_PATH \
-  -DZ7_NO_LARGE_PAGES \
+  -DNO_REGISTRY \
+  -DEXTRACT_ONLY \
+  -DNO_READ_FROM_CODER \
+  -D_SFX \
+  -D_NO_CRYPTO \
 
 CURRENT_OBJS = \
   $O\SfxSetup.obj \
@@ -38,7 +36,6 @@ WIN_OBJS = \
   $O\ResourceString.obj \
   $O\Synchronization.obj \
   $O\System.obj \
-  $O\TimeUtils.obj \
   $O\Window.obj \
 
 WIN_CTRL_OBJS = \
@@ -100,7 +97,6 @@ COMPRESS_OBJS = \
   $O\LzmaRegister.obj \
 
 C_OBJS = \
-  $O\7zStream.obj \
   $O\Alloc.obj \
   $O\Bcj2.obj \
   $O\Bra.obj \