react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/Build.mak

@@ -1,13 +1,7 @@
 LIBS = $(LIBS) oleaut32.lib ole32.lib
 
-# CFLAGS = $(CFLAGS) -DZ7_NO_UNICODE
 !IFNDEF MY_NO_UNICODE
-# CFLAGS = $(CFLAGS) -DUNICODE -D_UNICODE
-!ENDIF
-
-!IF "$(CC)" != "clang-cl"
-# for link time code generation:
-# CFLAGS = $(CFLAGS) -GL
+CFLAGS = $(CFLAGS) -DUNICODE -D_UNICODE
 !ENDIF
 
 !IFNDEF O
@@ -18,27 +12,17 @@ O=o
 !ENDIF
 !ENDIF
 
-!IF "$(CC)" != "clang-cl"
 # CFLAGS = $(CFLAGS) -FAsc -Fa$O/asm/
-!ENDIF
-
-# LFLAGS = $(LFLAGS) /guard:cf
 
 
 !IF "$(PLATFORM)" == "x64"
-MY_ML = ml64 -WX
-#-Dx64
-!ELSEIF "$(PLATFORM)" == "arm64"
-MY_ML = armasm64
+MY_ML = ml64 -Dx64 -WX
 !ELSEIF "$(PLATFORM)" == "arm"
 MY_ML = armasm -WX
 !ELSE
 MY_ML = ml -WX
-# -DABI_CDECL
 !ENDIF
 
-# MY_ML = "$(MY_ML) -Fl$O\asm\
-
 
 !IFDEF UNDER_CE
 RFLAGS = $(RFLAGS) -dUNDER_CE
@@ -57,33 +41,13 @@ LIBS = $(LIBS) user32.lib advapi32.lib shell32.lib
 
 !IF "$(PLATFORM)" == "arm"
 COMPL_ASM = $(MY_ML) $** $O/$(*B).obj
-!ELSEIF "$(PLATFORM)" == "arm64"
-COMPL_ASM = $(MY_ML) $** $O/$(*B).obj
 !ELSE
 COMPL_ASM = $(MY_ML) -c -Fo$O/ $**
 !ENDIF
 
-!IFDEF OLD_COMPILER
-CFLAGS_WARN_LEVEL = -W4
-!ELSE
-CFLAGS_WARN_LEVEL = -Wall
-!ENDIF
-
-CFLAGS = $(CFLAGS) -nologo -c -Fo$O/ $(CFLAGS_WARN_LEVEL) -WX -EHsc -Gy -GR- -GF
-
-!IF "$(CC)" == "clang-cl"
+CFLAGS = $(CFLAGS) -nologo -c -Fo$O/ -W4 -WX -EHsc -Gy -GR- -GF
 
-CFLAGS = $(CFLAGS) \
-  -Werror \
-  -Wall \
-  -Wextra \
-  -Weverything \
-  -Wfatal-errors \
-
-!ENDIF
-
-# !IFDEF MY_DYNAMIC_LINK
-!IF "$(MY_DYNAMIC_LINK)" != ""
+!IFDEF MY_DYNAMIC_LINK
 CFLAGS = $(CFLAGS) -MD
 !ELSE
 !IFNDEF MY_SINGLE_THREAD
@@ -91,42 +55,18 @@ CFLAGS = $(CFLAGS) -MT
 !ENDIF
 !ENDIF
 
-
-CFLAGS = $(CFLAGS_COMMON) $(CFLAGS)
-
-
 !IFNDEF OLD_COMPILER
-
-CFLAGS = $(CFLAGS) -GS- -Zc:wchar_t
-!IFDEF VCTOOLSVERSION
-!IF "$(VCTOOLSVERSION)" >= "14.00"
-!IF "$(CC)" != "clang-cl"
-CFLAGS = $(CFLAGS) -Zc:throwingNew
-!ENDIF
-!ENDIF
-!ELSE
-# -Zc:forScope is default in VS2010. so we need it only for older versions
-CFLAGS = $(CFLAGS) -Zc:forScope
-!ENDIF
-
+CFLAGS = $(CFLAGS) -GS- -Zc:forScope -Zc:wchar_t
 !IFNDEF UNDER_CE
