react-native-update 10.34.3 → 10.34.5

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

@@ -1,7 +1,7 @@
 // Windows/FileName.h
 
-#ifndef ZIP7_INC_WINDOWS_FILE_NAME_H
-#define ZIP7_INC_WINDOWS_FILE_NAME_H
+#ifndef __WINDOWS_FILE_NAME_H
+#define __WINDOWS_FILE_NAME_H
 
 #include "../Common/MyString.h"
 
@@ -17,21 +17,17 @@ int FindSepar(const FChar *s) throw();
 void NormalizeDirPathPrefix(FString &dirPath); // ensures that it ended with '\\', if dirPath is not epmty
 void NormalizeDirPathPrefix(UString &dirPath);
 
-#ifdef _WIN32
-void NormalizeDirSeparators(FString &s);
-#endif
-
 bool IsDrivePath(const wchar_t *s) throw();  // first 3 chars are drive chars like "a:\\"
 
 bool IsAltPathPrefix(CFSTR s) throw(); /* name: */
 
+#if defined(_WIN32) && !defined(UNDER_CE)
+
 extern const char * const kSuperPathPrefix; /* \\?\ */
 const unsigned kDevicePathPrefixSize = 4;
 const unsigned kSuperPathPrefixSize = 4;
 const unsigned kSuperUncPathPrefixSize = kSuperPathPrefixSize + 4;
 
-#if defined(_WIN32) && !defined(UNDER_CE)
-
 bool IsDevicePath(CFSTR s) throw();   /* \\.\ */
 bool IsSuperUncPath(CFSTR s) throw(); /* \\?\UNC\ */
 bool IsNetworkPath(CFSTR s) throw();  /* \\?\UNC\ or \\SERVER */
@@ -54,10 +50,6 @@ bool IsDrivePath2(const wchar_t *s) throw(); // first 2 chars are drive chars li
 bool IsSuperPath(const wchar_t *s) throw();
 bool IsSuperOrDevicePath(const wchar_t *s) throw();
 
-bool IsAltStreamPrefixWithColon(const UString &s) throw();
-// returns true, if super prefix was removed
-bool If_IsSuperPath_RemoveSuperPrefix(UString &s);
-
 #ifndef USE_UNICODE_FSTRING
 bool IsDrivePath2(CFSTR s) throw(); // first 2 chars are drive chars like "a:"
 // bool IsDriveName2(CFSTR s) throw(); // is drive name like "a:"
@@ -86,16 +78,7 @@ int FindAltStreamColon(CFSTR path) throw();
 bool IsAbsolutePath(const wchar_t *s) throw();
 unsigned GetRootPrefixSize(const wchar_t *s) throw();
 
-#ifndef _WIN32
-/* GetRootPrefixSize_WINDOWS() is called in linux, but it parses path by windows rules.
-   It supports only paths system (linux) slash separators (STRING_PATH_SEPARATOR),
-   It doesn't parses paths with backslash (windows) separators.
-   "c:/dir/file" is supported.
-*/
-unsigned GetRootPrefixSize_WINDOWS(const wchar_t *s) throw();
-#endif
-
-#ifdef Z7_LONG_PATH
+#ifdef WIN_LONG_PATH
 
 const int kSuperPathType_UseOnlyMain = 0;
 const int kSuperPathType_UseOnlySuper = 1;
@@ -105,16 +88,16 @@ int GetUseSuperPathType(CFSTR s) throw();
 bool GetSuperPath(CFSTR path, UString &superPath, bool onlyIfNew);
 bool GetSuperPaths(CFSTR s1, CFSTR s2, UString &d1, UString &d2, bool onlyIfNew);
 
-#define USE_MAIN_PATH (_useSuperPathType != kSuperPathType_UseOnlySuper)
-#define USE_MAIN_PATH_2 (_useSuperPathType1 != kSuperPathType_UseOnlySuper && _useSuperPathType2 != kSuperPathType_UseOnlySuper)
+#define USE_MAIN_PATH (__useSuperPathType != kSuperPathType_UseOnlySuper)
+#define USE_MAIN_PATH_2 (__useSuperPathType1 != kSuperPathType_UseOnlySuper && __useSuperPathType2 != kSuperPathType_UseOnlySuper)
 
