react-native-update 10.34.3 → 10.34.4

package/harmony/pushy/src/main/cpp/lzma/CPP/Common/MyCom.h

@@ -1,10 +1,13 @@
 // MyCom.h
 
-#ifndef ZIP7_INC_MY_COM_H
-#define ZIP7_INC_MY_COM_H
+#ifndef __MY_COM_H
+#define __MY_COM_H
 
 #include "MyWindows.h"
-#include "MyTypes.h"
+
+#ifndef RINOK
+#define RINOK(x) { HRESULT __result_ = (x); if (__result_ != S_OK) return __result_; }
+#endif
 
 template <class T>
 class CMyComPtr
@@ -17,7 +20,6 @@ public:
   ~CMyComPtr() { if (_p) _p->Release(); }
   void Release() { if (_p) { _p->Release(); _p = NULL; } }
   operator T*() const {  return (T*)_p;  }
-  T* Interface() const {  return (T*)_p;  }
   // T& operator*() const {  return *_p; }
   T** operator&() { return &_p; }
   T* operator->() const { return _p; }
@@ -64,121 +66,10 @@ public:
   template <class Q>
   HRESULT QueryInterface(REFGUID iid, Q** pp) const throw()
   {
-    // if (*pp) throw 20220216; // for debug
     return _p->QueryInterface(iid, (void**)pp);
   }
 };
 
