react-native-update 10.34.3 → 10.34.4

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

@@ -1,7 +1,7 @@
 // UpdateCallback.h
 
-#ifndef ZIP7_INC_UPDATE_CALLBACK_H
-#define ZIP7_INC_UPDATE_CALLBACK_H
+#ifndef __UPDATE_CALLBACK_H
+#define __UPDATE_CALLBACK_H
 
 #include "../../../Common/MyCom.h"
 
@@ -27,38 +27,30 @@ struct CArcToDoStat
   }
 };
 
-
-Z7_PURE_INTERFACES_BEGIN
-
-#define Z7_IFACEN_IUpdateCallbackUI(x) \
-  virtual HRESULT WriteSfx(const wchar_t *name, UInt64 size) x \
-  virtual HRESULT SetTotal(UInt64 size) x \
-  virtual HRESULT SetCompleted(const UInt64 *completeValue) x \
-  virtual HRESULT SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize) x \
-  virtual HRESULT CheckBreak() x \
-  /* virtual HRESULT Finalize() x */ \
-  virtual HRESULT SetNumItems(const CArcToDoStat &stat) x \
-  virtual HRESULT GetStream(const wchar_t *name, bool isDir, bool isAnti, UInt32 mode) x \
-  virtual HRESULT OpenFileError(const FString &path, DWORD systemError) x \
-  virtual HRESULT ReadingFileError(const FString &path, DWORD systemError) x \
-  virtual HRESULT SetOperationResult(Int32 opRes) x \
-  virtual HRESULT ReportExtractResult(Int32 opRes, Int32 isEncrypted, const wchar_t *name) x \
-  virtual HRESULT ReportUpdateOperation(UInt32 op, const wchar_t *name, bool isDir) x \
-  /* virtual HRESULT SetPassword(const UString &password) x */ \
-  virtual HRESULT CryptoGetTextPassword2(Int32 *passwordIsDefined, BSTR *password) x \
-  virtual HRESULT CryptoGetTextPassword(BSTR *password) x \
-  virtual HRESULT ShowDeleteFile(const wchar_t *name, bool isDir) x \
-
-  /*
-  virtual HRESULT ReportProp(UInt32 indexType, UInt32 index, PROPID propID, const PROPVARIANT *value) x \
-  virtual HRESULT ReportRawProp(UInt32 indexType, UInt32 index, PROPID propID, const void *data, UInt32 dataSize, UInt32 propType) x \
-  virtual HRESULT ReportFinished(UInt32 indexType, UInt32 index, Int32 opRes) x \
-  */
- 
+#define INTERFACE_IUpdateCallbackUI(x) \
+  virtual HRESULT WriteSfx(const wchar_t *name, UInt64 size) x; \
+  virtual HRESULT SetTotal(UInt64 size) x; \
+  virtual HRESULT SetCompleted(const UInt64 *completeValue) x; \
+  virtual HRESULT SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize) x; \
+  virtual HRESULT CheckBreak() x; \
+  /* virtual HRESULT Finalize() x; */ \
+  virtual HRESULT SetNumItems(const CArcToDoStat &stat) x; \
+  virtual HRESULT GetStream(const wchar_t *name, bool isDir, bool isAnti, UInt32 mode) x; \
+  virtual HRESULT OpenFileError(const FString &path, DWORD systemError) x; \
+  virtual HRESULT ReadingFileError(const FString &path, DWORD systemError) x; \
+  virtual HRESULT SetOperationResult(Int32 opRes) x; \
+  virtual HRESULT ReportExtractResult(Int32 opRes, Int32 isEncrypted, const wchar_t *name) x; \
+  virtual HRESULT ReportUpdateOpeartion(UInt32 op, const wchar_t *name, bool isDir) x; \
+  /* virtual HRESULT SetPassword(const UString &password) x; */ \
+  virtual HRESULT CryptoGetTextPassword2(Int32 *passwordIsDefined, BSTR *password) x; \
+  virtual HRESULT CryptoGetTextPassword(BSTR *password) x; \
+  virtual HRESULT ShowDeleteFile(const wchar_t *name, bool isDir) x; \
   /* virtual HRESULT CloseProgress() { return S_OK; } */
 
