react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Bundles/LzmaCon/LzmaAlone.cpp

@@ -1,8 +1,10 @@
-  // LzmaAlone.cpp
+// LzmaAlone.cpp
 
 #include "StdAfx.h"
 
-// #include <stdio.h>
+#include <stdio.h>
+
+#include "../../../../C/CpuArch.h"
 
 #if (defined(_WIN32) || defined(OS2) || defined(MSDOS)) && !defined(UNDER_CE)
 #include <fcntl.h>
@@ -12,17 +14,16 @@
 #define MY_SET_BINARY_MODE(file)
 #endif
 
-#include "../../../../C/CpuArch.h"
+#include "../../../Common/MyWindows.h"
+#include "../../../Common/MyInitGuid.h"
+
 #include "../../../../C/7zVersion.h"
 #include "../../../../C/Alloc.h"
 #include "../../../../C/Lzma86.h"
 
-#include "../../../Common/MyWindows.h"
-#include "../../../Common/MyInitGuid.h"
-
 #include "../../../Windows/NtCheck.h"
 
-#ifndef Z7_ST
+#ifndef _7ZIP_ST
 #include "../../../Windows/System.h"
 #endif
 
@@ -40,8 +41,6 @@
 #include "../../UI/Console/BenchCon.h"
 #include "../../UI/Console/ConsoleClose.h"
 
-extern
-bool g_LargePagesMode;
 bool g_LargePagesMode = false;
 
 using namespace NCommandLineParser;
@@ -59,20 +58,20 @@ static const char * const kHelpString =
     "  b : Benchmark\n"
     "<switches>\n"
     "  -a{N}  : set compression mode : [0, 1] : default = 1 (max)\n"
-    "  -d{N}  : set dictionary size : [12, 31] : default = 24 (16 MiB)\n"
+    "  -d{N}  : set dictionary size : [12, 30] : default = 24 (16 MiB)\n"
     "  -fb{N} : set number of fast bytes : [5, 273] : default = 128\n"
     "  -mc{N} : set number of cycles for match finder\n"
     "  -lc{N} : set number of literal context bits : [0, 8] : default = 3\n"
     "  -lp{N} : set number of literal pos bits : [0, 4] : default = 0\n"
     "  -pb{N} : set number of pos bits : [0, 4] : default = 2\n"
-    "  -mf{M} : set match finder: [hc4, hc5, bt2, bt3, bt4, bt5] : default = bt4\n"
+    "  -mf{M} : set match finder: [hc4, bt2, bt3, bt4] : default = bt4\n"
     "  -mt{N} : set number of CPU threads\n"
     "  -eos   : write end of stream marker\n"
     "  -si    : read data from stdin\n"
     "  -so    : write data to stdout\n";
 
 
-static const char * const kCantAllocate = "Cannot allocate memory";
+static const char * const kCantAllocate = "Can not allocate memory";
 static const char * const kReadError = "Read error";
 static const char * const kWriteError = "Write error";
 
@@ -100,32 +99,24 @@ enum Enum
 };
 }
 
