From 0467ce9fd762cb6e3ddf60b3e6686cf22e00c23e Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 12 Aug 2004 19:52:49 +0000 Subject: [PATCH] Get rid of the non-standard ICOM_VFIELD macro. --- dlls/avifil32/acmstream.c | 2 +- dlls/avifil32/avifile.c | 6 ++--- dlls/avifil32/editstream.c | 6 ++--- dlls/avifil32/factory.c | 2 +- dlls/avifil32/getframe.c | 2 +- dlls/avifil32/icmstream.c | 2 +- dlls/avifil32/tmpfile.c | 2 +- dlls/avifil32/wavfile.c | 6 ++--- dlls/comcat/comcat_private.h | 2 +- dlls/comcat/information.c | 6 ++--- dlls/d3d8/d3d8_private.h | 32 +++++++++++++-------------- dlls/d3d9/d3d9_private.h | 34 ++++++++++++++-------------- dlls/d3dx8/d3dx8core_private.h | 4 ++-- dlls/devenum/devenum_private.h | 12 +++++----- dlls/dinput/device_private.h | 2 +- dlls/dinput/dinput_main.c | 2 +- dlls/dmband/dmband_main.c | 2 +- dlls/dmcompos/dmcompos_main.c | 2 +- dlls/dmcompos/dmcompos_private.h | 2 +- dlls/dmime/dmime_main.c | 2 +- dlls/dmime/dmime_private.h | 8 +++---- dlls/dmloader/dmloader_private.h | 4 ++-- dlls/dmscript/dmscript_main.c | 2 +- dlls/dmstyle/dmstyle_main.c | 2 +- dlls/dmsynth/dmsynth_main.c | 2 +- dlls/dmsynth/dmsynth_private.h | 4 ++-- dlls/dmusic/dmusic_main.c | 2 +- dlls/dmusic/dmusic_private.h | 16 +++++++------- dlls/dplayx/dpclassfactory.c | 2 +- dlls/dplayx/dplay_global.h | 6 ++--- dlls/dplayx/dplaysp.c | 2 +- dlls/dplayx/dplobby.c | 6 ++--- dlls/dplayx/lobbysp.c | 2 +- dlls/dpnet/dpnet_main.c | 2 +- dlls/dpnet/dpnet_private.h | 4 ++-- dlls/dsound/dsound_private.h | 38 ++++++++++++++++---------------- dlls/dswave/dswave_main.c | 2 +- dlls/dxdiagn/dxdiag_main.c | 2 +- dlls/dxdiagn/dxdiag_private.h | 4 ++-- dlls/msdmo/dmoreg.c | 2 +- dlls/msi/msi.c | 2 +- dlls/ole32/bindctx.c | 2 +- dlls/ole32/clipboard.c | 2 +- dlls/ole32/compositemoniker.c | 2 +- dlls/ole32/ftmarshal.c | 4 ++-- dlls/ole32/git.c | 2 +- dlls/ole32/hglobalstream.c | 2 +- dlls/ole32/ifs.c | 4 ++-- dlls/ole32/memlockbytes.c | 2 +- dlls/ole32/memlockbytes16.c | 2 +- dlls/ole32/moniker.c | 2 +- dlls/ole32/ole16.c | 2 +- dlls/ole32/oleobj.c | 4 ++-- dlls/ole32/storage.c | 6 ++--- dlls/ole32/storage32.h | 14 ++++++------ dlls/oleaut32/dispatch.c | 2 +- dlls/oleaut32/olefont.c | 2 +- dlls/oleaut32/olepicture.c | 2 +- dlls/oleaut32/tests/vartype.c | 2 +- dlls/oleaut32/typelib.c | 8 +++---- dlls/oleaut32/typelib2.c | 8 +++---- dlls/quartz/enummoniker.c | 2 +- dlls/quartz/filtermapper.c | 4 ++-- dlls/quartz/systemclock.c | 2 +- dlls/rpcrt4/ndr_ole.c | 2 +- dlls/shdocvw/shdocvw.h | 24 ++++++++++---------- dlls/shell32/autocomplete.c | 4 ++-- dlls/shell32/cpanelfolder.c | 11 +++++---- dlls/shell32/dataobject.c | 4 ++-- dlls/shell32/dragdrophelper.c | 2 +- dlls/shell32/enumidlist.c | 2 +- dlls/shell32/folders.c | 10 ++++----- dlls/shell32/shelllink.c | 10 ++++----- dlls/shell32/shellole.c | 4 ++-- dlls/shell32/shfldr_desktop.c | 2 +- dlls/shell32/shfldr_fs.c | 12 +++++----- dlls/shell32/shfldr_mycomp.c | 6 ++--- dlls/shell32/shlfsbind.c | 2 +- dlls/shell32/shlview.c | 13 ++++++----- dlls/shell32/shv_bg_cmenu.c | 2 +- dlls/shell32/shv_item_cmenu.c | 2 +- dlls/shlwapi/assoc.c | 2 +- dlls/shlwapi/istream.c | 2 +- dlls/shlwapi/regstream.c | 2 +- dlls/winmm/winealsa/audio.c | 4 ++-- dlls/winmm/winealsa/audio_05.c | 4 ++-- dlls/winmm/wineaudioio/audio.c | 4 ++-- dlls/winmm/winejack/audio.c | 4 ++-- dlls/winmm/wineoss/audio.c | 16 +++++++------- include/objbase.h | 1 - 90 files changed, 238 insertions(+), 239 deletions(-) diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 0c6563bb775..63a7efec395 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -74,7 +74,7 @@ struct ICOM_VTABLE(IAVIStream) iacmst = { typedef struct _IAVIStreamImpl { /* IUnknown stuff */ - ICOM_VFIELD(IAVIStream); + IAVIStreamVtbl *lpVtbl; DWORD ref; /* IAVIStream stuff */ diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index a23231f87c8..b6ec19d2042 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -143,7 +143,7 @@ typedef struct _IAVIFileImpl IAVIFileImpl; typedef struct _IPersistFileImpl { /* IUnknown stuff */ - ICOM_VFIELD(IPersistFile); + IPersistFileVtbl *lpVtbl; /* IPersistFile stuff */ IAVIFileImpl *paf; @@ -151,7 +151,7 @@ typedef struct _IPersistFileImpl { typedef struct _IAVIStreamImpl { /* IUnknown stuff */ - ICOM_VFIELD(IAVIStream); + IAVIStreamVtbl *lpVtbl; DWORD ref; /* IAVIStream stuff */ @@ -180,7 +180,7 @@ typedef struct _IAVIStreamImpl { struct _IAVIFileImpl { /* IUnknown stuff */ - ICOM_VFIELD(IAVIFile); + IAVIFileVtbl *lpVtbl; DWORD ref; /* IAVIFile stuff... */ diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 5028345f11c..65e60cadbc4 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -146,7 +146,7 @@ typedef struct _IAVIEditStreamImpl IAVIEditStreamImpl; typedef struct _IEditAVIStreamImpl { /* IUnknown stuff */ - ICOM_VFIELD(IAVIStream); + IAVIStreamVtbl *lpVtbl; /* IAVIStream stuff */ IAVIEditStreamImpl *pae; @@ -154,7 +154,7 @@ typedef struct _IEditAVIStreamImpl { typedef struct _IEditStreamInternalImpl { /* IUnknown stuff */ - ICOM_VFIELD(IEditStreamInternal); + IEditStreamInternalVtbl *lpVtbl; /* IEditStreamInternal stuff */ IAVIEditStreamImpl *pae; @@ -162,7 +162,7 @@ typedef struct _IEditStreamInternalImpl { struct _IAVIEditStreamImpl { /* IUnknown stuff */ - ICOM_VFIELD(IAVIEditStream); + IAVIEditStreamVtbl *lpVtbl; DWORD ref; /* IAVIEditStream stuff */ diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index c983953dc24..91ec9eddc56 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -60,7 +60,7 @@ static ICOM_VTABLE(IClassFactory) iclassfact = { typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD dwRef; CLSID clsid; diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index b397affde81..cc6ded7d0bb 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -67,7 +67,7 @@ struct ICOM_VTABLE(IGetFrame) igetframeVtbl = { typedef struct _IGetFrameImpl { /* IUnknown stuff */ - ICOM_VFIELD(IGetFrame); + IGetFrameVtbl *lpVtbl; DWORD ref; /* IGetFrame stuff */ diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index 663c50577b0..8f0c0929044 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -77,7 +77,7 @@ struct ICOM_VTABLE(IAVIStream) iicmst = { typedef struct _IAVIStreamImpl { /* IUnknown stuff */ - ICOM_VFIELD(IAVIStream); + IAVIStreamVtbl *lpVtbl; DWORD ref; /* IAVIStream stuff */ diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index 57fcf44ccbf..1bf777d4998 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -66,7 +66,7 @@ struct ICOM_VTABLE(IAVIFile) itmpft = { typedef struct _ITmpFileImpl { /* IUnknown stuff */ - ICOM_VFIELD(IAVIFile); + IAVIFileVtbl *lpVtbl; DWORD ref; /* IAVIFile stuff */ diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index cfa40c51d37..626d63ea324 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -173,7 +173,7 @@ typedef struct _IAVIFileImpl IAVIFileImpl; typedef struct _IPersistFileImpl { /* IUnknown stuff */ - ICOM_VFIELD(IPersistFile); + IPersistFileVtbl *lpVtbl; /* IPersistFile stuff */ IAVIFileImpl *paf; @@ -181,7 +181,7 @@ typedef struct _IPersistFileImpl { typedef struct _IAVIStreamImpl { /* IUnknown stuff */ - ICOM_VFIELD(IAVIStream); + IAVIStreamVtbl *lpVtbl; /* IAVIStream stuff */ IAVIFileImpl *paf; @@ -189,7 +189,7 @@ typedef struct _IAVIStreamImpl { struct _IAVIFileImpl { /* IUnknown stuff */ - ICOM_VFIELD(IAVIFile); + IAVIFileVtbl *lpVtbl; DWORD ref; /* IAVIFile, IAVIStream stuff... */ diff --git a/dlls/comcat/comcat_private.h b/dlls/comcat/comcat_private.h index 5ca861ddb6d..bfdc50f20ed 100644 --- a/dlls/comcat/comcat_private.h +++ b/dlls/comcat/comcat_private.h @@ -42,7 +42,7 @@ extern DWORD dll_ref; typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } ClassFactoryImpl; diff --git a/dlls/comcat/information.c b/dlls/comcat/information.c index 98415258928..d7147089297 100644 --- a/dlls/comcat/information.c +++ b/dlls/comcat/information.c @@ -298,7 +298,7 @@ ICOM_VTABLE(ICatInformation) COMCAT_ICatInformation_Vtbl = */ typedef struct { - ICOM_VFIELD(IEnumCATEGORYINFO); + IEnumCATEGORYINFOVtbl *lpVtbl; DWORD ref; LCID lcid; HKEY key; @@ -601,7 +601,7 @@ static HRESULT COMCAT_IsClassOfCategories( */ typedef struct { - ICOM_VFIELD(IEnumGUID); + IEnumGUIDVtbl *lpVtbl; DWORD ref; struct class_categories const *categories; HKEY key; @@ -794,7 +794,7 @@ static LPENUMGUID COMCAT_CLSID_IEnumGUID_Construct( */ typedef struct { - ICOM_VFIELD(IEnumGUID); + IEnumGUIDVtbl *lpVtbl; DWORD ref; WCHAR keyname[68]; HKEY key; diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index d420d4396de..50c46fffd10 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -281,7 +281,7 @@ extern ICOM_VTABLE(IDirect3D8) Direct3D8_Vtbl; struct IDirect3D8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3D8); + IDirect3D8Vtbl *lpVtbl; DWORD ref; /* IDirect3D8 fields */ @@ -331,7 +331,7 @@ extern ICOM_VTABLE(IDirect3DDevice8) Direct3DDevice8_Vtbl; struct IDirect3DDevice8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DDevice8); + IDirect3DDevice8Vtbl *lpVtbl; DWORD ref; /* IDirect3DDevice8 fields */ @@ -525,7 +525,7 @@ extern ICOM_VTABLE(IDirect3DVolume8) Direct3DVolume8_Vtbl; struct IDirect3DVolume8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DVolume8); + IDirect3DVolume8Vtbl *lpVtbl; DWORD ref; /* IDirect3DVolume8 fields */ @@ -579,7 +579,7 @@ extern ICOM_VTABLE(IDirect3DSwapChain8) Direct3DSwapChain8_Vtbl; struct IDirect3DSwapChain8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DSwapChain8); + IDirect3DSwapChain8Vtbl *lpVtbl; DWORD ref; /* IDirect3DSwapChain8 fields */ @@ -618,7 +618,7 @@ extern ICOM_VTABLE(IDirect3DSurface8) Direct3DSurface8_Vtbl; struct IDirect3DSurface8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DSurface8); + IDirect3DSurface8Vtbl *lpVtbl; DWORD ref; /* IDirect3DSurface8 fields */ @@ -676,7 +676,7 @@ extern ICOM_VTABLE(IDirect3DResource8) Direct3DResource8_Vtbl; struct IDirect3DResource8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DResource8); + IDirect3DResource8Vtbl *lpVtbl; DWORD ref; /* IDirect3DResource8 fields */ @@ -718,7 +718,7 @@ extern ICOM_VTABLE(IDirect3DVertexBuffer8) Direct3DVertexBuffer8_Vtbl; struct IDirect3DVertexBuffer8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DVertexBuffer8); + IDirect3DVertexBuffer8Vtbl *lpVtbl; DWORD ref; /* IDirect3DResource8 fields */ @@ -766,7 +766,7 @@ extern ICOM_VTABLE(IDirect3DIndexBuffer8) Direct3DIndexBuffer8_Vtbl; struct IDirect3DIndexBuffer8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DIndexBuffer8); + IDirect3DIndexBuffer8Vtbl *lpVtbl; DWORD ref; /* IDirect3DResource8 fields */ @@ -814,7 +814,7 @@ extern ICOM_VTABLE(IDirect3DBaseTexture8) Direct3DBaseTexture8_Vtbl; struct IDirect3DBaseTexture8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DBaseTexture8); + IDirect3DBaseTexture8Vtbl *lpVtbl; DWORD ref; /* IDirect3DResource8 fields */ @@ -871,7 +871,7 @@ extern ICOM_VTABLE(IDirect3DCubeTexture8) Direct3DCubeTexture8_Vtbl; struct IDirect3DCubeTexture8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DCubeTexture8); + IDirect3DCubeTexture8Vtbl *lpVtbl; DWORD ref; /* IDirect3DResource8 fields */ @@ -933,7 +933,7 @@ extern ICOM_VTABLE(IDirect3DTexture8) Direct3DTexture8_Vtbl; struct IDirect3DTexture8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DTexture8); + IDirect3DTexture8Vtbl *lpVtbl; DWORD ref; /* IDirect3DResourc8 fields */ @@ -996,7 +996,7 @@ extern ICOM_VTABLE(IDirect3DVolumeTexture8) Direct3DVolumeTexture8_Vtbl; struct IDirect3DVolumeTexture8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DVolumeTexture8); + IDirect3DVolumeTexture8Vtbl *lpVtbl; DWORD ref; /* IDirect3DResource8 fields */ @@ -1084,7 +1084,7 @@ typedef struct SAVEDSTATES { */ struct IDirect3DStateBlockImpl { /* IUnknown fields */ - /*ICOM_VFIELD(IDirect3DStateBlock9);*/ + /*IDirect3DStateBlock9Vtbl *lpVtbl;*/ DWORD ref; /* The device, to be replaced by a IDirect3DDeviceImpl */ @@ -1173,7 +1173,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_CaptureStateBlock(IDirect3DDevice8Impl */ struct IDirect3DVertexShaderDeclarationImpl { /* IUnknown fields */ - /*ICOM_VFIELD(IDirect3DVertexShaderDeclaration9);*/ + /*IDirect3DVertexShaderDeclaration9Vtbl *lpVtbl;*/ DWORD ref; /* The device, to be replaced by a IDirect3DDeviceImpl */ @@ -1209,7 +1209,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_CreateVertexShaderDeclaration8(IDirect * IDirect3DVertexShader implementation structure */ struct IDirect3DVertexShaderImpl { - /*ICOM_VFIELD(IDirect3DVertexShader9);*/ + /*IDirect3DVertexShader9Vtbl *lpVtbl;*/ DWORD ref; /* The device, to be replaced by a IDirect3DDeviceImpl */ @@ -1258,7 +1258,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_FillVertexShaderInputArbHW(IDirect3DDe * IDirect3DPixelShader implementation structure */ struct IDirect3DPixelShaderImpl { - /*ICOM_VFIELD(IDirect3DPixelShader9);*/ + /*IDirect3DPixelShader9Vtbl *lpVtbl;*/ DWORD ref; /* The device, to be replaced by a IDirect3DDeviceImpl */ diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index aa90e6aeb66..c0b42e5150f 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -177,7 +177,7 @@ extern ICOM_VTABLE(IDirect3D9) Direct3D9_Vtbl; struct IDirect3D9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3D9); + IDirect3D9Vtbl *lpVtbl; DWORD ref; /* IDirect3D9 fields */ @@ -222,7 +222,7 @@ extern ICOM_VTABLE(IDirect3DDevice9) Direct3DDevice9_Vtbl; struct IDirect3DDevice9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DDevice9); + IDirect3DDevice9Vtbl *lpVtbl; DWORD ref; /* IDirect3DDevice9 fields */ @@ -427,7 +427,7 @@ extern ICOM_VTABLE(IDirect3DVolume9) Direct3DVolume9_Vtbl; struct IDirect3DVolume9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DVolume9); + IDirect3DVolume9Vtbl *lpVtbl; DWORD ref; /* IDirect3DVolume9 fields */ @@ -478,7 +478,7 @@ extern ICOM_VTABLE(IDirect3DSwapChain9) Direct3DSwapChain9_Vtbl; struct IDirect3DSwapChain9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DSwapChain9); + IDirect3DSwapChain9Vtbl *lpVtbl; DWORD ref; /* IDirect3DSwapChain9 fields */ @@ -519,7 +519,7 @@ extern ICOM_VTABLE(IDirect3DResource9) Direct3DResource9_Vtbl; struct IDirect3DResource9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DResource9); + IDirect3DResource9Vtbl *lpVtbl; DWORD ref; /* IDirect3DResource9 fields */ @@ -558,7 +558,7 @@ extern ICOM_VTABLE(IDirect3DSurface9) Direct3DSurface9_Vtbl; struct IDirect3DSurface9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DSurface9); + IDirect3DSurface9Vtbl *lpVtbl; DWORD ref; /* IDirect3DResource9 fields */ @@ -618,7 +618,7 @@ extern ICOM_VTABLE(IDirect3DVertexBuffer9) Direct3DVertexBuffer9_Vtbl; struct IDirect3DVertexBuffer9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DVertexBuffer9); + IDirect3DVertexBuffer9Vtbl *lpVtbl; DWORD ref; /* IDirect3DResource9 fields */ @@ -666,7 +666,7 @@ extern ICOM_VTABLE(IDirect3DIndexBuffer9) Direct3DIndexBuffer9_Vtbl; struct IDirect3DIndexBuffer9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DIndexBuffer9); + IDirect3DIndexBuffer9Vtbl *lpVtbl; DWORD ref; /* IDirect3DResource9 fields */ @@ -714,7 +714,7 @@ extern ICOM_VTABLE(IDirect3DBaseTexture9) Direct3DBaseTexture9_Vtbl; struct IDirect3DBaseTexture9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DBaseTexture9); + IDirect3DBaseTexture9Vtbl *lpVtbl; DWORD ref; /* IDirect3DResource9 fields */ @@ -766,7 +766,7 @@ extern ICOM_VTABLE(IDirect3DCubeTexture9) Direct3DCubeTexture9_Vtbl; struct IDirect3DCubeTexture9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DCubeTexture9); + IDirect3DCubeTexture9Vtbl *lpVtbl; DWORD ref; /* IDirect3DResource9 fields */ @@ -830,7 +830,7 @@ extern ICOM_VTABLE(IDirect3DTexture9) Direct3DTexture9_Vtbl; struct IDirect3DTexture9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DTexture9); + IDirect3DTexture9Vtbl *lpVtbl; DWORD ref; /* IDirect3DResource9 fields */ @@ -895,7 +895,7 @@ extern ICOM_VTABLE(IDirect3DVolumeTexture9) Direct3DVolumeTexture9_Vtbl; struct IDirect3DVolumeTexture9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DVolumeTexture9); + IDirect3DVolumeTexture9Vtbl *lpVtbl; DWORD ref; /* IDirect3DResource9 fields */ @@ -960,7 +960,7 @@ extern ICOM_VTABLE(IDirect3DStateBlock9) Direct3DStateBlock9_Vtbl; */ struct IDirect3DStateBlock9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DStateBlock9); + IDirect3DStateBlock9Vtbl *lpVtbl; DWORD ref; /* IDirect3DStateBlock9 fields */ @@ -1058,7 +1058,7 @@ extern ICOM_VTABLE(IDirect3DVertexDeclaration9) Direct3DVertexDeclaration9_Vtbl; */ struct IDirect3DVertexDeclaration9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DVertexDeclaration9); + IDirect3DVertexDeclaration9Vtbl *lpVtbl; DWORD ref; /* IDirect3DVertexDeclaration9 fields */ @@ -1097,7 +1097,7 @@ extern ICOM_VTABLE(IDirect3DVertexShader9) Direct3DVertexShader9_Vtbl; */ struct IDirect3DVertexShader9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DVertexShader9); + IDirect3DVertexShader9Vtbl *lpVtbl; DWORD ref; /* IDirect3DVertexDeclaration9 fields */ @@ -1139,7 +1139,7 @@ extern ICOM_VTABLE(IDirect3DPixelShader9) Direct3DPixelShader9_Vtbl; */ struct IDirect3DPixelShader9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DPixelShader9); + IDirect3DPixelShader9Vtbl *lpVtbl; DWORD ref; /* IDirect3DPixelShader9 fields */ @@ -1180,7 +1180,7 @@ extern ICOM_VTABLE(IDirect3DQuery9) Direct3DQuery9_Vtbl; */ struct IDirect3DQuery9Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirect3DQuery9); + IDirect3DQuery9Vtbl *lpVtbl; DWORD ref; /* IDirect3DQuery9 fields */ diff --git a/dlls/d3dx8/d3dx8core_private.h b/dlls/d3dx8/d3dx8core_private.h index 54aba71fbcb..e01bd5ec2ea 100644 --- a/dlls/d3dx8/d3dx8core_private.h +++ b/dlls/d3dx8/d3dx8core_private.h @@ -46,7 +46,7 @@ extern ICOM_VTABLE(ID3DXBuffer) D3DXBuffer_Vtbl; struct ID3DXBufferImpl { /* IUnknown fields */ - ICOM_VFIELD(ID3DXBuffer); + ID3DXBufferVtbl *lpVtbl; DWORD ref; /* ID3DXBuffer fields */ @@ -78,7 +78,7 @@ extern ICOM_VTABLE(ID3DXFont) D3DXFont_Vtbl; struct ID3DXFontImpl { /* IUnknown fields */ - ICOM_VFIELD(ID3DXFont); + ID3DXFontVtbl *lpVtbl; DWORD ref; /* ID3DXFont fields */ diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index bc6790623cf..82a2cf099c8 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -48,19 +48,19 @@ extern DWORD dll_ref; typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } ClassFactoryImpl; typedef struct { - ICOM_VFIELD(ICreateDevEnum); + ICreateDevEnumVtbl *lpVtbl; DWORD ref; } CreateDevEnumImpl; typedef struct { - ICOM_VFIELD(IEnumMoniker); + IEnumMonikerVtbl *lpVtbl; DWORD ref; DWORD index; HKEY hkey; @@ -68,7 +68,7 @@ typedef struct typedef struct { - ICOM_VFIELD(IMoniker); + IMonikerVtbl *lpVtbl; DWORD ref; HKEY hkey; @@ -76,14 +76,14 @@ typedef struct typedef struct { - ICOM_VFIELD(IPropertyBag); + IPropertyBagVtbl *lpVtbl; DWORD ref; HKEY hkey; } RegPropBagImpl; typedef struct { - ICOM_VFIELD(IParseDisplayName); + IParseDisplayNameVtbl *lpVtbl; DWORD ref; } ParseDisplayNameImpl; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 452837f1bdf..c6352c85471 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -30,7 +30,7 @@ typedef struct IDirectInputDevice2AImpl IDirectInputDevice2AImpl; struct IDirectInputDevice2AImpl { - ICOM_VFIELD(IDirectInputDevice2A); + IDirectInputDevice2AVtbl *lpVtbl; DWORD ref; GUID guid; }; diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index c29e29dab3c..50e47e1caf4 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -627,7 +627,7 @@ static ICOM_VTABLE(IDirectInput8W) ddi8wvt = { typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index 89a523c025b..a85c364e0ab 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmband); typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index 95b932d4562..cdbe4513717 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmcompos); typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 0588026f095..965ca3c721a 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -122,7 +122,7 @@ extern HRESULT WINAPI IDirectMusicChordMapImpl_IPersistStream_GetSizeMax (LPPERS */ struct IDirectMusicComposerImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectMusicComposer); + IDirectMusicComposerVtbl *lpVtbl; DWORD ref; /* IDirectMusicComposerImpl fields */ diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c index 56521a4216e..1e87a073589 100644 --- a/dlls/dmime/dmime_main.c +++ b/dlls/dmime/dmime_main.c @@ -25,7 +25,7 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index c1c52aa44f3..b85fb7681fd 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -192,7 +192,7 @@ typedef struct DMUSIC_PRIVATE_PCHANNEL_ { */ struct IDirectMusicPerformance8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirectMusicPerformance8); + IDirectMusicPerformance8Vtbl *lpVtbl; DWORD ref; /* IDirectMusicPerformanceImpl fields */ @@ -361,7 +361,7 @@ extern HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_GetSizeMax (LPPERS */ struct IDirectMusicSegmentState8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirectMusicSegmentState8); + IDirectMusicSegmentState8Vtbl *lpVtbl; DWORD ref; /* IDirectMusicSegmentState8Impl fields */ @@ -481,7 +481,7 @@ extern HRESULT WINAPI IDirectMusicAudioPathImpl_IPersistStream_GetSizeMax (LPPER */ struct IDirectMusicTool8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirectMusicTool8); + IDirectMusicTool8Vtbl *lpVtbl; DWORD ref; /* IDirectMusicTool8Impl fields */ @@ -505,7 +505,7 @@ extern HRESULT WINAPI IDirectMusicTool8Impl_Clone (LPDIRECTMUSICTOOL8 iface, IDi */ struct IDirectMusicPatternTrackImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectMusicPatternTrack); + IDirectMusicPatternTrackVtbl *lpVtbl; DWORD ref; /* IDirectMusicPatternTrackImpl fields */ diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index 454f5dbabcc..4f2d0e5e80b 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -105,7 +105,7 @@ extern HRESULT WINAPI DMUSIC_DestroyDirectMusicLoaderGenericStream (LPSTREAM ifa */ struct IDirectMusicLoaderCF { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD dwRef; }; @@ -122,7 +122,7 @@ extern HRESULT WINAPI IDirectMusicLoaderCF_LockServer (LPCLASSFACTORY iface,BOOL */ struct IDirectMusicContainerCF { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD dwRef; }; diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index b027c8abb1f..f63311b6907 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmscript); typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index dfaf6982dd0..e27da159f04 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -23,7 +23,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmstyle); typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 66a17abdbe9..152aeae7b39 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmsynth); typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index f9f2c137041..546d2e609a4 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -62,7 +62,7 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicSynthSinkImpl (LPCGUID lpcGUID, LP */ struct IDirectMusicSynth8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirectMusicSynth8); + IDirectMusicSynth8Vtbl *lpVtbl; DWORD ref; /* IDirectMusicSynth8 fields */ @@ -106,7 +106,7 @@ extern HRESULT WINAPI IDirectMusicSynth8Impl_AssignChannelToBuses (LPDIRECTMUSIC */ struct IDirectMusicSynthSinkImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectMusicSynthSink); + IDirectMusicSynthSinkVtbl *lpVtbl; DWORD ref; /* IDirectMusicSynthSinkImpl fields */ diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index c4c13363e4b..6bf9da1b733 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dmusic); typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 07195777671..564857279b9 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -108,7 +108,7 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicInstrumentImpl (LPCGUID lpcGUID, L */ struct IDirectMusic8Impl { /* IUnknown fields */ - ICOM_VFIELD(IDirectMusic8); + IDirectMusic8Vtbl *lpVtbl; DWORD ref; /* IDirectMusicImpl fields */ @@ -139,7 +139,7 @@ extern HRESULT WINAPI IDirectMusic8Impl_SetExternalMasterClock (LPDIRECTMUSIC8 i */ struct IDirectMusicBufferImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectMusicBuffer); + IDirectMusicBufferVtbl *lpVtbl; DWORD ref; /* IDirectMusicBufferImpl fields */ @@ -170,7 +170,7 @@ extern HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes (LPDIRECTMUSICBUFFER i */ struct IDirectMusicDownloadedInstrumentImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectMusicDownloadedInstrument); + IDirectMusicDownloadedInstrumentVtbl *lpVtbl; DWORD ref; /* IDirectMusicDownloadedInstrumentImpl fields */ @@ -189,7 +189,7 @@ extern ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release (LPDIRECTMUSI */ struct IDirectMusicDownloadImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectMusicDownload); + IDirectMusicDownloadVtbl *lpVtbl; DWORD ref; /* IDirectMusicDownloadImpl fields */ @@ -208,7 +208,7 @@ extern HRESULT WINAPI IDirectMusicDownloadImpl_GetBuffer (LPDIRECTMUSICDOWNLOAD */ struct IDirectMusicPortDownloadImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectMusicPortDownload); + IDirectMusicPortDownloadVtbl *lpVtbl; DWORD ref; /* IDirectMusicPortDownloadImpl fields */ @@ -231,7 +231,7 @@ extern HRESULT WINAPI IDirectMusicPortDownloadImpl_Unload (LPDIRECTMUSICPORTDOWN */ struct IDirectMusicPortImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectMusicPort); + IDirectMusicPortVtbl *lpVtbl; DWORD ref; /* IDirectMusicPortImpl fields */ @@ -272,7 +272,7 @@ extern HRESULT WINAPI IDirectMusicPortImpl_GetFormat (LPDIRECTMUSICPORT iface, L */ struct IDirectMusicThruImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectMusicThru); + IDirectMusicThruVtbl *lpVtbl; DWORD ref; /* IDirectMusicThruImpl fields */ @@ -290,7 +290,7 @@ extern HRESULT WINAPI ThruChannel (LPDIRECTMUSICTHRU iface, DWORD dwSourceChanne */ struct IReferenceClockImpl { /* IUnknown fields */ - ICOM_VFIELD(IReferenceClock); + IReferenceClockVtbl *lpVtbl; DWORD ref; /* IReferenceClockImpl fields */ diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index e9523a796a2..c50b919f251 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dplay); typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; diff --git a/dlls/dplayx/dplay_global.h b/dlls/dplayx/dplay_global.h index f00941809f0..3840e6727db 100644 --- a/dlls/dplayx/dplay_global.h +++ b/dlls/dplayx/dplay_global.h @@ -215,19 +215,19 @@ typedef struct tagDirectPlay4Data struct IDirectPlay2Impl { - ICOM_VFIELD(IDirectPlay2); + IDirectPlay2Vtbl *lpVtbl; DP_IMPL_FIELDS }; struct IDirectPlay3Impl { - ICOM_VFIELD(IDirectPlay3); + IDirectPlay3Vtbl *lpVtbl; DP_IMPL_FIELDS }; struct IDirectPlay4Impl { - ICOM_VFIELD(IDirectPlay4); + IDirectPlay4Vtbl *lpVtbl; DP_IMPL_FIELDS }; diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index a0acd747800..1372e4912a2 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -68,7 +68,7 @@ typedef struct tagDirectPlaySPData struct IDirectPlaySPImpl { - ICOM_VFIELD(IDirectPlaySP); + IDirectPlaySPVtbl *lpVtbl; DPSP_IMPL_FIELDS }; diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 913c50adcfa..eb537714661 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -118,19 +118,19 @@ typedef struct tagDirectPlayLobby3Data struct IDirectPlayLobbyImpl { - ICOM_VFIELD(IDirectPlayLobby); + IDirectPlayLobbyVtbl *lpVtbl; DPL_IMPL_FIELDS }; struct IDirectPlayLobby2Impl { - ICOM_VFIELD(IDirectPlayLobby2); + IDirectPlayLobby2Vtbl *lpVtbl; DPL_IMPL_FIELDS }; struct IDirectPlayLobby3Impl { - ICOM_VFIELD(IDirectPlayLobby3); + IDirectPlayLobby3Vtbl *lpVtbl; DPL_IMPL_FIELDS }; diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index ea130147cc0..40170c03cea 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -55,7 +55,7 @@ typedef struct tagDPLobbySPData struct IDPLobbySPImpl { - ICOM_VFIELD(IDPLobbySP); + IDPLobbySPVtbl *lpVtbl; DPLSP_IMPL_FIELDS }; diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index 627798da329..bfd8436a88d 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -65,7 +65,7 @@ HRESULT WINAPI DirectPlay8Create(REFGUID lpGUID, LPVOID *ppvInt, LPUNKNOWN punkO typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; REFCLSID rclsid; HRESULT (*pfnCreateInstanceFactory)(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index e7f97156342..1f3dc8cf795 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -50,7 +50,7 @@ extern ICOM_VTABLE(IDirectPlay8Client) DirectPlay8Client_Vtbl; struct IDirectPlay8ClientImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectPlay8Client); + IDirectPlay8ClientVtbl *lpVtbl; DWORD ref; /* IDirectPlay8Client fields */ }; @@ -96,7 +96,7 @@ extern ICOM_VTABLE(IDirectPlay8Address) DirectPlay8Address_Vtbl; struct IDirectPlay8AddressImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectPlay8Address); + IDirectPlay8AddressVtbl *lpVtbl; DWORD ref; /* IDirectPlay8Address fields */ GUID SP_guid; diff --git a/dlls/dsound/dsound_private.h b/dlls/dsound/dsound_private.h index 8a37e61e6d3..5168045c9cb 100644 --- a/dlls/dsound/dsound_private.h +++ b/dlls/dsound/dsound_private.h @@ -70,7 +70,7 @@ typedef struct IClassFactoryImpl IClassFactoryImpl; struct IDirectSoundImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectSound8); + IDirectSound8Vtbl *lpVtbl; DWORD ref; /* IDirectSoundImpl fields */ GUID guid; @@ -131,7 +131,7 @@ HRESULT WINAPI DSOUND_Create8( * IDirectSound COM components */ struct IDirectSound_IUnknown { - ICOM_VFIELD(IUnknown); + IUnknownVtbl *lpVtbl; DWORD ref; LPDIRECTSOUND8 pds; }; @@ -141,7 +141,7 @@ HRESULT WINAPI IDirectSound_IUnknown_Create( LPUNKNOWN * ppunk); struct IDirectSound_IDirectSound { - ICOM_VFIELD(IDirectSound); + IDirectSoundVtbl *lpVtbl; DWORD ref; LPDIRECTSOUND8 pds; }; @@ -154,7 +154,7 @@ HRESULT WINAPI IDirectSound_IDirectSound_Create( * IDirectSound8 COM components */ struct IDirectSound8_IUnknown { - ICOM_VFIELD(IUnknown); + IUnknownVtbl *lpVtbl; DWORD ref; LPDIRECTSOUND8 pds; }; @@ -164,7 +164,7 @@ HRESULT WINAPI IDirectSound8_IUnknown_Create( LPUNKNOWN * ppunk); struct IDirectSound8_IDirectSound { - ICOM_VFIELD(IDirectSound); + IDirectSoundVtbl *lpVtbl; DWORD ref; LPDIRECTSOUND8 pds; }; @@ -174,7 +174,7 @@ HRESULT WINAPI IDirectSound8_IDirectSound_Create( LPDIRECTSOUND * ppds); struct IDirectSound8_IDirectSound8 { - ICOM_VFIELD(IDirectSound8); + IDirectSound8Vtbl *lpVtbl; DWORD ref; LPDIRECTSOUND8 pds; }; @@ -190,7 +190,7 @@ struct IDirectSoundBufferImpl { /* FIXME: document */ /* IUnknown fields */ - ICOM_VFIELD(IDirectSoundBuffer8); + IDirectSoundBuffer8Vtbl *lpVtbl; DWORD ref; /* IDirectSoundBufferImpl fields */ SecondaryBufferImpl* dsb; @@ -240,7 +240,7 @@ HRESULT WINAPI IDirectSoundBufferImpl_Destroy( */ struct SecondaryBufferImpl { - ICOM_VFIELD(IDirectSoundBuffer8); + IDirectSoundBuffer8Vtbl *lpVtbl; DWORD ref; IDirectSoundBufferImpl* dsb; }; @@ -256,7 +256,7 @@ HRESULT WINAPI SecondaryBufferImpl_Destroy( */ struct PrimaryBufferImpl { - ICOM_VFIELD(IDirectSoundBuffer8); + IDirectSoundBuffer8Vtbl *lpVtbl; DWORD ref; IDirectSoundImpl* dsound; }; @@ -272,7 +272,7 @@ HRESULT WINAPI PrimaryBufferImpl_Create( struct IDirectSoundCaptureImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectSoundCapture); + IDirectSoundCaptureVtbl *lpVtbl; DWORD ref; /* IDirectSoundCaptureImpl fields */ @@ -309,7 +309,7 @@ struct IDirectSoundCaptureImpl struct IDirectSoundCaptureBufferImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectSoundCaptureBuffer8); + IDirectSoundCaptureBuffer8Vtbl *lpVtbl; DWORD ref; /* IDirectSoundCaptureBufferImpl fields */ @@ -331,7 +331,7 @@ struct IDirectSoundCaptureBufferImpl struct IDirectSoundFullDuplexImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectSoundFullDuplex); + IDirectSoundFullDuplexVtbl *lpVtbl; DWORD ref; /* IDirectSoundFullDuplexImpl fields */ @@ -344,7 +344,7 @@ struct IDirectSoundFullDuplexImpl struct IDirectSoundNotifyImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectSoundNotify); + IDirectSoundNotifyVtbl *lpVtbl; DWORD ref; IDirectSoundBufferImpl* dsb; }; @@ -361,7 +361,7 @@ HRESULT WINAPI IDirectSoundNotifyImpl_Destroy( struct IDirectSoundCaptureNotifyImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectSoundNotify); + IDirectSoundNotifyVtbl *lpVtbl; DWORD ref; IDirectSoundCaptureBufferImpl* dscb; }; @@ -376,7 +376,7 @@ HRESULT WINAPI IDirectSoundCaptureNotifyImpl_Create( struct IDirectSound3DListenerImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectSound3DListener); + IDirectSound3DListenerVtbl *lpVtbl; DWORD ref; /* IDirectSound3DListenerImpl fields */ IDirectSoundImpl* dsound; @@ -392,7 +392,7 @@ HRESULT WINAPI IDirectSound3DListenerImpl_Create( struct IKsBufferPropertySetImpl { /* IUnknown fields */ - ICOM_VFIELD(IKsPropertySet); + IKsPropertySetVtbl *lpVtbl; DWORD ref; /* IKsPropertySetImpl fields */ IDirectSoundBufferImpl* dsb; @@ -410,7 +410,7 @@ HRESULT WINAPI IKsBufferPropertySetImpl_Destroy( struct IKsPrivatePropertySetImpl { /* IUnknown fields */ - ICOM_VFIELD(IKsPropertySet); + IKsPropertySetVtbl *lpVtbl; DWORD ref; }; @@ -423,7 +423,7 @@ HRESULT WINAPI IKsPrivatePropertySetImpl_Create( struct IDirectSound3DBufferImpl { /* IUnknown fields */ - ICOM_VFIELD(IDirectSound3DBuffer); + IDirectSound3DBufferVtbl *lpVtbl; DWORD ref; /* IDirectSound3DBufferImpl fields */ IDirectSoundBufferImpl* dsb; @@ -441,7 +441,7 @@ HRESULT WINAPI IDirectSound3DBufferImpl_Destroy( struct IClassFactoryImpl { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; }; diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index a10df0886d2..97656a9db77 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dswave); typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; diff --git a/dlls/dxdiagn/dxdiag_main.c b/dlls/dxdiagn/dxdiag_main.c index 35ffc5e2be2..8519f66faed 100644 --- a/dlls/dxdiagn/dxdiag_main.c +++ b/dlls/dxdiagn/dxdiag_main.c @@ -40,7 +40,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpvReserved) */ typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; REFCLSID rclsid; HRESULT (*pfnCreateInstanceFactory)(LPCLASSFACTORY iface, LPUNKNOWN punkOuter, REFIID riid, LPVOID *ppobj); diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h index a8531c317c4..34b5607ce5a 100644 --- a/dlls/dxdiagn/dxdiag_private.h +++ b/dlls/dxdiagn/dxdiag_private.h @@ -49,7 +49,7 @@ extern ICOM_VTABLE(IDxDiagProvider) DxDiagProvider_Vtbl; */ struct IDxDiagProviderImpl { /* IUnknown fields */ - ICOM_VFIELD(IDxDiagProvider); + IDxDiagProviderVtbl *lpVtbl; DWORD ref; /* IDxDiagProvider fields */ BOOL init; @@ -86,7 +86,7 @@ extern ICOM_VTABLE(IDxDiagContainer) DxDiagContainer_Vtbl; */ struct IDxDiagContainerImpl { /* IUnknown fields */ - ICOM_VFIELD(IDxDiagContainer); + IDxDiagContainerVtbl *lpVtbl; DWORD ref; /* IDxDiagContainer fields */ IDxDiagContainerImpl_SubContainer* subContainers; diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 3d275b3446a..88273147fea 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -79,7 +79,7 @@ static const WCHAR szCat2Fmt[] = typedef struct { - ICOM_VFIELD(IEnumDMO); + IEnumDMOVtbl *lpVtbl; DWORD ref; DWORD index; const GUID* guidCategory; diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index eec2cd8dc2e..f779f84eabf 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1377,7 +1377,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 91b3791d170..af0b2d98d09 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -48,7 +48,7 @@ typedef struct BindCtxObject{ /* BindCtx data strucrture */ typedef struct BindCtxImpl{ - ICOM_VFIELD(IBindCtx); /* VTable relative to the IBindCtx interface.*/ + IBindCtxVtbl *lpVtbl; /* VTable relative to the IBindCtx interface.*/ ULONG ref; /* reference counter for this object */ diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index 0bee6453d7e..ab1833f9fad 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -133,7 +133,7 @@ typedef struct OLEClipbrd OLEClipbrd; typedef struct { /* IEnumFORMATETC VTable */ - ICOM_VFIELD(IEnumFORMATETC); + IEnumFORMATETCVtbl *lpVtbl; /* IEnumFORMATETC fields */ UINT posFmt; /* current enumerator position */ diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 6cc0c63e533..22d10f61781 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -66,7 +66,7 @@ typedef struct CompositeMonikerImpl{ /* EnumMoniker data structure */ typedef struct EnumMonikerImpl{ - ICOM_VFIELD(IEnumMoniker); /* VTable relative to the IEnumMoniker interface.*/ + IEnumMonikerVtbl *lpVtbl; /* VTable relative to the IEnumMoniker interface.*/ ULONG ref; /* reference counter for this object */ diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index d0e39f09444..e67c7142f69 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -35,9 +35,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); typedef struct _FTMarshalImpl { - ICOM_VFIELD (IUnknown); + IUnknownVtbl *lpVtbl; DWORD ref; - ICOM_VTABLE (IMarshal) * lpvtblFTM; + IMarshalVtbl *lpvtblFTM; IUnknown *pUnkOuter; } FTMarshalImpl; diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index c343d3709fb..fe426fce48c 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -70,7 +70,7 @@ typedef struct StdGITEntry /* Class data */ typedef struct StdGlobalInterfaceTableImpl { - ICOM_VFIELD(IGlobalInterfaceTable); + IGlobalInterfaceTableVtbl *lpVtbl; ULONG ref; struct StdGITEntry* firstEntry; diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index ba6e5870c58..6612d6ef4b1 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -52,7 +52,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); */ struct HGLOBALStreamImpl { - ICOM_VFIELD(IStream); /* Needs to be the first item in the stuct + IStreamVtbl *lpVtbl; /* Needs to be the first item in the stuct * since we want to cast this in a IStream pointer */ /* diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 6fa2cd5f3ec..90e5eb326a7 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -48,7 +48,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(olemalloc); static ICOM_VTABLE(IMalloc) VT_IMalloc32; typedef struct { - ICOM_VFIELD(IMalloc); + IMallocVtbl *lpVtbl; DWORD dummy; /* nothing, we are static */ IMallocSpy * pSpy; /* the spy when active */ DWORD SpyedAllocationsLeft; /* number of spyed allocations left */ @@ -364,7 +364,7 @@ static ICOM_VTABLE(IMalloc) VT_IMalloc32 = static ICOM_VTABLE(IMallocSpy) VT_IMallocSpy; typedef struct { - ICOM_VFIELD(IMallocSpy); + IMallocSpyVtbl *lpVtbl; DWORD ref; } _MallocSpy; diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c index 00bbabe2a68..5929011cfcd 100644 --- a/dlls/ole32/memlockbytes.c +++ b/dlls/ole32/memlockbytes.c @@ -53,7 +53,7 @@ struct HGLOBALLockBytesImpl * Needs to be the first item in the stuct * since we want to cast this in an ILockBytes pointer */ - ICOM_VFIELD(ILockBytes); + ILockBytesVtbl *lpVtbl; /* * Reference count diff --git a/dlls/ole32/memlockbytes16.c b/dlls/ole32/memlockbytes16.c index 22e14f91775..90677181d84 100644 --- a/dlls/ole32/memlockbytes16.c +++ b/dlls/ole32/memlockbytes16.c @@ -52,7 +52,7 @@ struct HGLOBALLockBytesImpl16 * Needs to be the first item in the stuct * since we want to cast this in an ILockBytes pointer */ - ICOM_VFIELD(ILockBytes16); + ILockBytes16Vtbl *lpVtbl; ULONG ref; /* diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 7612b1ceb46..5d24abed3c6 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -58,7 +58,7 @@ typedef struct RunObject{ /* define the RunningObjectTableImpl structure */ typedef struct RunningObjectTableImpl{ - ICOM_VFIELD(IRunningObjectTable); + IRunningObjectTableVtbl *lpVtbl; ULONG ref; RunObject* runObjTab; /* pointer to the first object in the table */ diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index 61e980e088d..fb81fc5f462 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -64,7 +64,7 @@ LPMALLOC16 currentMalloc16=NULL; typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IMalloc16); + IMalloc16Vtbl *lpVtbl; DWORD ref; /* IMalloc16 fields */ } IMalloc16Impl; diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index cced63a3066..dd39e673d97 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); */ typedef struct OleAdviseHolderImpl { - ICOM_VFIELD(IOleAdviseHolder); + IOleAdviseHolderVtbl *lpVtbl; DWORD ref; @@ -369,7 +369,7 @@ typedef struct DataAdviseConnection { typedef struct DataAdviseHolder { - ICOM_VFIELD(IDataAdviseHolder); + IDataAdviseHolderVtbl *lpVtbl; DWORD ref; DWORD maxCons; diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c index 664d661cec3..abed7bd5b0d 100644 --- a/dlls/ole32/storage.c +++ b/dlls/ole32/storage.c @@ -954,7 +954,7 @@ STORAGE_get_free_pps_entry(HANDLE hf) { typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IStream16); + IStream16Vtbl *lpVtbl; DWORD ref; /* IStream16 fields */ SEGPTR thisptr; /* pointer to this struct as segmented */ @@ -1448,7 +1448,7 @@ static void _create_istream16(LPSTREAM16 *str) { typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IStream); + IStreamVtbl *lpVtbl; DWORD ref; /* IStream32 fields */ struct storage_pps_entry stde; @@ -1502,7 +1502,7 @@ ULONG WINAPI IStream_fnRelease(IStream* iface) { typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IStorage16); + IStorage16Vtbl *lpVtbl; DWORD ref; /* IStorage16 fields */ SEGPTR thisptr; /* pointer to this struct as segmented */ diff --git a/dlls/ole32/storage32.h b/dlls/ole32/storage32.h index f9b0fb27334..05ceaed9727 100644 --- a/dlls/ole32/storage32.h +++ b/dlls/ole32/storage32.h @@ -204,7 +204,7 @@ HRESULT OLECONVERT_CreateCompObjStream(LPSTORAGE pStorage, LPCSTR strOleTypeName */ struct StorageBaseImpl { - ICOM_VFIELD(IStorage); /* Needs to be the first item in the struct + IStorageVtbl *lpVtbl; /* Needs to be the first item in the struct * since we want to cast this in a Storage32 pointer */ /* @@ -298,7 +298,7 @@ HRESULT WINAPI StorageBaseImpl_SetClass( */ struct StorageImpl { - ICOM_VFIELD(IStorage); /* Needs to be the first item in the struct + IStorageVtbl *lpVtbl; /* Needs to be the first item in the struct * since we want to cast this in a Storage32 pointer */ /* @@ -498,7 +498,7 @@ void Storage32Impl_SetExtDepotBlock(StorageImpl* This, */ struct StorageInternalImpl { - ICOM_VFIELD(IStorage); /* Needs to be the first item in the struct + IStorageVtbl *lpVtbl; /* Needs to be the first item in the struct * since we want to cast this in a Storage32 pointer */ /* @@ -542,8 +542,8 @@ HRESULT WINAPI StorageInternalImpl_Revert( */ struct IEnumSTATSTGImpl { - ICOM_VFIELD(IEnumSTATSTG); /* Needs to be the first item in the struct - * since we want to cast this in a IEnumSTATSTG pointer */ + IEnumSTATSTGVtbl *lpVtbl; /* Needs to be the first item in the struct + * since we want to cast this in a IEnumSTATSTG pointer */ ULONG ref; /* Reference count */ StorageImpl* parentStorage; /* Reference to the parent storage */ @@ -627,8 +627,8 @@ INT IEnumSTATSTGImpl_FindParentProperty( */ struct StgStreamImpl { - ICOM_VFIELD(IStream); /* Needs to be the first item in the struct - * since we want to cast this in a IStream pointer */ + IStreamVtbl *lpVtbl; /* Needs to be the first item in the struct + * since we want to cast this in a IStream pointer */ /* * Reference count diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index e867b652751..187a9f4a3dd 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -239,7 +239,7 @@ HRESULT WINAPI CreateDispTypeInfo( typedef struct { - ICOM_VFIELD(IDispatch); + IDispatchVtbl *lpVtbl; void * pvThis; ITypeInfo * pTypeInfo; ULONG ref; diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 7f8498d8a51..8aaeff9af61 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -1955,7 +1955,7 @@ static ICOM_VTABLE(IPersistStreamInit) OLEFontImpl_IPersistStreamInit_VTable = typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index c4fa0e8c0ed..a28877d09f4 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -1638,7 +1638,7 @@ HRESULT WINAPI OleLoadPictureEx( LPSTREAM lpstream, LONG lSize, BOOL fRunmode, typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index 012904749a4..ce5429ea938 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -483,7 +483,7 @@ typedef struct tagINTERNAL_BSTR typedef struct { - ICOM_VFIELD(IDispatch); + IDispatchVtbl *lpVtbl; ULONG ref; VARTYPE vt; BOOL bFailInvoke; diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 781626a5eb9..853d2898e15 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -853,8 +853,8 @@ typedef struct tagTLBImpLib /* internal ITypeLib data */ typedef struct tagITypeLibImpl { - ICOM_VFIELD(ITypeLib2); - ICOM_VTABLE(ITypeComp) * lpVtblTypeComp; + ITypeLib2Vtbl *lpVtbl; + ITypeCompVtbl *lpVtblTypeComp; UINT ref; TLIBATTR LibAttr; /* guid,lcid,syskind,version,flags */ @@ -964,8 +964,8 @@ typedef struct tagTLBImplType /* internal TypeInfo data */ typedef struct tagITypeInfoImpl { - ICOM_VFIELD(ITypeInfo2); - ICOM_VTABLE(ITypeComp) * lpVtblTypeComp; + ITypeInfo2Vtbl *lpVtbl; + ITypeCompVtbl *lpVtblTypeComp; UINT ref; TYPEATTR TypeAttr ; /* _lots_ of type information. */ ITypeLibImpl * pTypeLib; /* back pointer to typelib */ diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index d7564760e06..4171ab0a541 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -146,8 +146,8 @@ typedef struct tagMSFT_ImpFile { typedef struct tagICreateTypeLib2Impl { - ICOM_VFIELD(ICreateTypeLib2); - ICOM_VTABLE(ITypeLib2) *lpVtblTypeLib2; + ICreateTypeLib2Vtbl *lpVtbl; + ITypeLib2Vtbl *lpVtblTypeLib2; UINT ref; @@ -172,8 +172,8 @@ typedef struct tagICreateTypeLib2Impl typedef struct tagICreateTypeInfo2Impl { - ICOM_VFIELD(ICreateTypeInfo2); - ICOM_VTABLE(ITypeInfo2) *lpVtblTypeInfo2; + ICreateTypeInfo2Vtbl *lpVtbl; + ITypeInfo2Vtbl *lpVtblTypeInfo2; UINT ref; diff --git a/dlls/quartz/enummoniker.c b/dlls/quartz/enummoniker.c index 80f26cd7912..ec3fbe73315 100644 --- a/dlls/quartz/enummoniker.c +++ b/dlls/quartz/enummoniker.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct EnumMonikerImpl { - ICOM_VFIELD(IEnumMoniker); + IEnumMonikerVtbl *lpVtbl; ULONG ref; IMoniker ** ppMoniker; ULONG nMonikerCount; diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index a102b863b18..965f19dffbd 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -44,8 +44,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct FilterMapper2Impl { - ICOM_VFIELD(IFilterMapper2); - ICOM_VTABLE(IFilterMapper) * lpVtblFilterMapper; + IFilterMapper2Vtbl *lpVtbl; + IFilterMapperVtbl *lpVtblFilterMapper; ULONG refCount; } FilterMapper2Impl; diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 2d5e7648048..7325ab2636b 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -39,7 +39,7 @@ struct SystemClockAdviseEntry { }; typedef struct SystemClockImpl { - ICOM_VFIELD(IReferenceClock); + IReferenceClockVtbl *lpVtbl; ULONG ref; /** IReferenceClock */ diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index 26ddb25c56e..e7d9ed29162 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -77,7 +77,7 @@ static HMODULE LoadCOM(void) * (which also implements the MInterfacePointer structure) */ typedef struct RpcStreamImpl { - ICOM_VFIELD(IStream); + IStreamVtbl *lpVtbl; DWORD RefCount; PMIDL_STUB_MESSAGE pMsg; LPDWORD size; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 82133f5c583..9139f49dabf 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -41,7 +41,7 @@ typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; } IClassFactoryImpl; @@ -54,7 +54,7 @@ extern IClassFactoryImpl SHDOCVW_ClassFactory; typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IOleObject); + IOleObjectVtbl *lpVtbl; DWORD ref; } IOleObjectImpl; @@ -67,7 +67,7 @@ extern IOleObjectImpl SHDOCVW_OleObject; typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IOleInPlaceObject); + IOleInPlaceObjectVtbl *lpVtbl; DWORD ref; } IOleInPlaceObjectImpl; @@ -80,7 +80,7 @@ extern IOleInPlaceObjectImpl SHDOCVW_OleInPlaceObject; typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IOleControl); + IOleControlVtbl *lpVtbl; DWORD ref; } IOleControlImpl; @@ -93,7 +93,7 @@ extern IOleControlImpl SHDOCVW_OleControl; typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IWebBrowser); + IWebBrowserVtbl *lpVtbl; DWORD ref; } IWebBrowserImpl; @@ -106,7 +106,7 @@ extern IWebBrowserImpl SHDOCVW_WebBrowser; typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IProvideClassInfo); + IProvideClassInfoVtbl *lpVtbl; DWORD ref; } IProvideClassInfoImpl; @@ -119,7 +119,7 @@ extern IProvideClassInfoImpl SHDOCVW_ProvideClassInfo; typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IProvideClassInfo2); + IProvideClassInfo2Vtbl *lpVtbl; DWORD ref; } IProvideClassInfo2Impl; @@ -132,7 +132,7 @@ extern IProvideClassInfo2Impl SHDOCVW_ProvideClassInfo2; typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IPersistStorage); + IPersistStorageVtbl *lpVtbl; DWORD ref; } IPersistStorageImpl; @@ -145,7 +145,7 @@ extern IPersistStorageImpl SHDOCVW_PersistStorage; typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IPersistStreamInit); + IPersistStreamInitVtbl *lpVtbl; DWORD ref; } IPersistStreamInitImpl; @@ -158,7 +158,7 @@ extern IPersistStreamInitImpl SHDOCVW_PersistStreamInit; typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IQuickActivate); + IQuickActivateVtbl *lpVtbl; DWORD ref; } IQuickActivateImpl; @@ -171,7 +171,7 @@ extern IQuickActivateImpl SHDOCVW_QuickActivate; typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IConnectionPointContainer); + IConnectionPointContainerVtbl *lpVtbl; DWORD ref; } IConnectionPointContainerImpl; @@ -184,7 +184,7 @@ extern IConnectionPointContainerImpl SHDOCVW_ConnectionPointContainer; typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IConnectionPoint); + IConnectionPointVtbl *lpVtbl; DWORD ref; } IConnectionPointImpl; diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index ebc2bfcc304..8747b1ee6ab 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -59,8 +59,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { - ICOM_VFIELD(IAutoComplete); - ICOM_VTABLE (IAutoComplete2) * lpvtblAutoComplete2; + IAutoCompleteVtbl *lpVtbl; + IAutoComplete2Vtbl *lpvtblAutoComplete2; DWORD ref; BOOL enabled; HWND hwndEdit; diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 6cc7f052331..bb2961ba65d 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -57,12 +57,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); */ typedef struct { - ICOM_VFIELD(IShellFolder2); - DWORD ref; - - ICOM_VTABLE(IPersistFolder2)* lpVtblPersistFolder2; - ICOM_VTABLE(IShellExecuteHookW)* lpVtblShellExecuteHookW; - ICOM_VTABLE(IShellExecuteHookA)* lpVtblShellExecuteHookA; + IShellFolder2Vtbl *lpVtbl; + DWORD ref; + IPersistFolder2Vtbl *lpVtblPersistFolder2; + IShellExecuteHookWVtbl *lpVtblShellExecuteHookW; + IShellExecuteHookAVtbl *lpVtblShellExecuteHookA; IUnknown *pUnkOuter; /* used for aggregation */ diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index b4ab270a387..2f5592dc0fe 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IEnumFORMATETC); + IEnumFORMATETCVtbl *lpVtbl; DWORD ref; /* IEnumFORMATETC fields */ UINT posFmt; @@ -208,7 +208,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnClone(LPENUMFORMATETC iface, LPENUMFORMAT typedef struct { /* IUnknown fields */ - ICOM_VFIELD(IDataObject); + IDataObjectVtbl *lpVtbl; DWORD ref; /* IDataObject fields */ diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c index 7e4753510aa..63319f9c453 100644 --- a/dlls/shell32/dragdrophelper.c +++ b/dlls/shell32/dragdrophelper.c @@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); */ typedef struct { - ICOM_VFIELD (IDropTargetHelper); + IDropTargetHelperVtbl *lpVtbl; DWORD ref; } IDropTargetHelperImpl; diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 07122012bb9..1e6b3d56041 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -45,7 +45,7 @@ typedef struct tagENUMLIST typedef struct { - ICOM_VFIELD(IEnumIDList); + IEnumIDListVtbl *lpVtbl; DWORD ref; LPENUMLIST mpFirst; LPENUMLIST mpLast; diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index 2cb6673172b..b9f0d3662a7 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -46,11 +46,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); */ typedef struct { - ICOM_VFIELD(IExtractIconW); - DWORD ref; - ICOM_VTABLE(IPersistFile)* lpvtblPersistFile; - ICOM_VTABLE(IExtractIconA)* lpvtblExtractIconA; - LPITEMIDLIST pidl; + IExtractIconWVtbl *lpVtbl; + DWORD ref; + IPersistFileVtbl *lpvtblPersistFile; + IExtractIconAVtbl *lpvtblExtractIconA; + LPITEMIDLIST pidl; } IExtractIconWImpl; static struct ICOM_VTABLE(IExtractIconA) eiavt; diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 832a83095bf..7560294eb37 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -121,12 +121,12 @@ static ICOM_VTABLE(IPersistStream) psvt; typedef struct { - ICOM_VFIELD(IShellLinkA); - DWORD ref; + IShellLinkAVtbl *lpVtbl; + DWORD ref; - ICOM_VTABLE(IShellLinkW)* lpvtblw; - ICOM_VTABLE(IPersistFile)* lpvtblPersistFile; - ICOM_VTABLE(IPersistStream)* lpvtblPersistStream; + IShellLinkWVtbl *lpvtblw; + IPersistFileVtbl *lpvtblPersistFile; + IPersistStreamVtbl *lpvtblPersistStream; /* data structures according to the informations in the link */ LPITEMIDLIST pPidl; diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 85b482d27cc..07c11ce7ca6 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -278,7 +278,7 @@ static ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32; /* this is the static object instance */ typedef struct { - ICOM_VFIELD(IMalloc); + IMallocVtbl *lpVtbl; DWORD dummy; } _ShellMalloc; @@ -498,7 +498,7 @@ HRESULT WINAPI SHGetDesktopFolder(IShellFolder **psf) typedef struct { - ICOM_VFIELD(IClassFactory); + IClassFactoryVtbl *lpVtbl; DWORD ref; CLSID *rclsid; LPFNCREATEINSTANCE lpfnCI; diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index ebfb1babefd..eb0fc4a59fe 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); */ typedef struct { - ICOM_VFIELD (IShellFolder2); + IShellFolder2Vtbl *lpVtbl; DWORD ref; CLSID *pclsid; diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index d0f9ed173b4..9244d480563 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -58,12 +58,12 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); */ typedef struct { - ICOM_VFIELD (IUnknown); - DWORD ref; - ICOM_VTABLE (IShellFolder2) * lpvtblShellFolder; - ICOM_VTABLE (IPersistFolder3) * lpvtblPersistFolder3; - ICOM_VTABLE (IDropTarget) * lpvtblDropTarget; - ICOM_VTABLE (ISFHelper) * lpvtblSFHelper; + IUnknownVtbl *lpVtbl; + DWORD ref; + IShellFolder2Vtbl *lpvtblShellFolder; + IPersistFolder3Vtbl *lpvtblPersistFolder3; + IDropTargetVtbl *lpvtblDropTarget; + ISFHelperVtbl *lpvtblSFHelper; IUnknown *pUnkOuter; /* used for aggregation */ diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 28699c85bb8..a55bb7f962a 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -55,9 +55,9 @@ WINE_DEFAULT_DEBUG_CHANNEL (shell); */ typedef struct { - ICOM_VFIELD (IShellFolder2); - DWORD ref; - ICOM_VTABLE (IPersistFolder2) * lpVtblPersistFolder2; + IShellFolder2Vtbl *lpVtbl; + DWORD ref; + IPersistFolder2Vtbl *lpVtblPersistFolder2; /* both paths are parsible from the desktop */ LPITEMIDLIST pidlRoot; /* absolute pidl */ diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index 0804b1bb6db..69c5d490af0 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(pidl); */ typedef struct { - ICOM_VFIELD(IFileSystemBindData); + IFileSystemBindDataVtbl *lpVtbl; DWORD ref; WIN32_FIND_DATAW findFile; } IFileSystemBindDataImpl; diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 45a315452c7..365d41c9a05 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -74,12 +74,13 @@ typedef struct }LISTVIEW_SORT_INFO, *LPLISTVIEW_SORT_INFO; typedef struct -{ ICOM_VFIELD(IShellView); - DWORD ref; - ICOM_VTABLE(IOleCommandTarget)* lpvtblOleCommandTarget; - ICOM_VTABLE(IDropTarget)* lpvtblDropTarget; - ICOM_VTABLE(IDropSource)* lpvtblDropSource; - ICOM_VTABLE(IViewObject)* lpvtblViewObject; +{ + IShellViewVtbl* lpVtbl; + DWORD ref; + IOleCommandTargetVtbl* lpvtblOleCommandTarget; + IDropTargetVtbl* lpvtblDropTarget; + IDropSourceVtbl* lpvtblDropSource; + IViewObjectVtbl* lpvtblViewObject; IShellFolder* pSFParent; IShellFolder2* pSF2Parent; IShellBrowser* pShellBrowser; diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index c4174fab11f..b7e6b59012f 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); */ typedef struct { - ICOM_VFIELD(IContextMenu2); + IContextMenu2Vtbl *lpVtbl; IShellFolder* pSFParent; DWORD ref; } BgCmImpl; diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index 293764467be..e41f97236e1 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -41,7 +41,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); * IContextMenu Implementation */ typedef struct -{ ICOM_VFIELD(IContextMenu2); +{ IContextMenu2Vtbl *lpVtbl; DWORD ref; IShellFolder* pSFParent; LPITEMIDLIST pidl; /* root pidl */ diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 4f6e4035430..97b173d2dea 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -58,7 +58,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct { - ICOM_VFIELD(IQueryAssociations); + IQueryAssociationsVtbl *lpVtbl; LONG ref; HKEY hkeySource; HKEY hkeyProgID; diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index a669ca17ccd..2f8c3ed261f 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); /* Layout of ISHFileStream object */ typedef struct { - ICOM_VFIELD(IStream); + IStreamVtbl *lpVtbl; ULONG ref; HANDLE hFile; DWORD dwMode; diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index be8db334215..033e942da4f 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shell); typedef struct -{ ICOM_VFIELD(IStream); +{ IStreamVtbl *lpVtbl; DWORD ref; HKEY hKey; LPBYTE pbBuffer; diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c index 6af4811639b..5bbcd66be6c 100644 --- a/dlls/winmm/winealsa/audio.c +++ b/dlls/winmm/winealsa/audio.c @@ -2095,7 +2095,7 @@ typedef struct IDsDriverBufferImpl IDsDriverBufferImpl; struct IDsDriverImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsDriver); + IDsDriverVtbl *lpVtbl; DWORD ref; /* IDsDriverImpl fields */ UINT wDevID; @@ -2105,7 +2105,7 @@ struct IDsDriverImpl struct IDsDriverBufferImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsDriverBuffer); + IDsDriverBufferVtbl *lpVtbl; DWORD ref; /* IDsDriverBufferImpl fields */ IDsDriverImpl* drv; diff --git a/dlls/winmm/winealsa/audio_05.c b/dlls/winmm/winealsa/audio_05.c index f4da52c5beb..7b62bddcdcf 100644 --- a/dlls/winmm/winealsa/audio_05.c +++ b/dlls/winmm/winealsa/audio_05.c @@ -1359,7 +1359,7 @@ typedef struct IDsDriverBufferImpl IDsDriverBufferImpl; struct IDsDriverImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsDriver); + IDsDriverVtbl *lpVtbl; DWORD ref; /* IDsDriverImpl fields */ UINT wDevID; @@ -1369,7 +1369,7 @@ struct IDsDriverImpl struct IDsDriverBufferImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsDriverBuffer); + IDsDriverBufferVtbl *lpVtbl; DWORD ref; /* IDsDriverBufferImpl fields */ IDsDriverImpl* drv; diff --git a/dlls/winmm/wineaudioio/audio.c b/dlls/winmm/wineaudioio/audio.c index e4d21996bdb..a1002cffaf6 100644 --- a/dlls/winmm/wineaudioio/audio.c +++ b/dlls/winmm/wineaudioio/audio.c @@ -1285,7 +1285,7 @@ typedef struct IDsDriverBufferImpl IDsDriverBufferImpl; struct IDsDriverImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsDriver); + IDsDriverVtbl *lpVtbl; DWORD ref; /* IDsDriverImpl fields */ UINT wDevID; @@ -1295,7 +1295,7 @@ struct IDsDriverImpl struct IDsDriverBufferImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsDriverBuffer); + IDsDriverBufferVtbl *lpVtbl; DWORD ref; /* IDsDriverBufferImpl fields */ IDsDriverImpl* drv; diff --git a/dlls/winmm/winejack/audio.c b/dlls/winmm/winejack/audio.c index 52e4779a00f..ffe35f1b5e8 100644 --- a/dlls/winmm/winejack/audio.c +++ b/dlls/winmm/winejack/audio.c @@ -1784,7 +1784,7 @@ typedef struct IDsDriverBufferImpl IDsDriverBufferImpl; struct IDsDriverImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsDriver); + IDsDriverVtbl *lpVtbl; DWORD ref; /* IDsDriverImpl fields */ UINT wDevID; @@ -1794,7 +1794,7 @@ struct IDsDriverImpl struct IDsDriverBufferImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsDriverBuffer); + IDsDriverBufferVtbl *lpVtbl; DWORD ref; /* IDsDriverBufferImpl fields */ IDsDriverImpl* drv; diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c index e65f68f801e..5828f97daa2 100644 --- a/dlls/winmm/wineoss/audio.c +++ b/dlls/winmm/wineoss/audio.c @@ -2306,7 +2306,7 @@ typedef struct IDsDriverBufferImpl IDsDriverBufferImpl; struct IDsDriverPropertySetImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsDriverPropertySet); + IDsDriverPropertySetVtbl *lpVtbl; DWORD ref; IDsDriverBufferImpl* buffer; @@ -2315,7 +2315,7 @@ struct IDsDriverPropertySetImpl struct IDsDriverNotifyImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsDriverNotify); + IDsDriverNotifyVtbl *lpVtbl; DWORD ref; /* IDsDriverNotifyImpl fields */ @@ -2328,7 +2328,7 @@ struct IDsDriverNotifyImpl struct IDsDriverImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsDriver); + IDsDriverVtbl *lpVtbl; DWORD ref; /* IDsDriverImpl fields */ @@ -2342,7 +2342,7 @@ struct IDsDriverImpl struct IDsDriverBufferImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsDriverBuffer); + IDsDriverBufferVtbl *lpVtbl; DWORD ref; /* IDsDriverBufferImpl fields */ @@ -3950,7 +3950,7 @@ typedef struct IDsCaptureDriverBufferImpl IDsCaptureDriverBufferImpl; struct IDsCaptureDriverPropertySetImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsDriverPropertySet); + IDsDriverPropertySetVtbl *lpVtbl; DWORD ref; IDsCaptureDriverBufferImpl* capture_buffer; @@ -3959,7 +3959,7 @@ struct IDsCaptureDriverPropertySetImpl struct IDsCaptureDriverNotifyImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsDriverNotify); + IDsDriverNotifyVtbl *lpVtbl; DWORD ref; IDsCaptureDriverBufferImpl* capture_buffer; @@ -3968,7 +3968,7 @@ struct IDsCaptureDriverNotifyImpl struct IDsCaptureDriverImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsCaptureDriver); + IDsCaptureDriverVtbl *lpVtbl; DWORD ref; /* IDsCaptureDriverImpl fields */ @@ -3979,7 +3979,7 @@ struct IDsCaptureDriverImpl struct IDsCaptureDriverBufferImpl { /* IUnknown fields */ - ICOM_VFIELD(IDsCaptureDriverBuffer); + IDsCaptureDriverBufferVtbl *lpVtbl; DWORD ref; /* IDsCaptureDriverBufferImpl fields */ diff --git a/include/objbase.h b/include/objbase.h index 2f9f0d8d72b..bed45fab2c7 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -298,7 +298,6 @@ /* Wine-specific macros */ #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))