react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/7zip/Archive/IArchive.h

@@ -1,55 +1,22 @@
 // IArchive.h
 
-#ifndef ZIP7_INC_IARCHIVE_H
-#define ZIP7_INC_IARCHIVE_H
+#ifndef __IARCHIVE_H
+#define __IARCHIVE_H
 
 #include "../IProgress.h"
 #include "../IStream.h"
 #include "../PropID.h"
 
-Z7_PURE_INTERFACES_BEGIN
-
-
-#define Z7_IFACE_CONSTR_ARCHIVE_SUB(i, base, n) \
-  Z7_DECL_IFACE_7ZIP_SUB(i, base, 6, n) \
-  { Z7_IFACE_COM7_PURE(i) };
-
-#define Z7_IFACE_CONSTR_ARCHIVE(i, n) \
-  Z7_IFACE_CONSTR_ARCHIVE_SUB(i, IUnknown, n)
-
-/*
-How the function in 7-Zip returns object for output parameter via pointer
-
-1) The caller sets the value of variable before function call:
-  PROPVARIANT  :  vt = VT_EMPTY
-  BSTR         :  NULL
-  IUnknown* and derived interfaces  :  NULL
-  another scalar types  :  any non-initialized value is allowed
-
-2) The callee in current 7-Zip code now can free input object for output parameter:
-  PROPVARIANT   : the callee calls VariantClear(propvaiant_ptr) for input
-                  value stored in variable
-  another types : the callee ignores stored value.
-
-3) The callee writes new value to variable for output parameter and
-  returns execution to caller.
-
-4) The caller must free or release object returned by the callee:
-  PROPVARIANT   : VariantClear(&propvaiant)
-  BSTR          : SysFreeString(bstr)
-  IUnknown* and derived interfaces  :  if (ptr) ptr->Relase()
-*/
-
+#define ARCHIVE_INTERFACE_SUB(i, base, x) DECL_INTERFACE_SUB(i, base, 6, x)
+#define ARCHIVE_INTERFACE(i, x) ARCHIVE_INTERFACE_SUB(i, IUnknown, x)
 
 namespace NFileTimeType
 {
   enum EEnum
   {
-    kNotDefined = -1,
-    kWindows = 0,
+    kWindows,
     kUnix,
-    kDOS,
-    k1ns
+    kDOS
   };
 }
 
@@ -67,33 +34,8 @@ namespace NArcInfoFlags
   const UInt32 kPreArc          = 1 << 9;  // such archive can be stored before real archive (like SFX stub)
   const UInt32 kSymLinks        = 1 << 10; // the handler supports symbolic links
   const UInt32 kHardLinks       = 1 << 11; // the handler supports hard links
-  const UInt32 kByExtOnlyOpen   = 1 << 12; // call handler only if file extension matches
-  const UInt32 kHashHandler     = 1 << 13; // the handler contains the hashes (checksums)
-  const UInt32 kCTime           = 1 << 14;
-  const UInt32 kCTime_Default   = 1 << 15;
-  const UInt32 kATime           = 1 << 16;
-  const UInt32 kATime_Default   = 1 << 17;
-  const UInt32 kMTime           = 1 << 18;
-  const UInt32 kMTime_Default   = 1 << 19;
-  // const UInt32 kTTime_Reserved         = 1 << 20;
-  // const UInt32 kTTime_Reserved_Default = 1 << 21;
 }
 
-namespace NArcInfoTimeFlags
-{
-  const unsigned kTime_Prec_Mask_bit_index = 0;
-  const unsigned kTime_Prec_Mask_num_bits = 26;
-
-  const unsigned kTime_Prec_Default_bit_index = 27;
-  const unsigned kTime_Prec_Default_num_bits = 5;
-}
-
-#define TIME_PREC_TO_ARC_FLAGS_MASK(v) \
-  ((UInt32)1 << (NArcInfoTimeFlags::kTime_Prec_Mask_bit_index + (v)))
-
-#define TIME_PREC_TO_ARC_FLAGS_TIME_DEFAULT(v) \
-  ((UInt32)(v) << NArcInfoTimeFlags::kTime_Prec_Default_bit_index)
-
 namespace NArchive
 {
   namespace NHandlerPropID
@@ -111,8 +53,8 @@ namespace NArchive
       kSignatureOffset, // VT_UI4
       kAltStreams,      // VT_BOOL
       kNtSecure,        // VT_BOOL
-      kFlags,           // VT_UI4
-      kTimeFlags        // VT_UI4
+      kFlags            // VT_UI4
+      // kVersion          // VT_UI4 ((VER_MAJOR << 8) | VER_MINOR)
     };
   }
 
@@ -124,8 +66,7 @@ namespace NArchive
       {
         kExtract = 0,
         kTest,
-        kSkip,
-        kReadExternal
+        kSkip
       };
     }
   
