react-native-update 10.34.3 → 10.34.4

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

@@ -2,11 +2,6 @@
 
 #include "StdAfx.h"
 
-#ifndef _WIN32
-#include <sys/time.h>
-#include <time.h>
-#endif
-
 #include "Defs.h"
 #include "TimeUtils.h"
 
@@ -14,16 +9,14 @@ namespace NWindows {
 namespace NTime {
 
 static const UInt32 kNumTimeQuantumsInSecond = 10000000;
-static const unsigned kFileTimeStartYear = 1601;
-#if !defined(_WIN32) || defined(UNDER_CE)
-static const unsigned kDosTimeStartYear = 1980;
-#endif
-static const unsigned kUnixTimeStartYear = 1970;
+static const UInt32 kFileTimeStartYear = 1601;
+static const UInt32 kDosTimeStartYear = 1980;
+static const UInt32 kUnixTimeStartYear = 1970;
 static const UInt64 kUnixTimeOffset =
-    (UInt64)60 * 60 * 24 * (89 + 365 * (UInt32)(kUnixTimeStartYear - kFileTimeStartYear));
+    (UInt64)60 * 60 * 24 * (89 + 365 * (kUnixTimeStartYear - kFileTimeStartYear));
 static const UInt64 kNumSecondsInFileTime = (UInt64)(Int64)-1 / kNumTimeQuantumsInSecond;
 
-bool DosTime_To_FileTime(UInt32 dosTime, FILETIME &ft) throw()
+bool DosTimeToFileTime(UInt32 dosTime, FILETIME &ft) throw()
 {
   #if defined(_WIN32) && !defined(UNDER_CE)
   return BOOLToBool(::DosDateTimeToFileTime((UInt16)(dosTime >> 16), (UInt16)(dosTime & 0xFFFF), &ft));
@@ -31,14 +24,8 @@ bool DosTime_To_FileTime(UInt32 dosTime, FILETIME &ft) throw()
   ft.dwLowDateTime = 0;
   ft.dwHighDateTime = 0;
   UInt64 res;
-  if (!GetSecondsSince1601(
-      kDosTimeStartYear + (unsigned)(dosTime >> 25),
-      (unsigned)((dosTime >> 21) & 0xF),
-      (unsigned)((dosTime >> 16) & 0x1F),
-      (unsigned)((dosTime >> 11) & 0x1F),
-      (unsigned)((dosTime >>  5) & 0x3F),
-      (unsigned)((dosTime & 0x1F)) * 2,
-      res))
+  if (!GetSecondsSince1601(kDosTimeStartYear + (dosTime >> 25), (dosTime >> 21) & 0xF, (dosTime >> 16) & 0x1F,
+      (dosTime >> 11) & 0x1F, (dosTime >> 5) & 0x3F, (dosTime & 0x1F) * 2, res))
     return false;
   res *= kNumTimeQuantumsInSecond;
   ft.dwLowDateTime = (UInt32)res;
@@ -50,7 +37,11 @@ bool DosTime_To_FileTime(UInt32 dosTime, FILETIME &ft) throw()
 static const UInt32 kHighDosTime = 0xFF9FBF7D;
 static const UInt32 kLowDosTime = 0x210000;
 
-bool FileTime_To_DosTime(const FILETIME &ft, UInt32 &dosTime) throw()
+#define PERIOD_4 (4 * 365 + 1)
+#define PERIOD_100 (PERIOD_4 * 25 - 1)
+#define PERIOD_400 (PERIOD_100 * 4 + 1)
+
+bool FileTimeToDosTime(const FILETIME &ft, UInt32 &dosTime) throw()
 {
   #if defined(_WIN32) && !defined(UNDER_CE)
 
@@ -64,10 +55,6 @@ bool FileTime_To_DosTime(const FILETIME &ft, UInt32 &dosTime) throw()
 
   #else
 
-#define PERIOD_4 (4 * 365 + 1)
-#define PERIOD_100 (PERIOD_4 * 25 - 1)
-#define PERIOD_400 (PERIOD_100 * 4 + 1)
-
   unsigned year, mon, day, hour, min, sec;
   UInt64 v64 = ft.dwLowDateTime | ((UInt64)ft.dwHighDateTime << 32);
   Byte ms[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
@@ -84,7 +71,7 @@ bool FileTime_To_DosTime(const FILETIME &ft, UInt32 &dosTime) throw()
 
   v = (UInt32)v64;
 
-  year = kFileTimeStartYear + (unsigned)(v / PERIOD_400 * 400);
+  year = (unsigned)(kFileTimeStartYear + v / PERIOD_400 * 400);
   v %= PERIOD_400;
 
   temp = (unsigned)(v / PERIOD_100);
@@ -123,97 +110,54 @@ bool FileTime_To_DosTime(const FILETIME &ft, UInt32 &dosTime) throw()
   dosTime = kHighDosTime;
   if (year >= 128)
     return false;
-  dosTime =
-      ((UInt32)year << 25)
-    | ((UInt32)mon  << 21)
-    | ((UInt32)day  << 16)
-    | ((UInt32)hour << 11)
-    | ((UInt32)min  << 5)
-    | ((UInt32)sec  >> 1);
+  dosTime = (year << 25) | (mon << 21) | (day << 16) | (hour << 11) | (min << 5) | (sec >> 1);
   #endif
   return true;
 }
 
-
-bool UtcFileTime_To_LocalDosTime(const FILETIME &utc, UInt32 &dosTime) throw()
-{
-  FILETIME loc = { 0, 0 };
-  const UInt64 u1 = FILETIME_To_UInt64(utc);
-  const UInt64 kDelta = ((UInt64)1 << 41); // it's larger than quantums in 1 sec.
-  if (u1 >= kDelta)
-  {
-    if (!FileTimeToLocalFileTime(&utc, &loc))
-      loc = utc;
-    else
-    {
-      const UInt64 u2 = FILETIME_To_UInt64(loc);
-      const UInt64 delta = u1 < u2 ? (u2 - u1) : (u1 - u2);
-      if (delta > kDelta) // if FileTimeToLocalFileTime() overflow, we use UTC time
-        loc = utc;
-    }
-  }
-  return FileTime_To_DosTime(loc, dosTime);
-}
-
-UInt64 UnixTime_To_FileTime64(UInt32 unixTime) throw()
+UInt64 UnixTimeToFileTime64(UInt32 unixTime) throw()
 {
   return (kUnixTimeOffset + (UInt64)unixTime) * kNumTimeQuantumsInSecond;
 }
 
-void UnixTime_To_FileTime(UInt32 unixTime, FILETIME &ft) throw()
+void UnixTimeToFileTime(UInt32 unixTime, FILETIME &ft) throw()
 {
-  const UInt64 v = UnixTime_To_FileTime64(unixTime);
+  UInt64 v = UnixTimeToFileTime64(unixTime);
   ft.dwLowDateTime = (DWORD)v;
   ft.dwHighDateTime = (DWORD)(v >> 32);
 }
 
-UInt64 UnixTime64_To_FileTime64(Int64 unixTime) throw()
+UInt64 UnixTime64ToFileTime64(Int64 unixTime) throw()
 {
-  return (UInt64)((Int64)kUnixTimeOffset + unixTime) * kNumTimeQuantumsInSecond;
+  return (UInt64)(kUnixTimeOffset + unixTime) * kNumTimeQuantumsInSecond;
 }
 
-
-bool UnixTime64_To_FileTime64(Int64 unixTime, UInt64 &fileTime) throw()
+bool UnixTime64ToFileTime(Int64 unixTime, FILETIME &ft) throw()
 {
   if (unixTime > (Int64)(kNumSecondsInFileTime - kUnixTimeOffset))
   {
-    fileTime = (UInt64)(Int64)-1;
+    ft.dwLowDateTime = ft.dwHighDateTime = (UInt32)(Int32)-1;
     return false;
   }
-  if (unixTime < -(Int64)kUnixTimeOffset)
+  Int64 v = (Int64)kUnixTimeOffset + unixTime;
+  if (v < 0)
   {
-    fileTime = 0;
+    ft.dwLowDateTime = ft.dwHighDateTime = 0;
     return false;
   }
-  fileTime = UnixTime64_To_FileTime64(unixTime);
+  UInt64 v2 = (UInt64)v * kNumTimeQuantumsInSecond;
+  ft.dwLowDateTime = (DWORD)v2;
+  ft.dwHighDateTime = (DWORD)(v2 >> 32);
   return true;
 }
 
-
-bool UnixTime64_To_FileTime(Int64 unixTime, FILETIME &ft) throw()
-{
-  UInt64 v;
-  const bool res = UnixTime64_To_FileTime64(unixTime, v);
-  ft.dwLowDateTime = (DWORD)v;
-  ft.dwHighDateTime = (DWORD)(v >> 32);
-  return res;
-}
-
-
-Int64 FileTime_To_UnixTime64(const FILETIME &ft) throw()
+Int64 FileTimeToUnixTime64(const FILETIME &ft) throw()
 {
-  const UInt64 winTime = (((UInt64)ft.dwHighDateTime) << 32) + ft.dwLowDateTime;
-  return (Int64)(winTime / kNumTimeQuantumsInSecond) - (Int64)kUnixTimeOffset;
-}
-
-Int64 FileTime_To_UnixTime64_and_Quantums(const FILETIME &ft, UInt32 &quantums) throw()
-{
-  const UInt64 winTime = (((UInt64)ft.dwHighDateTime) << 32) + ft.dwLowDateTime;
-  quantums = (UInt32)(winTime % kNumTimeQuantumsInSecond);
+  UInt64 winTime = (((UInt64)ft.dwHighDateTime) << 32) + ft.dwLowDateTime;
   return (Int64)(winTime / kNumTimeQuantumsInSecond) - (Int64)kUnixTimeOffset;
 }
 
-bool FileTime_To_UnixTime(const FILETIME &ft, UInt32 &unixTime) throw()
+bool FileTimeToUnixTime(const FILETIME &ft, UInt32 &unixTime) throw()
 {
   UInt64 winTime = (((UInt64)ft.dwHighDateTime) << 32) + ft.dwLowDateTime;
   winTime /= kNumTimeQuantumsInSecond;
@@ -223,9 +167,9 @@ bool FileTime_To_UnixTime(const FILETIME &ft, UInt32 &unixTime) throw()
     return false;
   }
   winTime -= kUnixTimeOffset;
-  if (winTime > (UInt32)0xFFFFFFFF)
+  if (winTime > 0xFFFFFFFF)
   {
-    unixTime = (UInt32)0xFFFFFFFF;
+    unixTime = 0xFFFFFFFF;
     return false;
   }
   unixTime = (UInt32)winTime;
@@ -239,41 +183,24 @@ bool GetSecondsSince1601(unsigned year, unsigned month, unsigned day,
   if (year < kFileTimeStartYear || year >= 10000 || month < 1 || month > 12 ||
       day < 1 || day > 31 || hour > 23 || min > 59 || sec > 59)
     return false;
-  const unsigned numYears = year - kFileTimeStartYear;
-  UInt32 numDays = (UInt32)((UInt32)numYears * 365 + numYears / 4 - numYears / 100 + numYears / 400);
+  UInt32 numYears = year - kFileTimeStartYear;
+  UInt32 numDays = numYears * 365 + numYears / 4 - numYears / 100 + numYears / 400;
   Byte ms[] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
   if (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0))
     ms[1] = 29;
   month--;
   for (unsigned i = 0; i < month; i++)
     numDays += ms[i];
-  numDays += (UInt32)(day - 1);
+  numDays += day - 1;
   resSeconds = ((UInt64)(numDays * 24 + hour) * 60 + min) * 60 + sec;
   return true;
 }
 
-
-/* docs: TIME_UTC is not defined on many platforms:
-      glibc 2.15, macOS 10.13
-      FreeBSD 11.0, NetBSD 7.1, OpenBSD 6.0,
-      Minix 3.1.8, AIX 7.1, HP-UX 11.31, IRIX 6.5, Solaris 11.3,
-      Cygwin 2.9, mingw, MSVC 14, Android 9.0.
-  Android NDK defines TIME_UTC but doesn't have the timespec_get().
-*/
-#if defined(TIME_UTC) && !defined(__ANDROID__)
-#define ZIP7_USE_timespec_get
-// #pragma message("ZIP7_USE_timespec_get")
-#elif defined(CLOCK_REALTIME)
-#define ZIP7_USE_clock_gettime
-// #pragma message("ZIP7_USE_clock_gettime")
-#endif
-
-void GetCurUtc_FiTime(CFiTime &ft) throw()
+void GetCurUtcFileTime(FILETIME &ft) throw()
 {
- #ifdef _WIN32
-
   // Both variants provide same low resolution on WinXP: about 15 ms.
   // But GetSystemTimeAsFileTime is much faster.
+
   #ifdef UNDER_CE
   SYSTEMTIME st;
   GetSystemTime(&st);
@@ -281,187 +208,6 @@ void GetCurUtc_FiTime(CFiTime &ft) throw()
   #else
   GetSystemTimeAsFileTime(&ft);
   #endif
-
- #else
-  
-  FiTime_Clear(ft);
-#ifdef ZIP7_USE_timespec_get
-  timespec_get(&ft, TIME_UTC);
-#elif defined ZIP7_USE_clock_gettime
-
-#if defined(_AIX)
-  {
-    timespec ts;
-    clock_gettime(CLOCK_REALTIME, &ts);
-    ft.tv_sec = ts.tv_sec;
-    ft.tv_nsec = ts.tv_nsec;
-  }
-#else
-  clock_gettime(CLOCK_REALTIME, &ft);
-#endif
-
-#else
-  struct timeval now;
-  if (gettimeofday(&now, NULL) == 0)
-  {
-    ft.tv_sec = now.tv_sec;
-    // timeval::tv_usec   can be 64-bit signed in some cases
-    // timespec::tv_nsec  can be 32-bit signed in some cases
-    ft.tv_nsec =
-      (Int32) // to eliminate compiler conversion error
-      (now.tv_usec * 1000);
-  }
-#endif
-
- #endif
 }
 
-#ifndef _WIN32
-void GetCurUtcFileTime(FILETIME &ft) throw()
-{
-  UInt64 v = 0;
-#if defined(ZIP7_USE_timespec_get) || \
-    defined(ZIP7_USE_clock_gettime)
-  timespec ts;
-#if defined(ZIP7_USE_timespec_get)
-  if (timespec_get(&ts, TIME_UTC))
-#else
-  if (clock_gettime(CLOCK_REALTIME, &ts) == 0)
-#endif
-  {
-    v = ((UInt64)ts.tv_sec + kUnixTimeOffset) *
-      kNumTimeQuantumsInSecond + (UInt64)ts.tv_nsec / 100;
-  }
-#else
-  struct timeval now;
-  if (gettimeofday(&now, NULL) == 0)
-  {
-    v = ((UInt64)now.tv_sec + kUnixTimeOffset) *
-      kNumTimeQuantumsInSecond + (UInt64)now.tv_usec * 10;
-  }
-#endif
-  ft.dwLowDateTime  = (DWORD)v;
-  ft.dwHighDateTime = (DWORD)(v >> 32);
-}
-#endif
-
-
 }}
-
-
-#ifdef _WIN32
-
-/*
-void FiTime_Normalize_With_Prec(CFiTime &ft, unsigned prec)
-{
-  if (prec == k_PropVar_TimePrec_0
-      || prec == k_PropVar_TimePrec_HighPrec
-      || prec >= k_PropVar_TimePrec_100ns)
-    return;
-  UInt64 v = (((UInt64)ft.dwHighDateTime) << 32) + ft.dwLowDateTime;
-
-  int numDigits = (int)prec - (int)k_PropVar_TimePrec_Base;
-  UInt32 d;
-  if (prec == k_PropVar_TimePrec_DOS)
-  {
-    // we round up as windows DosDateTimeToFileTime()
-    v += NWindows::NTime::kNumTimeQuantumsInSecond * 2 - 1;
-    d = NWindows::NTime::kNumTimeQuantumsInSecond * 2;
-  }
-  else
-  {
-    if (prec == k_PropVar_TimePrec_Unix)
-      numDigits = 0;
-    else if (numDigits < 0)
-      return;
-    d = 1;
-    for (unsigned k = numDigits; k < 7; k++)
-      d *= 10;
-  }
-  v /= d;
-  v *= d;
-  ft.dwLowDateTime = (DWORD)v;
-  ft.dwHighDateTime = (DWORD)(v >> 32);
-}
-*/
-
-#else
-
-/*
-void FiTime_Normalize_With_Prec(CFiTime &ft, unsigned prec)
-{
-  if (prec >= k_PropVar_TimePrec_1ns
-      || prec == k_PropVar_TimePrec_HighPrec)
-    return;
-
-  int numDigits = (int)prec - (int)k_PropVar_TimePrec_Base;
-  UInt32 d;
-  if (prec == k_PropVar_TimePrec_Unix ||
-      prec == (int)k_PropVar_TimePrec_Base)
-  {
-    ft.tv_nsec = 0;
-    return;
-  }
-  if (prec == k_PropVar_TimePrec_DOS)
-  {
-    // we round up as windows DosDateTimeToFileTime()
-    const unsigned sec1 = (ft.tv_sec & 1);
-    if (ft.tv_nsec == 0 && sec1 == 0)
-      return;
-    ft.tv_nsec = 0;
-    ft.tv_sec += 2 - sec1;
-    return;
-  }
-  {
-    if (prec == k_PropVar_TimePrec_0
-        || numDigits < 0)
-      numDigits = 7;
-    d = 1;
-    for (unsigned k = numDigits; k < 9; k++)
-      d *= 10;
-    ft.tv_nsec /= d;
-    ft.tv_nsec *= d;
-  }
-}
-*/
-
-int Compare_FiTime(const CFiTime *a1, const CFiTime *a2)
-{
-  if (a1->tv_sec < a2->tv_sec) return -1;
-  if (a1->tv_sec > a2->tv_sec) return 1;
-  if (a1->tv_nsec < a2->tv_nsec) return -1;
-  if (a1->tv_nsec > a2->tv_nsec) return 1;
-  return 0;
-}
-
-bool FILETIME_To_timespec(const FILETIME &ft, CFiTime &ts)
-{
-  UInt32 quantums;
-  const Int64 sec = NWindows::NTime::FileTime_To_UnixTime64_and_Quantums(ft, quantums);
-  // time_t is long
-  const time_t sec2 = (time_t)sec;
-  if (sec2 == sec)
-  {
-    ts.tv_sec = sec2;
-    ts.tv_nsec = (Int32)(quantums * 100);
-    return true;
-  }
-  return false;
-}
-
-void FiTime_To_FILETIME_ns100(const CFiTime &ts, FILETIME &ft, unsigned &ns100)
-{
-  const UInt64 v = NWindows::NTime::UnixTime64_To_FileTime64(ts.tv_sec) + ((UInt64)ts.tv_nsec / 100);
-  ns100 = (unsigned)((UInt64)ts.tv_nsec % 100);
-  ft.dwLowDateTime = (DWORD)v;
-  ft.dwHighDateTime = (DWORD)(v >> 32);
-}
-
-void FiTime_To_FILETIME(const CFiTime &ts, FILETIME &ft)
-{
-  const UInt64 v = NWindows::NTime::UnixTime64_To_FileTime64(ts.tv_sec) + ((UInt64)ts.tv_nsec / 100);
-  ft.dwLowDateTime = (DWORD)v;
-  ft.dwHighDateTime = (DWORD)(v >> 32);
-}
-
-#endif

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

@@ -1,146 +1,32 @@
 // Windows/TimeUtils.h
 
-#ifndef ZIP7_INC_WINDOWS_TIME_UTILS_H
-#define ZIP7_INC_WINDOWS_TIME_UTILS_H
+#ifndef __WINDOWS_TIME_UTILS_H
+#define __WINDOWS_TIME_UTILS_H
 
 #include "../Common/MyTypes.h"
 #include "../Common/MyWindows.h"
-#include "PropVariant.h"
-
-inline UInt64 FILETIME_To_UInt64(const FILETIME &ft)
-{
-  return (((UInt64)ft.dwHighDateTime) << 32) + ft.dwLowDateTime;
-}
-
-inline void FILETIME_Clear(FILETIME &ft)
-{
-  ft.dwLowDateTime = 0;
-  ft.dwHighDateTime = 0;
-}
-
-inline bool FILETIME_IsZero(const FILETIME &ft)
-{
-  return (ft.dwHighDateTime == 0 && ft.dwLowDateTime == 0);
-}
-
-
-#ifdef _WIN32
-  #define CFiTime FILETIME
-  #define Compare_FiTime ::CompareFileTime
-  inline void FiTime_To_FILETIME(const CFiTime &ts, FILETIME &ft)
-  {
-    ft = ts;
-  }
-  /*
-  inline void FILETIME_To_FiTime(const FILETIME &ft, CFiTime &ts)
-  {
-    ts = ft;
-  }
-  */
-  inline void FiTime_Clear(CFiTime &ft)
-  {
-    ft.dwLowDateTime = 0;
-    ft.dwHighDateTime = 0;
-  }
-#else
-
-  #include <sys/stat.h>
-
- #if defined(_AIX)
-   #define CFiTime st_timespec
- #else
-   #define CFiTime timespec
- #endif
-  int Compare_FiTime(const CFiTime *a1, const CFiTime *a2);
-  bool FILETIME_To_timespec(const FILETIME &ft, CFiTime &ts);
-  void FiTime_To_FILETIME(const CFiTime &ts, FILETIME &ft);
-  void FiTime_To_FILETIME_ns100(const CFiTime &ts, FILETIME &ft, unsigned &ns100);
-  inline void FiTime_Clear(CFiTime &ft)
-  {
-    ft.tv_sec = 0;
-    ft.tv_nsec = 0;
-  }
-
- #ifdef __APPLE__
-  #define ST_MTIME(st) st.st_mtimespec
-  #define ST_ATIME(st) st.st_atimespec
-  #define ST_CTIME(st) st.st_ctimespec
- #else
-  #define ST_MTIME(st) st.st_mtim
-  #define ST_ATIME(st) st.st_atim
-  #define ST_CTIME(st) st.st_ctim
- #endif
-
-#endif
-
-// void FiTime_Normalize_With_Prec(CFiTime &ft, unsigned prec);
 
 namespace NWindows {
 namespace NTime {
 
-bool DosTime_To_FileTime(UInt32 dosTime, FILETIME &fileTime) throw();
-bool UtcFileTime_To_LocalDosTime(const FILETIME &utc, UInt32 &dosTime) throw();
-bool FileTime_To_DosTime(const FILETIME &fileTime, UInt32 &dosTime) throw();
+bool DosTimeToFileTime(UInt32 dosTime, FILETIME &fileTime) throw();
+bool FileTimeToDosTime(const FILETIME &fileTime, UInt32 &dosTime) throw();
 
 // UInt32 Unix Time : for dates 1970-2106
-UInt64 UnixTime_To_FileTime64(UInt32 unixTime) throw();
-void UnixTime_To_FileTime(UInt32 unixTime, FILETIME &fileTime) throw();
+UInt64 UnixTimeToFileTime64(UInt32 unixTime) throw();
+void UnixTimeToFileTime(UInt32 unixTime, FILETIME &fileTime) throw();
 
 // Int64 Unix Time : negative values for dates before 1970
-UInt64 UnixTime64_To_FileTime64(Int64 unixTime) throw(); // no check
-bool UnixTime64_To_FileTime64(Int64 unixTime, UInt64 &fileTime) throw();
-bool UnixTime64_To_FileTime(Int64 unixTime, FILETIME &fileTime) throw();
+UInt64 UnixTime64ToFileTime64(Int64 unixTime) throw();
+bool UnixTime64ToFileTime(Int64 unixTime, FILETIME &fileTime) throw();
 
-Int64 FileTime64_To_UnixTime64(UInt64 ft64) throw();
-bool FileTime_To_UnixTime(const FILETIME &fileTime, UInt32 &unixTime) throw();
-Int64 FileTime_To_UnixTime64(const FILETIME &ft) throw();
-Int64 FileTime_To_UnixTime64_and_Quantums(const FILETIME &ft, UInt32 &quantums) throw();
+bool FileTimeToUnixTime(const FILETIME &fileTime, UInt32 &unixTime) throw();
+Int64 FileTimeToUnixTime64(const FILETIME &ft) throw();
 
 bool GetSecondsSince1601(unsigned year, unsigned month, unsigned day,
   unsigned hour, unsigned min, unsigned sec, UInt64 &resSeconds) throw();
-
-void GetCurUtc_FiTime(CFiTime &ft) throw();
-#ifdef _WIN32
-#define GetCurUtcFileTime GetCurUtc_FiTime
-#else
 void GetCurUtcFileTime(FILETIME &ft) throw();
-#endif
 
 }}
 
-inline void PropVariant_SetFrom_UnixTime(NWindows::NCOM::CPropVariant &prop, UInt32 unixTime)
-{
-  FILETIME ft;
-  NWindows::NTime::UnixTime_To_FileTime(unixTime, ft);
-  prop.SetAsTimeFrom_FT_Prec(ft, k_PropVar_TimePrec_Unix);
-}
-
-inline void PropVariant_SetFrom_NtfsTime(NWindows::NCOM::CPropVariant &prop, const FILETIME &ft)
-{
-  prop.SetAsTimeFrom_FT_Prec(ft, k_PropVar_TimePrec_100ns);
-}
-
-inline void PropVariant_SetFrom_FiTime(NWindows::NCOM::CPropVariant &prop, const CFiTime &fts)
-{
- #ifdef _WIN32
-  PropVariant_SetFrom_NtfsTime(prop, fts);
- #else
-  unsigned ns100;
-  FILETIME ft;
-  FiTime_To_FILETIME_ns100(fts, ft, ns100);
-  prop.SetAsTimeFrom_FT_Prec_Ns100(ft, k_PropVar_TimePrec_1ns, ns100);
- #endif
-}
-
-inline bool PropVariant_SetFrom_DosTime(NWindows::NCOM::CPropVariant &prop, UInt32 dosTime)
-{
-  FILETIME localFileTime, utc;
-  if (!NWindows::NTime::DosTime_To_FileTime(dosTime, localFileTime))
-    return false;
-  if (!LocalFileTimeToFileTime(&localFileTime, &utc))
-    return false;
-  prop.SetAsTimeFrom_FT_Prec(utc, k_PropVar_TimePrec_DOS);
-  return true;
-}
-
 #endif

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

@@ -111,15 +111,15 @@ bool MySetWindowText(HWND wnd, LPCWSTR s)
 }
 #endif
 