-Z7_IFACE_DECL_PURE(IUpdateCallbackUI)
-Z7_PURE_INTERFACES_END
+struct IUpdateCallbackUI
+{
+  INTERFACE_IUpdateCallbackUI(=0)
+};
 
 struct CKeyKeyValPair
 {
@@ -75,11 +67,10 @@ struct CKeyKeyValPair
 };
 
 
-class CArchiveUpdateCallback Z7_final:
+class CArchiveUpdateCallback:
   public IArchiveUpdateCallback2,
   public IArchiveUpdateCallbackFile,
-  // public IArchiveUpdateCallbackArcProp,
-  public IArchiveExtractCallbackMessage2,
+  public IArchiveExtractCallbackMessage,
   public IArchiveGetRawProps,
   public IArchiveGetRootProps,
   public ICryptoGetTextPassword2,
@@ -88,63 +79,48 @@ class CArchiveUpdateCallback Z7_final:
   public IInFileStream_Callback,
   public CMyUnknownImp
 {
-  Z7_COM_QI_BEGIN2(IArchiveUpdateCallback2)
-    Z7_COM_QI_ENTRY(IArchiveUpdateCallbackFile)
-    // Z7_COM_QI_ENTRY(IArchiveUpdateCallbackArcProp)
-    Z7_COM_QI_ENTRY(IArchiveExtractCallbackMessage2)
-    Z7_COM_QI_ENTRY(IArchiveGetRawProps)
-    Z7_COM_QI_ENTRY(IArchiveGetRootProps)
-    Z7_COM_QI_ENTRY(ICryptoGetTextPassword2)
-    Z7_COM_QI_ENTRY(ICryptoGetTextPassword)
-    Z7_COM_QI_ENTRY(ICompressProgressInfo)
-  Z7_COM_QI_END
-  Z7_COM_ADDREF_RELEASE
-
-  Z7_IFACE_COM7_IMP(ICompressProgressInfo)
-
-  Z7_IFACE_COM7_IMP(IProgress)
-  Z7_IFACE_COM7_IMP(IArchiveUpdateCallback)
-  Z7_IFACE_COM7_IMP(IArchiveUpdateCallback2)
-  Z7_IFACE_COM7_IMP(IArchiveUpdateCallbackFile)
-  // Z7_IFACE_COM7_IMP(IArchiveUpdateCallbackArcProp)
-  Z7_IFACE_COM7_IMP(IArchiveExtractCallbackMessage2)
-  Z7_IFACE_COM7_IMP(IArchiveGetRawProps)
-  Z7_IFACE_COM7_IMP(IArchiveGetRootProps)
-  Z7_IFACE_COM7_IMP(ICryptoGetTextPassword2)
-  Z7_IFACE_COM7_IMP(ICryptoGetTextPassword)
-
-
-  void UpdateProcessedItemStatus(unsigned dirIndex);
+  #if defined(_WIN32) && !defined(UNDER_CE)
+  bool _saclEnabled;
+  #endif
+  CRecordVector<CKeyKeyValPair> _map;
+
+  UInt32 _hardIndex_From;
+  UInt32 _hardIndex_To;
 
 public:
-  bool PreserveATime;
-  bool ShareForWrite;
-  bool StopAfterOpenError;
-  bool StdInMode;
+  MY_QUERYINTERFACE_BEGIN2(IArchiveUpdateCallback2)
+    MY_QUERYINTERFACE_ENTRY(IArchiveUpdateCallbackFile)
+    MY_QUERYINTERFACE_ENTRY(IArchiveExtractCallbackMessage)
+    MY_QUERYINTERFACE_ENTRY(IArchiveGetRawProps)
+    MY_QUERYINTERFACE_ENTRY(IArchiveGetRootProps)
+    MY_QUERYINTERFACE_ENTRY(ICryptoGetTextPassword2)
+    MY_QUERYINTERFACE_ENTRY(ICryptoGetTextPassword)
+    MY_QUERYINTERFACE_ENTRY(ICompressProgressInfo)
+  MY_QUERYINTERFACE_END
+  MY_ADDREF_RELEASE
 
-  bool KeepOriginalItemNames;
-  bool StoreNtSecurity;
-  bool StoreHardLinks;
-  bool StoreSymLinks;
 
-  bool StoreOwnerId;
-  bool StoreOwnerName;
+  STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize);
 