@@ -143,7 +84,6 @@ namespace NArchive
         kIsNotArc,
         kHeadersError,
         kWrongPassword
-        // , kMemError
       };
     }
   }
@@ -156,7 +96,6 @@ namespace NArchive
       kInArcIndex,
       kBlockIndex,
       kOutArcIndex
-      // kArcProp
     };
   }
   
@@ -167,18 +106,20 @@ namespace NArchive
       enum
       {
         kOK = 0
-        // kError = 1,
-        // kError_FileChanged
+        , // kError
       };
     }
   }
 }
 
-#define Z7_IFACEM_IArchiveOpenCallback(x) \
-  x(SetTotal(const UInt64 *files, const UInt64 *bytes)) \
-  x(SetCompleted(const UInt64 *files, const UInt64 *bytes)) \
+#define INTERFACE_IArchiveOpenCallback(x) \
+  STDMETHOD(SetTotal)(const UInt64 *files, const UInt64 *bytes) x; \
+  STDMETHOD(SetCompleted)(const UInt64 *files, const UInt64 *bytes) x; \
 
-Z7_IFACE_CONSTR_ARCHIVE(IArchiveOpenCallback, 0x10)
+ARCHIVE_INTERFACE(IArchiveOpenCallback, 0x10)
+{
+  INTERFACE_IArchiveOpenCallback(PURE);
+};
 
 /*
 IArchiveExtractCallback::
@@ -196,13 +137,13 @@ IArchiveExtractCallback::GetStream()
   Int32 askExtractMode  (Extract::NAskMode)
     if (askMode != NExtract::NAskMode::kExtract)
     {
-      then the callee doesn't write data to stream: (*outStream == NULL)
+      then the callee can not real stream: (*inStream == NULL)
     }
   
   Out:
-      (*outStream == NULL) - for directories
-      (*outStream == NULL) - if link (hard link or symbolic link) was created
-      if (*outStream == NULL && askMode == NExtract::NAskMode::kExtract)
+      (*inStream == NULL) - for directories
+      (*inStream == NULL) - if link (hard link or symbolic link) was created
+      if (*inStream == NULL && askMode == NExtract::NAskMode::kExtract)
       {
         then the caller must skip extracting of that file.
       }
@@ -229,49 +170,57 @@ SetOperationResult()
   Int32 opRes (NExtract::NOperationResult)
 */
 
-// INTERFACE_IProgress(x)
-
-#define Z7_IFACEM_IArchiveExtractCallback(x) \
-  x(GetStream(UInt32 index, ISequentialOutStream **outStream, Int32 askExtractMode)) \
-  x(PrepareOperation(Int32 askExtractMode)) \
-  x(SetOperationResult(Int32 opRes)) \
+#define INTERFACE_IArchiveExtractCallback(x) \
+  INTERFACE_IProgress(x) \
+  STDMETHOD(GetStream)(UInt32 index, ISequentialOutStream **outStream, Int32 askExtractMode) x; \
+  STDMETHOD(PrepareOperation)(Int32 askExtractMode) x; \
+  STDMETHOD(SetOperationResult)(Int32 opRes) x; \
 
-Z7_IFACE_CONSTR_ARCHIVE_SUB(IArchiveExtractCallback, IProgress, 0x20)
+ARCHIVE_INTERFACE_SUB(IArchiveExtractCallback, IProgress, 0x20)
+{
+  INTERFACE_IArchiveExtractCallback(PURE)
+};
 
 
 
 /*
-v23:
-IArchiveExtractCallbackMessage2 can be requested from IArchiveExtractCallback object
+IArchiveExtractCallbackMessage can be requested from IArchiveExtractCallback object
   by Extract() or UpdateItems() functions to report about extracting errors
 ReportExtractResult()
   UInt32 indexType (NEventIndexType)
   UInt32 index
   Int32 opRes (NExtract::NOperationResult)
 */
-/*
-before v23:
-#define Z7_IFACEM_IArchiveExtractCallbackMessage(x) \
-  x(ReportExtractResult(UInt32 indexType, UInt32 index, Int32 opRes))
-Z7_IFACE_CONSTR_ARCHIVE_SUB(IArchiveExtractCallbackMessage, IProgress, 0x21)
-*/
-#define Z7_IFACEM_IArchiveExtractCallbackMessage2(x) \
-  x(ReportExtractResult(UInt32 indexType, UInt32 index, Int32 opRes))
-Z7_IFACE_CONSTR_ARCHIVE(IArchiveExtractCallbackMessage2, 0x22)
 