-!IF "$(CC)" != "clang-cl"
-MP_NPROC = 16
-!IFDEF NUMBER_OF_PROCESSORS
-!IF $(NUMBER_OF_PROCESSORS) < $(MP_NPROC)
-MP_NPROC = $(NUMBER_OF_PROCESSORS)
-!ENDIF
-!ENDIF
-CFLAGS = $(CFLAGS) -MP$(MP_NPROC)
-!ENDIF
+CFLAGS = $(CFLAGS) -MP2
 !IFNDEF PLATFORM
 # CFLAGS = $(CFLAGS) -arch:IA32
 !ENDIF
 !ENDIF
-
+!ELSE
+CFLAGS = $(CFLAGS)
 !ENDIF
 
-
 !IFDEF MY_CONSOLE
 CFLAGS = $(CFLAGS) -D_CONSOLE
 !ENDIF
@@ -144,7 +84,7 @@ CFLAGS_O1 = $(CFLAGS) -O1
 !ENDIF
 CFLAGS_O2 = $(CFLAGS) -O2
 
-LFLAGS = $(LFLAGS) -nologo -OPT:REF -OPT:ICF -INCREMENTAL:NO
+LFLAGS = $(LFLAGS) -nologo -OPT:REF -OPT:ICF
 
 !IFNDEF UNDER_CE
 LFLAGS = $(LFLAGS) /LARGEADDRESSAWARE
@@ -161,12 +101,6 @@ LFLAGS = $(LFLAGS) /FIXED:NO
 # /BASE:0x400000
 !ENDIF
 
-!IF "$(PLATFORM)" == "arm64"
-# we can get better compression ratio with ARM64 filter if we change alignment to 4096
-# LFLAGS = $(LFLAGS) /FILEALIGN:4096
-!ENDIF
-
-
 
 # !IF "$(PLATFORM)" == "x64"
 
@@ -183,39 +117,23 @@ LFLAGS = $(LFLAGS) /SUBSYSTEM:windows,$(MY_SUB_SYS_VER)
 !ENDIF
 
 
-!IF "$(PLATFORM)" == "arm64"
-CLANG_FLAGS_TARGET = --target=arm64-pc-windows-msvc
-!ENDIF
-
-COMPL_CLANG_SPEC=clang-cl $(CLANG_FLAGS_TARGET)
-COMPL_ASM_CLANG = $(COMPL_CLANG_SPEC) -nologo -c -Fo$O/ $(CFLAGS_WARN_LEVEL) -WX $**
-# COMPL_C_CLANG   = $(COMPL_CLANG_SPEC) $(CFLAGS_O2)
-
-
 PROGPATH = $O\$(PROG)
 
 COMPL_O1   = $(CC) $(CFLAGS_O1) $**
 COMPL_O2   = $(CC) $(CFLAGS_O2) $**
 COMPL_PCH  = $(CC) $(CFLAGS_O1) -Yc"StdAfx.h" -Fp$O/a.pch $**
 COMPL      = $(CC) $(CFLAGS_O1) -Yu"StdAfx.h" -Fp$O/a.pch $**
-COMPLB     = $(CC) $(CFLAGS_O1) -Yu"StdAfx.h" -Fp$O/a.pch $<
-COMPLB_O2  = $(CC) $(CFLAGS_O2) $<
-# COMPLB_O2  = $(CC) $(CFLAGS_O2) -Yu"StdAfx.h" -Fp$O/a.pch $<
 
-CFLAGS_C_ALL = $(CFLAGS_O2) $(CFLAGS_C_SPEC)
+COMPLB    = $(CC) $(CFLAGS_O1) -Yu"StdAfx.h" -Fp$O/a.pch $<
+# COMPLB_O2 = $(CC) $(CFLAGS_O2) -Yu"StdAfx.h" -Fp$O/a.pch $<
+COMPLB_O2 = $(CC) $(CFLAGS_O2) $<
 
