react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Common/Bench.h

@@ -1,15 +1,13 @@
 // Bench.h
 
-#ifndef ZIP7_INC_7ZIP_BENCH_H
-#define ZIP7_INC_7ZIP_BENCH_H
+#ifndef __7ZIP_BENCH_H
+#define __7ZIP_BENCH_H
 
 #include "../../../Windows/System.h"
 
 #include "../../Common/CreateCoder.h"
 #include "../../UI/Common/Property.h"
 
-UInt64 Benchmark_GetUsage_Percents(UInt64 usage);
-
 struct CBenchInfo
 {
   UInt64 GlobalTime;
@@ -19,100 +17,58 @@ struct CBenchInfo
   UInt64 UnpackSize;
   UInt64 PackSize;
   UInt64 NumIterations;
-    
-  /*
-     during Code(): we track benchInfo only from one thread (theads with index[0])
-       NumIterations means number of threads
-       UnpackSize and PackSize are total sizes of all iterations of current thread
-     after Code():
-       NumIterations means the number of Iterations
-       UnpackSize and PackSize are total sizes of all threads
-  */
   
   CBenchInfo(): NumIterations(0) {}
-
   UInt64 GetUsage() const;
   UInt64 GetRatingPerUsage(UInt64 rating) const;
-  UInt64 GetSpeed(UInt64 numUnits) const;
-  UInt64 GetUnpackSizeSpeed() const { return GetSpeed(UnpackSize * NumIterations); }
-
-  UInt64 Get_UnpackSize_Full() const { return UnpackSize * NumIterations; }
-
-  UInt64 GetRating_LzmaEnc(UInt64 dictSize) const;
-  UInt64 GetRating_LzmaDec() const;
+  UInt64 GetSpeed(UInt64 numCommands) const;
 };
 
-
-struct CTotalBenchRes
+struct IBenchCallback
 {
-  // UInt64 NumIterations1; // for Usage
-  UInt64 NumIterations2; // for Rating / RPU
-
-  UInt64 Rating;
-  UInt64 Usage;
-  UInt64 RPU;
-  UInt64 Speed;
-  
-  void Init() { /* NumIterations1 = 0; */ NumIterations2 = 0; Rating = 0; Usage = 0; RPU = 0; Speed = 0; }
-
-  void SetSum(const CTotalBenchRes &r1, const CTotalBenchRes &r2)
-  {
-    Rating = (r1.Rating + r2.Rating);
-    Usage = (r1.Usage + r2.Usage);
-    RPU = (r1.RPU + r2.RPU);
-    Speed = (r1.Speed + r2.Speed);
-    // NumIterations1 = (r1.NumIterations1 + r2.NumIterations1);
-    NumIterations2 = (r1.NumIterations2 + r2.NumIterations2);
-  }
-
-  void Generate_From_BenchInfo(const CBenchInfo &info);
-  void Mult_For_Weight(unsigned weight);
-  void Update_With_Res(const CTotalBenchRes &r);
+  virtual HRESULT SetFreq(bool showFreq, UInt64 cpuFreq) = 0;
+  virtual HRESULT SetEncodeResult(const CBenchInfo &info, bool final) = 0;
+  virtual HRESULT SetDecodeResult(const CBenchInfo &info, bool final) = 0;
 };
 
+UInt64 GetCompressRating(UInt32 dictSize, UInt64 elapsedTime, UInt64 freq, UInt64 size);
+UInt64 GetDecompressRating(UInt64 elapsedTime, UInt64 freq, UInt64 outSize, UInt64 inSize, UInt64 numIterations);
 
 const unsigned kBenchMinDicLogSize = 18;
 
-UInt64 GetBenchMemoryUsage(UInt32 numThreads, int level, UInt64 dictionary, bool totalBench);
-
-Z7_PURE_INTERFACES_BEGIN
-DECLARE_INTERFACE(IBenchCallback)
-{
-  // virtual HRESULT SetFreq(bool showFreq, UInt64 cpuFreq) = 0;
-  virtual HRESULT SetEncodeResult(const CBenchInfo &info, bool final) = 0;
-  virtual HRESULT SetDecodeResult(const CBenchInfo &info, bool final) = 0;
-};
+UInt64 GetBenchMemoryUsage(UInt32 numThreads, UInt32 dictionary, bool totalBench = false);
 
-DECLARE_INTERFACE(IBenchPrintCallback)
+struct IBenchPrintCallback
 {
   virtual void Print(const char *s) = 0;
   virtual void NewLine() = 0;
   virtual HRESULT CheckBreak() = 0;
 };
 