-#define Z7_IFACEM_IArchiveOpenVolumeCallback(x) \
-  x(GetProperty(PROPID propID, PROPVARIANT *value)) \
-  x(GetStream(const wchar_t *name, IInStream **inStream))
-Z7_IFACE_CONSTR_ARCHIVE(IArchiveOpenVolumeCallback, 0x30)
+#define INTERFACE_IArchiveExtractCallbackMessage(x) \
+  STDMETHOD(ReportExtractResult)(UInt32 indexType, UInt32 index, Int32 opRes) x; \
+
+ARCHIVE_INTERFACE_SUB(IArchiveExtractCallbackMessage, IProgress, 0x21)
+{
+  INTERFACE_IArchiveExtractCallbackMessage(PURE)
+};
+
+
+#define INTERFACE_IArchiveOpenVolumeCallback(x) \
+  STDMETHOD(GetProperty)(PROPID propID, PROPVARIANT *value) x; \
+  STDMETHOD(GetStream)(const wchar_t *name, IInStream **inStream) x; \
+
+ARCHIVE_INTERFACE(IArchiveOpenVolumeCallback, 0x30)
+{
+  INTERFACE_IArchiveOpenVolumeCallback(PURE);
+};
+
 
+ARCHIVE_INTERFACE(IInArchiveGetStream, 0x40)
+{
+  STDMETHOD(GetStream)(UInt32 index, ISequentialInStream **stream) PURE;
+};
 
-#define Z7_IFACEM_IInArchiveGetStream(x) \
-  x(GetStream(UInt32 index, ISequentialInStream **stream))
-Z7_IFACE_CONSTR_ARCHIVE(IInArchiveGetStream, 0x40)
 
-#define Z7_IFACEM_IArchiveOpenSetSubArchiveName(x) \
-  x(SetSubArchiveName(const wchar_t *name))
-Z7_IFACE_CONSTR_ARCHIVE(IArchiveOpenSetSubArchiveName, 0x50)
+ARCHIVE_INTERFACE(IArchiveOpenSetSubArchiveName, 0x50)
+{
+  STDMETHOD(SetSubArchiveName)(const wchar_t *name) PURE;
+};
 
 
 /*
@@ -307,25 +256,28 @@ Notes:
   Some IInArchive handlers will work incorrectly in that case.
 */
 
-#if defined(_MSC_VER) && !defined(__clang__)
-  #define MY_NO_THROW_DECL_ONLY  Z7_COM7F_E
+#ifdef _MSC_VER
+  #define MY_NO_THROW_DECL_ONLY throw()
 #else
   #define MY_NO_THROW_DECL_ONLY
 #endif
 
-#define Z7_IFACEM_IInArchive(x) \
-  x(Open(IInStream *stream, const UInt64 *maxCheckStartPosition, IArchiveOpenCallback *openCallback)) \
-  x(Close()) \
-  x(GetNumberOfItems(UInt32 *numItems)) \
-  x(GetProperty(UInt32 index, PROPID propID, PROPVARIANT *value)) \
-  x(Extract(const UInt32 *indices, UInt32 numItems, Int32 testMode, IArchiveExtractCallback *extractCallback)) \
-  x(GetArchiveProperty(PROPID propID, PROPVARIANT *value)) \
-  x(GetNumberOfProperties(UInt32 *numProps)) \
-  x(GetPropertyInfo(UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType)) \
-  x(GetNumberOfArchiveProperties(UInt32 *numProps)) \
-  x(GetArchivePropertyInfo(UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType)) \
-
-Z7_IFACE_CONSTR_ARCHIVE(IInArchive, 0x60)
+#define INTERFACE_IInArchive(x) \
+  STDMETHOD(Open)(IInStream *stream, const UInt64 *maxCheckStartPosition, IArchiveOpenCallback *openCallback) MY_NO_THROW_DECL_ONLY x; \
+  STDMETHOD(Close)() MY_NO_THROW_DECL_ONLY x; \
+  STDMETHOD(GetNumberOfItems)(UInt32 *numItems) MY_NO_THROW_DECL_ONLY x; \
+  STDMETHOD(GetProperty)(UInt32 index, PROPID propID, PROPVARIANT *value) MY_NO_THROW_DECL_ONLY x; \
+  STDMETHOD(Extract)(const UInt32* indices, UInt32 numItems, Int32 testMode, IArchiveExtractCallback *extractCallback) MY_NO_THROW_DECL_ONLY x; \
+  STDMETHOD(GetArchiveProperty)(PROPID propID, PROPVARIANT *value) MY_NO_THROW_DECL_ONLY x; \
+  STDMETHOD(GetNumberOfProperties)(UInt32 *numProps) MY_NO_THROW_DECL_ONLY x; \
+  STDMETHOD(GetPropertyInfo)(UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType) MY_NO_THROW_DECL_ONLY x; \
+  STDMETHOD(GetNumberOfArchiveProperties)(UInt32 *numProps) MY_NO_THROW_DECL_ONLY x; \
+  STDMETHOD(GetArchivePropertyInfo)(UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType) MY_NO_THROW_DECL_ONLY x; \
+
+ARCHIVE_INTERFACE(IInArchive, 0x60)
+{
+  INTERFACE_IInArchive(PURE)
+};
 
 namespace NParentType
 {
@@ -334,7 +286,7 @@ namespace NParentType
     kDir = 0,
     kAltStream
   };