-  bool Need_LatestMTime;
-  bool LatestMTime_Defined;
+  INTERFACE_IArchiveUpdateCallback2(;)
+  INTERFACE_IArchiveUpdateCallbackFile(;)
+  INTERFACE_IArchiveExtractCallbackMessage(;)
+  INTERFACE_IArchiveGetRawProps(;)
+  INTERFACE_IArchiveGetRootProps(;)
 
-  /*
-  bool Need_ArcMTime_Report;
-  bool ArcMTime_WasReported;
-  */
+  STDMETHOD(CryptoGetTextPassword2)(Int32 *passwordIsDefined, BSTR *password);
+  STDMETHOD(CryptoGetTextPassword)(BSTR *password);
 
   CRecordVector<UInt32> _openFiles_Indexes;
   FStringVector _openFiles_Paths;
-  // CRecordVector< CInFileStream* > _openFiles_Streams;
 
   bool AreAllFilesClosed() const { return _openFiles_Indexes.IsEmpty(); }
-  virtual HRESULT InFileStream_On_Error(UINT_PTR val, DWORD error) Z7_override;
-  virtual void InFileStream_On_Destroy(CInFileStream *stream, UINT_PTR val) Z7_override;
+  virtual HRESULT InFileStream_On_Error(UINT_PTR val, DWORD error);
+  virtual void InFileStream_On_Destroy(UINT_PTR val);
+
+  CRecordVector<UInt64> VolumesSizes;
+  FString VolName;
+  FString VolExt;
 
   IUpdateCallbackUI *Callback;
 
@@ -155,20 +131,18 @@ public:
   CMyComPtr<IInArchive> Archive;
   const CObjectVector<CArcItem> *ArcItems;
   const CRecordVector<CUpdatePair2> *UpdatePairs;
-
-  CRecordVector<UInt64> VolumesSizes;
-  FString VolName;
-  FString VolExt;
-  UString ArcFileName; // without path prefix
-
   const UStringVector *NewNames;
-  const UString *Comment;
   int CommentIndex;
+  const UString *Comment;
 
-  /*
-  CArcTime Reported_ArcMTime;
-  */
-  CFiTime LatestMTime;
+  bool ShareForWrite;
+  bool StopAfterOpenError;
+  bool StdInMode;
+
+  bool KeepOriginalItemNames;
+  bool StoreNtSecurity;
+  bool StoreHardLinks;
+  bool StoreSymLinks;
 
   Byte *ProcessedItemsStatuses;
 
@@ -178,20 +152,11 @@ public:
   bool IsDir(const CUpdatePair2 &up) const
   {
     if (up.DirIndex >= 0)
-      return DirItems->Items[(unsigned)up.DirIndex].IsDir();
+      return DirItems->Items[up.DirIndex].IsDir();
     else if (up.ArcIndex >= 0)
-      return (*ArcItems)[(unsigned)up.ArcIndex].IsDir;
+      return (*ArcItems)[up.ArcIndex].IsDir;
     return false;
   }
-
-private:
-  #if defined(_WIN32) && !defined(UNDER_CE)
-  bool _saclEnabled;
-  #endif
-  CRecordVector<CKeyKeyValPair> _map;
-
-  UInt32 _hardIndex_From;
-  UInt32 _hardIndex_To;
 };
 
 #endif

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

@@ -3,7 +3,6 @@
 #include "StdAfx.h"
 
 #include <time.h>
-// #include <stdio.h>
 
 #include "../../../Common/Wildcard.h"
 
@@ -15,97 +14,35 @@
 using namespace NWindows;
 using namespace NTime;
 
