commit 080abfcd35afaf5e8330d52a11e7b3b624e9451e
author Ove Kaaven <ovek@transgaming.com> Tue Sep 25 22:38:43 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Sep 25 22:38:43 2001 +0000
tree fee4fc33c8ce6cd0cd2b02b795c511f2b4c0d112
parent e0fa03695c2db4868c0c60a0db2334a4cce4d178

Added ICOM_[C]THIS_MULTI macros to make it easier to implement objects
that expose multiple interfaces. Added prototypes for CoGetPSClsid and
IUnknown_*_Proxy.

include/wine/obj_base.h

diff --git a/include/wine/obj_base.h b/include/wine/obj_base.h
index e355833..efa0714 100644
--- a/include/wine/obj_base.h
+++ b/include/wine/obj_base.h
@@ -584,8 +584,11 @@
 #endif /* ICOM_MSVTABLE_COMPAT */
 
 
-#define ICOM_THIS(impl,iface)          impl* const This=(impl*)iface
-#define ICOM_CTHIS(impl,iface)         const impl* const This=(const impl*)iface
+#define ICOM_THIS(impl,iface)          impl* const This=(impl*)(iface)
+#define ICOM_CTHIS(impl,iface)         const impl* const This=(const impl*)(iface)
+
+#define ICOM_THIS_MULTI(impl,field,iface)  impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))
+#define ICOM_CTHIS_MULTI(impl,field,iface) const impl* const This=(const impl*)((char*)(iface) - offsetof(impl,field))
 
 #endif /*ICOM_CINTERFACE  */
 
@@ -676,6 +679,10 @@
 #define IUnknown_AddRef(p)             ICOM_CALL (AddRef,p)
 #define IUnknown_Release(p)            ICOM_CALL (Release,p)
 
+HRESULT CALLBACK IUnknown_QueryInterface_Proxy(IUnknown *This,REFIID riid,LPVOID*ppvObj);
+ULONG   CALLBACK IUnknown_AddRef_Proxy(IUnknown *This);
+ULONG   CALLBACK IUnknown_Release_Proxy(IUnknown *This);
+
 /*****************************************************************************
  * IClassFactory interface
  */
@@ -797,6 +804,8 @@
 
 HRESULT WINAPI CoRevokeClassObject(DWORD dwRegister);
 
+HRESULT WINAPI CoGetPSClsid(REFIID riid,CLSID *pclsid);
+                    
 /*****************************************************************************
  *	COM Server dll - exports
  */