-}
+};
 
 namespace NPropDataType
 {
@@ -350,36 +302,41 @@ namespace NPropDataType
 
   const UInt32 kUtf8z  = kMask_Utf8  | kMask_ZeroEnd;
   const UInt32 kUtf16z = kMask_Utf16 | kMask_ZeroEnd;
-}
+};
 
 // UTF string (pointer to wchar_t) with zero end and little-endian.
 #define PROP_DATA_TYPE_wchar_t_PTR_Z_LE ((NPropDataType::kMask_Utf | NPropDataType::kMask_ZeroEnd) + (sizeof(wchar_t) >> 1))
 
-
 /*
 GetRawProp:
   Result:
     S_OK - even if property is not set
 */
 
-#define Z7_IFACEM_IArchiveGetRawProps(x) \
-  x(GetParent(UInt32 index, UInt32 *parent, UInt32 *parentType)) \
-  x(GetRawProp(UInt32 index, PROPID propID, const void **data, UInt32 *dataSize, UInt32 *propType)) \
-  x(GetNumRawProps(UInt32 *numProps)) \
-  x(GetRawPropInfo(UInt32 index, BSTR *name, PROPID *propID))
+#define INTERFACE_IArchiveGetRawProps(x) \
+  STDMETHOD(GetParent)(UInt32 index, UInt32 *parent, UInt32 *parentType) x; \
+  STDMETHOD(GetRawProp)(UInt32 index, PROPID propID, const void **data, UInt32 *dataSize, UInt32 *propType) x; \
+  STDMETHOD(GetNumRawProps)(UInt32 *numProps) x; \
+  STDMETHOD(GetRawPropInfo)(UInt32 index, BSTR *name, PROPID *propID) x;
 
-Z7_IFACE_CONSTR_ARCHIVE(IArchiveGetRawProps, 0x70)
+ARCHIVE_INTERFACE(IArchiveGetRawProps, 0x70)
+{
+  INTERFACE_IArchiveGetRawProps(PURE)
+};
 
-#define Z7_IFACEM_IArchiveGetRootProps(x) \
-  x(GetRootProp(PROPID propID, PROPVARIANT *value)) \
-  x(GetRootRawProp(PROPID propID, const void **data, UInt32 *dataSize, UInt32 *propType)) \
+#define INTERFACE_IArchiveGetRootProps(x) \
+  STDMETHOD(GetRootProp)(PROPID propID, PROPVARIANT *value) x; \
+  STDMETHOD(GetRootRawProp)(PROPID propID, const void **data, UInt32 *dataSize, UInt32 *propType) x; \
  
-Z7_IFACE_CONSTR_ARCHIVE(IArchiveGetRootProps, 0x71)
-
-#define Z7_IFACEM_IArchiveOpenSeq(x) \
-  x(OpenSeq(ISequentialInStream *stream)) \
+ARCHIVE_INTERFACE(IArchiveGetRootProps, 0x71)
+{
+  INTERFACE_IArchiveGetRootProps(PURE)
+};
 
-Z7_IFACE_CONSTR_ARCHIVE(IArchiveOpenSeq, 0x61)
+ARCHIVE_INTERFACE(IArchiveOpenSeq, 0x61)
+{
+  STDMETHOD(OpenSeq)(ISequentialInStream *stream) PURE;
+};
 
 /*
   OpenForSize
@@ -405,10 +362,12 @@ Flags:
   the handler can return S_OK, but it doesn't check even Signature.
   So next Extract can be called for that sequential stream.
 */
+
 /*
-#define Z7_IFACEM_IArchiveOpen2(x) \
-  x(ArcOpen2(ISequentialInStream *stream, UInt32 flags, IArchiveOpenCallback *openCallback))
-Z7_IFACE_CONSTR_ARCHIVE(IArchiveOpen2, 0x62)
+ARCHIVE_INTERFACE(IArchiveOpen2, 0x62)
+{
+  STDMETHOD(ArcOpen2)(ISequentialInStream *stream, UInt32 flags, IArchiveOpenCallback *openCallback) PURE;
+};
 */
 
 // ---------- UPDATE ----------
@@ -441,21 +400,27 @@ SetOperationResult()
   Int32 opRes (NExtract::NOperationResult::kOK)
 */
 