+CFLAGS_C_ALL = $(CFLAGS_O2) $(CFLAGS_C_SPEC)
 CCOMPL_PCH  = $(CC) $(CFLAGS_C_ALL) -Yc"Precomp.h" -Fp$O/a.pch $**
 CCOMPL_USE  = $(CC) $(CFLAGS_C_ALL) -Yu"Precomp.h" -Fp$O/a.pch $**
-CCOMPLB_USE = $(CC) $(CFLAGS_C_ALL) -Yu"Precomp.h" -Fp$O/a.pch $<
 CCOMPL      = $(CC) $(CFLAGS_C_ALL) $**
 CCOMPLB     = $(CC) $(CFLAGS_C_ALL) $<
 
-!IF "$(CC)" == "clang-cl"
-COMPL  = $(COMPL) -FI StdAfx.h
-COMPLB = $(COMPLB) -FI StdAfx.h
-CCOMPL_USE  = $(CCOMPL_USE) -FI Precomp.h
-CCOMPLB_USE = $(CCOMPLB_USE) -FI Precomp.h
-!ENDIF
 
 all: $(PROGPATH)
 
@@ -227,11 +145,6 @@ $O:
 $O/asm:
 	if not exist "$O/asm" mkdir "$O/asm"
 
-!IF "$(CC)" != "clang-cl"
-# for link time code generation:
-# LFLAGS = $(LFLAGS) -LTCG
-!ENDIF
-
 $(PROGPATH): $O $O/asm $(OBJS) $(DEF_FILE)
 	link $(LFLAGS) -out:$(PROGPATH) $(OBJS) $(LIBS)
 
@@ -241,12 +154,3 @@ $O\resource.res: $(*B).rc
 !ENDIF
 $O\StdAfx.obj: $(*B).cpp
 	$(COMPL_PCH)
-
-predef: empty.c
-	$(CCOMPL)   /EP /Zc:preprocessor /PD
-predef2: A.cpp
-	$(COMPL)   -EP -Zc:preprocessor -PD
-predef3: A.cpp
-	$(COMPL)   -E -dM
-predef4: A.cpp
-	$(COMPL_O2)   -E

package/harmony/pushy/src/main/cpp/lzma/CPP/Common/AutoPtr.h

@@ -1,45 +1,34 @@
 // Common/AutoPtr.h
 
-#ifndef ZIP7_INC_COMMON_AUTOPTR_H
-#define ZIP7_INC_COMMON_AUTOPTR_H
+#ifndef __COMMON_AUTOPTR_H
+#define __COMMON_AUTOPTR_H
 
-template<class T> class CMyUniquePtr
-// CMyAutoPtr
+template<class T> class CMyAutoPtr
 {
   T *_p;
-  
-  CMyUniquePtr(CMyUniquePtr<T>& p); // : _p(p.release()) {}
-  CMyUniquePtr<T>& operator=(T *p);
-  CMyUniquePtr<T>& operator=(CMyUniquePtr<T>& p);
-  /*
+public:
+  CMyAutoPtr(T *p = 0) : _p(p) {}
+  CMyAutoPtr(CMyAutoPtr<T>& p): _p(p.release()) {}
+  CMyAutoPtr<T>& operator=(CMyAutoPtr<T>& p)
   {
     reset(p.release());
     return (*this);
   }
-  */
-  void reset(T* p = NULL)
-  {
-    if (p != _p)
-      delete _p;
-    _p = p;
-  }
-public:
-  CMyUniquePtr(T *p = NULL) : _p(p) {}
-  ~CMyUniquePtr() { delete _p; }
+  ~CMyAutoPtr() { delete _p; }
   T& operator*() const { return *_p; }
-  T* operator->() const { return _p; }
-  // operator bool() const { return _p != NULL; }
+  // T* operator->() const { return (&**this); }
   T* get() const { return _p; }
   T* release()
   {
     T *tmp = _p;
-    _p = NULL;
+    _p = 0;
     return tmp;
   }
-  void Create_if_Empty()
+  void reset(T* p = 0)
   {
-    if (!_p)
-      _p = new T;
+    if (p != _p)
+      delete _p;
+    _p = p;
   }
 };
 

