Commit 080abfcd authored by Ove Kaaven's avatar Ove Kaaven Committed by Alexandre Julliard

Added ICOM_[C]THIS_MULTI macros to make it easier to implement objects

that expose multiple interfaces. Added prototypes for CoGetPSClsid and IUnknown_*_Proxy.
parent e0fa0369
......@@ -584,8 +584,11 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax);
#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 @@ struct IUnknown {
#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 CoRegisterClassObject(REFCLSID rclsid,LPUNKNOWN pUnk,DWORD dwClsC
HRESULT WINAPI CoRevokeClassObject(DWORD dwRegister);
HRESULT WINAPI CoGetPSClsid(REFIID riid,CLSID *pclsid);
/*****************************************************************************
* COM Server dll - exports
*/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment