react-native-update 10.34.3 → 10.34.5

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

@@ -14,15 +14,13 @@
 
 #include "PropIDUtils.h"
 
-#ifndef Z7_SFX
 #define Get16(x) GetUi16(x)
 #define Get32(x) GetUi32(x)
-#endif
 
 using namespace NWindows;
 
-static const unsigned kNumWinAtrribFlags = 30;
-static const char g_WinAttribChars[kNumWinAtrribFlags + 1] = "RHS8DAdNTsLCOIEVvX.PU.M......B";
+static const unsigned kNumWinAtrribFlags = 21;
+static const char g_WinAttribChars[kNumWinAtrribFlags + 1] = "RHS8DAdNTsLCOIEV.X.PU";
 
 /*
 FILE_ATTRIBUTE_
@@ -48,14 +46,13 @@ FILE_ATTRIBUTE_
 18 RECALL_ON_OPEN or EA
 19 PINNED
 20 UNPINNED
-21 STRICTLY_SEQUENTIAL  (10.0.16267)
+21 STRICTLY_SEQUENTIAL
 22 RECALL_ON_DATA_ACCESS
-29 STRICTLY_SEQUENTIAL  (10.0.17134+) (SMR Blob)
 */
 
 
 static const char kPosixTypes[16] = { '0', 'p', 'c', '3', 'd', '5', 'b', '7', '-', '9', 'l', 'B', 's', 'D', 'E', 'F' };
-#define MY_ATTR_CHAR(a, n, c) (((a) & (1 << (n))) ? c : '-')
+#define MY_ATTR_CHAR(a, n, c) ((a) & (1 << (n))) ? c : '-';
 
 static void ConvertPosixAttribToString(char *s, UInt32 a) throw()
 {
@@ -66,9 +63,9 @@ static void ConvertPosixAttribToString(char *s, UInt32 a) throw()
     s[8 - i] = MY_ATTR_CHAR(a, i + 1, 'w');
     s[9 - i] = MY_ATTR_CHAR(a, i + 0, 'x');
   }
-  if ((a & 0x800) != 0) s[3] = ((a & (1 << 6)) ? 's' : 'S'); // S_ISUID
-  if ((a & 0x400) != 0) s[6] = ((a & (1 << 3)) ? 's' : 'S'); // S_ISGID
-  if ((a & 0x200) != 0) s[9] = ((a & (1 << 0)) ? 't' : 'T'); // S_ISVTX
+  if ((a & 0x800) != 0) s[3] = ((a & (1 << 6)) ? 's' : 'S');
+  if ((a & 0x400) != 0) s[6] = ((a & (1 << 3)) ? 's' : 'S');
+  if ((a & 0x200) != 0) s[9] = ((a & (1 << 0)) ? 't' : 'T');
   s[10] = 0;
   
   a &= ~(UInt32)0xFFFF;
@@ -84,34 +81,26 @@ void ConvertWinAttribToString(char *s, UInt32 wa) throw()
 {
   /*
   some programs store posix attributes in high 16 bits.
-    p7zip - stores additional 0x8000 flag marker.
-    macos - stores additional 0x4000 flag marker.
-    info-zip - no additional marker.
-  But this code works with Attrib from internal 7zip code.
-  So we expect that 0x8000 marker is set, if there are posix attributes.
-  (DT_UNKNOWN == 0) type in high bits is possible in some case for linux files.
-  0x8000 flag is possible also in ReFS (Windows)?
+  p7zip - stores additional 0x8000 flag marker.
+  macos - stores additional 0x4000 flag marker.
+  info-zip - no additional marker.
   */
-
-  const bool isPosix = (
-      (wa & 0x8000) != 0 // FILE_ATTRIBUTE_UNIX_EXTENSION;
-      // && (wa & 0xFFFF0000u) != 0
-      );
- 
+  
+  bool isPosix = ((wa & 0xF0000000) != 0);
+  
   UInt32 posix = 0;
   if (isPosix)
   {
     posix = wa >> 16;
-    if ((wa & 0xF0000000u) != 0)
-      wa &= (UInt32)0x3FFF;
+    wa &= (UInt32)0x3FFF;
   }
 
   for (unsigned i = 0; i < kNumWinAtrribFlags; i++)
   {
-    const UInt32 flag = (UInt32)1 << i;
-    if (wa & flag)
+    UInt32 flag = (1 << i);
+    if ((wa & flag) != 0)
     {
-      const char c = g_WinAttribChars[i];
+      char c = g_WinAttribChars[i];
       if (c != '.')
       {
         wa &= ~flag;
@@ -145,37 +134,10 @@ void ConvertPropertyToShortString2(char *dest, const PROPVARIANT &prop, PROPID p
   if (prop.vt == VT_FILETIME)
   {
     const FILETIME &ft = prop.filetime;
-    unsigned ns100 = 0;
-    int numDigits = kTimestampPrintLevel_NTFS;
-    const unsigned prec = prop.wReserved1;
-    const unsigned ns100_Temp = prop.wReserved2;
-    if (prec != 0
-        && prec <= k_PropVar_TimePrec_1ns
-        && ns100_Temp < 100
-        && prop.wReserved3 == 0)
-    {
-      ns100 = ns100_Temp;
-      if (prec == k_PropVar_TimePrec_Unix ||
-          prec == k_PropVar_TimePrec_DOS)
-        numDigits = 0;
-      else if (prec == k_PropVar_TimePrec_HighPrec)
-        numDigits = 9;
-      else
-      {
-        numDigits = (int)prec - (int)k_PropVar_TimePrec_Base;
-        if (
-            // numDigits < kTimestampPrintLevel_DAY // for debuf
-            numDigits < kTimestampPrintLevel_SEC
-            )
-
-          numDigits = kTimestampPrintLevel_NTFS;
-      }
-    }
-    if (ft.dwHighDateTime == 0 && ft.dwLowDateTime == 0 && ns100 == 0)
+    if ((ft.dwHighDateTime == 0 &&
+         ft.dwLowDateTime == 0))
       return;
-    if (level > numDigits)
-      level = numDigits;
-    ConvertUtcFileTimeToString2(ft, ns100, dest, level);
+    ConvertUtcFileTimeToString(prop.filetime, dest, level);
     return;
   }
 
@@ -192,7 +154,7 @@ void ConvertPropertyToShortString2(char *dest, const PROPVARIANT &prop, PROPID p
     {
       if (prop.vt != VT_UI4)
         break;
-      const UInt32 a = prop.ulVal;
+      UInt32 a = prop.ulVal;
 
       /*
       if ((a & 0x8000) && (a & 0x7FFF) == 0)
@@ -216,7 +178,7 @@ void ConvertPropertyToShortString2(char *dest, const PROPVARIANT &prop, PROPID p
       ConvertUInt32ToString((UInt32)(prop.uhVal.QuadPart >> 48), dest);
       dest += strlen(dest);
       *dest++ = '-';
-      const UInt64 low = prop.uhVal.QuadPart & (((UInt64)1 << 48) - 1);
+      UInt64 low = prop.uhVal.QuadPart & (((UInt64)1 << 48) - 1);
       ConvertUInt64ToString(low, dest);
       return;
     }
@@ -234,25 +196,6 @@ void ConvertPropertyToShortString2(char *dest, const PROPVARIANT &prop, PROPID p
       ConvertUInt64ToHex(v, dest + 2);
       return;
     }
-
-    /*
-    case kpidDevice:
-    {
-      UInt64 v = 0;
-      if (prop.vt == VT_UI4)
-        v = prop.ulVal;
-      else if (prop.vt == VT_UI8)
-        v = (UInt64)prop.uhVal.QuadPart;
-      else
-        break;
-      ConvertUInt32ToString(MY_dev_major(v), dest);
-      dest += strlen(dest);
-      *dest++ = ',';
-      ConvertUInt32ToString(MY_dev_minor(v), dest);
-      return;
-    }
-    */
-    default: break;
   }
   
   ConvertPropVariantToShortString(prop, dest);
@@ -270,12 +213,17 @@ void ConvertPropertyToString2(UString &dest, const PROPVARIANT &prop, PROPID pro
   dest = temp;
 }
 
-#ifndef Z7_SFX
+static inline unsigned GetHex(unsigned v)
+{
+  return (v < 10) ? ('0' + v) : ('A' + (v - 10));
+}
+
+#ifndef _SFX
 
 static inline void AddHexToString(AString &res, unsigned v)
 {
-  res.Add_Char((char)GET_HEX_CHAR_UPPER(v >> 4));
-  res.Add_Char((char)GET_HEX_CHAR_UPPER(v & 15));
+  res += (char)GetHex(v >> 4);
+  res += (char)GetHex(v & 0xF);
 }
 
 /*
@@ -324,7 +272,7 @@ static int FindPairIndex(const CSecID2Name * pairs, unsigned num, UInt32 id)
 {
   for (unsigned i = 0; i < num; i++)
     if (pairs[i].n == id)
-      return (int)i;
+      return i;
   return -1;
 }
 
@@ -384,41 +332,41 @@ static const CServicesToName services_to_name[] =
   { { 0x38FB89B5, 0xCBC28419, 0x6D236C5C, 0x6E770057, 0x876402C0 } , "TrustedInstaller" }
 };
 
-static void ParseSid(AString &s, const Byte *p, size_t lim /* , unsigned &sidSize */)
+static void ParseSid(AString &s, const Byte *p, UInt32 lim, UInt32 &sidSize)
 {
-  // sidSize = 0;
+  sidSize = 0;
   if (lim < 8)
   {
     s += "ERROR";
     return;
   }
-  if (p[0] != 1) // rev
+  UInt32 rev = p[0];
+  if (rev != 1)
   {
     s += "UNSUPPORTED";
     return;
   }
-  const unsigned num = p[1];
-  const unsigned sidSize_Loc = 8 + num * 4;
-  if (sidSize_Loc > lim)
+  UInt32 num = p[1];
+  if (8 + num * 4 > lim)
   {
     s += "ERROR";
     return;
   }
-  // sidSize = sidSize_Loc;
-  const UInt32 authority = GetBe32(p + 4);
+  sidSize = 8 + num * 4;
+  UInt32 authority = GetBe32(p + 4);
 
   if (p[2] == 0 && p[3] == 0 && authority == 5 && num >= 1)
   {
-    const UInt32 v0 = Get32(p + 8);
-    if (v0 < Z7_ARRAY_SIZE(sidNames))
+    UInt32 v0 = Get32(p + 8);
+    if (v0 < ARRAY_SIZE(sidNames))
     {
       s += sidNames[v0];
       return;
     }
     if (v0 == 32 && num == 2)
     {
-      const UInt32 v1 = Get32(p + 12);
-      const int index = FindPairIndex(sid_32_Names, Z7_ARRAY_SIZE(sid_32_Names), v1);
+      UInt32 v1 = Get32(p + 12);
+      int index = FindPairIndex(sid_32_Names, ARRAY_SIZE(sid_32_Names), v1);
       if (index >= 0)
       {
         s += sid_32_Names[(unsigned)index].sz;
@@ -428,7 +376,7 @@ static void ParseSid(AString &s, const Byte *p, size_t lim /* , unsigned &sidSiz
     if (v0 == 21 && num == 5)
     {
       UInt32 v4 = Get32(p + 8 + 4 * 4);
-      const int index = FindPairIndex(sid_21_Names, Z7_ARRAY_SIZE(sid_21_Names), v4);
+      int index = FindPairIndex(sid_21_Names, ARRAY_SIZE(sid_21_Names), v4);
       if (index >= 0)
       {
         s += sid_21_Names[(unsigned)index].sz;
@@ -437,7 +385,7 @@ static void ParseSid(AString &s, const Byte *p, size_t lim /* , unsigned &sidSiz
     }
     if (v0 == 80 && num == 6)
     {
-      for (unsigned i = 0; i < Z7_ARRAY_SIZE(services_to_name); i++)
+      for (unsigned i = 0; i < ARRAY_SIZE(services_to_name); i++)
       {
         const CServicesToName &sn = services_to_name[i];
         int j;
@@ -462,39 +410,39 @@ static void ParseSid(AString &s, const Byte *p, size_t lim /* , unsigned &sidSiz
   }
   for (UInt32 i = 0; i < num; i++)
   {
-    s.Add_Minus();
+    s += '-';
     s.Add_UInt32(Get32(p + 8 + i * 4));
   }
 }
 
-static void ParseOwner(AString &s, const Byte *p, size_t size, UInt32 pos)
+static void ParseOwner(AString &s, const Byte *p, UInt32 size, UInt32 pos)
 {
   if (pos > size)
   {
     s += "ERROR";
     return;
   }
-  // unsigned sidSize = 0;
-  ParseSid(s, p + pos, size - pos /* , sidSize */);
+  UInt32 sidSize = 0;
+  ParseSid(s, p + pos, size - pos, sidSize);
 }
 
-static void ParseAcl(AString &s, const Byte *p, size_t size, const char *strName, UInt32 flags, UInt32 offset)
+static void ParseAcl(AString &s, const Byte *p, UInt32 size, const char *strName, UInt32 flags, UInt32 offset)
 {
-  const unsigned control = Get16(p + 2);
+  UInt32 control = Get16(p + 2);
   if ((flags & control) == 0)
     return;
-  const UInt32 pos = Get32(p + offset);
+  UInt32 pos = Get32(p + offset);
   s.Add_Space();
   s += strName;
   if (pos >= size)
     return;
   p += pos;
-  size -= (size_t)pos;
+  size -= pos;
   if (size < 8)
     return;
   if (Get16(p) != 2) // revision
     return;
-  const UInt32 num = Get32(p + 4);
+  UInt32 num = Get32(p + 4);
   s.Add_UInt32(num);
   
   /*
@@ -531,16 +479,11 @@ static void ParseAcl(AString &s, const Byte *p, size_t size, const char *strName
   */
 }
 
-/*
 #define MY_SE_OWNER_DEFAULTED       (0x0001)
 #define MY_SE_GROUP_DEFAULTED       (0x0002)
-*/
 #define MY_SE_DACL_PRESENT          (0x0004)
-/*
 #define MY_SE_DACL_DEFAULTED        (0x0008)
-*/
 #define MY_SE_SACL_PRESENT          (0x0010)
-/*
 #define MY_SE_SACL_DEFAULTED        (0x0020)
 #define MY_SE_DACL_AUTO_INHERIT_REQ (0x0100)
 #define MY_SE_SACL_AUTO_INHERIT_REQ (0x0200)
@@ -550,9 +493,8 @@ static void ParseAcl(AString &s, const Byte *p, size_t size, const char *strName
 #define MY_SE_SACL_PROTECTED        (0x2000)
 #define MY_SE_RM_CONTROL_VALID      (0x4000)
 #define MY_SE_SELF_RELATIVE         (0x8000)
-*/
 
-void ConvertNtSecureToString(const Byte *data, size_t size, AString &s)
+void ConvertNtSecureToString(const Byte *data, UInt32 size, AString &s)
 {
   s.Empty();
   if (size < 20 || size > (1 << 18))
@@ -571,43 +513,44 @@ void ConvertNtSecureToString(const Byte *data, size_t size, AString &s)
   ParseAcl(s, data, size, "s:", MY_SE_SACL_PRESENT, 12);
   ParseAcl(s, data, size, "d:", MY_SE_DACL_PRESENT, 16);
   s.Add_Space();
-  s.Add_UInt32((UInt32)size);
-  // s.Add_LF();
+  s.Add_UInt32(size);
+  // s += '\n';
   // s += Data_To_Hex(data, size);
 }
 
 #ifdef _WIN32
 
-static bool CheckSid(const Byte *data, size_t size, UInt32 pos) throw()
+static bool CheckSid(const Byte *data, UInt32 size, UInt32 pos) throw()
 {
   if (pos >= size)
     return false;
   size -= pos;
   if (size < 8)
     return false;
-  if (data[pos] != 1) // rev
+  UInt32 rev = data[pos];
+  if (rev != 1)
     return false;
-  const unsigned num = data[pos + 1];
+  UInt32 num = data[pos + 1];
   return (8 + num * 4 <= size);
 }
 
-static bool CheckAcl(const Byte *p, size_t size, UInt32 flags, size_t offset) throw()
+static bool CheckAcl(const Byte *p, UInt32 size, UInt32 flags, UInt32 offset) throw()
 {
-  const unsigned control = Get16(p + 2);
+  UInt32 control = Get16(p + 2);
   if ((flags & control) == 0)
     return true;
-  const UInt32 pos = Get32(p + offset);
+  UInt32 pos = Get32(p + offset);
   if (pos >= size)
     return false;
   p += pos;
   size -= pos;
   if (size < 8)
     return false;
-  const unsigned aclSize = Get16(p + 2);
+  UInt32 aclSize = Get16(p + 2);
   return (aclSize <= size);
 }
 
-bool CheckNtSecure(const Byte *data, size_t size) throw()
+bool CheckNtSecure(const Byte *data, UInt32 size) throw()
 {
   if (size < 20)
     return false;
@@ -647,65 +590,45 @@ static const CSecID2Name k_ReparseTags[] =
   { 0x80000014, "NFS" },
   { 0x80000015, "FILE_PLACEHOLDER" },
   { 0x80000016, "DFM" },
-  { 0x80000017, "WOF" },
-  { 0x80000018, "WCI" },
-  { 0x8000001B, "APPEXECLINK" },
-  { 0xA000001D, "LX_SYMLINK" },
-  { 0x80000023, "AF_UNIX" },
-  { 0x80000024, "LX_FIFO" },
-  { 0x80000025, "LX_CHR" },
-  { 0x80000026, "LX_BLK" }
+  { 0x80000017, "WOF" }
 };
 
-bool ConvertNtReparseToString(const Byte *data, size_t size, UString &s)
+bool ConvertNtReparseToString(const Byte *data, UInt32 size, UString &s)
 {
   s.Empty();
   NFile::CReparseAttr attr;
-
-  if (attr.Parse(data, size))
+  DWORD errorCode = 0;
+  if (attr.Parse(data, size, errorCode))
   {
-    if (attr.IsSymLink_WSL())
+    if (!attr.IsSymLink())
+      s += "Junction: ";
+    s += attr.GetPath();
+    if (!attr.IsOkNamePair())
     {
-      s += "WSL: ";
-      s += attr.GetPath();
-    }
-    else
-    {
-      if (!attr.IsSymLink_Win())
-        s += "Junction: ";
-      s += attr.GetPath();
-      if (s.IsEmpty())
-        s += "Link: ";
-      if (!attr.IsOkNamePair())
-      {
-        s += " : ";
-        s += attr.PrintName;
-      }
+      s += " : ";
+      s += attr.PrintName;
     }
-    if (attr.MinorError)
-      s += " : MINOR_ERROR";
     return true;
-    // s.Add_Space(); // for debug
   }
 
   if (size < 8)
     return false;
-  const UInt32 tag = Get32(data);
-  const UInt32 len = Get16(data + 4);
+  UInt32 tag = Get32(data);
+  UInt32 len = Get16(data + 4);
   if (len + 8 > size)
     return false;
   if (Get16(data + 6) != 0) // padding
     return false;
 
   /*
-  #define my_IO_REPARSE_TAG_DEDUP        (0x80000013L)
-  if (tag == my_IO_REPARSE_TAG_DEDUP)
+  #define _my_IO_REPARSE_TAG_DEDUP        (0x80000013L)
+  if (tag == _my_IO_REPARSE_TAG_DEDUP)
   {
   }
   */
 
   {
-    const int index = FindPairIndex(k_ReparseTags, Z7_ARRAY_SIZE(k_ReparseTags), tag);
+    int index = FindPairIndex(k_ReparseTags, ARRAY_SIZE(k_ReparseTags), tag);
     if (index >= 0)
       s += k_ReparseTags[(unsigned)index].sz;
     else
@@ -717,7 +640,7 @@ bool ConvertNtReparseToString(const Byte *data, size_t size, UString &s)
     }
   }
 
-  s.Add_Colon();
+  s += ":";
   s.Add_UInt32(len);
 
   if (len != 0)
@@ -728,14 +651,14 @@ bool ConvertNtReparseToString(const Byte *data, size_t size, UString &s)
     
     for (UInt32 i = 0; i < len; i++)
     {
-      if (i >= 16)
+      if (i >= 8)
       {
         s += "...";
         break;
       }
-      const unsigned b = data[i];
-      s.Add_Char((char)GET_HEX_CHAR_UPPER(b >> 4));
-      s.Add_Char((char)GET_HEX_CHAR_UPPER(b & 15));
+      unsigned b = data[i];
+      s += (char)GetHex((b >> 4) & 0xF);
+      s += (char)GetHex(b & 0xF);
     }
   }
 

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

@@ -1,7 +1,7 @@
 // PropIDUtils.h
 
-#ifndef ZIP7_INC_PROPID_UTILS_H
-#define ZIP7_INC_PROPID_UTILS_H
+#ifndef __PROPID_UTILS_H
+#define __PROPID_UTILS_H
 
 #include "../../../Common/MyString.h"
 
@@ -9,9 +9,9 @@
 void ConvertPropertyToShortString2(char *dest, const PROPVARIANT &propVariant, PROPID propID, int level = 0) throw();
 void ConvertPropertyToString2(UString &dest, const PROPVARIANT &propVariant, PROPID propID, int level = 0);
 
-bool ConvertNtReparseToString(const Byte *data, size_t size, UString &s);
-void ConvertNtSecureToString(const Byte *data, size_t size, AString &s);
-bool CheckNtSecure(const Byte *data, size_t size) throw();
+bool ConvertNtReparseToString(const Byte *data, UInt32 size, UString &s);
+void ConvertNtSecureToString(const Byte *data, UInt32 size, AString &s);
+bool CheckNtSecure(const Byte *data, UInt32 size) throw();;
 
 void ConvertWinAttribToString(char *s, UInt32 wa) throw();
 

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

@@ -1,7 +1,7 @@
 // Property.h
 
-#ifndef ZIP7_INC_7Z_PROPERTY_H
-#define ZIP7_INC_7Z_PROPERTY_H
+#ifndef __7Z_PROPERTY_H
+#define __7Z_PROPERTY_H
 
 #include "../../../Common/MyString.h"
 

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

@@ -18,7 +18,7 @@ using namespace NCOM;
 static void ParseNumberString(const UString &s, NCOM::CPropVariant &prop)
 {
   const wchar_t *end;
-  const UInt64 result = ConvertStringToUInt64(s, &end);
+  UInt64 result = ConvertStringToUInt64(s, &end);
   if (*end != 0 || s.IsEmpty())
     prop = s;
   else if (result <= (UInt32)0xFFFFFFFF)
@@ -27,33 +27,18 @@ static void ParseNumberString(const UString &s, NCOM::CPropVariant &prop)
     prop = result;
 }
 
-
-struct CPropPropetiesVector
-{
-  CPropVariant *values;
-  CPropPropetiesVector(unsigned num)
-  {
-    values = new CPropVariant[num];
-  }
-  ~CPropPropetiesVector()
-  {
-    delete []values;
-  }
-};
-
-
 HRESULT SetProperties(IUnknown *unknown, const CObjectVector<CProperty> &properties)
 {
   if (properties.IsEmpty())
     return S_OK;
-  Z7_DECL_CMyComPtr_QI_FROM(
-      ISetProperties,
-      setProperties, unknown)
+  CMyComPtr<ISetProperties> setProperties;
+  unknown->QueryInterface(IID_ISetProperties, (void **)&setProperties);
   if (!setProperties)
     return S_OK;
 
   UStringVector realNames;
-  CPropPropetiesVector values(properties.Size());
+  CPropVariant *values = new CPropVariant[properties.Size()];
+  try
   {
     unsigned i;
     for (i = 0; i < properties.Size(); i++)
@@ -65,7 +50,7 @@ HRESULT SetProperties(IUnknown *unknown, const CObjectVector<CProperty> &propert
       {
         if (!name.IsEmpty())
         {
-          const wchar_t c = name.Back();
+          wchar_t c = name.Back();
           if (c == L'-')
             propVariant = false;
           else if (c == L'+')
@@ -77,12 +62,19 @@ HRESULT SetProperties(IUnknown *unknown, const CObjectVector<CProperty> &propert
       else
         ParseNumberString(property.Value, propVariant);
       realNames.Add(name);
-      values.values[i] = propVariant;
+      values[i] = propVariant;
     }
     CRecordVector<const wchar_t *> names;
     for (i = 0; i < realNames.Size(); i++)
       names.Add((const wchar_t *)realNames[i]);
     
-    return setProperties->SetProperties(names.ConstData(), values.values, names.Size());
+    RINOK(setProperties->SetProperties(&names.Front(), values, names.Size()));
+  }
+  catch(...)
+  {
+    delete []values;
+    throw;
   }
+  delete []values;
+  return S_OK;
 }

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

@@ -1,7 +1,7 @@
 // SetProperties.h
 
-#ifndef ZIP7_INC_SETPROPERTIES_H
-#define ZIP7_INC_SETPROPERTIES_H
+#ifndef __SETPROPERTIES_H
+#define __SETPROPERTIES_H
 
 #include "Property.h"
 

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

@@ -1,7 +1,7 @@
 // SortUtils.h
 
-#ifndef ZIP7_INC_SORT_UTLS_H
-#define ZIP7_INC_SORT_UTLS_H
+#ifndef __SORT_UTLS_H
+#define __SORT_UTLS_H
 
 #include "../../../Common/MyString.h"
 

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

@@ -1,11 +1,8 @@
 // StdAfx.h
 
-#ifndef ZIP7_INC_STDAFX_H
-#define ZIP7_INC_STDAFX_H
+#ifndef __STDAFX_H
+#define __STDAFX_H
 
-#if defined(_MSC_VER) && _MSC_VER >= 1800
-#pragma warning(disable : 4464) // relative include path contains '..'
-#endif
 #include "../../../Common/Common.h"
 
 #endif

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

@@ -13,8 +13,7 @@ void CTempFiles::Clear()
 {
   while (!Paths.IsEmpty())
   {
-    if (NeedDeleteFiles)
-      NDir::DeleteFileAlways(Paths.Back());
+    NDir::DeleteFileAlways(Paths.Back());
     Paths.DeleteBack();
   }
 }