-// INTERFACE_IProgress(x)
-#define Z7_IFACEM_IArchiveUpdateCallback(x) \
-  x(GetUpdateItemInfo(UInt32 index, Int32 *newData, Int32 *newProps, UInt32 *indexInArchive)) \
-  x(GetProperty(UInt32 index, PROPID propID, PROPVARIANT *value)) \
-  x(GetStream(UInt32 index, ISequentialInStream **inStream)) \
-  x(SetOperationResult(Int32 operationResult)) \
+#define INTERFACE_IArchiveUpdateCallback(x) \
+  INTERFACE_IProgress(x); \
+  STDMETHOD(GetUpdateItemInfo)(UInt32 index, Int32 *newData, Int32 *newProps, UInt32 *indexInArchive) x; \
+  STDMETHOD(GetProperty)(UInt32 index, PROPID propID, PROPVARIANT *value) x; \
+  STDMETHOD(GetStream)(UInt32 index, ISequentialInStream **inStream) x; \
+  STDMETHOD(SetOperationResult)(Int32 operationResult) x; \
 
-Z7_IFACE_CONSTR_ARCHIVE_SUB(IArchiveUpdateCallback, IProgress, 0x80)
+ARCHIVE_INTERFACE_SUB(IArchiveUpdateCallback, IProgress, 0x80)
+{
+  INTERFACE_IArchiveUpdateCallback(PURE);
+};
 
-// INTERFACE_IArchiveUpdateCallback(x)
-#define Z7_IFACEM_IArchiveUpdateCallback2(x) \
-  x(GetVolumeSize(UInt32 index, UInt64 *size)) \
-  x(GetVolumeStream(UInt32 index, ISequentialOutStream **volumeStream)) \
+#define INTERFACE_IArchiveUpdateCallback2(x) \
+  INTERFACE_IArchiveUpdateCallback(x) \
+  STDMETHOD(GetVolumeSize)(UInt32 index, UInt64 *size) x; \
+  STDMETHOD(GetVolumeStream)(UInt32 index, ISequentialOutStream **volumeStream) x; \
 
-Z7_IFACE_CONSTR_ARCHIVE_SUB(IArchiveUpdateCallback2, IArchiveUpdateCallback, 0x82)
+ARCHIVE_INTERFACE_SUB(IArchiveUpdateCallback2, IArchiveUpdateCallback, 0x82)
+{
+  INTERFACE_IArchiveUpdateCallback2(PURE);
+};
 
 namespace NUpdateNotifyOp
 {
@@ -468,13 +433,11 @@ namespace NUpdateNotifyOp
     kRepack,
     kSkip,
     kDelete,
-    kHeader,
-    kHashRead,
-    kInFileChanged
-    // , kOpFinished
-    // , kNumDefined
+    kHeader
+
+    // kNumDefined
   };
-}
+};
 
 /*
 IArchiveUpdateCallbackFile::ReportOperation
@@ -483,27 +446,15 @@ IArchiveUpdateCallbackFile::ReportOperation
   UInt32 notifyOp (NUpdateNotifyOp)
 */
 
-#define Z7_IFACEM_IArchiveUpdateCallbackFile(x) \
-  x(GetStream2(UInt32 index, ISequentialInStream **inStream, UInt32 notifyOp)) \
-  x(ReportOperation(UInt32 indexType, UInt32 index, UInt32 notifyOp)) \
+#define INTERFACE_IArchiveUpdateCallbackFile(x) \
+  STDMETHOD(GetStream2)(UInt32 index, ISequentialInStream **inStream, UInt32 notifyOp) x; \
+  STDMETHOD(ReportOperation)(UInt32 indexType, UInt32 index, UInt32 notifyOp) x; \
 
-Z7_IFACE_CONSTR_ARCHIVE(IArchiveUpdateCallbackFile, 0x83)
-
-
-#define Z7_IFACEM_IArchiveGetDiskProperty(x) \
-  x(GetDiskProperty(UInt32 index, PROPID propID, PROPVARIANT *value)) \
-  
-Z7_IFACE_CONSTR_ARCHIVE(IArchiveGetDiskProperty, 0x84)
+ARCHIVE_INTERFACE(IArchiveUpdateCallbackFile, 0x83)
+{
+  INTERFACE_IArchiveUpdateCallbackFile(PURE);
+};
 
-/*
-#define Z7_IFACEM_IArchiveUpdateCallbackArcProp(x) \
-  x(ReportProp(UInt32 indexType, UInt32 index, PROPID propID, const PROPVARIANT *value)) \
-  x(ReportRawProp(UInt32 indexType, UInt32 index, PROPID propID, const void *data, UInt32 dataSize, UInt32 propType)) \
-  x(ReportFinished(UInt32 indexType, UInt32 index, Int32 opRes)) \
-  x(DoNeedArcProp(PROPID propID, Int32 *answer)) \
- 
-Z7_IFACE_CONSTR_ARCHIVE(IArchiveUpdateCallbackArcProp, 0x85)
-*/
 
 /*
 UpdateItems()
@@ -527,11 +478,14 @@ UpdateItems()
 */
 
 
