react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Console/MainAr.cpp

@@ -5,7 +5,6 @@
 #ifdef _WIN32
 #include "../../../../C/DllSecur.h"
 #endif
-#include "../../../../C/CpuArch.h"
 
 #include "../../../Common/MyException.h"
 #include "../../../Common/StdOutStream.h"
@@ -20,11 +19,7 @@
 
 using namespace NWindows;
 
-extern
-CStdOutStream *g_StdStream;
 CStdOutStream *g_StdStream = NULL;
-extern
-CStdOutStream *g_ErrStream;
 CStdOutStream *g_ErrStream = NULL;
 
 extern int Main2(
@@ -53,54 +48,9 @@ static void PrintError(const char *message)
     *g_ErrStream << "\n\n" << message << endl;
 }
 
-#if defined(_WIN32) && defined(_UNICODE) && !defined(_WIN64) && !defined(UNDER_CE)
 #define NT_CHECK_FAIL_ACTION *g_StdStream << "Unsupported Windows version"; return NExitCode::kFatalError;
-#endif
 
-static inline bool CheckIsa()
-{
-  // __try
-  {
-    // some compilers (e2k) support SSE/AVX, but cpuid() can be unavailable or return lower isa support
-#ifdef MY_CPU_X86_OR_AMD64
-    #if 0 && (defined(__AVX512F__) && defined(__AVX512VL__))
-      if (!CPU_IsSupported_AVX512F_AVX512VL())
-        return false;
-    #elif defined(__AVX2__)
-      if (!CPU_IsSupported_AVX2())
-        return false;
-    #elif defined(__AVX__)
-      if (!CPU_IsSupported_AVX())
-        return false;
-    #elif defined(__SSE2__) && !defined(MY_CPU_AMD64) || defined(_M_IX86_FP) && (_M_IX86_FP >= 2)
-      if (!CPU_IsSupported_SSE2())
-        return false;
-    #elif defined(__SSE__) && !defined(MY_CPU_AMD64) || defined(_M_IX86_FP) && (_M_IX86_FP >= 1)
-      if (!CPU_IsSupported_SSE() ||
-          !CPU_IsSupported_CMOV())
-        return false;
-    #endif
-#endif
-    /*
-    __asm
-    {
-      _emit 0fH
-      _emit 038H
-      _emit 0cbH
-      _emit (0c0H + 0 * 8 + 0)
-    }
-    */
-    return true;
-  }
-  /*
-  __except (EXCEPTION_EXECUTE_HANDLER)
-  {
-    return false;
-  }
-  */
-}
-
-int Z7_CDECL main
+int MY_CDECL main
 (
   #ifndef _WIN32
   int numArgs, char *args[]
@@ -110,14 +60,6 @@ int Z7_CDECL main
   g_ErrStream = &g_StdErr;
   g_StdStream = &g_StdOut;
 
-  // #if (defined(_MSC_VER) && defined(_M_IX86))
-  if (!CheckIsa())
-  {
-    PrintError("ERROR: processor doesn't support required ISA extension");
-    return NExitCode::kFatalError;
-  }
-  // #endif
-
   NT_CHECK
 
   NConsoleClose::CCtrlHandlerSetter ctrlHandlerSetter;
@@ -140,13 +82,11 @@ int Z7_CDECL main
     PrintError(kMemoryExceptionMessage);
     return (NExitCode::kMemoryError);
   }
-/*
   catch(const NConsoleClose::CCtrlBreakException &)
   {
     PrintError(kUserBreakMessage);
     return (NExitCode::kUserBreak);
   }
-*/
   catch(const CMessagePathException &e)
   {
     PrintError(kException_CmdLine_Error_Message);
@@ -173,7 +113,7 @@ int Z7_CDECL main
     }
     return (NExitCode::kFatalError);
   }
-  catch(NExitCode::EEnum exitCode)
+  catch(NExitCode::EEnum &exitCode)
   {
     FlushStreams();
     if (g_ErrStream)

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.cpp

@@ -77,17 +77,17 @@ HRESULT COpenCallbackConsole::Open_Finished()
 }
 
 
-#ifndef Z7_NO_CRYPTO
+#ifndef _NO_CRYPTO
 
 HRESULT COpenCallbackConsole::Open_CryptoGetTextPassword(BSTR *password)
 {
   *password = NULL;
-  RINOK(CheckBreak2())
+  RINOK(CheckBreak2());
 
   if (!PasswordIsDefined)
   {
     ClosePercents();
-    RINOK(GetPassword_HRESULT(_so, Password))
+    RINOK(GetPassword_HRESULT(_so, Password));
     PasswordIsDefined = true;
   }
   return StringToBstr(Password, password);

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Console/OpenCallbackConsole.h

@@ -1,7 +1,7 @@
 // OpenCallbackConsole.h
 
-#ifndef ZIP7_INC_OPEN_CALLBACK_CONSOLE_H
-#define ZIP7_INC_OPEN_CALLBACK_CONSOLE_H
+#ifndef __OPEN_CALLBACK_CONSOLE_H
+#define __OPEN_CALLBACK_CONSOLE_H
 
 #include "../../../Common/StdOutStream.h"
 
@@ -17,12 +17,12 @@ protected:
   CStdOutStream *_so;
   CStdOutStream *_se;
 
-  // UInt64 _totalFiles;
-  UInt64 _totalBytes;
   bool _totalFilesDefined;
   // bool _totalBytesDefined;
+  // UInt64 _totalFiles;
+  UInt64 _totalBytes;
 
-  bool NeedPercents() const { return _percent._so && !_percent.DisablePrint; }
+  bool NeedPercents() const { return _percent._so != NULL; }
 
 public:
 
@@ -35,35 +35,28 @@ public:
   }
 
   COpenCallbackConsole():