-#define SWFRM_3(t, mu, mi) t, mu, mi, NULL
-
-#define SWFRM_1(t) SWFRM_3(t, false, 0)
-#define SWFRM_SIMPLE SWFRM_1(NSwitchType::kSimple)
-#define SWFRM_STRING SWFRM_1(NSwitchType::kString)
-
-#define SWFRM_STRING_SINGL(mi) SWFRM_3(NSwitchType::kString, false, mi)
-
 static const CSwitchForm kSwitchForms[] =
 {
-  { "?",  SWFRM_SIMPLE },
-  { "H",  SWFRM_SIMPLE },
-  { "MM", SWFRM_STRING_SINGL(1) },
-  { "X", SWFRM_STRING_SINGL(1) },
-  { "A", SWFRM_STRING_SINGL(1) },
-  { "D", SWFRM_STRING_SINGL(1) },
-  { "FB", SWFRM_STRING_SINGL(1) },
-  { "MC", SWFRM_STRING_SINGL(1) },
-  { "LC", SWFRM_STRING_SINGL(1) },
-  { "LP", SWFRM_STRING_SINGL(1) },
-  { "PB", SWFRM_STRING_SINGL(1) },
-  { "MF", SWFRM_STRING_SINGL(1) },
-  { "MT", SWFRM_STRING },
-  { "EOS", SWFRM_SIMPLE },
-  { "SI",  SWFRM_SIMPLE },
-  { "SO",  SWFRM_SIMPLE },
+  { "?",  NSwitchType::kSimple, false },
+  { "H",  NSwitchType::kSimple, false },
+  { "MM", NSwitchType::kString, false, 1 },
+  { "X", NSwitchType::kString, false, 1 },
+  { "A", NSwitchType::kString, false, 1 },
+  { "D", NSwitchType::kString, false, 1 },
+  { "FB", NSwitchType::kString, false, 1 },
+  { "MC", NSwitchType::kString, false, 1 },
+  { "LC", NSwitchType::kString, false, 1 },
+  { "LP", NSwitchType::kString, false, 1 },
+  { "PB", NSwitchType::kString, false, 1 },
+  { "MF", NSwitchType::kString, false, 1 },
+  { "MT", NSwitchType::kString, false, 0 },
+  { "EOS", NSwitchType::kSimple, false },
+  { "SI",  NSwitchType::kSimple, false },
+  { "SO",  NSwitchType::kSimple, false },
   { "F86",  NSwitchType::kChar, false, 0, "+" }
 };
 
@@ -220,17 +211,20 @@ static void PrintHelp()
   Print(kHelpString);
 }
 
-
-Z7_CLASS_IMP_COM_1(
-  CProgressPrint,
-  ICompressProgressInfo
-)
+class CProgressPrint:
+  public ICompressProgressInfo,
+  public CMyUnknownImp
+{
   UInt64 _size1;
   UInt64 _size2;
 public:
   CProgressPrint(): _size1(0), _size2(0) {}
 
   void ClosePrint();
+
+  MY_UNKNOWN_IMP1(ICompressProgressInfo)
+
+  STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize);
 };
 
 #define BACK_STR \
@@ -246,7 +240,7 @@ void CProgressPrint::ClosePrint()
   Print(kBackSpaces);
 }
 
