1 files changed, 92 insertions, 85 deletions

diff --git a/CPP/7zip/UI/Common/UpdateCallback.h b/CPP/7zip/UI/Common/UpdateCallback.h
index 3719c1e..379b814 100644
--- a/CPP/7zip/UI/Common/UpdateCallback.h
+++ b/CPP/7zip/UI/Common/UpdateCallback.h
@@ -1,7 +1,7 @@
 // UpdateCallback.h
 
-#ifndef __UPDATE_CALLBACK_H
-#define __UPDATE_CALLBACK_H
+#ifndef ZIP7_INC_UPDATE_CALLBACK_H
+#define ZIP7_INC_UPDATE_CALLBACK_H
 
 #include "../../../Common/MyCom.h"
 
@@ -27,37 +27,38 @@ struct CArcToDoStat
   }
 };
 
-#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 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; \
+
+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; \
+  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 \
   */
  
   /* virtual HRESULT CloseProgress() { return S_OK; } */
 
-struct IUpdateCallbackUI
-{
-  INTERFACE_IUpdateCallbackUI(=0)
-};
+Z7_IFACE_DECL_PURE(IUpdateCallbackUI)
+Z7_PURE_INTERFACES_END
 
 struct CKeyKeyValPair
 {
@@ -74,11 +75,11 @@ struct CKeyKeyValPair
 };
 
 
-class CArchiveUpdateCallback:
+class CArchiveUpdateCallback Z7_final:
   public IArchiveUpdateCallback2,
   public IArchiveUpdateCallbackFile,
   // public IArchiveUpdateCallbackArcProp,
-  public IArchiveExtractCallbackMessage,
+  public IArchiveExtractCallbackMessage2,
   public IArchiveGetRawProps,
   public IArchiveGetRootProps,
   public ICryptoGetTextPassword2,
@@ -87,54 +88,63 @@ class CArchiveUpdateCallback:
   public IInFileStream_Callback,
   public CMyUnknownImp
 {
-  #if defined(_WIN32) && !defined(UNDER_CE)
-  bool _saclEnabled;
-  #endif
-  CRecordVector<CKeyKeyValPair> _map;
+  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)
 
-  UInt32 _hardIndex_From;
-  UInt32 _hardIndex_To;
 
   void UpdateProcessedItemStatus(unsigned dirIndex);
 
 public:
-  MY_QUERYINTERFACE_BEGIN2(IArchiveUpdateCallback2)
-    MY_QUERYINTERFACE_ENTRY(IArchiveUpdateCallbackFile)
-    // MY_QUERYINTERFACE_ENTRY(IArchiveUpdateCallbackArcProp)
-    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
-
-
-  STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize);
-
-  INTERFACE_IArchiveUpdateCallback2(;)
-  INTERFACE_IArchiveUpdateCallbackFile(;)
-  // INTERFACE_IArchiveUpdateCallbackArcProp(;)
-  INTERFACE_IArchiveExtractCallbackMessage(;)
-  INTERFACE_IArchiveGetRawProps(;)
-  INTERFACE_IArchiveGetRootProps(;)
-
-  STDMETHOD(CryptoGetTextPassword2)(Int32 *passwordIsDefined, BSTR *password);
-  STDMETHOD(CryptoGetTextPassword)(BSTR *password);
+  bool PreserveATime;
+  bool ShareForWrite;
+  bool StopAfterOpenError;
+  bool StdInMode;
+
+  bool KeepOriginalItemNames;
+  bool StoreNtSecurity;
+  bool StoreHardLinks;
+  bool StoreSymLinks;
+
+  bool StoreOwnerId;
+  bool StoreOwnerName;
+
+  bool Need_LatestMTime;
+  bool LatestMTime_Defined;
+
+  /*
+  bool Need_ArcMTime_Report;
+  bool ArcMTime_WasReported;
+  */
 
   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);
-  virtual void InFileStream_On_Destroy(CInFileStream *stream, UINT_PTR val);
-
-  CRecordVector<UInt64> VolumesSizes;
-  FString VolName;
-  FString VolExt;
-  UString ArcFileName; // without path prefix
+  virtual HRESULT InFileStream_On_Error(UINT_PTR val, DWORD error) Z7_override;
+  virtual void InFileStream_On_Destroy(CInFileStream *stream, UINT_PTR val) Z7_override;
 
   IUpdateCallbackUI *Callback;
 
@@ -145,36 +155,24 @@ public:
   CMyComPtr<IInArchive> Archive;
   const CObjectVector<CArcItem> *ArcItems;
   const CRecordVector<CUpdatePair2> *UpdatePairs;
-  const UStringVector *NewNames;
-  int CommentIndex;
-  const UString *Comment;
 
-  bool PreserveATime;
-  bool ShareForWrite;
-  bool StopAfterOpenError;
-  bool StdInMode;
-
-  bool KeepOriginalItemNames;
-  bool StoreNtSecurity;
-  bool StoreHardLinks;
-  bool StoreSymLinks;
+  CRecordVector<UInt64> VolumesSizes;
+  FString VolName;
+  FString VolExt;
+  UString ArcFileName; // without path prefix
 
-  bool StoreOwnerId;
-  bool StoreOwnerName;
+  const UStringVector *NewNames;
+  const UString *Comment;
+  int CommentIndex;
 
   /*
-  bool Need_ArcMTime_Report;
-  bool ArcMTime_WasReported;
   CArcTime Reported_ArcMTime;
   */
-  bool Need_LatestMTime;
-  bool LatestMTime_Defined;
   CFiTime LatestMTime;
 
   Byte *ProcessedItemsStatuses;
 
 
-
   CArchiveUpdateCallback();
 
   bool IsDir(const CUpdatePair2 &up) const
@@ -185,6 +183,15 @@ public:
       return (*ArcItems)[(unsigned)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