-      _totalBytes(0),
       _totalFilesDefined(false),
       // _totalBytesDefined(false),
+      _totalBytes(0),
       MultiArcMode(false)
       
-      #ifndef Z7_NO_CRYPTO
+      #ifndef _NO_CRYPTO
       , PasswordIsDefined(false)
       // , PasswordWasAsked(false)
       #endif
       
       {}
-
-  virtual ~COpenCallbackConsole() {}
   
-  void Init(
-      CStdOutStream *outStream,
-      CStdOutStream *errorStream,
-      CStdOutStream *percentStream,
-      bool disablePercents)
+  void Init(CStdOutStream *outStream, CStdOutStream *errorStream, CStdOutStream *percentStream)
   {
     _so = outStream;
     _se = errorStream;
     _percent._so = percentStream;
-    _percent.DisablePrint = disablePercents;
   }
 
-  Z7_IFACE_IMP(IOpenCallbackUI)
+  INTERFACE_IOpenCallbackUI(;)
   
-  #ifndef Z7_NO_CRYPTO
+  #ifndef _NO_CRYPTO
   bool PasswordIsDefined;
   // bool PasswordWasAsked;
   UString Password;

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Console/PercentPrinter.cpp

@@ -63,8 +63,7 @@ void CPercentPrinter::GetPercents()
   {
     char c = '%';
     UInt64 val = 0;
-    if (Total == (UInt64)(Int64)-1 ||
-        (Total == 0 && Completed != 0))
+    if (Total == (UInt64)(Int64)-1)
     {
       val = Completed >> 20;
       c = 'M';
@@ -79,7 +78,7 @@ void CPercentPrinter::GetPercents()
 
   while (size < kPercentsSize)
   {
-    _s.Add_Space();
+    _s += ' ';
     size++;
   }
 
@@ -88,8 +87,6 @@ void CPercentPrinter::GetPercents()
 
 void CPercentPrinter::Print()
 {
-  if (DisablePrint)
-    return;
   DWORD tick = 0;
   if (_tickStep != 0)
     tick = GetTickCount();
@@ -127,8 +124,8 @@ void CPercentPrinter::Print()
     char s[32];
     ConvertUInt64ToString(Files, s);
     // unsigned size = (unsigned)strlen(s);
-    // for (; size < 3; size++) _s.Add_Space();
-    _s.Add_Space();
+    // for (; size < 3; size++) _s += ' ';
+    _s += ' ';
     _s += s;
     // _s += "f";
   }
@@ -136,17 +133,17 @@ void CPercentPrinter::Print()
 
   if (!Command.IsEmpty())
   {
-    _s.Add_Space();
+    _s += ' ';
     _s += Command;
   }
 
   if (!FileName.IsEmpty() && _s.Len() < MaxLen)
   {
-    _s.Add_Space();
+    _s += ' ';
 
     _tempU = FileName;
-    _so->Normalize_UString_Path(_tempU);
-    _so->Convert_UString_to_AString(_tempU, _temp);
+    _so->Normalize_UString(_tempU);
+    StdOut_Convert_UString_to_AString(_tempU, _temp);
     if (_s.Len() + _temp.Len() > MaxLen)
     {
       unsigned len = FileName.Len();
@@ -159,8 +156,8 @@ void CPercentPrinter::Print()
         _tempU = FileName;
         _tempU.Delete(len / 2, _tempU.Len() - len);
         _tempU.Insert(len / 2, L" . ");
-        _so->Normalize_UString_Path(_tempU);
-        _so->Convert_UString_to_AString(_tempU, _temp);
+        _so->Normalize_UString(_tempU);
+        StdOut_Convert_UString_to_AString(_tempU, _temp);
         if (_s.Len() + _temp.Len() <= MaxLen)
           break;
       }

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Console/PercentPrinter.h

@@ -1,7 +1,7 @@
 // PercentPrinter.h
 
-#ifndef ZIP7_INC_PERCENT_PRINTER_H
-#define ZIP7_INC_PERCENT_PRINTER_H
+#ifndef __PERCENT_PRINTER_H
+#define __PERCENT_PRINTER_H
 
 #include "../../../Common/StdOutStream.h"
 
@@ -26,13 +26,6 @@ struct CPercentPrinterState
 
 class CPercentPrinter: public CPercentPrinterState
 {
-public:
-  CStdOutStream *_so;
-  bool DisablePrint;
-  bool NeedFlush;
-  unsigned MaxLen;
-  
-private:
   UInt32 _tickStep;
   DWORD _prevTick;
 
@@ -48,13 +41,16 @@ private:
   void GetPercents();
 
 public:
+  CStdOutStream *_so;
+
+  bool NeedFlush;
+  unsigned MaxLen;
   
   CPercentPrinter(UInt32 tickStep = 200):
-      DisablePrint(false),
-      NeedFlush(true),
-      MaxLen(80 - 1),
       _tickStep(tickStep),
-      _prevTick(0)
+      _prevTick(0),
+      NeedFlush(true),
+      MaxLen(80 - 1)
   {}
 
   ~CPercentPrinter();

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Console/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