-Z7_COM7F_IMF(CProgressPrint::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize))
+STDMETHODIMP CProgressPrint::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize)
 {
   if (NConsoleClose::TestBreakSignal())
     return E_ABORT;
@@ -270,7 +264,6 @@ Z7_COM7F_IMF(CProgressPrint::SetRatioInfo(const UInt64 *inSize, const UInt64 *ou
 }
 
 
-Z7_ATTR_NORETURN
 static void IncorrectCommand()
 {
   throw "Incorrect command";
@@ -314,16 +307,14 @@ static int Error_HRESULT(const char *s, HRESULT res)
   else
   {
     char temp[32];
-    ConvertUInt32ToHex((UInt32)res, temp);
+    ConvertUInt32ToHex(res, temp);
     PrintErr("Error code = 0x");
     PrintErr_LF(temp);
   }
   return 1;
 }
 
-#if defined(_UNICODE) && !defined(_WIN64) && !defined(UNDER_CE)
 #define NT_CHECK_FAIL_ACTION PrintError("Unsupported Windows version"); return 1;
-#endif
 
 static void AddProp(CObjectVector<CProperty> &props2, const char *name, const wchar_t *val)
 {
@@ -355,7 +346,7 @@ static int main2(int numArgs, const char *args[])
   CParser parser;
   try
   {
-    if (!parser.ParseStrings(kSwitchForms, Z7_ARRAY_SIZE(kSwitchForms), commandStrings))
+    if (!parser.ParseStrings(kSwitchForms, ARRAY_SIZE(kSwitchForms), commandStrings))
     {
       PrintError2(parser.ErrorMessage, parser.ErrorLine);
       return 1;
@@ -372,8 +363,8 @@ static int main2(int numArgs, const char *args[])
     return 0;
   }
 
-  const bool stdInMode = parser[NKey::kStdIn].ThereIs;
-  const bool stdOutMode = parser[NKey::kStdOut].ThereIs;
+  bool stdInMode = parser[NKey::kStdIn].ThereIs;
+  bool stdOutMode = parser[NKey::kStdOut].ThereIs;
 
   if (!stdOutMode)
     PrintTitle();
@@ -394,16 +385,7 @@ static int main2(int numArgs, const char *args[])
     UInt32 dictLog;
     const UString &s = parser[NKey::kDict].PostStrings[0];
     dictLog = GetNumber(s);
-    if (dictLog >= 32)
-      throw "unsupported dictionary size";
-    // we only want to use dictionary sizes that are powers of 2,
-    // because 7-zip only recognizes such dictionary sizes in the lzma header.#if 0
-#if 0
-    if (dictLog == 32)
-      dict = (UInt32)3840 << 20;
-    else
-#endif
-    dict = (UInt32)1 << dictLog;
+    dict = 1 << dictLog;
     dictDefined = true;
     AddProp(props2, "d", s);
   }
@@ -421,7 +403,7 @@ static int main2(int numArgs, const char *args[])
 
   UInt32 numThreads = (UInt32)(Int32)-1;
 
-  #ifndef Z7_ST
+  #ifndef _7ZIP_ST
   
   if (parser[NKey::kMultiThread].ThereIs)
   {
@@ -492,7 +474,7 @@ static int main2(int numArgs, const char *args[])
     inStream = inStreamSpec;
     if (!inStreamSpec->Open(us2fs(inputName)))
     {
-      PrintError2("Cannot open input file", inputName);
+      PrintError2("can not open input file", inputName);
       return 1;
     }
   }
@@ -510,9 +492,9 @@ static int main2(int numArgs, const char *args[])
     const UString &outputName = params[paramIndex++];
     outStreamSpec = new COutFileStream;
     outStream = outStreamSpec;
-    if (!outStreamSpec->Create_ALWAYS(us2fs(outputName)))
+    if (!outStreamSpec->Create(us2fs(outputName), true))
     {
-      PrintError2("Cannot open output file", outputName);
+      PrintError2("can not open output file", outputName);
       return 1;
     }
   }
@@ -522,8 +504,8 @@ static int main2(int numArgs, const char *args[])
   
   if (inStreamSpec)
   {
-    if (!inStreamSpec->GetLength(fileSize))
-      throw "Cannot get file length";
+    if (!inStreamSpec->File.GetLength(fileSize))
+      throw "Can not get file length";
     fileSizeDefined = true;
     if (!stdOutMode)
       Print_Size("Input size:  ", fileSize);
@@ -531,7 +513,7 @@ static int main2(int numArgs, const char *args[])
 
   if (encodeMode && !dictDefined)
   {
-    dict = (UInt32)1 << kDictSizeLog;
+    dict = 1 << kDictSizeLog;
     if (fileSizeDefined)
     {
       unsigned i;
@@ -550,7 +532,7 @@ static int main2(int numArgs, const char *args[])
        You can use xz format instead, if you want to use filters */
 
     if (parser[NKey::kEOS].ThereIs || stdInMode)
-      throw "Cannot use stdin in this mode";
+      throw "Can not use stdin in this mode";
 
     size_t inSize = (size_t)fileSize;
 
@@ -567,7 +549,7 @@ static int main2(int numArgs, const char *args[])
     }
     
     if (ReadStream_FAIL(inStream, inBuffer, inSize) != S_OK)
-      throw "Cannot read";
+      throw "Can not read";
 
     Byte *outBuffer = NULL;
     size_t outSize;
@@ -683,7 +665,7 @@ static int main2(int numArgs, const char *args[])
       NCoderPropID::kMatchFinderCycles,
     };
 
-    const unsigned kNumPropsMax = Z7_ARRAY_SIZE(propIDs);
+    const unsigned kNumPropsMax = ARRAY_SIZE(propIDs);
 
     PROPVARIANT props[kNumPropsMax];
     for (int p = 0; p < 6; p++)
@@ -764,7 +746,7 @@ static int main2(int numArgs, const char *args[])
       throw "SetDecoderProperties error";
     
     UInt64 unpackSize = 0;
-    for (unsigned i = 0; i < 8; i++)
+    for (int i = 0; i < 8; i++)
       unpackSize |= ((UInt64)header[kPropertiesSize + i]) << (8 * i);
 
     bool unpackSizeDefined = (unpackSize != (UInt64)(Int64)-1);
@@ -799,7 +781,7 @@ static int main2(int numArgs, const char *args[])
   return 0;
 }
 
-int Z7_CDECL main(int numArgs, const char *args[])
+int MY_CDECL main(int numArgs, const char *args[])
 {
   NConsoleClose::CCtrlHandlerSetter ctrlHandlerSetter;
 

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

@@ -42,7 +42,7 @@ RSC=rc.exe
 # PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /Gr /MD /W4 /WX /GX /O2 /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "Z7_NO_LONG_PATH" /Yu"StdAfx.h" /FD /c
+# ADD CPP /nologo /Gr /MD /W4 /WX /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"StdAfx.h" /FD /c
 # ADD BASE RSC /l 0x419 /d "NDEBUG"
 # ADD RSC /l 0x419 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -66,7 +66,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 "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W4 /WX /Gm /GX /ZI /Od /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "Z7_NO_LONG_PATH" /Yu"StdAfx.h" /FD /GZ /c
+# ADD CPP /nologo /MDd /W4 /WX /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /Yu"StdAfx.h" /FD /GZ /c
 # ADD BASE RSC /l 0x419 /d "_DEBUG"
 # ADD RSC /l 0x419 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -132,10 +132,6 @@ SOURCE=..\..\..\Windows\FileIO.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Windows\NtCheck.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Windows\PropVariant.cpp
 # End Source File
 # Begin Source File
@@ -144,11 +140,11 @@ SOURCE=..\..\..\Windows\PropVariant.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Windows\Registry.cpp
+SOURCE=..\..\..\Windows\Synchronization.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Windows\Registry.h
+SOURCE=..\..\..\Windows\Synchronization.h
 # End Source File
 # Begin Source File
 
@@ -160,14 +156,6 @@ SOURCE=..\..\..\Windows\System.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Windows\SystemInfo.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Windows\SystemInfo.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Windows\Thread.h
 # End Source File
 # End Group
@@ -184,10 +172,6 @@ SOURCE=..\..\..\Common\CommandLineParser.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\Common.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\ComTry.h
 # End Source File
 # Begin Source File
@@ -212,30 +196,10 @@ SOURCE=..\..\..\Common\IntToString.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\LzFindPrepare.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\MyBuffer.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\MyBuffer2.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\MyCom.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\MyInitGuid.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\MyLinux.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\MyString.cpp
 # End Source File
 # Begin Source File
@@ -244,10 +208,6 @@ SOURCE=..\..\..\Common\MyString.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\Common\MyTypes.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\Common\MyUnknown.h
 # End Source File
 # Begin Source File
@@ -294,14 +254,6 @@ SOURCE=..\..\..\Common\StringToInt.h
 
 SOURCE=..\..\..\Common\Types.h
 # End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\Wildcard.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\..\Common\Wildcard.h
-# End Source File
 # End Group
 # Begin Group "7zip Common"
 
@@ -348,14 +300,6 @@ SOURCE=..\..\Common\MethodProps.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Common\StreamObjects.cpp
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\Common\StreamObjects.h
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Common\StreamUtils.cpp
 # End Source File
 # Begin Source File
@@ -374,6 +318,14 @@ SOURCE=..\..\UI\Common\Bench.cpp
 
 SOURCE=..\..\UI\Common\Bench.h
 # End Source File
+# Begin Source File
+
+SOURCE=..\..\UI\Common\LoadCodecs.cpp
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\UI\Common\LoadCodecs.h
+# End Source File
 # End Group
 # Begin Group "Console"
 
@@ -418,16 +370,21 @@ SOURCE=..\..\..\..\C\7zTypes.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\7zWindows.h
+SOURCE=..\..\..\..\C\Alloc.c
+# SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Alloc.c
+SOURCE=..\..\..\..\C\Alloc.h
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\C\Bra.c
 # SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Alloc.h
+SOURCE=..\..\..\..\C\Bra.h
 # End Source File
 # Begin Source File
 
@@ -436,7 +393,8 @@ SOURCE=..\..\..\..\C\Bra86.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\Compiler.h
+SOURCE=..\..\..\..\C\BraIA64.c
+# SUBTRACT CPP /YX /Yc /Yu
 # End Source File
 # Begin Source File
 
@@ -467,11 +425,6 @@ SOURCE=..\..\..\..\C\LzFindMt.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\C\LzFindOpt.c
-# SUBTRACT CPP /YX /Yc /Yu
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\..\..\C\LzHash.h
 # End Source File
 # Begin Source File
@@ -516,22 +469,6 @@ SOURCE=..\..\..\..\C\Threads.c
 SOURCE=..\..\..\..\C\Threads.h
 # End Source File
 # End Group
-# Begin Group "7zip"
-
-# PROP Default_Filter ""
-# Begin Source File
-
-SOURCE=..\..\ICoder.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IDecl.h
-# End Source File
-# Begin Source File
-
-SOURCE=..\..\IProgress.h
-# End Source File
-# End Group
 # Begin Source File
 
 SOURCE=.\LzmaAlone.cpp

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

@@ -1,11 +1,8 @@
 // StdAfx.h
 
-#ifndef ZIP7_INC_STDAFX_H
-#define ZIP7_INC_STDAFX_H
+#ifndef __STDAFX_H
+#define __STDAFX_H
 
-#if defined(_MSC_VER) && _MSC_VER >= 1800
-#pragma warning(disable : 4464) // relative include path contains '..'
-#endif
 #include "../../../Common/Common.h"
 
 #endif

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

@@ -1,10 +1,6 @@
 PROG = lzma.exe
 MY_CONSOLE = 1
 
-CFLAGS = $(CFLAGS) -DZ7_NO_LONG_PATH
-# CFLAGS = $(CFLAGS) -DZ7_ST
-
-
 CURRENT_OBJS = \
   $O\LzmaAlone.obj \
 
@@ -18,28 +14,24 @@ COMMON_OBJS = \
   $O\CRC.obj \
   $O\CrcReg.obj \
   $O\IntToString.obj \
-  $O\LzFindPrepare.obj \
   $O\MyString.obj \
-  $O\MyVector.obj \
   $O\NewHandler.obj \
   $O\StringConvert.obj \
   $O\StringToInt.obj \
-  $O\Wildcard.obj \
+  $O\MyVector.obj
 
 WIN_OBJS = \
   $O\FileIO.obj \
   $O\PropVariant.obj \
-  $O\Registry.obj \
-  $O\System.obj \
-  $O\SystemInfo.obj \
+  $O\System.obj
 
 7ZIP_COMMON_OBJS = \
-  $O\CreateCoder.obj \
   $O\CWrappers.obj \
+  $O\CreateCoder.obj \
   $O\FileStreams.obj \
   $O\FilterCoder.obj \
   $O\MethodProps.obj \
-  $O\StreamObjects.obj \
+  $O\OutBuffer.obj \
   $O\StreamUtils.obj \
 
 UI_COMMON_OBJS = \
@@ -62,7 +54,6 @@ C_OBJS = \
   $O\Threads.obj \
 
 !include "../../Crc.mak"
-!include "../../LzFindOpt.mak"
 !include "../../LzmaDec.mak"
 
 !include "../../7zip.mak"