commit 55379110c5b03ade998a764b8a42c01b6dae75f1
author Alexandre Julliard <julliard@winehq.org> Thu Apr 10 21:13:58 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Apr 10 21:13:58 2003 +0000
tree eea7d94dfc5eb72c7d5081c9e65a9533209b3fd8
parent 6d1f9b037de66f0587911b367f07d2269cf00d37

Get rid of the ICOM_CALL macros.

include/shlwapi.h

diff --git a/include/shlwapi.h b/include/shlwapi.h
index 0480fe9..918238f 100644
--- a/include/shlwapi.h
+++ b/include/shlwapi.h
@@ -256,14 +256,16 @@
 ICOM_DEFINE(IQueryAssociations,IUnknown)
 #undef INTERFACE
 
-#define IQueryAssociations_QueryInterface(p,a,b)   ICOM_CALL2(QueryInterface,p,a,b)
-#define IQueryAssociations_AddRef(p)               ICOM_CALL(AddRef,p)
-#define IQueryAssociations_Release(p)              ICOM_CALL(Release,p)
-#define IQueryAssociations_Init(p,a,b,c,d)         ICOM_CALL4(Init,p,a,b,c,d)
-#define IQueryAssociations_GetString(p,a,b,c,d,e)  ICOM_CALL5(GetString,p,a,b,c,d,e)
-#define IQueryAssociations_GetKey(p,a,b,c,d)       ICOM_CALL4(GetKey,p,a,b,c,d)
-#define IQueryAssociations_GetData(p,a,b,c,d,e)    ICOM_CALL5(GetData,p,a,b,c,d,e)
-#define IQueryAssociations_GetEnum(p,a,b,c,d,e)    ICOM_CALL5(GetEnum,p,a,b,c,d,e)
+#ifdef COBJMACROS
+#define IQueryAssociations_QueryInterface(p,a,b)   (p)->lpVtbl->QueryInterface(p,a,b)
+#define IQueryAssociations_AddRef(p)               (p)->lpVtbl->AddRef(p)
+#define IQueryAssociations_Release(p)              (p)->lpVtbl->Release(p)
+#define IQueryAssociations_Init(p,a,b,c,d)         (p)->lpVtbl->Init(p,a,b,c,d)
+#define IQueryAssociations_GetString(p,a,b,c,d,e)  (p)->lpVtbl->GetString(p,a,b,c,d,e)
+#define IQueryAssociations_GetKey(p,a,b,c,d)       (p)->lpVtbl->GetKey(p,a,b,c,d)
+#define IQueryAssociations_GetData(p,a,b,c,d,e)    (p)->lpVtbl->GetData(p,a,b,c,d,e)
+#define IQueryAssociations_GetEnum(p,a,b,c,d,e)    (p)->lpVtbl->GetEnum(p,a,b,c,d,e)
+#endif
 
 HRESULT WINAPI AssocCreate(CLSID,REFIID,LPVOID*);