-
-/*
-  a2.Prec =
-  {
-    0 (k_PropVar_TimePrec_0):
-       if GetProperty(kpidMTime) returned 0 and
-          GetProperty(kpidTimeType) did not returned VT_UI4.
-       7z, wim, tar in 7-Zip before v21)
-    in that case we use
-      (prec) that is set by IOutArchive::GetFileTimeType()
-  }
-*/
-       
-static int MyCompareTime(unsigned prec, const CFiTime &f1, const CArcTime &a2)
+static int MyCompareTime(NFileTimeType::EEnum fileTimeType, const FILETIME &time1, const FILETIME &time2)
 {
-  // except of precision, we also have limitation, when timestamp is out of range
-
-  /* if (Prec) in archive item is defined, then use global (prec) */
-  if (a2.Prec != k_PropVar_TimePrec_0)
-    prec = a2.Prec;
-
-  CArcTime a1;
-  a1.Set_From_FiTime(f1);
-  /* Set_From_FiTime() must set full form precision:
-     k_PropVar_TimePrec_Base + numDigits
-     windows: 7 digits, non-windows: 9 digits */
-
-  if (prec == k_PropVar_TimePrec_DOS)
+  switch (fileTimeType)
   {
-    const UInt32 dosTime1 = a1.Get_DosTime();
-    const UInt32 dosTime2 = a2.Get_DosTime();
-    return MyCompare(dosTime1, dosTime2);
-  }
-
-  if (prec == k_PropVar_TimePrec_Unix)
-  {
-    const Int64 u2 = FileTime_To_UnixTime64(a2.FT);
-    if (u2 == 0 || u2 == (UInt32)0xFFFFFFFF)
-    {
-      // timestamp probably was saturated in archive to 32-bit
-      // so we use saturated 32-bit value for disk file too.
-      UInt32 u1;
-      FileTime_To_UnixTime(a1.FT, u1);
-      const UInt32 u2_32 = (UInt32)u2;
-      return MyCompare(u1, u2_32);
-    }
-
-    const Int64 u1 = FileTime_To_UnixTime64(a1.FT);
-    return MyCompare(u1, u2);
-    // prec = k_PropVar_TimePrec_Base; // for debug
-  }
-
-  if (prec == k_PropVar_TimePrec_0)
-    prec = k_PropVar_TimePrec_Base + 7;
-  else if (prec == k_PropVar_TimePrec_HighPrec)
-    prec = k_PropVar_TimePrec_Base + 9;
-  else if (prec < k_PropVar_TimePrec_Base)
-    prec = k_PropVar_TimePrec_Base;
-  else if (prec > k_PropVar_TimePrec_Base + 9)
-    prec = k_PropVar_TimePrec_Base + 7;
-
-  // prec now is full form: k_PropVar_TimePrec_Base + numDigits;
-  if (prec > a1.Prec && a1.Prec >= k_PropVar_TimePrec_Base)
-    prec = a1.Prec;
-
-  const unsigned numDigits = prec - k_PropVar_TimePrec_Base;
-  if (numDigits >= 7)
-  {
-    const int comp = CompareFileTime(&a1.FT, &a2.FT);
-    if (comp != 0 || numDigits == 7)
-      return comp;
-    return MyCompare(a1.Ns100, a2.Ns100);
+    case NFileTimeType::kWindows:
+      return ::CompareFileTime(&time1, &time2);
+    case NFileTimeType::kUnix:
+      {
+        UInt32 unixTime1, unixTime2;
+        FileTimeToUnixTime(time1, unixTime1);
+        FileTimeToUnixTime(time2, unixTime2);
+        return MyCompare(unixTime1, unixTime2);
+      }
+    case NFileTimeType::kDOS:
+      {
+        UInt32 dosTime1, dosTime2;
+        FileTimeToDosTime(time1, dosTime1);
+        FileTimeToDosTime(time2, dosTime2);
+        return MyCompare(dosTime1, dosTime2);
+      }
   }
-  UInt32 d = 1;
-  for (unsigned k = numDigits; k < 7; k++)
-    d *= 10;
-  const UInt64 v1 = a1.Get_FILETIME_as_UInt64() / d * d;
-  const UInt64 v2 = a2.Get_FILETIME_as_UInt64() / d * d;
-  // printf("\ndelta=%d numDigits=%d\n", (unsigned)(v1- v2), numDigits);
-  return MyCompare(v1, v2);
+  throw 4191618;
 }
 
-
-
 static const char * const k_Duplicate_inArc_Message = "Duplicate filename in archive:";
 static const char * const k_Duplicate_inDir_Message = "Duplicate filename on disk:";
 static const char * const k_NotCensoredCollision_Message = "Internal file name collision (file on disk, file in archive):";
 
