From 8ea817cb14eb0e2a21aff6632374accabe525a25 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Thu, 26 Aug 2010 02:13:12 +0000 Subject: [PATCH] 2010-08-25 Ali Sabil * include/ocidl.h: Define COBJMACROS for IPropertyBag and IPropertyBag2. --- winsup/w32api/ChangeLog | 4 ++++ winsup/w32api/include/ocidl.h | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index d3db8878c..87794947f 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,7 @@ +2010-08-25 Ali Sabil + + * include/ocidl.h: Define COBJMACROS for IPropertyBag and IPropertyBag2. + 2010-08-25 Chris Sutcliffe * include/shlwapi (ASSOCDATA): Update definition. diff --git a/winsup/w32api/include/ocidl.h b/winsup/w32api/include/ocidl.h index 79f6b43d4..66436deed 100644 --- a/winsup/w32api/include/ocidl.h +++ b/winsup/w32api/include/ocidl.h @@ -217,6 +217,14 @@ DECLARE_INTERFACE_(IPropertyBag,IUnknown) }; #undef INTERFACE +#ifdef COBJMACROS +#define IPropertyBag_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IPropertyBag_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IPropertyBag_Release(T) (T)->lpVtbl->Release(T) +#define IPropertyBag_Read(T,a,b,c) (T)->lpVtbl->Read(T,a,b,c) +#define IPropertyBag_Write(T,a,b) (T)->lpVtbl->Write(T,a,b) +#endif + EXTERN_C const IID IID_IPropertyBag2; #define INTERFACE IPropertyBag2 DECLARE_INTERFACE_(IPropertyBag2,IUnknown) @@ -232,6 +240,17 @@ DECLARE_INTERFACE_(IPropertyBag2,IUnknown) }; #undef INTERFACE +#ifdef COBJMACROS +#define IPropertyBag2_QueryInterface(T,a,b) (T)->lpVtbl->QueryInterface(T,a,b) +#define IPropertyBag2_AddRef(T) (T)->lpVtbl->AddRef(T) +#define IPropertyBag2_Release(T) (T)->lpVtbl->Release(T) +#define IPropertyBag2_Read(T,a,b,c,d,e) (T)->lpVtbl->Read(T,a,b,c,d,e) +#define IPropertyBag2_Write(T,a,b,c) (T)->lpVtbl->Write(T,a,b,c) +#define IPropertyBag2_CountProperties(T,a) (T)->lpVtbl->CountProperties(T,a) +#define IPropertyBag2_GetPropertyInfo(T,a,b,c,d) (T)->lpVtbl->GetPropertyInfo(T,a,b,c,d) +#define IPropertyBag2_LoadObject(T,a,b,c,d) (T)->lpVtbl->LoadObject(T,a,b,c,d) +#endif + EXTERN_C const IID IID_IPersistPropertyBag; #define INTERFACE IPersistPropertyBag DECLARE_INTERFACE_(IPersistPropertyBag,IPersist)