-#define Z7_IFACEM_IOutArchive(x) \
-  x(UpdateItems(ISequentialOutStream *outStream, UInt32 numItems, IArchiveUpdateCallback *updateCallback)) \
-  x(GetFileTimeType(UInt32 *type))
+#define INTERFACE_IOutArchive(x) \
+  STDMETHOD(UpdateItems)(ISequentialOutStream *outStream, UInt32 numItems, IArchiveUpdateCallback *updateCallback) x; \
+  STDMETHOD(GetFileTimeType)(UInt32 *type) x;
 
-Z7_IFACE_CONSTR_ARCHIVE(IOutArchive, 0xA0)
+ARCHIVE_INTERFACE(IOutArchive, 0xA0)
+{
+  INTERFACE_IOutArchive(PURE)
+};
 
 
 /*
@@ -544,76 +498,31 @@ ISetProperties::SetProperties()
     VT_BSTR
 */
 
-#define Z7_IFACEM_ISetProperties(x) \
-  x(SetProperties(const wchar_t * const *names, const PROPVARIANT *values, UInt32 numProps))
-
-Z7_IFACE_CONSTR_ARCHIVE(ISetProperties, 0x03)
-
-#define Z7_IFACEM_IArchiveKeepModeForNextOpen(x) \
-  x(KeepModeForNextOpen()) \
+ARCHIVE_INTERFACE(ISetProperties, 0x03)
+{
+  STDMETHOD(SetProperties)(const wchar_t * const *names, const PROPVARIANT *values, UInt32 numProps) PURE;
+};
 
-Z7_IFACE_CONSTR_ARCHIVE(IArchiveKeepModeForNextOpen, 0x04)
+ARCHIVE_INTERFACE(IArchiveKeepModeForNextOpen, 0x04)
+{
+  STDMETHOD(KeepModeForNextOpen)() PURE;
+};
 
 /* Exe handler: the handler for executable format (PE, ELF, Mach-O).
    SFX archive: executable stub + some tail data.
      before 9.31: exe handler didn't parse SFX archives as executable format.
      for 9.31+: exe handler parses SFX archives as executable format, only if AllowTail(1) was called */
 
-#define Z7_IFACEM_IArchiveAllowTail(x) \
-  x(AllowTail(Int32 allowTail)) \
-
-Z7_IFACE_CONSTR_ARCHIVE(IArchiveAllowTail, 0x05)
-
-
-namespace NRequestMemoryUseFlags
+ARCHIVE_INTERFACE(IArchiveAllowTail, 0x05)
 {
-  const UInt32 k_AllowedSize_WasForced    = 1 << 0;  // (*allowedSize) was forced by -mmemx or -smemx
-  const UInt32 k_DefaultLimit_Exceeded    = 1 << 1;  // default limit of archive format was exceeded
-  const UInt32 k_MLimit_Exceeded          = 1 << 2;  // -mmemx value was exceeded
-  const UInt32 k_SLimit_Exceeded          = 1 << 3;  // -smemx value was exceeded
-  
-  const UInt32 k_NoErrorMessage           = 1 << 10; // do not show error message, and show only request
-  const UInt32 k_IsReport                 = 1 << 11; // only report is required, without user request
-  
-  const UInt32 k_SkipArc_IsExpected       = 1 << 12; // NRequestMemoryAnswerFlags::k_SkipArc flag answer is expected
-  const UInt32 k_Report_SkipArc           = 1 << 13; // report about SkipArc operation
-
-  // const UInt32 k_SkipBigFile_IsExpected   = 1 << 14; // NRequestMemoryAnswerFlags::k_SkipBigFiles flag answer is expected (unused)
-  // const UInt32 k_Report_SkipBigFile       = 1 << 15; // report about SkipFile operation (unused)
-
-  // const UInt32 k_SkipBigFiles_IsExpected  = 1 << 16; // NRequestMemoryAnswerFlags::k_SkipBigFiles flag answer is expected (unused)
-  // const UInt32 k_Report_SkipBigFiles      = 1 << 17; // report that all big files will be skipped (unused)
-}
+  STDMETHOD(AllowTail)(Int32 allowTail) PURE;
+};
 
-namespace NRequestMemoryAnswerFlags
-{
-  const UInt32 k_Allow          = 1 << 0;  // allow further archive extraction
-  const UInt32 k_Stop           = 1 << 1;  // for exit (and return_code == E_ABORT is used)
-  const UInt32 k_SkipArc        = 1 << 2;  // skip current archive extraction
-  // const UInt32 k_SkipBigFile    = 1 << 4;  // skip extracting of files that exceed limit (unused)
-  // const UInt32 k_SkipBigFiles   = 1 << 5;  // skip extracting of files that exceed limit (unused)
-  const UInt32 k_Limit_Exceeded  = 1 << 10;  // limit was exceeded
-}
 