package/harmony/pushy/src/main/cpp/lzma/CPP/Common/CRC.cpp

@@ -4,4 +4,4 @@
 
 #include "../../C/7zCrc.h"
 
-static struct CCRCTableInit { CCRCTableInit() { CrcGenerateTable(); } } g_CRCTableInit;
+struct CCRCTableInit { CCRCTableInit() { CrcGenerateTable(); } } g_CRCTableInit;

package/harmony/pushy/src/main/cpp/lzma/CPP/Common/C_FileIO.cpp

@@ -1,3 +1,92 @@
 // Common/C_FileIO.cpp
 
-#include "StdAfx.h"
+#include "C_FileIO.h"
+
+#include <fcntl.h>
+#ifdef _WIN32
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
+namespace NC {
+namespace NFile {
+namespace NIO {
+
+bool CFileBase::OpenBinary(const char *name, int flags)
+{
+  #ifdef O_BINARY
+  flags |= O_BINARY;
+  #endif
+  Close();
+  _handle = ::open(name, flags, 0666);
+  return _handle != -1;
+}
+
+bool CFileBase::Close()
+{
+  if (_handle == -1)
+    return true;
+  if (close(_handle) != 0)
+    return false;
+  _handle = -1;
+  return true;
+}
+
+bool CFileBase::GetLength(UInt64 &length) const
+{
+  off_t curPos = Seek(0, SEEK_CUR);
+  off_t lengthTemp = Seek(0, SEEK_END);
+  Seek(curPos, SEEK_SET);
+  length = (UInt64)lengthTemp;
+  return true;
+}
+
+off_t CFileBase::Seek(off_t distanceToMove, int moveMethod) const
+{
+  return ::lseek(_handle, distanceToMove, moveMethod);
+}
+
+/////////////////////////
+// CInFile
+
+bool CInFile::Open(const char *name)
+{
+  return CFileBase::OpenBinary(name, O_RDONLY);
+}
+
+bool CInFile::OpenShared(const char *name, bool)
+{
+  return Open(name);
+}
+
+ssize_t CInFile::Read(void *data, size_t size)
+{
+  return read(_handle, data, size);
+}
+
+/////////////////////////
+// COutFile
+
+bool COutFile::Create(const char *name, bool createAlways)
+{
+  if (createAlways)
+  {
+    Close();
+    _handle = ::creat(name, 0666);
+    return _handle != -1;
+  }
+  return OpenBinary(name, O_CREAT | O_EXCL | O_WRONLY);
+}
+
+bool COutFile::Open(const char *name, DWORD creationDisposition)
+{
+  return Create(name, false);
+}
+
+ssize_t COutFile::Write(const void *data, size_t size)
+{
+  return write(_handle, data, size);
+}
+
+}}}

package/harmony/pushy/src/main/cpp/lzma/CPP/Common/C_FileIO.h

@@ -1,6 +1,53 @@
 // Common/C_FileIO.h
 
-#ifndef ZIP7_INC_COMMON_C_FILEIO_H
-#define ZIP7_INC_COMMON_C_FILEIO_H
+#ifndef __COMMON_C_FILEIO_H
+#define __COMMON_C_FILEIO_H
+
+#include <stdio.h>
+#include <sys/types.h>
+
+#include "MyTypes.h"
+#include "MyWindows.h"
+
+#ifdef _WIN32
+#ifdef _MSC_VER
+typedef size_t ssize_t;
+#endif
+#endif
+
+namespace NC {
+namespace NFile {
+namespace NIO {
+
+class CFileBase
+{
+protected:
+  int _handle;
+  bool OpenBinary(const char *name, int flags);
+public:
+  CFileBase(): _handle(-1) {};
+  ~CFileBase() { Close(); }
+  bool Close();
+  bool GetLength(UInt64 &length) const;
+  off_t Seek(off_t distanceToMove, int moveMethod) const;
+};
+
+class CInFile: public CFileBase
+{
+public:
+  bool Open(const char *name);
+  bool OpenShared(const char *name, bool shareForWrite);
+  ssize_t Read(void *data, size_t size);
+};
+
+class COutFile: public CFileBase
+{
+public:
+  bool Create(const char *name, bool createAlways);
+  bool Open(const char *name, DWORD creationDisposition);
+  ssize_t Write(const void *data, size_t size);
+};
+
+}}}
 
 #endif