-DECLARE_INTERFACE(IBenchFreqCallback)
+/*
+struct IBenchFreqCallback
 {
-  virtual HRESULT AddCpuFreq(unsigned numThreads, UInt64 freq, UInt64 usage) = 0;
-  virtual HRESULT FreqsFinished(unsigned numThreads) = 0;
+  virtual void AddCpuFreq(UInt64 freq) = 0;
 };
-Z7_PURE_INTERFACES_END
+*/
 
 HRESULT Bench(
     DECL_EXTERNAL_CODECS_LOC_VARS
     IBenchPrintCallback *printCallback,
     IBenchCallback *benchCallback,
+    // IBenchFreqCallback *freqCallback,
     const CObjectVector<CProperty> &props,
     UInt32 numIterations,
-    bool multiDict,
-    IBenchFreqCallback *freqCallback = NULL);
+    bool multiDict
+    );
 
 AString GetProcessThreadsInfo(const NWindows::NSystem::CProcessAffinity &ti);
 
 void GetSysInfo(AString &s1, AString &s2);
 void GetCpuName(AString &s);
-void AddCpuFeatures(AString &s);
+void GetCpuFeatures(AString &s);
 
-#ifdef Z7_LARGE_PAGES
+#ifdef _7ZIP_LARGE_PAGES
 void Add_LargePages_String(AString &s);
 #else
 // #define Add_LargePages_String

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Common/DefaultName.cpp

@@ -20,7 +20,7 @@ static UString GetDefaultName3(const UString &fileName,
   
   int dotPos = fileName.ReverseFind_Dot();
   if (dotPos > 0)
-    return fileName.Left((unsigned)dotPos) + addSubExtension;
+    return fileName.Left(dotPos) + addSubExtension;
 
   if (addSubExtension.IsEmpty())
     return fileName + L'~';

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Common/DefaultName.h

@@ -1,7 +1,7 @@
 // DefaultName.h
 
-#ifndef ZIP7_INC_DEFAULT_NAME_H
-#define ZIP7_INC_DEFAULT_NAME_H
+#ifndef __DEFAULT_NAME_H
+#define __DEFAULT_NAME_H
 
 #include "../../../Common/MyString.h"
 

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/UI/Common/DirItem.h

@@ -1,17 +1,11 @@
 // DirItem.h
 
-#ifndef ZIP7_INC_DIR_ITEM_H
-#define ZIP7_INC_DIR_ITEM_H
-
-#ifdef _WIN32
-#include "../../../Common/MyLinux.h"
-#endif
+#ifndef __DIR_ITEM_H
+#define __DIR_ITEM_H
 
 #include "../../../Common/MyString.h"
 
 #include "../../../Windows/FileFind.h"
-#include "../../../Windows/PropVariant.h"
-#include "../../../Windows/TimeUtils.h"
 
 #include "../../Common/UniqBlocks.h"
 
@@ -72,230 +66,43 @@ struct CDirItemsStat2: public CDirItemsStat
 };
 
 
-Z7_PURE_INTERFACES_BEGIN
-
-#define Z7_IFACEN_IDirItemsCallback(x) \
-  virtual HRESULT ScanError(const FString &path, DWORD systemError) x \
-  virtual HRESULT ScanProgress(const CDirItemsStat &st, const FString &path, bool isDir) x \
-
-Z7_IFACE_DECL_PURE(IDirItemsCallback)
-
-Z7_PURE_INTERFACES_END
 
+#define INTERFACE_IDirItemsCallback(x) \
+  virtual HRESULT ScanError(const FString &path, DWORD systemError) x; \
+  virtual HRESULT ScanProgress(const CDirItemsStat &st, const FString &path, bool isDir) x; \
 
