react-native-update 10.34.3 → 10.34.5

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/PropVariant.h

@@ -1,7 +1,7 @@
 // Windows/PropVariant.h
 
-#ifndef ZIP7_INC_WINDOWS_PROP_VARIANT_H
-#define ZIP7_INC_WINDOWS_PROP_VARIANT_H
+#ifndef __WINDOWS_PROP_VARIANT_H
+#define __WINDOWS_PROP_VARIANT_H
 
 #include "../Common/MyTypes.h"
 #include "../Common/MyWindows.h"
@@ -29,14 +29,11 @@ inline void PropVarEm_Set_UInt64(PROPVARIANT *p, UInt64 v) throw()
   p->uhVal.QuadPart = v;
 }
 
-inline void PropVarEm_Set_FileTime64_Prec(PROPVARIANT *p, UInt64 v, unsigned prec) throw()
+inline void PropVarEm_Set_FileTime64(PROPVARIANT *p, UInt64 v) throw()
 {
   p->vt = VT_FILETIME;
   p->filetime.dwLowDateTime = (DWORD)v;
   p->filetime.dwHighDateTime = (DWORD)(v >> 32);
-  p->wReserved1 = (WORD)prec;
-  p->wReserved2 = 0;
-  p->wReserved3 = 0;
 }
 
 inline void PropVarEm_Set_Bool(PROPVARIANT *p, bool b) throw()
@@ -48,14 +45,6 @@ inline void PropVarEm_Set_Bool(PROPVARIANT *p, bool b) throw()
 
 class CPropVariant : public tagPROPVARIANT
 {
-  // ---------- forbidden functions ----------
-  CPropVariant(const char *s);
-  // CPropVariant(const UString &s);
- #ifdef DEBUG_FSTRING_INHERITS_ASTRING
-  CPropVariant(const FString &s);
-  CPropVariant& operator=(const FString &s);
- #endif
-
 public:
   CPropVariant()
   {
@@ -64,53 +53,9 @@ public:
     // wReserved2 = 0;
     // wReserved3 = 0;
     // uhVal.QuadPart = 0;
-    bstrVal = NULL;
-  }
-
-
-  void Set_FtPrec(unsigned prec)
-  {
-    wReserved1 = (WORD)prec;
-    wReserved2 = 0;
-    wReserved3 = 0;
-  }
-
-  void SetAsTimeFrom_FT_Prec(const FILETIME &ft, unsigned prec)
-  {
-    operator=(ft);
-    Set_FtPrec(prec);
-  }
-
-  void SetAsTimeFrom_Ft64_Prec(UInt64 v, unsigned prec)
-  {
-    FILETIME ft;
-    ft.dwLowDateTime = (DWORD)(UInt32)v;
-    ft.dwHighDateTime = (DWORD)(UInt32)(v >> 32);
-    operator=(ft);
-    Set_FtPrec(prec);
-  }
-
-  void SetAsTimeFrom_FT_Prec_Ns100(const FILETIME &ft, unsigned prec, unsigned ns100)
-  {
-    operator=(ft);
-    wReserved1 = (WORD)prec;
-    wReserved2 = (WORD)ns100;
-    wReserved3 = 0;
-  }
-
-  unsigned Get_Ns100() const
-  {
-    const unsigned prec = wReserved1;
-    const unsigned ns100 = wReserved2;
-    if (prec == 0
-        && prec <= k_PropVar_TimePrec_1ns
-        && ns100 < 100
-        && wReserved3 == 0)
-      return ns100;
-    return 0;
+    bstrVal = 0;
   }
-
-  ~CPropVariant() throw();
+  ~CPropVariant() throw() { Clear(); }
   CPropVariant(const PROPVARIANT &varSrc);
   CPropVariant(const CPropVariant &varSrc);
   CPropVariant(BSTR bstrSrc);
@@ -119,14 +64,13 @@ public:
   CPropVariant(Byte value) { vt = VT_UI1; wReserved1 = 0; bVal = value; }
 
 private:
-  CPropVariant(UInt16 value); // { vt = VT_UI2; wReserved1 = 0; uiVal = value; }
   CPropVariant(Int16 value); // { vt = VT_I2; wReserved1 = 0; iVal = value; }
   CPropVariant(Int32 value); // { vt = VT_I4; wReserved1 = 0; lVal = value; }
-  CPropVariant(Int64 value); // { vt = VT_I8; wReserved1 = 0; hVal.QuadPart = value; }
 
 public:
   CPropVariant(UInt32 value) { vt = VT_UI4; wReserved1 = 0; ulVal = value; }
   CPropVariant(UInt64 value) { vt = VT_UI8; wReserved1 = 0; uhVal.QuadPart = value; }
+  CPropVariant(Int64 value) { vt = VT_I8; wReserved1 = 0; hVal.QuadPart = value; }
   CPropVariant(const FILETIME &value) { vt = VT_FILETIME; wReserved1 = 0; filetime = value; }
 
   CPropVariant& operator=(const CPropVariant &varSrc);
@@ -144,18 +88,14 @@ public:
   
 private:
   CPropVariant& operator=(Int16 value) throw();
-  CPropVariant& operator=(UInt16 value) throw();
-  CPropVariant& operator=(Int32 value) throw();
-  CPropVariant& operator=(Int64 value) throw();
 
 public:
+  CPropVariant& operator=(Int32 value) throw();
   CPropVariant& operator=(UInt32 value) throw();
   CPropVariant& operator=(UInt64 value) throw();
+  CPropVariant& operator=(Int64 value) throw();
   CPropVariant& operator=(const FILETIME &value) throw();
 
-  void Set_Int32(Int32 value) throw();
-  void Set_Int64(Int64 value) throw();
-
   BSTR AllocBstr(unsigned numChars);
 
   HRESULT Clear() throw();
@@ -165,6 +105,7 @@ public:
 
   HRESULT InternalClear() throw();
   void InternalCopy(const PROPVARIANT *pSrc);
+
   int Compare(const CPropVariant &a) throw();
 };
 

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/PropVariantConv.cpp