-Z7_ATTR_NORETURN
-static
-void ThrowError(const char *message, const UString &s1, const UString &s2)
+static void ThrowError(const char *message, const UString &s1, const UString &s2)
 {
   UString m (message);
   m.Add_LF(); m += s1;
@@ -115,7 +52,7 @@ void ThrowError(const char *message, const UString &s1, const UString &s2)
 
 static int CompareArcItemsBase(const CArcItem &ai1, const CArcItem &ai2)
 {
-  const int res = CompareFileNames(ai1.Name, ai2.Name);
+  int res = CompareFileNames(ai1.Name, ai2.Name);
   if (res != 0)
     return res;
   if (ai1.IsDir != ai2.IsDir)
@@ -125,10 +62,10 @@ static int CompareArcItemsBase(const CArcItem &ai1, const CArcItem &ai2)
 
 static int CompareArcItems(const unsigned *p1, const unsigned *p2, void *param)
 {
-  const unsigned i1 = *p1;
-  const unsigned i2 = *p2;
+  unsigned i1 = *p1;
+  unsigned i2 = *p2;
   const CObjectVector<CArcItem> &arcItems = *(const CObjectVector<CArcItem> *)param;
-  const int res = CompareArcItemsBase(arcItems[i1], arcItems[i2]);
+  int res = CompareArcItemsBase(arcItems[i1], arcItems[i2]);
   if (res != 0)
     return res;
   return MyCompare(i1, i2);
@@ -142,8 +79,8 @@ void GetUpdatePairInfoList(
 {
   CUIntVector dirIndices, arcIndices;
   
-  const unsigned numDirItems = dirItems.Items.Size();
-  const unsigned numArcItems = arcItems.Size();
+  unsigned numDirItems = dirItems.Items.Size();
+  unsigned numArcItems = arcItems.Size();
   
   CIntArr duplicatedArcItem(numArcItems);
   {
@@ -207,18 +144,18 @@ void GetUpdatePairInfoList(
     
     if (dirIndex < numDirItems)
     {
-      dirIndex2 = (int)dirIndices[dirIndex];
-      di = &dirItems.Items[(unsigned)dirIndex2];
+      dirIndex2 = dirIndices[dirIndex];
+      di = &dirItems.Items[dirIndex2];
     }
 
     if (arcIndex < numArcItems)
     {
-      arcIndex2 = (int)arcIndices[arcIndex];
-      ai = &arcItems[(unsigned)arcIndex2];
+      arcIndex2 = arcIndices[arcIndex];
+      ai = &arcItems[arcIndex2];
       compareResult = 1;
       if (dirIndex < numDirItems)
       {
-        compareResult = CompareFileNames(dirNames[(unsigned)dirIndex2], ai->Name);
+        compareResult = CompareFileNames(dirNames[dirIndex2], ai->Name);
         if (compareResult == 0)
         {
           if (di->IsDir() != ai->IsDir)
@@ -229,7 +166,7 @@ void GetUpdatePairInfoList(
     
     if (compareResult < 0)
     {
-      name = &dirNames[(unsigned)dirIndex2];
+      name = &dirNames[dirIndex2];
       pair.State = NUpdateArchive::NPairState::kOnlyOnDisk;
       pair.DirIndex = dirIndex2;
       dirIndex++;
@@ -245,28 +182,25 @@ void GetUpdatePairInfoList(
     }
     else
     {
-      const int dupl = duplicatedArcItem[arcIndex];
+      int dupl = duplicatedArcItem[arcIndex];
       if (dupl != 0)
-        ThrowError(k_Duplicate_inArc_Message, ai->Name, arcItems[arcIndices[(unsigned)((int)arcIndex + dupl)]].Name);
+        ThrowError(k_Duplicate_inArc_Message, ai->Name, arcItems[arcIndices[arcIndex + dupl]].Name);
 
-      name = &dirNames[(unsigned)dirIndex2];
+      name = &dirNames[dirIndex2];
       if (!ai->Censored)
         ThrowError(k_NotCensoredCollision_Message, *name, ai->Name);
       
       pair.DirIndex = dirIndex2;
       pair.ArcIndex = arcIndex2;
 
-      int compResult = 0;
-      if (ai->MTime.Def)
-      {
-        compResult = MyCompareTime((unsigned)fileTimeType, di->MTime, ai->MTime);
-      }
-      switch (compResult)
+      switch (ai->MTimeDefined ? MyCompareTime(
+          ai->TimeType != - 1 ? (NFileTimeType::EEnum)ai->TimeType : fileTimeType,
+          di->MTime, ai->MTime): 0)
       {
         case -1: pair.State = NUpdateArchive::NPairState::kNewInArchive; break;
         case  1: pair.State = NUpdateArchive::NPairState::kOldInArchive; break;
         default:
-          pair.State = (ai->Size_Defined && di->Size == ai->Size) ?
+          pair.State = (ai->SizeDefined && di->Size == ai->Size) ?
               NUpdateArchive::NPairState::kSameFiles :
               NUpdateArchive::NPairState::kUnknowNewerFiles;
       }
@@ -275,15 +209,12 @@ void GetUpdatePairInfoList(
       arcIndex++;
     }
     
-    if (
-       #ifdef _WIN32
-        (di && di->IsAltStream) ||
-       #endif
+    if ((di && di->IsAltStream) ||
         (ai && ai->IsAltStream))
     {
       if (prevHostName)
       {
-        const unsigned hostLen = prevHostName->Len();
+        unsigned hostLen = prevHostName->Len();
         if (name->Len() > hostLen)
           if ((*name)[hostLen] == ':' && CompareFileNames(*prevHostName, name->Left(hostLen)) == 0)
             pair.HostIndex = prevHostFile;
@@ -291,7 +222,7 @@ void GetUpdatePairInfoList(
     }
     else
     {
-      prevHostFile = (int)updatePairs.Size();
+      prevHostFile = updatePairs.Size();
       prevHostName = name;
     }
     

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

@@ -1,7 +1,7 @@
 // UpdatePair.h
 
-#ifndef ZIP7_INC_UPDATE_PAIR_H
-#define ZIP7_INC_UPDATE_PAIR_H
+#ifndef __UPDATE_PAIR_H
+#define __UPDATE_PAIR_H
 
 #include "DirItem.h"
 #include "UpdateAction.h"

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

@@ -24,11 +24,11 @@ void UpdateProduce(
     up2.NewData = up2.NewProps = true;
     up2.UseArcProps = false;
     
-    switch ((int)actionSet.StateActions[(unsigned)pair.State])
+    switch (actionSet.StateActions[(unsigned)pair.State])
     {
       case NPairAction::kIgnore:
         if (pair.ArcIndex >= 0 && callback)
-          callback->ShowDeleteFile((unsigned)pair.ArcIndex);
+          callback->ShowDeleteFile(pair.ArcIndex);
         continue;
 
       case NPairAction::kCopy:
@@ -43,7 +43,7 @@ void UpdateProduce(
                 1) no such alt stream in Disk
                 2) there is Host file in disk
             */
-            if (updatePairs[(unsigned)pair.HostIndex].DirIndex >= 0)
+            if (updatePairs[pair.HostIndex].DirIndex >= 0)
               continue;
           }
         }
@@ -61,12 +61,8 @@ void UpdateProduce(
         up2.IsAnti = true;
         up2.UseArcProps = (pair.ArcIndex >= 0);
         break;
-      
-      default: throw 123; // break; // is unexpected case
     }
 
-    up2.IsSameTime = ((unsigned)pair.State == NUpdateArchive::NPairState::kSameFiles);
-
     operationChain.Add(up2);
   }
   

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

@@ -1,7 +1,7 @@
 // UpdateProduce.h
 
-#ifndef ZIP7_INC_UPDATE_PRODUCE_H
-#define ZIP7_INC_UPDATE_PRODUCE_H
+#ifndef __UPDATE_PRODUCE_H
+#define __UPDATE_PRODUCE_H
 
 #include "UpdatePair.h"
 
@@ -17,14 +17,13 @@ struct CUpdatePair2
   int NewNameIndex;
 
   bool IsMainRenameItem;
-  bool IsSameTime;
 
-  void SetAs_NoChangeArcItem(unsigned arcIndex) // int
+  void SetAs_NoChangeArcItem(int arcIndex)
   {
     NewData = NewProps = false;
     UseArcProps = true;
     IsAnti = false;
-    ArcIndex = (int)arcIndex;
+    ArcIndex = arcIndex;
   }
 
   bool ExistOnDisk() const { return DirIndex != -1; }
@@ -38,18 +37,14 @@ struct CUpdatePair2
       DirIndex(-1),
       ArcIndex(-1),
       NewNameIndex(-1),
-      IsMainRenameItem(false),
-      IsSameTime(false)
+      IsMainRenameItem(false)
       {}
 };
 
-Z7_PURE_INTERFACES_BEGIN
-
-DECLARE_INTERFACE(IUpdateProduceCallback)
+struct IUpdateProduceCallback
 {
   virtual HRESULT ShowDeleteFile(unsigned arcIndex) = 0;
 };
-Z7_PURE_INTERFACES_END
 
 void UpdateProduce(
     const CRecordVector<CUpdatePair> &updatePairs,

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

@@ -2,8 +2,10 @@
 
 #include "StdAfx.h"
 
+#include "../../../Common/StringConvert.h"
+#include "../../../Common/Wildcard.h"
+
 #include "../../../Windows/FileName.h"
-#include "../../../Windows/FileSystem.h"
 
 #include "WorkDir.h"
 
@@ -19,10 +21,10 @@ FString GetWorkDir(const NWorkDir::CInfo &workDirInfo, const FString &path, FStr
   if (workDirInfo.ForRemovableOnly)
   {
     mode = NWorkDir::NMode::kCurrent;
-    const FString prefix = path.Left(3);
-    if (NName::IsDrivePath(prefix))
+    FString prefix = path.Left(3);
+    if (prefix[1] == FTEXT(':') && prefix[2] == FTEXT('\\'))
     {
-      const UINT driveType = NSystem::MyGetDriveType(prefix);
+      UINT driveType = GetDriveType(GetSystemString(prefix, ::AreFileApisANSI() ? CP_ACP : CP_OEMCP));
       if (driveType == DRIVE_CDROM || driveType == DRIVE_REMOVABLE)
         mode = workDirInfo.Mode;
     }
@@ -36,26 +38,29 @@ FString GetWorkDir(const NWorkDir::CInfo &workDirInfo, const FString &path, FStr
   }
   #endif
   
-  const int pos = path.ReverseFind_PathSepar() + 1;
-  fileName = path.Ptr((unsigned)pos);
+  int pos = path.ReverseFind_PathSepar() + 1;
+  fileName = path.Ptr(pos);
   
-  FString tempDir;
-  switch ((int)mode)
+  switch (mode)
   {
     case NWorkDir::NMode::kCurrent:
-      tempDir = path.Left((unsigned)pos);
-      break;
+    {
+      return path.Left(pos);
+    }
     case NWorkDir::NMode::kSpecified:
-      tempDir = workDirInfo.Path;
-      break;
-    // case NWorkDir::NMode::kSystem:
+    {
+      FString tempDir = workDirInfo.Path;
+      NName::NormalizeDirPathPrefix(tempDir);
+      return tempDir;
+    }
     default:
+    {
+      FString tempDir;
       if (!MyGetTempPath(tempDir))
         throw 141717;
-      break;
+      return tempDir;
+    }
   }
-  NName::NormalizeDirPathPrefix(tempDir);
-  return tempDir;
 }
 
 HRESULT CWorkDirTempFile::CreateTempFile(const FString &originalPath)
@@ -63,22 +68,27 @@ HRESULT CWorkDirTempFile::CreateTempFile(const FString &originalPath)
   NWorkDir::CInfo workDirInfo;
   workDirInfo.Load();
   FString namePart;
-  FString path = GetWorkDir(workDirInfo, originalPath, namePart);
-  CreateComplexDir(path);
-  path += namePart;
+  FString workDir = GetWorkDir(workDirInfo, originalPath, namePart);
+  CreateComplexDir(workDir);
+  CTempFile tempFile;
   _outStreamSpec = new COutFileStream;
   OutStream = _outStreamSpec;
-  if (!_tempFile.Create(path, &_outStreamSpec->File))
-    return GetLastError_noZero_HRESULT();
+  if (!_tempFile.Create(workDir + namePart, &_outStreamSpec->File))
+  {
+    DWORD error = GetLastError();
+    return error ? error : E_FAIL;
+  }
   _originalPath = originalPath;
   return S_OK;
 }
 
-HRESULT CWorkDirTempFile::MoveToOriginal(bool deleteOriginal,
-    NWindows::NFile::NDir::ICopyFileProgress *progress)
+HRESULT CWorkDirTempFile::MoveToOriginal(bool deleteOriginal)
 {
   OutStream.Release();
-  if (!_tempFile.MoveTo(_originalPath, deleteOriginal, progress))
-    return GetLastError_noZero_HRESULT();
+  if (!_tempFile.MoveTo(_originalPath, deleteOriginal))
+  {
+    DWORD error = GetLastError();
+    return error ? error : E_FAIL;
+  }
   return S_OK;
 }