-
-template <class iface, class cls>
-class CMyComPtr2
-{
-  cls* _p;
-  
-  CMyComPtr2(const CMyComPtr2<iface, cls>& lp);
-  CMyComPtr2(cls* p);
-  CMyComPtr2(iface* p);
-  iface* operator=(const CMyComPtr2<iface, cls>& lp);
-  iface* operator=(cls* p);
-  iface* operator=(iface* p);
-public:
-  CMyComPtr2(): _p(NULL) {}
-  ~CMyComPtr2()
-  {
-    if (_p)
-    {
-      iface *ip = _p;
-      ip->Release();
-    }
-  }
-  // void Release() { if (_p) { (iface *)_p->Release(); _p = NULL; } }
-  cls* operator->() const { return _p; }
-  cls* ClsPtr() const { return _p; }
-  operator iface*() const
-  {
-    iface *ip = _p;
-    return ip;
-  }
-  iface* Interface() const
-  {
-    iface *ip = _p;
-    return ip;
-  }
-  // operator bool() const {  return _p != NULL; }
-  bool IsDefined() const {  return _p != NULL; }
-  void Create_if_Empty()
-  {
-    if (!_p)
-    {
-      _p = new cls;
-      iface *ip = _p;
-      ip->AddRef();
-    }
-  }
-  iface* Detach()
-  {
-    iface *ip = _p;
-    _p = NULL;
-    return ip;
-  }
-  void SetFromCls(cls *src)
-  {
-    if (src)
-    {
-      iface *ip = src;
-      ip->AddRef();
-    }
-    if (_p)
-    {
-      iface *ip = _p;
-      ip->Release();
-    }
-    _p = src;
-  }
-};
-
-
-template <class iface, class cls>
-class CMyComPtr2_Create
-{
-  cls* _p;
-
-  CMyComPtr2_Create(const CMyComPtr2_Create<iface, cls>& lp);
-  CMyComPtr2_Create(cls* p);
-  CMyComPtr2_Create(iface* p);
-  iface* operator=(const CMyComPtr2_Create<iface, cls>& lp);
-  iface* operator=(cls* p);
-  iface* operator=(iface* p);
-public:
-  CMyComPtr2_Create(): _p(new cls)
-  {
-    iface *ip = _p;
-    ip->AddRef();
-  }
-  ~CMyComPtr2_Create()
-  {
-    iface *ip = _p;
-    ip->Release();
-  }
-  cls* operator->() const { return _p; }
-  cls* ClsPtr() const { return _p; }
-  operator iface*() const
-  {
-    iface *ip = _p;
-    return ip;
-  }
-  iface* Interface() const
-  {
-    iface *ip = _p;
-    return ip;
-  }
-};
-
-
-#define Z7_DECL_CMyComPtr_QI_FROM(i, v, unk) \
-  CMyComPtr<i> v; (unk)->QueryInterface(IID_ ## i, (void **)&v);
-
-
 //////////////////////////////////////////////////////////
 
 inline HRESULT StringToBstr(LPCOLESTR src, BSTR *bstr)
@@ -190,7 +81,7 @@ inline HRESULT StringToBstr(LPCOLESTR src, BSTR *bstr)
 class CMyComBSTR
 {
   BSTR m_str;
-  Z7_CLASS_NO_COPY(CMyComBSTR)
+
 public:
   CMyComBSTR(): m_str(NULL) {}
   ~CMyComBSTR() { ::SysFreeString(m_str); }
@@ -198,23 +89,13 @@ public:
   operator LPCOLESTR() const { return m_str; }
   // operator bool() const { return m_str != NULL; }
   // bool operator!() const { return m_str == NULL; }
-
-  void Wipe_and_Free()
-  {
-    if (m_str)
-    {
-      memset(m_str, 0, ::SysStringLen(m_str) * sizeof(*m_str));
-      Empty();
-    }
-  }
-
 private:
   // operator BSTR() const { return m_str; }
 
   CMyComBSTR(LPCOLESTR src) { m_str = ::SysAllocString(src); }
   // CMyComBSTR(int nSize) { m_str = ::SysAllocStringLen(NULL, nSize); }
   // CMyComBSTR(int nSize, LPCOLESTR sz) { m_str = ::SysAllocStringLen(sz, nSize);  }
-  // CMyComBSTR(const CMyComBSTR& src) { m_str = src.MyCopy(); }
+  CMyComBSTR(const CMyComBSTR& src) { m_str = src.MyCopy(); }
   
   /*
   CMyComBSTR(REFGUID src)
@@ -226,7 +107,6 @@ private:
   }
   */
   
-  /*
   CMyComBSTR& operator=(const CMyComBSTR& src)
   {
     if (m_str != src.m_str)
@@ -237,7 +117,6 @@ private:
     }
     return *this;
   }
-  */
   
   CMyComBSTR& operator=(LPCOLESTR src)
   {
@@ -279,415 +158,120 @@ private:
 };
 
 
-class CMyComBSTR_Wipe: public CMyComBSTR
-{
-  Z7_CLASS_NO_COPY(CMyComBSTR_Wipe)
-public:
-  CMyComBSTR_Wipe(): CMyComBSTR() {}
-  ~CMyComBSTR_Wipe() { Wipe_and_Free(); }
-};
-
-
 
 /*
   If CMyUnknownImp doesn't use virtual destructor, the code size is smaller.
   But if some class_1 derived from CMyUnknownImp
-    uses Z7_COM_ADDREF_RELEASE and IUnknown::Release()
+    uses MY_ADDREF_RELEASE and IUnknown::Release()
     and some another class_2 is derived from class_1,
     then class_1 must use virtual destructor:
       virtual ~class_1();
     In that case, class_1::Release() calls correct destructor of class_2.
-  We can use virtual ~CMyUnknownImp() to disable warning
+
+  Also you can use virtual ~CMyUnknownImp(), if you want to disable warning
     "class has virtual functions, but destructor is not virtual".
-  Also we can use virtual ~IUnknown() {} in MyWindows.h
 */
 
 class CMyUnknownImp
 {
-  Z7_CLASS_NO_COPY(CMyUnknownImp)
-protected:
-  ULONG _m_RefCount;
-  CMyUnknownImp(): _m_RefCount(0) {}
+public:
+  ULONG __m_RefCount;
+  CMyUnknownImp(): __m_RefCount(0) {}
 
-  #ifdef _WIN32
-  #if defined(__GNUC__) || defined(__clang__)
-  // virtual ~CMyUnknownImp() {} // to disable GCC/CLANG varnings
-  #endif
-  #endif
+  // virtual
+  ~CMyUnknownImp() {}
 };
 
 
 
-#define Z7_COM_QI_BEGIN \
-  private: STDMETHOD(QueryInterface) (REFGUID iid, void **outObject) throw() Z7_override Z7_final \
-    { *outObject = NULL;
-
-#define Z7_COM_QI_ENTRY(i) \
-  else if (iid == IID_ ## i) \
-    { i *ti = this;  *outObject = ti; }
-//   { *outObject = (void *)(i *)this; }
-
-#define Z7_COM_QI_ENTRY_UNKNOWN_0 \
-  if (iid == IID_IUnknown) \
-    { IUnknown *tu = this;  *outObject = tu; }
-
-#define Z7_COM_QI_ENTRY_UNKNOWN(i) \
-  if (iid == IID_IUnknown) \
-    { i *ti = this;  IUnknown *tu = ti;  *outObject = tu; }
-//    { *outObject = (void *)(IUnknown *)(i *)this; }
-
-#define Z7_COM_QI_BEGIN2(i) \
-  Z7_COM_QI_BEGIN \
-  Z7_COM_QI_ENTRY_UNKNOWN(i) \
-  Z7_COM_QI_ENTRY(i)
+#define MY_QUERYINTERFACE_BEGIN STDMETHOD(QueryInterface) \
+(REFGUID iid, void **outObject) throw() { *outObject = NULL;
 
+#define MY_QUERYINTERFACE_ENTRY(i) else if (iid == IID_ ## i) \
+    { *outObject = (void *)(i *)this; }
 
-#define Z7_COM_ADDREF_RELEASE_MT \
-  private: \
-  STDMETHOD_(ULONG, AddRef)() Z7_override Z7_final \
-    { return (ULONG)InterlockedIncrement((LONG *)&_m_RefCount); } \
-  STDMETHOD_(ULONG, Release)() Z7_override Z7_final \
-    { const LONG v = InterlockedDecrement((LONG *)&_m_RefCount); \
-      if (v != 0) return (ULONG)v; \
-      delete this;  return 0; }
+#define MY_QUERYINTERFACE_ENTRY_UNKNOWN(i) if (iid == IID_IUnknown) \
+    { *outObject = (void *)(IUnknown *)(i *)this; }
 
-#define Z7_COM_QI_END_MT \
-  else return E_NOINTERFACE; \
-  InterlockedIncrement((LONG *)&_m_RefCount); /* AddRef(); */ return S_OK; }
+#define MY_QUERYINTERFACE_BEGIN2(i) MY_QUERYINTERFACE_BEGIN \
+    MY_QUERYINTERFACE_ENTRY_UNKNOWN(i) \
+    MY_QUERYINTERFACE_ENTRY(i)
 
-// you can define Z7_COM_USE_ATOMIC,
-// if you want to call Release() from different threads (for example, for .NET code)
-// #define Z7_COM_USE_ATOMIC
+#define MY_QUERYINTERFACE_END else return E_NOINTERFACE; ++__m_RefCount; /* AddRef(); */ return S_OK; }
 
-#if defined(Z7_COM_USE_ATOMIC) && !defined(Z7_ST)
+#define MY_ADDREF_RELEASE \
+STDMETHOD_(ULONG, AddRef)() throw() { return ++__m_RefCount; } \
+STDMETHOD_(ULONG, Release)() { if (--__m_RefCount != 0)  \
+  return __m_RefCount; delete this; return 0; }
 
-#ifndef _WIN32
-#if 0
-#include "../../C/Threads.h"
-#else
-EXTERN_C_BEGIN
-LONG InterlockedIncrement(LONG volatile *addend);
-LONG InterlockedDecrement(LONG volatile *addend);
-EXTERN_C_END
-#endif
-#endif // _WIN32
-
-#define Z7_COM_ADDREF_RELEASE  Z7_COM_ADDREF_RELEASE_MT
-#define Z7_COM_QI_END          Z7_COM_QI_END_MT
-
-#else // !Z7_COM_USE_ATOMIC
-
-#define Z7_COM_ADDREF_RELEASE \
-  private: \
-  STDMETHOD_(ULONG, AddRef)() throw() Z7_override Z7_final \
-    { return ++_m_RefCount; } \
-  STDMETHOD_(ULONG, Release)() throw() Z7_override Z7_final \
-    { if (--_m_RefCount != 0) return _m_RefCount; \
-      delete this;  return 0; }
-
-#define Z7_COM_QI_END \
-  else return E_NOINTERFACE; \
-  ++_m_RefCount; /* AddRef(); */ return S_OK; }
-
-#endif // !Z7_COM_USE_ATOMIC
-
-
-#define Z7_COM_UNKNOWN_IMP_SPEC(i) \
-  Z7_COM_QI_BEGIN \
+#define MY_UNKNOWN_IMP_SPEC(i) \
+  MY_QUERYINTERFACE_BEGIN \
   i \
-  Z7_COM_QI_END \
-  Z7_COM_ADDREF_RELEASE
-
+  MY_QUERYINTERFACE_END \
+  MY_ADDREF_RELEASE
 
-#define Z7_COM_UNKNOWN_IMP_0 \
-  Z7_COM_QI_BEGIN \
-  Z7_COM_QI_ENTRY_UNKNOWN_0 \
-  Z7_COM_QI_END \
-  Z7_COM_ADDREF_RELEASE
 
-#define Z7_COM_UNKNOWN_IMP_1(i) \
-  Z7_COM_UNKNOWN_IMP_SPEC( \
-  Z7_COM_QI_ENTRY_UNKNOWN(i) \
-  Z7_COM_QI_ENTRY(i) \
-  )
+#define MY_UNKNOWN_IMP MY_QUERYINTERFACE_BEGIN \
+  MY_QUERYINTERFACE_ENTRY_UNKNOWN(IUnknown) \
+  MY_QUERYINTERFACE_END \
+  MY_ADDREF_RELEASE
 
-#define Z7_COM_UNKNOWN_IMP_2(i1, i2) \
-  Z7_COM_UNKNOWN_IMP_SPEC( \
-  Z7_COM_QI_ENTRY_UNKNOWN(i1) \
-  Z7_COM_QI_ENTRY(i1) \
-  Z7_COM_QI_ENTRY(i2) \
+#define MY_UNKNOWN_IMP1(i) MY_UNKNOWN_IMP_SPEC( \
+  MY_QUERYINTERFACE_ENTRY_UNKNOWN(i) \
+  MY_QUERYINTERFACE_ENTRY(i) \
   )
 
-#define Z7_COM_UNKNOWN_IMP_3(i1, i2, i3) \
-  Z7_COM_UNKNOWN_IMP_SPEC( \
-  Z7_COM_QI_ENTRY_UNKNOWN(i1) \
-  Z7_COM_QI_ENTRY(i1) \
-  Z7_COM_QI_ENTRY(i2) \
-  Z7_COM_QI_ENTRY(i3) \
+#define MY_UNKNOWN_IMP2(i1, i2) MY_UNKNOWN_IMP_SPEC( \
+  MY_QUERYINTERFACE_ENTRY_UNKNOWN(i1) \
+  MY_QUERYINTERFACE_ENTRY(i1) \
+  MY_QUERYINTERFACE_ENTRY(i2) \
   )
 
-#define Z7_COM_UNKNOWN_IMP_4(i1, i2, i3, i4) \
-  Z7_COM_UNKNOWN_IMP_SPEC( \
-  Z7_COM_QI_ENTRY_UNKNOWN(i1) \
-  Z7_COM_QI_ENTRY(i1) \
-  Z7_COM_QI_ENTRY(i2) \
-  Z7_COM_QI_ENTRY(i3) \
-  Z7_COM_QI_ENTRY(i4) \
+#define MY_UNKNOWN_IMP3(i1, i2, i3) MY_UNKNOWN_IMP_SPEC( \
+  MY_QUERYINTERFACE_ENTRY_UNKNOWN(i1) \
+  MY_QUERYINTERFACE_ENTRY(i1) \
+  MY_QUERYINTERFACE_ENTRY(i2) \
+  MY_QUERYINTERFACE_ENTRY(i3) \
   )
 
-#define Z7_COM_UNKNOWN_IMP_5(i1, i2, i3, i4, i5) \
-  Z7_COM_UNKNOWN_IMP_SPEC( \
-  Z7_COM_QI_ENTRY_UNKNOWN(i1) \
-  Z7_COM_QI_ENTRY(i1) \
-  Z7_COM_QI_ENTRY(i2) \
-  Z7_COM_QI_ENTRY(i3) \
-  Z7_COM_QI_ENTRY(i4) \
-  Z7_COM_QI_ENTRY(i5) \
+#define MY_UNKNOWN_IMP4(i1, i2, i3, i4) MY_UNKNOWN_IMP_SPEC( \
+  MY_QUERYINTERFACE_ENTRY_UNKNOWN(i1) \
+  MY_QUERYINTERFACE_ENTRY(i1) \
+  MY_QUERYINTERFACE_ENTRY(i2) \
+  MY_QUERYINTERFACE_ENTRY(i3) \
+  MY_QUERYINTERFACE_ENTRY(i4) \
   )
 
-#define Z7_COM_UNKNOWN_IMP_6(i1, i2, i3, i4, i5, i6) \
-  Z7_COM_UNKNOWN_IMP_SPEC( \
-  Z7_COM_QI_ENTRY_UNKNOWN(i1) \
-  Z7_COM_QI_ENTRY(i1) \
-  Z7_COM_QI_ENTRY(i2) \
-  Z7_COM_QI_ENTRY(i3) \
-  Z7_COM_QI_ENTRY(i4) \
-  Z7_COM_QI_ENTRY(i5) \
-  Z7_COM_QI_ENTRY(i6) \
+#define MY_UNKNOWN_IMP5(i1, i2, i3, i4, i5) MY_UNKNOWN_IMP_SPEC( \
+  MY_QUERYINTERFACE_ENTRY_UNKNOWN(i1) \
+  MY_QUERYINTERFACE_ENTRY(i1) \
+  MY_QUERYINTERFACE_ENTRY(i2) \
+  MY_QUERYINTERFACE_ENTRY(i3) \
+  MY_QUERYINTERFACE_ENTRY(i4) \
+  MY_QUERYINTERFACE_ENTRY(i5) \
   )
 
-#define Z7_COM_UNKNOWN_IMP_7(i1, i2, i3, i4, i5, i6, i7) \
-  Z7_COM_UNKNOWN_IMP_SPEC( \
-  Z7_COM_QI_ENTRY_UNKNOWN(i1) \
-  Z7_COM_QI_ENTRY(i1) \
-  Z7_COM_QI_ENTRY(i2) \
-  Z7_COM_QI_ENTRY(i3) \
-  Z7_COM_QI_ENTRY(i4) \
-  Z7_COM_QI_ENTRY(i5) \
-  Z7_COM_QI_ENTRY(i6) \
-  Z7_COM_QI_ENTRY(i7) \
+#define MY_UNKNOWN_IMP6(i1, i2, i3, i4, i5, i6) MY_UNKNOWN_IMP_SPEC( \
+  MY_QUERYINTERFACE_ENTRY_UNKNOWN(i1) \
+  MY_QUERYINTERFACE_ENTRY(i1) \
+  MY_QUERYINTERFACE_ENTRY(i2) \
+  MY_QUERYINTERFACE_ENTRY(i3) \
+  MY_QUERYINTERFACE_ENTRY(i4) \
+  MY_QUERYINTERFACE_ENTRY(i5) \
+  MY_QUERYINTERFACE_ENTRY(i6) \
   )
 
-#define Z7_COM_UNKNOWN_IMP_8(i1, i2, i3, i4, i5, i6, i7, i8) \
-  Z7_COM_UNKNOWN_IMP_SPEC( \
-  Z7_COM_QI_ENTRY_UNKNOWN(i1) \
-  Z7_COM_QI_ENTRY(i1) \
-  Z7_COM_QI_ENTRY(i2) \
-  Z7_COM_QI_ENTRY(i3) \
-  Z7_COM_QI_ENTRY(i4) \
-  Z7_COM_QI_ENTRY(i5) \
-  Z7_COM_QI_ENTRY(i6) \
-  Z7_COM_QI_ENTRY(i7) \
-  Z7_COM_QI_ENTRY(i8) \
+#define MY_UNKNOWN_IMP7(i1, i2, i3, i4, i5, i6, i7) MY_UNKNOWN_IMP_SPEC( \
+  MY_QUERYINTERFACE_ENTRY_UNKNOWN(i1) \
+  MY_QUERYINTERFACE_ENTRY(i1) \
+  MY_QUERYINTERFACE_ENTRY(i2) \
+  MY_QUERYINTERFACE_ENTRY(i3) \
+  MY_QUERYINTERFACE_ENTRY(i4) \
+  MY_QUERYINTERFACE_ENTRY(i5) \
+  MY_QUERYINTERFACE_ENTRY(i6) \
+  MY_QUERYINTERFACE_ENTRY(i7) \
   )
 
-
-#define Z7_IFACES_IMP_UNK_1(i1) \
-  Z7_COM_UNKNOWN_IMP_1(i1) \
-  Z7_IFACE_COM7_IMP(i1) \
-
-#define Z7_IFACES_IMP_UNK_2(i1, i2) \
-  Z7_COM_UNKNOWN_IMP_2(i1, i2) \
-  Z7_IFACE_COM7_IMP(i1) \
-  Z7_IFACE_COM7_IMP(i2) \
-
-#define Z7_IFACES_IMP_UNK_3(i1, i2, i3) \
-  Z7_COM_UNKNOWN_IMP_3(i1, i2, i3) \
-  Z7_IFACE_COM7_IMP(i1) \
-  Z7_IFACE_COM7_IMP(i2) \
-  Z7_IFACE_COM7_IMP(i3) \
-
-#define Z7_IFACES_IMP_UNK_4(i1, i2, i3, i4) \
-  Z7_COM_UNKNOWN_IMP_4(i1, i2, i3, i4) \
-  Z7_IFACE_COM7_IMP(i1) \
-  Z7_IFACE_COM7_IMP(i2) \
-  Z7_IFACE_COM7_IMP(i3) \
-  Z7_IFACE_COM7_IMP(i4) \
-
-#define Z7_IFACES_IMP_UNK_5(i1, i2, i3, i4, i5) \
-  Z7_COM_UNKNOWN_IMP_5(i1, i2, i3, i4, i5) \
-  Z7_IFACE_COM7_IMP(i1) \
-  Z7_IFACE_COM7_IMP(i2) \
-  Z7_IFACE_COM7_IMP(i3) \
-  Z7_IFACE_COM7_IMP(i4) \
-  Z7_IFACE_COM7_IMP(i5) \
-
-#define Z7_IFACES_IMP_UNK_6(i1, i2, i3, i4, i5, i6) \
-  Z7_COM_UNKNOWN_IMP_6(i1, i2, i3, i4, i5, i6) \
-  Z7_IFACE_COM7_IMP(i1) \
-  Z7_IFACE_COM7_IMP(i2) \
-  Z7_IFACE_COM7_IMP(i3) \
-  Z7_IFACE_COM7_IMP(i4) \
-  Z7_IFACE_COM7_IMP(i5) \
-  Z7_IFACE_COM7_IMP(i6) \
-
-#define Z7_IFACES_IMP_UNK_7(i1, i2, i3, i4, i5, i6, i7) \
-  Z7_COM_UNKNOWN_IMP_7(i1, i2, i3, i4, i5, i6, i7) \
-  Z7_IFACE_COM7_IMP(i1) \
-  Z7_IFACE_COM7_IMP(i2) \
-  Z7_IFACE_COM7_IMP(i3) \
-  Z7_IFACE_COM7_IMP(i4) \
-  Z7_IFACE_COM7_IMP(i5) \
-  Z7_IFACE_COM7_IMP(i6) \
-  Z7_IFACE_COM7_IMP(i7) \
-
-
-#define Z7_CLASS_IMP_COM_0(c) \
-  Z7_class_final(c) : \
-  public IUnknown, \
-  public CMyUnknownImp { \
-  Z7_COM_UNKNOWN_IMP_0 \
-  private:
-
-#define Z7_CLASS_IMP_COM_1(c, i1) \
-  Z7_class_final(c) : \
-  public i1, \
-  public CMyUnknownImp { \
-  Z7_IFACES_IMP_UNK_1(i1) \
-  private:
-
-#define Z7_CLASS_IMP_COM_2(c, i1, i2) \
-  Z7_class_final(c) : \
-  public i1, \
-  public i2, \
-  public CMyUnknownImp { \
-  Z7_IFACES_IMP_UNK_2(i1, i2) \
-  private:
-
-#define Z7_CLASS_IMP_COM_3(c, i1, i2, i3) \
-  Z7_class_final(c) : \
-  public i1, \
-  public i2, \
-  public i3, \
-  public CMyUnknownImp { \
-  Z7_IFACES_IMP_UNK_3(i1, i2, i3) \
-  private:
-
-#define Z7_CLASS_IMP_COM_4(c, i1, i2, i3, i4) \
-  Z7_class_final(c) : \
-  public i1, \
-  public i2, \
-  public i3, \
-  public i4, \
-  public CMyUnknownImp { \
-  Z7_IFACES_IMP_UNK_4(i1, i2, i3, i4) \
-  private:
-
-#define Z7_CLASS_IMP_COM_5(c, i1, i2, i3, i4, i5) \
-  Z7_class_final(c) : \
-  public i1, \
-  public i2, \
-  public i3, \
-  public i4, \
-  public i5, \
-  public CMyUnknownImp { \
-  Z7_IFACES_IMP_UNK_5(i1, i2, i3, i4, i5) \
-  private:
-
-#define Z7_CLASS_IMP_COM_6(c, i1, i2, i3, i4, i5, i6) \
-  Z7_class_final(c) : \
-  public i1, \
-  public i2, \
-  public i3, \
-  public i4, \
-  public i5, \
-  public i6, \
-  public CMyUnknownImp { \
-  Z7_IFACES_IMP_UNK_6(i1, i2, i3, i4, i5, i6) \
-  private:
-
-
-#define Z7_CLASS_IMP_COM_7(c, i1, i2, i3, i4, i5, i6, i7) \
-  Z7_class_final(c) : \
-  public i1, \
-  public i2, \
-  public i3, \
-  public i4, \
-  public i5, \
-  public i6, \
-  public i7, \
-  public CMyUnknownImp { \
-  Z7_IFACES_IMP_UNK_7(i1, i2, i3, i4, i5, i6, i7) \
-  private:
-
-
-/*
-#define Z7_CLASS_IMP_NOQIB_0(c) \
-  Z7_class_final(c) : \
-  public IUnknown, \
-  public CMyUnknownImp { \
-  Z7_COM_UNKNOWN_IMP_0 \
-  private:
-*/
-
-#define Z7_CLASS_IMP_NOQIB_1(c, i1) \
-  Z7_class_final(c) : \
-  public i1, \
-  public CMyUnknownImp { \
-  Z7_COM_UNKNOWN_IMP_0 \
-  Z7_IFACE_COM7_IMP(i1) \
-  private:
-
-#define Z7_CLASS_IMP_NOQIB_2(c, i1, i2) \
-  Z7_class_final(c) : \
-  public i1, \
-  public i2, \
-  public CMyUnknownImp { \
-  Z7_COM_UNKNOWN_IMP_1(i2) \
-  Z7_IFACE_COM7_IMP(i1) \
-  Z7_IFACE_COM7_IMP(i2) \
-  private:
-
-#define Z7_CLASS_IMP_NOQIB_3(c, i1, i2, i3) \
-  Z7_class_final(c) : \
-  public i1, \
-  public i2, \
-  public i3, \
-  public CMyUnknownImp { \
-  Z7_COM_UNKNOWN_IMP_2(i2, i3) \
-  Z7_IFACE_COM7_IMP(i1) \
-  Z7_IFACE_COM7_IMP(i2) \
-  Z7_IFACE_COM7_IMP(i3) \
-  private:
-
-#define Z7_CLASS_IMP_NOQIB_4(c, i1, i2, i3, i4) \
-  Z7_class_final(c) : \
-  public i1, \
-  public i2, \
-  public i3, \
-  public i4, \
-  public CMyUnknownImp { \
-  Z7_COM_UNKNOWN_IMP_3(i2, i3, i4) \
-  Z7_IFACE_COM7_IMP(i1) \
-  Z7_IFACE_COM7_IMP(i2) \
-  Z7_IFACE_COM7_IMP(i3) \
-  Z7_IFACE_COM7_IMP(i4) \
-
-/*
-#define Z7_CLASS_IMP_NOQIB_5(c, i1, i2, i3, i4, i5) \
-  Z7_class_final(c) : \
-  public i1, \
-  public i2, \
-  public i3, \
-  public i4, \
-  public i5, \
-  public CMyUnknownImp { \
-  Z7_COM_UNKNOWN_IMP_4(i2, i3, i4, i5) \
-  Z7_IFACE_COM7_IMP(i1) \
-  Z7_IFACE_COM7_IMP(i2) \
-  Z7_IFACE_COM7_IMP(i3) \
-  Z7_IFACE_COM7_IMP(i4) \
-  Z7_IFACE_COM7_IMP(i5) \
-*/
-
-
-#define Z7_CLASS_IMP_IInStream(c) \
-  class c Z7_final : \
-  public IInStream, \
-  public CMyUnknownImp { \
-  Z7_IFACES_IMP_UNK_2(ISequentialInStream, IInStream) \
-
-
-#define k_My_HRESULT_WritingWasCut 0x20000010
+const HRESULT k_My_HRESULT_WritingWasCut = 0x20000010;
 
 #endif

package/harmony/pushy/src/main/cpp/lzma/CPP/Common/MyException.h

@@ -1,7 +1,7 @@
 // Common/Exception.h
 
-#ifndef ZIP7_INC_COMMON_EXCEPTION_H
-#define ZIP7_INC_COMMON_EXCEPTION_H
+#ifndef __COMMON_EXCEPTION_H
+#define __COMMON_EXCEPTION_H
 
 #include "MyWindows.h"