@@ -1,4 +1,4 @@
-// PropVariantConv.cpp
+// PropVariantConvert.cpp
 
 #include "StdAfx.h"
 
@@ -9,52 +9,16 @@
 
 #define UINT_TO_STR_2(c, val) { s[0] = (c); s[1] = (char)('0' + (val) / 10); s[2] = (char)('0' + (val) % 10); s += 3; }
 
-static const unsigned k_TimeStringBufferSize = 64;
-
-bool g_Timestamp_Show_UTC;
-#if 0
-bool g_Timestamp_Show_DisableZ;
-bool g_Timestamp_Show_TDelimeter;
-bool g_Timestamp_Show_ZoneOffset;
-#endif
-
-Z7_NO_INLINE
-bool ConvertUtcFileTimeToString2(const FILETIME &utc, unsigned ns100, char *s, int level, unsigned flags) throw()
+bool ConvertUtcFileTimeToString(const FILETIME &utc, char *s, int level) throw()
 {
   *s = 0;
   FILETIME ft;
-
-#if 0
-  Int64 bias64 = 0;
-#endif
-
-  const bool show_utc =
-      (flags & kTimestampPrintFlags_Force_UTC) ? true :
-      (flags & kTimestampPrintFlags_Force_LOCAL) ? false :
-      g_Timestamp_Show_UTC;
-
-  if (show_utc)
-    ft = utc;
-  else
-  {
-    if (!FileTimeToLocalFileTime(&utc, &ft))
-      return false;
-#if 0
-    if (g_Timestamp_Show_ZoneOffset)
-    {
-      const UInt64 utc64 = (((UInt64)utc.dwHighDateTime) << 32) + utc.dwLowDateTime;
-      const UInt64 loc64 = (((UInt64) ft.dwHighDateTime) << 32) +  ft.dwLowDateTime;
-      bias64 = (Int64)utc64 - (Int64)loc64;
-    }
-#endif
-  }
+  if (!FileTimeToLocalFileTime(&utc, &ft))
+    return false;
 
   SYSTEMTIME st;
   if (!BOOLToBool(FileTimeToSystemTime(&ft, &st)))
-  {
-    // win10 : that function doesn't work, if bit 63 of 64-bit FILETIME is set.
     return false;
-  }
 
   {
     unsigned val = st.wYear;
@@ -69,22 +33,17 @@ bool ConvertUtcFileTimeToString2(const FILETIME &utc, unsigned ns100, char *s, i
     s[0] = (char)('0' + val / 10);
     s += 4;
   }
-  UINT_TO_STR_2('-', st.wMonth)
-  UINT_TO_STR_2('-', st.wDay)
+  UINT_TO_STR_2('-', st.wMonth);
+  UINT_TO_STR_2('-', st.wDay);
   
   if (level > kTimestampPrintLevel_DAY)
   {
-    const char setChar =
-#if 0
-      g_Timestamp_Show_TDelimeter ? 'T' : // ISO 8601
-#endif
-      ' ';
-    UINT_TO_STR_2(setChar, st.wHour)
-    UINT_TO_STR_2(':', st.wMinute)
+    UINT_TO_STR_2(' ', st.wHour);
+    UINT_TO_STR_2(':', st.wMinute);
     
     if (level >= kTimestampPrintLevel_SEC)
     {
-      UINT_TO_STR_2(':', st.wSecond)
+      UINT_TO_STR_2(':', st.wSecond);
 
       if (level > kTimestampPrintLevel_SEC)
       {
@@ -112,93 +71,22 @@ bool ConvertUtcFileTimeToString2(const FILETIME &utc, unsigned ns100, char *s, i
             numDigits = (unsigned)level;
           s += numDigits;
         }
-        if (level >= kTimestampPrintLevel_NTFS + 1)
-        {
-          *s++ = (char)('0' + (ns100 / 10));
-          if (level >= kTimestampPrintLevel_NTFS + 2)
-            *s++ = (char)('0' + (ns100 % 10));
-        }
       }
     }
   }
   
-  if (show_utc)
-  {
-    if ((flags & kTimestampPrintFlags_DisableZ) == 0
-#if 0
-      && !g_Timestamp_Show_DisableZ
-#endif
-      )
-      *s++ = 'Z';
-  }
-#if 0
-  else if (g_Timestamp_Show_ZoneOffset)
-  {
-#if 1
-    {
-      char c;
-      if (bias64 < 0)
-      {
-        bias64 = -bias64;
-        c = '+';
-      }
-      else
-        c = '-';
-      UInt32 bias = (UInt32)((UInt64)bias64 / (10000000 * 60));
-#else
-    TIME_ZONE_INFORMATION zi;
-    const DWORD dw = GetTimeZoneInformation(&zi);
-    if (dw <= TIME_ZONE_ID_DAYLIGHT) // == 2
-    {
-      // UTC = LOCAL + Bias
-      Int32 bias = zi.Bias;
-      char c;
-      if (bias < 0)
-      {
-        bias = -bias;
-        c = '+';
-      }
-      else
-        c = '-';
-#endif
-      const UInt32 hours = (UInt32)bias / 60;
-      const UInt32 mins = (UInt32)bias % 60;
-      UINT_TO_STR_2(c, hours)
-      UINT_TO_STR_2(':', mins)
-    }
-  }
-#endif
   *s = 0;
   return true;
 }
 
 
-bool ConvertUtcFileTimeToString(const FILETIME &utc, char *s, int level) throw()
-{
-  return ConvertUtcFileTimeToString2(utc, 0, s, level);
-}
-
-bool ConvertUtcFileTimeToString2(const FILETIME &ft, unsigned ns100, wchar_t *dest, int level) throw()
-{
-  char s[k_TimeStringBufferSize];
-  const bool res = ConvertUtcFileTimeToString2(ft, ns100, s, level);
-  for (unsigned i = 0;; i++)
-  {
-    const Byte c = (Byte)s[i];
-    dest[i] = c;
-    if (c == 0)
-      break;
-  }
-  return res;
-}
-
 bool ConvertUtcFileTimeToString(const FILETIME &ft, wchar_t *dest, int level) throw()
 {
-  char s[k_TimeStringBufferSize];
-  const bool res = ConvertUtcFileTimeToString(ft, s, level);
+  char s[32];
+  bool res = ConvertUtcFileTimeToString(ft, s, level);
   for (unsigned i = 0;; i++)
   {
-    const Byte c = (Byte)s[i];
+    unsigned char c = s[i];
     dest[i] = c;
     if (c == 0)
       break;
@@ -218,19 +106,7 @@ void ConvertPropVariantToShortString(const PROPVARIANT &prop, char *dest) throw(
     case VT_UI2: ConvertUInt32ToString(prop.uiVal, dest); return;
     case VT_UI4: ConvertUInt32ToString(prop.ulVal, dest); return;
     case VT_UI8: ConvertUInt64ToString(prop.uhVal.QuadPart, dest); return;
-    case VT_FILETIME:
-    {
-      // const unsigned prec = prop.wReserved1;
-      int level = 0;
-      /*
-      if (prec == 0)
-        level = 7;
-      else if (prec > 16 && prec <= 16 + 9)
-        level = prec - 16;
-      */
-      ConvertUtcFileTimeToString(prop.filetime, dest, level);
-      return;
-    }
+    case VT_FILETIME: ConvertUtcFileTimeToString(prop.filetime, dest); return;
     // case VT_I1: return ConvertInt64ToString(prop.cVal, dest); return;
     case VT_I2: ConvertInt64ToString(prop.iVal, dest); return;
     case VT_I4: ConvertInt64ToString(prop.lVal, dest); return;
@@ -251,19 +127,7 @@ void ConvertPropVariantToShortString(const PROPVARIANT &prop, wchar_t *dest) thr
     case VT_UI2: ConvertUInt32ToString(prop.uiVal, dest); return;
     case VT_UI4: ConvertUInt32ToString(prop.ulVal, dest); return;
     case VT_UI8: ConvertUInt64ToString(prop.uhVal.QuadPart, dest); return;
-    case VT_FILETIME:
-    {
-      // const unsigned prec = prop.wReserved1;
-      int level = 0;
-      /*
-      if (prec == 0)
-        level = 7;
-      else if (prec > 16 && prec <= 16 + 9)
-        level = prec - 16;
-      */
-      ConvertUtcFileTimeToString(prop.filetime, dest, level);
-      return;
-    }
+    case VT_FILETIME: ConvertUtcFileTimeToString(prop.filetime, dest); return;
     // case VT_I1: return ConvertInt64ToString(prop.cVal, dest); return;
     case VT_I2: ConvertInt64ToString(prop.iVal, dest); return;
     case VT_I4: ConvertInt64ToString(prop.lVal, dest); return;

package/harmony/pushy/src/main/cpp/lzma/CPP/Windows/PropVariantConv.h

@@ -1,30 +1,20 @@
 // Windows/PropVariantConv.h
 
-#ifndef ZIP7_INC_PROP_VARIANT_CONV_H
-#define ZIP7_INC_PROP_VARIANT_CONV_H
+#ifndef __PROP_VARIANT_CONV_H
+#define __PROP_VARIANT_CONV_H
 
 #include "../Common/MyTypes.h"
 
 // provide at least 32 bytes for buffer including zero-end
 
-extern bool g_Timestamp_Show_UTC;
-
 #define kTimestampPrintLevel_DAY -3
 // #define kTimestampPrintLevel_HOUR -2
 #define kTimestampPrintLevel_MIN -1
-#define kTimestampPrintLevel_SEC  0
+#define kTimestampPrintLevel_SEC 0
 #define kTimestampPrintLevel_NTFS 7
-#define kTimestampPrintLevel_NS   9
-
-
-#define kTimestampPrintFlags_Force_UTC   (1 << 0)
-#define kTimestampPrintFlags_Force_LOCAL (1 << 1)
-#define kTimestampPrintFlags_DisableZ    (1 << 4)
 
 bool ConvertUtcFileTimeToString(const FILETIME &ft, char *s, int level = kTimestampPrintLevel_SEC) throw();
 bool ConvertUtcFileTimeToString(const FILETIME &ft, wchar_t *s, int level = kTimestampPrintLevel_SEC) throw();
-bool ConvertUtcFileTimeToString2(const FILETIME &ft, unsigned ns100, char *s, int level = kTimestampPrintLevel_SEC, unsigned flags = 0) throw();
-bool ConvertUtcFileTimeToString2(const FILETIME &ft, unsigned ns100, wchar_t *s, int level = kTimestampPrintLevel_SEC) throw();
 
 // provide at least 32 bytes for buffer including zero-end
 // don't send VT_BSTR to these functions