-#define USE_SUPER_PATH (_useSuperPathType != kSuperPathType_UseOnlyMain)
-#define USE_SUPER_PATH_2 (_useSuperPathType1 != kSuperPathType_UseOnlyMain || _useSuperPathType2 != kSuperPathType_UseOnlyMain)
+#define USE_SUPER_PATH (__useSuperPathType != kSuperPathType_UseOnlyMain)
+#define USE_SUPER_PATH_2 (__useSuperPathType1 != kSuperPathType_UseOnlyMain || __useSuperPathType2 != kSuperPathType_UseOnlyMain)
 
-#define IF_USE_MAIN_PATH int _useSuperPathType = GetUseSuperPathType(path); if (USE_MAIN_PATH)
+#define IF_USE_MAIN_PATH int __useSuperPathType = GetUseSuperPathType(path); if (USE_MAIN_PATH)
 #define IF_USE_MAIN_PATH_2(x1, x2) \
-    int _useSuperPathType1 = GetUseSuperPathType(x1); \
-    int _useSuperPathType2 = GetUseSuperPathType(x2); \
+    int __useSuperPathType1 = GetUseSuperPathType(x1); \
+    int __useSuperPathType2 = GetUseSuperPathType(x2); \
     if (USE_MAIN_PATH_2)
 
 #else
@@ -122,18 +105,8 @@ bool GetSuperPaths(CFSTR s1, CFSTR s2, UString &d1, UString &d2, bool onlyIfNew)
 #define IF_USE_MAIN_PATH
 #define IF_USE_MAIN_PATH_2(x1, x2)
 
-#endif // Z7_LONG_PATH
-
-/*
-  if (dirPrefix != NULL && (path) is relative)
-  {
-    (dirPrefix) will be used
-    result (fullPath) will contain prefix part of (dirPrefix).
-  }
-  Current_Dir path can be used in 2 cases:
-    1) if (path) is relative && dirPrefix == NULL
-    2) for _WIN32: if (path) is absolute starting wuth "\"
-*/
+#endif // WIN_LONG_PATH
+
 bool GetFullPath(CFSTR dirPrefix, CFSTR path, FString &fullPath);
 bool GetFullPath(CFSTR path, FString &fullPath);
 

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

