From 110af2d2db9861e3f65b13a9c03eb1f2b47c43db Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Sun, 24 Aug 2003 23:04:57 +0000 Subject: 2003-08-24 Danny Smith * include/objidl.h (COBJMACROS): Define macros only if using C interace. * include/unknwn.h: Ditto. * include/comcat.h: Ditto. 2003-08-24 Filip Navara * include/prsht.h (PSH_WIZARDHASFINISH, PSH_WIZARD_LITE, PSH_NOCONTEXTHELP): Define. (PSH_WIZARD97): Fix definition for _WIN32_IE >= 0x500. * include/winuser.h (DFCS_TRANSPARENT, DFCS_HOT): Define. (LPDLGTEMPLATE[AW]): Add typedefs. --- winsup/w32api/include/comcat.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'winsup/w32api/include/comcat.h') diff --git a/winsup/w32api/include/comcat.h b/winsup/w32api/include/comcat.h index 233d923fd..e264ac999 100644 --- a/winsup/w32api/include/comcat.h +++ b/winsup/w32api/include/comcat.h @@ -31,7 +31,8 @@ DECLARE_INTERFACE_(IEnumGUID,IUnknown) STDMETHOD(Clone)(THIS_ LPENUMGUID*) PURE; }; #undef INTERFACE -#ifdef COBJMACROS +#if (!defined (__cplusplus) || defined (CINTERFACE)) \ + && defined (COBJMACROS) #define IEnumGUID_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumGUID_AddRef(p) (p)->lpVtbl->AddRef(p) #define IEnumGUID_Release(p) (p)->lpVtbl->Release(p) @@ -103,7 +104,8 @@ DECLARE_INTERFACE_(ICatInformation,IUnknown) STDMETHOD(EnumReqCategoriesOfClass)(THIS_ REFCLSID,LPENUMCATID*) PURE; }; #undef INTERFACE -#ifdef COBJMACROS +#if (!defined (__cplusplus) || defined (CINTERFACE)) \ + && defined (COBJMACROS) #define ICatInformation_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICatInformation_AddRef(p) (p)->lpVtbl->AddRef(p) #define ICatInformation_Release(p) (p)->lpVtbl->Release(p) @@ -129,7 +131,8 @@ DECLARE_INTERFACE_(ICatRegister,IUnknown) STDMETHOD(UnRegisterClassReqCategories)(THIS_ REFCLSID,ULONG,CATID*) PURE; }; #undef INTERFACE -#ifdef COBJMACROS +#if (!defined (__cplusplus) || defined (CINTERFACE)) \ + && defined (COBJMACROS) #define ICatRegister_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICatRegister_AddRef(p) (p)->lpVtbl->AddRef(p) #define ICatRegister_Release(p) (p)->lpVtbl->Release(p) @@ -155,7 +158,8 @@ DECLARE_INTERFACE_(IEnumCATEGORYINFO,IUnknown) STDMETHOD(Clone)(THIS_ LPENUMCATEGORYINFO*) PURE; }; #undef INTERFACE -#ifdef COBJMACROS +#if (!defined (__cplusplus) || defined (CINTERFACE)) \ + && defined (COBJMACROS) #define IEnumCATEGORYINFO_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumCATEGORYINFO_AddRef(p) (p)->lpVtbl->AddRef(p) #define IEnumCATEGORYINFO_Release(p) (p)->lpVtbl->Release(p) -- cgit v1.2.3