-/*
-  *allowedSize is in/out:
-    in  : default allowed memory usage size or forced size, if it was changed by switch -mmemx.
-    out : value specified by user or unchanged value.
-
-  *answerFlags is in/out:
-    *answerFlags must be set by caller before calling for default action,
-
-  indexType : must be set with NEventIndexType::* constant
-          (indexType == kNoIndex), if request for whole archive.
-  index : must be set for some (indexType) types (if
-          fileIndex , if (indexType == NEventIndexType::kInArcIndex)
-          0, if       if (indexType == kNoIndex)
-  path : NULL can be used for any indexType.
-*/
-#define Z7_IFACEM_IArchiveRequestMemoryUseCallback(x) \
-  x(RequestMemoryUse(UInt32 flags, UInt32 indexType, UInt32 index, const wchar_t *path, \
-    UInt64 requiredSize, UInt64 *allowedSize, UInt32 *answerFlags))
-Z7_IFACE_CONSTR_ARCHIVE(IArchiveRequestMemoryUseCallback, 0x09)
+#define IMP_IInArchive_GetProp(k) \
+  (UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType) \
+    { if (index >= ARRAY_SIZE(k)) return E_INVALIDARG; \
+    *propID = k[index]; *varType = k7z_PROPID_To_VARTYPE[(unsigned)*propID];  *name = 0; return S_OK; } \
 
 
 struct CStatProp
@@ -629,69 +538,46 @@ namespace NCOM {
 BSTR AllocBstrFromAscii(const char *s) throw();
 }}
 
-
-#define IMP_IInArchive_GetProp_Base(fn, f, k) \
-  Z7_COM7F_IMF(CHandler::fn(UInt32 *numProps)) \
-    { *numProps = Z7_ARRAY_SIZE(k); return S_OK; } \
-  Z7_COM7F_IMF(CHandler::f(UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType)) \
-    { if (index >= Z7_ARRAY_SIZE(k)) return E_INVALIDARG; \
-
-#define IMP_IInArchive_GetProp_NO_NAME(fn, f, k) \
-  IMP_IInArchive_GetProp_Base(fn, f, k) \
-    *propID = k[index]; \
-    *varType = k7z_PROPID_To_VARTYPE[(unsigned)*propID]; \
-    *name = NULL; return S_OK; } \
-
-#define IMP_IInArchive_GetProp_WITH_NAME(fn, f, k) \
-  IMP_IInArchive_GetProp_Base(fn, f, k) \
+#define IMP_IInArchive_GetProp_WITH_NAME(k) \
+  (UInt32 index, BSTR *name, PROPID *propID, VARTYPE *varType) \
+    { if (index >= ARRAY_SIZE(k)) return E_INVALIDARG; \
     const CStatProp &prop = k[index]; \
-    *propID = (PROPID)prop.PropID; \
-    *varType = prop.vt; \
+    *propID = (PROPID)prop.PropID; *varType = prop.vt; \
     *name = NWindows::NCOM::AllocBstrFromAscii(prop.Name); return S_OK; } \
 
-
 #define IMP_IInArchive_Props \
-  IMP_IInArchive_GetProp_NO_NAME(GetNumberOfProperties, GetPropertyInfo, kProps)
+  STDMETHODIMP CHandler::GetNumberOfProperties(UInt32 *numProps) \
+    { *numProps = ARRAY_SIZE(kProps); return S_OK; } \
+  STDMETHODIMP CHandler::GetPropertyInfo IMP_IInArchive_GetProp(kProps)
 
 #define IMP_IInArchive_Props_WITH_NAME \
-  IMP_IInArchive_GetProp_WITH_NAME(GetNumberOfProperties, GetPropertyInfo, kProps)
+  STDMETHODIMP CHandler::GetNumberOfProperties(UInt32 *numProps) \
+    { *numProps = ARRAY_SIZE(kProps); return S_OK; } \
+  STDMETHODIMP CHandler::GetPropertyInfo IMP_IInArchive_GetProp_WITH_NAME(kProps)
+
 
 #define IMP_IInArchive_ArcProps \
-  IMP_IInArchive_GetProp_NO_NAME(GetNumberOfArchiveProperties, GetArchivePropertyInfo, kArcProps)
+  STDMETHODIMP CHandler::GetNumberOfArchiveProperties(UInt32 *numProps) \
+    { *numProps = ARRAY_SIZE(kArcProps); return S_OK; } \
+  STDMETHODIMP CHandler::GetArchivePropertyInfo IMP_IInArchive_GetProp(kArcProps)
 
 #define IMP_IInArchive_ArcProps_WITH_NAME \