@@ -19,8 +19,6 @@ namespace NWindows {
 namespace NFile {
 namespace NSystem {
 
-#ifdef _WIN32
-
 bool MyGetVolumeInformation(
     CFSTR rootPath,
     UString &volumeName,
@@ -71,26 +69,19 @@ UINT MyGetDriveType(CFSTR pathName)
   }
 }
 
-#if !defined(Z7_WIN32_WINNT_MIN) || Z7_WIN32_WINNT_MIN < 0x0400
-// GetDiskFreeSpaceEx requires Windows95-OSR2, NT4
-#define Z7_USE_DYN_GetDiskFreeSpaceEx
-#endif
-
-#ifdef Z7_USE_DYN_GetDiskFreeSpaceEx
-typedef BOOL (WINAPI * Func_GetDiskFreeSpaceExA)(
+typedef BOOL (WINAPI * GetDiskFreeSpaceExA_Pointer)(
   LPCSTR lpDirectoryName,                  // directory name
   PULARGE_INTEGER lpFreeBytesAvailable,    // bytes available to caller
   PULARGE_INTEGER lpTotalNumberOfBytes,    // bytes on disk
   PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk
 );
 
-typedef BOOL (WINAPI * Func_GetDiskFreeSpaceExW)(
+typedef BOOL (WINAPI * GetDiskFreeSpaceExW_Pointer)(
   LPCWSTR lpDirectoryName,                 // directory name
   PULARGE_INTEGER lpFreeBytesAvailable,    // bytes available to caller
   PULARGE_INTEGER lpTotalNumberOfBytes,    // bytes on disk
   PULARGE_INTEGER lpTotalNumberOfFreeBytes // free bytes on disk
 );
-#endif
 
 bool MyGetDiskFreeSpace(CFSTR rootPath, UInt64 &clusterSize, UInt64 &totalSize, UInt64 &freeSize)
 {
@@ -99,22 +90,12 @@ bool MyGetDiskFreeSpace(CFSTR rootPath, UInt64 &clusterSize, UInt64 &totalSize,
   #ifndef _UNICODE
   if (!g_IsNT)
   {
-#ifdef Z7_USE_DYN_GetDiskFreeSpaceEx
-    const
-    Func_GetDiskFreeSpaceExA f = Z7_GET_PROC_ADDRESS(
-    Func_GetDiskFreeSpaceExA, GetModuleHandle(TEXT("kernel32.dll")),
-        "GetDiskFreeSpaceExA");
-    if (f)
-#endif
+    GetDiskFreeSpaceExA_Pointer pGetDiskFreeSpaceEx = (GetDiskFreeSpaceExA_Pointer)GetProcAddress(
+        GetModuleHandle(TEXT("kernel32.dll")), "GetDiskFreeSpaceExA");
+    if (pGetDiskFreeSpaceEx)
     {
       ULARGE_INTEGER freeBytesToCaller2, totalSize2, freeSize2;
-      sizeIsDetected = BOOLToBool(
-#ifdef Z7_USE_DYN_GetDiskFreeSpaceEx
-        f
-#else
-        GetDiskFreeSpaceExA
-#endif
-          (fs2fas(rootPath), &freeBytesToCaller2, &totalSize2, &freeSize2));
+      sizeIsDetected = BOOLToBool(pGetDiskFreeSpaceEx(fs2fas(rootPath), &freeBytesToCaller2, &totalSize2, &freeSize2));
       totalSize = totalSize2.QuadPart;
       freeSize = freeSize2.QuadPart;
     }
@@ -124,22 +105,12 @@ bool MyGetDiskFreeSpace(CFSTR rootPath, UInt64 &clusterSize, UInt64 &totalSize,
   else
   #endif
   {
-#ifdef Z7_USE_DYN_GetDiskFreeSpaceEx
-    const
-    Func_GetDiskFreeSpaceExW f = Z7_GET_PROC_ADDRESS(
-    Func_GetDiskFreeSpaceExW, GetModuleHandle(TEXT("kernel32.dll")),
-        "GetDiskFreeSpaceExW");
-    if (f)
-#endif
+    GetDiskFreeSpaceExW_Pointer pGetDiskFreeSpaceEx = (GetDiskFreeSpaceExW_Pointer)GetProcAddress(
+        GetModuleHandle(TEXT("kernel32.dll")), "GetDiskFreeSpaceExW");
+    if (pGetDiskFreeSpaceEx)
     {
       ULARGE_INTEGER freeBytesToCaller2, totalSize2, freeSize2;
-      sizeIsDetected = BOOLToBool(
-#ifdef Z7_USE_DYN_GetDiskFreeSpaceEx
-        f
-#else
-        GetDiskFreeSpaceExW
-#endif
-          (fs2us(rootPath), &freeBytesToCaller2, &totalSize2, &freeSize2));
+      sizeIsDetected = BOOLToBool(pGetDiskFreeSpaceEx(fs2us(rootPath), &freeBytesToCaller2, &totalSize2, &freeSize2));
       totalSize = totalSize2.QuadPart;
       freeSize = freeSize2.QuadPart;
     }
@@ -155,33 +126,6 @@ bool MyGetDiskFreeSpace(CFSTR rootPath, UInt64 &clusterSize, UInt64 &totalSize,
   return true;
 }
 
-#endif
-
-/*
-bool Is_File_LimitedBy_4GB(CFSTR _path, bool &isFsDetected)
-{
-  isFsDetected = false;
-  FString path (_path);
-  path.DeleteFrom(NName::GetRootPrefixSize(path));
-  // GetVolumeInformation supports super paths.
-  // NName::If_IsSuperPath_RemoveSuperPrefix(path);
-  if (!path.IsEmpty())
-  {
-    DWORD volumeSerialNumber, maximumComponentLength, fileSystemFlags;
-    UString volName, fileSystemName;
-    if (MyGetVolumeInformation(path, volName,
-        &volumeSerialNumber, &maximumComponentLength, &fileSystemFlags,
-        fileSystemName))
-    {
-      isFsDetected = true;
-      if (fileSystemName.IsPrefixedBy_Ascii_NoCase("fat"))
-        return true;
-    }
-  }
-  return false;
-}
-*/
-
 }}}
 
 #endif

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

@@ -1,7 +1,7 @@
 // Windows/FileSystem.h
 
-#ifndef ZIP7_INC_WINDOWS_FILE_SYSTEM_H
-#define ZIP7_INC_WINDOWS_FILE_SYSTEM_H
+#ifndef __WINDOWS_FILE_SYSTEM_H
+#define __WINDOWS_FILE_SYSTEM_H
 
 #include "../Common/MyString.h"
 #include "../Common/MyTypes.h"
@@ -10,8 +10,6 @@ namespace NWindows {
 namespace NFile {
 namespace NSystem {
 
-#ifdef _WIN32
-
 bool MyGetVolumeInformation(
     CFSTR rootPath  ,
     UString &volumeName,
@@ -24,8 +22,6 @@ UINT MyGetDriveType(CFSTR pathName);
 
 bool MyGetDiskFreeSpace(CFSTR rootPath, UInt64 &clusterSize, UInt64 &totalSize, UInt64 &freeSize);
 
-#endif
-
 }}}
 
 #endif

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

@@ -1,13 +1,11 @@
 // Windows/Handle.h
 
-#ifndef ZIP7_INC_WINDOWS_HANDLE_H
-#define ZIP7_INC_WINDOWS_HANDLE_H
-
-#include "../Common/MyWindows.h"
+#ifndef __WINDOWS_HANDLE_H
+#define __WINDOWS_HANDLE_H
 
 namespace NWindows {
 
-class CHandle  MY_UNCOPYABLE
+class CHandle
 {
 protected:
   HANDLE _handle;
@@ -28,7 +26,7 @@ public:
   void Attach(HANDLE handle) { _handle = handle; }
   HANDLE Detach()
   {
-    const HANDLE handle = _handle;
+    HANDLE handle = _handle;
     _handle = NULL;
     return handle;
   }

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

@@ -21,10 +21,7 @@ typedef BOOL (WINAPI * Func_LookupPrivilegeValue)(LPCTSTR lpSystemName, LPCTSTR
 typedef BOOL (WINAPI * Func_AdjustTokenPrivileges)(HANDLE TokenHandle, BOOL DisableAllPrivileges,
     PTOKEN_PRIVILEGES NewState, DWORD BufferLength, PTOKEN_PRIVILEGES PreviousState, PDWORD ReturnLength);
 }
-
-#define GET_PROC_ADDR(fff, name)  \
-  const Func_ ## fff  my_ ## fff = Z7_GET_PROC_ADDRESS( \
-        Func_ ## fff, hModule, name);
+#define GET_PROC_ADDR(fff, name) Func_ ## fff  my_ ## fff  = (Func_ ## fff)GetProcAddress(hModule, name)
 #endif
 
 bool EnablePrivilege(LPCTSTR privilegeName, bool enable)
@@ -33,21 +30,13 @@ bool EnablePrivilege(LPCTSTR privilegeName, bool enable)
 
   #ifndef _UNICODE
 
-  const HMODULE hModule = ::LoadLibrary(TEXT("advapi32.dll"));
-  if (!hModule)
+  HMODULE hModule = ::LoadLibrary(TEXT("Advapi32.dll"));
+  if (hModule == NULL)
     return false;
   
-Z7_DIAGNOSTIC_IGNORE_CAST_FUNCTION
-
-  GET_PROC_ADDR(
-     OpenProcessToken,
-    "OpenProcessToken")
-  GET_PROC_ADDR(
-     LookupPrivilegeValue,
-    "LookupPrivilegeValueA")
-  GET_PROC_ADDR(
-     AdjustTokenPrivileges,
-    "AdjustTokenPrivileges")
+  GET_PROC_ADDR(OpenProcessToken, "OpenProcessToken");
+  GET_PROC_ADDR(LookupPrivilegeValue, "LookupPrivilegeValueA");
+  GET_PROC_ADDR(AdjustTokenPrivileges, "AdjustTokenPrivileges");
   
   if (my_OpenProcessToken &&
       my_AdjustTokenPrivileges &&
@@ -81,29 +70,25 @@ Z7_DIAGNOSTIC_IGNORE_CAST_FUNCTION
 }
 
 
-Z7_DIAGNOSTIC_IGNORE_CAST_FUNCTION
 
 typedef void (WINAPI * Func_RtlGetVersion) (OSVERSIONINFOEXW *);
 
 /*
   We suppose that Window 10 works incorrectly with "Large Pages" at:
-    - Windows 10 1703 (15063) : incorrect allocating after VirtualFree()
-    - Windows 10 1709 (16299) : incorrect allocating after VirtualFree()
-    - Windows 10 1809 (17763) : the failures for blocks of 1 GiB and larger,
-                                if CPU doesn't support 1 GB pages.
-  Windows 10 1903 (18362) probably works correctly.
+    - Windows 10 1703 (15063)
+    - Windows 10 1709 (16299)
+
+    - Windows 10 1809 (17763) on some CPUs that have no 1 GB page support.
+         We need more information about that new BUG in Windows.
 */
 
 unsigned Get_LargePages_RiskLevel()
 {
   OSVERSIONINFOEXW vi;
-  const HMODULE ntdll = ::GetModuleHandleW(L"ntdll.dll");
+  HMODULE ntdll = ::GetModuleHandleW(L"ntdll.dll");
   if (!ntdll)
     return 0;
-  const
-  Func_RtlGetVersion func = Z7_GET_PROC_ADDRESS(
-  Func_RtlGetVersion, ntdll,
-      "RtlGetVersion");
+  Func_RtlGetVersion func = (Func_RtlGetVersion)GetProcAddress(ntdll, "RtlGetVersion");
   if (!func)
     return 0;
   func(&vi);
@@ -115,7 +100,7 @@ unsigned Get_LargePages_RiskLevel()
     return 1;
 
   #ifdef MY_CPU_X86_OR_AMD64
-  if (vi.dwBuildNumber < 18362 && !CPU_IsSupported_PageGB())
+  if (!CPU_IsSupported_PageGB())
     return 1;
   #endif
 

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

@@ -1,7 +1,7 @@
 // Windows/MemoryLock.h
 
-#ifndef ZIP7_INC_WINDOWS_MEMORY_LOCK_H
-#define ZIP7_INC_WINDOWS_MEMORY_LOCK_H
+#ifndef __WINDOWS_MEMORY_LOCK_H
+#define __WINDOWS_MEMORY_LOCK_H
 
 #include "../Common/MyWindows.h"
 

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

@@ -1,34 +1,22 @@
 // Windows/NtCheck.h
 
-#ifndef ZIP7_INC_WINDOWS_NT_CHECK_H
-#define ZIP7_INC_WINDOWS_NT_CHECK_H
+#ifndef __WINDOWS_NT_CHECK_H
+#define __WINDOWS_NT_CHECK_H
 
 #ifdef _WIN32
 
 #include "../Common/MyWindows.h"
 
 #if !defined(_WIN64) && !defined(UNDER_CE)
-
-#if defined(_MSC_VER) && _MSC_VER >= 1900
-#pragma warning(push)
-// GetVersionExW was declared deprecated
-#pragma warning(disable : 4996)
-#endif
 static inline bool IsItWindowsNT()
 {
   OSVERSIONINFO vi;
   vi.dwOSVersionInfoSize = sizeof(vi);
   return (::GetVersionEx(&vi) && vi.dwPlatformId == VER_PLATFORM_WIN32_NT);
 }
-#if defined(_MSC_VER) && _MSC_VER >= 1900
-#pragma warning(pop)
-#endif
-
 #endif
 
 #ifndef _UNICODE
-    extern
-    bool g_IsNT;
   #if defined(_WIN64) || defined(UNDER_CE)
     bool g_IsNT = true;
     #define SET_IS_NT

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

@@ -192,112 +192,82 @@ BSTR CPropVariant::AllocBstr(unsigned numChars)
   return bstrVal;
 }
 
-#define SET_PROP_id_dest(id, dest) \
-  if (vt != id) { InternalClear(); vt = id; } dest = value; wReserved1 = 0;
-
-void CPropVariant::Set_Int32(Int32 value) throw()
-{
-  SET_PROP_id_dest(VT_I4, lVal)
-}
-
-void CPropVariant::Set_Int64(Int64 value) throw()
-{
-  SET_PROP_id_dest(VT_I8, hVal.QuadPart)
-}
-
 #define SET_PROP_FUNC(type, id, dest) \
   CPropVariant& CPropVariant::operator=(type value) throw() \
-  { SET_PROP_id_dest(id, dest)  return *this; }
+  { if (vt != id) { InternalClear(); vt = id; } \
+    dest = value; return *this; }
 
 SET_PROP_FUNC(Byte, VT_UI1, bVal)
 // SET_PROP_FUNC(Int16, VT_I2, iVal)
-// SET_PROP_FUNC(Int32, VT_I4, lVal)
+SET_PROP_FUNC(Int32, VT_I4, lVal)
 SET_PROP_FUNC(UInt32, VT_UI4, ulVal)
 SET_PROP_FUNC(UInt64, VT_UI8, uhVal.QuadPart)
-// SET_PROP_FUNC(Int64, VT_I8, hVal.QuadPart)
+SET_PROP_FUNC(Int64, VT_I8, hVal.QuadPart)
 SET_PROP_FUNC(const FILETIME &, VT_FILETIME, filetime)
 
-#define CASE_SIMPLE_VT_VALUES \
-    case VT_EMPTY:    \
-    case VT_BOOL:     \
-    case VT_FILETIME: \
-    case VT_UI8:      \
-    case VT_UI4:      \
-    case VT_UI2:      \
-    case VT_UI1:      \
-    case VT_I8:       \
-    case VT_I4:       \
-    case VT_I2:       \
-    case VT_I1:       \
-    case VT_UINT:     \
-    case VT_INT:      \
-    case VT_NULL:     \
-    case VT_ERROR:    \
-    case VT_R4:       \
-    case VT_R8:       \
-    case VT_CY:       \
-    case VT_DATE:     \
-
-
-/*
-  ::VariantClear() and ::VariantCopy() don't work, if (vt == VT_FILETIME)
-  So we handle VT_FILETIME and another simple types directly
-  we call system functions for VT_BSTR and for unknown typed
-*/
- 
-CPropVariant::~CPropVariant() throw()
-{
-  switch ((unsigned)vt)
-  {
-    CASE_SIMPLE_VT_VALUES
-      // vt = VT_EMPTY; // it's optional
-      return;
-    default: break;
-  }
-  ::VariantClear((tagVARIANT *)this);
-}
-
 HRESULT PropVariant_Clear(PROPVARIANT *prop) throw()
 {
-  switch ((unsigned)prop->vt)
+  switch (prop->vt)
   {
-    CASE_SIMPLE_VT_VALUES
+    case VT_EMPTY:
+    case VT_UI1:
+    case VT_I1:
+    case VT_I2:
+    case VT_UI2:
+    case VT_BOOL:
+    case VT_I4:
+    case VT_UI4:
+    case VT_R4:
+    case VT_INT:
+    case VT_UINT:
+    case VT_ERROR:
+    case VT_FILETIME:
+    case VT_UI8:
+    case VT_R8:
+    case VT_CY:
+    case VT_DATE:
       prop->vt = VT_EMPTY;
-      break;
-    default:
-    {
-      const HRESULT res = ::VariantClear((VARIANTARG *)prop);
-      if (res != S_OK || prop->vt != VT_EMPTY)
-        return res;
-      break;
-    }
+      prop->wReserved1 = 0;
+      prop->wReserved2 = 0;
+      prop->wReserved3 = 0;
+      prop->uhVal.QuadPart = 0;
+      return S_OK;
   }
-  prop->wReserved1 = 0;
-  prop->wReserved2 = 0;
-  prop->wReserved3 = 0;
-  prop->uhVal.QuadPart = 0;
-  return S_OK;
+  return ::VariantClear((VARIANTARG *)prop);
+  // return ::PropVariantClear(prop);
+  // PropVariantClear can clear VT_BLOB.
 }
 
 HRESULT CPropVariant::Clear() throw()
 {
   if (vt == VT_EMPTY)
-  {
-    wReserved1 = 0;
     return S_OK;
-  }
   return PropVariant_Clear(this);
 }
 
 HRESULT CPropVariant::Copy(const PROPVARIANT* pSrc) throw()
 {
-  Clear();
-  switch ((unsigned)pSrc->vt)
+  ::VariantClear((tagVARIANT *)this);
+  switch (pSrc->vt)
   {
-    CASE_SIMPLE_VT_VALUES
+    case VT_UI1:
+    case VT_I1:
+    case VT_I2:
+    case VT_UI2:
+    case VT_BOOL:
+    case VT_I4:
+    case VT_UI4:
+    case VT_R4:
+    case VT_INT:
+    case VT_UINT:
+    case VT_ERROR:
+    case VT_FILETIME:
+    case VT_UI8:
+    case VT_R8:
+    case VT_CY:
+    case VT_DATE:
       memmove((PROPVARIANT*)this, pSrc, sizeof(PROPVARIANT));
       return S_OK;
-    default: break;
   }
   return ::VariantCopy((tagVARIANT *)this, (tagVARIANT *)const_cast<PROPVARIANT *>(pSrc));
 }
@@ -305,13 +275,11 @@ HRESULT CPropVariant::Copy(const PROPVARIANT* pSrc) throw()
 
 HRESULT CPropVariant::Attach(PROPVARIANT *pSrc) throw()
 {
-  const HRESULT hr = Clear();
+  HRESULT hr = Clear();
   if (FAILED(hr))
     return hr;
-  // memcpy((PROPVARIANT *)this, pSrc, sizeof(PROPVARIANT));
-  *(PROPVARIANT *)this = *pSrc;
+  memcpy(this, pSrc, sizeof(PROPVARIANT));
   pSrc->vt = VT_EMPTY;
-  pSrc->wReserved1 = 0;
   return S_OK;
 }
 
@@ -319,25 +287,20 @@ HRESULT CPropVariant::Detach(PROPVARIANT *pDest) throw()
 {
   if (pDest->vt != VT_EMPTY)
   {
-    const HRESULT hr = PropVariant_Clear(pDest);
+    HRESULT hr = PropVariant_Clear(pDest);
     if (FAILED(hr))
       return hr;
   }
-  // memcpy(pDest, this, sizeof(PROPVARIANT));
-  *pDest = *(PROPVARIANT *)this;
+  memcpy(pDest, this, sizeof(PROPVARIANT));
   vt = VT_EMPTY;
-  wReserved1 = 0;
   return S_OK;
 }
 
 HRESULT CPropVariant::InternalClear() throw()
 {
   if (vt == VT_EMPTY)
-  {
-    wReserved1 = 0;
     return S_OK;
-  }
-  const HRESULT hr = Clear();
+  HRESULT hr = Clear();
   if (FAILED(hr))
   {
     vt = VT_ERROR;
@@ -348,7 +311,7 @@ HRESULT CPropVariant::InternalClear() throw()
 
 void CPropVariant::InternalCopy(const PROPVARIANT *pSrc)
 {
-  const HRESULT hr = Copy(pSrc);
+  HRESULT hr = Copy(pSrc);
   if (FAILED(hr))
   {
     if (hr == E_OUTOFMEMORY)
@@ -358,12 +321,11 @@ void CPropVariant::InternalCopy(const PROPVARIANT *pSrc)
   }
 }
 
-
 int CPropVariant::Compare(const CPropVariant &a) throw()
 {
   if (vt != a.vt)
     return MyCompare(vt, a.vt);
-  switch ((unsigned)vt)
+  switch (vt)
   {
     case VT_EMPTY: return 0;
     // case VT_I1: return MyCompare(cVal, a.cVal);
@@ -376,15 +338,7 @@ int CPropVariant::Compare(const CPropVariant &a) throw()
     case VT_I8: return MyCompare(hVal.QuadPart, a.hVal.QuadPart);
     case VT_UI8: return MyCompare(uhVal.QuadPart, a.uhVal.QuadPart);
     case VT_BOOL: return -MyCompare(boolVal, a.boolVal);
-    case VT_FILETIME:
-    {
-      const int res = CompareFileTime(&filetime, &a.filetime);
-      if (res != 0)
-        return res;
-      const unsigned v1 = Get_Ns100();
-      const unsigned v2 = a.Get_Ns100();
-      return MyCompare(v1, v2);
-    }
+    case VT_FILETIME: return ::CompareFileTime(&filetime, &a.filetime);
     case VT_BSTR: return 0; // Not implemented
     default: return 0;
   }