- Move shldisp.h to the right place.
authorFilip Navara <filip.navara@gmail.com>
Sun, 26 Sep 2004 14:34:23 +0000 (14:34 +0000)
committerFilip Navara <filip.navara@gmail.com>
Sun, 26 Sep 2004 14:34:23 +0000 (14:34 +0000)
- Get rid of the ICOM crap.

svn path=/trunk/; revision=11069

13 files changed:
reactos/include/wine/docobj.h
reactos/include/wine/exdisp.h
reactos/include/wine/icom.h [deleted file]
reactos/include/wine/objbase.h
reactos/include/wine/objidl.h
reactos/include/wine/shldisp.h [moved from reactos/w32api/include/shldisp.h with 98% similarity]
reactos/include/wine/shlwapi.h
reactos/include/wine/unknwn.h
reactos/lib/oleaut32/connpt.c
reactos/lib/oleaut32/dispatch.c
reactos/lib/oleaut32/olepicture.c
reactos/lib/oleaut32/tmarshal.c
reactos/lib/shell32/shellfolder.h

index 5f2deba..cd5d80e 100644 (file)
@@ -66,8 +66,6 @@ struct IOleDocument {
     const IOleDocumentVtbl* lpVtbl;
 };
 struct IOleDocumentVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
         IOleDocument* This,