-struct CArcTime
+struct IDirItemsCallback
 {
-  FILETIME FT;
-  UInt16 Prec;
-  Byte Ns100;
-  bool Def;
-
-  CArcTime()
-  {
-    Clear();
-  }
-
-  void Clear()
-  {
-    FT.dwHighDateTime = FT.dwLowDateTime = 0;
-    Prec = 0;
-    Ns100 = 0;
-    Def = false;
-  }
-
-  bool IsZero() const
-  {
-    return FT.dwLowDateTime == 0 && FT.dwHighDateTime == 0 && Ns100 == 0;
-  }
-
-  int CompareWith(const CArcTime &a) const
-  {
-    const int res = CompareFileTime(&FT, &a.FT);
-    if (res != 0)
-      return res;
-    if (Ns100 < a.Ns100) return -1;
-    if (Ns100 > a.Ns100) return 1;
-    return 0;
-  }
-
-  UInt64 Get_FILETIME_as_UInt64() const
-  {
-    return (((UInt64)FT.dwHighDateTime) << 32) + FT.dwLowDateTime;
-  }
-
-  UInt32 Get_DosTime() const
-  {
-    FILETIME ft2 = FT;
-    if ((Prec == k_PropVar_TimePrec_Base + 8 ||
-         Prec == k_PropVar_TimePrec_Base + 9)
-        && Ns100 != 0)
-    {
-      UInt64 u64 = Get_FILETIME_as_UInt64();
-      // we round up even small (ns < 100ns) as FileTimeToDosTime()
-      if (u64 % 20000000 == 0)
-      {
-        u64++;
-        ft2.dwHighDateTime = (DWORD)(u64 >> 32);
-        ft2.dwHighDateTime = (DWORD)u64;
-      }
-    }
-    // FileTimeToDosTime() is expected to round up in Windows
-    UInt32 dosTime;
-    // we use simplified code with utctime->dos.
-    // do we need local time instead here?
-    NWindows::NTime::FileTime_To_DosTime(ft2, dosTime);
-    return dosTime;
-  }
-
-  int GetNumDigits() const
-  {
-    if (Prec == k_PropVar_TimePrec_Unix ||
-        Prec == k_PropVar_TimePrec_DOS)
-      return 0;
-    if (Prec == k_PropVar_TimePrec_HighPrec)
-      return 9;
-    if (Prec == k_PropVar_TimePrec_0)
-      return 7;
-    int digits = (int)Prec - (int)k_PropVar_TimePrec_Base;
-    if (digits < 0)
-      digits = 0;
-    return digits;
-  }
-
-  void Write_To_FiTime(CFiTime &dest) const
-  {
-   #ifdef _WIN32
-    dest = FT;
-   #else
-    if (FILETIME_To_timespec(FT, dest))
-    if ((Prec == k_PropVar_TimePrec_Base + 8 ||
-         Prec == k_PropVar_TimePrec_Base + 9)
-        && Ns100 != 0)
-    {
-      dest.tv_nsec += Ns100;
-    }
-   #endif
-  }
-
-  // (Def) is not set
-  void Set_From_FILETIME(const FILETIME &ft)
-  {
-    FT = ft;
-    // Prec = k_PropVar_TimePrec_CompatNTFS;
-    Prec = k_PropVar_TimePrec_Base + 7;
-    Ns100 = 0;
-  }
-
-  // (Def) is not set
-  // it set full form precision: k_PropVar_TimePrec_Base + numDigits
-  void Set_From_FiTime(const CFiTime &ts)
-  {
-   #ifdef _WIN32
-    FT = ts;
-    Prec = k_PropVar_TimePrec_Base + 7;
-    // Prec = k_PropVar_TimePrec_Base; // for debug
-    // Prec = 0; // for debug
-    Ns100 = 0;
-   #else
-    unsigned ns100;
-    FiTime_To_FILETIME_ns100(ts, FT, ns100);
-    Ns100 = (Byte)ns100;
-    Prec = k_PropVar_TimePrec_Base + 9;
-   #endif
-  }
-
-  void Set_From_Prop(const PROPVARIANT &prop)
-  {
-    FT = prop.filetime;
-    unsigned prec = 0;
-    unsigned ns100 = 0;
-    const unsigned prec_Temp = prop.wReserved1;
-    if (prec_Temp != 0
-        && prec_Temp <= k_PropVar_TimePrec_1ns
-        && prop.wReserved3 == 0)
-    {
-      const unsigned ns100_Temp = prop.wReserved2;
-      if (ns100_Temp < 100)
-      {
-        ns100 = ns100_Temp;
-        prec = prec_Temp;
-      }
-    }
-    Prec = (UInt16)prec;
-    Ns100 = (Byte)ns100;
-    Def = true;
-  }
+  INTERFACE_IDirItemsCallback(=0)
 };
 
