react-native-update 10.34.3 → 10.34.4

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

@@ -5,10 +5,6 @@
 #ifndef _WIN32
 
 #include <stdlib.h>
-#include <time.h>
-#ifdef __GNUC__
-#include <sys/time.h>
-#endif
 
 #include "MyWindows.h"
 
@@ -42,11 +38,11 @@ BSTR SysAllocStringByteLen(LPCSTR s, UINT len)
   /* Original SysAllocStringByteLen in Win32 maybe fills only unaligned null OLECHAR at the end.
      We provide also aligned null OLECHAR at the end. */
 
-  if (len >= (k_BstrSize_Max - (UINT)sizeof(OLECHAR) - (UINT)sizeof(OLECHAR) - (UINT)sizeof(CBstrSizeType)))
+  if (len >= (k_BstrSize_Max - sizeof(OLECHAR) - sizeof(OLECHAR) - sizeof(CBstrSizeType)))
     return NULL;
 
-  UINT size = (len + (UINT)sizeof(OLECHAR) + (UINT)sizeof(OLECHAR) - 1) & ~((UINT)sizeof(OLECHAR) - 1);
-  void *p = AllocateForBSTR(size + (UINT)sizeof(CBstrSizeType));
+  UINT size = (len + sizeof(OLECHAR) + sizeof(OLECHAR) - 1) & ~(sizeof(OLECHAR) - 1);
+  void *p = AllocateForBSTR(size + sizeof(CBstrSizeType));
   if (!p)
     return NULL;
   *(CBstrSizeType *)p = (CBstrSizeType)len;