@@ -111,7 +109,6 @@ struct IOleDocumentVtbl {
 #endif
 
 #define IOleDocument_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
     /*** IUnknown methods ***/ \
     STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
     STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -179,8 +176,6 @@ struct IOleDocumentSite {
     const IOleDocumentSiteVtbl* lpVtbl;
 };
 struct IOleDocumentSiteVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
         IOleDocumentSite* This,
@@ -210,7 +205,6 @@ struct IOleDocumentSiteVtbl {
 #endif
 
 #define IOleDocumentSite_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
     /*** IUnknown methods ***/ \
     STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
     STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -291,8 +285,6 @@ struct IOleDocumentView {
     const IOleDocumentViewVtbl* lpVtbl;
 };
 struct IOleDocumentViewVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
         IOleDocumentView* This,
@@ -385,7 +377,6 @@ struct IOleDocumentViewVtbl {
 #endif
 
 #define IOleDocumentView_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
     /*** IUnknown methods ***/ \
     STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
     STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -548,8 +539,6 @@ struct IEnumOleDocumentViews {
     const IEnumOleDocumentViewsVtbl* lpVtbl;
 };
 struct IEnumOleDocumentViewsVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
         IEnumOleDocumentViews* This,
@@ -595,7 +584,6 @@ struct IEnumOleDocumentViewsVtbl {
 #endif
 
 #define IEnumOleDocumentViews_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
     /*** IUnknown methods ***/ \
     STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
     STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -778,8 +766,6 @@ struct IOleCommandTarget {
     const IOleCommandTargetVtbl* lpVtbl;
 };
 struct IOleCommandTargetVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
         IOleCommandTarget* This,
@@ -821,7 +807,6 @@ struct IOleCommandTargetVtbl {
 #endif
 
 #define IOleCommandTarget_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
     /*** IUnknown methods ***/ \
     STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
     STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -888,8 +873,6 @@ struct IContinueCallback {
     const IContinueCallbackVtbl* lpVtbl;
 };
 struct IContinueCallbackVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
         IContinueCallback* This,
@@ -925,7 +908,6 @@ struct IContinueCallbackVtbl {
 #endif
 
 #define IContinueCallback_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
     /*** IUnknown methods ***/ \
     STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
     STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1018,8 +1000,6 @@ struct IPrint {
     const IPrintVtbl* lpVtbl;
 };
 struct IPrintVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
         IPrint* This,
@@ -1067,7 +1047,6 @@ struct IPrintVtbl {
 #endif
 
 #define IPrint_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
     /*** IUnknown methods ***/ \
     STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
     STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
index 8565708..1c0341f 100644 (file)
@@ -127,8 +127,6 @@ struct IWebBrowser {
     const IWebBrowserVtbl* lpVtbl;
 };
 struct IWebBrowserVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
         IWebBrowser* This,
@@ -311,7 +309,6 @@ struct IWebBrowserVtbl {
 #endif
 
 #define IWebBrowser_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
     /*** IUnknown methods ***/ \
     STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
     STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -634,8 +631,6 @@ struct IWebBrowserApp {
     const IWebBrowserAppVtbl* lpVtbl;
 };
 struct IWebBrowserAppVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
         IWebBrowserApp* This,
@@ -922,7 +917,6 @@ struct IWebBrowserAppVtbl {
 #endif
 
 #define IWebBrowserApp_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
     /*** IUnknown methods ***/ \
     STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
     STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
diff --git a/reactos/include/wine/icom.h b/reactos/include/wine/icom.h
deleted file mode 100644 (file)
index cf945c0..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef __WINE_ICOM_H
-#define __WINE_ICOM_H
-
-//#if defined(ICOM_MSVTABLE_COMPAT) && (!defined(__cplusplus) || defined(CINTERFACE))
-//#define ICOM_MSVTABLE_COMPAT_FIELDS long dummyRTTI1,dummyRTTI2;
-//#define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE 0,0,
-//#else
-# define ICOM_MSVTABLE_COMPAT_FIELDS
-# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-//#endif
-
-#define ICOM_DEFINE(iface,ibase) DECLARE_INTERFACE_(iface,ibase) { iface##_METHODS };
-#define ICOM_VTABLE(iface)       iface##Vtbl
-#define ICOM_VFIELD(iface)       ICOM_VTABLE(iface)* lpVtbl
-#define ICOM_THIS(impl,iface)    impl* const This=(impl*)(iface)
-#define ICOM_THIS_MULTI(impl,field,iface)  impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))
-
-#define IUnknown_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
-    /*** IUnknown methods ***/ \
-    STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
-    STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
-    STDMETHOD_(ULONG,Release)(THIS) PURE;
-
-#endif /* __WINE_ICOM_H */
index 1e38ac7..9e10ca6 100644 (file)
 
 #define interface struct
 
-#undef CONST_VTBL
-#define CONST_VTBL
-#define WINE_DECLARE_INTERFACE(iface) \
-         /*typedef*/ interface iface { struct iface##Vtbl *lpVtbl; } /*iface*/; \
-         typedef struct iface##Vtbl iface##Vtbl; \
-         struct iface##Vtbl
-#define WINE_DECLARE_INTERFACE_(iface,ibase) WINE_DECLARE_INTERFACE(iface)
-
-#define ICOM_DEFINE(iface,ibase) WINE_DECLARE_INTERFACE_(iface,ibase) { iface##_METHODS };
-#define ICOM_VTABLE(iface)       iface##Vtbl
-#define ICOM_VFIELD(iface)       ICOM_VTABLE(iface)* lpVtbl
-#define ICOM_THIS(impl,iface)    impl* const This=(impl*)(iface)
-#define ICOM_THIS_MULTI(impl,field,iface)  impl* const This=(impl*)((char*)(iface) - offsetof(impl,field))
-
 /*****************************************************************************
  *     Storage API
  */
index 9c1190a..81ed34d 100644 (file)
@@ -1750,7 +1750,6 @@ DEFINE_GUID(IID_IClassActivator, 0x00000140, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x0
 DEFINE_GUID(IID_ISequentialStream, 0x0c733a30, 0x2a1c, 0x11ce, 0xad,0xe5, 0x00,0xaa,0x00,0x44,0x77,0x3d);
 
 #define ISequentialStream_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
     /*** IUnknown methods ***/ \
     STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
     STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -1830,8 +1829,6 @@ struct IGlobalInterfaceTable {
     const IGlobalInterfaceTableVtbl* lpVtbl;
 };
 struct IGlobalInterfaceTableVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
         IGlobalInterfaceTable* This,
@@ -1875,7 +1872,6 @@ struct IGlobalInterfaceTableVtbl {
 #endif
 
 #define IGlobalInterfaceTable_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
     /*** IUnknown methods ***/ \
     STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
     STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
similarity index 98%
rename from reactos/w32api/include/shldisp.h
rename to reactos/include/wine/shldisp.h
index 4d1a994..3349f92 100644 (file)
@@ -46,8 +46,6 @@ struct IAutoComplete {
     const IAutoCompleteVtbl* lpVtbl;
 };
 struct IAutoCompleteVtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
         IAutoComplete* This,
@@ -85,7 +83,6 @@ struct IAutoCompleteVtbl {
 #endif
 
 #define IAutoComplete_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
     /*** IUnknown methods ***/ \
     STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
     STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
@@ -157,8 +154,6 @@ struct IAutoComplete2 {
     const IAutoComplete2Vtbl* lpVtbl;
 };
 struct IAutoComplete2Vtbl {
-    ICOM_MSVTABLE_COMPAT_FIELDS
-
     /*** IUnknown methods ***/
     HRESULT (STDMETHODCALLTYPE *QueryInterface)(
         IAutoComplete2* This,
@@ -208,7 +203,6 @@ struct IAutoComplete2Vtbl {
 #endif
 
 #define IAutoComplete2_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
     /*** IUnknown methods ***/ \
     STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
     STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
index 643a6e0..8f76d07 100644 (file)
@@ -846,7 +846,7 @@ typedef struct IQueryAssociations IQueryAssociations,*LPQUERYASSOCIATIONS;
     STDMETHOD(GetKey)(THIS_ ASSOCF  flags, ASSOCKEY  key, LPCWSTR  pszExtra, HKEY * phkeyOut) PURE; \
     STDMETHOD(GetData)(THIS_ ASSOCF  flags, ASSOCDATA  data, LPCWSTR  pszExtra, LPVOID  pvOut, DWORD * pcbOut) PURE; \
     STDMETHOD(GetEnum)(THIS_ ASSOCF  flags, ASSOCENUM  assocenum, LPCWSTR  pszExtra, REFIID  riid, LPVOID * ppvOut) PURE;
-ICOM_DEFINE(IQueryAssociations,IUnknown)
+DECLARE_INTERFACE_(IQueryAssociations,IUnknown) { IQueryAssociations_METHODS };
 #undef INTERFACE
 
 #ifdef COBJMACROS
index b99281f..2dc493c 100644 (file)
@@ -20,16 +20,7 @@ DEFINE_GUID(IID_IClassFactory, 0x00000001, 0x0000, 0x0000, 0xc0,0x00, 0x00,0x00,
 #define IClassFactory_CreateInstance(p,a,b,c) (p)->lpVtbl->CreateInstance(p,a,b,c)
 #define IClassFactory_LockServer(p,a) (p)->lpVtbl->LockServer(p,a)
 
-#if defined(ICOM_MSVTABLE_COMPAT) && (!defined(__cplusplus) || defined(CINTERFACE))
-# define ICOM_MSVTABLE_COMPAT_FIELDS long dummyRTTI1,dummyRTTI2;
-# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE 0,0,
-#else
-# define ICOM_MSVTABLE_COMPAT_FIELDS
-# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
-#endif
-
 #define IUnknown_METHODS \
-    ICOM_MSVTABLE_COMPAT_FIELDS \
     /*** IUnknown methods ***/ \
     STDMETHOD_(HRESULT,QueryInterface)(THIS_ REFIID riid, void** ppvObject) PURE; \
     STDMETHOD_(ULONG,AddRef)(THIS) PURE; \
index ff778f4..e6bf098 100644 (file)
@@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole);
  */
 typedef struct ConnectionPointImpl {
 
-  ICOM_VTABLE(IConnectionPoint)       *lpvtbl;
+  IConnectionPointVtbl       *lpvtbl;
 
   /* IUnknown of our main object*/
   IUnknown *Obj;
@@ -63,7 +63,7 @@ typedef struct ConnectionPointImpl {
   DWORD nSinks;
 } ConnectionPointImpl;
 
-static ICOM_VTABLE(IConnectionPoint) ConnectionPointImpl_VTable;
+static IConnectionPointVtbl ConnectionPointImpl_VTable;
 
 
 /************************************************************************
@@ -71,7 +71,7 @@ static ICOM_VTABLE(IConnectionPoint) ConnectionPointImpl_VTable;
  */
 typedef struct EnumConnectionsImpl {
 
-  ICOM_VTABLE(IEnumConnections)       *lpvtbl;
+  IEnumConnectionsVtbl       *lpvtbl;
 
   DWORD ref;
 
@@ -140,7 +140,7 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface(
   REFIID  riid,
   void**  ppvObject)
 {
-  ICOM_THIS(ConnectionPointImpl, iface);
+  ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
   TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject);
 
   /*
@@ -192,7 +192,7 @@ static HRESULT WINAPI ConnectionPointImpl_QueryInterface(
  */
 static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface)
 {
-  ICOM_THIS(ConnectionPointImpl, iface);
+  ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
   TRACE("(%p)->(ref=%ld)\n", This, This->ref);
   This->ref++;
 
@@ -207,7 +207,7 @@ static ULONG WINAPI ConnectionPointImpl_AddRef(IConnectionPoint* iface)
 static ULONG WINAPI ConnectionPointImpl_Release(
       IConnectionPoint* iface)
 {
-  ICOM_THIS(ConnectionPointImpl, iface);
+  ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
   TRACE("(%p)->(ref=%ld)\n", This, This->ref);
 
   /*
@@ -236,7 +236,7 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionInterface(
                                               IConnectionPoint *iface,
                                               IID              *piid)
 {
-  ICOM_THIS(ConnectionPointImpl, iface);
+  ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
   TRACE("(%p)->(%p) returning %s\n", This, piid, debugstr_guid(&(This->iid)));
   *piid = This->iid;
   return S_OK;
@@ -250,7 +250,7 @@ static HRESULT WINAPI ConnectionPointImpl_GetConnectionPointContainer(
                                      IConnectionPoint           *iface,
                                      IConnectionPointContainer  **ppCPC)
 {
-  ICOM_THIS(ConnectionPointImpl, iface);
+  ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
   TRACE("(%p)->(%p)\n", This, ppCPC);
 
   return IUnknown_QueryInterface(This->Obj,
@@ -267,7 +267,7 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface,
                                                 DWORD *pdwCookie)
 {
   DWORD i;
-  ICOM_THIS(ConnectionPointImpl, iface);
+  ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
   IUnknown *lpSink;
   TRACE("(%p)->(%p, %p)\n", This, lpUnk, pdwCookie);
 
@@ -298,7 +298,7 @@ static HRESULT WINAPI ConnectionPointImpl_Advise(IConnectionPoint *iface,
 static HRESULT WINAPI ConnectionPointImpl_Unadvise(IConnectionPoint *iface,
                                                   DWORD dwCookie)
 {
-  ICOM_THIS(ConnectionPointImpl, iface);
+  ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
   TRACE("(%p)->(%ld)\n", This, dwCookie);
 
   if(dwCookie == 0 || dwCookie > This->maxSinks) return E_INVALIDARG;
@@ -319,7 +319,7 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections(
                                                    IConnectionPoint *iface,
                                                    LPENUMCONNECTIONS *ppEnum)
 {
-  ICOM_THIS(ConnectionPointImpl, iface);
+  ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
   CONNECTDATA *pCD;
   DWORD i, nextslot;
   EnumConnectionsImpl *EnumObj;
@@ -355,9 +355,8 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections(
   return hr;
 }
 
-static ICOM_VTABLE(IConnectionPoint) ConnectionPointImpl_VTable =
+static IConnectionPointVtbl ConnectionPointImpl_VTable =
 {
-  ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
   ConnectionPointImpl_QueryInterface,
   ConnectionPointImpl_AddRef,
   ConnectionPointImpl_Release,
@@ -369,7 +368,7 @@ static ICOM_VTABLE(IConnectionPoint) ConnectionPointImpl_VTable =
 };
 
 
-static ICOM_VTABLE(IEnumConnections) EnumConnectionsImpl_VTable;
+static IEnumConnectionsVtbl EnumConnectionsImpl_VTable;
 static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface);
 
 /************************************************************************
@@ -421,7 +420,7 @@ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface(
   REFIID  riid,
   void**  ppvObject)
 {
-  ICOM_THIS(ConnectionPointImpl, iface);
+  ConnectionPointImpl *This = (ConnectionPointImpl *)iface;
   TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject);
 
   /*
@@ -473,7 +472,7 @@ static HRESULT WINAPI EnumConnectionsImpl_QueryInterface(
  */
 static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface)
 {
-  ICOM_THIS(EnumConnectionsImpl, iface);
+  EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface;
   TRACE("(%p)->(ref=%ld)\n", This, This->ref);
   This->ref++;
   IUnknown_AddRef(This->pUnk);
@@ -487,7 +486,7 @@ static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface)
  */
 static ULONG WINAPI EnumConnectionsImpl_Release(IEnumConnections* iface)
 {
-  ICOM_THIS(EnumConnectionsImpl, iface);
+  EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface;
   TRACE("(%p)->(ref=%ld)\n", This, This->ref);
 
   IUnknown_Release(This->pUnk);
@@ -518,7 +517,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface,
                                               ULONG cConn, LPCONNECTDATA pCD,
                                               ULONG *pEnum)
 {
-  ICOM_THIS(EnumConnectionsImpl, iface);
+  EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface;
   DWORD nRet = 0;
   TRACE("(%p)->(%ld, %p, %p)\n", This, cConn, pCD, pEnum);
 
@@ -553,7 +552,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Next(IEnumConnections* iface,
 static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface,
                                               ULONG cSkip)
 {
-  ICOM_THIS(EnumConnectionsImpl, iface);
+  EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface;
   TRACE("(%p)->(%ld)\n", This, cSkip);
 
   if(This->nCur + cSkip >= This->nConns)
@@ -571,7 +570,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Skip(IEnumConnections* iface,
  */
 static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface)
 {
-  ICOM_THIS(EnumConnectionsImpl, iface);
+  EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface;
   TRACE("(%p)\n", This);
 
   This->nCur = 0;
@@ -587,7 +586,7 @@ static HRESULT WINAPI EnumConnectionsImpl_Reset(IEnumConnections* iface)
 static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface,
                                                LPENUMCONNECTIONS *ppEnum)
 {
-  ICOM_THIS(EnumConnectionsImpl, iface);
+  EnumConnectionsImpl *This = (EnumConnectionsImpl *)iface;
   EnumConnectionsImpl *newObj;
   TRACE("(%p)->(%p)\n", This, ppEnum);
 
@@ -598,9 +597,8 @@ static HRESULT WINAPI EnumConnectionsImpl_Clone(IEnumConnections* iface,
   return S_OK;
 }
 
-static ICOM_VTABLE(IEnumConnections) EnumConnectionsImpl_VTable =
+static IEnumConnectionsVtbl EnumConnectionsImpl_VTable =
 {
-  ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
   EnumConnectionsImpl_QueryInterface,
   EnumConnectionsImpl_AddRef,
   EnumConnectionsImpl_Release,
index e867b65..5e0ca90 100644 (file)
@@ -239,7 +239,7 @@ HRESULT WINAPI CreateDispTypeInfo(
 
 typedef struct
 {
-    ICOM_VFIELD(IDispatch);
+    IDispatchVtbl *lpVtbl;
     void * pvThis;
     ITypeInfo * pTypeInfo;
     ULONG ref;
@@ -255,7 +255,7 @@ static HRESULT WINAPI StdDispatch_QueryInterface(
   REFIID riid,
   void** ppvObject)
 {
-    ICOM_THIS(StdDispatch, iface);
+    StdDispatch *This = (StdDispatch *)iface;
     TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppvObject);
 
     if (IsEqualIID(riid, &IID_IDispatch) ||
@@ -275,7 +275,7 @@ static HRESULT WINAPI StdDispatch_QueryInterface(
  */
 static ULONG WINAPI StdDispatch_AddRef(LPDISPATCH iface)
 {
-    ICOM_THIS(StdDispatch, iface);
+    StdDispatch *This = (StdDispatch *)iface;
     TRACE("()\n");
 
     return ++This->ref;
@@ -288,7 +288,7 @@ static ULONG WINAPI StdDispatch_AddRef(LPDISPATCH iface)
  */
 static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface)
 {
-    ICOM_THIS(StdDispatch, iface);
+    StdDispatch *This = (StdDispatch *)iface;
     ULONG ret;
     TRACE("(%p)->()\n", This);
 
@@ -322,7 +322,7 @@ static ULONG WINAPI StdDispatch_Release(LPDISPATCH iface)
  */
 static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pctinfo)
 {
-    ICOM_THIS(StdDispatch, iface);
+    StdDispatch *This = (StdDispatch *)iface;
     TRACE("(%p)\n", pctinfo);
 
     *pctinfo = This->pTypeInfo ? 1 : 0;
@@ -349,7 +349,7 @@ static HRESULT WINAPI StdDispatch_GetTypeInfoCount(LPDISPATCH iface, UINT * pcti
  */
 static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCID lcid, ITypeInfo** ppTInfo)
 {
-    ICOM_THIS(StdDispatch, iface);
+    StdDispatch *This = (StdDispatch *)iface;
     TRACE("(%d, %lx, %p)\n", iTInfo, lcid, ppTInfo);
 
     *ppTInfo = NULL;
@@ -392,7 +392,7 @@ static HRESULT WINAPI StdDispatch_GetTypeInfo(LPDISPATCH iface, UINT iTInfo, LCI
  */
 static HRESULT WINAPI StdDispatch_GetIDsOfNames(LPDISPATCH iface, REFIID riid, LPOLESTR * rgszNames, UINT cNames, LCID lcid, DISPID * rgDispId)
 {
-    ICOM_THIS(StdDispatch, iface);
+    StdDispatch *This = (StdDispatch *)iface;
     TRACE("(%s, %p, %d, 0x%lx, %p)\n", debugstr_guid(riid), rgszNames, cNames, lcid, rgDispId);
 
     if (!IsEqualGUID(riid, &IID_NULL))
@@ -430,7 +430,7 @@ static HRESULT WINAPI StdDispatch_Invoke(LPDISPATCH iface, DISPID dispIdMember,
                                          WORD wFlags, DISPPARAMS * pDispParams, VARIANT * pVarResult,
                                          EXCEPINFO * pExcepInfo, UINT * puArgErr)
 {
-    ICOM_THIS(StdDispatch, iface);
+    StdDispatch *This = (StdDispatch *)iface;
     TRACE("(%ld, %s, 0x%lx, 0x%x, %p, %p, %p, %p)\n", dispIdMember, debugstr_guid(riid), lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
 
     if (!IsEqualGUID(riid, &IID_NULL))
@@ -441,9 +441,8 @@ static HRESULT WINAPI StdDispatch_Invoke(LPDISPATCH iface, DISPID dispIdMember,
     return DispInvoke(This->pvThis, This->pTypeInfo, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
 }
 
-static ICOM_VTABLE(IDispatch) StdDispatch_VTable =
+static IDispatchVtbl StdDispatch_VTable =
 {
-  ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
   StdDispatch_QueryInterface,
   StdDispatch_AddRef,
   StdDispatch_Release,
index e86bb63..94d66a3 100644 (file)
@@ -91,10 +91,10 @@ typedef struct OLEPictureImpl {
    * IPicture handles IUnknown
    */
 
-    ICOM_VTABLE(IPicture)       *lpvtbl1;
-    ICOM_VTABLE(IDispatch)      *lpvtbl2;
-    ICOM_VTABLE(IPersistStream) *lpvtbl3;
-    ICOM_VTABLE(IConnectionPointContainer) *lpvtbl4;
+    IPictureVtbl       *lpvtbl1;
+    IDispatchVtbl      *lpvtbl2;
+    IPersistStreamVtbl *lpvtbl3;
+    IConnectionPointContainerVtbl *lpvtbl4;
 
   /* Object referenece count */
     DWORD ref;
@@ -136,10 +136,10 @@ typedef struct OLEPictureImpl {
 /*
  * Predeclare VTables.  They get initialized at the end.
  */
-static ICOM_VTABLE(IPicture) OLEPictureImpl_VTable;
-static ICOM_VTABLE(IDispatch) OLEPictureImpl_IDispatch_VTable;
-static ICOM_VTABLE(IPersistStream) OLEPictureImpl_IPersistStream_VTable;
-static ICOM_VTABLE(IConnectionPointContainer) OLEPictureImpl_IConnectionPointContainer_VTable;
+static IPictureVtbl OLEPictureImpl_VTable;
+static IDispatchVtbl OLEPictureImpl_IDispatch_VTable;
+static IPersistStreamVtbl OLEPictureImpl_IPersistStream_VTable;
+static IConnectionPointContainerVtbl OLEPictureImpl_IConnectionPointContainer_VTable;
 
 /***********************************************************************
  * Implementation of the OLEPictureImpl class.
@@ -295,7 +295,7 @@ static HRESULT WINAPI OLEPictureImpl_QueryInterface(
   REFIID  riid,
   void**  ppvObject)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(riid), ppvObject);
 
   /*
@@ -386,7 +386,7 @@ static void OLEPicture_SendNotify(OLEPictureImpl* this, DISPID dispID)
 static ULONG WINAPI OLEPictureImpl_AddRef(
   IPicture* iface)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   TRACE("(%p)->(ref=%ld)\n", This, This->ref);
   This->ref++;
 
@@ -401,7 +401,7 @@ static ULONG WINAPI OLEPictureImpl_AddRef(
 static ULONG WINAPI OLEPictureImpl_Release(
       IPicture* iface)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   TRACE("(%p)->(ref=%ld)\n", This, This->ref);
 
   /*
@@ -429,7 +429,7 @@ static ULONG WINAPI OLEPictureImpl_Release(
 static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface,
                                                OLE_HANDLE *phandle)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   TRACE("(%p)->(%p)\n", This, phandle);
   switch(This->desc.picType) {
   case PICTYPE_BITMAP:
@@ -458,7 +458,7 @@ static HRESULT WINAPI OLEPictureImpl_get_Handle(IPicture *iface,
 static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface,
                                              OLE_HANDLE *phandle)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   FIXME("(%p)->(%p): stub\n", This, phandle);
   return E_NOTIMPL;
 }
@@ -469,7 +469,7 @@ static HRESULT WINAPI OLEPictureImpl_get_hPal(IPicture *iface,
 static HRESULT WINAPI OLEPictureImpl_get_Type(IPicture *iface,
                                              short *ptype)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   TRACE("(%p)->(%p): type is %d\n", This, ptype, This->desc.picType);
   *ptype = This->desc.picType;
   return S_OK;
@@ -481,7 +481,7 @@ static HRESULT WINAPI OLEPictureImpl_get_Type(IPicture *iface,
 static HRESULT WINAPI OLEPictureImpl_get_Width(IPicture *iface,
                                               OLE_XSIZE_HIMETRIC *pwidth)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   TRACE("(%p)->(%p): width is %ld\n", This, pwidth, This->himetricWidth);
   *pwidth = This->himetricWidth;
   return S_OK;
@@ -493,7 +493,7 @@ static HRESULT WINAPI OLEPictureImpl_get_Width(IPicture *iface,
 static HRESULT WINAPI OLEPictureImpl_get_Height(IPicture *iface,
                                                OLE_YSIZE_HIMETRIC *pheight)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   TRACE("(%p)->(%p): height is %ld\n", This, pheight, This->himetricHeight);
   *pheight = This->himetricHeight;
   return S_OK;
@@ -510,7 +510,7 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc,
                                            OLE_YSIZE_HIMETRIC cySrc,
                                            LPCRECT prcWBounds)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   TRACE("(%p)->(%p, (%ld,%ld), (%ld,%ld) <- (%ld,%ld), (%ld,%ld), %p)\n",
        This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, prcWBounds);
   if(prcWBounds)
@@ -567,7 +567,7 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc,
 static HRESULT WINAPI OLEPictureImpl_set_hPal(IPicture *iface,
                                              OLE_HANDLE hpal)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   FIXME("(%p)->(%08x): stub\n", This, hpal);
   OLEPicture_SendNotify(This,DISPID_PICT_HPAL);
   return E_NOTIMPL;
@@ -579,7 +579,7 @@ static HRESULT WINAPI OLEPictureImpl_set_hPal(IPicture *iface,
 static HRESULT WINAPI OLEPictureImpl_get_CurDC(IPicture *iface,
                                               HDC *phdc)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   TRACE("(%p), returning %p\n", This, This->hDCCur);
   if (phdc) *phdc = This->hDCCur;
   return S_OK;
@@ -593,7 +593,7 @@ static HRESULT WINAPI OLEPictureImpl_SelectPicture(IPicture *iface,
                                                   HDC *phdcOut,
                                                   OLE_HANDLE *phbmpOut)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   TRACE("(%p)->(%p, %p, %p)\n", This, hdcIn, phdcOut, phbmpOut);
   if (This->desc.picType == PICTYPE_BITMAP) {
       SelectObject(hdcIn,This->desc.u.bmp.hbitmap);
@@ -616,7 +616,7 @@ static HRESULT WINAPI OLEPictureImpl_SelectPicture(IPicture *iface,
 static HRESULT WINAPI OLEPictureImpl_get_KeepOriginalFormat(IPicture *iface,
                                                            BOOL *pfKeep)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   TRACE("(%p)->(%p)\n", This, pfKeep);
   if (!pfKeep)
       return E_POINTER;
@@ -630,7 +630,7 @@ static HRESULT WINAPI OLEPictureImpl_get_KeepOriginalFormat(IPicture *iface,
 static HRESULT WINAPI OLEPictureImpl_put_KeepOriginalFormat(IPicture *iface,
                                                            BOOL keep)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   TRACE("(%p)->(%d)\n", This, keep);
   This->keepOrigFormat = keep;
   /* FIXME: what DISPID notification here? */
@@ -642,7 +642,7 @@ static HRESULT WINAPI OLEPictureImpl_put_KeepOriginalFormat(IPicture *iface,
  */
 static HRESULT WINAPI OLEPictureImpl_PictureChanged(IPicture *iface)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   TRACE("(%p)->()\n", This);
   OLEPicture_SendNotify(This,DISPID_PICT_HANDLE);
   return S_OK;
@@ -656,7 +656,7 @@ static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface,
                                                BOOL SaveMemCopy,
                                                LONG *pcbSize)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   FIXME("(%p)->(%p, %d, %p), hacked stub.\n", This, pstream, SaveMemCopy, pcbSize);
   return IStream_Write(pstream,This->data,This->datalen,(ULONG*)pcbSize);
 }
@@ -667,7 +667,7 @@ static HRESULT WINAPI OLEPictureImpl_SaveAsFile(IPicture *iface,
 static HRESULT WINAPI OLEPictureImpl_get_Attributes(IPicture *iface,
                                                    DWORD *pdwAttr)
 {
-  ICOM_THIS(OLEPictureImpl, iface);
+  OLEPictureImpl *This = (OLEPictureImpl *)iface;
   TRACE("(%p)->(%p).\n", This, pdwAttr);
   *pdwAttr = 0;
   switch (This->desc.picType) {
@@ -1313,9 +1313,8 @@ static HRESULT WINAPI OLEPictureImpl_Invoke(
 }
 
 
-static ICOM_VTABLE(IPicture) OLEPictureImpl_VTable =
+static IPictureVtbl OLEPictureImpl_VTable =
 {
-  ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
   OLEPictureImpl_QueryInterface,
   OLEPictureImpl_AddRef,
   OLEPictureImpl_Release,
@@ -1335,9 +1334,8 @@ static ICOM_VTABLE(IPicture) OLEPictureImpl_VTable =
   OLEPictureImpl_get_Attributes
 };
 
-static ICOM_VTABLE(IDispatch) OLEPictureImpl_IDispatch_VTable =
+static IDispatchVtbl OLEPictureImpl_IDispatch_VTable =
 {
-  ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
   OLEPictureImpl_IDispatch_QueryInterface,
   OLEPictureImpl_IDispatch_AddRef,
   OLEPictureImpl_IDispatch_Release,
@@ -1347,9 +1345,8 @@ static ICOM_VTABLE(IDispatch) OLEPictureImpl_IDispatch_VTable =
   OLEPictureImpl_Invoke
 };
 
-static ICOM_VTABLE(IPersistStream) OLEPictureImpl_IPersistStream_VTable =
+static IPersistStreamVtbl OLEPictureImpl_IPersistStream_VTable =
 {
-  ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
   OLEPictureImpl_IPersistStream_QueryInterface,
   OLEPictureImpl_IPersistStream_AddRef,
   OLEPictureImpl_IPersistStream_Release,
@@ -1360,9 +1357,8 @@ static ICOM_VTABLE(IPersistStream) OLEPictureImpl_IPersistStream_VTable =
   OLEPictureImpl_GetSizeMax
 };
 
-static ICOM_VTABLE(IConnectionPointContainer) OLEPictureImpl_IConnectionPointContainer_VTable =
+static IConnectionPointContainerVtbl OLEPictureImpl_IConnectionPointContainer_VTable =
 {
-  ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
   OLEPictureImpl_IConnectionPointContainer_QueryInterface,
   OLEPictureImpl_IConnectionPointContainer_AddRef,
   OLEPictureImpl_IConnectionPointContainer_Release,
@@ -1482,13 +1478,13 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode,
 typedef struct
 {
     /* IUnknown fields */
-    ICOM_VFIELD(IClassFactory);
+    IClassFactoryVtbl          *lpVtbl;
     DWORD                       ref;
 } IClassFactoryImpl;
 
 static HRESULT WINAPI
 SPCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
-       ICOM_THIS(IClassFactoryImpl,iface);
+       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
 
        FIXME("(%p)->(%s,%p),stub!\n",This,debugstr_guid(riid),ppobj);
        return E_NOINTERFACE;
@@ -1496,12 +1492,12 @@ SPCF_QueryInterface(LPCLASSFACTORY iface,REFIID riid,LPVOID *ppobj) {
 
 static ULONG WINAPI
 SPCF_AddRef(LPCLASSFACTORY iface) {
-       ICOM_THIS(IClassFactoryImpl,iface);
+       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
        return ++(This->ref);
 }
 
 static ULONG WINAPI SPCF_Release(LPCLASSFACTORY iface) {
-       ICOM_THIS(IClassFactoryImpl,iface);
+       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
        /* static class, won't be  freed */
        return --(This->ref);
 }
@@ -1519,13 +1515,12 @@ static HRESULT WINAPI SPCF_CreateInstance(
 }
 
 static HRESULT WINAPI SPCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
-       ICOM_THIS(IClassFactoryImpl,iface);
+       IClassFactoryImpl *This = (IClassFactoryImpl *)iface;
        FIXME("(%p)->(%d),stub!\n",This,dolock);
        return S_OK;
 }
 
-static ICOM_VTABLE(IClassFactory) SPCF_Vtbl = {
-       ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
+static IClassFactoryVtbl SPCF_Vtbl = {
        SPCF_QueryInterface,
        SPCF_AddRef,
        SPCF_Release,
index 4dc5a66..5d2ba72 100644 (file)
@@ -291,7 +291,7 @@ typedef struct _TMAsmProxy {
 
 typedef struct _TMProxyImpl {
     DWORD                              *lpvtbl;
-    ICOM_VTABLE(IRpcProxyBuffer)       *lpvtbl2;
+    IRpcProxyBufferVtbl        *lpvtbl2;
     DWORD                              ref;
 
     TMAsmProxy                         *asmstubs;
index 8c8901e..10a3919 100644 (file)
@@ -33,7 +33,7 @@
  * Predeclare the interfaces
  */
 DEFINE_GUID(IID_ISFHelper, 0x1fe68efbL, 0x1874, 0x9812, 0x56, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00);
-typedef struct ISFHelper ISFHelper, *LPISFHELPER;
+typedef struct ISFHelper *LPISFHELPER;
 
 /*****************************************************************************
  * ISFHelper interface
@@ -46,7 +46,7 @@ typedef struct ISFHelper ISFHelper, *LPISFHELPER;
        STDMETHOD(AddFolder)(THIS_ HWND  hwnd, LPCSTR  lpName, LPITEMIDLIST * ppidlOut) PURE; \
        STDMETHOD(DeleteItems)(THIS_ UINT  cidl, LPCITEMIDLIST * apidl) PURE; \
        STDMETHOD(CopyItems)(THIS_ IShellFolder * pSFFrom, UINT  cidl, LPCITEMIDLIST * apidl) PURE;
-ICOM_DEFINE(ISFHelper, IUnknown)
+DECLARE_INTERFACE_(ISFHelper, IUnknown) { ISFHelper_METHODS };
 #undef INTERFACE
 
 #ifdef COBJMACROS