-  IMP_IInArchive_GetProp_WITH_NAME(GetNumberOfArchiveProperties, GetArchivePropertyInfo, kArcProps)
+  STDMETHODIMP CHandler::GetNumberOfArchiveProperties(UInt32 *numProps) \
+    { *numProps = ARRAY_SIZE(kArcProps); return S_OK; } \
+  STDMETHODIMP CHandler::GetArchivePropertyInfo IMP_IInArchive_GetProp_WITH_NAME(kArcProps)
 
 #define IMP_IInArchive_ArcProps_NO_Table \
-  Z7_COM7F_IMF(CHandler::GetNumberOfArchiveProperties(UInt32 *numProps)) \
+  STDMETHODIMP CHandler::GetNumberOfArchiveProperties(UInt32 *numProps) \
     { *numProps = 0; return S_OK; } \
-  Z7_COM7F_IMF(CHandler::GetArchivePropertyInfo(UInt32, BSTR *, PROPID *, VARTYPE *)) \
+  STDMETHODIMP CHandler::GetArchivePropertyInfo(UInt32, BSTR *, PROPID *, VARTYPE *) \
     { return E_NOTIMPL; } \
 
 #define IMP_IInArchive_ArcProps_NO \
   IMP_IInArchive_ArcProps_NO_Table \
-  Z7_COM7F_IMF(CHandler::GetArchiveProperty(PROPID, PROPVARIANT *value)) \
+  STDMETHODIMP CHandler::GetArchiveProperty(PROPID, PROPVARIANT *value) \
     { value->vt = VT_EMPTY; return S_OK; }
 
 
-#define Z7_class_CHandler_final \
-        Z7_class_final(CHandler)
-
-
-#define Z7_CLASS_IMP_CHandler_IInArchive_0 \
-  Z7_CLASS_IMP_COM_1(CHandler, IInArchive)
-#define Z7_CLASS_IMP_CHandler_IInArchive_1(i1) \
-  Z7_CLASS_IMP_COM_2(CHandler, IInArchive, i1)
-#define Z7_CLASS_IMP_CHandler_IInArchive_2(i1, i2) \
-  Z7_CLASS_IMP_COM_3(CHandler, IInArchive, i1, i2)
-#define Z7_CLASS_IMP_CHandler_IInArchive_3(i1, i2, i3) \
-  Z7_CLASS_IMP_COM_4(CHandler, IInArchive, i1, i2, i3)
-#define Z7_CLASS_IMP_CHandler_IInArchive_4(i1, i2, i3, i4) \
-  Z7_CLASS_IMP_COM_5(CHandler, IInArchive, i1, i2, i3, i4)
-#define Z7_CLASS_IMP_CHandler_IInArchive_5(i1, i2, i3, i4, i5) \
-  Z7_CLASS_IMP_COM_6(CHandler, IInArchive, i1, i2, i3, i4, i5)
-
-
 
 #define k_IsArc_Res_NO   0
 #define k_IsArc_Res_YES  1
@@ -714,41 +600,9 @@ extern "C"
 
   typedef HRESULT (WINAPI *Func_SetCaseSensitive)(Int32 caseSensitive);
   typedef HRESULT (WINAPI *Func_SetLargePageMode)();
-  // typedef HRESULT (WINAPI *Func_SetClientVersion)(UInt32 version);
 
   typedef IOutArchive * (*Func_CreateOutArchive)();
   typedef IInArchive * (*Func_CreateInArchive)();
 }
 
-
-/*
-  if there is no time in archive, external MTime of archive
-  will be used instead of _item.Time from archive.
-  For 7-zip before 22.00 we need to return some supported value.
-  But (kpidTimeType > kDOS) is not allowed in 7-Zip before 22.00.
-  So we return highest precision value supported by old 7-Zip.
-  new 7-Zip 22.00 doesn't use that value in usual cases.
-*/
-
-
-#define DECLARE_AND_SET_CLIENT_VERSION_VAR
-#define GET_FileTimeType_NotDefined_for_GetFileTimeType \
-      NFileTimeType::kWindows
-
-/*
-extern UInt32 g_ClientVersion;
-
-#define GET_CLIENT_VERSION(major, minor)  \
-  ((UInt32)(((UInt32)(major) << 16) | (UInt32)(minor)))
-
-#define DECLARE_AND_SET_CLIENT_VERSION_VAR \
-  UInt32 g_ClientVersion = GET_CLIENT_VERSION(MY_VER_MAJOR, MY_VER_MINOR);
-
-#define GET_FileTimeType_NotDefined_for_GetFileTimeType \
-      ((UInt32)(g_ClientVersion >= GET_CLIENT_VERSION(22, 0) ? \
-        (UInt32)(Int32)NFileTimeType::kNotDefined : \
-        NFileTimeType::kWindows))
-*/
-
-Z7_PURE_INTERFACES_END
 #endif