-
-struct CDirItem: public NWindows::NFile::NFind::CFileInfoBase
+struct CDirItem
 {
+  UInt64 Size;
+  FILETIME CTime;
+  FILETIME ATime;
+  FILETIME MTime;
   UString Name;
   
- #ifndef UNDER_CE
+  #if defined(_WIN32) && !defined(UNDER_CE)
+  // UString ShortName;
   CByteBuffer ReparseData;
+  CByteBuffer ReparseData2; // fixed (reduced) absolute links
 
- #ifdef _WIN32
-  // UString ShortName;
-  CByteBuffer ReparseData2; // fixed (reduced) absolute links for WIM format
   bool AreReparseData() const { return ReparseData.Size() != 0 || ReparseData2.Size() != 0; }
- #else
-  bool AreReparseData() const { return ReparseData.Size() != 0; }
- #endif // _WIN32
-
- #endif // !UNDER_CE
+  #endif
   
-  void Copy_From_FileInfoBase(const NWindows::NFile::NFind::CFileInfoBase &fi)
-  {
-    (NWindows::NFile::NFind::CFileInfoBase &)*this = fi;
-  }
-
+  UInt32 Attrib;
   int PhyParent;
   int LogParent;
   int SecureIndex;
 
- #ifdef _WIN32
- #else
-  int OwnerNameIndex;
-  int OwnerGroupIndex;
- #endif
-
-  // bool Attrib_IsDefined;
-
-  CDirItem():
-      PhyParent(-1)
-    , LogParent(-1)
-    , SecureIndex(-1)
-   #ifdef _WIN32
-   #else
-    , OwnerNameIndex(-1)
-    , OwnerGroupIndex(-1)
-   #endif
-    // , Attrib_IsDefined(true)
-  {
-  }
-
-
-  CDirItem(const NWindows::NFile::NFind::CFileInfo &fi,
-      int phyParent, int logParent, int secureIndex):
-    CFileInfoBase(fi)
-    , Name(fs2us(fi.Name))
-   #if defined(_WIN32) && !defined(UNDER_CE)
-    // , ShortName(fs2us(fi.ShortName))
-   #endif
-    , PhyParent(phyParent)
-    , LogParent(logParent)
-    , SecureIndex(secureIndex)
-   #ifdef _WIN32
-   #else
-    , OwnerNameIndex(-1)
-    , OwnerGroupIndex(-1)
-   #endif
-    {}
+  bool IsAltStream;
+  
+  CDirItem(): PhyParent(-1), LogParent(-1), SecureIndex(-1), IsAltStream(false) {}
+  bool IsDir() const { return (Attrib & FILE_ATTRIBUTE_DIRECTORY) != 0 ; }
 };
 
-
-
 class CDirItems
 {
   UStringVector Prefixes;
@@ -310,26 +117,18 @@ public:
   CObjectVector<CDirItem> Items;
 
   bool SymLinks;
-  bool ScanAltStreams;
-  bool ExcludeDirItems;
-  bool ExcludeFileItems;
-  bool ShareForWrite;
-
-  /* it must be called after anotrher checks */
-  bool CanIncludeItem(bool isDir) const
-  {
-    return isDir ? !ExcludeDirItems : !ExcludeFileItems;
-  }
- 
 
+  bool ScanAltStreams;
+  
   CDirItemsStat Stat;
 
-  #if !defined(UNDER_CE)
+  #ifndef UNDER_CE
   HRESULT SetLinkInfo(CDirItem &dirItem, const NWindows::NFile::NFind::CFileInfo &fi,
       const FString &phyPrefix);
   #endif
 
- #if defined(_WIN32) && !defined(UNDER_CE)
+
+  #if defined(_WIN32) && !defined(UNDER_CE)
 
   CUniqBlocks SecureBlocks;
   CByteBuffer TempSecureBuf;
@@ -337,19 +136,8 @@ public:
   bool ReadSecure;
   
   HRESULT AddSecurityItem(const FString &path, int &secureIndex);
-  HRESULT FillFixedReparse();
-
- #endif
-
- #ifndef _WIN32
-  
-  C_UInt32_UString_Map OwnerNameMap;
-  C_UInt32_UString_Map OwnerGroupMap;
-  bool StoreOwnerName;
-  
-  HRESULT FillDeviceSizes();
 
- #endif
+  #endif
 
   IDirItemsCallback *Callback;
 
@@ -369,9 +157,6 @@ public:
 
   unsigned AddPrefix(int phyParent, int logParent, const UString &prefix);
   void DeleteLastPrefix();
-
-  // HRESULT EnumerateOneDir(const FString &phyPrefix, CObjectVector<NWindows::NFile::NFind::CDirEntry> &files);
-  HRESULT EnumerateOneDir(const FString &phyPrefix, CObjectVector<NWindows::NFile::NFind::CFileInfo> &files);
   
   HRESULT EnumerateItems2(
     const FString &phyPrefix,
@@ -379,29 +164,27 @@ public:
     const FStringVector &filePaths,
     FStringVector *requestedPaths);
 
+  #if defined(_WIN32) && !defined(UNDER_CE)
+  void FillFixedReparse();
+  #endif
+
   void ReserveDown();
 };
 
-
-
-
 struct CArcItem
 {
   UInt64 Size;
+  FILETIME MTime;
   UString Name;
-  CArcTime MTime;  // it can be mtime of archive file, if MTime is not defined for item in archive
   bool IsDir;
   bool IsAltStream;
-  bool Size_Defined;
+  bool SizeDefined;
+  bool MTimeDefined;
   bool Censored;
   UInt32 IndexInServer;
+  int TimeType;
   
-  CArcItem():
-      IsDir(false),
-      IsAltStream(false),
-      Size_Defined(false),
-      Censored(false)
-    {}
+  CArcItem(): IsDir(false), IsAltStream(false), SizeDefined(false), MTimeDefined(false), Censored(false), TimeType(-1) {}
 };
 
 #endif