-bool CWindow::GetText(CSysString &s) const
+bool CWindow::GetText(CSysString &s)
 {
   s.Empty();
-  unsigned len = (unsigned)GetTextLength();
+  int len = GetTextLength();
   if (len == 0)
     return (::GetLastError() == ERROR_SUCCESS);
   TCHAR *p = s.GetBuf(len);
   {
-    const unsigned len2 = (unsigned)GetText(p, (int)(len + 1));
+    int len2 = GetText(p, len + 1);
     if (len > len2)
       len = len2;
   }
@@ -130,17 +130,17 @@ bool CWindow::GetText(CSysString &s) const
 }
 
 #ifndef _UNICODE
-bool CWindow::GetText(UString &s) const
+bool CWindow::GetText(UString &s)
 {
   if (g_IsNT)
   {
     s.Empty();
-    unsigned len = (unsigned)GetWindowTextLengthW(_window);
+    int len = GetWindowTextLengthW(_window);
     if (len == 0)
       return (::GetLastError() == ERROR_SUCCESS);
     wchar_t *p = s.GetBuf(len);
     {
-      const unsigned len2 = (unsigned)GetWindowTextW(_window, p, (int)(len + 1));
+      int len2 = GetWindowTextW(_window, p, len + 1);
       if (len > len2)
         len = len2;
     }
@@ -150,7 +150,7 @@ bool CWindow::GetText(UString &s) const
     return true;
   }
   CSysString sysString;
-  const bool result = GetText(sysString);
+  bool result = GetText(sysString);
   MultiByteToUnicodeString2(s, sysString);
   return result;
 }