@@ -60,11 +56,11 @@ BSTR SysAllocStringByteLen(LPCSTR s, UINT len)
 
 BSTR SysAllocStringLen(const OLECHAR *s, UINT len)
 {
-  if (len >= (k_BstrSize_Max - (UINT)sizeof(OLECHAR) - (UINT)sizeof(CBstrSizeType)) / (UINT)sizeof(OLECHAR))
+  if (len >= (k_BstrSize_Max - sizeof(OLECHAR) - sizeof(CBstrSizeType)) / sizeof(OLECHAR))
     return NULL;
 
-  UINT size = len * (UINT)sizeof(OLECHAR);
-  void *p = AllocateForBSTR(size + (UINT)sizeof(CBstrSizeType) + (UINT)sizeof(OLECHAR));
+  UINT size = len * sizeof(OLECHAR);
+  void *p = AllocateForBSTR(size + sizeof(CBstrSizeType) + sizeof(OLECHAR));
   if (!p)
     return NULL;
   *(CBstrSizeType *)p = (CBstrSizeType)size;
@@ -78,7 +74,7 @@ BSTR SysAllocStringLen(const OLECHAR *s, UINT len)
 BSTR SysAllocString(const OLECHAR *s)
 {
   if (!s)
-    return NULL;
+    return 0;
   const OLECHAR *s2 = s;
   while (*s2 != 0)
     s2++;
@@ -88,21 +84,21 @@ BSTR SysAllocString(const OLECHAR *s)
 void SysFreeString(BSTR bstr)
 {
   if (bstr)
-    FreeForBSTR((CBstrSizeType *)(void *)bstr - 1);
+    FreeForBSTR((CBstrSizeType *)bstr - 1);
 }
 
 UINT SysStringByteLen(BSTR bstr)
 {
   if (!bstr)
     return 0;
-  return *((CBstrSizeType *)(void *)bstr - 1);
+  return *((CBstrSizeType *)bstr - 1);
 }
 
 UINT SysStringLen(BSTR bstr)
 {
   if (!bstr)
     return 0;
-  return *((CBstrSizeType *)(void *)bstr - 1) / (UINT)sizeof(OLECHAR);
+  return *((CBstrSizeType *)bstr - 1) / sizeof(OLECHAR);
 }
 
 
@@ -143,150 +139,7 @@ LONG CompareFileTime(const FILETIME* ft1, const FILETIME* ft2)
 
 DWORD GetLastError()
 {
-  return (DWORD)errno;
-}
-
-void SetLastError(DWORD dw)
-{
-  errno = (int)dw;
-}
-
-
-static LONG TIME_GetBias()
-{
-  time_t utc = time(NULL);
-  struct tm *ptm = localtime(&utc);
-  int localdaylight = ptm->tm_isdst; /* daylight for local timezone */
-  ptm = gmtime(&utc);
-  ptm->tm_isdst = localdaylight; /* use local daylight, not that of Greenwich */
-  LONG bias = (int)(mktime(ptm)-utc);
-  return bias;
-}
-
-#define TICKS_PER_SEC 10000000
-/*
-#define SECS_PER_DAY (24 * 60 * 60)
-#define SECS_1601_TO_1970  ((369 * 365 + 89) * (UInt64)SECS_PER_DAY)
-#define TICKS_1601_TO_1970 (SECS_1601_TO_1970 * TICKS_PER_SEC)
-*/
-
-#define GET_TIME_64(pft) ((pft)->dwLowDateTime | ((UInt64)(pft)->dwHighDateTime << 32))
-
-#define SET_FILETIME(ft, v64) \
-   (ft)->dwLowDateTime = (DWORD)v64; \
-   (ft)->dwHighDateTime = (DWORD)(v64 >> 32);
-
-
-BOOL WINAPI FileTimeToLocalFileTime(const FILETIME *fileTime, FILETIME *localFileTime)
-{
-  UInt64 v = GET_TIME_64(fileTime);
-  v = (UInt64)((Int64)v - (Int64)TIME_GetBias() * TICKS_PER_SEC);
-  SET_FILETIME(localFileTime, v)
-  return TRUE;
-}
-
-BOOL WINAPI LocalFileTimeToFileTime(const FILETIME *localFileTime, FILETIME *fileTime)
-{
-  UInt64 v = GET_TIME_64(localFileTime);
-  v = (UInt64)((Int64)v + (Int64)TIME_GetBias() * TICKS_PER_SEC);
-  SET_FILETIME(fileTime, v)
-  return TRUE;
-}
-
-/*
-VOID WINAPI GetSystemTimeAsFileTime(FILETIME *ft)
-{
-  UInt64 t = 0;
-  timeval tv;
-  if (gettimeofday(&tv, NULL) == 0)
-  {
-    t = tv.tv_sec * (UInt64)TICKS_PER_SEC + TICKS_1601_TO_1970;
-    t += tv.tv_usec * 10;
-  }
-  SET_FILETIME(ft, t)
-}
-*/
-
-DWORD WINAPI GetTickCount(VOID)
-{
-  #ifndef _WIN32
-  // gettimeofday() doesn't work in some MINGWs by unknown reason
-  timeval tv;
-  if (gettimeofday(&tv, NULL) == 0)
-  {
-    // tv_sec and tv_usec are (long)
-    return (DWORD)((UInt64)(Int64)tv.tv_sec * (UInt64)1000 + (UInt64)(Int64)tv.tv_usec / 1000);
-  }
-  #endif
-  return (DWORD)time(NULL) * 1000;
-}
-
-
-#define PERIOD_4 (4 * 365 + 1)
-#define PERIOD_100 (PERIOD_4 * 25 - 1)
-#define PERIOD_400 (PERIOD_100 * 4 + 1)
-
-BOOL WINAPI FileTimeToSystemTime(const FILETIME *ft, SYSTEMTIME *st)
-{
-  UInt32 v;
-  UInt64 v64 = GET_TIME_64(ft);
-  v64 /= 10000;
-  st->wMilliseconds = (WORD)(v64 % 1000); v64 /= 1000;
-  st->wSecond       = (WORD)(v64 %   60); v64 /= 60;
-  st->wMinute       = (WORD)(v64 %   60); v64 /= 60;
-  v = (UInt32)v64;
-  st->wHour         = (WORD)(v %   24); v /= 24;
-
-  // 1601-01-01 was Monday
-  st->wDayOfWeek = (WORD)((v + 1) % 7);
-
-  UInt32 leaps, year, day, mon;
-  leaps = (3 * ((4 * v + (365 - 31 - 28) * 4 + 3) / PERIOD_400) + 3) / 4;
-  v += 28188 + leaps;
-  // leaps - the number of exceptions from PERIOD_4 rules starting from 1600-03-01
-  // (1959 / 64) - converts day from 03-01 to month
-  year = (20 * v - 2442) / (5 * PERIOD_4);
-  day = v - (year * PERIOD_4) / 4;
-  mon = (64 * day) / 1959;
-  st->wDay = (WORD)(day - (1959 * mon) / 64);
-  mon -= 1;
-  year += 1524;
-  if (mon > 12)
-  {
-    mon -= 12;
-    year++;
-  }
-  st->wMonth = (WORD)mon;
-  st->wYear = (WORD)year;
-
-  /*
-  unsigned year, mon;
-  unsigned char ms[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-  unsigned t;
-
-  year = (WORD)(1601 + v / PERIOD_400 * 400);
-  v %= PERIOD_400;
-
-  t = v / PERIOD_100; if (t ==  4) t =  3; year += t * 100; v -= t * PERIOD_100;
-  t = v / PERIOD_4;   if (t == 25) t = 24; year += t * 4;   v -= t * PERIOD_4;
-  t = v / 365;        if (t ==  4) t =  3; year += t;       v -= t * 365;
-
-  st->wYear = (WORD)year;
-
-  if (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0))
-    ms[1] = 29;
-  for (mon = 0;; mon++)
-  {
-    unsigned d = ms[mon];
-    if (v < d)
-      break;
-    v -= d;
-  }
-  st->wDay = (WORD)(v + 1);
-  st->wMonth = (WORD)(mon + 1);
-  */
-
-  return TRUE;
+  return 0;
 }
 
 #endif

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

@@ -1,36 +1,25 @@
 // MyWindows.h
 
-#ifdef Z7_DEFINE_GUID
-#undef Z7_DEFINE_GUID
-#endif
-
-#ifdef INITGUID
-  #define Z7_DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-    EXTERN_C const GUID name; \
-    EXTERN_C const GUID name = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }
-#else
-  #define Z7_DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
-    EXTERN_C const GUID name
-#endif
-
-
-#ifndef ZIP7_INC_MY_WINDOWS_H
-#define ZIP7_INC_MY_WINDOWS_H
+#ifndef __MY_WINDOWS_H
+#define __MY_WINDOWS_H
 
 #ifdef _WIN32
 
-#include "../../C/7zWindows.h"
+#include <windows.h>
 
-#else // _WIN32
+#ifdef UNDER_CE
+  #undef VARIANT_TRUE
+  #define VARIANT_TRUE ((VARIANT_BOOL)-1)
+#endif
+
+#else
 
 #include <stddef.h> // for wchar_t
 #include <string.h>
 // #include <stdint.h> // for uintptr_t
 
-#include "../../C/7zTypes.h"
 #include "MyGuidDef.h"
 
-// WINAPI is __stdcall in Windows-MSVC in windef.h
 #define WINAPI
 
 typedef char CHAR;
@@ -46,12 +35,17 @@ typedef unsigned short USHORT;
 typedef unsigned short WORD;
 typedef short VARIANT_BOOL;
 
-#define LOWORD(l) ((WORD)((DWORD_PTR)(l) & 0xffff))
-#define HIWORD(l) ((WORD)((DWORD_PTR)(l) >> 16))
+typedef int INT;
+typedef Int32 INT32;
+typedef unsigned int UINT;
+typedef UInt32 UINT32;
+typedef INT32 LONG;   // LONG, ULONG and DWORD must be 32-bit
+typedef UINT32 ULONG;
+
+#undef DWORD
+typedef UINT32 DWORD;
 
-// MS uses long for BOOL, but long is 32-bit in MS. So we use int.
-// typedef long BOOL;
-typedef int BOOL;
+typedef long BOOL;
 
 #ifndef FALSE
   #define FALSE 0
@@ -59,15 +53,15 @@ typedef int BOOL;
 #endif
 
 // typedef size_t ULONG_PTR;
-// typedef size_t DWORD_PTR;
+typedef size_t DWORD_PTR;
 // typedef uintptr_t UINT_PTR;
 // typedef ptrdiff_t UINT_PTR;
 
 typedef Int64 LONGLONG;
 typedef UInt64 ULONGLONG;
 
-typedef struct { LONGLONG QuadPart; } LARGE_INTEGER;
-typedef struct { ULONGLONG QuadPart; } ULARGE_INTEGER;
+typedef struct _LARGE_INTEGER { LONGLONG QuadPart; } LARGE_INTEGER;
+typedef struct _ULARGE_INTEGER { ULONGLONG QuadPart; } ULARGE_INTEGER;
 
 typedef const CHAR *LPCSTR;
 typedef CHAR TCHAR;
@@ -79,111 +73,61 @@ typedef OLECHAR *BSTR;
 typedef const OLECHAR *LPCOLESTR;
 typedef OLECHAR *LPOLESTR;
 
-typedef struct
+typedef struct _FILETIME
 {
   DWORD dwLowDateTime;
   DWORD dwHighDateTime;
 } FILETIME;
 
-#define SUCCEEDED(hr) ((HRESULT)(hr) >= 0)
-#define FAILED(hr)    ((HRESULT)(hr) < 0)
+#define HRESULT LONG
+#define FAILED(Status) ((HRESULT)(Status)<0)
 typedef ULONG PROPID;
 typedef LONG SCODE;
 
+#define ERROR_NEGATIVE_SEEK 131L
 
 #define S_OK    ((HRESULT)0x00000000L)
 #define S_FALSE ((HRESULT)0x00000001L)
-#define E_NOTIMPL     ((HRESULT)0x80004001L)
+#define E_NOTIMPL ((HRESULT)0x80004001L)
 #define E_NOINTERFACE ((HRESULT)0x80004002L)
-#define E_ABORT       ((HRESULT)0x80004004L)
-#define E_FAIL        ((HRESULT)0x80004005L)
-#define STG_E_INVALIDFUNCTION     ((HRESULT)0x80030001L)
-#define CLASS_E_CLASSNOTAVAILABLE ((HRESULT)0x80040111L)
-
+#define E_ABORT ((HRESULT)0x80004004L)
+#define E_FAIL ((HRESULT)0x80004005L)
+#define STG_E_INVALIDFUNCTION ((HRESULT)0x80030001L)
+#define E_OUTOFMEMORY ((HRESULT)0x8007000EL)
+#define E_INVALIDARG ((HRESULT)0x80070057L)
 
 #ifdef _MSC_VER
 #define STDMETHODCALLTYPE __stdcall
-#define STDAPICALLTYPE    __stdcall
 #else
-// do we need __export here?
 #define STDMETHODCALLTYPE
-#define STDAPICALLTYPE
 #endif
 
-#define STDAPI  EXTERN_C HRESULT STDAPICALLTYPE
-
-#ifndef DECLSPEC_NOTHROW
-#define DECLSPEC_NOTHROW    Z7_DECLSPEC_NOTHROW
-#endif
-
-#ifndef DECLSPEC_NOVTABLE
-#define DECLSPEC_NOVTABLE   Z7_DECLSPEC_NOVTABLE
-#endif
-
-#ifndef COM_DECLSPEC_NOTHROW
-#ifdef COM_STDMETHOD_CAN_THROW
-  #define COM_DECLSPEC_NOTHROW
-#else
-  #define COM_DECLSPEC_NOTHROW  DECLSPEC_NOTHROW
-#endif
-#endif
-
-#define DECLARE_INTERFACE(iface)              struct DECLSPEC_NOVTABLE iface
-#define DECLARE_INTERFACE_(iface, baseiface)  struct DECLSPEC_NOVTABLE iface : public baseiface
-
-#define STDMETHOD_(t, f)  virtual COM_DECLSPEC_NOTHROW t STDMETHODCALLTYPE f
-#define STDMETHOD(f)      STDMETHOD_(HRESULT, f)
-#define STDMETHODIMP_(t)  COM_DECLSPEC_NOTHROW t STDMETHODCALLTYPE
-#define STDMETHODIMP      STDMETHODIMP_(HRESULT)
-
+#define STDMETHOD_(t, f) virtual t STDMETHODCALLTYPE f
+#define STDMETHOD(f) STDMETHOD_(HRESULT, f)
+#define STDMETHODIMP_(type) type STDMETHODCALLTYPE
+#define STDMETHODIMP STDMETHODIMP_(HRESULT)
 
 #define PURE = 0
 
-// #define MIDL_INTERFACE(x) struct
-
+#define MIDL_INTERFACE(x) struct
 
 #ifdef __cplusplus
 
-/*
-  p7zip and 7-Zip before v23 used virtual destructor in IUnknown,
-  if _WIN32 is not defined.
-  It used virtual destructor, because some compilers don't like virtual
-  interfaces without virtual destructor.
-  IUnknown in Windows (_WIN32) doesn't use virtual destructor in IUnknown.
-  We still can define Z7_USE_VIRTUAL_DESTRUCTOR_IN_IUNKNOWN here,
-  if we want to be compatible with old plugin interface of p7zip and 7-Zip before v23.
-
-v23:
-  In new 7-Zip v23 we try to be more compatible with original IUnknown from _WIN32.
-  So we do not define Z7_USE_VIRTUAL_DESTRUCTOR_IN_IUNKNOWN here,
-*/
-// #define Z7_USE_VIRTUAL_DESTRUCTOR_IN_IUNKNOWN
-
-#ifdef Z7_USE_VIRTUAL_DESTRUCTOR_IN_IUNKNOWN
-#if defined(__clang__)
-#pragma GCC diagnostic ignored "-Winconsistent-missing-destructor-override"
-#endif
-#endif
-
-Z7_PURE_INTERFACES_BEGIN
-
 DEFINE_GUID(IID_IUnknown,
 0x00000000, 0x0000, 0x0000, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
 struct IUnknown
 {
-  STDMETHOD(QueryInterface) (REFIID iid, void **outObject) =0;
-  STDMETHOD_(ULONG, AddRef)() =0;
-  STDMETHOD_(ULONG, Release)() =0;
- #ifdef Z7_USE_VIRTUAL_DESTRUCTOR_IN_IUNKNOWN
+  STDMETHOD(QueryInterface) (REFIID iid, void **outObject) PURE;
+  STDMETHOD_(ULONG, AddRef)() PURE;
+  STDMETHOD_(ULONG, Release)() PURE;
+  #ifndef _WIN32
   virtual ~IUnknown() {}
- #endif
+  #endif
 };
 
 typedef IUnknown *LPUNKNOWN;
 
-Z7_PURE_INTERFACES_END
-
-#endif // __cplusplus
+#endif
 
 #define VARIANT_TRUE ((VARIANT_BOOL)-1)
 #define VARIANT_FALSE ((VARIANT_BOOL)0)
@@ -205,7 +149,6 @@ enum VARENUM
   VT_VARIANT = 12,
   VT_UNKNOWN = 13,
   VT_DECIMAL = 14,
-
   VT_I1 = 16,
   VT_UI1 = 17,
   VT_UI2 = 18,
@@ -253,8 +196,8 @@ typedef PROPVARIANT tagVARIANT;
 typedef tagVARIANT VARIANT;
 typedef VARIANT VARIANTARG;
 
-EXTERN_C HRESULT VariantClear(VARIANTARG *prop);
-EXTERN_C HRESULT VariantCopy(VARIANTARG *dest, const VARIANTARG *src);
+MY_EXTERN_C HRESULT VariantClear(VARIANTARG *prop);
+MY_EXTERN_C HRESULT VariantCopy(VARIANTARG *dest, const VARIANTARG *src);
 
 typedef struct tagSTATPROPSTG
 {
@@ -263,21 +206,15 @@ typedef struct tagSTATPROPSTG
   VARTYPE vt;
 } STATPROPSTG;
 
-EXTERN_C BSTR SysAllocStringByteLen(LPCSTR psz, UINT len);
-EXTERN_C BSTR SysAllocStringLen(const OLECHAR *sz, UINT len);
-EXTERN_C BSTR SysAllocString(const OLECHAR *sz);
-EXTERN_C void SysFreeString(BSTR bstr);
-EXTERN_C UINT SysStringByteLen(BSTR bstr);
-EXTERN_C UINT SysStringLen(BSTR bstr);
-
-EXTERN_C DWORD GetLastError();
-EXTERN_C void SetLastError(DWORD dwCode);
-EXTERN_C LONG CompareFileTime(const FILETIME* ft1, const FILETIME* ft2);
+MY_EXTERN_C BSTR SysAllocStringByteLen(LPCSTR psz, UINT len);
+MY_EXTERN_C BSTR SysAllocStringLen(const OLECHAR *sz, UINT len);
+MY_EXTERN_C BSTR SysAllocString(const OLECHAR *sz);
+MY_EXTERN_C void SysFreeString(BSTR bstr);
+MY_EXTERN_C UINT SysStringByteLen(BSTR bstr);
+MY_EXTERN_C UINT SysStringLen(BSTR bstr);
 
-EXTERN_C DWORD GetCurrentThreadId();
-EXTERN_C DWORD GetCurrentProcessId();
-
-#define MAX_PATH 1024
+MY_EXTERN_C DWORD GetLastError();
+MY_EXTERN_C LONG CompareFileTime(const FILETIME* ft1, const FILETIME* ft2);
 
 #define CP_ACP    0
 #define CP_OEMCP  1
@@ -290,36 +227,5 @@ typedef enum tagSTREAM_SEEK
   STREAM_SEEK_END = 2
 } STREAM_SEEK;
 
-
-
-typedef struct
-{
-  WORD wYear;
-  WORD wMonth;
-  WORD wDayOfWeek;
-  WORD wDay;
-  WORD wHour;
-  WORD wMinute;
-  WORD wSecond;
-  WORD wMilliseconds;
-} SYSTEMTIME;
-
-BOOL WINAPI FileTimeToLocalFileTime(const FILETIME *fileTime, FILETIME *localFileTime);
-BOOL WINAPI LocalFileTimeToFileTime(const FILETIME *localFileTime, FILETIME *fileTime);
-BOOL WINAPI FileTimeToSystemTime(const FILETIME *fileTime, SYSTEMTIME *systemTime);
-// VOID WINAPI GetSystemTimeAsFileTime(FILETIME *systemTimeAsFileTime);
-
-DWORD GetTickCount();
-
-
-/*
-#define CREATE_NEW          1
-#define CREATE_ALWAYS       2
-#define OPEN_EXISTING       3
-#define OPEN_ALWAYS         4
-#define TRUNCATE_EXISTING   5
-*/
-
-#endif // _WIN32
-
+#endif
 #endif