package/harmony/pushy/src/main/cpp/lzma/CPP/Common/ComTry.h

@@ -1,7 +1,7 @@
 // ComTry.h
 
-#ifndef ZIP7_INC_COM_TRY_H
-#define ZIP7_INC_COM_TRY_H
+#ifndef __COM_TRY_H
+#define __COM_TRY_H
 
 #include "MyWindows.h"
 // #include "Exception.h"

package/harmony/pushy/src/main/cpp/lzma/CPP/Common/CommandLineParser.cpp

@@ -6,8 +6,6 @@
 
 namespace NCommandLineParser {
 
-#ifdef _WIN32
-
 bool SplitCommandLine(const UString &src, UString &dest1, UString &dest2)
 {
   dest1.Empty();
@@ -16,7 +14,7 @@ bool SplitCommandLine(const UString &src, UString &dest1, UString &dest2)
   unsigned i;
   for (i = 0; i < src.Len(); i++)
   {
-    const wchar_t c = src[i];
+    wchar_t c = src[i];
     if ((c == L' ' || c == L'\t') && !quoteMode)
     {
       dest2 = src.Ptr(i + 1);
@@ -32,34 +30,6 @@ bool SplitCommandLine(const UString &src, UString &dest1, UString &dest2)
 
 void SplitCommandLine(const UString &s, UStringVector &parts)
 {
-#if 0
-/* we don't use CommandLineToArgvW() because
-   it can remove tail backslash:
-     "1\"
-   converted to
-     1"
-*/
-  parts.Clear();
-  {
-    int nArgs;
-    LPWSTR *szArgList = CommandLineToArgvW(s, &nArgs);
-    if (szArgList)
-    {
-      for (int i = 0; i < nArgs; i++)
-      {
-        // printf("%2d: |%S|\n", i, szArglist[i]);
-        parts.Add(szArgList[i]);
-      }
-      LocalFree(szArgList);
-      return;
-    }
-  }
-#endif
-/*
-#ifdef _UNICODE
-  throw 20240406;
-#else
-*/
   UString sTemp (s);
   sTemp.Trim();
   parts.Clear();
@@ -72,9 +42,7 @@ void SplitCommandLine(const UString &s, UStringVector &parts)
       break;
     sTemp = s2;
   }
-// #endif
 }
-#endif
 
 
 static const char * const kStopSwitchParsing = "--";
@@ -110,13 +78,13 @@ bool CParser::ParseString(const UString &s, const CSwitchForm *switchForms, unsi
   for (unsigned i = 0; i < numSwitches; i++)
   {
     const char * const key = switchForms[i].Key;
-    const unsigned switchLen = MyStringLen(key);
+    unsigned switchLen = MyStringLen(key);
     if ((int)switchLen <= maxLen || pos + switchLen > s.Len())
       continue;
     if (IsString1PrefixedByString2_NoCase_Ascii((const wchar_t *)s + pos, key))
     {
       switchIndex = i;
-      maxLen = (int)switchLen;
+      maxLen = switchLen;
     }
   }
 
@@ -126,7 +94,7 @@ bool CParser::ParseString(const UString &s, const CSwitchForm *switchForms, unsi
     return false;
   }
 
-  pos += (unsigned)maxLen;
+  pos += maxLen;
   
   CSwitchResult &sw = _switches[switchIndex];
   const CSwitchForm &form = switchForms[switchIndex];
@@ -139,7 +107,7 @@ bool CParser::ParseString(const UString &s, const CSwitchForm *switchForms, unsi
 
   sw.ThereIs = true;
 
-  const unsigned rem = s.Len() - pos;
+  int rem = s.Len() - pos;
   if (rem < form.MinLen)
   {
     ErrorMessage = "Too short switch:";
@@ -165,7 +133,7 @@ bool CParser::ParseString(const UString &s, const CSwitchForm *switchForms, unsi
     case NSwitchType::kChar:
       if (rem == 1)
       {
-        const wchar_t c = s[pos];
+        wchar_t c = s[pos];
         if (c <= 0x7F)
         {
           sw.PostCharIndex = FindCharPosInString(form.PostCharSet, (char)c);
@@ -182,8 +150,6 @@ bool CParser::ParseString(const UString &s, const CSwitchForm *switchForms, unsi
       sw.PostStrings.Add(s.Ptr(pos));
       return true;
     }
-    // case NSwitchType::kSimple:
-    default: break;
   }
 
   if (pos != s.Len())
@@ -212,7 +178,7 @@ bool CParser::ParseStrings(const CSwitchForm *switchForms, unsigned numSwitches,
     {
       if (s.IsEqualTo(kStopSwitchParsing))
       {
-        StopSwitchIndex = (int)NonSwitchStrings.Size();
+        StopSwitchIndex = NonSwitchStrings.Size();
         continue;
       }
       if (!s.IsEmpty() && IsItSwitchChar(s[0]))

package/harmony/pushy/src/main/cpp/lzma/CPP/Common/CommandLineParser.h

@@ -1,7 +1,7 @@
 // Common/CommandLineParser.h
 
-#ifndef ZIP7_INC_COMMON_COMMAND_LINE_PARSER_H
-#define ZIP7_INC_COMMON_COMMAND_LINE_PARSER_H
+#ifndef __COMMON_COMMAND_LINE_PARSER_H
+#define __COMMON_COMMAND_LINE_PARSER_H
 
 #include "MyString.h"
 
@@ -38,7 +38,7 @@ struct CSwitchResult
   int PostCharIndex;
   UStringVector PostStrings;
   
-  CSwitchResult(): ThereIs(false) {}
+  CSwitchResult(): ThereIs(false) {};
 };
   
 class CParser

package/harmony/pushy/src/main/cpp/lzma/CPP/Common/Common.h

@@ -1,15 +1,7 @@
 // Common.h
 
-#if defined(_MSC_VER) && _MSC_VER >= 1800
-#pragma warning(disable : 4464) // relative include path contains '..'
-#endif
-
-#ifndef ZIP7_INC_COMMON_H
-#define ZIP7_INC_COMMON_H
-
-#include "../../C/Precomp.h"
-#include "Common0.h"
-#include "MyWindows.h"
+#ifndef __COMMON_COMMON_H
+#define __COMMON_COMMON_H
 
 /*
 This file is included to all cpp files in 7-Zip.
@@ -19,10 +11,33 @@ So 7-Zip includes "Common.h" in both modes:
 and
   without precompiled StdAfx.h
 
-include "Common.h" before other h files of 7-zip,
-   if you need predefined macros.
-do not include "Common.h", if you need only interfaces,
-   and you don't need predefined macros.
+If you use 7-Zip code, you must include "Common.h" before other h files of 7-zip.
+If you don't need some things that are used in 7-Zip,
+you can change this h file or h files included in this file.
 */
 
+// compiler pragmas to disable some warnings
+#include "../../C/Compiler.h"
+
+// it's <windows.h> or code that defines windows things, if it's not _WIN32
+#include "MyWindows.h"
+
+// NewHandler.h and NewHandler.cpp redefine operator new() to throw exceptions, if compiled with old MSVC compilers
+#include "NewHandler.h"
+
+
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
+
+
+/* There is BUG in MSVC 6.0 compiler for operator new[]:
+   It doesn't check overflow, when it calculates size in bytes for allocated array.
+   So we can use MY_ARRAY_NEW macro instead of new[] operator. */
+
+#if defined(_MSC_VER) && (_MSC_VER == 1200) && !defined(_WIN64)
+  #define MY_ARRAY_NEW(p, T, size) p = new T[(size > (unsigned)0xFFFFFFFF / sizeof(T)) ? (unsigned)0xFFFFFFFF / sizeof(T) : size];
+#else
+  #define MY_ARRAY_NEW(p, T, size) p = new T[size];
+#endif
+
 #endif