From 48c4bb3c31ee09e3266ef2c3d83984a1199e5278 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 12 Aug 2004 23:00:51 +0000 Subject: [PATCH] Get rid of the non-standard ICOM_VTABLE macro. --- dlls/amstream/amstream.c | 4 +- dlls/amstream/main.c | 2 +- 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 | 10 +- dlls/comcat/factory.c | 2 +- dlls/comcat/information.c | 8 +- dlls/comcat/manager.c | 2 +- dlls/comcat/register.c | 2 +- dlls/commdlg/filedlgbrowser.c | 18 ++-- dlls/d3d8/basetexture.c | 2 +- dlls/d3d8/cubetexture.c | 2 +- dlls/d3d8/d3d8_private.h | 32 +++--- dlls/d3d8/device.c | 2 +- dlls/d3d8/directx.c | 2 +- dlls/d3d8/indexbuffer.c | 2 +- dlls/d3d8/resource.c | 2 +- dlls/d3d8/surface.c | 2 +- dlls/d3d8/swapchain.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d8/vertexbuffer.c | 2 +- dlls/d3d8/volume.c | 2 +- dlls/d3d8/volumetexture.c | 2 +- dlls/d3d9/basetexture.c | 2 +- dlls/d3d9/cubetexture.c | 2 +- dlls/d3d9/d3d9_private.h | 34 +++--- dlls/d3d9/device.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/d3d9/indexbuffer.c | 2 +- dlls/d3d9/pixelshader.c | 2 +- dlls/d3d9/query.c | 2 +- dlls/d3d9/resource.c | 2 +- dlls/d3d9/stateblock.c | 2 +- dlls/d3d9/surface.c | 2 +- dlls/d3d9/swapchain.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/d3d9/vertexbuffer.c | 2 +- dlls/d3d9/vertexdeclaration.c | 2 +- dlls/d3d9/vertexshader.c | 2 +- dlls/d3d9/volume.c | 2 +- dlls/d3d9/volumetexture.c | 2 +- dlls/d3dx8/d3dx8core_private.h | 4 +- dlls/d3dx8/d3dxbuffer.c | 2 +- dlls/d3dxof/d3dxof.c | 28 ++--- dlls/d3dxof/main.c | 2 +- dlls/ddraw/d3ddevice/mesa.c | 8 +- dlls/ddraw/d3dexecutebuffer.c | 2 +- dlls/ddraw/d3dlight.c | 2 +- dlls/ddraw/d3dmaterial.c | 6 +- dlls/ddraw/d3dtexture.c | 4 +- dlls/ddraw/d3dvertexbuffer.c | 4 +- dlls/ddraw/d3dviewport.c | 2 +- dlls/ddraw/dclipper/main.c | 4 +- dlls/ddraw/ddraw/hal.c | 4 +- dlls/ddraw/ddraw/main.c | 10 +- dlls/ddraw/ddraw/thunks.c | 6 +- dlls/ddraw/ddraw/user.c | 4 +- dlls/ddraw/direct3d/mesa.c | 8 +- dlls/ddraw/dpalette/hal.c | 4 +- dlls/ddraw/dpalette/main.c | 4 +- dlls/ddraw/dsurface/dib.c | 4 +- dlls/ddraw/dsurface/fakezbuffer.c | 4 +- dlls/ddraw/dsurface/gamma.c | 2 +- dlls/ddraw/dsurface/hal.c | 4 +- dlls/ddraw/dsurface/main.h | 2 +- dlls/ddraw/dsurface/thunks.c | 2 +- dlls/ddraw/dsurface/thunks.h | 2 +- dlls/ddraw/dsurface/user.c | 4 +- dlls/ddraw/main.c | 2 +- dlls/devenum/createdevenum.c | 4 +- dlls/devenum/factory.c | 2 +- dlls/devenum/mediacatenum.c | 6 +- dlls/devenum/parsedisplayname.c | 2 +- dlls/dinput/dinput_main.c | 18 ++-- dlls/dinput/joystick_linux.c | 8 +- dlls/dinput/joystick_linuxinput.c | 8 +- dlls/dinput/keyboard.c | 8 +- dlls/dinput/mouse.c | 8 +- dlls/dmband/band.c | 8 +- dlls/dmband/bandtrack.c | 6 +- dlls/dmband/dmband_main.c | 4 +- dlls/dmband/dmband_private.h | 28 ++--- dlls/dmcompos/chordmap.c | 8 +- dlls/dmcompos/chordmaptrack.c | 6 +- dlls/dmcompos/composer.c | 2 +- dlls/dmcompos/dmcompos_main.c | 10 +- dlls/dmcompos/dmcompos_private.h | 42 ++++---- dlls/dmcompos/signposttrack.c | 6 +- dlls/dmime/audiopath.c | 8 +- dlls/dmime/dmime_main.c | 28 ++--- dlls/dmime/dmime_private.h | 164 ++++++++++++++--------------- dlls/dmime/graph.c | 8 +- dlls/dmime/lyricstrack.c | 6 +- dlls/dmime/markertrack.c | 6 +- dlls/dmime/paramcontroltrack.c | 6 +- dlls/dmime/patterntrack.c | 2 +- dlls/dmime/performance.c | 2 +- dlls/dmime/segment.c | 8 +- dlls/dmime/segmentstate.c | 2 +- dlls/dmime/segtriggertrack.c | 6 +- dlls/dmime/seqtrack.c | 6 +- dlls/dmime/sysextrack.c | 6 +- dlls/dmime/tempotrack.c | 6 +- dlls/dmime/timesigtrack.c | 6 +- dlls/dmime/tool.c | 2 +- dlls/dmime/wavetrack.c | 6 +- dlls/dmloader/classfactory.c | 4 +- dlls/dmloader/container.c | 6 +- dlls/dmloader/dmloader_private.h | 44 ++++---- dlls/dmloader/loader.c | 2 +- dlls/dmloader/loaderstream.c | 12 +-- dlls/dmscript/dmscript_main.c | 20 ++-- dlls/dmscript/dmscript_private.h | 28 ++--- dlls/dmscript/script.c | 8 +- dlls/dmscript/scripttrack.c | 6 +- dlls/dmstyle/auditiontrack.c | 6 +- dlls/dmstyle/chordtrack.c | 6 +- dlls/dmstyle/commandtrack.c | 6 +- dlls/dmstyle/dmstyle_main.c | 16 +-- dlls/dmstyle/dmstyle_private.h | 100 +++++++++--------- dlls/dmstyle/motiftrack.c | 6 +- dlls/dmstyle/mutetrack.c | 6 +- dlls/dmstyle/style.c | 8 +- dlls/dmstyle/styletrack.c | 6 +- dlls/dmsynth/dmsynth_main.c | 4 +- dlls/dmsynth/dmsynth_private.h | 4 +- dlls/dmsynth/synth.c | 2 +- dlls/dmsynth/synthsink.c | 2 +- dlls/dmusic/buffer.c | 2 +- dlls/dmusic/clock.c | 2 +- dlls/dmusic/collection.c | 8 +- dlls/dmusic/dmusic.c | 2 +- dlls/dmusic/dmusic_main.c | 4 +- dlls/dmusic/dmusic_private.h | 40 +++---- dlls/dmusic/download.c | 2 +- dlls/dmusic/downloadedinstrument.c | 2 +- dlls/dmusic/instrument.c | 4 +- dlls/dmusic/port.c | 2 +- dlls/dmusic/portdownload.c | 2 +- dlls/dmusic/thru.c | 2 +- dlls/dplayx/dpclassfactory.c | 2 +- dlls/dplayx/dplay.c | 24 ++--- dlls/dplayx/dplaysp.c | 4 +- dlls/dplayx/dplobby.c | 24 ++--- dlls/dplayx/lobbysp.c | 4 +- dlls/dpnet/address.c | 2 +- dlls/dpnet/client.c | 2 +- dlls/dpnet/dpnet_main.c | 2 +- dlls/dpnet/dpnet_private.h | 4 +- dlls/dsound/buffer.c | 6 +- dlls/dsound/capture.c | 18 ++-- dlls/dsound/dsound.c | 12 +-- dlls/dsound/dsound_main.c | 4 +- dlls/dsound/primary.c | 2 +- dlls/dsound/propset.c | 4 +- dlls/dsound/sound3d.c | 4 +- dlls/dswave/dswave.c | 8 +- dlls/dswave/dswave_main.c | 2 +- dlls/dswave/dswave_private.h | 16 +-- dlls/dxdiagn/container.c | 2 +- dlls/dxdiagn/dxdiag_main.c | 2 +- dlls/dxdiagn/dxdiag_private.h | 4 +- dlls/dxdiagn/provider.c | 2 +- dlls/mlang/mlang.c | 22 ++-- dlls/msdmo/dmoreg.c | 4 +- dlls/msi/msi.c | 2 +- dlls/ole32/antimoniker.c | 8 +- dlls/ole32/bindctx.c | 2 +- dlls/ole32/clipboard.c | 6 +- dlls/ole32/compobj_private.h | 4 +- dlls/ole32/compositemoniker.c | 10 +- dlls/ole32/datacache.c | 24 ++--- dlls/ole32/defaulthandler.c | 16 +-- dlls/ole32/errorinfo.c | 18 ++-- dlls/ole32/filemoniker.c | 8 +- dlls/ole32/ftmarshal.c | 4 +- dlls/ole32/git.c | 6 +- dlls/ole32/hglobalstream.c | 2 +- dlls/ole32/ifs.c | 8 +- dlls/ole32/itemmoniker.c | 8 +- dlls/ole32/marshal.c | 8 +- dlls/ole32/memlockbytes.c | 2 +- dlls/ole32/memlockbytes16.c | 4 +- dlls/ole32/moniker.c | 2 +- dlls/ole32/ole16.c | 6 +- dlls/ole32/oleobj.c | 4 +- dlls/ole32/oleproxy.c | 16 +-- dlls/ole32/rpc.c | 4 +- dlls/ole32/stg_stream.c | 2 +- dlls/ole32/storage.c | 14 +-- dlls/ole32/storage32.c | 6 +- dlls/oleaut32/connpt.c | 12 +-- dlls/oleaut32/dispatch.c | 2 +- dlls/oleaut32/olefont.c | 30 +++--- dlls/oleaut32/olepicture.c | 26 ++--- dlls/oleaut32/tests/safearray.c | 10 +- dlls/oleaut32/tests/vartype.c | 2 +- dlls/oleaut32/tmarshal.c | 12 +-- dlls/oleaut32/typelib.c | 16 +-- dlls/oleaut32/typelib2.c | 8 +- dlls/quartz/enummoniker.c | 4 +- dlls/quartz/filtergraph.c | 36 +++---- dlls/quartz/filtermapper.c | 8 +- dlls/quartz/main.c | 2 +- dlls/quartz/systemclock.c | 4 +- dlls/rpcrt4/cproxy.c | 6 +- dlls/rpcrt4/cpsf.c | 2 +- dlls/rpcrt4/ndr_ole.c | 2 +- dlls/shdocvw/classinfo.c | 4 +- dlls/shdocvw/events.c | 4 +- dlls/shdocvw/factory.c | 2 +- dlls/shdocvw/misc.c | 2 +- dlls/shdocvw/oleobject.c | 6 +- dlls/shdocvw/persist.c | 4 +- dlls/shdocvw/webbrowser.c | 2 +- dlls/shell32/autocomplete.c | 8 +- dlls/shell32/cpanelfolder.c | 16 +-- dlls/shell32/dataobject.c | 6 +- dlls/shell32/dragdrophelper.c | 4 +- dlls/shell32/enumidlist.c | 4 +- dlls/shell32/folders.c | 12 +-- dlls/shell32/memorystream.c | 4 +- dlls/shell32/shelllink.c | 16 +-- dlls/shell32/shellole.c | 8 +- dlls/shell32/shfldr_desktop.c | 4 +- dlls/shell32/shfldr_fs.c | 20 ++-- dlls/shell32/shfldr_mycomp.c | 8 +- dlls/shell32/shlfsbind.c | 2 +- dlls/shell32/shlview.c | 20 ++-- dlls/shell32/shv_bg_cmenu.c | 4 +- dlls/shell32/shv_item_cmenu.c | 4 +- dlls/shlwapi/assoc.c | 4 +- dlls/shlwapi/istream.c | 2 +- dlls/shlwapi/regstream.c | 4 +- dlls/urlmon/umon.c | 8 +- dlls/winmm/winealsa/audio.c | 4 +- dlls/winmm/winealsa/audio_05.c | 4 +- dlls/winmm/wineaudioio/audio.c | 4 +- dlls/winmm/wineoss/audio.c | 16 +-- include/objbase.h | 5 +- include/rpcproxy.h | 4 +- 247 files changed, 972 insertions(+), 973 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index c478e2a4aee..128bf338b88 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -37,7 +37,7 @@ typedef struct { int ref; } IAMMultiMediaStreamImpl; -static struct ICOM_VTABLE(IAMMultiMediaStream) AM_Vtbl; +static struct IAMMultiMediaStreamVtbl AM_Vtbl; HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) { @@ -243,7 +243,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface, return S_FALSE; } -static ICOM_VTABLE(IAMMultiMediaStream) AM_Vtbl = +static IAMMultiMediaStreamVtbl AM_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IAMMultiMediaStreamImpl_QueryInterface, diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index b230c1b5eb1..f6ed67d2681 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -140,7 +140,7 @@ static HRESULT WINAPI AMCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) DSCF_Vtbl = +static IClassFactoryVtbl DSCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE AMCF_QueryInterface, diff --git a/dlls/avifil32/acmstream.c b/dlls/avifil32/acmstream.c index 63a7efec395..50b3d07b760 100644 --- a/dlls/avifil32/acmstream.c +++ b/dlls/avifil32/acmstream.c @@ -54,7 +54,7 @@ static HRESULT WINAPI ACMStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp, static HRESULT WINAPI ACMStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size); static HRESULT WINAPI ACMStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); -struct ICOM_VTABLE(IAVIStream) iacmst = { +struct IAVIStreamVtbl iacmst = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ACMStream_fnQueryInterface, ACMStream_fnAddRef, diff --git a/dlls/avifil32/avifile.c b/dlls/avifil32/avifile.c index b6ec19d2042..1c87a65ce37 100644 --- a/dlls/avifil32/avifile.c +++ b/dlls/avifil32/avifile.c @@ -69,7 +69,7 @@ static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile*iface,DWORD ckid,LPVOID lpDat static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile*iface); static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam); -struct ICOM_VTABLE(IAVIFile) iavift = { +struct IAVIFileVtbl iavift = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IAVIFile_fnQueryInterface, IAVIFile_fnAddRef, @@ -93,7 +93,7 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile*iface,LPCOLESTR pszFileNa static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile*iface,LPCOLESTR pszFileName); static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile*iface,LPOLESTR*ppszFileName); -struct ICOM_VTABLE(IPersistFile) ipersistft = { +struct IPersistFileVtbl ipersistft = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IPersistFile_fnQueryInterface, IPersistFile_fnAddRef, @@ -121,7 +121,7 @@ static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size); static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); -struct ICOM_VTABLE(IAVIStream) iavist = { +struct IAVIStreamVtbl iavist = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IAVIStream_fnQueryInterface, IAVIStream_fnAddRef, diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 65e60cadbc4..3036c996679 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -75,7 +75,7 @@ static HRESULT WINAPI IAVIEditStream_fnClone(IAVIEditStream*iface, static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface, LPAVISTREAMINFOW asi,LONG size); -struct ICOM_VTABLE(IAVIEditStream) ieditstream = { +struct IAVIEditStreamVtbl ieditstream = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IAVIEditStream_fnQueryInterface, IAVIEditStream_fnAddRef, @@ -111,7 +111,7 @@ static HRESULT WINAPI IEditAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc, LPVOID lp,LONG size); static HRESULT WINAPI IEditAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); -struct ICOM_VTABLE(IAVIStream) ieditstast = { +struct IAVIStreamVtbl ieditstast = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IEditAVIStream_fnQueryInterface, IEditAVIStream_fnAddRef, @@ -134,7 +134,7 @@ static ULONG WINAPI IEditStreamInternal_fnAddRef(IEditStreamInternal*iface); static ULONG WINAPI IEditStreamInternal_fnRelease(IEditStreamInternal*iface); static HRESULT WINAPI IEditStreamInternal_fnGetEditStreamImpl(IEditStreamInternal*iface,LPVOID*ppimpl); -struct ICOM_VTABLE(IEditStreamInternal) ieditstreaminternal = { +struct IEditStreamInternalVtbl ieditstreaminternal = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IEditStreamInternal_fnQueryInterface, IEditStreamInternal_fnAddRef, diff --git a/dlls/avifil32/factory.c b/dlls/avifil32/factory.c index 91ec9eddc56..88ec8df9105 100644 --- a/dlls/avifil32/factory.c +++ b/dlls/avifil32/factory.c @@ -48,7 +48,7 @@ static ULONG WINAPI IClassFactory_fnRelease(LPCLASSFACTORY iface); static HRESULT WINAPI IClassFactory_fnCreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj); static HRESULT WINAPI IClassFactory_fnLockServer(LPCLASSFACTORY iface,BOOL dolock); -static ICOM_VTABLE(IClassFactory) iclassfact = { +static IClassFactoryVtbl iclassfact = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IClassFactory_fnQueryInterface, IClassFactory_fnAddRef, diff --git a/dlls/avifil32/getframe.c b/dlls/avifil32/getframe.c index cc6ded7d0bb..5b89aacee44 100644 --- a/dlls/avifil32/getframe.c +++ b/dlls/avifil32/getframe.c @@ -54,7 +54,7 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface, LPVOID lpBits, INT x, INT y, INT dx, INT dy); -struct ICOM_VTABLE(IGetFrame) igetframeVtbl = { +struct IGetFrameVtbl igetframeVtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IGetFrame_fnQueryInterface, IGetFrame_fnAddRef, diff --git a/dlls/avifil32/icmstream.c b/dlls/avifil32/icmstream.c index 8f0c0929044..b0b3f11579e 100644 --- a/dlls/avifil32/icmstream.c +++ b/dlls/avifil32/icmstream.c @@ -57,7 +57,7 @@ static HRESULT WINAPI ICMStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp, static HRESULT WINAPI ICMStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size); static HRESULT WINAPI ICMStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); -struct ICOM_VTABLE(IAVIStream) iicmst = { +struct IAVIStreamVtbl iicmst = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICMStream_fnQueryInterface, ICMStream_fnAddRef, diff --git a/dlls/avifil32/tmpfile.c b/dlls/avifil32/tmpfile.c index 1bf777d4998..4d5d2758bef 100644 --- a/dlls/avifil32/tmpfile.c +++ b/dlls/avifil32/tmpfile.c @@ -50,7 +50,7 @@ static HRESULT WINAPI ITmpFile_fnReadData(IAVIFile*iface,DWORD ckid,LPVOID lpDat static HRESULT WINAPI ITmpFile_fnEndRecord(IAVIFile*iface); static HRESULT WINAPI ITmpFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam); -struct ICOM_VTABLE(IAVIFile) itmpft = { +struct IAVIFileVtbl itmpft = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ITmpFile_fnQueryInterface, ITmpFile_fnAddRef, diff --git a/dlls/avifil32/wavfile.c b/dlls/avifil32/wavfile.c index 626d63ea324..f366aa6cdd6 100644 --- a/dlls/avifil32/wavfile.c +++ b/dlls/avifil32/wavfile.c @@ -99,7 +99,7 @@ static HRESULT WINAPI IAVIFile_fnReadData(IAVIFile*iface,DWORD ckid,LPVOID lpDat static HRESULT WINAPI IAVIFile_fnEndRecord(IAVIFile*iface); static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam); -struct ICOM_VTABLE(IAVIFile) iwavft = { +struct IAVIFileVtbl iwavft = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IAVIFile_fnQueryInterface, IAVIFile_fnAddRef, @@ -123,7 +123,7 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile*iface,LPCOLESTR pszFileNa static HRESULT WINAPI IPersistFile_fnSaveCompleted(IPersistFile*iface,LPCOLESTR pszFileName); static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile*iface,LPOLESTR*ppszFileName); -struct ICOM_VTABLE(IPersistFile) iwavpft = { +struct IPersistFileVtbl iwavpft = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IPersistFile_fnQueryInterface, IPersistFile_fnAddRef, @@ -151,7 +151,7 @@ static HRESULT WINAPI IAVIStream_fnReadData(IAVIStream*iface,DWORD fcc,LPVOID lp static HRESULT WINAPI IAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size); static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); -struct ICOM_VTABLE(IAVIStream) iwavst = { +struct IAVIStreamVtbl iwavst = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IAVIStream_fnQueryInterface, IAVIStream_fnAddRef, diff --git a/dlls/comcat/comcat_private.h b/dlls/comcat/comcat_private.h index bfdc50f20ed..7e02b9f6cf3 100644 --- a/dlls/comcat/comcat_private.h +++ b/dlls/comcat/comcat_private.h @@ -54,15 +54,15 @@ extern ClassFactoryImpl COMCAT_ClassFactory; typedef struct { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *unkVtbl; - ICOM_VTABLE(ICatRegister) *regVtbl; - ICOM_VTABLE(ICatInformation) *infVtbl; + IUnknownVtbl *unkVtbl; + ICatRegisterVtbl *regVtbl; + ICatInformationVtbl *infVtbl; DWORD ref; } ComCatMgrImpl; extern ComCatMgrImpl COMCAT_ComCatMgr; -extern ICOM_VTABLE(ICatRegister) COMCAT_ICatRegister_Vtbl; -extern ICOM_VTABLE(ICatInformation) COMCAT_ICatInformation_Vtbl; +extern ICatRegisterVtbl COMCAT_ICatRegister_Vtbl; +extern ICatInformationVtbl COMCAT_ICatInformation_Vtbl; /********************************************************************** * Global string constant declarations diff --git a/dlls/comcat/factory.c b/dlls/comcat/factory.c index 1a3f12cc5c0..d8ebb8448e8 100644 --- a/dlls/comcat/factory.c +++ b/dlls/comcat/factory.c @@ -128,7 +128,7 @@ static HRESULT WINAPI COMCAT_IClassFactory_LockServer( /********************************************************************** * IClassFactory_Vtbl */ -static ICOM_VTABLE(IClassFactory) IClassFactory_Vtbl = +static IClassFactoryVtbl IClassFactory_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE COMCAT_IClassFactory_QueryInterface, diff --git a/dlls/comcat/information.c b/dlls/comcat/information.c index d7147089297..1f2a577537a 100644 --- a/dlls/comcat/information.c +++ b/dlls/comcat/information.c @@ -276,7 +276,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumReqCategoriesOfClass( /********************************************************************** * COMCAT_ICatInformation_Vtbl */ -ICOM_VTABLE(ICatInformation) COMCAT_ICatInformation_Vtbl = +ICatInformationVtbl COMCAT_ICatInformation_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE COMCAT_ICatInformation_QueryInterface, @@ -449,7 +449,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Clone( return S_OK; } -ICOM_VTABLE(IEnumCATEGORYINFO) COMCAT_IEnumCATEGORYINFO_Vtbl = +IEnumCATEGORYINFOVtbl COMCAT_IEnumCATEGORYINFO_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE COMCAT_IEnumCATEGORYINFO_QueryInterface, @@ -757,7 +757,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Clone( return S_OK; } -ICOM_VTABLE(IEnumGUID) COMCAT_CLSID_IEnumGUID_Vtbl = +IEnumGUIDVtbl COMCAT_CLSID_IEnumGUID_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE COMCAT_CLSID_IEnumGUID_QueryInterface, @@ -932,7 +932,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Clone( return S_OK; } -ICOM_VTABLE(IEnumGUID) COMCAT_CATID_IEnumGUID_Vtbl = +IEnumGUIDVtbl COMCAT_CATID_IEnumGUID_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE COMCAT_CATID_IEnumGUID_QueryInterface, diff --git a/dlls/comcat/manager.c b/dlls/comcat/manager.c index 894529bad4b..1aef1cecf45 100644 --- a/dlls/comcat/manager.c +++ b/dlls/comcat/manager.c @@ -95,7 +95,7 @@ static ULONG WINAPI COMCAT_IUnknown_Release(LPUNKNOWN iface) /********************************************************************** * COMCAT_IUnknown_Vtbl */ -static ICOM_VTABLE(IUnknown) COMCAT_IUnknown_Vtbl = +static IUnknownVtbl COMCAT_IUnknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE COMCAT_IUnknown_QueryInterface, diff --git a/dlls/comcat/register.c b/dlls/comcat/register.c index 3b6dc57f5f2..727d39ff122 100644 --- a/dlls/comcat/register.c +++ b/dlls/comcat/register.c @@ -236,7 +236,7 @@ static HRESULT WINAPI COMCAT_ICatRegister_UnRegisterClassReqCategories( /********************************************************************** * COMCAT_ICatRegister_Vtbl */ -ICOM_VTABLE(ICatRegister) COMCAT_ICatRegister_Vtbl = +ICatRegisterVtbl COMCAT_ICatRegister_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE COMCAT_ICatRegister_QueryInterface, diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/commdlg/filedlgbrowser.c index db1ade8b0c9..f77b301f494 100644 --- a/dlls/commdlg/filedlgbrowser.c +++ b/dlls/commdlg/filedlgbrowser.c @@ -45,9 +45,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg); typedef struct { - ICOM_VTABLE(IShellBrowser) * lpVtbl; - ICOM_VTABLE(ICommDlgBrowser) * lpVtblCommDlgBrowser; - ICOM_VTABLE(IServiceProvider)* lpVtblServiceProvider; + IShellBrowserVtbl * lpVtbl; + ICommDlgBrowserVtbl * lpVtblCommDlgBrowser; + IServiceProviderVtbl* lpVtblServiceProvider; DWORD ref; /* Reference counter */ HWND hwndOwner; /* Owner dialog of the interface */ @@ -56,9 +56,9 @@ typedef struct /************************************************************************** * vtable */ -static ICOM_VTABLE(IShellBrowser) IShellBrowserImpl_Vtbl; -static ICOM_VTABLE(ICommDlgBrowser) IShellBrowserImpl_ICommDlgBrowser_Vtbl; -static ICOM_VTABLE(IServiceProvider) IShellBrowserImpl_IServiceProvider_Vtbl; +static IShellBrowserVtbl IShellBrowserImpl_Vtbl; +static ICommDlgBrowserVtbl IShellBrowserImpl_ICommDlgBrowser_Vtbl; +static IServiceProviderVtbl IShellBrowserImpl_IServiceProvider_Vtbl; /************************************************************************** * Local Prototypes @@ -630,7 +630,7 @@ HRESULT WINAPI IShellBrowserImpl_TranslateAcceleratorSB(IShellBrowser *iface, return E_NOTIMPL; } -static ICOM_VTABLE(IShellBrowser) IShellBrowserImpl_Vtbl = +static IShellBrowserVtbl IShellBrowserImpl_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE /* IUnknown */ @@ -855,7 +855,7 @@ HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IS return S_OK; } -static ICOM_VTABLE(ICommDlgBrowser) IShellBrowserImpl_ICommDlgBrowser_Vtbl = +static ICommDlgBrowserVtbl IShellBrowserImpl_ICommDlgBrowser_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE /* IUnknown */ @@ -945,7 +945,7 @@ HRESULT WINAPI IShellBrowserImpl_IServiceProvider_QueryService( } -static ICOM_VTABLE(IServiceProvider) IShellBrowserImpl_IServiceProvider_Vtbl = +static IServiceProviderVtbl IShellBrowserImpl_IServiceProvider_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE /* IUnknown */ diff --git a/dlls/d3d8/basetexture.c b/dlls/d3d8/basetexture.c index 642be184fb4..2e2b0efc9fa 100644 --- a/dlls/d3d8/basetexture.c +++ b/dlls/d3d8/basetexture.c @@ -125,7 +125,7 @@ DWORD WINAPI IDirect3DBaseTexture8Impl_GetLevelCount(LPDIRECT3DBASETEX return This->levels; } -ICOM_VTABLE(IDirect3DBaseTexture8) Direct3DBaseTexture8_Vtbl = +IDirect3DBaseTexture8Vtbl Direct3DBaseTexture8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DBaseTexture8Impl_QueryInterface, diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index 7480a129b67..7877156e511 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -280,7 +280,7 @@ HRESULT WINAPI IDirect3DCubeTexture8Impl_AddDirtyRect(LPDIRECT3DCUBETEXT } -ICOM_VTABLE(IDirect3DCubeTexture8) Direct3DCubeTexture8_Vtbl = +IDirect3DCubeTexture8Vtbl Direct3DCubeTexture8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DCubeTexture8Impl_QueryInterface, diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index 50c46fffd10..a76da6a594d 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -273,7 +273,7 @@ struct PLIGHTINFOEL { /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3D8) Direct3D8_Vtbl; +extern IDirect3D8Vtbl Direct3D8_Vtbl; /***************************************************************************** * IDirect3D implementation structure @@ -323,7 +323,7 @@ extern HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adap /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DDevice8) Direct3DDevice8_Vtbl; +extern IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl; /***************************************************************************** * IDirect3DDevice8 implementation structure @@ -517,7 +517,7 @@ extern HRESULT WINAPI IDirect3DDevice8Impl_ActiveRender(LPDIRECT3DDEVICE8 ifac /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DVolume8) Direct3DVolume8_Vtbl; +extern IDirect3DVolume8Vtbl Direct3DVolume8_Vtbl; /***************************************************************************** * IDirect3DVolume8 implementation structure @@ -571,7 +571,7 @@ extern HRESULT WINAPI IDirect3DVolume8Impl_AddDirtyBox(LPDIRECT3DVOLUME8 iface, /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DSwapChain8) Direct3DSwapChain8_Vtbl; +extern IDirect3DSwapChain8Vtbl Direct3DSwapChain8_Vtbl; /***************************************************************************** * IDirect3DSwapChain8 implementation structure @@ -610,7 +610,7 @@ extern HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(LPDIRECT3DSWAPCHAIN8 /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DSurface8) Direct3DSurface8_Vtbl; +extern IDirect3DSurface8Vtbl Direct3DSurface8_Vtbl; /***************************************************************************** * IDirect3DSurface8 implementation structure @@ -668,7 +668,7 @@ extern HRESULT WINAPI IDirect3DSurface8Impl_AddDirtyRect(LPDIRECT3DSURFACE8 ifac /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DResource8) Direct3DResource8_Vtbl; +extern IDirect3DResource8Vtbl Direct3DResource8_Vtbl; /***************************************************************************** * IDirect3DResource8 implementation structure @@ -710,7 +710,7 @@ extern D3DPOOL WINAPI IDirect3DResource8Impl_GetPool(LPDIRECT3DRESOURCE8 /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DVertexBuffer8) Direct3DVertexBuffer8_Vtbl; +extern IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl; /***************************************************************************** * IDirect3DVertexBuffer8 implementation structure @@ -758,7 +758,7 @@ extern HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDesc(LPDIRECT3DVERTE /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DIndexBuffer8) Direct3DIndexBuffer8_Vtbl; +extern IDirect3DIndexBuffer8Vtbl Direct3DIndexBuffer8_Vtbl; /***************************************************************************** * IDirect3DIndexBuffer8 implementation structure @@ -806,7 +806,7 @@ extern HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDesc(LPDIRECT3DINDEXB /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DBaseTexture8) Direct3DBaseTexture8_Vtbl; +extern IDirect3DBaseTexture8Vtbl Direct3DBaseTexture8_Vtbl; /***************************************************************************** * IDirect3DBaseTexture8 implementation structure @@ -863,7 +863,7 @@ extern BOOL WINAPI IDirect3DBaseTexture8Impl_SetDirty(LPDIRECT3DBASET /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DCubeTexture8) Direct3DCubeTexture8_Vtbl; +extern IDirect3DCubeTexture8Vtbl Direct3DCubeTexture8_Vtbl; /***************************************************************************** * IDirect3DCubeTexture8 implementation structure @@ -925,7 +925,7 @@ extern HRESULT WINAPI IDirect3DCubeTexture8Impl_AddDirtyRect(LPDIRECT3DC /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DTexture8) Direct3DTexture8_Vtbl; +extern IDirect3DTexture8Vtbl Direct3DTexture8_Vtbl; /***************************************************************************** * IDirect3DTexture8 implementation structure @@ -988,7 +988,7 @@ extern HRESULT WINAPI IDirect3DTexture8Impl_AddDirtyRect(LPDIRECT3DTEXTU /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DVolumeTexture8) Direct3DVolumeTexture8_Vtbl; +extern IDirect3DVolumeTexture8Vtbl Direct3DVolumeTexture8_Vtbl; /***************************************************************************** * IDirect3DVolumeTexture8 implementation structure @@ -1077,7 +1077,7 @@ typedef struct SAVEDSTATES { /***************************************************************************** * Predeclare the interface implementation structures */ -/*extern ICOM_VTABLE(IDirect3DStateBlock9) Direct3DStateBlock9_Vtbl;*/ +/*extern IDirect3DStateBlock9Vtbl Direct3DStateBlock9_Vtbl;*/ /***************************************************************************** * IDirect3DStateBlock implementation structure @@ -1166,7 +1166,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_CaptureStateBlock(IDirect3DDevice8Impl /***************************************************************************** * Predeclare the interface implementation structures */ -/*extern ICOM_VTABLE(IDirect3DVertexShaderDeclaration9) Direct3DVertexShaderDeclaration9_Vtbl;*/ +/*extern IDirect3DVertexShaderDeclaration9Vtbl Direct3DVertexShaderDeclaration9_Vtbl;*/ /***************************************************************************** * IDirect3DVertexShaderDeclaration implementation structure @@ -1203,7 +1203,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_CreateVertexShaderDeclaration8(IDirect /***************************************************************************** * Predeclare the interface implementation structures */ -/*extern ICOM_VTABLE(IDirect3DVertexShader9) Direct3DVertexShader9_Vtbl;*/ +/*extern IDirect3DVertexShader9Vtbl Direct3DVertexShader9_Vtbl;*/ /***************************************************************************** * IDirect3DVertexShader implementation structure @@ -1252,7 +1252,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_FillVertexShaderInputArbHW(IDirect3DDe /***************************************************************************** * Predeclare the interface implementation structures */ -/*extern ICOM_VTABLE(IDirect3DPixelShader9) Direct3DPixelShader9_Vtbl;*/ +/*extern IDirect3DPixelShader9Vtbl Direct3DPixelShader9_Vtbl;*/ /***************************************************************************** * IDirect3DPixelShader implementation structure diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index c614b985c80..d282e9ee41d 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -4343,7 +4343,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetStreamSource(LPDIRECT3DDEVICE8 iface, U } -ICOM_VTABLE(IDirect3DDevice8) Direct3DDevice8_Vtbl = +IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DDevice8Impl_QueryInterface, diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index b5a9cb794c3..e24182dc159 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -1479,7 +1479,7 @@ HRESULT WINAPI IDirect3D8Impl_CreateDevice (LPDIRECT3D8 iface, return D3D_OK; } -ICOM_VTABLE(IDirect3D8) Direct3D8_Vtbl = +IDirect3D8Vtbl Direct3D8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3D8Impl_QueryInterface, diff --git a/dlls/d3d8/indexbuffer.c b/dlls/d3d8/indexbuffer.c index 7b75164f323..6655b5fd8b1 100644 --- a/dlls/d3d8/indexbuffer.c +++ b/dlls/d3d8/indexbuffer.c @@ -125,7 +125,7 @@ HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDesc(LPDIRECT3DINDEXBUFFER8 return D3D_OK; } -ICOM_VTABLE(IDirect3DIndexBuffer8) Direct3DIndexBuffer8_Vtbl = +IDirect3DIndexBuffer8Vtbl Direct3DIndexBuffer8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DIndexBuffer8Impl_QueryInterface, diff --git a/dlls/d3d8/resource.c b/dlls/d3d8/resource.c index 95da66d5cf8..608eb66f85a 100644 --- a/dlls/d3d8/resource.c +++ b/dlls/d3d8/resource.c @@ -127,7 +127,7 @@ D3DPOOL WINAPI IDirect3DResource8Impl_GetPool(LPDIRECT3DRESOURCE8 iface) { } } -ICOM_VTABLE(IDirect3DResource8) Direct3DResource8_Vtbl = +IDirect3DResource8Vtbl Direct3DResource8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DResource8Impl_QueryInterface, diff --git a/dlls/d3d8/surface.c b/dlls/d3d8/surface.c index d5bae51e601..167f6f4fb2e 100644 --- a/dlls/d3d8/surface.c +++ b/dlls/d3d8/surface.c @@ -461,7 +461,7 @@ unlock_end: } -ICOM_VTABLE(IDirect3DSurface8) Direct3DSurface8_Vtbl = +IDirect3DSurface8Vtbl Direct3DSurface8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DSurface8Impl_QueryInterface, diff --git a/dlls/d3d8/swapchain.c b/dlls/d3d8/swapchain.c index 5f853115fd3..bd4ab57d507 100644 --- a/dlls/d3d8/swapchain.c +++ b/dlls/d3d8/swapchain.c @@ -86,7 +86,7 @@ HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(LPDIRECT3DSWAPCHAIN8 iface, return D3D_OK; } -ICOM_VTABLE(IDirect3DSwapChain8) Direct3DSwapChain8_Vtbl = +IDirect3DSwapChain8Vtbl Direct3DSwapChain8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DSwapChain8Impl_QueryInterface, diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index 0d94794bf5e..8e2ec7866d3 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -233,7 +233,7 @@ HRESULT WINAPI IDirect3DTexture8Impl_AddDirtyRect(LPDIRECT3DTEXTURE8 ifa } -ICOM_VTABLE(IDirect3DTexture8) Direct3DTexture8_Vtbl = +IDirect3DTexture8Vtbl Direct3DTexture8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DTexture8Impl_QueryInterface, diff --git a/dlls/d3d8/vertexbuffer.c b/dlls/d3d8/vertexbuffer.c index d04fc3c6e3b..a4520d1e8c4 100644 --- a/dlls/d3d8/vertexbuffer.c +++ b/dlls/d3d8/vertexbuffer.c @@ -130,7 +130,7 @@ HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDesc(LPDIRECT3DVERTEXBUFFER return D3D_OK; } -ICOM_VTABLE(IDirect3DVertexBuffer8) Direct3DVertexBuffer8_Vtbl = +IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DVertexBuffer8Impl_QueryInterface, diff --git a/dlls/d3d8/volume.c b/dlls/d3d8/volume.c index 5cf44e1c693..2d88ea3e1c9 100644 --- a/dlls/d3d8/volume.c +++ b/dlls/d3d8/volume.c @@ -185,7 +185,7 @@ HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(LPDIRECT3DVOLUME8 iface) { } -ICOM_VTABLE(IDirect3DVolume8) Direct3DVolume8_Vtbl = +IDirect3DVolume8Vtbl Direct3DVolume8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DVolume8Impl_QueryInterface, diff --git a/dlls/d3d8/volumetexture.c b/dlls/d3d8/volumetexture.c index b2ac97da132..28423c44e66 100644 --- a/dlls/d3d8/volumetexture.c +++ b/dlls/d3d8/volumetexture.c @@ -257,7 +257,7 @@ HRESULT WINAPI IDirect3DVolumeTexture8Impl_AddDirtyBox(LPDIRECT3DVOLUMET } -ICOM_VTABLE(IDirect3DVolumeTexture8) Direct3DVolumeTexture8_Vtbl = +IDirect3DVolumeTexture8Vtbl Direct3DVolumeTexture8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DVolumeTexture8Impl_QueryInterface, diff --git a/dlls/d3d9/basetexture.c b/dlls/d3d9/basetexture.c index 970bc970bbb..58ad0866c0b 100644 --- a/dlls/d3d9/basetexture.c +++ b/dlls/d3d9/basetexture.c @@ -149,7 +149,7 @@ void WINAPI IDirect3DBaseTexture9Impl_GenerateMipSubLevels(LPDIRECT3DBASETEXTURE } -ICOM_VTABLE(IDirect3DBaseTexture9) Direct3DBaseTexture9_Vtbl = +IDirect3DBaseTexture9Vtbl Direct3DBaseTexture9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DBaseTexture9Impl_QueryInterface, diff --git a/dlls/d3d9/cubetexture.c b/dlls/d3d9/cubetexture.c index 9d02edaae2e..221c8cdb4c0 100644 --- a/dlls/d3d9/cubetexture.c +++ b/dlls/d3d9/cubetexture.c @@ -220,7 +220,7 @@ HRESULT WINAPI IDirect3DCubeTexture9Impl_AddDirtyRect(LPDIRECT3DCUBETEXTURE9 if } -ICOM_VTABLE(IDirect3DCubeTexture9) Direct3DCubeTexture9_Vtbl = +IDirect3DCubeTexture9Vtbl Direct3DCubeTexture9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DCubeTexture9Impl_QueryInterface, diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index c0b42e5150f..0e3eb2aaf98 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -169,7 +169,7 @@ typedef struct D3DSHADERVECTORI { /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3D9) Direct3D9_Vtbl; +extern IDirect3D9Vtbl Direct3D9_Vtbl; /***************************************************************************** * IDirect3D implementation structure @@ -214,7 +214,7 @@ extern HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adap /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DDevice9) Direct3DDevice9_Vtbl; +extern IDirect3DDevice9Vtbl Direct3DDevice9_Vtbl; /***************************************************************************** * IDirect3DDevice9 implementation structure @@ -419,7 +419,7 @@ extern HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(LPDIRECT3DDEVICE9 iface /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DVolume9) Direct3DVolume9_Vtbl; +extern IDirect3DVolume9Vtbl Direct3DVolume9_Vtbl; /***************************************************************************** * IDirect3DVolume9 implementation structure @@ -470,7 +470,7 @@ extern HRESULT WINAPI IDirect3DVolume9Impl_UnlockBox(LPDIRECT3DVOLUME9 iface); /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DSwapChain9) Direct3DSwapChain9_Vtbl; +extern IDirect3DSwapChain9Vtbl Direct3DSwapChain9_Vtbl; /***************************************************************************** * IDirect3DSwapChain9 implementation structure @@ -511,7 +511,7 @@ extern HRESULT WINAPI IDirect3DSwapChain9Impl_GetPresentParameters(LPDIRECT3DSWA /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DResource9) Direct3DResource9_Vtbl; +extern IDirect3DResource9Vtbl Direct3DResource9_Vtbl; /***************************************************************************** * IDirect3DResource9 implementation structure @@ -550,7 +550,7 @@ extern D3DRESOURCETYPE WINAPI IDirect3DResource9Impl_GetType(LPDIRECT3DRESOURCE9 /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DSurface9) Direct3DSurface9_Vtbl; +extern IDirect3DSurface9Vtbl Direct3DSurface9_Vtbl; /***************************************************************************** * IDirect3DSurface9 implementation structure @@ -610,7 +610,7 @@ extern HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(LPDIRECT3DSURFACE9 iface, /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DVertexBuffer9) Direct3DVertexBuffer9_Vtbl; +extern IDirect3DVertexBuffer9Vtbl Direct3DVertexBuffer9_Vtbl; /***************************************************************************** * IDirect3DVertexBuffer9 implementation structure @@ -658,7 +658,7 @@ extern HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDesc(LPDIRECT3DVERTE /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DIndexBuffer9) Direct3DIndexBuffer9_Vtbl; +extern IDirect3DIndexBuffer9Vtbl Direct3DIndexBuffer9_Vtbl; /***************************************************************************** * IDirect3DIndexBuffer9 implementation structure @@ -706,7 +706,7 @@ extern HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetDesc(LPDIRECT3DINDEXB /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DBaseTexture9) Direct3DBaseTexture9_Vtbl; +extern IDirect3DBaseTexture9Vtbl Direct3DBaseTexture9_Vtbl; /***************************************************************************** * IDirect3DBaseTexture9 implementation structure @@ -758,7 +758,7 @@ extern void WINAPI IDirect3DBaseTexture9Impl_GenerateMipSubLevels(LPD /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DCubeTexture9) Direct3DCubeTexture9_Vtbl; +extern IDirect3DCubeTexture9Vtbl Direct3DCubeTexture9_Vtbl; /***************************************************************************** * IDirect3DCubeTexture9 implementation structure @@ -822,7 +822,7 @@ extern HRESULT WINAPI IDirect3DCubeTexture9Impl_AddDirtyRect(LPDIRECT3DC /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DTexture9) Direct3DTexture9_Vtbl; +extern IDirect3DTexture9Vtbl Direct3DTexture9_Vtbl; /***************************************************************************** * IDirect3DTexture9 implementation structure @@ -887,7 +887,7 @@ extern HRESULT WINAPI IDirect3DTexture9Impl_AddDirtyRect(LPDIRECT3DTEXTU /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DVolumeTexture9) Direct3DVolumeTexture9_Vtbl; +extern IDirect3DVolumeTexture9Vtbl Direct3DVolumeTexture9_Vtbl; /***************************************************************************** * IDirect3DVolumeTexture9 implementation structure @@ -953,7 +953,7 @@ extern HRESULT WINAPI IDirect3DVolumeTexture9Impl_AddDirtyBox(LPDIRECT3D /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DStateBlock9) Direct3DStateBlock9_Vtbl; +extern IDirect3DStateBlock9Vtbl Direct3DStateBlock9_Vtbl; /***************************************************************************** * IDirect3DStateBlock9 implementation structure @@ -1051,7 +1051,7 @@ extern HRESULT WINAPI IDirect3DStateBlock9Impl_Apply(LPDIRECT3DSTATEBLOC /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DVertexDeclaration9) Direct3DVertexDeclaration9_Vtbl; +extern IDirect3DVertexDeclaration9Vtbl Direct3DVertexDeclaration9_Vtbl; /***************************************************************************** * IDirect3DVertexShaderDeclaration implementation structure @@ -1090,7 +1090,7 @@ extern HRESULT WINAPI IDirect3DVertexDeclaration9Impl_GetDeclaration(LPDIR /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DVertexShader9) Direct3DVertexShader9_Vtbl; +extern IDirect3DVertexShader9Vtbl Direct3DVertexShader9_Vtbl; /***************************************************************************** * IDirect3DVertexShader implementation structure @@ -1132,7 +1132,7 @@ extern HRESULT WINAPI IDirect3DVertexShader9Impl_GetFunction(LPDIRECT3DV /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DPixelShader9) Direct3DPixelShader9_Vtbl; +extern IDirect3DPixelShader9Vtbl Direct3DPixelShader9_Vtbl; /***************************************************************************** * IDirect3DPixelShader implementation structure @@ -1173,7 +1173,7 @@ extern HRESULT WINAPI IDirect3DPixelShader9Impl_GetFunction(LPDIRECT3DPI /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirect3DQuery9) Direct3DQuery9_Vtbl; +extern IDirect3DQuery9Vtbl Direct3DQuery9_Vtbl; /***************************************************************************** * IDirect3DPixelShader implementation structure diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 9cb750b384c..a54411afc82 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -713,7 +713,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_DeletePatch(LPDIRECT3DDEVICE9 iface, UINT } -ICOM_VTABLE(IDirect3DDevice9) Direct3DDevice9_Vtbl = +IDirect3DDevice9Vtbl Direct3DDevice9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DDevice9Impl_QueryInterface, diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 24193b46e40..a2980f9b7e8 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -164,7 +164,7 @@ HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3 return D3D_OK; } -ICOM_VTABLE(IDirect3D9) Direct3D9_Vtbl = +IDirect3D9Vtbl Direct3D9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3D9Impl_QueryInterface, diff --git a/dlls/d3d9/indexbuffer.c b/dlls/d3d9/indexbuffer.c index ad0327cbf17..6769864453c 100644 --- a/dlls/d3d9/indexbuffer.c +++ b/dlls/d3d9/indexbuffer.c @@ -134,7 +134,7 @@ HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetDesc(LPDIRECT3DINDEXBUFFER9 } -ICOM_VTABLE(IDirect3DIndexBuffer9) Direct3DIndexBuffer9_Vtbl = +IDirect3DIndexBuffer9Vtbl Direct3DIndexBuffer9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DIndexBuffer9Impl_QueryInterface, diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c index 2a0318bf721..c3a5c7b52a7 100644 --- a/dlls/d3d9/pixelshader.c +++ b/dlls/d3d9/pixelshader.c @@ -83,7 +83,7 @@ HRESULT WINAPI IDirect3DPixelShader9Impl_GetFunction(LPDIRECT3DPIXELSHADER9 ifac } -ICOM_VTABLE(IDirect3DPixelShader9) Direct3DPixelShader9_Vtbl = +IDirect3DPixelShader9Vtbl Direct3DPixelShader9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DPixelShader9Impl_QueryInterface, diff --git a/dlls/d3d9/query.c b/dlls/d3d9/query.c index 5b8c640bcf6..354e971afce 100644 --- a/dlls/d3d9/query.c +++ b/dlls/d3d9/query.c @@ -101,7 +101,7 @@ HRESULT WINAPI IDirect3DQuery9Impl_GetData(LPDIRECT3DQUERY9 iface, void* pData, } -ICOM_VTABLE(IDirect3DQuery9) Direct3DQuery9_Vtbl = +IDirect3DQuery9Vtbl Direct3DQuery9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DQuery9Impl_QueryInterface, diff --git a/dlls/d3d9/resource.c b/dlls/d3d9/resource.c index 29a6892ea27..8155310fd12 100644 --- a/dlls/d3d9/resource.c +++ b/dlls/d3d9/resource.c @@ -117,7 +117,7 @@ D3DRESOURCETYPE WINAPI IDirect3DResource9Impl_GetType(LPDIRECT3DRESOURCE9 iface) } -ICOM_VTABLE(IDirect3DResource9) Direct3DResource9_Vtbl = +IDirect3DResource9Vtbl Direct3DResource9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DResource9Impl_QueryInterface, diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index b738800cb50..814ec4383b5 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -89,7 +89,7 @@ HRESULT WINAPI IDirect3DStateBlock9Impl_Apply(LPDIRECT3DSTATEBLOCK9 iface) { } -ICOM_VTABLE(IDirect3DStateBlock9) Direct3DStateBlock9_Vtbl = +IDirect3DStateBlock9Vtbl Direct3DStateBlock9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DStateBlock9Impl_QueryInterface, diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 05cb29611de..627ad7cedf1 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -163,7 +163,7 @@ HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(LPDIRECT3DSURFACE9 iface, HDC hdc } -ICOM_VTABLE(IDirect3DSurface9) Direct3DSurface9_Vtbl = +IDirect3DSurface9Vtbl Direct3DSurface9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DSurface9Impl_QueryInterface, diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index fd85cdbda67..344b67ad3b3 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -117,7 +117,7 @@ HRESULT WINAPI IDirect3DSwapChain9Impl_GetPresentParameters(LPDIRECT3DSWAPCHAIN9 } -ICOM_VTABLE(IDirect3DSwapChain9) Direct3DSwapChain9_Vtbl = +IDirect3DSwapChain9Vtbl Direct3DSwapChain9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DSwapChain9Impl_QueryInterface, diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index f15bdb53108..509eb0588a2 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -213,7 +213,7 @@ HRESULT WINAPI IDirect3DTexture9Impl_AddDirtyRect(LPDIRECT3DTEXTURE9 iface, CONS } -ICOM_VTABLE(IDirect3DTexture9) Direct3DTexture9_Vtbl = +IDirect3DTexture9Vtbl Direct3DTexture9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DTexture9Impl_QueryInterface, diff --git a/dlls/d3d9/vertexbuffer.c b/dlls/d3d9/vertexbuffer.c index d2ccee0bfad..5ac1b06ac39 100644 --- a/dlls/d3d9/vertexbuffer.c +++ b/dlls/d3d9/vertexbuffer.c @@ -134,7 +134,7 @@ HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDesc(LPDIRECT3DVERTEXBUFFER9 iface, } -ICOM_VTABLE(IDirect3DVertexBuffer9) Direct3DVertexBuffer9_Vtbl = +IDirect3DVertexBuffer9Vtbl Direct3DVertexBuffer9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DVertexBuffer9Impl_QueryInterface, diff --git a/dlls/d3d9/vertexdeclaration.c b/dlls/d3d9/vertexdeclaration.c index 350e00726f2..2c60d09bb4c 100644 --- a/dlls/d3d9/vertexdeclaration.c +++ b/dlls/d3d9/vertexdeclaration.c @@ -83,7 +83,7 @@ HRESULT WINAPI IDirect3DVertexDeclaration9Impl_GetDeclaration(LPDIRECT3DVERTEXDE } -ICOM_VTABLE(IDirect3DVertexDeclaration9) Direct3DVertexDeclaration9_Vtbl = +IDirect3DVertexDeclaration9Vtbl Direct3DVertexDeclaration9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DVertexDeclaration9Impl_QueryInterface, diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index f0e2a5239a4..1df9c300ba2 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -83,7 +83,7 @@ HRESULT WINAPI IDirect3DVertexShader9Impl_GetFunction(LPDIRECT3DVERTEXSHADER9 if } -ICOM_VTABLE(IDirect3DVertexShader9) Direct3DVertexShader9_Vtbl = +IDirect3DVertexShader9Vtbl Direct3DVertexShader9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DVertexShader9Impl_QueryInterface, diff --git a/dlls/d3d9/volume.c b/dlls/d3d9/volume.c index 6a3a41ba3ae..368a96848fb 100644 --- a/dlls/d3d9/volume.c +++ b/dlls/d3d9/volume.c @@ -126,7 +126,7 @@ HRESULT WINAPI IDirect3DVolume9Impl_UnlockBox(LPDIRECT3DVOLUME9 iface) { } -ICOM_VTABLE(IDirect3DVolume9) Direct3DVolume9_Vtbl = +IDirect3DVolume9Vtbl Direct3DVolume9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DVolume9Impl_QueryInterface, diff --git a/dlls/d3d9/volumetexture.c b/dlls/d3d9/volumetexture.c index 0356f743012..237ff1a1f9b 100644 --- a/dlls/d3d9/volumetexture.c +++ b/dlls/d3d9/volumetexture.c @@ -217,7 +217,7 @@ HRESULT WINAPI IDirect3DVolumeTexture9Impl_AddDirtyBox(LPDIRECT3DVOLUMETEXTURE9 } -ICOM_VTABLE(IDirect3DVolumeTexture9) Direct3DVolumeTexture9_Vtbl = +IDirect3DVolumeTexture9Vtbl Direct3DVolumeTexture9_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirect3DVolumeTexture9Impl_QueryInterface, diff --git a/dlls/d3dx8/d3dx8core_private.h b/dlls/d3dx8/d3dx8core_private.h index e01bd5ec2ea..2e1557b3476 100644 --- a/dlls/d3dx8/d3dx8core_private.h +++ b/dlls/d3dx8/d3dx8core_private.h @@ -38,7 +38,7 @@ typedef struct ID3DXFontImpl ID3DXFontImpl; /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(ID3DXBuffer) D3DXBuffer_Vtbl; +extern ID3DXBufferVtbl D3DXBuffer_Vtbl; /***************************************************************************** * ID3DXBufferImpl implementation structure @@ -70,7 +70,7 @@ extern DWORD WINAPI ID3DXBufferImpl_GetBufferSize(LPD3DXBUFFER iface); /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(ID3DXFont) D3DXFont_Vtbl; +extern ID3DXFontVtbl D3DXFont_Vtbl; /***************************************************************************** * ID3DXFontImpl implementation structure diff --git a/dlls/d3dx8/d3dxbuffer.c b/dlls/d3dx8/d3dxbuffer.c index dcb973d2647..dec05d1325e 100644 --- a/dlls/d3dx8/d3dxbuffer.c +++ b/dlls/d3dx8/d3dxbuffer.c @@ -77,7 +77,7 @@ DWORD WINAPI ID3DXBufferImpl_GetBufferSize(LPD3DXBUFFER iface) { return This->bufferSize; } -ICOM_VTABLE(ID3DXBuffer) D3DXBuffer_Vtbl = +ID3DXBufferVtbl D3DXBuffer_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ID3DXBufferImpl_QueryInterface, diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index bf536ac69d4..bfc1b5cd892 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -32,13 +32,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); -static struct ICOM_VTABLE(IDirectXFile) IDirectXFile_Vtbl; -static struct ICOM_VTABLE(IDirectXFileBinary) IDirectXFileBinary_Vtbl; -static struct ICOM_VTABLE(IDirectXFileData) IDirectXFileData_Vtbl; -static struct ICOM_VTABLE(IDirectXFileDataReference) IDirectXFileDataReference_Vtbl; -static struct ICOM_VTABLE(IDirectXFileEnumObject) IDirectXFileEnumObject_Vtbl; -static struct ICOM_VTABLE(IDirectXFileObject) IDirectXFileObject_Vtbl; -static struct ICOM_VTABLE(IDirectXFileSaveObject) IDirectXFileSaveObject_Vtbl; +static struct IDirectXFileVtbl IDirectXFile_Vtbl; +static struct IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl; +static struct IDirectXFileDataVtbl IDirectXFileData_Vtbl; +static struct IDirectXFileDataReferenceVtbl IDirectXFileDataReference_Vtbl; +static struct IDirectXFileEnumObjectVtbl IDirectXFileEnumObject_Vtbl; +static struct IDirectXFileObjectVtbl IDirectXFileObject_Vtbl; +static struct IDirectXFileSaveObjectVtbl IDirectXFileSaveObject_Vtbl; HRESULT IDirectXFileImpl_Create(IUnknown* pUnkOuter, LPVOID* ppObj) { @@ -139,7 +139,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP return S_FALSE; } -static ICOM_VTABLE(IDirectXFile) IDirectXFile_Vtbl = +static IDirectXFileVtbl IDirectXFile_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectXFileImpl_QueryInterface, @@ -256,7 +256,7 @@ static HRESULT WINAPI IDirectXFileBinaryImpl_Read(IDirectXFileBinary* iface, LPV return S_FALSE; } -static ICOM_VTABLE(IDirectXFileBinary) IDirectXFileBinary_Vtbl = +static IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectXFileBinaryImpl_QueryInterface, @@ -402,7 +402,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_AddBinaryObject(IDirectXFileData* ifa return S_FALSE; } -static ICOM_VTABLE(IDirectXFileData) IDirectXFileData_Vtbl = +static IDirectXFileDataVtbl IDirectXFileData_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectXFileDataImpl_QueryInterface, @@ -505,7 +505,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_Resolve(IDirectXFileDataRefe return S_FALSE; } -static ICOM_VTABLE(IDirectXFileDataReference) IDirectXFileDataReference_Vtbl = +static IDirectXFileDataReferenceVtbl IDirectXFileDataReference_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectXFileDataReferenceImpl_QueryInterface, @@ -609,7 +609,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectByName(IDirectXFil return S_FALSE; } -static ICOM_VTABLE(IDirectXFileEnumObject) IDirectXFileEnumObject_Vtbl = +static IDirectXFileEnumObjectVtbl IDirectXFileEnumObject_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectXFileEnumObjectImpl_QueryInterface, @@ -696,7 +696,7 @@ static HRESULT WINAPI IDirectXFileObjectImpl_GetId(IDirectXFileObject* iface, LP return S_FALSE; } -static ICOM_VTABLE(IDirectXFileObject) IDirectXFileObject_Vtbl = +static IDirectXFileObjectVtbl IDirectXFileObject_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectXFileObjectImpl_QueryInterface, @@ -790,7 +790,7 @@ static HRESULT WINAPI IDirectXFileSaveObjectImpl_SaveData(IDirectXFileSaveObject return S_FALSE; } -static ICOM_VTABLE(IDirectXFileSaveObject) IDirectXFileSaveObject_Vtbl = +static IDirectXFileSaveObjectVtbl IDirectXFileSaveObject_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectXFileSaveObjectImpl_QueryInterface, diff --git a/dlls/d3dxof/main.c b/dlls/d3dxof/main.c index ce9bb76f6de..54866538328 100644 --- a/dlls/d3dxof/main.c +++ b/dlls/d3dxof/main.c @@ -141,7 +141,7 @@ static HRESULT WINAPI XFCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) XFCF_Vtbl = +static IClassFactoryVtbl XFCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XFCF_QueryInterface, diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c index 602033e953b..618d250ecf8 100644 --- a/dlls/ddraw/d3ddevice/mesa.c +++ b/dlls/ddraw/d3ddevice/mesa.c @@ -2570,7 +2570,7 @@ GL_IDirect3DDeviceImpl_7_SetViewport(LPDIRECT3DDEVICE7 iface, # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3DDevice7) VTABLE_IDirect3DDevice7 = +IDirect3DDevice7Vtbl VTABLE_IDirect3DDevice7 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Main_IDirect3DDeviceImpl_7_3T_2T_1T_QueryInterface, @@ -2635,7 +2635,7 @@ ICOM_VTABLE(IDirect3DDevice7) VTABLE_IDirect3DDevice7 = # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3DDevice3) VTABLE_IDirect3DDevice3 = +IDirect3DDevice3Vtbl VTABLE_IDirect3DDevice3 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Thunk_IDirect3DDeviceImpl_3_QueryInterface, @@ -2693,7 +2693,7 @@ ICOM_VTABLE(IDirect3DDevice3) VTABLE_IDirect3DDevice3 = # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3DDevice2) VTABLE_IDirect3DDevice2 = +IDirect3DDevice2Vtbl VTABLE_IDirect3DDevice2 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Thunk_IDirect3DDeviceImpl_2_QueryInterface, @@ -2742,7 +2742,7 @@ ICOM_VTABLE(IDirect3DDevice2) VTABLE_IDirect3DDevice2 = # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3DDevice) VTABLE_IDirect3DDevice = +IDirect3DDeviceVtbl VTABLE_IDirect3DDevice = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Thunk_IDirect3DDeviceImpl_1_QueryInterface, diff --git a/dlls/ddraw/d3dexecutebuffer.c b/dlls/ddraw/d3dexecutebuffer.c index c3d87899256..69b233375f5 100644 --- a/dlls/ddraw/d3dexecutebuffer.c +++ b/dlls/ddraw/d3dexecutebuffer.c @@ -652,7 +652,7 @@ Main_IDirect3DExecuteBufferImpl_1_Optimize(LPDIRECT3DEXECUTEBUFFER iface, # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3DExecuteBuffer) VTABLE_IDirect3DExecuteBuffer = +IDirect3DExecuteBufferVtbl VTABLE_IDirect3DExecuteBuffer = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Main_IDirect3DExecuteBufferImpl_1_QueryInterface, diff --git a/dlls/ddraw/d3dlight.c b/dlls/ddraw/d3dlight.c index b757295fa0d..bba52205d21 100644 --- a/dlls/ddraw/d3dlight.c +++ b/dlls/ddraw/d3dlight.c @@ -207,7 +207,7 @@ GL_IDirect3DLightImpl_1_Release(LPDIRECT3DLIGHT iface) # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3DLight) VTABLE_IDirect3DLight = +IDirect3DLightVtbl VTABLE_IDirect3DLight = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Main_IDirect3DLightImpl_1_QueryInterface, diff --git a/dlls/ddraw/d3dmaterial.c b/dlls/ddraw/d3dmaterial.c index 6d3031a6216..f2eda824061 100644 --- a/dlls/ddraw/d3dmaterial.c +++ b/dlls/ddraw/d3dmaterial.c @@ -326,7 +326,7 @@ static void activate(IDirect3DMaterialImpl* This) { # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3DMaterial3) VTABLE_IDirect3DMaterial3 = +IDirect3DMaterial3Vtbl VTABLE_IDirect3DMaterial3 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Main_IDirect3DMaterialImpl_3_2T_1T_QueryInterface, @@ -348,7 +348,7 @@ ICOM_VTABLE(IDirect3DMaterial3) VTABLE_IDirect3DMaterial3 = # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3DMaterial2) VTABLE_IDirect3DMaterial2 = +IDirect3DMaterial2Vtbl VTABLE_IDirect3DMaterial2 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Thunk_IDirect3DMaterialImpl_2_QueryInterface, @@ -370,7 +370,7 @@ ICOM_VTABLE(IDirect3DMaterial2) VTABLE_IDirect3DMaterial2 = # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3DMaterial) VTABLE_IDirect3DMaterial = +IDirect3DMaterialVtbl VTABLE_IDirect3DMaterial = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Thunk_IDirect3DMaterialImpl_1_QueryInterface, diff --git a/dlls/ddraw/d3dtexture.c b/dlls/ddraw/d3dtexture.c index ffe068e2700..53997b2068d 100644 --- a/dlls/ddraw/d3dtexture.c +++ b/dlls/ddraw/d3dtexture.c @@ -825,7 +825,7 @@ Thunk_IDirect3DTextureImpl_1_Load(LPDIRECT3DTEXTURE iface, # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3DTexture2) VTABLE_IDirect3DTexture2 = +IDirect3DTexture2Vtbl VTABLE_IDirect3DTexture2 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Thunk_IDirect3DTextureImpl_2_QueryInterface, @@ -847,7 +847,7 @@ ICOM_VTABLE(IDirect3DTexture2) VTABLE_IDirect3DTexture2 = # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3DTexture) VTABLE_IDirect3DTexture = +IDirect3DTextureVtbl VTABLE_IDirect3DTexture = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Thunk_IDirect3DTextureImpl_1_QueryInterface, diff --git a/dlls/ddraw/d3dvertexbuffer.c b/dlls/ddraw/d3dvertexbuffer.c index 4c37b63d177..c61bafd9f4b 100644 --- a/dlls/ddraw/d3dvertexbuffer.c +++ b/dlls/ddraw/d3dvertexbuffer.c @@ -469,7 +469,7 @@ GL_IDirect3DVertexBufferImpl_7_ProcessVerticesStrided(LPDIRECT3DVERTEXBUFFER7 if # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3DVertexBuffer7) VTABLE_IDirect3DVertexBuffer7 = +IDirect3DVertexBuffer7Vtbl VTABLE_IDirect3DVertexBuffer7 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Main_IDirect3DVertexBufferImpl_7_1T_QueryInterface, @@ -494,7 +494,7 @@ ICOM_VTABLE(IDirect3DVertexBuffer7) VTABLE_IDirect3DVertexBuffer7 = # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3DVertexBuffer) VTABLE_IDirect3DVertexBuffer = +IDirect3DVertexBufferVtbl VTABLE_IDirect3DVertexBuffer = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Thunk_IDirect3DVertexBufferImpl_1_QueryInterface, diff --git a/dlls/ddraw/d3dviewport.c b/dlls/ddraw/d3dviewport.c index 3e67adcb51b..70f8c14d10a 100644 --- a/dlls/ddraw/d3dviewport.c +++ b/dlls/ddraw/d3dviewport.c @@ -477,7 +477,7 @@ Main_IDirect3DViewportImpl_3_Clear2(LPDIRECT3DVIEWPORT3 iface, # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3DViewport3) VTABLE_IDirect3DViewport3 = +IDirect3DViewport3Vtbl VTABLE_IDirect3DViewport3 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Main_IDirect3DViewportImpl_3_2_1_QueryInterface, diff --git a/dlls/ddraw/dclipper/main.c b/dlls/ddraw/dclipper/main.c index ed7cfec03b3..bab3ea68919 100644 --- a/dlls/ddraw/dclipper/main.c +++ b/dlls/ddraw/dclipper/main.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); * DirectDrawCreateClipper (DDRAW.@) */ -static ICOM_VTABLE(IDirectDrawClipper) DDRAW_Clipper_VTable; +static IDirectDrawClipperVtbl DDRAW_Clipper_VTable; HRESULT WINAPI DirectDrawCreateClipper( DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, LPUNKNOWN pUnkOuter @@ -207,7 +207,7 @@ HRESULT WINAPI Main_DirectDrawClipper_IsClipListChanged( return DD_OK; } -static ICOM_VTABLE(IDirectDrawClipper) DDRAW_Clipper_VTable = +static IDirectDrawClipperVtbl DDRAW_Clipper_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Main_DirectDrawClipper_QueryInterface, diff --git a/dlls/ddraw/ddraw/hal.c b/dlls/ddraw/ddraw/hal.c index ac5bec676de..9d5e2a32acc 100644 --- a/dlls/ddraw/ddraw/hal.c +++ b/dlls/ddraw/ddraw/hal.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); -static ICOM_VTABLE(IDirectDraw7) HAL_DirectDraw_VTable; +static IDirectDraw7Vtbl HAL_DirectDraw_VTable; static DDVERSIONDATA hal_version; static DD32BITDRIVERDATA hal_driverdata; @@ -550,7 +550,7 @@ HAL_DirectDraw_GetFourCCCodes(LPDIRECTDRAW7 iface, LPDWORD pNumCodes, } -static ICOM_VTABLE(IDirectDraw7) HAL_DirectDraw_VTable = +static IDirectDraw7Vtbl HAL_DirectDraw_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Main_DirectDraw_QueryInterface, diff --git a/dlls/ddraw/ddraw/main.c b/dlls/ddraw/ddraw/main.c index a0b7a012168..6d5e3230827 100644 --- a/dlls/ddraw/ddraw/main.c +++ b/dlls/ddraw/ddraw/main.c @@ -74,9 +74,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); -extern ICOM_VTABLE(IDirectDraw) DDRAW_IDirectDraw_VTable; -extern ICOM_VTABLE(IDirectDraw2) DDRAW_IDirectDraw2_VTable; -extern ICOM_VTABLE(IDirectDraw4) DDRAW_IDirectDraw4_VTable; +extern IDirectDrawVtbl DDRAW_IDirectDraw_VTable; +extern IDirectDraw2Vtbl DDRAW_IDirectDraw2_VTable; +extern IDirectDraw4Vtbl DDRAW_IDirectDraw4_VTable; static void DDRAW_UnsubclassWindow(IDirectDrawImpl* This); @@ -1418,7 +1418,7 @@ void Uninit_DirectDraw_final_release(IDirectDrawImpl *This) Main_DirectDraw_final_release(This); } -static ICOM_VTABLE(IDirectDraw7) Uninit_DirectDraw_VTable; +static IDirectDraw7Vtbl Uninit_DirectDraw_VTable; /* Not called from the vtable. */ HRESULT Uninit_DirectDraw_Construct(IDirectDrawImpl *This, BOOL ex) @@ -1658,7 +1658,7 @@ Uninit_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface, DWORD dwFlags, return DDERR_NOTINITIALIZED; } -static ICOM_VTABLE(IDirectDraw7) Uninit_DirectDraw_VTable = +static IDirectDraw7Vtbl Uninit_DirectDraw_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Main_DirectDraw_QueryInterface, diff --git a/dlls/ddraw/ddraw/thunks.c b/dlls/ddraw/ddraw/thunks.c index d7e012dd3df..69f4e3c41fb 100644 --- a/dlls/ddraw/ddraw/thunks.c +++ b/dlls/ddraw/ddraw/thunks.c @@ -942,7 +942,7 @@ IDirectDraw4Impl_GetDeviceIdentifier(LPDIRECTDRAW4 This, return hr; } -ICOM_VTABLE(IDirectDraw) DDRAW_IDirectDraw_VTable = +IDirectDrawVtbl DDRAW_IDirectDraw_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectDrawImpl_QueryInterface, @@ -970,7 +970,7 @@ ICOM_VTABLE(IDirectDraw) DDRAW_IDirectDraw_VTable = IDirectDrawImpl_WaitForVerticalBlank, }; -ICOM_VTABLE(IDirectDraw2) DDRAW_IDirectDraw2_VTable = +IDirectDraw2Vtbl DDRAW_IDirectDraw2_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectDraw2Impl_QueryInterface, @@ -999,7 +999,7 @@ ICOM_VTABLE(IDirectDraw2) DDRAW_IDirectDraw2_VTable = IDirectDraw2Impl_GetAvailableVidMem }; -ICOM_VTABLE(IDirectDraw4) DDRAW_IDirectDraw4_VTable = +IDirectDraw4Vtbl DDRAW_IDirectDraw4_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectDraw4Impl_QueryInterface, diff --git a/dlls/ddraw/ddraw/user.c b/dlls/ddraw/ddraw/user.c index e45d34b0021..cb9384fb11b 100644 --- a/dlls/ddraw/ddraw/user.c +++ b/dlls/ddraw/ddraw/user.c @@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); -static ICOM_VTABLE(IDirectDraw7) User_DirectDraw_VTable; +static IDirectDraw7Vtbl User_DirectDraw_VTable; static const DDDEVICEIDENTIFIER2 user_device = { @@ -525,7 +525,7 @@ User_DirectDraw_SetDisplayMode(LPDIRECTDRAW7 iface, DWORD dwWidth, /* TestCooperativeLevel: generic? */ /* WaitForVerticalBlank: ??? */ -static ICOM_VTABLE(IDirectDraw7) User_DirectDraw_VTable = +static IDirectDraw7Vtbl User_DirectDraw_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Main_DirectDraw_QueryInterface, diff --git a/dlls/ddraw/direct3d/mesa.c b/dlls/ddraw/direct3d/mesa.c index 5e345c8a3db..dc2b959ad31 100644 --- a/dlls/ddraw/direct3d/mesa.c +++ b/dlls/ddraw/direct3d/mesa.c @@ -302,7 +302,7 @@ static void light_released(IDirectDrawImpl *This, GLenum light_num) # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3D7) VTABLE_IDirect3D7 = +IDirect3D7Vtbl VTABLE_IDirect3D7 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Thunk_IDirect3DImpl_7_QueryInterface, @@ -326,7 +326,7 @@ ICOM_VTABLE(IDirect3D7) VTABLE_IDirect3D7 = # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3D3) VTABLE_IDirect3D3 = +IDirect3D3Vtbl VTABLE_IDirect3D3 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Thunk_IDirect3DImpl_3_QueryInterface, @@ -354,7 +354,7 @@ ICOM_VTABLE(IDirect3D3) VTABLE_IDirect3D3 = # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3D2) VTABLE_IDirect3D2 = +IDirect3D2Vtbl VTABLE_IDirect3D2 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Thunk_IDirect3DImpl_2_QueryInterface, @@ -379,7 +379,7 @@ ICOM_VTABLE(IDirect3D2) VTABLE_IDirect3D2 = # define XCAST(fun) (void*) #endif -ICOM_VTABLE(IDirect3D) VTABLE_IDirect3D = +IDirect3DVtbl VTABLE_IDirect3D = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface) Thunk_IDirect3DImpl_1_QueryInterface, diff --git a/dlls/ddraw/dpalette/hal.c b/dlls/ddraw/dpalette/hal.c index 77a50a0056d..07422631039 100644 --- a/dlls/ddraw/dpalette/hal.c +++ b/dlls/ddraw/dpalette/hal.c @@ -31,7 +31,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); -static ICOM_VTABLE(IDirectDrawPalette) DDRAW_HAL_Palette_VTable; +static IDirectDrawPaletteVtbl DDRAW_HAL_Palette_VTable; /****************************************************************************** * IDirectDrawPalette @@ -125,7 +125,7 @@ void HAL_DirectDrawPalette_final_release(IDirectDrawPaletteImpl* This) Main_DirectDrawPalette_final_release(This); } -static ICOM_VTABLE(IDirectDrawPalette) DDRAW_HAL_Palette_VTable = +static IDirectDrawPaletteVtbl DDRAW_HAL_Palette_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Main_DirectDrawPalette_QueryInterface, diff --git a/dlls/ddraw/dpalette/main.c b/dlls/ddraw/dpalette/main.c index c83b90a4abf..fae0cf44c89 100644 --- a/dlls/ddraw/dpalette/main.c +++ b/dlls/ddraw/dpalette/main.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); /* For unsigned x. 0 is not a power of 2. */ #define IS_POW_2(x) (((x) & ((x) - 1)) == 0) -static ICOM_VTABLE(IDirectDrawPalette) DDRAW_Main_Palette_VTable; +static IDirectDrawPaletteVtbl DDRAW_Main_Palette_VTable; /****************************************************************************** * IDirectDrawPalette @@ -266,7 +266,7 @@ Main_DirectDrawPalette_QueryInterface(LPDIRECTDRAWPALETTE iface, } } -static ICOM_VTABLE(IDirectDrawPalette) DDRAW_Main_Palette_VTable = +static IDirectDrawPaletteVtbl DDRAW_Main_Palette_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Main_DirectDrawPalette_QueryInterface, diff --git a/dlls/ddraw/dsurface/dib.c b/dlls/ddraw/dsurface/dib.c index 86f73b7d802..473881e4b7f 100644 --- a/dlls/ddraw/dsurface/dib.c +++ b/dlls/ddraw/dsurface/dib.c @@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); extern HBITMAP DIB_CreateDIBSection( HDC hdc, const BITMAPINFO *bmi, UINT usage, VOID **bits, HANDLE section, DWORD offset, DWORD ovr_pitch ); -static ICOM_VTABLE(IDirectDrawSurface7) DIB_IDirectDrawSurface7_VTable; +static IDirectDrawSurface7Vtbl DIB_IDirectDrawSurface7_VTable; /* Return the width of a DIB bitmap in bytes. DIB bitmap data is 32-bit aligned. */ inline static int get_dib_width_bytes( int width, int depth ) @@ -1356,7 +1356,7 @@ DIB_DirectDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, /* UpdateOverlayDisplay: generic */ /* UpdateOverlayZOrder: generic */ -static ICOM_VTABLE(IDirectDrawSurface7) DIB_IDirectDrawSurface7_VTable = +static IDirectDrawSurface7Vtbl DIB_IDirectDrawSurface7_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Main_DirectDrawSurface_QueryInterface, diff --git a/dlls/ddraw/dsurface/fakezbuffer.c b/dlls/ddraw/dsurface/fakezbuffer.c index f871c0e8900..9b5337067af 100644 --- a/dlls/ddraw/dsurface/fakezbuffer.c +++ b/dlls/ddraw/dsurface/fakezbuffer.c @@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); -static ICOM_VTABLE(IDirectDrawSurface7) FakeZBuffer_IDirectDrawSurface7_VTable; +static IDirectDrawSurface7Vtbl FakeZBuffer_IDirectDrawSurface7_VTable; #ifdef HAVE_OPENGL static void zbuffer_lock_update(IDirectDrawSurfaceImpl* This, LPCRECT pRect, DWORD dwFlags) @@ -259,7 +259,7 @@ FakeZBuffer_DirectDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface, } -static ICOM_VTABLE(IDirectDrawSurface7) FakeZBuffer_IDirectDrawSurface7_VTable= +static IDirectDrawSurface7Vtbl FakeZBuffer_IDirectDrawSurface7_VTable= { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Main_DirectDrawSurface_QueryInterface, diff --git a/dlls/ddraw/dsurface/gamma.c b/dlls/ddraw/dsurface/gamma.c index 7853aeaf59f..412f1e20bf4 100644 --- a/dlls/ddraw/dsurface/gamma.c +++ b/dlls/ddraw/dsurface/gamma.c @@ -70,7 +70,7 @@ DirectDrawGammaControl_SetGammaRamp(LPDIRECTDRAWGAMMACONTROL iface, DWORD dwFlag return This->set_gamma_ramp(This, dwFlags, lpGammaRamp); } -ICOM_VTABLE(IDirectDrawGammaControl) DDRAW_IDDGC_VTable = +IDirectDrawGammaControlVtbl DDRAW_IDDGC_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DirectDrawGammaControl_QueryInterface, diff --git a/dlls/ddraw/dsurface/hal.c b/dlls/ddraw/dsurface/hal.c index ee62e006521..70d07a205f1 100644 --- a/dlls/ddraw/dsurface/hal.c +++ b/dlls/ddraw/dsurface/hal.c @@ -35,7 +35,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw); -static ICOM_VTABLE(IDirectDrawSurface7) HAL_IDirectDrawSurface7_VTable; +static IDirectDrawSurface7Vtbl HAL_IDirectDrawSurface7_VTable; static HRESULT HAL_DirectDrawSurface_create_surface(IDirectDrawSurfaceImpl* This, IDirectDrawImpl* pDD) @@ -362,7 +362,7 @@ HWND HAL_DirectDrawSurface_get_display_window(IDirectDrawSurfaceImpl* This) return 0; } -static ICOM_VTABLE(IDirectDrawSurface7) HAL_IDirectDrawSurface7_VTable = +static IDirectDrawSurface7Vtbl HAL_IDirectDrawSurface7_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Main_DirectDrawSurface_QueryInterface, diff --git a/dlls/ddraw/dsurface/main.h b/dlls/ddraw/dsurface/main.h index 959b2fc0f50..07d3b887175 100644 --- a/dlls/ddraw/dsurface/main.h +++ b/dlls/ddraw/dsurface/main.h @@ -45,7 +45,7 @@ typedef struct PrivateData DWORD size; } PrivateData; -extern ICOM_VTABLE(IDirectDrawGammaControl) DDRAW_IDDGC_VTable; +extern IDirectDrawGammaControlVtbl DDRAW_IDDGC_VTable; /* Non-interface functions */ HRESULT diff --git a/dlls/ddraw/dsurface/thunks.c b/dlls/ddraw/dsurface/thunks.c index 3c8ad068ac3..626be89208a 100644 --- a/dlls/ddraw/dsurface/thunks.c +++ b/dlls/ddraw/dsurface/thunks.c @@ -390,7 +390,7 @@ IDirectDrawSurface3Impl_SetSurfaceDesc(LPDIRECTDRAWSURFACE3 This, dwFlags); } -ICOM_VTABLE(IDirectDrawSurface3) DDRAW_IDDS3_Thunk_VTable = +IDirectDrawSurface3Vtbl DDRAW_IDDS3_Thunk_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectDrawSurface3Impl_QueryInterface, diff --git a/dlls/ddraw/dsurface/thunks.h b/dlls/ddraw/dsurface/thunks.h index 7759af3c753..b1c39b066c2 100644 --- a/dlls/ddraw/dsurface/thunks.h +++ b/dlls/ddraw/dsurface/thunks.h @@ -19,6 +19,6 @@ #ifndef DDRAW_DSURFACE_THUNKS_H_INCLUDED #define DDRAW_DSURFACE_THUNKS_H_INCLUDED -extern ICOM_VTABLE(IDirectDrawSurface3) DDRAW_IDDS3_Thunk_VTable; +extern IDirectDrawSurface3Vtbl DDRAW_IDDS3_Thunk_VTable; #endif diff --git a/dlls/ddraw/dsurface/user.c b/dlls/ddraw/dsurface/user.c index 517dad7fb54..f50276fb608 100644 --- a/dlls/ddraw/dsurface/user.c +++ b/dlls/ddraw/dsurface/user.c @@ -52,7 +52,7 @@ static void User_copy_to_screen(IDirectDrawSurfaceImpl* This, LPCRECT rc); static HWND get_display_window(IDirectDrawSurfaceImpl* This, LPPOINT pt); -static ICOM_VTABLE(IDirectDrawSurface7) User_IDirectDrawSurface7_VTable; +static IDirectDrawSurface7Vtbl User_IDirectDrawSurface7_VTable; HRESULT User_DirectDrawSurface_Construct(IDirectDrawSurfaceImpl* This, @@ -625,7 +625,7 @@ static void User_copy_from_screen(IDirectDrawSurfaceImpl* This, LPCRECT rc) } #endif -static ICOM_VTABLE(IDirectDrawSurface7) User_IDirectDrawSurface7_VTable = +static IDirectDrawSurface7Vtbl User_IDirectDrawSurface7_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Main_DirectDrawSurface_QueryInterface, diff --git a/dlls/ddraw/main.c b/dlls/ddraw/main.c index 7c149c7aee5..c761d223f8b 100644 --- a/dlls/ddraw/main.c +++ b/dlls/ddraw/main.c @@ -515,7 +515,7 @@ static HRESULT WINAPI DDCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) DDCF_Vtbl = +static IClassFactoryVtbl DDCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DDCF_QueryInterface, diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index ddc616ee49f..b686e349a9b 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -33,7 +33,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(devenum); -extern ICOM_VTABLE(IEnumMoniker) IEnumMoniker_Vtbl; +extern IEnumMonikerVtbl IEnumMoniker_Vtbl; extern HINSTANCE DEVENUM_hInstance; @@ -190,7 +190,7 @@ HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator( /********************************************************************** * ICreateDevEnum_Vtbl */ -static ICOM_VTABLE(ICreateDevEnum) ICreateDevEnum_Vtbl = +static ICreateDevEnumVtbl ICreateDevEnum_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DEVENUM_ICreateDevEnum_QueryInterface, diff --git a/dlls/devenum/factory.c b/dlls/devenum/factory.c index 8ac9ceb1429..13f64f70c2d 100644 --- a/dlls/devenum/factory.c +++ b/dlls/devenum/factory.c @@ -139,7 +139,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_LockServer( /********************************************************************** * IClassFactory_Vtbl */ -static ICOM_VTABLE(IClassFactory) IClassFactory_Vtbl = +static IClassFactoryVtbl IClassFactory_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DEVENUM_IClassFactory_QueryInterface, diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 77c842cafca..974482dc1eb 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -253,7 +253,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write( return res; } -static ICOM_VTABLE(IPropertyBag) IPropertyBag_Vtbl = +static IPropertyBagVtbl IPropertyBag_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DEVENUM_IPropertyBag_QueryInterface, @@ -631,7 +631,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsSystemMoniker( return S_FALSE; } -static ICOM_VTABLE(IMoniker) IMoniker_Vtbl = +static IMonikerVtbl IMoniker_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DEVENUM_IMediaCatMoniker_QueryInterface, @@ -807,7 +807,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Clone(LPENUMMONIKER iface, IEnumMonik /********************************************************************** * IEnumMoniker_Vtbl */ -ICOM_VTABLE(IEnumMoniker) IEnumMoniker_Vtbl = +IEnumMonikerVtbl IEnumMoniker_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DEVENUM_IEnumMoniker_QueryInterface, diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index c51e538c94f..2ee72e7d172 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -167,7 +167,7 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName( /********************************************************************** * IParseDisplayName_Vtbl */ -static ICOM_VTABLE(IParseDisplayName) IParseDisplayName_Vtbl = +static IParseDisplayNameVtbl IParseDisplayName_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DEVENUM_IParseDisplayName_QueryInterface, diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 50e47e1caf4..56cc3bd4d5b 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -44,10 +44,10 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); -static ICOM_VTABLE(IDirectInput7A) ddi7avt; -static ICOM_VTABLE(IDirectInput7W) ddi7wvt; -static ICOM_VTABLE(IDirectInput8A) ddi8avt; -static ICOM_VTABLE(IDirectInput8W) ddi8wvt; +static IDirectInput7AVtbl ddi7avt; +static IDirectInput7WVtbl ddi7wvt; +static IDirectInput8AVtbl ddi8avt; +static IDirectInput8WVtbl ddi8wvt; /* This array will be filled a dinput.so loading */ #define MAX_WINE_DINPUT_DEVICES 4 @@ -542,7 +542,7 @@ static HRESULT WINAPI IDirectInput8WImpl_ConfigureDevices( # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectInput7A) ddi7avt = { +static IDirectInput7AVtbl ddi7avt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface)IDirectInputAImpl_QueryInterface, XCAST(AddRef)IDirectInputAImpl_AddRef, @@ -563,7 +563,7 @@ static ICOM_VTABLE(IDirectInput7A) ddi7avt = { # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectInput7W) ddi7wvt = { +static IDirectInput7WVtbl ddi7wvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface)IDirectInputWImpl_QueryInterface, XCAST(AddRef)IDirectInputAImpl_AddRef, @@ -584,7 +584,7 @@ static ICOM_VTABLE(IDirectInput7W) ddi7wvt = { # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectInput8A) ddi8avt = { +static IDirectInput8AVtbl ddi8avt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface)IDirectInput8AImpl_QueryInterface, XCAST(AddRef)IDirectInputAImpl_AddRef, @@ -605,7 +605,7 @@ static ICOM_VTABLE(IDirectInput8A) ddi8avt = { #else # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectInput8W) ddi8wvt = { +static IDirectInput8WVtbl ddi8wvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface)IDirectInput8WImpl_QueryInterface, XCAST(AddRef)IDirectInputAImpl_AddRef, @@ -677,7 +677,7 @@ static HRESULT WINAPI DICF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) DICF_Vtbl = { +static IClassFactoryVtbl DICF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DICF_QueryInterface, DICF_AddRef, diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 61b76aea33c..a66f4a2c18e 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -67,8 +67,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); #define WINE_JOYSTICK_BUTTON_BASE 8 typedef struct JoystickImpl JoystickImpl; -static ICOM_VTABLE(IDirectInputDevice8A) JoystickAvt; -static ICOM_VTABLE(IDirectInputDevice8W) JoystickWvt; +static IDirectInputDevice8AVtbl JoystickAvt; +static IDirectInputDevice8WVtbl JoystickWvt; struct JoystickImpl { LPVOID lpVtbl; @@ -638,7 +638,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, return DI_OK; } -static ICOM_VTABLE(IDirectInputDevice8A) JoystickAvt = +static IDirectInputDevice8AVtbl JoystickAvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectInputDevice2AImpl_QueryInterface, @@ -681,7 +681,7 @@ static ICOM_VTABLE(IDirectInputDevice8A) JoystickAvt = # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectInputDevice8W) SysJoystickWvt = +static IDirectInputDevice8WVtbl SysJoystickWvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectInputDevice2WImpl_QueryInterface, diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 38fa5ee00ba..83804378e16 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -70,8 +70,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); #define WINE_JOYSTICK_BUTTON_BASE 8 typedef struct JoystickImpl JoystickImpl; -static ICOM_VTABLE(IDirectInputDevice8A) JoystickAvt; -static ICOM_VTABLE(IDirectInputDevice8W) JoystickWvt; +static IDirectInputDevice8AVtbl JoystickAvt; +static IDirectInputDevice8WVtbl JoystickWvt; struct JoystickImpl { LPVOID lpVtbl; @@ -998,7 +998,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface, return DI_OK; } -static ICOM_VTABLE(IDirectInputDevice8A) JoystickAvt = +static IDirectInputDevice8AVtbl JoystickAvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectInputDevice2AImpl_QueryInterface, @@ -1041,7 +1041,7 @@ static ICOM_VTABLE(IDirectInputDevice8A) JoystickAvt = # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectInputDevice8W) JoystickWvt = +static IDirectInputDevice8WVtbl JoystickWvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectInputDevice2WImpl_QueryInterface, diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index e636eab1686..a3eb330265f 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -37,8 +37,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); -static ICOM_VTABLE(IDirectInputDevice8A) SysKeyboardAvt; -static ICOM_VTABLE(IDirectInputDevice8W) SysKeyboardWvt; +static IDirectInputDevice8AVtbl SysKeyboardAvt; +static IDirectInputDevice8WVtbl SysKeyboardWvt; typedef struct SysKeyboardImpl SysKeyboardImpl; struct SysKeyboardImpl @@ -695,7 +695,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface return DI_OK; } -static ICOM_VTABLE(IDirectInputDevice8A) SysKeyboardAvt = +static IDirectInputDevice8AVtbl SysKeyboardAvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectInputDevice2AImpl_QueryInterface, @@ -738,7 +738,7 @@ static ICOM_VTABLE(IDirectInputDevice8A) SysKeyboardAvt = # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectInputDevice8W) SysKeyboardWvt = +static IDirectInputDevice8WVtbl SysKeyboardWvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectInputDevice2WImpl_QueryInterface, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 4e0ccdc5046..1c2a99a1038 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -95,8 +95,8 @@ static const DIDATAFORMAT Wine_InternalMouseFormat = { (LPDIOBJECTDATAFORMAT) Wine_InternalMouseObjectFormat }; -static ICOM_VTABLE(IDirectInputDevice8A) SysMouseAvt; -static ICOM_VTABLE(IDirectInputDevice8W) SysMouseWvt; +static IDirectInputDevice8AVtbl SysMouseAvt; +static IDirectInputDevice8WVtbl SysMouseWvt; typedef struct SysMouseImpl SysMouseImpl; @@ -1068,7 +1068,7 @@ static HRESULT WINAPI SysMouseWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, L } -static ICOM_VTABLE(IDirectInputDevice8A) SysMouseAvt = +static IDirectInputDevice8AVtbl SysMouseAvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectInputDevice2AImpl_QueryInterface, @@ -1111,7 +1111,7 @@ static ICOM_VTABLE(IDirectInputDevice8A) SysMouseAvt = # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectInputDevice8W) SysMouseWvt = +static IDirectInputDevice8WVtbl SysMouseWvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectInputDevice2WImpl_QueryInterface, diff --git a/dlls/dmband/band.c b/dlls/dmband/band.c index bcad371f29c..d83d0441fc2 100644 --- a/dlls/dmband/band.c +++ b/dlls/dmband/band.c @@ -70,7 +70,7 @@ ULONG WINAPI IDirectMusicBandImpl_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicBand_Unknown_Vtbl = { +IUnknownVtbl DirectMusicBand_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicBandImpl_IUnknown_QueryInterface, IDirectMusicBandImpl_IUnknown_AddRef, @@ -111,7 +111,7 @@ HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicBand_Unload (LPDIRECTMUSICBAND i return S_OK; } -ICOM_VTABLE(IDirectMusicBand) DirectMusicBand_Band_Vtbl = { +IDirectMusicBandVtbl DirectMusicBand_Band_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicBandImpl_IDirectMusicBand_QueryInterface, IDirectMusicBandImpl_IDirectMusicBand_AddRef, @@ -327,7 +327,7 @@ HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_ParseDescriptor (LPDIRECT return S_OK; } -ICOM_VTABLE(IDirectMusicObject) DirectMusicBand_Object_Vtbl = { +IDirectMusicObjectVtbl DirectMusicBand_Object_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicBandImpl_IDirectMusicObject_QueryInterface, IDirectMusicBandImpl_IDirectMusicObject_AddRef, @@ -668,7 +668,7 @@ HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_GetSizeMax (LPPERSISTSTREAM i return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicBand_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicBand_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicBandImpl_IPersistStream_QueryInterface, IDirectMusicBandImpl_IPersistStream_AddRef, diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 83f21a4fe00..99ac418e088 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicBandTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicBandTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicBandTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicBandTrack_IUnknown_QueryInterface, IDirectMusicBandTrack_IUnknown_AddRef, @@ -203,7 +203,7 @@ HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicBandTrack_DirectMusicTrack_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicBandTrack_DirectMusicTrack_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicBandTrack_IDirectMusicTrack_QueryInterface, IDirectMusicBandTrack_IDirectMusicTrack_AddRef, @@ -567,7 +567,7 @@ HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicBandTrack_PerststStream_Vtbl = { +IPersistStreamVtbl DirectMusicBandTrack_PerststStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicBandTrack_IPersistStream_QueryInterface, IDirectMusicBandTrack_IPersistStream_AddRef, diff --git a/dlls/dmband/dmband_main.c b/dlls/dmband/dmband_main.c index a85c364e0ab..23eb8d5ca82 100644 --- a/dlls/dmband/dmband_main.c +++ b/dlls/dmband/dmband_main.c @@ -60,7 +60,7 @@ static HRESULT WINAPI BandCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) BandCF_Vtbl = { +static IClassFactoryVtbl BandCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE BandCF_QueryInterface, BandCF_AddRef, @@ -106,7 +106,7 @@ static HRESULT WINAPI BandTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) BandTrackCF_Vtbl = { +static IClassFactoryVtbl BandTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE BandTrackCF_QueryInterface, BandTrackCF_AddRef, diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index 6f1b2fd4814..6f579eb06b6 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -51,14 +51,14 @@ typedef struct IDirectMusicBandTrack IDirectMusicBandTrack; /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IUnknown) DirectMusicBand_Uknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicBand) DirectMusicBand_Band_Vtbl; -extern ICOM_VTABLE(IDirectMusicObject) DirectMusicBand_Object_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicBand_PeristStream_Vtbl; +extern IUnknownVtbl DirectMusicBand_Uknown_Vtbl; +extern IDirectMusicBandVtbl DirectMusicBand_Band_Vtbl; +extern IDirectMusicObjectVtbl DirectMusicBand_Object_Vtbl; +extern IPersistStreamVtbl DirectMusicBand_PeristStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicBandTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicBandTrack_DirectMusicTrack_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicBandTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicBandTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicBandTrack_DirectMusicTrack_Vtbl; +extern IPersistStreamVtbl DirectMusicBandTrack_PersistStream_Vtbl; /***************************************************************************** * ClassFactory @@ -99,10 +99,10 @@ typedef struct _DMUS_PRIVATE_BAND { */ struct IDirectMusicBandImpl { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicBand) *BandVtbl; - ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicBandVtbl *BandVtbl; + IDirectMusicObjectVtbl *ObjectVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicBandImpl fields */ @@ -145,9 +145,9 @@ extern HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_GetSizeMax (LPPERSISTS */ struct IDirectMusicBandTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicBandTrack fields */ diff --git a/dlls/dmcompos/chordmap.c b/dlls/dmcompos/chordmap.c index f2e3a18d6aa..53073a68874 100644 --- a/dlls/dmcompos/chordmap.c +++ b/dlls/dmcompos/chordmap.c @@ -68,7 +68,7 @@ ULONG WINAPI IDirectMusicChordMapImpl_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicChordMap_Unknown_Vtbl = { +IUnknownVtbl DirectMusicChordMap_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicChordMapImpl_IUnknown_QueryInterface, IDirectMusicChordMapImpl_IUnknown_AddRef, @@ -97,7 +97,7 @@ HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicChordMap_GetScale (LPDIRECTM return S_OK; } -ICOM_VTABLE(IDirectMusicChordMap) DirectMusicChordMap_ChordMap_Vtbl = { +IDirectMusicChordMapVtbl DirectMusicChordMap_ChordMap_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicChordMapImpl_IDirectMusicChordMap_QueryInterface, IDirectMusicChordMapImpl_IDirectMusicChordMap_AddRef, @@ -311,7 +311,7 @@ HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_ParseDescriptor (LPDI return S_OK; } -ICOM_VTABLE(IDirectMusicObject) DirectMusicChordMap_Object_Vtbl = { +IDirectMusicObjectVtbl DirectMusicChordMap_Object_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicChordMapImpl_IDirectMusicObject_QueryInterface, IDirectMusicChordMapImpl_IDirectMusicObject_AddRef, @@ -501,7 +501,7 @@ HRESULT WINAPI IDirectMusicChordMapImpl_IPersistStream_GetSizeMax (LPPERSISTSTRE return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicChordMap_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicChordMap_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicChordMapImpl_IPersistStream_QueryInterface, IDirectMusicChordMapImpl_IPersistStream_AddRef, diff --git a/dlls/dmcompos/chordmaptrack.c b/dlls/dmcompos/chordmaptrack.c index 2e6540cf3ab..72418d2ef31 100644 --- a/dlls/dmcompos/chordmaptrack.c +++ b/dlls/dmcompos/chordmaptrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicChordMapTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicChordMapTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicChordMapTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicChordMapTrack_IUnknown_QueryInterface, IDirectMusicChordMapTrack_IUnknown_AddRef, @@ -183,7 +183,7 @@ HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTR return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicChordMapTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicChordMapTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicChordMapTrack_IDirectMusicTrack_QueryInterface, IDirectMusicChordMapTrack_IDirectMusicTrack_AddRef, @@ -243,7 +243,7 @@ HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_GetSizeMax (LPPERSISTSTR return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicChordMapTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicChordMapTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicChordMapTrack_IPersistStream_QueryInterface, IDirectMusicChordMapTrack_IPersistStream_AddRef, diff --git a/dlls/dmcompos/composer.c b/dlls/dmcompos/composer.c index 7952297cef8..21663011a0e 100644 --- a/dlls/dmcompos/composer.c +++ b/dlls/dmcompos/composer.c @@ -89,7 +89,7 @@ HRESULT WINAPI IDirectMusicComposerImpl_ChangeChordMap (LPDIRECTMUSICCOMPOSER if return S_OK; } -ICOM_VTABLE(IDirectMusicComposer) DirectMusicComposer_Vtbl = { +IDirectMusicComposerVtbl DirectMusicComposer_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicComposerImpl_QueryInterface, IDirectMusicComposerImpl_AddRef, diff --git a/dlls/dmcompos/dmcompos_main.c b/dlls/dmcompos/dmcompos_main.c index cdbe4513717..5ce7e605f3b 100644 --- a/dlls/dmcompos/dmcompos_main.c +++ b/dlls/dmcompos/dmcompos_main.c @@ -59,7 +59,7 @@ static HRESULT WINAPI ChordMapCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) ChordMapCF_Vtbl = { +static IClassFactoryVtbl ChordMapCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ChordMapCF_QueryInterface, ChordMapCF_AddRef, @@ -102,7 +102,7 @@ static HRESULT WINAPI ComposerCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) ComposerCF_Vtbl = { +static IClassFactoryVtbl ComposerCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ComposerCF_QueryInterface, ComposerCF_AddRef, @@ -145,7 +145,7 @@ static HRESULT WINAPI ChordMapTrackCF_LockServer(LPCLASSFACTORY iface,BOOL doloc return S_OK; } -static ICOM_VTABLE(IClassFactory) ChordMapTrackCF_Vtbl = { +static IClassFactoryVtbl ChordMapTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ChordMapTrackCF_QueryInterface, ChordMapTrackCF_AddRef, @@ -190,7 +190,7 @@ static HRESULT WINAPI TemplateCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) TemplateCF_Vtbl = { +static IClassFactoryVtbl TemplateCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE TemplateCF_QueryInterface, TemplateCF_AddRef, @@ -233,7 +233,7 @@ static HRESULT WINAPI SignPostTrackCF_LockServer(LPCLASSFACTORY iface,BOOL doloc return S_OK; } -static ICOM_VTABLE(IClassFactory) SignPostTrackCF_Vtbl = { +static IClassFactoryVtbl SignPostTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE SignPostTrackCF_QueryInterface, SignPostTrackCF_AddRef, diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 965ca3c721a..34e3db3ed24 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -52,20 +52,20 @@ typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack; /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IUnknown) DirectMusicChordMap_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicChordMap) DirectMusicChordMap_ChordMap_Vtbl; -extern ICOM_VTABLE(IDirectMusicObject) DirectMusicChordMap_Object_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicChordMap_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicChordMap_Unknown_Vtbl; +extern IDirectMusicChordMapVtbl DirectMusicChordMap_ChordMap_Vtbl; +extern IDirectMusicObjectVtbl DirectMusicChordMap_Object_Vtbl; +extern IPersistStreamVtbl DirectMusicChordMap_PersistStream_Vtbl; -extern ICOM_VTABLE(IDirectMusicComposer) DirectMusicComposer_Vtbl; +extern IDirectMusicComposerVtbl DirectMusicComposer_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicChordMapTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicChordMapTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicChordMapTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicChordMapTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicChordMapTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicChordMapTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicSignPostTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicSignPostTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicSignPostTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicSignPostTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicSignPostTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicSignPostTrack_PersistStream_Vtbl; /***************************************************************************** * ClassFactory @@ -80,10 +80,10 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicSignPostTrack (LPCGUID lpcGUID, LP */ struct IDirectMusicChordMapImpl { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicChordMap) *ChordMapVtbl; - ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicChordMapVtbl *ChordMapVtbl; + IDirectMusicObjectVtbl *ObjectVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicChordMapImpl fields */ @@ -146,9 +146,9 @@ extern HRESULT WINAPI IDirectMusicComposerImpl_ChangeChordMap (LPDIRECTMUSICCOMP */ struct IDirectMusicChordMapTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicChordMapTrack fields */ @@ -194,9 +194,9 @@ extern HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_GetSizeMax (LPPER */ struct IDirectMusicSignPostTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicSignPostTrack fields */ diff --git a/dlls/dmcompos/signposttrack.c b/dlls/dmcompos/signposttrack.c index 2ce20f9b113..b51d5020b44 100644 --- a/dlls/dmcompos/signposttrack.c +++ b/dlls/dmcompos/signposttrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicSignPostTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicSignPostTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicSignPostTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSignPostTrack_IUnknown_QueryInterface, IDirectMusicSignPostTrack_IUnknown_AddRef, @@ -180,7 +180,7 @@ HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTR return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicSignPostTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicSignPostTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSignPostTrack_IDirectMusicTrack_QueryInterface, IDirectMusicSignPostTrack_IDirectMusicTrack_AddRef, @@ -240,7 +240,7 @@ HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_GetSizeMax (LPPERSISTSTR return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicSignPostTrack_PersistStream_Vtbl = +IPersistStreamVtbl DirectMusicSignPostTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSignPostTrack_IPersistStream_QueryInterface, diff --git a/dlls/dmime/audiopath.c b/dlls/dmime/audiopath.c index 914a42df233..81d2af63b0d 100644 --- a/dlls/dmime/audiopath.c +++ b/dlls/dmime/audiopath.c @@ -71,7 +71,7 @@ ULONG WINAPI IDirectMusicAudioPathImpl_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicAudioPath_Unknown_Vtbl = { +IUnknownVtbl DirectMusicAudioPath_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicAudioPathImpl_IUnknown_QueryInterface, IDirectMusicAudioPathImpl_IUnknown_AddRef, @@ -210,7 +210,7 @@ HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_ConvertPChannel ( return S_OK; } -ICOM_VTABLE(IDirectMusicAudioPath) DirectMusicAudioPath_AudioPath_Vtbl = { +IDirectMusicAudioPathVtbl DirectMusicAudioPath_AudioPath_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicAudioPathImpl_IDirectMusicAudioPath_QueryInterface, IDirectMusicAudioPathImpl_IDirectMusicAudioPath_AddRef, @@ -428,7 +428,7 @@ HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_ParseDescriptor (LPD return S_OK; } -ICOM_VTABLE(IDirectMusicObject) DirectMusicAudioPath_Object_Vtbl = { +IDirectMusicObjectVtbl DirectMusicAudioPath_Object_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicAudioPathImpl_IDirectMusicObject_QueryInterface, IDirectMusicAudioPathImpl_IDirectMusicObject_AddRef, @@ -617,7 +617,7 @@ HRESULT WINAPI IDirectMusicAudioPathImpl_IPersistStream_GetSizeMax (LPPERSISTSTR return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicAudioPath_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicAudioPath_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicAudioPathImpl_IPersistStream_QueryInterface, IDirectMusicAudioPathImpl_IPersistStream_AddRef, diff --git a/dlls/dmime/dmime_main.c b/dlls/dmime/dmime_main.c index 1e87a073589..96e68c10495 100644 --- a/dlls/dmime/dmime_main.c +++ b/dlls/dmime/dmime_main.c @@ -61,7 +61,7 @@ static HRESULT WINAPI PerformanceCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) PerformanceCF_Vtbl = { +static IClassFactoryVtbl PerformanceCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE PerformanceCF_QueryInterface, PerformanceCF_AddRef, @@ -104,7 +104,7 @@ static HRESULT WINAPI SegmentCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) SegmentCF_Vtbl = { +static IClassFactoryVtbl SegmentCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE SegmentCF_QueryInterface, SegmentCF_AddRef, @@ -147,7 +147,7 @@ static HRESULT WINAPI SegmentStateCF_LockServer(LPCLASSFACTORY iface,BOOL dolock return S_OK; } -static ICOM_VTABLE(IClassFactory) SegmentStateCF_Vtbl = { +static IClassFactoryVtbl SegmentStateCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE SegmentStateCF_QueryInterface, SegmentStateCF_AddRef, @@ -190,7 +190,7 @@ static HRESULT WINAPI GraphCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) GraphCF_Vtbl = { +static IClassFactoryVtbl GraphCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE GraphCF_QueryInterface, GraphCF_AddRef, @@ -233,7 +233,7 @@ static HRESULT WINAPI TempoTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) TempoTrackCF_Vtbl = { +static IClassFactoryVtbl TempoTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE TempoTrackCF_QueryInterface, TempoTrackCF_AddRef, @@ -276,7 +276,7 @@ static HRESULT WINAPI SeqTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) SeqTrackCF_Vtbl = { +static IClassFactoryVtbl SeqTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE SeqTrackCF_QueryInterface, SeqTrackCF_AddRef, @@ -319,7 +319,7 @@ static HRESULT WINAPI SysExTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) SysExTrackCF_Vtbl = { +static IClassFactoryVtbl SysExTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE SysExTrackCF_QueryInterface, SysExTrackCF_AddRef, @@ -362,7 +362,7 @@ static HRESULT WINAPI TimeSigTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock return S_OK; } -static ICOM_VTABLE(IClassFactory) TimeSigTrackCF_Vtbl = { +static IClassFactoryVtbl TimeSigTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE TimeSigTrackCF_QueryInterface, TimeSigTrackCF_AddRef, @@ -405,7 +405,7 @@ static HRESULT WINAPI ParamControlTrackCF_LockServer(LPCLASSFACTORY iface,BOOL d return S_OK; } -static ICOM_VTABLE(IClassFactory) ParamControlTrackCF_Vtbl = { +static IClassFactoryVtbl ParamControlTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ParamControlTrackCF_QueryInterface, ParamControlTrackCF_AddRef, @@ -448,7 +448,7 @@ static HRESULT WINAPI MarkerTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) MarkerTrackCF_Vtbl = { +static IClassFactoryVtbl MarkerTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE MarkerTrackCF_QueryInterface, MarkerTrackCF_AddRef, @@ -491,7 +491,7 @@ static HRESULT WINAPI LyricsTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) LyricsTrackCF_Vtbl = { +static IClassFactoryVtbl LyricsTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE LyricsTrackCF_QueryInterface, LyricsTrackCF_AddRef, @@ -535,7 +535,7 @@ static HRESULT WINAPI SegTriggerTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dol return S_OK; } -static ICOM_VTABLE(IClassFactory) SegTriggerTrackCF_Vtbl = { +static IClassFactoryVtbl SegTriggerTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE SegTriggerTrackCF_QueryInterface, SegTriggerTrackCF_AddRef, @@ -578,7 +578,7 @@ static HRESULT WINAPI AudioPathCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) AudioPathCF_Vtbl = { +static IClassFactoryVtbl AudioPathCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE AudioPathCF_QueryInterface, AudioPathCF_AddRef, @@ -621,7 +621,7 @@ static HRESULT WINAPI WaveTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) WaveTrackCF_Vtbl = { +static IClassFactoryVtbl WaveTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE WaveTrackCF_QueryInterface, WaveTrackCF_AddRef, diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index b85fb7681fd..bc4f3dab3d1 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -65,64 +65,64 @@ typedef struct IDirectMusicWaveTrack IDirectMusicWaveTrack; /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirectMusicPerformance8) DirectMusicPerformance8_Vtbl; +extern IDirectMusicPerformance8Vtbl DirectMusicPerformance8_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicSegment8_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicSegment8) DirectMusicSegment8_Segment_Vtbl; -extern ICOM_VTABLE(IDirectMusicObject) DirectMusicSegment8_Object_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicSegment8_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicSegment8_Unknown_Vtbl; +extern IDirectMusicSegment8Vtbl DirectMusicSegment8_Segment_Vtbl; +extern IDirectMusicObjectVtbl DirectMusicSegment8_Object_Vtbl; +extern IPersistStreamVtbl DirectMusicSegment8_PersistStream_Vtbl; -extern ICOM_VTABLE(IDirectMusicSegmentState8) DirectMusicSegmentState8_Vtbl; +extern IDirectMusicSegmentState8Vtbl DirectMusicSegmentState8_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicGraph_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicGraph) DirectMusicGraph_Gtaph_Vtbl; -extern ICOM_VTABLE(IDirectMusicObject) DirectMusicGraph_Object_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicGraph_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicGraph_Unknown_Vtbl; +extern IDirectMusicGraphVtbl DirectMusicGraph_Gtaph_Vtbl; +extern IDirectMusicObjectVtbl DirectMusicGraph_Object_Vtbl; +extern IPersistStreamVtbl DirectMusicGraph_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicAudioPath_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicAudioPath) DirectMusicAudioPath_AudioPath_Vtbl; -extern ICOM_VTABLE(IDirectMusicObject) DirectMusicAudioPath_Object_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicAudioPath_Persist_Stream_Vtbl; +extern IUnknownVtbl DirectMusicAudioPath_Unknown_Vtbl; +extern IDirectMusicAudioPathVtbl DirectMusicAudioPath_AudioPath_Vtbl; +extern IDirectMusicObjectVtbl DirectMusicAudioPath_Object_Vtbl; +extern IPersistStreamVtbl DirectMusicAudioPath_Persist_Stream_Vtbl; -extern ICOM_VTABLE(IDirectMusicTool8) DirectMusicTool8_Vtbl; +extern IDirectMusicTool8Vtbl DirectMusicTool8_Vtbl; -extern ICOM_VTABLE(IDirectMusicPatternTrack) DirectMusicPatternTrack_Vtbl; +extern IDirectMusicPatternTrackVtbl DirectMusicPatternTrack_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicLyricsTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicLyricsTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicLyricsTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicLyricsTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicLyricsTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicLyricsTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicMarkerTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicMarkerTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicMarkerTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicMarkerTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicMarkerTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicMarkerTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicParamControlTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicParamControlTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicParamControlTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicParamControlTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicParamControlTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicParamControlTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicSegTriggerTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicSegTriggerTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicSegTriggerTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicSegTriggerTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicSegTriggerTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicSegTriggerTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicSeqTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicSeqTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicSeqTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicSeqTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicSeqTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicSeqTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicSysExTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicSysExTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicSysExTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicSysExTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicSysExTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicSysExTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicTempoTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicTempoTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicTempoTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicTempoTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicTempoTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicTempoTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicTimeSigTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicTimeSigTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicTimeSigTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicTimeSigTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicTimeSigTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicTimeSigTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicWaveTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicWaveTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicWaveTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicWaveTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicWaveTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicWaveTrack_PersistStream_Vtbl; /***************************************************************************** * ClassFactory @@ -290,10 +290,10 @@ extern HRESULT WINAPI IDirectMusicPerformance8Impl_GetParamEx (LPDIRECTMUSICPERF */ struct IDirectMusicSegment8Impl { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicSegment8) *SegmentVtbl; - ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicSegment8Vtbl *SegmentVtbl; + IDirectMusicObjectVtbl *ObjectVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicSegment8Impl fields */ @@ -385,10 +385,10 @@ extern HRESULT WINAPI IDirectMusicSegmentState8Impl_GetObjectInPath (LPDIRECTMUS */ struct IDirectMusicGraphImpl { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicGraph) *GraphVtbl; - ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicGraphVtbl *GraphVtbl; + IDirectMusicObjectVtbl *ObjectVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicGraphImpl fields */ @@ -430,10 +430,10 @@ extern HRESULT WINAPI IDirectMusicGraphImpl_IPersistStream_GetSizeMax (LPPERSIST */ struct IDirectMusicAudioPathImpl { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicAudioPath) *AudioPathVtbl; - ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicAudioPathVtbl *AudioPathVtbl; + IDirectMusicObjectVtbl *ObjectVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicAudioPathImpl fields */ @@ -526,9 +526,9 @@ extern HRESULT WINAPI IDirectMusicPatternTrackImpl_SetPatternByName (LPDIRECTMUS struct IDirectMusicLyricsTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicLyricsTrack fields */ @@ -573,9 +573,9 @@ extern HRESULT WINAPI IDirectMusicLyricsTrack_IPersistStream_GetSizeMax (LPPERSI */ struct IDirectMusicMarkerTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicMarkerTrack fields */ @@ -620,9 +620,9 @@ extern HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_GetSizeMax (LPPERSI */ struct IDirectMusicParamControlTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicParamControlTrack fields */ @@ -667,9 +667,9 @@ extern HRESULT WINAPI IDirectMusicParamControlTrack_IPersistStream_GetSizeMax (L */ struct IDirectMusicSegTriggerTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicSegTriggerTrack fields */ @@ -716,9 +716,9 @@ extern HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_GetSizeMax (LPP */ struct IDirectMusicSeqTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicSeqTrack fields */ @@ -763,9 +763,9 @@ extern HRESULT WINAPI IDirectMusicSeqTrack_IPersistStream_GetSizeMax (LPPERSISTS */ struct IDirectMusicSysExTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicSysExTrack fields */ @@ -810,9 +810,9 @@ extern HRESULT WINAPI IDirectMusicSysExTrack_IPersistStream_GetSizeMax (LPPERSIS */ struct IDirectMusicTempoTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicTempoTrack fields */ @@ -859,9 +859,9 @@ extern HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_GetSizeMax (LPPERSIS */ struct IDirectMusicTimeSigTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicTimeSigTrack fields */ @@ -906,9 +906,9 @@ extern HRESULT WINAPI IDirectMusicTimeSigTrack_IPersistStream_GetSizeMax (LPPERS */ struct IDirectMusicWaveTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicWaveTrack fields */ diff --git a/dlls/dmime/graph.c b/dlls/dmime/graph.c index 8c7b100fe6f..b908d6c012b 100644 --- a/dlls/dmime/graph.c +++ b/dlls/dmime/graph.c @@ -68,7 +68,7 @@ ULONG WINAPI IDirectMusicGraphImpl_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicGraph_Unknown_Vtbl = { +IUnknownVtbl DirectMusicGraph_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicGraphImpl_IUnknown_QueryInterface, IDirectMusicGraphImpl_IUnknown_AddRef, @@ -175,7 +175,7 @@ HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicGraph_RemoveTool (LPDIRECTMUSIC return S_OK; } -ICOM_VTABLE(IDirectMusicGraph) DirectMusicGraph_Graph_Vtbl = { +IDirectMusicGraphVtbl DirectMusicGraph_Graph_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicGraphImpl_IDirectMusicGraph_QueryInterface, IDirectMusicGraphImpl_IDirectMusicGraph_AddRef, @@ -394,7 +394,7 @@ HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicObject_ParseDescriptor (LPDIREC return S_OK; } -ICOM_VTABLE(IDirectMusicObject) DirectMusicGraph_Object_Vtbl = { +IDirectMusicObjectVtbl DirectMusicGraph_Object_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicGraphImpl_IDirectMusicObject_QueryInterface, IDirectMusicGraphImpl_IDirectMusicObject_AddRef, @@ -582,7 +582,7 @@ HRESULT WINAPI IDirectMusicGraphImpl_IPersistStream_GetSizeMax (LPPERSISTSTREAM return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicGraph_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicGraph_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicGraphImpl_IPersistStream_QueryInterface, IDirectMusicGraphImpl_IPersistStream_AddRef, diff --git a/dlls/dmime/lyricstrack.c b/dlls/dmime/lyricstrack.c index 14a560d809f..bb9de62d71e 100644 --- a/dlls/dmime/lyricstrack.c +++ b/dlls/dmime/lyricstrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicLyricsTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicLyricsTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicLyricsTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicLyricsTrack_IUnknown_QueryInterface, IDirectMusicLyricsTrack_IUnknown_AddRef, @@ -185,7 +185,7 @@ HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRAC return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicLyricsTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicLyricsTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicLyricsTrack_IDirectMusicTrack_QueryInterface, IDirectMusicLyricsTrack_IDirectMusicTrack_AddRef, @@ -244,7 +244,7 @@ HRESULT WINAPI IDirectMusicLyricsTrack_IPersistStream_GetSizeMax (LPPERSISTSTREA return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicLyricsTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicLyricsTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicLyricsTrack_IPersistStream_QueryInterface, IDirectMusicLyricsTrack_IPersistStream_AddRef, diff --git a/dlls/dmime/markertrack.c b/dlls/dmime/markertrack.c index a18d0f78154..886b2b13b87 100644 --- a/dlls/dmime/markertrack.c +++ b/dlls/dmime/markertrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicMarkerTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicMarkerTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicMarkerTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicMarkerTrack_IUnknown_QueryInterface, IDirectMusicMarkerTrack_IUnknown_AddRef, @@ -185,7 +185,7 @@ HRESULT WINAPI IDirectMusicMarkerTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRAC return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicMarkerTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicMarkerTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicMarkerTrack_IDirectMusicTrack_QueryInterface, IDirectMusicMarkerTrack_IDirectMusicTrack_AddRef, @@ -244,7 +244,7 @@ HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_GetSizeMax (LPPERSISTSTREA return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicMarkerTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicMarkerTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicMarkerTrack_IPersistStream_QueryInterface, IDirectMusicMarkerTrack_IPersistStream_AddRef, diff --git a/dlls/dmime/paramcontroltrack.c b/dlls/dmime/paramcontroltrack.c index 0b83928625e..2370adfa4c1 100644 --- a/dlls/dmime/paramcontroltrack.c +++ b/dlls/dmime/paramcontroltrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicParamControlTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicParamControlTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicParamControlTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicParamControlTrack_IUnknown_QueryInterface, IDirectMusicParamControlTrack_IUnknown_AddRef, @@ -185,7 +185,7 @@ HRESULT WINAPI IDirectMusicParamControlTrack_IDirectMusicTrack_Join (LPDIRECTMUS return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicParamControlTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicParamControlTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicParamControlTrack_IDirectMusicTrack_QueryInterface, IDirectMusicParamControlTrack_IDirectMusicTrack_AddRef, @@ -244,7 +244,7 @@ HRESULT WINAPI IDirectMusicParamControlTrack_IPersistStream_GetSizeMax (LPPERSIS return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicParamControlTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicParamControlTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicParamControlTrack_IPersistStream_QueryInterface, IDirectMusicParamControlTrack_IPersistStream_AddRef, diff --git a/dlls/dmime/patterntrack.c b/dlls/dmime/patterntrack.c index b289de0adbe..afa915d6c8b 100644 --- a/dlls/dmime/patterntrack.c +++ b/dlls/dmime/patterntrack.c @@ -72,7 +72,7 @@ HRESULT WINAPI IDirectMusicPatternTrackImpl_SetPatternByName (LPDIRECTMUSICPATTE return S_OK; } -ICOM_VTABLE(IDirectMusicPatternTrack) DirectMusicPatternTrack_Vtbl = { +IDirectMusicPatternTrackVtbl DirectMusicPatternTrack_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicPatternTrackImpl_QueryInterface, IDirectMusicPatternTrackImpl_AddRef, diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index d16d917296c..a5f2db59e9a 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -914,7 +914,7 @@ HRESULT WINAPI IDirectMusicPerformance8Impl_GetParamEx (LPDIRECTMUSICPERFORMANCE return S_OK; } -ICOM_VTABLE(IDirectMusicPerformance8) DirectMusicPerformance8_Vtbl = { +IDirectMusicPerformance8Vtbl DirectMusicPerformance8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicPerformance8Impl_QueryInterface, IDirectMusicPerformance8Impl_AddRef, diff --git a/dlls/dmime/segment.c b/dlls/dmime/segment.c index 48d5a1710df..dc6068725da 100644 --- a/dlls/dmime/segment.c +++ b/dlls/dmime/segment.c @@ -71,7 +71,7 @@ ULONG WINAPI IDirectMusicSegment8Impl_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicSegment8_Unknown_Vtbl = { +IUnknownVtbl DirectMusicSegment8_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSegment8Impl_IUnknown_QueryInterface, IDirectMusicSegment8Impl_IUnknown_AddRef, @@ -472,7 +472,7 @@ HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicSegment8_Unload (LPDIRECTMUS return S_OK; } -ICOM_VTABLE(IDirectMusicSegment8) DirectMusicSegment8_Segment_Vtbl = { +IDirectMusicSegment8Vtbl DirectMusicSegment8_Segment_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSegment8Impl_IDirectMusicSegment8_QueryInterface, IDirectMusicSegment8Impl_IDirectMusicSegment8_AddRef, @@ -736,7 +736,7 @@ HRESULT WINAPI IDirectMusicSegment8Impl_IDirectMusicObject_ParseDescriptor (LPDI return S_OK; } -ICOM_VTABLE(IDirectMusicObject) DirectMusicSegment8_Object_Vtbl = { +IDirectMusicObjectVtbl DirectMusicSegment8_Object_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSegment8Impl_IDirectMusicObject_QueryInterface, IDirectMusicSegment8Impl_IDirectMusicObject_AddRef, @@ -1269,7 +1269,7 @@ HRESULT WINAPI IDirectMusicSegment8Impl_IPersistStream_GetSizeMax (LPPERSISTSTRE return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicSegment8_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicSegment8_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSegment8Impl_IPersistStream_QueryInterface, IDirectMusicSegment8Impl_IPersistStream_AddRef, diff --git a/dlls/dmime/segmentstate.c b/dlls/dmime/segmentstate.c index 05561ba4d8a..bf47fd75da8 100644 --- a/dlls/dmime/segmentstate.c +++ b/dlls/dmime/segmentstate.c @@ -97,7 +97,7 @@ HRESULT WINAPI IDirectMusicSegmentState8Impl_GetObjectInPath (LPDIRECTMUSICSEGME return S_OK; } -ICOM_VTABLE(IDirectMusicSegmentState8) DirectMusicSegmentState8_Vtbl = { +IDirectMusicSegmentState8Vtbl DirectMusicSegmentState8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSegmentState8Impl_QueryInterface, IDirectMusicSegmentState8Impl_AddRef, diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index ff02d6bb9a7..b4527c82a26 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -66,7 +66,7 @@ ULONG WINAPI IDirectMusicSegTriggerTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicSegTriggerTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicSegTriggerTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSegTriggerTrack_IUnknown_QueryInterface, IDirectMusicSegTriggerTrack_IUnknown_AddRef, @@ -186,7 +186,7 @@ HRESULT WINAPI IDirectMusicSegTriggerTrack_IDirectMusicTrack_Join (LPDIRECTMUSIC return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicSegTriggerTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicSegTriggerTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSegTriggerTrack_IDirectMusicTrack_QueryInterface, IDirectMusicSegTriggerTrack_IDirectMusicTrack_AddRef, @@ -491,7 +491,7 @@ HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_GetSizeMax (LPPERSISTS return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicSegTriggerTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicSegTriggerTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSegTriggerTrack_IPersistStream_QueryInterface, IDirectMusicSegTriggerTrack_IPersistStream_AddRef, diff --git a/dlls/dmime/seqtrack.c b/dlls/dmime/seqtrack.c index e2875a04ca5..db6cf3404aa 100644 --- a/dlls/dmime/seqtrack.c +++ b/dlls/dmime/seqtrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicSeqTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicSeqTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicSeqTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSeqTrack_IUnknown_QueryInterface, IDirectMusicSeqTrack_IUnknown_AddRef, @@ -185,7 +185,7 @@ HRESULT WINAPI IDirectMusicSeqTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicSeqTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicSeqTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSeqTrack_IDirectMusicTrack_QueryInterface, IDirectMusicSeqTrack_IDirectMusicTrack_AddRef, @@ -244,7 +244,7 @@ HRESULT WINAPI IDirectMusicSeqTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM i return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicSeqTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicSeqTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSeqTrack_IPersistStream_QueryInterface, IDirectMusicSeqTrack_IPersistStream_AddRef, diff --git a/dlls/dmime/sysextrack.c b/dlls/dmime/sysextrack.c index f9ebdbb21a0..149b8e48128 100644 --- a/dlls/dmime/sysextrack.c +++ b/dlls/dmime/sysextrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicSysExTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicSysExTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicSysExTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSysExTrack_IUnknown_QueryInterface, IDirectMusicSysExTrack_IUnknown_AddRef, @@ -185,7 +185,7 @@ HRESULT WINAPI IDirectMusicSysExTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicSysExTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicSysExTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSysExTrack_IDirectMusicTrack_QueryInterface, IDirectMusicSysExTrack_IDirectMusicTrack_AddRef, @@ -244,7 +244,7 @@ HRESULT WINAPI IDirectMusicSysExTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicSysExTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicSysExTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSysExTrack_IPersistStream_QueryInterface, IDirectMusicSysExTrack_IPersistStream_AddRef, diff --git a/dlls/dmime/tempotrack.c b/dlls/dmime/tempotrack.c index f98423c3754..e44e3a17ef1 100644 --- a/dlls/dmime/tempotrack.c +++ b/dlls/dmime/tempotrack.c @@ -66,7 +66,7 @@ ULONG WINAPI IDirectMusicTempoTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicTempoTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicTempoTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicTempoTrack_IUnknown_QueryInterface, IDirectMusicTempoTrack_IUnknown_AddRef, @@ -259,7 +259,7 @@ HRESULT WINAPI IDirectMusicTempoTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicTempoTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicTempoTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicTempoTrack_IDirectMusicTrack_QueryInterface, IDirectMusicTempoTrack_IDirectMusicTrack_AddRef, @@ -378,7 +378,7 @@ HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicTempoTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicTempoTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicTempoTrack_IPersistStream_QueryInterface, IDirectMusicTempoTrack_IPersistStream_AddRef, diff --git a/dlls/dmime/timesigtrack.c b/dlls/dmime/timesigtrack.c index 9150ebfc538..4a02a57a055 100644 --- a/dlls/dmime/timesigtrack.c +++ b/dlls/dmime/timesigtrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicTimeSigTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicTimeSigTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicTimeSigTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicTimeSigTrack_IUnknown_QueryInterface, IDirectMusicTimeSigTrack_IUnknown_AddRef, @@ -190,7 +190,7 @@ HRESULT WINAPI IDirectMusicTimeSigTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRA return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicTimeSigTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicTimeSigTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicTimeSigTrack_IDirectMusicTrack_QueryInterface, IDirectMusicTimeSigTrack_IDirectMusicTrack_AddRef, @@ -249,7 +249,7 @@ HRESULT WINAPI IDirectMusicTimeSigTrack_IPersistStream_GetSizeMax (LPPERSISTSTRE return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicTimeSigTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicTimeSigTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicTimeSigTrack_IPersistStream_QueryInterface, IDirectMusicTimeSigTrack_IPersistStream_AddRef, diff --git a/dlls/dmime/tool.c b/dlls/dmime/tool.c index 4f81c71b017..629bdcb986a 100644 --- a/dlls/dmime/tool.c +++ b/dlls/dmime/tool.c @@ -96,7 +96,7 @@ HRESULT WINAPI IDirectMusicTool8Impl_Clone (LPDIRECTMUSICTOOL8 iface, IDirectMus return S_OK; } -ICOM_VTABLE(IDirectMusicTool8) DirectMusicTool8_Vtbl = { +IDirectMusicTool8Vtbl DirectMusicTool8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicTool8Impl_QueryInterface, IDirectMusicTool8Impl_AddRef, diff --git a/dlls/dmime/wavetrack.c b/dlls/dmime/wavetrack.c index 0d2bd4e7cd4..7d8d11eae5a 100644 --- a/dlls/dmime/wavetrack.c +++ b/dlls/dmime/wavetrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicWaveTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicWaveTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicWaveTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicWaveTrack_IUnknown_QueryInterface, IDirectMusicWaveTrack_IUnknown_AddRef, @@ -191,7 +191,7 @@ HRESULT WINAPI IDirectMusicWaveTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicWaveTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicWaveTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicWaveTrack_IDirectMusicTrack_QueryInterface, IDirectMusicWaveTrack_IDirectMusicTrack_AddRef, @@ -250,7 +250,7 @@ HRESULT WINAPI IDirectMusicWaveTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicWaveTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicWaveTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicWaveTrack_IPersistStream_QueryInterface, IDirectMusicWaveTrack_IPersistStream_AddRef, diff --git a/dlls/dmloader/classfactory.c b/dlls/dmloader/classfactory.c index 0f962cc65fa..c06d38f2421 100644 --- a/dlls/dmloader/classfactory.c +++ b/dlls/dmloader/classfactory.c @@ -82,7 +82,7 @@ HRESULT WINAPI IDirectMusicLoaderCF_LockServer (LPCLASSFACTORY iface, BOOL doloc return S_OK; } -ICOM_VTABLE(IClassFactory) DirectMusicLoaderCF_Vtbl = { +IClassFactoryVtbl DirectMusicLoaderCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicLoaderCF_QueryInterface, IDirectMusicLoaderCF_AddRef, @@ -170,7 +170,7 @@ HRESULT WINAPI IDirectMusicContainerCF_LockServer (LPCLASSFACTORY iface, BOOL do return S_OK; } -ICOM_VTABLE(IClassFactory) DirectMusicContainerCF_Vtbl = { +IClassFactoryVtbl DirectMusicContainerCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicContainerCF_QueryInterface, IDirectMusicContainerCF_AddRef, diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index fd40aac26c0..74a3de2e637 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -127,7 +127,7 @@ HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicContainer_EnumObject (LPDIR return S_FALSE; } -ICOM_VTABLE(IDirectMusicContainer) DirectMusicContainer_Container_Vtbl = { +IDirectMusicContainerVtbl DirectMusicContainer_Container_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicContainerImpl_IDirectMusicContainer_QueryInterface, IDirectMusicContainerImpl_IDirectMusicContainer_AddRef, @@ -399,7 +399,7 @@ HRESULT WINAPI IDirectMusicContainerImpl_IDirectMusicObject_ParseDescriptor (LPD return S_OK; } -ICOM_VTABLE(IDirectMusicObject) DirectMusicContainer_Object_Vtbl = { +IDirectMusicObjectVtbl DirectMusicContainer_Object_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicContainerImpl_IDirectMusicObject_QueryInterface, IDirectMusicContainerImpl_IDirectMusicObject_AddRef, @@ -871,7 +871,7 @@ HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_GetSizeMax (LPPERSISTSTR return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicContainer_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicContainer_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicContainerImpl_IPersistStream_QueryInterface, IDirectMusicContainerImpl_IPersistStream_AddRef, diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index 4f2d0e5e80b..6e29428bbbb 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -62,23 +62,23 @@ typedef struct IDirectMusicLoaderGenericStream IDirectMusicLoaderGenericStream; /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IClassFactory) DirectMusicLoaderCF_Vtbl; -extern ICOM_VTABLE(IClassFactory) DirectMusicContainerCF_Vtbl; +extern IClassFactoryVtbl DirectMusicLoaderCF_Vtbl; +extern IClassFactoryVtbl DirectMusicContainerCF_Vtbl; -extern ICOM_VTABLE(IDirectMusicLoader8) DirectMusicLoader_Loader_Vtbl; +extern IDirectMusicLoader8Vtbl DirectMusicLoader_Loader_Vtbl; -extern ICOM_VTABLE(IDirectMusicContainer) DirectMusicContainer_Container_Vtbl; -extern ICOM_VTABLE(IDirectMusicObject) DirectMusicContainer_Object_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicContainer_PersistStream_Vtbl; +extern IDirectMusicContainerVtbl DirectMusicContainer_Container_Vtbl; +extern IDirectMusicObjectVtbl DirectMusicContainer_Object_Vtbl; +extern IPersistStreamVtbl DirectMusicContainer_PersistStream_Vtbl; -extern ICOM_VTABLE(IStream) DirectMusicLoaderFileStream_Stream_Vtbl; -extern ICOM_VTABLE(IDirectMusicGetLoader) DirectMusicLoaderFileStream_GetLoader_Vtbl; +extern IStreamVtbl DirectMusicLoaderFileStream_Stream_Vtbl; +extern IDirectMusicGetLoaderVtbl DirectMusicLoaderFileStream_GetLoader_Vtbl; -extern ICOM_VTABLE(IStream) DirectMusicLoaderResourceStream_Stream_Vtbl; -extern ICOM_VTABLE(IDirectMusicGetLoader) DirectMusicLoaderResourceStream_GetLoader_Vtbl; +extern IStreamVtbl DirectMusicLoaderResourceStream_Stream_Vtbl; +extern IDirectMusicGetLoaderVtbl DirectMusicLoaderResourceStream_GetLoader_Vtbl; -extern ICOM_VTABLE(IStream) DirectMusicLoaderGenericStream_Stream_Vtbl; -extern ICOM_VTABLE(IDirectMusicGetLoader) DirectMusicLoaderGenericStream_GetLoader_Vtbl; +extern IStreamVtbl DirectMusicLoaderGenericStream_Stream_Vtbl; +extern IDirectMusicGetLoaderVtbl DirectMusicLoaderGenericStream_GetLoader_Vtbl; /***************************************************************************** * Creation helpers @@ -155,7 +155,7 @@ typedef struct _WINE_LOADER_OPTION { */ struct IDirectMusicLoaderImpl { /* VTABLEs */ - ICOM_VTABLE(IDirectMusicLoader8) *LoaderVtbl; + IDirectMusicLoader8Vtbl *LoaderVtbl; /* reference counter */ DWORD dwRef; /* simple cache (linked list) */ @@ -198,9 +198,9 @@ typedef struct _WINE_CONTAINER_ENTRY { */ struct IDirectMusicContainerImpl { /* VTABLEs */ - ICOM_VTABLE(IDirectMusicContainer) *ContainerVtbl; - ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IDirectMusicContainerVtbl *ContainerVtbl; + IDirectMusicObjectVtbl *ObjectVtbl; + IPersistStreamVtbl *PersistStreamVtbl; /* reference counter */ DWORD dwRef; /* stream */ @@ -241,8 +241,8 @@ extern HRESULT WINAPI IDirectMusicContainerImpl_IPersistStream_GetSizeMax (LPPER */ struct IDirectMusicLoaderFileStream { /* VTABLEs */ - ICOM_VTABLE(IStream) *StreamVtbl; - ICOM_VTABLE(IDirectMusicGetLoader) *GetLoaderVtbl; + IStreamVtbl *StreamVtbl; + IDirectMusicGetLoaderVtbl *GetLoaderVtbl; /* reference counter */ DWORD dwRef; /* file */ @@ -282,8 +282,8 @@ extern HRESULT WINAPI IDirectMusicLoaderFileStream_IDirectMusicGetLoader_GetLoad */ struct IDirectMusicLoaderResourceStream { /* IUnknown fields */ - ICOM_VTABLE(IStream) *StreamVtbl; - ICOM_VTABLE(IDirectMusicGetLoader) *GetLoaderVtbl; + IStreamVtbl *StreamVtbl; + IDirectMusicGetLoaderVtbl *GetLoaderVtbl; /* reference counter */ DWORD dwRef; /* data */ @@ -325,8 +325,8 @@ extern HRESULT WINAPI IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_Get */ struct IDirectMusicLoaderGenericStream { /* IUnknown fields */ - ICOM_VTABLE(IStream) *StreamVtbl; - ICOM_VTABLE(IDirectMusicGetLoader) *GetLoaderVtbl; + IStreamVtbl *StreamVtbl; + IDirectMusicGetLoaderVtbl *GetLoaderVtbl; /* reference counter */ DWORD dwRef; /* stream */ diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 2008e05b01c..3ae6865de5c 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -736,7 +736,7 @@ HRESULT WINAPI IDirectMusicLoaderImpl_IDirectMusicLoader_LoadObjectFromFile (LPD return IDirectMusicLoaderImpl_IDirectMusicLoader_GetObject (iface, &ObjDesc, iidInterfaceID, ppObject); } -ICOM_VTABLE(IDirectMusicLoader8) DirectMusicLoader_Loader_Vtbl = { +IDirectMusicLoader8Vtbl DirectMusicLoader_Loader_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicLoaderImpl_IDirectMusicLoader_QueryInterface, IDirectMusicLoaderImpl_IDirectMusicLoader_AddRef, diff --git a/dlls/dmloader/loaderstream.c b/dlls/dmloader/loaderstream.c index db4e96aa523..15455b3a9d5 100644 --- a/dlls/dmloader/loaderstream.c +++ b/dlls/dmloader/loaderstream.c @@ -230,7 +230,7 @@ HRESULT WINAPI IDirectMusicLoaderFileStream_IStream_Stat (LPSTREAM iface, STATST return E_NOTIMPL; } -ICOM_VTABLE(IStream) DirectMusicLoaderFileStream_Stream_Vtbl = { +IStreamVtbl DirectMusicLoaderFileStream_Stream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicLoaderFileStream_IStream_QueryInterface, IDirectMusicLoaderFileStream_IStream_AddRef, @@ -274,7 +274,7 @@ HRESULT WINAPI IDirectMusicLoaderFileStream_IDirectMusicGetLoader_GetLoader (LPD return S_OK; } -ICOM_VTABLE(IDirectMusicGetLoader) DirectMusicLoaderFileStream_GetLoader_Vtbl = { +IDirectMusicGetLoaderVtbl DirectMusicLoaderFileStream_GetLoader_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicLoaderFileStream_IDirectMusicGetLoader_QueryInterface, IDirectMusicLoaderFileStream_IDirectMusicGetLoader_AddRef, @@ -498,7 +498,7 @@ HRESULT WINAPI IDirectMusicLoaderResourceStream_IStream_Stat (LPSTREAM iface, ST return E_NOTIMPL; } -ICOM_VTABLE(IStream) DirectMusicLoaderResourceStream_Stream_Vtbl = { +IStreamVtbl DirectMusicLoaderResourceStream_Stream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicLoaderResourceStream_IStream_QueryInterface, IDirectMusicLoaderResourceStream_IStream_AddRef, @@ -542,7 +542,7 @@ HRESULT WINAPI IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_GetLoader return S_OK; } -ICOM_VTABLE(IDirectMusicGetLoader) DirectMusicLoaderResourceStream_GetLoader_Vtbl = { +IDirectMusicGetLoaderVtbl DirectMusicLoaderResourceStream_GetLoader_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_QueryInterface, IDirectMusicLoaderResourceStream_IDirectMusicGetLoader_AddRef, @@ -758,7 +758,7 @@ HRESULT WINAPI IDirectMusicLoaderGenericStream_IStream_Stat (LPSTREAM iface, STA return IStream_Stat (This->pStream, pstatstg, grfStatFlag); } -ICOM_VTABLE(IStream) DirectMusicLoaderGenericStream_Stream_Vtbl = { +IStreamVtbl DirectMusicLoaderGenericStream_Stream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicLoaderGenericStream_IStream_QueryInterface, IDirectMusicLoaderGenericStream_IStream_AddRef, @@ -802,7 +802,7 @@ HRESULT WINAPI IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_GetLoader ( return S_OK; } -ICOM_VTABLE(IDirectMusicGetLoader) DirectMusicLoaderGenericStream_GetLoader_Vtbl = { +IDirectMusicGetLoaderVtbl DirectMusicLoaderGenericStream_GetLoader_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_QueryInterface, IDirectMusicLoaderGenericStream_IDirectMusicGetLoader_AddRef, diff --git a/dlls/dmscript/dmscript_main.c b/dlls/dmscript/dmscript_main.c index f63311b6907..c491be5fe91 100644 --- a/dlls/dmscript/dmscript_main.c +++ b/dlls/dmscript/dmscript_main.c @@ -61,7 +61,7 @@ static HRESULT WINAPI ScriptAutoImplSegmentCF_LockServer(LPCLASSFACTORY iface,BO return S_OK; } -static ICOM_VTABLE(IClassFactory) ScriptAutoImplSegmentCF_Vtbl = { +static IClassFactoryVtbl ScriptAutoImplSegmentCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ScriptAutoImplSegmentCF_QueryInterface, ScriptAutoImplSegmentCF_AddRef, @@ -104,7 +104,7 @@ static HRESULT WINAPI ScriptTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) ScriptTrackCF_Vtbl = { +static IClassFactoryVtbl ScriptTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ScriptTrackCF_QueryInterface, ScriptTrackCF_AddRef, @@ -149,7 +149,7 @@ static HRESULT WINAPI AudioVBScriptCF_LockServer(LPCLASSFACTORY iface,BOOL doloc return S_OK; } -static ICOM_VTABLE(IClassFactory) AudioVBScriptCF_Vtbl = { +static IClassFactoryVtbl AudioVBScriptCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE AudioVBScriptCF_QueryInterface, AudioVBScriptCF_AddRef, @@ -192,7 +192,7 @@ static HRESULT WINAPI ScriptCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) ScriptCF_Vtbl = { +static IClassFactoryVtbl ScriptCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ScriptCF_QueryInterface, ScriptCF_AddRef, @@ -237,7 +237,7 @@ static HRESULT WINAPI ScriptAutoImplPerformanceCF_LockServer(LPCLASSFACTORY ifac return S_OK; } -static ICOM_VTABLE(IClassFactory) ScriptAutoImplPerformanceCF_Vtbl = { +static IClassFactoryVtbl ScriptAutoImplPerformanceCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ScriptAutoImplPerformanceCF_QueryInterface, ScriptAutoImplPerformanceCF_AddRef, @@ -282,7 +282,7 @@ static HRESULT WINAPI ScriptSourceCodeLoaderCF_LockServer(LPCLASSFACTORY iface,B return S_OK; } -static ICOM_VTABLE(IClassFactory) ScriptSourceCodeLoaderCF_Vtbl = { +static IClassFactoryVtbl ScriptSourceCodeLoaderCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ScriptSourceCodeLoaderCF_QueryInterface, ScriptSourceCodeLoaderCF_AddRef, @@ -327,7 +327,7 @@ static HRESULT WINAPI ScriptAutoImplSegmentStateCF_LockServer(LPCLASSFACTORY ifa return S_OK; } -static ICOM_VTABLE(IClassFactory) ScriptAutoImplSegmentStateCF_Vtbl = { +static IClassFactoryVtbl ScriptAutoImplSegmentStateCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ScriptAutoImplSegmentStateCF_QueryInterface, ScriptAutoImplSegmentStateCF_AddRef, @@ -372,7 +372,7 @@ static HRESULT WINAPI ScriptAutoImplAudioPathConfigCF_LockServer(LPCLASSFACTORY return S_OK; } -static ICOM_VTABLE(IClassFactory) ScriptAutoImplAudioPathConfigCF_Vtbl = { +static IClassFactoryVtbl ScriptAutoImplAudioPathConfigCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ScriptAutoImplAudioPathConfigCF_QueryInterface, ScriptAutoImplAudioPathConfigCF_AddRef, @@ -417,7 +417,7 @@ static HRESULT WINAPI ScriptAutoImplAudioPathCF_LockServer(LPCLASSFACTORY iface, return S_OK; } -static ICOM_VTABLE(IClassFactory) ScriptAutoImplAudioPathCF_Vtbl = { +static IClassFactoryVtbl ScriptAutoImplAudioPathCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ScriptAutoImplAudioPathCF_QueryInterface, ScriptAutoImplAudioPathCF_AddRef, @@ -462,7 +462,7 @@ static HRESULT WINAPI ScriptAutoImplSongCF_LockServer(LPCLASSFACTORY iface,BOOL return S_OK; } -static ICOM_VTABLE(IClassFactory) ScriptAutoImplSongCF_Vtbl = { +static IClassFactoryVtbl ScriptAutoImplSongCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ScriptAutoImplSongCF_QueryInterface, ScriptAutoImplSongCF_AddRef, diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index e777d223ac3..ab2b189a268 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -51,14 +51,14 @@ typedef struct IDirectMusicScriptTrack IDirectMusicScriptTrack; /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IUnknown) DirectMusicScript_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicScript) DirectMusicScript_Script_Vtbl; -extern ICOM_VTABLE(IDirectMusicObject) DirectMusicScript_Object_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicScript_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicScript_Unknown_Vtbl; +extern IDirectMusicScriptVtbl DirectMusicScript_Script_Vtbl; +extern IDirectMusicObjectVtbl DirectMusicScript_Object_Vtbl; +extern IPersistStreamVtbl DirectMusicScript_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicScriptTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicScriptTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicScriptTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicScriptTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicScriptTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicScriptTrack_PersistStream_Vtbl; /***************************************************************************** * ClassFactory @@ -72,10 +72,10 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicScriptTrack (LPCGUID lpcGUID, LPVO */ struct IDirectMusicScriptImpl { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicScript) *ScriptVtbl; - ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicScriptVtbl *ScriptVtbl; + IDirectMusicObjectVtbl *ObjectVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicScriptImpl fields */ @@ -127,9 +127,9 @@ extern HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetSizeMax (LPPERSIS */ struct IDirectMusicScriptTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicScriptTrack fields */ diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index ce676bbb0a7..c11c5e1cf73 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -81,7 +81,7 @@ ULONG WINAPI IDirectMusicScriptImpl_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicScript_Unknown_Vtbl = { +IUnknownVtbl DirectMusicScript_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicScriptImpl_IUnknown_QueryInterface, IDirectMusicScriptImpl_IUnknown_AddRef, @@ -167,7 +167,7 @@ HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicScript_EnumVariable (LPDIRECTM return S_OK; } -ICOM_VTABLE(IDirectMusicScript) DirectMusicScript_Script_Vtbl = { +IDirectMusicScriptVtbl DirectMusicScript_Script_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicScriptImpl_IDirectMusicScript_QueryInterface, IDirectMusicScriptImpl_IDirectMusicScript_AddRef, @@ -391,7 +391,7 @@ HRESULT WINAPI IDirectMusicScriptImpl_IDirectMusicObject_ParseDescriptor (LPDIRE return S_OK; } -ICOM_VTABLE(IDirectMusicObject) DirectMusicScript_Object_Vtbl = { +IDirectMusicObjectVtbl DirectMusicScript_Object_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicScriptImpl_IDirectMusicObject_QueryInterface, IDirectMusicScriptImpl_IDirectMusicObject_AddRef, @@ -666,7 +666,7 @@ HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_GetSizeMax (LPPERSISTSTREAM return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicScript_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicScript_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicScriptImpl_IPersistStream_QueryInterface, IDirectMusicScriptImpl_IPersistStream_AddRef, diff --git a/dlls/dmscript/scripttrack.c b/dlls/dmscript/scripttrack.c index 57ef70820ec..f38c1e523e2 100644 --- a/dlls/dmscript/scripttrack.c +++ b/dlls/dmscript/scripttrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicScriptTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicScriptTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicScriptTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicScriptTrack_IUnknown_QueryInterface, IDirectMusicScriptTrack_IUnknown_AddRef, @@ -185,7 +185,7 @@ HRESULT WINAPI IDirectMusicScriptTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRAC return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicScriptTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicScriptTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicScriptTrack_IDirectMusicTrack_QueryInterface, IDirectMusicScriptTrack_IDirectMusicTrack_AddRef, @@ -244,7 +244,7 @@ HRESULT WINAPI IDirectMusicScriptTrack_IPersistStream_GetSizeMax (LPPERSISTSTREA return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicScriptTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicScriptTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicScriptTrack_IPersistStream_QueryInterface, IDirectMusicScriptTrack_IPersistStream_AddRef, diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 2cf45af9748..03e408e5d81 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicAuditionTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicAuditionTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicAuditionTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicAuditionTrack_IUnknown_QueryInterface, IDirectMusicAuditionTrack_IUnknown_AddRef, @@ -185,7 +185,7 @@ HRESULT WINAPI IDirectMusicAuditionTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTR return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicAuditionTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicAuditionTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicAuditionTrack_IDirectMusicTrack_QueryInterface, IDirectMusicAuditionTrack_IDirectMusicTrack_AddRef, @@ -244,7 +244,7 @@ HRESULT WINAPI IDirectMusicAuditionTrack_IPersistStream_GetSizeMax (LPPERSISTSTR return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicAuditionTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicAuditionTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicAuditionTrack_IPersistStream_QueryInterface, IDirectMusicAuditionTrack_IPersistStream_AddRef, diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index b19b4f71936..a6e9d708dce 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -66,7 +66,7 @@ ULONG WINAPI IDirectMusicChordTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicChordTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicChordTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicChordTrack_IUnknown_QueryInterface, IDirectMusicChordTrack_IUnknown_AddRef, @@ -190,7 +190,7 @@ HRESULT WINAPI IDirectMusicChordTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicChordTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicChordTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicChordTrack_IDirectMusicTrack_QueryInterface, IDirectMusicChordTrack_IDirectMusicTrack_AddRef, @@ -372,7 +372,7 @@ HRESULT WINAPI IDirectMusicChordTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicChordTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicChordTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicChordTrack_IPersistStream_QueryInterface, IDirectMusicChordTrack_IPersistStream_AddRef, diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 6439fe3ffcb..559892a1473 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicCommandTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicCommandTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicCommandTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicCommandTrack_IUnknown_QueryInterface, IDirectMusicCommandTrack_IUnknown_AddRef, @@ -191,7 +191,7 @@ HRESULT WINAPI IDirectMusicCommandTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRA return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicCommandTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicCommandTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicCommandTrack_IDirectMusicTrack_QueryInterface, IDirectMusicCommandTrack_IDirectMusicTrack_AddRef, @@ -306,7 +306,7 @@ HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_GetSizeMax (LPPERSISTSTRE return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicCommandTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicCommandTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicCommandTrack_IPersistStream_QueryInterface, IDirectMusicCommandTrack_IPersistStream_AddRef, diff --git a/dlls/dmstyle/dmstyle_main.c b/dlls/dmstyle/dmstyle_main.c index e27da159f04..b41f0a613ce 100644 --- a/dlls/dmstyle/dmstyle_main.c +++ b/dlls/dmstyle/dmstyle_main.c @@ -61,7 +61,7 @@ static HRESULT WINAPI SectionCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) SectionCF_Vtbl = { +static IClassFactoryVtbl SectionCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE SectionCF_QueryInterface, SectionCF_AddRef, @@ -104,7 +104,7 @@ static HRESULT WINAPI StyleCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) StyleCF_Vtbl = { +static IClassFactoryVtbl StyleCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE StyleCF_QueryInterface, StyleCF_AddRef, @@ -147,7 +147,7 @@ static HRESULT WINAPI ChordTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) ChordTrackCF_Vtbl = { +static IClassFactoryVtbl ChordTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ChordTrackCF_QueryInterface, ChordTrackCF_AddRef, @@ -190,7 +190,7 @@ static HRESULT WINAPI CommandTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock return S_OK; } -static ICOM_VTABLE(IClassFactory) CommandTrackCF_Vtbl = { +static IClassFactoryVtbl CommandTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE CommandTrackCF_QueryInterface, CommandTrackCF_AddRef, @@ -233,7 +233,7 @@ static HRESULT WINAPI StyleTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) StyleTrackCF_Vtbl = { +static IClassFactoryVtbl StyleTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE StyleTrackCF_QueryInterface, StyleTrackCF_AddRef, @@ -276,7 +276,7 @@ static HRESULT WINAPI MotifTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) MotifTrackCF_Vtbl = { +static IClassFactoryVtbl MotifTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE MotifTrackCF_QueryInterface, MotifTrackCF_AddRef, @@ -319,7 +319,7 @@ static HRESULT WINAPI AuditionTrackCF_LockServer(LPCLASSFACTORY iface,BOOL doloc return S_OK; } -static ICOM_VTABLE(IClassFactory) AuditionTrackCF_Vtbl = { +static IClassFactoryVtbl AuditionTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE AuditionTrackCF_QueryInterface, AuditionTrackCF_AddRef, @@ -362,7 +362,7 @@ static HRESULT WINAPI MuteTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) MuteTrackCF_Vtbl = { +static IClassFactoryVtbl MuteTrackCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE MuteTrackCF_QueryInterface, MuteTrackCF_AddRef, diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index ccd23b96eaa..76ea20aa69b 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -57,38 +57,38 @@ typedef struct IDirectMusicStyleTrack IDirectMusicStyleTrack; /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IUnknown) DirectMusicStyle8_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicStyle8) DirectMusicStyle8_Style_Vtbl; -extern ICOM_VTABLE(IDirectMusicObject) DirectMusicStyle8_Object_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicStyle8_IPersistStream_Vtbl; +extern IUnknownVtbl DirectMusicStyle8_Unknown_Vtbl; +extern IDirectMusicStyle8Vtbl DirectMusicStyle8_Style_Vtbl; +extern IDirectMusicObjectVtbl DirectMusicStyle8_Object_Vtbl; +extern IPersistStreamVtbl DirectMusicStyle8_IPersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicAuditionTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicAuditionTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicAuditionTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicAuditionTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicAuditionTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicAuditionTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicChordTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicChordTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicChordTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicChordTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicChordTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicChordTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicCommandTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicCommandTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicCommandTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicCommandTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicCommandTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicCommandTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicMelodyFormulationTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicMelodyFormulationTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicMelodyFormulationTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicMelodyFormulationTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicMelodyFormulationTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicMelodyFormulationTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicMotifTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicMotifTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicMotifTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicMotifTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicMotifTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicMotifTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicMuteTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicMuteTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicMuteTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicMuteTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicMuteTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicMuteTrack_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicStyleTrack_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicStyleTrack_Track_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicStyleTrack_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicStyleTrack_Unknown_Vtbl; +extern IDirectMusicTrack8Vtbl DirectMusicStyleTrack_Track_Vtbl; +extern IPersistStreamVtbl DirectMusicStyleTrack_PersistStream_Vtbl; /***************************************************************************** * ClassFactory @@ -124,10 +124,10 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicStyleTrack (LPCGUID lpcGUID, LPVOI */ struct IDirectMusicStyle8Impl { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicStyle8) *StyleVtbl; - ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicStyle8Vtbl *StyleVtbl; + IDirectMusicObjectVtbl *ObjectVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicStyle8Impl fields */ @@ -182,9 +182,9 @@ extern HRESULT WINAPI IDirectMusicStyle8Impl_IPersistStream_GetSizeMax (LPPERSIS */ struct IDirectMusicAuditionTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicAuditionTrack fields */ @@ -230,9 +230,9 @@ extern HRESULT WINAPI IDirectMusicAuditionTrack_IPersistStream_GetSizeMax (LPPER */ struct IDirectMusicChordTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicChordTrack fields */ @@ -284,9 +284,9 @@ typedef struct _DMUS_PRIVATE_COMMAND { */ struct IDirectMusicCommandTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicCommandTrack fields */ @@ -334,9 +334,9 @@ extern HRESULT WINAPI IDirectMusicCommandTrack_IPersistStream_GetSizeMax (LPPERS */ struct IDirectMusicMelodyFormulationTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicMelodyFormulationTrack fields */ @@ -382,9 +382,9 @@ extern HRESULT WINAPI IDirectMusicMelodyFormulationTrack_IPersistStream_GetSizeM */ struct IDirectMusicMotifTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicMotifTrack fields */ @@ -430,9 +430,9 @@ extern HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_GetSizeMax (LPPERSIS */ struct IDirectMusicMuteTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicMuteTrack fields */ @@ -478,9 +478,9 @@ extern HRESULT WINAPI IDirectMusicMuteTrack_IPersistStream_GetSizeMax (LPPERSIST */ struct IDirectMusicStyleTrack { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicTrack8Vtbl *TrackVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicStyleTrack fields */ diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index 53eebf9ea62..a9666ead9e4 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicMotifTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicMotifTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicMotifTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicMotifTrack_IUnknown_QueryInterface, IDirectMusicMotifTrack_IUnknown_AddRef, @@ -191,7 +191,7 @@ HRESULT WINAPI IDirectMusicMotifTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicMotifTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicMotifTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicMotifTrack_IDirectMusicTrack_QueryInterface, IDirectMusicMotifTrack_IDirectMusicTrack_AddRef, @@ -250,7 +250,7 @@ HRESULT WINAPI IDirectMusicMotifTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicMotifTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicMotifTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicMotifTrack_IPersistStream_QueryInterface, IDirectMusicMotifTrack_IPersistStream_AddRef, diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 77d2c02d679..97910d57790 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicMuteTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicMuteTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicMuteTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicMuteTrack_IUnknown_QueryInterface, IDirectMusicMuteTrack_IUnknown_AddRef, @@ -188,7 +188,7 @@ HRESULT WINAPI IDirectMusicMuteTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8 return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicMuteTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicMuteTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicMuteTrack_IDirectMusicTrack_QueryInterface, IDirectMusicMuteTrack_IDirectMusicTrack_AddRef, @@ -247,7 +247,7 @@ HRESULT WINAPI IDirectMusicMuteTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicMuteTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicMuteTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicMuteTrack_IPersistStream_QueryInterface, IDirectMusicMuteTrack_IPersistStream_AddRef, diff --git a/dlls/dmstyle/style.c b/dlls/dmstyle/style.c index a9d0d911872..ffe3041c831 100644 --- a/dlls/dmstyle/style.c +++ b/dlls/dmstyle/style.c @@ -69,7 +69,7 @@ ULONG WINAPI IDirectMusicStyle8Impl_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicStyle8_Unknown_Vtbl = { +IUnknownVtbl DirectMusicStyle8_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicStyle8Impl_IUnknown_QueryInterface, IDirectMusicStyle8Impl_IUnknown_AddRef, @@ -165,7 +165,7 @@ HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicStyle8_EnumPattern (LPDIRECTMU return S_OK; } -ICOM_VTABLE(IDirectMusicStyle8) DirectMusicStyle8_Style_Vtbl = { +IDirectMusicStyle8Vtbl DirectMusicStyle8_Style_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicStyle8Impl_IDirectMusicStyle8_QueryInterface, IDirectMusicStyle8Impl_IDirectMusicStyle8_AddRef, @@ -391,7 +391,7 @@ HRESULT WINAPI IDirectMusicStyle8Impl_IDirectMusicObject_ParseDescriptor (LPDIRE return S_OK; } -ICOM_VTABLE(IDirectMusicObject) DirectMusicStyle8_Object_Vtbl = { +IDirectMusicObjectVtbl DirectMusicStyle8_Object_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicStyle8Impl_IDirectMusicObject_QueryInterface, IDirectMusicStyle8Impl_IDirectMusicObject_AddRef, @@ -1027,7 +1027,7 @@ HRESULT WINAPI IDirectMusicStyle8Impl_IPersistStream_GetSizeMax (LPPERSISTSTREAM } -ICOM_VTABLE(IPersistStream) DirectMusicStyle8_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicStyle8_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicStyle8Impl_IPersistStream_QueryInterface, IDirectMusicStyle8Impl_IPersistStream_AddRef, diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 580636575a5..d36686b6b24 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicStyleTrack_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicStyleTrack_Unknown_Vtbl = { +IUnknownVtbl DirectMusicStyleTrack_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicStyleTrack_IUnknown_QueryInterface, IDirectMusicStyleTrack_IUnknown_AddRef, @@ -192,7 +192,7 @@ HRESULT WINAPI IDirectMusicStyleTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK return S_OK; } -ICOM_VTABLE(IDirectMusicTrack8) DirectMusicStyleTrack_Track_Vtbl = { +IDirectMusicTrack8Vtbl DirectMusicStyleTrack_Track_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicStyleTrack_IDirectMusicTrack_QueryInterface, IDirectMusicStyleTrack_IDirectMusicTrack_AddRef, @@ -417,7 +417,7 @@ HRESULT WINAPI IDirectMusicStyleTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicStyleTrack_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicStyleTrack_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicStyleTrack_IPersistStream_QueryInterface, IDirectMusicStyleTrack_IPersistStream_AddRef, diff --git a/dlls/dmsynth/dmsynth_main.c b/dlls/dmsynth/dmsynth_main.c index 152aeae7b39..6b09294db60 100644 --- a/dlls/dmsynth/dmsynth_main.c +++ b/dlls/dmsynth/dmsynth_main.c @@ -61,7 +61,7 @@ static HRESULT WINAPI SynthCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) SynthCF_Vtbl = { +static IClassFactoryVtbl SynthCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE SynthCF_QueryInterface, SynthCF_AddRef, @@ -104,7 +104,7 @@ static HRESULT WINAPI SynthSinkCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) SynthSinkCF_Vtbl = { +static IClassFactoryVtbl SynthSinkCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE SynthSinkCF_QueryInterface, SynthSinkCF_AddRef, diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 546d2e609a4..f4a1e907af1 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -48,8 +48,8 @@ typedef struct IDirectMusicSynthSinkImpl IDirectMusicSynthSinkImpl; /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirectMusicSynth8) DirectMusicSynth8_Vtbl; -extern ICOM_VTABLE(IDirectMusicSynthSink) DirectMusicSynthSink_Vtbl; +extern IDirectMusicSynth8Vtbl DirectMusicSynth8_Vtbl; +extern IDirectMusicSynthSinkVtbl DirectMusicSynthSink_Vtbl; /***************************************************************************** * ClassFactory diff --git a/dlls/dmsynth/synth.c b/dlls/dmsynth/synth.c index 4173b36a569..50f739b245f 100644 --- a/dlls/dmsynth/synth.c +++ b/dlls/dmsynth/synth.c @@ -192,7 +192,7 @@ HRESULT WINAPI IDirectMusicSynth8Impl_AssignChannelToBuses (LPDIRECTMUSICSYNTH8 return S_OK; } -ICOM_VTABLE(IDirectMusicSynth8) DirectMusicSynth8_Vtbl = { +IDirectMusicSynth8Vtbl DirectMusicSynth8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSynth8Impl_QueryInterface, IDirectMusicSynth8Impl_AddRef, diff --git a/dlls/dmsynth/synthsink.c b/dlls/dmsynth/synthsink.c index 00da6f0fe6a..42e6cbbc51d 100644 --- a/dlls/dmsynth/synthsink.c +++ b/dlls/dmsynth/synthsink.c @@ -101,7 +101,7 @@ HRESULT WINAPI IDirectMusicSynthSinkImpl_GetDesiredBufferSize (LPDIRECTMUSICSYNT return S_OK; } -ICOM_VTABLE(IDirectMusicSynthSink) DirectMusicSynthSink_Vtbl = { +IDirectMusicSynthSinkVtbl DirectMusicSynthSink_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicSynthSinkImpl_QueryInterface, IDirectMusicSynthSinkImpl_AddRef, diff --git a/dlls/dmusic/buffer.c b/dlls/dmusic/buffer.c index 06ef78e0160..8601339e062 100644 --- a/dlls/dmusic/buffer.c +++ b/dlls/dmusic/buffer.c @@ -130,7 +130,7 @@ HRESULT WINAPI IDirectMusicBufferImpl_SetUsedBytes (LPDIRECTMUSICBUFFER iface, D return S_OK; } -ICOM_VTABLE(IDirectMusicBuffer) DirectMusicBuffer_Vtbl = { +IDirectMusicBufferVtbl DirectMusicBuffer_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicBufferImpl_QueryInterface, IDirectMusicBufferImpl_AddRef, diff --git a/dlls/dmusic/clock.c b/dlls/dmusic/clock.c index 9ee3eae05f5..f2e5f4d35e4 100644 --- a/dlls/dmusic/clock.c +++ b/dlls/dmusic/clock.c @@ -78,7 +78,7 @@ HRESULT WINAPI IReferenceClockImpl_Unadvise (IReferenceClock *iface, DWORD dwAdv return S_OK; } -ICOM_VTABLE(IReferenceClock) ReferenceClock_Vtbl = { +IReferenceClockVtbl ReferenceClock_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IReferenceClockImpl_QueryInterface, IReferenceClockImpl_AddRef, diff --git a/dlls/dmusic/collection.c b/dlls/dmusic/collection.c index 5384fefaf26..41622875be8 100644 --- a/dlls/dmusic/collection.c +++ b/dlls/dmusic/collection.c @@ -68,7 +68,7 @@ ULONG WINAPI IDirectMusicCollectionImpl_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicCollection_Unknown_Vtbl = { +IUnknownVtbl DirectMusicCollection_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicCollectionImpl_IUnknown_QueryInterface, IDirectMusicCollectionImpl_IUnknown_AddRef, @@ -139,7 +139,7 @@ HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicCollection_EnumInstrument return S_FALSE; } -ICOM_VTABLE(IDirectMusicCollection) DirectMusicCollection_Collection_Vtbl = { +IDirectMusicCollectionVtbl DirectMusicCollection_Collection_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicCollectionImpl_IDirectMusicCollection_QueryInterface, IDirectMusicCollectionImpl_IDirectMusicCollection_AddRef, @@ -375,7 +375,7 @@ HRESULT WINAPI IDirectMusicCollectionImpl_IDirectMusicObject_ParseDescriptor (LP return S_OK; } -ICOM_VTABLE(IDirectMusicObject) DirectMusicCollection_Object_Vtbl = { +IDirectMusicObjectVtbl DirectMusicCollection_Object_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicCollectionImpl_IDirectMusicObject_QueryInterface, IDirectMusicCollectionImpl_IDirectMusicObject_AddRef, @@ -727,7 +727,7 @@ HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetSizeMax (LPPERSISTST return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicCollection_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicCollection_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicCollectionImpl_IPersistStream_QueryInterface, IDirectMusicCollectionImpl_IPersistStream_AddRef, diff --git a/dlls/dmusic/dmusic.c b/dlls/dmusic/dmusic.c index 34f09fc2b9b..c7b47dac67a 100644 --- a/dlls/dmusic/dmusic.c +++ b/dlls/dmusic/dmusic.c @@ -230,7 +230,7 @@ HRESULT WINAPI IDirectMusic8Impl_SetExternalMasterClock (LPDIRECTMUSIC8 iface, I return S_OK; } -ICOM_VTABLE(IDirectMusic8) DirectMusic8_Vtbl = { +IDirectMusic8Vtbl DirectMusic8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusic8Impl_QueryInterface, IDirectMusic8Impl_AddRef, diff --git a/dlls/dmusic/dmusic_main.c b/dlls/dmusic/dmusic_main.c index 6bf9da1b733..76ddee9d7f6 100644 --- a/dlls/dmusic/dmusic_main.c +++ b/dlls/dmusic/dmusic_main.c @@ -61,7 +61,7 @@ static HRESULT WINAPI DirectMusicCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) DirectMusicCF_Vtbl = { +static IClassFactoryVtbl DirectMusicCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DirectMusicCF_QueryInterface, DirectMusicCF_AddRef, @@ -104,7 +104,7 @@ static HRESULT WINAPI CollectionCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) CollectionCF_Vtbl = { +static IClassFactoryVtbl CollectionCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE CollectionCF_QueryInterface, CollectionCF_AddRef, diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 564857279b9..6562df80fe4 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -58,22 +58,22 @@ typedef struct IDirectMusicInstrumentImpl IDirectMusicInstrumentImpl; /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirectMusic8) DirectMusic8_Vtbl; -extern ICOM_VTABLE(IDirectMusicBuffer) DirectMusicBuffer_Vtbl; -extern ICOM_VTABLE(IDirectMusicDownloadedInstrument) DirectMusicDownloadedInstrument_Vtbl; -extern ICOM_VTABLE(IDirectMusicDownload) DirectMusicDownload_Vtbl; -extern ICOM_VTABLE(IDirectMusicPortDownload) DirectMusicPortDownload_Vtbl; -extern ICOM_VTABLE(IDirectMusicPort) DirectMusicPort_Vtbl; -extern ICOM_VTABLE(IDirectMusicThru) DirectMusicThru_Vtbl; -extern ICOM_VTABLE(IReferenceClock) ReferenceClock_Vtbl; +extern IDirectMusic8Vtbl DirectMusic8_Vtbl; +extern IDirectMusicBufferVtbl DirectMusicBuffer_Vtbl; +extern IDirectMusicDownloadedInstrumentVtbl DirectMusicDownloadedInstrument_Vtbl; +extern IDirectMusicDownloadVtbl DirectMusicDownload_Vtbl; +extern IDirectMusicPortDownloadVtbl DirectMusicPortDownload_Vtbl; +extern IDirectMusicPortVtbl DirectMusicPort_Vtbl; +extern IDirectMusicThruVtbl DirectMusicThru_Vtbl; +extern IReferenceClockVtbl ReferenceClock_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicCollection_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicCollection) DirectMusicCollection_Collection_Vtbl; -extern ICOM_VTABLE(IDirectMusicObject) DirectMusicCollection_Object_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicCollection_PersistStream_Vtbl; +extern IUnknownVtbl DirectMusicCollection_Unknown_Vtbl; +extern IDirectMusicCollectionVtbl DirectMusicCollection_Collection_Vtbl; +extern IDirectMusicObjectVtbl DirectMusicCollection_Object_Vtbl; +extern IPersistStreamVtbl DirectMusicCollection_PersistStream_Vtbl; -extern ICOM_VTABLE(IUnknown) DirectMusicInstrument_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicInstrument) DirectMusicInstrument_Instrument_Vtbl; +extern IUnknownVtbl DirectMusicInstrument_Unknown_Vtbl; +extern IDirectMusicInstrumentVtbl DirectMusicInstrument_Instrument_Vtbl; /***************************************************************************** * Some stuff to make my life easier :=) @@ -323,10 +323,10 @@ typedef struct _DMUS_PRIVATE_POOLCUE { */ struct IDirectMusicCollectionImpl { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicCollection) *CollectionVtbl; - ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicCollectionVtbl *CollectionVtbl; + IDirectMusicObjectVtbl *ObjectVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicCollectionImpl fields */ @@ -376,8 +376,8 @@ extern HRESULT WINAPI IDirectMusicCollectionImpl_IPersistStream_GetSizeMax (LPPE */ struct IDirectMusicInstrumentImpl { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicInstrument) *InstrumentVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicInstrumentVtbl *InstrumentVtbl; DWORD ref; /* IDirectMusicInstrumentImpl fields */ diff --git a/dlls/dmusic/download.c b/dlls/dmusic/download.c index 7103a7f65a0..e5dc7ff76f7 100644 --- a/dlls/dmusic/download.c +++ b/dlls/dmusic/download.c @@ -59,7 +59,7 @@ HRESULT WINAPI IDirectMusicDownloadImpl_GetBuffer (LPDIRECTMUSICDOWNLOAD iface, return S_OK; } -ICOM_VTABLE(IDirectMusicDownload) DirectMusicDownload_Vtbl = { +IDirectMusicDownloadVtbl DirectMusicDownload_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicDownloadImpl_QueryInterface, IDirectMusicDownloadImpl_AddRef, diff --git a/dlls/dmusic/downloadedinstrument.c b/dlls/dmusic/downloadedinstrument.c index eb0a3028a92..73210262432 100644 --- a/dlls/dmusic/downloadedinstrument.c +++ b/dlls/dmusic/downloadedinstrument.c @@ -55,7 +55,7 @@ ULONG WINAPI IDirectMusicDownloadedInstrumentImpl_Release (LPDIRECTMUSICDOWNLOAD /* IDirectMusicDownloadedInstrumentImpl IDirectMusicDownloadedInstrument part: */ /* none at this time */ -ICOM_VTABLE(IDirectMusicDownloadedInstrument) DirectMusicDownloadedInstrument_Vtbl = { +IDirectMusicDownloadedInstrumentVtbl DirectMusicDownloadedInstrument_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicDownloadedInstrumentImpl_QueryInterface, IDirectMusicDownloadedInstrumentImpl_AddRef, diff --git a/dlls/dmusic/instrument.c b/dlls/dmusic/instrument.c index dd336add4a1..b66aa60cb33 100644 --- a/dlls/dmusic/instrument.c +++ b/dlls/dmusic/instrument.c @@ -68,7 +68,7 @@ ULONG WINAPI IDirectMusicInstrumentImpl_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicInstrument_Unknown_Vtbl = { +IUnknownVtbl DirectMusicInstrument_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicInstrumentImpl_IUnknown_QueryInterface, IDirectMusicInstrumentImpl_IUnknown_AddRef, @@ -105,7 +105,7 @@ HRESULT WINAPI IDirectMusicInstrumentImpl_IDirectMusicInstrument_SetPatch (LPDIR return S_OK; } -ICOM_VTABLE(IDirectMusicInstrument) DirectMusicInstrument_Instrument_Vtbl = { +IDirectMusicInstrumentVtbl DirectMusicInstrument_Instrument_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicInstrumentImpl_IDirectMusicInstrument_QueryInterface, IDirectMusicInstrumentImpl_IDirectMusicInstrument_AddRef, diff --git a/dlls/dmusic/port.c b/dlls/dmusic/port.c index 6dd70031412..38552072925 100644 --- a/dlls/dmusic/port.c +++ b/dlls/dmusic/port.c @@ -165,7 +165,7 @@ HRESULT WINAPI IDirectMusicPortImpl_GetFormat (LPDIRECTMUSICPORT iface, LPWAVEFO return S_OK; } -ICOM_VTABLE(IDirectMusicPort) DirectMusicPort_Vtbl = { +IDirectMusicPortVtbl DirectMusicPort_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicPortImpl_QueryInterface, IDirectMusicPortImpl_AddRef, diff --git a/dlls/dmusic/portdownload.c b/dlls/dmusic/portdownload.c index ead10730b57..a8b4a11d8bc 100644 --- a/dlls/dmusic/portdownload.c +++ b/dlls/dmusic/portdownload.c @@ -88,7 +88,7 @@ HRESULT WINAPI IDirectMusicPortDownloadImpl_Unload (LPDIRECTMUSICPORTDOWNLOAD if return S_OK; } -ICOM_VTABLE(IDirectMusicPortDownload) DirectMusicPortDownload_Vtbl = { +IDirectMusicPortDownloadVtbl DirectMusicPortDownload_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicPortDownloadImpl_QueryInterface, IDirectMusicPortDownloadImpl_AddRef, diff --git a/dlls/dmusic/thru.c b/dlls/dmusic/thru.c index 63c0305e47c..14d0b46aa22 100644 --- a/dlls/dmusic/thru.c +++ b/dlls/dmusic/thru.c @@ -59,7 +59,7 @@ HRESULT WINAPI IDirectMusicThruImpl_ThruChannel (LPDIRECTMUSICTHRU iface, DWORD return S_OK; } -ICOM_VTABLE(IDirectMusicThru) DirectMusicThru_Vtbl = { +IDirectMusicThruVtbl DirectMusicThru_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicThruImpl_QueryInterface, IDirectMusicThruImpl_AddRef, diff --git a/dlls/dplayx/dpclassfactory.c b/dlls/dplayx/dpclassfactory.c index c50b919f251..5a9bd439eb1 100644 --- a/dlls/dplayx/dpclassfactory.c +++ b/dlls/dplayx/dpclassfactory.c @@ -86,7 +86,7 @@ static HRESULT WINAPI DP_and_DPL_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) DP_and_DPL_Vtbl = { +static IClassFactoryVtbl DP_and_DPL_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DP_and_DPL_QueryInterface, DP_and_DPL_AddRef, diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index c14d1b0cfb2..3b0796cdd54 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -77,13 +77,13 @@ static BOOL CALLBACK cbRemoveGroupOrPlayer( DPID dpId, DWORD dwPlayerType, static void DP_DeleteGroup( IDirectPlay2Impl* This, DPID dpid ); /* Forward declarations of virtual tables */ -static ICOM_VTABLE(IDirectPlay2) directPlay2AVT; -static ICOM_VTABLE(IDirectPlay3) directPlay3AVT; -static ICOM_VTABLE(IDirectPlay4) directPlay4AVT; +static IDirectPlay2Vtbl directPlay2AVT; +static IDirectPlay3Vtbl directPlay3AVT; +static IDirectPlay4Vtbl directPlay4AVT; -static ICOM_VTABLE(IDirectPlay2) directPlay2WVT; -static ICOM_VTABLE(IDirectPlay3) directPlay3WVT; -static ICOM_VTABLE(IDirectPlay4) directPlay4WVT; +static IDirectPlay2Vtbl directPlay2WVT; +static IDirectPlay3Vtbl directPlay3WVT; +static IDirectPlay4Vtbl directPlay4WVT; /* Helper methods for player/group interfaces */ static HRESULT WINAPI DP_IF_DeletePlayerFromGroup @@ -4818,7 +4818,7 @@ static HRESULT WINAPI DirectPlay4WImpl_CancelPriority # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectPlay2) directPlay2WVT = +static IDirectPlay2Vtbl directPlay2WVT = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface)DP_QueryInterface, @@ -4864,7 +4864,7 @@ static ICOM_VTABLE(IDirectPlay2) directPlay2WVT = # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectPlay2) directPlay2AVT = +static IDirectPlay2Vtbl directPlay2AVT = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface)DP_QueryInterface, @@ -4911,7 +4911,7 @@ static ICOM_VTABLE(IDirectPlay2) directPlay2AVT = # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectPlay3) directPlay3AVT = +static IDirectPlay3Vtbl directPlay3AVT = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface)DP_QueryInterface, @@ -4972,7 +4972,7 @@ static ICOM_VTABLE(IDirectPlay3) directPlay3AVT = #else # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectPlay3) directPlay3WVT = +static IDirectPlay3Vtbl directPlay3WVT = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface)DP_QueryInterface, @@ -5033,7 +5033,7 @@ static ICOM_VTABLE(IDirectPlay3) directPlay3WVT = #else # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectPlay4) directPlay4WVT = +static IDirectPlay4Vtbl directPlay4WVT = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface)DP_QueryInterface, @@ -5102,7 +5102,7 @@ static ICOM_VTABLE(IDirectPlay4) directPlay4WVT = #else # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectPlay4) directPlay4AVT = +static IDirectPlay4Vtbl directPlay4AVT = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface)DP_QueryInterface, diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c index 1372e4912a2..aebc11a8214 100644 --- a/dlls/dplayx/dplaysp.c +++ b/dlls/dplayx/dplaysp.c @@ -73,7 +73,7 @@ struct IDirectPlaySPImpl }; /* Forward declaration of virtual tables */ -static ICOM_VTABLE(IDirectPlaySP) directPlaySPVT; +static IDirectPlaySPVtbl directPlaySPVT; /* This structure is passed to the DP object for safe keeping */ typedef struct tagDP_SPPLAYERDATA @@ -943,7 +943,7 @@ static VOID WINAPI IDirectPlaySPImpl_SendComplete } -static struct ICOM_VTABLE(IDirectPlaySP) directPlaySPVT = +static struct IDirectPlaySPVtbl directPlaySPVT = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index eb537714661..434ae1c4aca 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -136,13 +136,13 @@ struct IDirectPlayLobby3Impl /* Forward declarations of virtual tables */ -static ICOM_VTABLE(IDirectPlayLobby) directPlayLobbyWVT; -static ICOM_VTABLE(IDirectPlayLobby2) directPlayLobby2WVT; -static ICOM_VTABLE(IDirectPlayLobby3) directPlayLobby3WVT; +static IDirectPlayLobbyVtbl directPlayLobbyWVT; +static IDirectPlayLobby2Vtbl directPlayLobby2WVT; +static IDirectPlayLobby3Vtbl directPlayLobby3WVT; -static ICOM_VTABLE(IDirectPlayLobby) directPlayLobbyAVT; -static ICOM_VTABLE(IDirectPlayLobby2) directPlayLobby2AVT; -static ICOM_VTABLE(IDirectPlayLobby3) directPlayLobby3AVT; +static IDirectPlayLobbyVtbl directPlayLobbyAVT; +static IDirectPlayLobby2Vtbl directPlayLobby2AVT; +static IDirectPlayLobby3Vtbl directPlayLobby3AVT; @@ -1764,7 +1764,7 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_WaitForConnectionSettings /* Direct Play Lobby 1 (ascii) Virtual Table for methods */ /* All lobby 1 methods are exactly the same except QueryInterface */ -static struct ICOM_VTABLE(IDirectPlayLobby) directPlayLobbyAVT = +static struct IDirectPlayLobbyVtbl directPlayLobbyAVT = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE @@ -1795,7 +1795,7 @@ static struct ICOM_VTABLE(IDirectPlayLobby) directPlayLobbyAVT = #endif /* Direct Play Lobby 1 (unicode) Virtual Table for methods */ -static ICOM_VTABLE(IDirectPlayLobby) directPlayLobbyWVT = +static IDirectPlayLobbyVtbl directPlayLobbyWVT = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE @@ -1825,7 +1825,7 @@ static ICOM_VTABLE(IDirectPlayLobby) directPlayLobbyWVT = #endif /* Direct Play Lobby 2 (ascii) Virtual Table for methods */ -static ICOM_VTABLE(IDirectPlayLobby2) directPlayLobby2AVT = +static IDirectPlayLobby2Vtbl directPlayLobby2AVT = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE @@ -1857,7 +1857,7 @@ static ICOM_VTABLE(IDirectPlayLobby2) directPlayLobby2AVT = #endif /* Direct Play Lobby 2 (unicode) Virtual Table for methods */ -static ICOM_VTABLE(IDirectPlayLobby2) directPlayLobby2WVT = +static IDirectPlayLobby2Vtbl directPlayLobby2WVT = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE @@ -1890,7 +1890,7 @@ static ICOM_VTABLE(IDirectPlayLobby2) directPlayLobby2WVT = # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectPlayLobby3) directPlayLobby3AVT = +static IDirectPlayLobby3Vtbl directPlayLobby3AVT = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface)DPL_QueryInterface, @@ -1927,7 +1927,7 @@ static ICOM_VTABLE(IDirectPlayLobby3) directPlayLobby3AVT = # define XCAST(fun) (void*) #endif -static ICOM_VTABLE(IDirectPlayLobby3) directPlayLobby3WVT = +static IDirectPlayLobby3Vtbl directPlayLobby3WVT = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE XCAST(QueryInterface)DPL_QueryInterface, diff --git a/dlls/dplayx/lobbysp.c b/dlls/dplayx/lobbysp.c index 40170c03cea..79e529535fe 100644 --- a/dlls/dplayx/lobbysp.c +++ b/dlls/dplayx/lobbysp.c @@ -60,7 +60,7 @@ struct IDPLobbySPImpl }; /* Forward declaration of virtual tables */ -static ICOM_VTABLE(IDPLobbySP) dpLobbySPVT; +static IDPLobbySPVtbl dpLobbySPVT; extern HRESULT DPLSP_CreateInterface( REFIID riid, LPVOID* ppvObj, IDirectPlay2Impl* dp ) @@ -440,7 +440,7 @@ HRESULT WINAPI IDPLobbySPImpl_StartSession } -static struct ICOM_VTABLE(IDPLobbySP) dpLobbySPVT = +static struct IDPLobbySPVtbl dpLobbySPVT = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 3e8ebc6b2ff..865444b48a4 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -207,7 +207,7 @@ HRESULT WINAPI IDirectPlay8AddressImpl_BuildFromDirectPlay4Address(PDIRECTPLAY8A return DPN_OK; } -ICOM_VTABLE(IDirectPlay8Address) DirectPlay8Address_Vtbl = +IDirectPlay8AddressVtbl DirectPlay8Address_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectPlay8AddressImpl_QueryInterface, diff --git a/dlls/dpnet/client.c b/dlls/dpnet/client.c index 52ddf36c1f0..c5c5e6e213e 100644 --- a/dlls/dpnet/client.c +++ b/dlls/dpnet/client.c @@ -220,7 +220,7 @@ HRESULT WINAPI IDirectPlay8ClientImpl_RegisterLobby(PDIRECTPLAY8CLIENT iface, CO return DPN_OK; } -ICOM_VTABLE(IDirectPlay8Client) DirectPlay8Client_Vtbl = +IDirectPlay8ClientVtbl DirectPlay8Client_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectPlay8ClientImpl_QueryInterface, diff --git a/dlls/dpnet/dpnet_main.c b/dlls/dpnet/dpnet_main.c index bfd8436a88d..415e12e6df6 100644 --- a/dlls/dpnet/dpnet_main.c +++ b/dlls/dpnet/dpnet_main.c @@ -102,7 +102,7 @@ static HRESULT WINAPI DICF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) DICF_Vtbl = { +static IClassFactoryVtbl DICF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DICF_QueryInterface, DICF_AddRef, diff --git a/dlls/dpnet/dpnet_private.h b/dlls/dpnet/dpnet_private.h index 1f3dc8cf795..334b5558fa7 100644 --- a/dlls/dpnet/dpnet_private.h +++ b/dlls/dpnet/dpnet_private.h @@ -42,7 +42,7 @@ typedef struct IDirectPlay8AddressImpl IDirectPlay8AddressImpl; /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirectPlay8Client) DirectPlay8Client_Vtbl; +extern IDirectPlay8ClientVtbl DirectPlay8Client_Vtbl; /***************************************************************************** * IDirectPlay8Client implementation structure @@ -88,7 +88,7 @@ extern HRESULT WINAPI IDirectPlay8ClientImpl_RegisterLobby(PDIRECTPLAY8CLIENT if /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDirectPlay8Address) DirectPlay8Address_Vtbl; +extern IDirectPlay8AddressVtbl DirectPlay8Address_Vtbl; /***************************************************************************** * IDirectPlay8Address implementation structure diff --git a/dlls/dsound/buffer.c b/dlls/dsound/buffer.c index 2514d4a50a9..fe377122bb8 100644 --- a/dlls/dsound/buffer.c +++ b/dlls/dsound/buffer.c @@ -145,7 +145,7 @@ static HRESULT WINAPI IDirectSoundNotifyImpl_SetNotificationPositions( return S_OK; } -ICOM_VTABLE(IDirectSoundNotify) dsnvt = +IDirectSoundNotifyVtbl dsnvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectSoundNotifyImpl_QueryInterface, @@ -1010,7 +1010,7 @@ static HRESULT WINAPI IDirectSoundBufferImpl_QueryInterface( return E_NOINTERFACE; } -static ICOM_VTABLE(IDirectSoundBuffer8) dsbvt = +static IDirectSoundBuffer8Vtbl dsbvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectSoundBufferImpl_QueryInterface, @@ -1505,7 +1505,7 @@ static HRESULT WINAPI SecondaryBufferImpl_GetObjectInPath( return IDirectSoundBufferImpl_GetObjectInPath((LPDIRECTSOUNDBUFFER8)This->dsb,rguidObject,dwIndex,rguidInterface,ppObject); } -static ICOM_VTABLE(IDirectSoundBuffer8) sbvt = +static IDirectSoundBuffer8Vtbl sbvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE SecondaryBufferImpl_QueryInterface, diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index da0db2cab30..ed17a5bd26b 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -75,9 +75,9 @@ static HRESULT WINAPI IDirectSoundFullDuplexImpl_Initialize( LPLPDIRECTSOUNDCAPTUREBUFFER8 lplpDirectSoundCaptureBuffer8, LPLPDIRECTSOUNDBUFFER8 lplpDirectSoundBuffer8 ); -static ICOM_VTABLE(IDirectSoundCapture) dscvt; -static ICOM_VTABLE(IDirectSoundCaptureBuffer8) dscbvt; -static ICOM_VTABLE(IDirectSoundFullDuplex) dsfdvt; +static IDirectSoundCaptureVtbl dscvt; +static IDirectSoundCaptureBuffer8Vtbl dscbvt; +static IDirectSoundFullDuplexVtbl dsfdvt; static IDirectSoundCaptureImpl* dsound_capture = NULL; static GUID capture_guids[MAXWAVEDRIVERS]; @@ -631,7 +631,7 @@ IDirectSoundCaptureImpl_Initialize( return err; } -static ICOM_VTABLE(IDirectSoundCapture) dscvt = +static IDirectSoundCaptureVtbl dscvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE /* IUnknown methods */ @@ -889,7 +889,7 @@ static HRESULT WINAPI IDirectSoundCaptureNotifyImpl_SetNotificationPositions( return S_OK; } -ICOM_VTABLE(IDirectSoundNotify) dscnvt = +IDirectSoundNotifyVtbl dscnvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectSoundCaptureNotifyImpl_QueryInterface, @@ -1591,7 +1591,7 @@ IDirectSoundCaptureBufferImpl_GetFXStatus( return DS_OK; } -static ICOM_VTABLE(IDirectSoundCaptureBuffer8) dscbvt = +static IDirectSoundCaptureBuffer8Vtbl dscbvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE /* IUnknown methods */ @@ -1676,7 +1676,7 @@ DSCCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) DSCCF_Vtbl = +static IClassFactoryVtbl DSCCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DSCCF_QueryInterface, @@ -1840,7 +1840,7 @@ IDirectSoundFullDuplexImpl_Initialize( return E_FAIL; } -static ICOM_VTABLE(IDirectSoundFullDuplex) dsfdvt = +static IDirectSoundFullDuplexVtbl dsfdvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE /* IUnknown methods */ @@ -1915,7 +1915,7 @@ DSFDCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) DSFDCF_Vtbl = +static IClassFactoryVtbl DSFDCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DSFDCF_QueryInterface, diff --git a/dlls/dsound/dsound.c b/dlls/dsound/dsound.c index 77e01cb6cf5..48b2245121a 100644 --- a/dlls/dsound/dsound.c +++ b/dlls/dsound/dsound.c @@ -696,7 +696,7 @@ static HRESULT WINAPI IDirectSoundImpl_VerifyCertification( return DS_OK; } -static ICOM_VTABLE(IDirectSound8) IDirectSoundImpl_Vtbl = +static IDirectSound8Vtbl IDirectSoundImpl_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectSoundImpl_QueryInterface, @@ -978,7 +978,7 @@ static ULONG WINAPI IDirectSound_IUnknown_Release( return ulReturn; } -static ICOM_VTABLE(IUnknown) DirectSound_Unknown_Vtbl = +static IUnknownVtbl DirectSound_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectSound_IUnknown_QueryInterface, @@ -1132,7 +1132,7 @@ static HRESULT WINAPI IDirectSound_IDirectSound_Initialize( return IDirectSoundImpl_Initialize(This->pds,lpcGuid); } -static ICOM_VTABLE(IDirectSound) DirectSound_DirectSound_Vtbl = +static IDirectSoundVtbl DirectSound_DirectSound_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectSound_IDirectSound_QueryInterface, @@ -1219,7 +1219,7 @@ static ULONG WINAPI IDirectSound8_IUnknown_Release( return ulReturn; } -static ICOM_VTABLE(IUnknown) DirectSound8_Unknown_Vtbl = +static IUnknownVtbl DirectSound8_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectSound8_IUnknown_QueryInterface, @@ -1373,7 +1373,7 @@ static HRESULT WINAPI IDirectSound8_IDirectSound_Initialize( return IDirectSoundImpl_Initialize(This->pds,lpcGuid); } -static ICOM_VTABLE(IDirectSound) DirectSound8_DirectSound_Vtbl = +static IDirectSoundVtbl DirectSound8_DirectSound_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectSound8_IDirectSound_QueryInterface, @@ -1544,7 +1544,7 @@ static HRESULT WINAPI IDirectSound8_IDirectSound8_VerifyCertification( return IDirectSoundImpl_VerifyCertification(This->pds,pdwCertified); } -static ICOM_VTABLE(IDirectSound8) DirectSound8_DirectSound8_Vtbl = +static IDirectSound8Vtbl DirectSound8_DirectSound8_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectSound8_IDirectSound8_QueryInterface, diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 62c4de9b8ed..a88058fb7e2 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -508,7 +508,7 @@ static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) DSCF_Vtbl = { +static IClassFactoryVtbl DSCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DSCF_QueryInterface, DSCF_AddRef, @@ -575,7 +575,7 @@ DSPCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) DSPCF_Vtbl = { +static IClassFactoryVtbl DSPCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DSPCF_QueryInterface, DSPCF_AddRef, diff --git a/dlls/dsound/primary.c b/dlls/dsound/primary.c index e49a5e933bc..6e4c3fb1a7e 100644 --- a/dlls/dsound/primary.c +++ b/dlls/dsound/primary.c @@ -1040,7 +1040,7 @@ static HRESULT WINAPI PrimaryBufferImpl_QueryInterface( return E_NOINTERFACE; } -static ICOM_VTABLE(IDirectSoundBuffer8) dspbvt = +static IDirectSoundBuffer8Vtbl dspbvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE PrimaryBufferImpl_QueryInterface, diff --git a/dlls/dsound/propset.c b/dlls/dsound/propset.c index d9c2334582f..18471e6865c 100644 --- a/dlls/dsound/propset.c +++ b/dlls/dsound/propset.c @@ -191,7 +191,7 @@ static HRESULT WINAPI IKsBufferPropertySetImpl_QuerySupport( return E_PROP_ID_UNSUPPORTED; } -static ICOM_VTABLE(IKsPropertySet) iksbvt = { +static IKsPropertySetVtbl iksbvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IKsBufferPropertySetImpl_QueryInterface, IKsBufferPropertySetImpl_AddRef, @@ -1125,7 +1125,7 @@ static HRESULT WINAPI IKsPrivatePropertySetImpl_QuerySupport( return E_PROP_ID_UNSUPPORTED; } -static ICOM_VTABLE(IKsPropertySet) ikspvt = { +static IKsPropertySetVtbl ikspvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IKsPrivatePropertySetImpl_QueryInterface, IKsPrivatePropertySetImpl_AddRef, diff --git a/dlls/dsound/sound3d.c b/dlls/dsound/sound3d.c index 3453c7ce25d..1979d911002 100644 --- a/dlls/dsound/sound3d.c +++ b/dlls/dsound/sound3d.c @@ -698,7 +698,7 @@ static HRESULT WINAPI IDirectSound3DBufferImpl_SetVelocity( return DS_OK; } -static ICOM_VTABLE(IDirectSound3DBuffer) ds3dbvt = +static IDirectSound3DBufferVtbl ds3dbvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE /* IUnknown methods */ @@ -1079,7 +1079,7 @@ static HRESULT WINAPI IDirectSound3DListenerImpl_CommitDeferredSettings( return DS_OK; } -static ICOM_VTABLE(IDirectSound3DListener) ds3dlvt = +static IDirectSound3DListenerVtbl ds3dlvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE /* IUnknown methods */ diff --git a/dlls/dswave/dswave.c b/dlls/dswave/dswave.c index fb8c0d0beaf..8602bc899fd 100644 --- a/dlls/dswave/dswave.c +++ b/dlls/dswave/dswave.c @@ -78,7 +78,7 @@ ULONG WINAPI IDirectMusicWaveImpl_IUnknown_Release (LPUNKNOWN iface) { return ref; } -ICOM_VTABLE(IUnknown) DirectMusicWave_Unknown_Vtbl = { +IUnknownVtbl DirectMusicWave_Unknown_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicWaveImpl_IUnknown_QueryInterface, IDirectMusicWaveImpl_IUnknown_AddRef, @@ -269,7 +269,7 @@ HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicSegment8_Unload (LPDIRECTMUSICSE return S_OK; } -ICOM_VTABLE(IDirectMusicSegment8) DirectMusicSegment8_Segment_Vtbl = { +IDirectMusicSegment8Vtbl DirectMusicSegment8_Segment_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicWaveImpl_IDirectMusicSegment8_QueryInterface, IDirectMusicWaveImpl_IDirectMusicSegment8_AddRef, @@ -510,7 +510,7 @@ HRESULT WINAPI IDirectMusicWaveImpl_IDirectMusicObject_ParseDescriptor (LPDIRECT return S_OK; } -ICOM_VTABLE(IDirectMusicObject) DirectMusicWave_Object_Vtbl = { +IDirectMusicObjectVtbl DirectMusicWave_Object_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicWaveImpl_IDirectMusicObject_QueryInterface, IDirectMusicWaveImpl_IDirectMusicObject_AddRef, @@ -700,7 +700,7 @@ HRESULT WINAPI IDirectMusicWaveImpl_IPersistStream_GetSizeMax (LPPERSISTSTREAM i return E_NOTIMPL; } -ICOM_VTABLE(IPersistStream) DirectMusicWave_PersistStream_Vtbl = { +IPersistStreamVtbl DirectMusicWave_PersistStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDirectMusicWaveImpl_IPersistStream_QueryInterface, IDirectMusicWaveImpl_IPersistStream_AddRef, diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index 97656a9db77..7d927635df6 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -61,7 +61,7 @@ static HRESULT WINAPI WaveCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) WaveCF_Vtbl = { +static IClassFactoryVtbl WaveCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE WaveCF_QueryInterface, WaveCF_AddRef, diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 90a344773ab..d690900be22 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -48,10 +48,10 @@ typedef struct IDirectMusicWaveImpl IDirectMusicWaveImpl; /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IUnknown) DirectMusicWave_Unknown_Vtbl; -extern ICOM_VTABLE(IDirectMusicObject) DirectMusicWave_Object_Vtbl; -extern ICOM_VTABLE(IPersistStream) DirectMusicWave_PersistStream_Vtbl; -extern ICOM_VTABLE(IDirectMusicSegment8) DirectMusicWave_Segment_Vtbl; +extern IUnknownVtbl DirectMusicWave_Unknown_Vtbl; +extern IDirectMusicObjectVtbl DirectMusicWave_Object_Vtbl; +extern IPersistStreamVtbl DirectMusicWave_PersistStream_Vtbl; +extern IDirectMusicSegment8Vtbl DirectMusicWave_Segment_Vtbl; /***************************************************************************** @@ -65,10 +65,10 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicWaveImpl (LPCGUID lpcGUID, LPVOID* */ struct IDirectMusicWaveImpl { /* IUnknown fields */ - ICOM_VTABLE(IUnknown) *UnknownVtbl; - ICOM_VTABLE(IDirectMusicSegment8) *SegmentVtbl; - ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; - ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; + IUnknownVtbl *UnknownVtbl; + IDirectMusicSegment8Vtbl *SegmentVtbl; + IDirectMusicObjectVtbl *ObjectVtbl; + IPersistStreamVtbl *PersistStreamVtbl; DWORD ref; /* IDirectMusicWaveImpl fields */ diff --git a/dlls/dxdiagn/container.c b/dlls/dxdiagn/container.c index 07033231887..ef97a01c914 100644 --- a/dlls/dxdiagn/container.c +++ b/dlls/dxdiagn/container.c @@ -139,7 +139,7 @@ HRESULT WINAPI IDxDiagContainerImpl_GetProp(PDXDIAGCONTAINER iface, LPCWSTR pwsz } -ICOM_VTABLE(IDxDiagContainer) DxDiagContainer_Vtbl = +IDxDiagContainerVtbl DxDiagContainer_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDxDiagContainerImpl_QueryInterface, diff --git a/dlls/dxdiagn/dxdiag_main.c b/dlls/dxdiagn/dxdiag_main.c index 8519f66faed..f8da234c1e9 100644 --- a/dlls/dxdiagn/dxdiag_main.c +++ b/dlls/dxdiagn/dxdiag_main.c @@ -77,7 +77,7 @@ static HRESULT WINAPI DXDiagCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) DXDiagCF_Vtbl = { +static IClassFactoryVtbl DXDiagCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DXDiagCF_QueryInterface, DXDiagCF_AddRef, diff --git a/dlls/dxdiagn/dxdiag_private.h b/dlls/dxdiagn/dxdiag_private.h index 34b5607ce5a..ec6a0cb235e 100644 --- a/dlls/dxdiagn/dxdiag_private.h +++ b/dlls/dxdiagn/dxdiag_private.h @@ -42,7 +42,7 @@ typedef struct IDxDiagContainerImpl IDxDiagContainerImpl; /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDxDiagProvider) DxDiagProvider_Vtbl; +extern IDxDiagProviderVtbl DxDiagProvider_Vtbl; /***************************************************************************** * IDxDiagProvider implementation structure @@ -79,7 +79,7 @@ typedef struct IDxDiagContainerImpl_SubContainer { /***************************************************************************** * Predeclare the interface implementation structures */ -extern ICOM_VTABLE(IDxDiagContainer) DxDiagContainer_Vtbl; +extern IDxDiagContainerVtbl DxDiagContainer_Vtbl; /***************************************************************************** * IDxDiagContainer implementation structure diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 93418d55237..02d84573abc 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -94,7 +94,7 @@ HRESULT WINAPI IDxDiagProviderImpl_GetRootContainer(PDXDIAGPROVIDER iface, IDxDi return IDxDiagContainerImpl_QueryInterface((PDXDIAGCONTAINER)This->pRootContainer, &IID_IDxDiagContainer, (void**) ppInstance); } -ICOM_VTABLE(IDxDiagProvider) DxDiagProvider_Vtbl = +IDxDiagProviderVtbl DxDiagProvider_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDxDiagProviderImpl_QueryInterface, diff --git a/dlls/mlang/mlang.c b/dlls/mlang/mlang.c index 680f79f123e..2242a079cf6 100644 --- a/dlls/mlang/mlang.c +++ b/dlls/mlang/mlang.c @@ -636,7 +636,7 @@ static HRESULT WINAPI MLANGCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) MLANGCF_Vtbl = +static IClassFactoryVtbl MLANGCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE MLANGCF_QueryInterface, @@ -691,9 +691,9 @@ HRESULT WINAPI MLANG_DllGetClassObject(REFCLSID rclsid, REFIID iid, LPVOID *ppv) typedef struct tagMLang_impl { - ICOM_VTABLE(IMLangFontLink) *vtbl_IMLangFontLink; - ICOM_VTABLE(IMultiLanguage) *vtbl_IMultiLanguage; - ICOM_VTABLE(IMultiLanguage2) *vtbl_IMultiLanguage2; + IMLangFontLinkVtbl *vtbl_IMLangFontLink; + IMultiLanguageVtbl *vtbl_IMultiLanguage; + IMultiLanguage2Vtbl *vtbl_IMultiLanguage2; DWORD ref; DWORD total_cp, total_scripts; } MLang_impl; @@ -758,7 +758,7 @@ static HRESULT WINAPI MLang_QueryInterface( typedef struct tagEnumCodePage_impl { - ICOM_VTABLE(IEnumCodePage) *vtbl_IEnumCodePage; + IEnumCodePageVtbl *vtbl_IEnumCodePage; DWORD ref; MIMECPINFO *cpinfo; DWORD total, pos; @@ -868,7 +868,7 @@ static HRESULT WINAPI fnIEnumCodePage_Skip( return S_OK; } -static ICOM_VTABLE(IEnumCodePage) IEnumCodePage_vtbl = +static IEnumCodePageVtbl IEnumCodePage_vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE fnIEnumCodePage_QueryInterface, @@ -930,7 +930,7 @@ static HRESULT EnumCodePage_create( MLang_impl* mlang, DWORD grfFlags, typedef struct tagEnumScript_impl { - ICOM_VTABLE(IEnumScript) *vtbl_IEnumScript; + IEnumScriptVtbl *vtbl_IEnumScript; DWORD ref; SCRIPTINFO *script_info; DWORD total, pos; @@ -1038,7 +1038,7 @@ static HRESULT WINAPI fnIEnumScript_Skip( return S_OK; } -static ICOM_VTABLE(IEnumScript) IEnumScript_vtbl = +static IEnumScriptVtbl IEnumScript_vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE fnIEnumScript_QueryInterface, @@ -1183,7 +1183,7 @@ static HRESULT WINAPI fnIMLangFontLink_ResetFontMapping( } -static ICOM_VTABLE(IMLangFontLink) IMLangFontLink_vtbl = +static IMLangFontLinkVtbl IMLangFontLink_vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE fnIMLangFontLink_QueryInterface, @@ -1368,7 +1368,7 @@ static HRESULT WINAPI fnIMultiLanguage_CreateConvertCharset( return E_NOTIMPL; } -static ICOM_VTABLE(IMultiLanguage) IMultiLanguage_vtbl = +static IMultiLanguageVtbl IMultiLanguage_vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE fnIMultiLanguage_QueryInterface, @@ -1766,7 +1766,7 @@ static HRESULT WINAPI fnIMultiLanguage2_ValidateCodePageEx( return S_FALSE; } -static ICOM_VTABLE(IMultiLanguage2) IMultiLanguage2_vtbl = +static IMultiLanguage2Vtbl IMultiLanguage2_vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE fnIMultiLanguage2_QueryInterface, diff --git a/dlls/msdmo/dmoreg.c b/dlls/msdmo/dmoreg.c index 88273147fea..b986b87c6b5 100644 --- a/dlls/msdmo/dmoreg.c +++ b/dlls/msdmo/dmoreg.c @@ -94,7 +94,7 @@ typedef struct const GUID IID_IEnumDMO = { 0x2c3cd98a, 0x2bfa, 0x4a53, { 0x9c, 0x27, 0x52, 0x49, 0xba, 0x64, 0xba, 0x0f}}; -static struct ICOM_VTABLE(IEnumDMO) edmovt; +static struct IEnumDMOVtbl edmovt; static LPWSTR GUIDToString(LPWSTR lpwstr, REFGUID lpcguid) { @@ -647,7 +647,7 @@ HRESULT WINAPI DMOEnum( } -static ICOM_VTABLE (IEnumDMO) edmovt = +static IEnumDMOVtbl edmovt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IEnumDMO_fnQueryInterface, diff --git a/dlls/msi/msi.c b/dlls/msi/msi.c index f779f84eabf..f25f48ea311 100644 --- a/dlls/msi/msi.c +++ b/dlls/msi/msi.c @@ -1410,7 +1410,7 @@ static HRESULT WINAPI MsiCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) MsiCF_Vtbl = { +static IClassFactoryVtbl MsiCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE MsiCF_QueryInterface, MsiCF_AddRef, diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index f323ef49aa5..c664cb5922d 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -41,12 +41,12 @@ const CLSID CLSID_AntiMoniker = { /* AntiMoniker data structure */ typedef struct AntiMonikerImpl{ - ICOM_VTABLE(IMoniker)* lpvtbl1; /* VTable relative to the IMoniker interface.*/ + IMonikerVtbl* lpvtbl1; /* VTable relative to the IMoniker interface.*/ /* The ROT (RunningObjectTable implementation) uses the IROTData interface to test whether * two monikers are equal. That's whay IROTData interface is implemented by monikers. */ - ICOM_VTABLE(IROTData)* lpvtbl2; /* VTable relative to the IROTData interface.*/ + IROTDataVtbl* lpvtbl2; /* VTable relative to the IROTData interface.*/ ULONG ref; /* reference counter for this object */ @@ -104,7 +104,7 @@ HRESULT WINAPI AntiMonikerImpl_Destroy(AntiMonikerImpl* iface); /********************************************************************************/ /* Virtual function table for the AntiMonikerImpl class which include IPersist,*/ /* IPersistStream and IMoniker functions. */ -static ICOM_VTABLE(IMoniker) VT_AntiMonikerImpl = +static IMonikerVtbl VT_AntiMonikerImpl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE AntiMonikerImpl_QueryInterface, @@ -134,7 +134,7 @@ static ICOM_VTABLE(IMoniker) VT_AntiMonikerImpl = /********************************************************************************/ /* Virtual function table for the IROTData class. */ -static ICOM_VTABLE(IROTData) VT_ROTDataImpl = +static IROTDataVtbl VT_ROTDataImpl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE AntiMonikerROTDataImpl_QueryInterface, diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index af0b2d98d09..19642b0de68 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -83,7 +83,7 @@ HRESULT WINAPI BindCtxImpl_Destroy(BindCtxImpl* This); HRESULT WINAPI BindCtxImpl_GetObjectIndex(BindCtxImpl* This,IUnknown* punk,LPOLESTR pszkey,DWORD *index); /* Virtual function table for the BindCtx class. */ -static ICOM_VTABLE(IBindCtx) VT_BindCtxImpl = +static IBindCtxVtbl VT_BindCtxImpl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE BindCtxImpl_QueryInterface, diff --git a/dlls/ole32/clipboard.c b/dlls/ole32/clipboard.c index ab1833f9fad..6a58127bfed 100644 --- a/dlls/ole32/clipboard.c +++ b/dlls/ole32/clipboard.c @@ -94,7 +94,7 @@ struct OLEClipbrd /* * List all interface VTables here */ - ICOM_VTABLE(IDataObject)* lpvtbl1; /* IDataObject VTable */ + IDataObjectVtbl* lpvtbl1; /* IDataObject VTable */ /* * The hidden OLE clipboard window. This window is used as the bridge between the @@ -248,7 +248,7 @@ static HRESULT WINAPI OLEClipbrd_IEnumFORMATETC_Clone(LPENUMFORMATETC iface, LPE /* * Virtual function table for the OLEClipbrd's exposed IDataObject interface */ -static ICOM_VTABLE(IDataObject) OLEClipbrd_IDataObject_VTable = +static IDataObjectVtbl OLEClipbrd_IDataObject_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE OLEClipbrd_IDataObject_QueryInterface, @@ -268,7 +268,7 @@ static ICOM_VTABLE(IDataObject) OLEClipbrd_IDataObject_VTable = /* * Virtual function table for IEnumFORMATETC interface */ -static struct ICOM_VTABLE(IEnumFORMATETC) efvt = +static struct IEnumFORMATETCVtbl efvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE OLEClipbrd_IEnumFORMATETC_QueryInterface, diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index e77ba788886..d69d1796643 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -55,7 +55,7 @@ typedef struct tagXIF { /* exported object */ typedef struct tagXOBJECT { - ICOM_VTABLE(IRpcStubBuffer) *lpVtbl; + IRpcStubBufferVtbl *lpVtbl; struct tagAPARTMENT *parent; struct tagXOBJECT *next; LPUNKNOWN obj; /* object identity (IUnknown) */ @@ -78,7 +78,7 @@ typedef struct tagIIF { /* imported object */ typedef struct tagIOBJECT { - ICOM_VTABLE(IRemUnknown) *lpVtbl; + IRemUnknownVtbl *lpVtbl; struct tagAPARTMENT *parent; struct tagIOBJECT *next; LPRPCCHANNELBUFFER chan; /* channel to object */ diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c index 22d10f61781..5743ef4f61e 100644 --- a/dlls/ole32/compositemoniker.c +++ b/dlls/ole32/compositemoniker.c @@ -44,13 +44,13 @@ const CLSID CLSID_CompositeMoniker = { /* CompositeMoniker data structure */ typedef struct CompositeMonikerImpl{ - ICOM_VTABLE(IMoniker)* lpvtbl1; /* VTable relative to the IMoniker interface.*/ + IMonikerVtbl* lpvtbl1; /* VTable relative to the IMoniker interface.*/ /* The ROT (RunningObjectTable implementation) uses the IROTData * interface to test whether two monikers are equal. That's why IROTData * interface is implemented by monikers. */ - ICOM_VTABLE(IROTData)* lpvtbl2; /* VTable relative to the IROTData interface.*/ + IROTDataVtbl* lpvtbl2; /* VTable relative to the IROTData interface.*/ ULONG ref; /* reference counter for this object */ @@ -148,7 +148,7 @@ HRESULT WINAPI EnumMonikerImpl_CreateEnumMoniker(IMoniker** tabMoniker,ULONG tab /* Virtual function table for the CompositeMonikerImpl class which includes */ /* IPersist, IPersistStream and IMoniker functions. */ -static ICOM_VTABLE(IMoniker) VT_CompositeMonikerImpl = +static IMonikerVtbl VT_CompositeMonikerImpl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE CompositeMonikerImpl_QueryInterface, @@ -178,7 +178,7 @@ static ICOM_VTABLE(IMoniker) VT_CompositeMonikerImpl = /********************************************************************************/ /* Virtual function table for the IROTData class. */ -static ICOM_VTABLE(IROTData) VT_ROTDataImpl = +static IROTDataVtbl VT_ROTDataImpl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE CompositeMonikerROTDataImpl_QueryInterface, @@ -189,7 +189,7 @@ static ICOM_VTABLE(IROTData) VT_ROTDataImpl = /********************************************************************************/ /* Virtual function table for the IROTData class */ -static ICOM_VTABLE(IEnumMoniker) VT_EnumMonikerImpl = +static IEnumMonikerVtbl VT_EnumMonikerImpl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE EnumMonikerImpl_QueryInterface, diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index c7cdec28038..75ff0d259a5 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -91,12 +91,12 @@ struct DataCache /* * List all interface VTables here */ - ICOM_VTABLE(IDataObject)* lpvtbl1; - ICOM_VTABLE(IUnknown)* lpvtbl2; - ICOM_VTABLE(IPersistStorage)* lpvtbl3; - ICOM_VTABLE(IViewObject2)* lpvtbl4; - ICOM_VTABLE(IOleCache2)* lpvtbl5; - ICOM_VTABLE(IOleCacheControl)* lpvtbl6; + IDataObjectVtbl* lpvtbl1; + IUnknownVtbl* lpvtbl2; + IPersistStorageVtbl* lpvtbl3; + IViewObject2Vtbl* lpvtbl4; + IOleCache2Vtbl* lpvtbl5; + IOleCacheControlVtbl* lpvtbl6; /* * Reference count of this object @@ -373,7 +373,7 @@ static HRESULT WINAPI DataCache_OnStop( /* * Virtual function tables for the DataCache class. */ -static ICOM_VTABLE(IUnknown) DataCache_NDIUnknown_VTable = +static IUnknownVtbl DataCache_NDIUnknown_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DataCache_NDIUnknown_QueryInterface, @@ -381,7 +381,7 @@ static ICOM_VTABLE(IUnknown) DataCache_NDIUnknown_VTable = DataCache_NDIUnknown_Release }; -static ICOM_VTABLE(IDataObject) DataCache_IDataObject_VTable = +static IDataObjectVtbl DataCache_IDataObject_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DataCache_IDataObject_QueryInterface, @@ -398,7 +398,7 @@ static ICOM_VTABLE(IDataObject) DataCache_IDataObject_VTable = DataCache_EnumDAdvise }; -static ICOM_VTABLE(IPersistStorage) DataCache_IPersistStorage_VTable = +static IPersistStorageVtbl DataCache_IPersistStorage_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DataCache_IPersistStorage_QueryInterface, @@ -413,7 +413,7 @@ static ICOM_VTABLE(IPersistStorage) DataCache_IPersistStorage_VTable = DataCache_HandsOffStorage }; -static ICOM_VTABLE(IViewObject2) DataCache_IViewObject2_VTable = +static IViewObject2Vtbl DataCache_IViewObject2_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DataCache_IViewObject2_QueryInterface, @@ -428,7 +428,7 @@ static ICOM_VTABLE(IViewObject2) DataCache_IViewObject2_VTable = DataCache_GetExtent }; -static ICOM_VTABLE(IOleCache2) DataCache_IOleCache2_VTable = +static IOleCache2Vtbl DataCache_IOleCache2_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DataCache_IOleCache2_QueryInterface, @@ -443,7 +443,7 @@ static ICOM_VTABLE(IOleCache2) DataCache_IOleCache2_VTable = DataCache_DiscardCache }; -static ICOM_VTABLE(IOleCacheControl) DataCache_IOleCacheControl_VTable = +static IOleCacheControlVtbl DataCache_IOleCacheControl_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DataCache_IOleCacheControl_QueryInterface, diff --git a/dlls/ole32/defaulthandler.c b/dlls/ole32/defaulthandler.c index 5286dad542b..6964f15334a 100644 --- a/dlls/ole32/defaulthandler.c +++ b/dlls/ole32/defaulthandler.c @@ -68,10 +68,10 @@ struct DefaultHandler /* * List all interface VTables here */ - ICOM_VTABLE(IOleObject)* lpvtbl1; - ICOM_VTABLE(IUnknown)* lpvtbl2; - ICOM_VTABLE(IDataObject)* lpvtbl3; - ICOM_VTABLE(IRunnableObject)* lpvtbl4; + IOleObjectVtbl* lpvtbl1; + IUnknownVtbl* lpvtbl2; + IDataObjectVtbl* lpvtbl3; + IRunnableObjectVtbl* lpvtbl4; /* * Reference count of this object @@ -323,7 +323,7 @@ static HRESULT WINAPI DefaultHandler_SetContainedObject( /* * Virtual function tables for the DefaultHandler class. */ -static ICOM_VTABLE(IOleObject) DefaultHandler_IOleObject_VTable = +static IOleObjectVtbl DefaultHandler_IOleObject_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DefaultHandler_QueryInterface, @@ -352,7 +352,7 @@ static ICOM_VTABLE(IOleObject) DefaultHandler_IOleObject_VTable = DefaultHandler_SetColorScheme }; -static ICOM_VTABLE(IUnknown) DefaultHandler_NDIUnknown_VTable = +static IUnknownVtbl DefaultHandler_NDIUnknown_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DefaultHandler_NDIUnknown_QueryInterface, @@ -360,7 +360,7 @@ static ICOM_VTABLE(IUnknown) DefaultHandler_NDIUnknown_VTable = DefaultHandler_NDIUnknown_Release, }; -static ICOM_VTABLE(IDataObject) DefaultHandler_IDataObject_VTable = +static IDataObjectVtbl DefaultHandler_IDataObject_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DefaultHandler_IDataObject_QueryInterface, @@ -377,7 +377,7 @@ static ICOM_VTABLE(IDataObject) DefaultHandler_IDataObject_VTable = DefaultHandler_EnumDAdvise }; -static ICOM_VTABLE(IRunnableObject) DefaultHandler_IRunnableObject_VTable = +static IRunnableObjectVtbl DefaultHandler_IRunnableObject_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DefaultHandler_IRunnableObject_QueryInterface, diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index 6f30afbbe59..e24d9ca36e4 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -129,9 +129,9 @@ static VOID WINAPI ERRORINFO_SysFreeString(BSTR in) typedef struct ErrorInfoImpl { - ICOM_VTABLE(IErrorInfo) *lpvtei; - ICOM_VTABLE(ICreateErrorInfo) *lpvtcei; - ICOM_VTABLE(ISupportErrorInfo) *lpvtsei; + IErrorInfoVtbl *lpvtei; + ICreateErrorInfoVtbl *lpvtcei; + ISupportErrorInfoVtbl *lpvtsei; DWORD ref; GUID m_Guid; @@ -141,9 +141,9 @@ typedef struct ErrorInfoImpl DWORD m_dwHelpContext; } ErrorInfoImpl; -static ICOM_VTABLE(IErrorInfo) IErrorInfoImpl_VTable; -static ICOM_VTABLE(ICreateErrorInfo) ICreateErrorInfoImpl_VTable; -static ICOM_VTABLE(ISupportErrorInfo) ISupportErrorInfoImpl_VTable; +static IErrorInfoVtbl IErrorInfoImpl_VTable; +static ICreateErrorInfoVtbl ICreateErrorInfoImpl_VTable; +static ISupportErrorInfoVtbl ISupportErrorInfoImpl_VTable; /* converts a objectpointer to This @@ -302,7 +302,7 @@ static HRESULT WINAPI IErrorInfoImpl_GetHelpContext( return S_OK; } -static ICOM_VTABLE(IErrorInfo) IErrorInfoImpl_VTable = +static IErrorInfoVtbl IErrorInfoImpl_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IErrorInfoImpl_QueryInterface, @@ -404,7 +404,7 @@ static HRESULT WINAPI ICreateErrorInfoImpl_SetHelpContext( return S_OK; } -static ICOM_VTABLE(ICreateErrorInfo) ICreateErrorInfoImpl_VTable = +static ICreateErrorInfoVtbl ICreateErrorInfoImpl_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICreateErrorInfoImpl_QueryInterface, @@ -455,7 +455,7 @@ static HRESULT WINAPI ISupportErrorInfoImpl_InterfaceSupportsErrorInfo( return (IsEqualIID(riid, &This->m_Guid)) ? S_OK : S_FALSE; } -static ICOM_VTABLE(ISupportErrorInfo) ISupportErrorInfoImpl_VTable = +static ISupportErrorInfoVtbl ISupportErrorInfoImpl_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ISupportErrorInfoImpl_QueryInterface, diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c index 60747597632..e55068d22d6 100644 --- a/dlls/ole32/filemoniker.c +++ b/dlls/ole32/filemoniker.c @@ -44,12 +44,12 @@ const CLSID CLSID_FileMoniker = { /* filemoniker data structure */ typedef struct FileMonikerImpl{ - ICOM_VTABLE(IMoniker)* lpvtbl1; /* VTable relative to the IMoniker interface.*/ + IMonikerVtbl* lpvtbl1; /* VTable relative to the IMoniker interface.*/ /* The ROT (RunningObjectTable implementation) uses the IROTData interface to test whether * two monikers are equal. That's whay IROTData interface is implemented by monikers. */ - ICOM_VTABLE(IROTData)* lpvtbl2; /* VTable relative to the IROTData interface.*/ + IROTDataVtbl* lpvtbl2; /* VTable relative to the IROTData interface.*/ ULONG ref; /* reference counter for this object */ @@ -111,7 +111,7 @@ int WINAPI FileMonikerImpl_DecomposePath(LPCOLESTR str, LPOLESTR** tabStr); /********************************************************************************/ /* Virtual function table for the FileMonikerImpl class which include IPersist,*/ /* IPersistStream and IMoniker functions. */ -static ICOM_VTABLE(IMoniker) VT_FileMonikerImpl = +static IMonikerVtbl VT_FileMonikerImpl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE FileMonikerImpl_QueryInterface, @@ -141,7 +141,7 @@ static ICOM_VTABLE(IMoniker) VT_FileMonikerImpl = /********************************************************************************/ /* Virtual function table for the IROTData class. */ -static ICOM_VTABLE(IROTData) VT_ROTDataImpl = +static IROTDataVtbl VT_ROTDataImpl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE FileMonikerROTDataImpl_QueryInterface, diff --git a/dlls/ole32/ftmarshal.c b/dlls/ole32/ftmarshal.c index e67c7142f69..e6484167859 100644 --- a/dlls/ole32/ftmarshal.c +++ b/dlls/ole32/ftmarshal.c @@ -90,7 +90,7 @@ ULONG WINAPI IiFTMUnknown_fnRelease (IUnknown * iface) return 0; } -static ICOM_VTABLE (IUnknown) iunkvt = +static IUnknownVtbl iunkvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IiFTMUnknown_fnQueryInterface, @@ -201,7 +201,7 @@ HRESULT WINAPI FTMarshalImpl_DisconnectObject (LPMARSHAL iface, DWORD dwReserved return S_OK; } -ICOM_VTABLE (IMarshal) ftmvtbl = +IMarshalVtbl ftmvtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE FTMarshalImpl_QueryInterface, diff --git a/dlls/ole32/git.c b/dlls/ole32/git.c index fe426fce48c..7581155c348 100644 --- a/dlls/ole32/git.c +++ b/dlls/ole32/git.c @@ -92,7 +92,7 @@ static HRESULT WINAPI StdGlobalInterfaceTable_RevokeInterfaceFromGlobal(IGlobalI static HRESULT WINAPI StdGlobalInterfaceTable_GetInterfaceFromGlobal(IGlobalInterfaceTable* iface, DWORD dwCookie, REFIID riid, void **ppv); /* Virtual function table */ -static ICOM_VTABLE(IGlobalInterfaceTable) StdGlobalInterfaceTableImpl_Vtbl = +static IGlobalInterfaceTableVtbl StdGlobalInterfaceTableImpl_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE StdGlobalInterfaceTable_QueryInterface, @@ -349,7 +349,7 @@ static HRESULT WINAPI GITCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) GITClassFactoryVtbl = { +static IClassFactoryVtbl GITClassFactoryVtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE GITCF_QueryInterface, GITCF_AddRef, @@ -357,7 +357,7 @@ static ICOM_VTABLE(IClassFactory) GITClassFactoryVtbl = { GITCF_CreateInstance, GITCF_LockServer }; -static ICOM_VTABLE(IClassFactory) *PGITClassFactoryVtbl = &GITClassFactoryVtbl; +static IClassFactoryVtbl *PGITClassFactoryVtbl = &GITClassFactoryVtbl; HRESULT StdGlobalInterfaceTable_GetFactory(LPVOID *ppv) { *ppv = &PGITClassFactoryVtbl; diff --git a/dlls/ole32/hglobalstream.c b/dlls/ole32/hglobalstream.c index 6612d6ef4b1..1d22f359be3 100644 --- a/dlls/ole32/hglobalstream.c +++ b/dlls/ole32/hglobalstream.c @@ -169,7 +169,7 @@ HRESULT WINAPI HGLOBALStreamImpl_Clone( /* * Virtual function table for the HGLOBALStreamImpl class. */ -static ICOM_VTABLE(IStream) HGLOBALStreamImpl_Vtbl = +static IStreamVtbl HGLOBALStreamImpl_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE HGLOBALStreamImpl_QueryInterface, diff --git a/dlls/ole32/ifs.c b/dlls/ole32/ifs.c index 90e5eb326a7..89056c7be5a 100644 --- a/dlls/ole32/ifs.c +++ b/dlls/ole32/ifs.c @@ -45,7 +45,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(olemalloc); * *****************************************************************************/ /* set the vtable later */ -static ICOM_VTABLE(IMalloc) VT_IMalloc32; +static IMallocVtbl VT_IMalloc32; typedef struct { IMallocVtbl *lpVtbl; @@ -342,7 +342,7 @@ static VOID WINAPI IMalloc_fnHeapMinimize(LPMALLOC iface) { } } -static ICOM_VTABLE(IMalloc) VT_IMalloc32 = +static IMallocVtbl VT_IMalloc32 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IMalloc_fnQueryInterface, @@ -361,7 +361,7 @@ static ICOM_VTABLE(IMalloc) VT_IMalloc32 = *****************************************************************************/ /* set the vtable later */ -static ICOM_VTABLE(IMallocSpy) VT_IMallocSpy; +static IMallocSpyVtbl VT_IMallocSpy; typedef struct { IMallocSpyVtbl *lpVtbl; @@ -502,7 +502,7 @@ static void MallocSpyDumpLeaks() { TRACE("leaks: %lu\n", Malloc32.SpyedAllocationsLeft); } -static ICOM_VTABLE(IMallocSpy) VT_IMallocSpy = +static IMallocSpyVtbl VT_IMallocSpy = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IMallocSpy_fnQueryInterface, diff --git a/dlls/ole32/itemmoniker.c b/dlls/ole32/itemmoniker.c index b426f712f13..415390b75c5 100644 --- a/dlls/ole32/itemmoniker.c +++ b/dlls/ole32/itemmoniker.c @@ -43,12 +43,12 @@ const CLSID CLSID_ItemMoniker = { /* ItemMoniker data structure */ typedef struct ItemMonikerImpl{ - ICOM_VTABLE(IMoniker)* lpvtbl1; /* VTable relative to the IMoniker interface.*/ + IMonikerVtbl* lpvtbl1; /* VTable relative to the IMoniker interface.*/ /* The ROT (RunningObjectTable implementation) uses the IROTData interface to test whether * two monikers are equal. That's whay IROTData interface is implemented by monikers. */ - ICOM_VTABLE(IROTData)* lpvtbl2; /* VTable relative to the IROTData interface.*/ + IROTDataVtbl* lpvtbl2; /* VTable relative to the IROTData interface.*/ ULONG ref; /* reference counter for this object */ @@ -110,7 +110,7 @@ static HRESULT WINAPI ItemMonikerROTDataImpl_GetComparaisonData(IROTData* iface, /********************************************************************************/ /* Virtual function table for the ItemMonikerImpl class which include IPersist,*/ /* IPersistStream and IMoniker functions. */ -static ICOM_VTABLE(IMoniker) VT_ItemMonikerImpl = +static IMonikerVtbl VT_ItemMonikerImpl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ItemMonikerImpl_QueryInterface, @@ -140,7 +140,7 @@ static ICOM_VTABLE(IMoniker) VT_ItemMonikerImpl = /********************************************************************************/ /* Virtual function table for the IROTData class. */ -static ICOM_VTABLE(IROTData) VT_ROTDataImpl = +static IROTDataVtbl VT_ROTDataImpl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ItemMonikerROTDataImpl_QueryInterface, diff --git a/dlls/ole32/marshal.c b/dlls/ole32/marshal.c index d57363170b5..29f663f04fb 100644 --- a/dlls/ole32/marshal.c +++ b/dlls/ole32/marshal.c @@ -193,7 +193,7 @@ MARSHAL_Register_Proxy(wine_marshal_id *mid,LPUNKNOWN punk) { /********************** StdMarshal implementation ****************************/ typedef struct _StdMarshalImpl { - ICOM_VTABLE(IMarshal) *lpvtbl; + IMarshalVtbl *lpvtbl; DWORD ref; IID iid; @@ -391,7 +391,7 @@ StdMarshalImpl_DisconnectObject(LPMARSHAL iface, DWORD dwReserved) { return S_OK; } -ICOM_VTABLE(IMarshal) stdmvtbl = { +IMarshalVtbl stdmvtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE StdMarshalImpl_QueryInterface, StdMarshalImpl_AddRef, @@ -751,7 +751,7 @@ SMCF_LockServer(LPCLASSFACTORY iface, BOOL fLock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) dfmarshalcfvtbl = { +static IClassFactoryVtbl dfmarshalcfvtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE SMCF_QueryInterface, SMCF_AddRef, @@ -759,7 +759,7 @@ static ICOM_VTABLE(IClassFactory) dfmarshalcfvtbl = { SMCF_CreateInstance, SMCF_LockServer }; -static ICOM_VTABLE(IClassFactory) *pdfmarshalcfvtbl = &dfmarshalcfvtbl; +static IClassFactoryVtbl *pdfmarshalcfvtbl = &dfmarshalcfvtbl; HRESULT MARSHAL_GetStandardMarshalCF(LPVOID *ppv) { diff --git a/dlls/ole32/memlockbytes.c b/dlls/ole32/memlockbytes.c index 5929011cfcd..5fc32dd989a 100644 --- a/dlls/ole32/memlockbytes.c +++ b/dlls/ole32/memlockbytes.c @@ -140,7 +140,7 @@ HRESULT WINAPI HGLOBALLockBytesImpl_Stat( /* * Virtual function table for the HGLOBALLockBytesImpl class. */ -static ICOM_VTABLE(ILockBytes) HGLOBALLockBytesImpl_Vtbl = +static ILockBytesVtbl HGLOBALLockBytesImpl_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE HGLOBALLockBytesImpl_QueryInterface, diff --git a/dlls/ole32/memlockbytes16.c b/dlls/ole32/memlockbytes16.c index 90677181d84..ec8bdbd650d 100644 --- a/dlls/ole32/memlockbytes16.c +++ b/dlls/ole32/memlockbytes16.c @@ -148,7 +148,7 @@ HGLOBALLockBytesImpl16_Construct(HGLOBAL16 hGlobal, { HGLOBALLockBytesImpl16* newLockBytes; - static ICOM_VTABLE(ILockBytes16) vt16; + static ILockBytes16Vtbl vt16; static SEGPTR msegvt16; HMODULE16 hcomp = GetModuleHandle16("OLE2"); @@ -176,7 +176,7 @@ HGLOBALLockBytesImpl16_Construct(HGLOBAL16 hGlobal, #undef VTENT msegvt16 = MapLS( &vt16 ); } - newLockBytes->lpVtbl = (ICOM_VTABLE(ILockBytes16)*)msegvt16; + newLockBytes->lpVtbl = (ILockBytes16Vtbl*)msegvt16; newLockBytes->ref = 0; /* * Initialize the support. diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c index 5d24abed3c6..5d223ba7b6c 100644 --- a/dlls/ole32/moniker.c +++ b/dlls/ole32/moniker.c @@ -90,7 +90,7 @@ HRESULT WINAPI RunningObjectTableImpl_Destroy(); HRESULT WINAPI RunningObjectTableImpl_GetObjectIndex(RunningObjectTableImpl* This,DWORD identReg,IMoniker* pmk,DWORD *indx); /* Virtual function table for the IRunningObjectTable class. */ -static ICOM_VTABLE(IRunningObjectTable) VT_RunningObjectTableImpl = +static IRunningObjectTableVtbl VT_RunningObjectTableImpl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE RunningObjectTableImpl_QueryInterface, diff --git a/dlls/ole32/ole16.c b/dlls/ole32/ole16.c index fb81fc5f462..b3ef66bd94c 100644 --- a/dlls/ole32/ole16.c +++ b/dlls/ole32/ole16.c @@ -178,7 +178,7 @@ LPVOID WINAPI IMalloc16_fnHeapMinimize(IMalloc16* iface) { LPMALLOC16 IMalloc16_Constructor() { - static ICOM_VTABLE(IMalloc16) vt16; + static IMalloc16Vtbl vt16; static SEGPTR msegvt16; IMalloc16Impl* This; HMODULE16 hcomp = GetModuleHandle16("COMPOBJ"); @@ -199,7 +199,7 @@ IMalloc16_Constructor() #undef VTENT msegvt16 = MapLS( &vt16 ); } - This->lpVtbl = (ICOM_VTABLE(IMalloc16)*)msegvt16; + This->lpVtbl = (IMalloc16Vtbl*)msegvt16; This->ref = 1; return (LPMALLOC16)MapLS( This ); } @@ -313,7 +313,7 @@ _xmalloc16(DWORD size, SEGPTR *ptr) { * everything we need. */ if (!K32WOWCallback16Ex( - (DWORD)((ICOM_VTABLE(IMalloc16)*)MapSL( + (DWORD)((IMalloc16Vtbl*)MapSL( (SEGPTR)((LPMALLOC16)MapSL((SEGPTR)mllc))->lpVtbl ) )->Alloc, WCB16_CDECL, diff --git a/dlls/ole32/oleobj.c b/dlls/ole32/oleobj.c index dd39e673d97..fcbce41be4e 100644 --- a/dlls/ole32/oleobj.c +++ b/dlls/ole32/oleobj.c @@ -63,7 +63,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_SendOnClose (LPOLEADVISEHOLDER); /************************************************************************** * OleAdviseHolderImpl_VTable */ -static struct ICOM_VTABLE(IOleAdviseHolder) oahvt = +static struct IOleAdviseHolderVtbl oahvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE OleAdviseHolderImpl_QueryInterface, @@ -411,7 +411,7 @@ static HRESULT WINAPI DataAdviseHolder_SendOnDataChange( /************************************************************************** * DataAdviseHolderImpl_VTable */ -static struct ICOM_VTABLE(IDataAdviseHolder) DataAdviseHolderImpl_VTable = +static struct IDataAdviseHolderVtbl DataAdviseHolderImpl_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DataAdviseHolder_QueryInterface, diff --git a/dlls/ole32/oleproxy.c b/dlls/ole32/oleproxy.c index 9faee8cab39..d65101d7f6d 100644 --- a/dlls/ole32/oleproxy.c +++ b/dlls/ole32/oleproxy.c @@ -83,7 +83,7 @@ const CLSID CLSID_PSFactoryBuffer = { 0x00000320, 0, 0, {0xc0, 0, 0, 0, 0, 0, 0, * COM will load the appropriate interface stubs and proxies as needed. */ typedef struct _CFStub { - ICOM_VTABLE(IRpcStubBuffer) *lpvtbl; + IRpcStubBufferVtbl *lpvtbl; DWORD ref; LPUNKNOWN pUnkServer; @@ -236,7 +236,7 @@ CFStub_DebugServerRelease(LPRPCSTUBBUFFER iface,void *pv) { FIXME("(%p), stub!\n",pv); } -static ICOM_VTABLE(IRpcStubBuffer) cfstubvt = { +static IRpcStubBufferVtbl cfstubvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE CFStub_QueryInterface, CFStub_AddRef, @@ -267,8 +267,8 @@ CFStub_Construct(LPRPCSTUBBUFFER *ppv) { * the refcount. */ typedef struct _CFProxy { - ICOM_VTABLE(IClassFactory) *lpvtbl_cf; - ICOM_VTABLE(IRpcProxyBuffer) *lpvtbl_proxy; + IClassFactoryVtbl *lpvtbl_cf; + IRpcProxyBufferVtbl *lpvtbl_proxy; DWORD ref; IRpcChannelBuffer *chanbuf; @@ -411,7 +411,7 @@ static HRESULT WINAPI CFProxy_LockServer(LPCLASSFACTORY iface,BOOL fLock) { return S_OK; } -static ICOM_VTABLE(IRpcProxyBuffer) pspbvtbl = { +static IRpcProxyBufferVtbl pspbvtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IRpcProxyBufferImpl_QueryInterface, IRpcProxyBufferImpl_AddRef, @@ -419,7 +419,7 @@ static ICOM_VTABLE(IRpcProxyBuffer) pspbvtbl = { IRpcProxyBufferImpl_Connect, IRpcProxyBufferImpl_Disconnect }; -static ICOM_VTABLE(IClassFactory) cfproxyvt = { +static IClassFactoryVtbl cfproxyvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE CFProxy_QueryInterface, CFProxy_AddRef, @@ -495,7 +495,7 @@ PSFacBuf_CreateStub( return E_FAIL; } -static ICOM_VTABLE(IPSFactoryBuffer) psfacbufvtbl = { +static IPSFactoryBufferVtbl psfacbufvtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE PSFacBuf_QueryInterface, PSFacBuf_AddRef, @@ -505,7 +505,7 @@ static ICOM_VTABLE(IPSFactoryBuffer) psfacbufvtbl = { }; /* This is the whole PSFactoryBuffer object, just the vtableptr */ -static ICOM_VTABLE(IPSFactoryBuffer) *lppsfac = &psfacbufvtbl; +static IPSFactoryBufferVtbl *lppsfac = &psfacbufvtbl; /*********************************************************************** * DllGetClassObject [OLE32.@] diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index 88b75c4869d..3cbb0f7323c 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -109,7 +109,7 @@ static wine_pipe *pipes = NULL; static int nrofpipes = 0; typedef struct _PipeBuf { - ICOM_VTABLE(IRpcChannelBuffer) *lpVtbl; + IRpcChannelBufferVtbl *lpVtbl; DWORD ref; wine_marshal_id mid; @@ -465,7 +465,7 @@ PipeBuf_IsConnected(LPRPCCHANNELBUFFER iface) { return S_OK; } -static ICOM_VTABLE(IRpcChannelBuffer) pipebufvt = { +static IRpcChannelBufferVtbl pipebufvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE PipeBuf_QueryInterface, PipeBuf_AddRef, diff --git a/dlls/ole32/stg_stream.c b/dlls/ole32/stg_stream.c index b365ffe3851..e8a5b3b3cf8 100644 --- a/dlls/ole32/stg_stream.c +++ b/dlls/ole32/stg_stream.c @@ -46,7 +46,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(storage); /* * Virtual function table for the StgStreamImpl class. */ -static ICOM_VTABLE(IStream) StgStreamImpl_Vtbl = +static IStreamVtbl StgStreamImpl_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE StgStreamImpl_QueryInterface, diff --git a/dlls/ole32/storage.c b/dlls/ole32/storage.c index abed7bd5b0d..0a3fe8f8086 100644 --- a/dlls/ole32/storage.c +++ b/dlls/ole32/storage.c @@ -90,10 +90,10 @@ static const BYTE STORAGE_magic[8] ={0xd0,0xcf,0x11,0xe0,0xa1,0xb1,0x1a,0xe1}; #define SMALLBLOCKS_PER_BIGBLOCK (BIGSIZE/SMALLSIZE) #define READ_HEADER STORAGE_get_big_block(hf,-1,(LPBYTE)&sth);assert(!memcmp(STORAGE_magic,sth.magic,sizeof(STORAGE_magic))); -static ICOM_VTABLE(IStorage16) stvt16; -static ICOM_VTABLE(IStorage16) *segstvt16 = NULL; -static ICOM_VTABLE(IStream16) strvt16; -static ICOM_VTABLE(IStream16) *segstrvt16 = NULL; +static IStorage16Vtbl stvt16; +static IStorage16Vtbl *segstvt16 = NULL; +static IStream16Vtbl strvt16; +static IStream16Vtbl *segstrvt16 = NULL; /*ULONG WINAPI IStorage16_AddRef(LPSTORAGE16 this);*/ static void _create_istorage16(LPSTORAGE16 *stg); @@ -1412,7 +1412,7 @@ static void _create_istream16(LPSTREAM16 *str) { VTENT(Stat); VTENT(Clone); #undef VTENT - segstrvt16 = (ICOM_VTABLE(IStream16)*)MapLS( &strvt16 ); + segstrvt16 = (IStream16Vtbl*)MapLS( &strvt16 ); } else { #define VTENT(xfn) strvt16.xfn = IStream16_fn##xfn; VTENT(QueryInterface); @@ -1826,7 +1826,7 @@ static void _create_istorage16(LPSTORAGE16 *stg) { VTENT(SetStateBits) VTENT(Stat) #undef VTENT - segstvt16 = (ICOM_VTABLE(IStorage16)*)MapLS( &stvt16 ); + segstvt16 = (IStorage16Vtbl*)MapLS( &stvt16 ); } else { #define VTENT(xfn) stvt16.xfn = IStorage16_fn##xfn; VTENT(QueryInterface) @@ -1982,7 +1982,7 @@ HRESULT WINAPI StgIsStorageILockBytes16(SEGPTR plkbyt) args[5] = 0; if (!K32WOWCallback16Ex( - (DWORD)((ICOM_VTABLE(ILockBytes16)*)MapSL( + (DWORD)((ILockBytes16Vtbl*)MapSL( (SEGPTR)((LPLOCKBYTES16)MapSL(plkbyt))->lpVtbl) )->ReadAt, WCB16_PASCAL, diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 719f876ffcd..8c306cde6e3 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -158,7 +158,7 @@ static DWORD GetCreationModeFromSTGM(DWORD stgm); /* * Virtual function table for the IStorage32Impl class. */ -static ICOM_VTABLE(IStorage) Storage32Impl_Vtbl = +static IStorageVtbl Storage32Impl_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE StorageBaseImpl_QueryInterface, @@ -184,7 +184,7 @@ static ICOM_VTABLE(IStorage) Storage32Impl_Vtbl = /* * Virtual function table for the Storage32InternalImpl class. */ -static ICOM_VTABLE(IStorage) Storage32InternalImpl_Vtbl = +static IStorageVtbl Storage32InternalImpl_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE StorageBaseImpl_QueryInterface, @@ -210,7 +210,7 @@ static ICOM_VTABLE(IStorage) Storage32InternalImpl_Vtbl = /* * Virtual function table for the IEnumSTATSTGImpl class. */ -static ICOM_VTABLE(IEnumSTATSTG) IEnumSTATSTGImpl_Vtbl = +static IEnumSTATSTGVtbl IEnumSTATSTGImpl_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IEnumSTATSTGImpl_QueryInterface, diff --git a/dlls/oleaut32/connpt.c b/dlls/oleaut32/connpt.c index ff778f44505..b212bd5ca4f 100644 --- a/dlls/oleaut32/connpt.c +++ b/dlls/oleaut32/connpt.c @@ -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; @@ -355,7 +355,7 @@ static HRESULT WINAPI ConnectionPointImpl_EnumConnections( return hr; } -static ICOM_VTABLE(IConnectionPoint) ConnectionPointImpl_VTable = +static IConnectionPointVtbl ConnectionPointImpl_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ConnectionPointImpl_QueryInterface, @@ -369,7 +369,7 @@ static ICOM_VTABLE(IConnectionPoint) ConnectionPointImpl_VTable = }; -static ICOM_VTABLE(IEnumConnections) EnumConnectionsImpl_VTable; +static IEnumConnectionsVtbl EnumConnectionsImpl_VTable; static ULONG WINAPI EnumConnectionsImpl_AddRef(IEnumConnections* iface); /************************************************************************ @@ -598,7 +598,7 @@ 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, diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c index 187a9f4a3dd..ee173bbe215 100644 --- a/dlls/oleaut32/dispatch.c +++ b/dlls/oleaut32/dispatch.c @@ -441,7 +441,7 @@ 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, diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 8aaeff9af61..5ee9bac1b31 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -63,12 +63,12 @@ struct OLEFontImpl * The first two are supported by the first vtable, the next two are * supported by the second table and the last two have their own. */ - ICOM_VTABLE(IFont)* lpvtbl1; - ICOM_VTABLE(IDispatch)* lpvtbl2; - ICOM_VTABLE(IPersistStream)* lpvtbl3; - ICOM_VTABLE(IConnectionPointContainer)* lpvtbl4; - ICOM_VTABLE(IPersistPropertyBag)* lpvtbl5; - ICOM_VTABLE(IPersistStreamInit)* lpvtbl6; + IFontVtbl* lpvtbl1; + IDispatchVtbl* lpvtbl2; + IPersistStreamVtbl* lpvtbl3; + IConnectionPointContainerVtbl* lpvtbl4; + IPersistPropertyBagVtbl* lpvtbl5; + IPersistStreamInitVtbl* lpvtbl6; /* * Reference count for that instance of the class. */ @@ -220,7 +220,7 @@ static HRESULT WINAPI OLEFontImpl_FindConnectionPoint( /* * Virtual function tables for the OLEFontImpl class. */ -static ICOM_VTABLE(IFont) OLEFontImpl_VTable = +static IFontVtbl OLEFontImpl_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE OLEFontImpl_QueryInterface, @@ -252,7 +252,7 @@ static ICOM_VTABLE(IFont) OLEFontImpl_VTable = OLEFontImpl_SetHdc }; -static ICOM_VTABLE(IDispatch) OLEFontImpl_IDispatch_VTable = +static IDispatchVtbl OLEFontImpl_IDispatch_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE OLEFontImpl_IDispatch_QueryInterface, @@ -264,7 +264,7 @@ static ICOM_VTABLE(IDispatch) OLEFontImpl_IDispatch_VTable = OLEFontImpl_Invoke }; -static ICOM_VTABLE(IPersistStream) OLEFontImpl_IPersistStream_VTable = +static IPersistStreamVtbl OLEFontImpl_IPersistStream_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE OLEFontImpl_IPersistStream_QueryInterface, @@ -277,7 +277,7 @@ static ICOM_VTABLE(IPersistStream) OLEFontImpl_IPersistStream_VTable = OLEFontImpl_GetSizeMax }; -static ICOM_VTABLE(IConnectionPointContainer) +static IConnectionPointContainerVtbl OLEFontImpl_IConnectionPointContainer_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE @@ -288,8 +288,8 @@ static ICOM_VTABLE(IConnectionPointContainer) OLEFontImpl_FindConnectionPoint }; -static ICOM_VTABLE(IPersistPropertyBag) OLEFontImpl_IPersistPropertyBag_VTable; -static ICOM_VTABLE(IPersistStreamInit) OLEFontImpl_IPersistStreamInit_VTable; +static IPersistPropertyBagVtbl OLEFontImpl_IPersistPropertyBag_VTable; +static IPersistStreamInitVtbl OLEFontImpl_IPersistStreamInit_VTable; /****************************************************************************** * OleCreateFontIndirect [OLEAUT32.420] */ @@ -1855,7 +1855,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistPropertyBag_Save( return E_FAIL; } -static ICOM_VTABLE(IPersistPropertyBag) OLEFontImpl_IPersistPropertyBag_VTable = +static IPersistPropertyBagVtbl OLEFontImpl_IPersistPropertyBag_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE OLEFontImpl_IPersistPropertyBag_QueryInterface, @@ -1934,7 +1934,7 @@ static HRESULT WINAPI OLEFontImpl_IPersistStreamInit_InitNew( return S_OK; } -static ICOM_VTABLE(IPersistStreamInit) OLEFontImpl_IPersistStreamInit_VTable = +static IPersistStreamInitVtbl OLEFontImpl_IPersistStreamInit_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE OLEFontImpl_IPersistStreamInit_QueryInterface, @@ -1992,7 +1992,7 @@ static HRESULT WINAPI SFCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) SFCF_Vtbl = { +static IClassFactoryVtbl SFCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE SFCF_QueryInterface, SFCF_AddRef, diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c index a28877d09f4..dcb98c82dc9 100644 --- a/dlls/oleaut32/olepicture.c +++ b/dlls/oleaut32/olepicture.c @@ -96,10 +96,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; @@ -145,10 +145,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. @@ -1469,7 +1469,7 @@ static HRESULT WINAPI OLEPictureImpl_Invoke( } -static ICOM_VTABLE(IPicture) OLEPictureImpl_VTable = +static IPictureVtbl OLEPictureImpl_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE OLEPictureImpl_QueryInterface, @@ -1491,7 +1491,7 @@ 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, @@ -1503,7 +1503,7 @@ 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, @@ -1516,7 +1516,7 @@ 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, @@ -1680,7 +1680,7 @@ static HRESULT WINAPI SPCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) SPCF_Vtbl = { +static IClassFactoryVtbl SPCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE SPCF_QueryInterface, SPCF_AddRef, diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 8b020339647..37f59314229 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -72,13 +72,13 @@ static SAFEARRAY* (WINAPI *pSafeArrayCreateVector)(VARTYPE,LONG,ULONG); */ typedef struct IRecordInfoImpl { - ICOM_VTABLE(IRecordInfo) *lpvtbl; + IRecordInfoVtbl *lpvtbl; DWORD ref; DWORD sizeCalled; DWORD clearCalled; } IRecordInfoImpl; -static ICOM_VTABLE(IRecordInfo) IRecordInfoImpl_VTable; +static IRecordInfoVtbl IRecordInfoImpl_VTable; static IRecordInfoImpl *IRecordInfoImpl_Construct() { @@ -132,7 +132,7 @@ static HRESULT CALLBACK IRecordInfoImpl_Dummy(IRecordInfo *iface WINE_UNUSED) exit(255); } -static ICOM_VTABLE(IRecordInfo) IRecordInfoImpl_VTable = +static IRecordInfoVtbl IRecordInfoImpl_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE (PVOID)IRecordInfoImpl_Dummy, @@ -1022,7 +1022,7 @@ static ULONG WINAPI tunk_Release(LPUNKNOWN punk) { return --tunk_xref; } -static ICOM_VTABLE(IUnknown) xtunk_vtbl = { +static IUnknownVtbl xtunk_vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE tunk_QueryInterface, tunk_AddRef, @@ -1030,7 +1030,7 @@ static ICOM_VTABLE(IUnknown) xtunk_vtbl = { }; static struct xtunk_iface { - ICOM_VTABLE(IUnknown) *lpvtbl; + IUnknownVtbl *lpvtbl; } xtunk_iface; diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index ce5429ea938..11b1ecb8505 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -550,7 +550,7 @@ static HRESULT WINAPI DummyDispatch_Invoke(LPDISPATCH iface, return S_OK; } -static ICOM_VTABLE(IDispatch) DummyDispatch_VTable = +static IDispatchVtbl DummyDispatch_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DummyDispatch_QueryInterface, diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c index 736542592d0..14f1975fb92 100644 --- a/dlls/oleaut32/tmarshal.c +++ b/dlls/oleaut32/tmarshal.c @@ -302,7 +302,7 @@ typedef struct _TMAsmProxy { typedef struct _TMProxyImpl { DWORD *lpvtbl; - ICOM_VTABLE(IRpcProxyBuffer) *lpvtbl2; + IRpcProxyBufferVtbl *lpvtbl2; DWORD ref; TMAsmProxy *asmstubs; @@ -367,7 +367,7 @@ TMProxyImpl_Disconnect(LPRPCPROXYBUFFER iface) { } -static ICOM_VTABLE(IRpcProxyBuffer) tmproxyvtable = { +static IRpcProxyBufferVtbl tmproxyvtable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE TMProxyImpl_QueryInterface, TMProxyImpl_AddRef, @@ -1436,7 +1436,7 @@ PSFacBuf_CreateProxy( } typedef struct _TMStubImpl { - ICOM_VTABLE(IRpcStubBuffer) *lpvtbl; + IRpcStubBufferVtbl *lpvtbl; DWORD ref; LPUNKNOWN pUnk; @@ -1709,7 +1709,7 @@ TMStubImpl_DebugServerRelease(LPRPCSTUBBUFFER iface, LPVOID ppv) { return; } -ICOM_VTABLE(IRpcStubBuffer) tmstubvtbl = { +IRpcStubBufferVtbl tmstubvtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE TMStubImpl_QueryInterface, TMStubImpl_AddRef, @@ -1753,7 +1753,7 @@ PSFacBuf_CreateStub( return hres; } -static ICOM_VTABLE(IPSFactoryBuffer) psfacbufvtbl = { +static IPSFactoryBufferVtbl psfacbufvtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE PSFacBuf_QueryInterface, PSFacBuf_AddRef, @@ -1763,7 +1763,7 @@ static ICOM_VTABLE(IPSFactoryBuffer) psfacbufvtbl = { }; /* This is the whole PSFactoryBuffer object, just the vtableptr */ -static ICOM_VTABLE(IPSFactoryBuffer) *lppsfac = &psfacbufvtbl; +static IPSFactoryBufferVtbl *lppsfac = &psfacbufvtbl; /*********************************************************************** * DllGetClassObject [OLE32.63] diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 853d2898e15..27540166dfe 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -880,8 +880,8 @@ typedef struct tagITypeLibImpl WCHAR *path; } ITypeLibImpl; -static struct ICOM_VTABLE(ITypeLib2) tlbvt; -static struct ICOM_VTABLE(ITypeComp) tlbtcvt; +static struct ITypeLib2Vtbl tlbvt; +static struct ITypeCompVtbl tlbtcvt; #define _ITypeComp_Offset(impl) ((int)(&(((impl*)0)->lpVtblTypeComp))) #define ICOM_THIS_From_ITypeComp(impl, iface) impl* This = (impl*)(((char*)iface)-_ITypeComp_Offset(impl)) @@ -993,8 +993,8 @@ typedef struct tagITypeInfoImpl struct tagITypeInfoImpl * next; } ITypeInfoImpl; -static struct ICOM_VTABLE(ITypeInfo2) tinfvt; -static struct ICOM_VTABLE(ITypeComp) tcompvt; +static struct ITypeInfo2Vtbl tinfvt; +static struct ITypeCompVtbl tcompvt; static ITypeInfo2 * WINAPI ITypeInfo_Constructor(); @@ -3950,7 +3950,7 @@ static HRESULT WINAPI ITypeLib2_fnGetAllCustData( return S_OK; } -static ICOM_VTABLE(ITypeLib2) tlbvt = { +static ITypeLib2Vtbl tlbvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ITypeLib2_fnQueryInterface, ITypeLib2_fnAddRef, @@ -4018,7 +4018,7 @@ static HRESULT WINAPI ITypeLibComp_fnBindType( return E_NOTIMPL; } -static ICOM_VTABLE(ITypeComp) tlbtcvt = +static ITypeCompVtbl tlbtcvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE @@ -5661,7 +5661,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllImplTypeCustData( return TYPE_E_ELEMENTNOTFOUND; } -static ICOM_VTABLE(ITypeInfo2) tinfvt = +static ITypeInfo2Vtbl tinfvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE @@ -5816,7 +5816,7 @@ static HRESULT WINAPI ITypeComp_fnBindType( return S_OK; } -static ICOM_VTABLE(ITypeComp) tcompvt = +static ITypeCompVtbl tcompvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE diff --git a/dlls/oleaut32/typelib2.c b/dlls/oleaut32/typelib2.c index 4171ab0a541..a5fc422b15b 100644 --- a/dlls/oleaut32/typelib2.c +++ b/dlls/oleaut32/typelib2.c @@ -2798,7 +2798,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllImplTypeCustData( /*================== ICreateTypeInfo2 & ITypeInfo2 VTABLEs And Creation ===================================*/ -static ICOM_VTABLE(ICreateTypeInfo2) ctypeinfo2vt = +static ICreateTypeInfo2Vtbl ctypeinfo2vt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE @@ -2847,7 +2847,7 @@ static ICOM_VTABLE(ICreateTypeInfo2) ctypeinfo2vt = ICreateTypeInfo2_fnSetName }; -static ICOM_VTABLE(ITypeInfo2) typeinfo2vt = +static ITypeInfo2Vtbl typeinfo2vt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE @@ -3757,7 +3757,7 @@ static HRESULT WINAPI ITypeLib2_fnGetAllCustData( /*================== ICreateTypeLib2 & ITypeLib2 VTABLEs And Creation ===================================*/ -static ICOM_VTABLE(ICreateTypeLib2) ctypelib2vt = +static ICreateTypeLib2Vtbl ctypelib2vt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE @@ -3782,7 +3782,7 @@ static ICOM_VTABLE(ICreateTypeLib2) ctypelib2vt = ICreateTypeLib2_fnSetHelpStringDll }; -static ICOM_VTABLE(ITypeLib2) typelib2vt = +static ITypeLib2Vtbl typelib2vt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE diff --git a/dlls/quartz/enummoniker.c b/dlls/quartz/enummoniker.c index ec3fbe73315..25ddc751c4e 100644 --- a/dlls/quartz/enummoniker.c +++ b/dlls/quartz/enummoniker.c @@ -43,7 +43,7 @@ typedef struct EnumMonikerImpl ULONG index; } EnumMonikerImpl; -static struct ICOM_VTABLE(IEnumMoniker) EnumMonikerImpl_Vtbl; +static struct IEnumMonikerVtbl EnumMonikerImpl_Vtbl; static ULONG WINAPI EnumMonikerImpl_AddRef(LPENUMMONIKER iface); @@ -187,7 +187,7 @@ static HRESULT WINAPI EnumMonikerImpl_Clone(LPENUMMONIKER iface, IEnumMoniker ** /********************************************************************** * IEnumMoniker_Vtbl */ -static ICOM_VTABLE(IEnumMoniker) EnumMonikerImpl_Vtbl = +static IEnumMonikerVtbl EnumMonikerImpl_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE EnumMonikerImpl_QueryInterface, diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 81759e56452..32c0ea7a52b 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -135,15 +135,15 @@ static int EventsQueue_GetEvent(EventsQueue* omr, Event* evt, long msTimeOut) } typedef struct _IFilterGraphImpl { - ICOM_VTABLE(IGraphBuilder) *IGraphBuilder_vtbl; - ICOM_VTABLE(IMediaControl) *IMediaControl_vtbl; - ICOM_VTABLE(IMediaSeeking) *IMediaSeeking_vtbl; - ICOM_VTABLE(IBasicAudio) *IBasicAudio_vtbl; - ICOM_VTABLE(IBasicVideo) *IBasicVideo_vtbl; - ICOM_VTABLE(IVideoWindow) *IVideoWindow_vtbl; - ICOM_VTABLE(IMediaEventEx) *IMediaEventEx_vtbl; - ICOM_VTABLE(IMediaFilter) *IMediaFilter_vtbl; - ICOM_VTABLE(IMediaEventSink) *IMediaEventSink_vtbl; + IGraphBuilderVtbl *IGraphBuilder_vtbl; + IMediaControlVtbl *IMediaControl_vtbl; + IMediaSeekingVtbl *IMediaSeeking_vtbl; + IBasicAudioVtbl *IBasicAudio_vtbl; + IBasicVideoVtbl *IBasicVideo_vtbl; + IVideoWindowVtbl *IVideoWindow_vtbl; + IMediaEventExVtbl *IMediaEventEx_vtbl; + IMediaFilterVtbl *IMediaFilter_vtbl; + IMediaEventSinkVtbl *IMediaEventSink_vtbl; /* IAMGraphStreams */ /* IAMStats */ /* IBasicVideo2 */ @@ -549,7 +549,7 @@ static HRESULT WINAPI Graphbuilder_ShouldOperationContinue(IGraphBuilder *iface) } -static ICOM_VTABLE(IGraphBuilder) IGraphBuilder_VTable = +static IGraphBuilderVtbl IGraphBuilder_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Graphbuilder_QueryInterface, @@ -733,7 +733,7 @@ static HRESULT WINAPI Mediacontrol_StopWhenReady(IMediaControl *iface) { } -static ICOM_VTABLE(IMediaControl) IMediaControl_VTable = +static IMediaControlVtbl IMediaControl_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Mediacontrol_QueryInterface, @@ -945,7 +945,7 @@ static HRESULT WINAPI Mediaseeking_GetPreroll(IMediaSeeking *iface, } -static ICOM_VTABLE(IMediaSeeking) IMediaSeeking_VTable = +static IMediaSeekingVtbl IMediaSeeking_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Mediaseeking_QueryInterface, @@ -1084,7 +1084,7 @@ static HRESULT WINAPI Basicaudio_get_Balance(IBasicAudio *iface, return S_OK; } -static ICOM_VTABLE(IBasicAudio) IBasicAudio_VTable = +static IBasicAudioVtbl IBasicAudio_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Basicaudio_QueryInterface, @@ -1480,7 +1480,7 @@ static HRESULT WINAPI Basicvideo_IsUsingDefaultDestination(IBasicVideo *iface) { } -static ICOM_VTABLE(IBasicVideo) IBasicVideo_VTable = +static IBasicVideoVtbl IBasicVideo_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Basicvideo_QueryInterface, @@ -1969,7 +1969,7 @@ static HRESULT WINAPI Videowindow_IsCursorHidden(IVideoWindow *iface, } -static ICOM_VTABLE(IVideoWindow) IVideoWindow_VTable = +static IVideoWindowVtbl IVideoWindow_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Videowindow_QueryInterface, @@ -2237,7 +2237,7 @@ static HRESULT WINAPI Mediaevent_GetNotifyFlags(IMediaEventEx *iface, } -static ICOM_VTABLE(IMediaEventEx) IMediaEventEx_VTable = +static IMediaEventExVtbl IMediaEventEx_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE Mediaevent_QueryInterface, @@ -2329,7 +2329,7 @@ static HRESULT WINAPI MediaFilter_GetSyncSource(IMediaFilter *iface, IReferenceC return E_NOTIMPL; } -static ICOM_VTABLE(IMediaFilter) IMediaFilter_VTable = +static IMediaFilterVtbl IMediaFilter_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE MediaFilter_QueryInterface, @@ -2407,7 +2407,7 @@ static HRESULT WINAPI MediaEventSink_Notify(IMediaEventSink *iface, long EventCo return S_OK; } -static ICOM_VTABLE(IMediaEventSink) IMediaEventSink_VTable = +static IMediaEventSinkVtbl IMediaEventSink_VTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE MediaEventSink_QueryInterface, diff --git a/dlls/quartz/filtermapper.c b/dlls/quartz/filtermapper.c index 965f19dffbd..d65d599eeaf 100644 --- a/dlls/quartz/filtermapper.c +++ b/dlls/quartz/filtermapper.c @@ -49,8 +49,8 @@ typedef struct FilterMapper2Impl ULONG refCount; } FilterMapper2Impl; -static struct ICOM_VTABLE(IFilterMapper2) fm2vtbl; -static struct ICOM_VTABLE(IFilterMapper) fmvtbl; +static struct IFilterMapper2Vtbl fm2vtbl; +static struct IFilterMapperVtbl fmvtbl; #define _IFilterMapper_Offset ((int)(&(((FilterMapper2Impl*)0)->lpVtblFilterMapper))) #define ICOM_THIS_From_IFilterMapper(impl, iface) impl* This = (impl*)(((char*)iface)-_IFilterMapper_Offset) @@ -984,7 +984,7 @@ static HRESULT WINAPI FilterMapper2_EnumMatchingFilters( return hr; } -static ICOM_VTABLE(IFilterMapper2) fm2vtbl = +static IFilterMapper2Vtbl fm2vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE @@ -1471,7 +1471,7 @@ static HRESULT WINAPI FilterMapper_UnregisterPin(IFilterMapper * iface, CLSID Fi return hr; } -static ICOM_VTABLE(IFilterMapper) fmvtbl = +static IFilterMapperVtbl fmvtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 73366427140..c79da4b5c09 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -132,7 +132,7 @@ static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) { return S_OK; } -static ICOM_VTABLE(IClassFactory) DSCF_Vtbl = +static IClassFactoryVtbl DSCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE DSCF_QueryInterface, diff --git a/dlls/quartz/systemclock.c b/dlls/quartz/systemclock.c index 7325ab2636b..50a38f7c364 100644 --- a/dlls/quartz/systemclock.c +++ b/dlls/quartz/systemclock.c @@ -183,7 +183,7 @@ static BOOL SystemClockPostMessageToAdviseThread(SystemClockImpl* This, UINT iMs return PostThreadMessageA(This->adviseThreadId, iMsg, 0, 0); } -ICOM_VTABLE(IReferenceClock) SystemClock_Vtbl; +IReferenceClockVtbl SystemClock_Vtbl; static ULONG WINAPI SystemClockImpl_AddRef(IReferenceClock* iface) { ICOM_THIS(SystemClockImpl,iface); @@ -343,7 +343,7 @@ out: return ret; } -ICOM_VTABLE(IReferenceClock) SystemClock_Vtbl = +IReferenceClockVtbl SystemClock_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE SystemClockImpl_QueryInterface, diff --git a/dlls/rpcrt4/cproxy.c b/dlls/rpcrt4/cproxy.c index c36baf94558..81c1e78fe7f 100644 --- a/dlls/rpcrt4/cproxy.c +++ b/dlls/rpcrt4/cproxy.c @@ -41,7 +41,7 @@ struct StublessThunk; /* I don't know what MS's std proxy structure looks like, so this probably doesn't match, but that shouldn't matter */ typedef struct { - ICOM_VTABLE(IRpcProxyBuffer) *lpVtbl; + IRpcProxyBufferVtbl *lpVtbl; LPVOID *PVtbl; DWORD RefCount; const MIDL_STUBLESS_PROXY_INFO *stubless; @@ -53,7 +53,7 @@ typedef struct { struct StublessThunk *thunks; } StdProxyImpl; -static ICOM_VTABLE(IRpcProxyBuffer) StdProxy_Vtbl; +static IRpcProxyBufferVtbl StdProxy_Vtbl; /* How the Windows stubless proxy thunks work is explained at * http://msdn.microsoft.com/library/en-us/dnmsj99/html/com0199.asp, @@ -265,7 +265,7 @@ static VOID WINAPI StdProxy_Disconnect(LPRPCPROXYBUFFER iface) This->pChannel = NULL; } -static ICOM_VTABLE(IRpcProxyBuffer) StdProxy_Vtbl = +static IRpcProxyBufferVtbl StdProxy_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE StdProxy_QueryInterface, diff --git a/dlls/rpcrt4/cpsf.c b/dlls/rpcrt4/cpsf.c index ba0db037e29..136232073e3 100644 --- a/dlls/rpcrt4/cpsf.c +++ b/dlls/rpcrt4/cpsf.c @@ -114,7 +114,7 @@ static HRESULT WINAPI CStdPSFactory_CreateStub(LPPSFACTORYBUFFER iface, ProxyInfo->pStubVtblList[Index], iface, ppStub); } -static ICOM_VTABLE(IPSFactoryBuffer) CStdPSFactory_Vtbl = +static IPSFactoryBufferVtbl CStdPSFactory_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE CStdPSFactory_QueryInterface, diff --git a/dlls/rpcrt4/ndr_ole.c b/dlls/rpcrt4/ndr_ole.c index e7d9ed29162..0a43712370d 100644 --- a/dlls/rpcrt4/ndr_ole.c +++ b/dlls/rpcrt4/ndr_ole.c @@ -180,7 +180,7 @@ static HRESULT WINAPI RpcStream_SetSize(LPSTREAM iface, return S_OK; } -static ICOM_VTABLE(IStream) RpcStream_Vtbl = +static IStreamVtbl RpcStream_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE RpcStream_QueryInterface, diff --git a/dlls/shdocvw/classinfo.c b/dlls/shdocvw/classinfo.c index d5401f95111..4e8788c3769 100644 --- a/dlls/shdocvw/classinfo.c +++ b/dlls/shdocvw/classinfo.c @@ -74,7 +74,7 @@ static HRESULT WINAPI WBPCI_GetClassInfo(LPPROVIDECLASSINFO iface, LPTYPEINFO *p * IProvideClassInfo virtual function table for IE Web Browser component */ -static ICOM_VTABLE(IProvideClassInfo) WBPCI_Vtbl = +static IProvideClassInfoVtbl WBPCI_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE WBPCI_QueryInterface, @@ -159,7 +159,7 @@ static HRESULT WINAPI WBPCI2_GetGUID(LPPROVIDECLASSINFO2 iface, * IProvideClassInfo virtual function table for IE Web Browser component */ -static ICOM_VTABLE(IProvideClassInfo2) WBPCI2_Vtbl = +static IProvideClassInfo2Vtbl WBPCI2_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE WBPCI2_QueryInterface, diff --git a/dlls/shdocvw/events.c b/dlls/shdocvw/events.c index 760c7ed4788..7031a178dd6 100644 --- a/dlls/shdocvw/events.c +++ b/dlls/shdocvw/events.c @@ -103,7 +103,7 @@ static HRESULT WINAPI WBCPC_FindConnectionPoint(LPCONNECTIONPOINTCONTAINER iface * IConnectionPointContainer virtual function table for IE Web Browser component */ -static ICOM_VTABLE(IConnectionPointContainer) WBCPC_Vtbl = +static IConnectionPointContainerVtbl WBCPC_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE WBCPC_QueryInterface, @@ -198,7 +198,7 @@ static HRESULT WINAPI WBCP_EnumConnections(LPCONNECTIONPOINT iface, * IConnectionPoint virtual function table for IE Web Browser component */ -static ICOM_VTABLE(IConnectionPoint) WBCP_Vtbl = +static IConnectionPointVtbl WBCP_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE WBCP_QueryInterface, diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c index f29ec17a2bc..bd979853fdf 100644 --- a/dlls/shdocvw/factory.c +++ b/dlls/shdocvw/factory.c @@ -109,7 +109,7 @@ static HRESULT WINAPI WBCF_LockServer(LPCLASSFACTORY iface, BOOL dolock) return S_OK; } -static ICOM_VTABLE(IClassFactory) WBCF_Vtbl = +static IClassFactoryVtbl WBCF_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE WBCF_QueryInterface, diff --git a/dlls/shdocvw/misc.c b/dlls/shdocvw/misc.c index e16a34c1bb9..f3e14b45954 100644 --- a/dlls/shdocvw/misc.c +++ b/dlls/shdocvw/misc.c @@ -80,7 +80,7 @@ static HRESULT WINAPI WBQA_GetContentExtent(LPQUICKACTIVATE iface, LPSIZEL pSize * IQuickActivate virtual function table for IE Web Browser component */ -static ICOM_VTABLE(IQuickActivate) WBQA_Vtbl = +static IQuickActivateVtbl WBQA_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE WBQA_QueryInterface, diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index ffd538e1445..3287cafdb65 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -410,7 +410,7 @@ static HRESULT WINAPI WBOOBJ_SetColorScheme(LPOLEOBJECT iface, * IOleObject virtual function table for IE Web Browser component */ -static ICOM_VTABLE(IOleObject) WBOOBJ_Vtbl = +static IOleObjectVtbl WBOOBJ_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE WBOOBJ_QueryInterface, @@ -528,7 +528,7 @@ static HRESULT WINAPI WBOIPO_ReactivateAndUndo(LPOLEINPLACEOBJECT iface) * IOleInPlaceObject virtual function table for IE Web Browser component */ -static ICOM_VTABLE(IOleInPlaceObject) WBOIPO_Vtbl = +static IOleInPlaceObjectVtbl WBOIPO_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE WBOIPO_QueryInterface, @@ -603,7 +603,7 @@ static HRESULT WINAPI WBOC_FreezeEvents(LPOLECONTROL iface, BOOL bFreeze) * IOleControl virtual function table for IE Web Browser component */ -static ICOM_VTABLE(IOleControl) WBOC_Vtbl = +static IOleControlVtbl WBOC_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE WBOC_QueryInterface, diff --git a/dlls/shdocvw/persist.c b/dlls/shdocvw/persist.c index b0cabe501da..9f44af88fb6 100644 --- a/dlls/shdocvw/persist.c +++ b/dlls/shdocvw/persist.c @@ -94,7 +94,7 @@ static HRESULT WINAPI WBPS_SaveCompleted(LPPERSISTSTORAGE iface, LPSTORAGE pStgN * IPersistStorage virtual function table for IE Web Browser component */ -static ICOM_VTABLE(IPersistStorage) WBPS_Vtbl = +static IPersistStorageVtbl WBPS_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE WBPS_QueryInterface, @@ -183,7 +183,7 @@ static HRESULT WINAPI WBPSI_InitNew(LPPERSISTSTREAMINIT iface) * IPersistStreamInit virtual function table for IE Web Browser component */ -static ICOM_VTABLE(IPersistStreamInit) WBPSI_Vtbl = +static IPersistStreamInitVtbl WBPSI_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE WBPSI_QueryInterface, diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index e37285423b9..e7507bdd613 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -241,7 +241,7 @@ static HRESULT WINAPI WB_get_Busy(IWebBrowser *iface, VARIANT_BOOL *pBool) * IWebBrowser virtual function table for IE Web Browser component */ -static ICOM_VTABLE(IWebBrowser) WB_Vtbl = +static IWebBrowserVtbl WB_Vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE WB_QueryInterface, diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 8747b1ee6ab..f865bbeef12 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -73,8 +73,8 @@ typedef struct AUTOCOMPLETEOPTIONS options; } IAutoCompleteImpl; -static struct ICOM_VTABLE(IAutoComplete) acvt; -static struct ICOM_VTABLE(IAutoComplete2) ac2vt; +static struct IAutoCompleteVtbl acvt; +static struct IAutoComplete2Vtbl ac2vt; #define _IAutoComplete2_Offset ((int)(&(((IAutoCompleteImpl*)0)->lpvtblAutoComplete2))) #define _ICOM_THIS_From_IAutoComplete2(class, name) class* This = (class*)(((char*)name)-_IAutoComplete2_Offset); @@ -310,7 +310,7 @@ static HRESULT WINAPI IAutoComplete_fnInit( /************************************************************************** * IAutoComplete_fnVTable */ -static ICOM_VTABLE (IAutoComplete) acvt = +static IAutoCompleteVtbl acvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IAutoComplete_fnQueryInterface, @@ -431,7 +431,7 @@ static HRESULT WINAPI IAutoComplete2_fnSetOptions( /************************************************************************** * IAutoComplete2_fnVTable */ -static ICOM_VTABLE (IAutoComplete2) ac2vt = +static IAutoComplete2Vtbl ac2vt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IAutoComplete2_fnQueryInterface, diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index bb2961ba65d..5248cc759c7 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -70,10 +70,10 @@ typedef struct { int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ } ICPanelImpl; -static ICOM_VTABLE(IShellFolder2) vt_ShellFolder2; -static ICOM_VTABLE(IPersistFolder2) vt_PersistFolder2; -static ICOM_VTABLE(IShellExecuteHookW) vt_ShellExecuteHookW; -static ICOM_VTABLE(IShellExecuteHookA) vt_ShellExecuteHookA; +static IShellFolder2Vtbl vt_ShellFolder2; +static IPersistFolder2Vtbl vt_PersistFolder2; +static IShellExecuteHookWVtbl vt_ShellExecuteHookW; +static IShellExecuteHookAVtbl vt_ShellExecuteHookA; #define _IPersistFolder2_Offset ((int)(&(((ICPanelImpl*)0)->lpVtblPersistFolder2))) #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); @@ -785,7 +785,7 @@ static HRESULT WINAPI ISF_ControlPanel_fnMapColumnToSCID(IShellFolder2 * iface, return E_NOTIMPL; } -static ICOM_VTABLE(IShellFolder2) vt_ShellFolder2 = +static IShellFolder2Vtbl vt_ShellFolder2 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE @@ -892,7 +892,7 @@ static HRESULT WINAPI ICPanel_PersistFolder2_GetCurFolder(IPersistFolder2 * ifac return S_OK; } -static ICOM_VTABLE(IPersistFolder2) vt_PersistFolder2 = +static IPersistFolder2Vtbl vt_PersistFolder2 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE @@ -1002,7 +1002,7 @@ static HRESULT WINAPI IShellExecuteHookW_fnExecute(IShellExecuteHookW* iface, LP return S_FALSE; } -static ICOM_VTABLE(IShellExecuteHookW) vt_ShellExecuteHookW = +static IShellExecuteHookWVtbl vt_ShellExecuteHookW = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE @@ -1082,7 +1082,7 @@ static HRESULT WINAPI IShellExecuteHookA_fnExecute(IShellExecuteHookA* iface, LP return S_FALSE; } -static ICOM_VTABLE(IShellExecuteHookA) vt_ShellExecuteHookA = +static IShellExecuteHookAVtbl vt_ShellExecuteHookA = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index 2f5592dc0fe..062e855730e 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -56,7 +56,7 @@ static HRESULT WINAPI IEnumFORMATETC_fnSkip(LPENUMFORMATETC iface, ULONG celt); static HRESULT WINAPI IEnumFORMATETC_fnReset(LPENUMFORMATETC iface); static HRESULT WINAPI IEnumFORMATETC_fnClone(LPENUMFORMATETC iface, LPENUMFORMATETC* ppenum); -static struct ICOM_VTABLE(IEnumFORMATETC) efvt = +static struct IEnumFORMATETCVtbl efvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IEnumFORMATETC_fnQueryInterface, @@ -223,7 +223,7 @@ typedef struct } IDataObjectImpl; -static struct ICOM_VTABLE(IDataObject) dtovt; +static struct IDataObjectVtbl dtovt; /************************************************************************** * IDataObject_Constructor @@ -440,7 +440,7 @@ static HRESULT WINAPI IDataObject_fnEnumDAdvise(LPDATAOBJECT iface, IEnumSTATDAT return E_NOTIMPL; } -static struct ICOM_VTABLE(IDataObject) dtovt = +static struct IDataObjectVtbl dtovt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDataObject_fnQueryInterface, diff --git a/dlls/shell32/dragdrophelper.c b/dlls/shell32/dragdrophelper.c index 63319f9c453..5daf7338cfe 100644 --- a/dlls/shell32/dragdrophelper.c +++ b/dlls/shell32/dragdrophelper.c @@ -50,7 +50,7 @@ typedef struct { DWORD ref; } IDropTargetHelperImpl; -static struct ICOM_VTABLE (IDropTargetHelper) vt_IDropTargetHelper; +static struct IDropTargetHelperVtbl vt_IDropTargetHelper; #define _IUnknown_(This) (IUnknown*)&(This->lpVtbl) #define _IDropTargetHelper_(This) (IDropTargetHelper*)&(This->lpVtbl) @@ -171,7 +171,7 @@ static HRESULT WINAPI IDropTargetHelper_fnShow (IDropTargetHelper * iface, BOOL return E_NOTIMPL; } -static ICOM_VTABLE (IDropTargetHelper) vt_IDropTargetHelper = +static IDropTargetHelperVtbl vt_IDropTargetHelper = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDropTargetHelper_fnQueryInterface, diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 1e6b3d56041..b331ffa5a6d 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -53,7 +53,7 @@ typedef struct } IEnumIDListImpl; -static struct ICOM_VTABLE(IEnumIDList) eidlvt; +static struct IEnumIDListVtbl eidlvt; /************************************************************************** * AddToEnumList() @@ -361,7 +361,7 @@ static HRESULT WINAPI IEnumIDList_fnClone( /************************************************************************** * IEnumIDList_fnVTable */ -static ICOM_VTABLE (IEnumIDList) eidlvt = +static IEnumIDListVtbl eidlvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IEnumIDList_fnQueryInterface, diff --git a/dlls/shell32/folders.c b/dlls/shell32/folders.c index b9f0d3662a7..a8df2e1138c 100644 --- a/dlls/shell32/folders.c +++ b/dlls/shell32/folders.c @@ -53,9 +53,9 @@ typedef struct LPITEMIDLIST pidl; } IExtractIconWImpl; -static struct ICOM_VTABLE(IExtractIconA) eiavt; -static struct ICOM_VTABLE(IExtractIconW) eivt; -static struct ICOM_VTABLE(IPersistFile) pfvt; +static struct IExtractIconAVtbl eiavt; +static struct IExtractIconWVtbl eivt; +static struct IPersistFileVtbl pfvt; #define _IPersistFile_Offset ((int)(&(((IExtractIconWImpl*)0)->lpvtblPersistFile))) #define _ICOM_THIS_From_IPersistFile(class, name) class* This = (class*)(((char*)name)-_IPersistFile_Offset); @@ -385,7 +385,7 @@ static HRESULT WINAPI IExtractIconW_fnExtract(IExtractIconW * iface, LPCWSTR psz return S_OK; } -static struct ICOM_VTABLE(IExtractIconW) eivt = +static struct IExtractIconWVtbl eivt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IExtractIconW_fnQueryInterface, @@ -478,7 +478,7 @@ static HRESULT WINAPI IExtractIconA_fnExtract(IExtractIconA * iface, LPCSTR pszF return ret; } -static struct ICOM_VTABLE(IExtractIconA) eiavt = +static struct IExtractIconAVtbl eiavt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IExtractIconA_fnQueryInterface, @@ -551,7 +551,7 @@ static HRESULT WINAPI IEIPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFi } -static struct ICOM_VTABLE(IPersistFile) pfvt = +static struct IPersistFileVtbl pfvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IEIPersistFile_fnQueryInterface, diff --git a/dlls/shell32/memorystream.c b/dlls/shell32/memorystream.c index 7738e340f40..9a4e1a0b030 100644 --- a/dlls/shell32/memorystream.c +++ b/dlls/shell32/memorystream.c @@ -55,7 +55,7 @@ static HRESULT WINAPI IStream_fnUnlockRegion (IStream * iface, ULARGE_INTEGER li static HRESULT WINAPI IStream_fnStat (IStream * iface, STATSTG* pstatstg, DWORD grfStatFlag); static HRESULT WINAPI IStream_fnClone (IStream * iface, IStream** ppstm); -static ICOM_VTABLE(IStream) stvt = +static IStreamVtbl stvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IStream_fnQueryInterface, @@ -76,7 +76,7 @@ static ICOM_VTABLE(IStream) stvt = }; typedef struct -{ ICOM_VTABLE(IStream) *lpvtst; +{ IStreamVtbl *lpvtst; DWORD ref; HANDLE handle; } ISHFileStream; diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 7560294eb37..5aaa8c6bf80 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -112,10 +112,10 @@ typedef struct _LOCAL_VOLUME_INFO #include "poppack.h" -static ICOM_VTABLE(IShellLinkA) slvt; -static ICOM_VTABLE(IShellLinkW) slvtw; -static ICOM_VTABLE(IPersistFile) pfvt; -static ICOM_VTABLE(IPersistStream) psvt; +static IShellLinkAVtbl slvt; +static IShellLinkWVtbl slvtw; +static IPersistFileVtbl pfvt; +static IPersistStreamVtbl psvt; /* IShellLink Implementation */ @@ -326,7 +326,7 @@ static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile* iface, LPOLESTR *p return NOERROR; } -static ICOM_VTABLE(IPersistFile) pfvt = +static IPersistFileVtbl pfvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IPersistFile_fnQueryInterface, @@ -768,7 +768,7 @@ static HRESULT WINAPI IPersistStream_fnGetSizeMax( return E_NOTIMPL; } -static ICOM_VTABLE(IPersistStream) psvt = +static IPersistStreamVtbl psvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IPersistStream_fnQueryInterface, @@ -1327,7 +1327,7 @@ static HRESULT WINAPI IShellLinkA_fnSetPath(IShellLinkA * iface, LPCSTR pszFile) * IShellLink Implementation */ -static ICOM_VTABLE(IShellLinkA) slvt = +static IShellLinkAVtbl slvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IShellLinkA_fnQueryInterface, @@ -1715,7 +1715,7 @@ static HRESULT WINAPI IShellLinkW_fnSetPath(IShellLinkW * iface, LPCWSTR pszFile * IShellLinkW Implementation */ -static ICOM_VTABLE(IShellLinkW) slvtw = +static IShellLinkWVtbl slvtw = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IShellLinkW_fnQueryInterface, diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 07c11ce7ca6..3fa3c8f0ef9 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -274,7 +274,7 @@ DWORD WINAPI SHCLSIDFromStringAW (LPVOID clsid, CLSID *id) */ /* set the vtable later */ -static ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32; +static IMallocVtbl VT_Shell_IMalloc32; /* this is the static object instance */ typedef struct { @@ -382,7 +382,7 @@ static VOID WINAPI IShellMalloc_fnHeapMinimize(LPMALLOC iface) TRACE("()\n"); } -static ICOM_VTABLE(IMalloc) VT_Shell_IMalloc32 = +static IMallocVtbl VT_Shell_IMalloc32 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IShellMalloc_fnQueryInterface, @@ -506,7 +506,7 @@ typedef struct ULONG * pcRefDll; /* pointer to refcounter in external dll (ugrrr...) */ } IDefClFImpl; -static ICOM_VTABLE(IClassFactory) dclfvt; +static IClassFactoryVtbl dclfvt; /************************************************************************** * IDefClF_fnConstructor @@ -609,7 +609,7 @@ static HRESULT WINAPI IDefClF_fnLockServer(LPCLASSFACTORY iface, BOOL fLock) return E_NOTIMPL; } -static ICOM_VTABLE(IClassFactory) dclfvt = +static IClassFactoryVtbl dclfvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDefClF_fnQueryInterface, diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index eb0fc4a59fe..880e7a2857c 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -76,7 +76,7 @@ typedef struct { #define _IUnknown_(This) (IShellFolder*)&(This->lpVtbl) #define _IShellFolder_(This) (IShellFolder*)&(This->lpVtbl) -static struct ICOM_VTABLE (IShellFolder2) vt_MCFldr_ShellFolder2; +static struct IShellFolder2Vtbl vt_MCFldr_ShellFolder2; static shvheader DesktopSFHeader[] = { {IDS_SHV_COLUMN1, SHCOLSTATE_TYPE_STR | SHCOLSTATE_ONBYDEFAULT, LVCFMT_RIGHT, 15}, @@ -712,7 +712,7 @@ static HRESULT WINAPI ISF_Desktop_fnMapColumnToSCID (IShellFolder2 * iface, UINT return E_NOTIMPL; } -static ICOM_VTABLE (IShellFolder2) vt_MCFldr_ShellFolder2 = +static IShellFolder2Vtbl vt_MCFldr_ShellFolder2 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ISF_Desktop_fnQueryInterface, diff --git a/dlls/shell32/shfldr_fs.c b/dlls/shell32/shfldr_fs.c index 9244d480563..20dda035d28 100644 --- a/dlls/shell32/shfldr_fs.c +++ b/dlls/shell32/shfldr_fs.c @@ -80,11 +80,11 @@ typedef struct { BOOL fAcceptFmt; /* flag for pending Drop */ } IGenericSFImpl; -static struct ICOM_VTABLE (IUnknown) unkvt; -static struct ICOM_VTABLE (IShellFolder2) sfvt; -static struct ICOM_VTABLE (IPersistFolder3) vt_FSFldr_PersistFolder3; /* IPersistFolder3 for a FS_Folder */ -static struct ICOM_VTABLE (IDropTarget) dtvt; -static struct ICOM_VTABLE (ISFHelper) shvt; +static struct IUnknownVtbl unkvt; +static struct IShellFolder2Vtbl sfvt; +static struct IPersistFolder3Vtbl vt_FSFldr_PersistFolder3; /* IPersistFolder3 for a FS_Folder */ +static struct IDropTargetVtbl dtvt; +static struct ISFHelperVtbl shvt; #define _IShellFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpvtblShellFolder))) #define _ICOM_THIS_From_IShellFolder2(class, name) class* This = (class*)(((char*)name)-_IShellFolder2_Offset); @@ -196,7 +196,7 @@ static ULONG WINAPI IUnknown_fnRelease (IUnknown * iface) return This->ref; } -static ICOM_VTABLE (IUnknown) unkvt = +static IUnknownVtbl unkvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IUnknown_fnQueryInterface, IUnknown_fnAddRef, @@ -858,7 +858,7 @@ static HRESULT WINAPI IShellFolder_fnMapColumnToSCID (IShellFolder2 * iface, UIN return E_NOTIMPL; } -static ICOM_VTABLE (IShellFolder2) sfvt = +static IShellFolder2Vtbl sfvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IShellFolder_fnQueryInterface, @@ -1098,7 +1098,7 @@ ISFHelper_fnCopyItems (ISFHelper * iface, IShellFolder * pSFFrom, UINT cidl, LPC return S_OK; } -static ICOM_VTABLE (ISFHelper) shvt = +static ISFHelperVtbl shvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ISFHelper_fnQueryInterface, @@ -1274,7 +1274,7 @@ IFSFldr_PersistFolder3_GetFolderTargetInfo (IPersistFolder3 * iface, PERSIST_FOL return E_NOTIMPL; } -static ICOM_VTABLE (IPersistFolder3) vt_FSFldr_PersistFolder3 = +static IPersistFolder3Vtbl vt_FSFldr_PersistFolder3 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IFSFldr_PersistFolder3_QueryInterface, @@ -1389,7 +1389,7 @@ ISFDropTarget_Drop (IDropTarget * iface, IDataObject * pDataObject, DWORD dwKeyS return E_NOTIMPL; } -static struct ICOM_VTABLE (IDropTarget) dtvt = { +static struct IDropTargetVtbl dtvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ISFDropTarget_QueryInterface, ISFDropTarget_AddRef, diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index a55bb7f962a..1414d2c2380 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -64,8 +64,8 @@ typedef struct { int dwAttributes; /* attributes returned by GetAttributesOf FIXME: use it */ } IGenericSFImpl; -static struct ICOM_VTABLE (IShellFolder2) vt_ShellFolder2; -static struct ICOM_VTABLE (IPersistFolder2) vt_PersistFolder2; +static struct IShellFolder2Vtbl vt_ShellFolder2; +static struct IPersistFolder2Vtbl vt_PersistFolder2; #define _IPersistFolder2_Offset ((int)(&(((IGenericSFImpl*)0)->lpVtblPersistFolder2))) #define _ICOM_THIS_From_IPersistFolder2(class, name) class* This = (class*)(((char*)name)-_IPersistFolder2_Offset); @@ -715,7 +715,7 @@ static HRESULT WINAPI ISF_MyComputer_fnMapColumnToSCID (IShellFolder2 * iface, U return E_NOTIMPL; } -static ICOM_VTABLE (IShellFolder2) vt_ShellFolder2 = +static IShellFolder2Vtbl vt_ShellFolder2 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ISF_MyComputer_fnQueryInterface, @@ -820,7 +820,7 @@ static HRESULT WINAPI IMCFldr_PersistFolder2_GetCurFolder (IPersistFolder2 * ifa return S_OK; } -static ICOM_VTABLE (IPersistFolder2) vt_PersistFolder2 = +static IPersistFolder2Vtbl vt_PersistFolder2 = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IMCFldr_PersistFolder2_QueryInterface, diff --git a/dlls/shell32/shlfsbind.c b/dlls/shell32/shlfsbind.c index 69c5d490af0..b841ddca821 100644 --- a/dlls/shell32/shlfsbind.c +++ b/dlls/shell32/shlfsbind.c @@ -52,7 +52,7 @@ static ULONG WINAPI IFileSystemBindData_fnRelease(IFileSystemBindData *iface); static HRESULT WINAPI IFileSystemBindData_fnGetFindData(IFileSystemBindData *iface, WIN32_FIND_DATAW *pfd); static HRESULT WINAPI IFileSystemBindData_fnSetFindData(IFileSystemBindData *iface, const WIN32_FIND_DATAW *pfd); -static struct ICOM_VTABLE(IFileSystemBindData) sbvt = +static struct IFileSystemBindDataVtbl sbvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IFileSystemBindData_fnQueryInterface, diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 365d41c9a05..fee09ce3230 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -98,21 +98,21 @@ typedef struct HANDLE hAccel; } IShellViewImpl; -static struct ICOM_VTABLE(IShellView) svvt; +static struct IShellViewVtbl svvt; -static struct ICOM_VTABLE(IOleCommandTarget) ctvt; +static struct IOleCommandTargetVtbl ctvt; #define _IOleCommandTarget_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblOleCommandTarget))) #define _ICOM_THIS_From_IOleCommandTarget(class, name) class* This = (class*)(((char*)name)-_IOleCommandTarget_Offset); -static struct ICOM_VTABLE(IDropTarget) dtvt; +static struct IDropTargetVtbl dtvt; #define _IDropTarget_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblDropTarget))) #define _ICOM_THIS_From_IDropTarget(class, name) class* This = (class*)(((char*)name)-_IDropTarget_Offset); -static struct ICOM_VTABLE(IDropSource) dsvt; +static struct IDropSourceVtbl dsvt; #define _IDropSource_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblDropSource))) #define _ICOM_THIS_From_IDropSource(class, name) class* This = (class*)(((char*)name)-_IDropSource_Offset); -static struct ICOM_VTABLE(IViewObject) vovt; +static struct IViewObjectVtbl vovt; #define _IViewObject_Offset ((int)(&(((IShellViewImpl*)0)->lpvtblViewObject))) #define _ICOM_THIS_From_IViewObject(class, name) class* This = (class*)(((char*)name)-_IViewObject_Offset); @@ -1983,7 +1983,7 @@ static HRESULT WINAPI IShellView_fnGetItemObject(IShellView * iface, UINT uItem, return S_OK; } -static struct ICOM_VTABLE(IShellView) svvt = +static struct IShellViewVtbl svvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IShellView_fnQueryInterface, @@ -2096,7 +2096,7 @@ static HRESULT WINAPI ISVOleCmdTarget_Exec( return OLECMDERR_E_UNKNOWNGROUP; } -static ICOM_VTABLE(IOleCommandTarget) ctvt = +static IOleCommandTargetVtbl ctvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ISVOleCmdTarget_QueryInterface, @@ -2192,7 +2192,7 @@ static HRESULT WINAPI ISVDropTarget_Drop( return E_NOTIMPL; } -static struct ICOM_VTABLE(IDropTarget) dtvt = +static struct IDropTargetVtbl dtvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ISVDropTarget_QueryInterface, @@ -2263,7 +2263,7 @@ static HRESULT WINAPI ISVDropSource_GiveFeedback( return DRAGDROP_S_USEDEFAULTCURSORS; } -static struct ICOM_VTABLE(IDropSource) dsvt = +static struct IDropSourceVtbl dsvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ISVDropSource_QueryInterface, @@ -2395,7 +2395,7 @@ static HRESULT WINAPI ISVViewObject_GetAdvise( } -static struct ICOM_VTABLE(IViewObject) vovt = +static struct IViewObjectVtbl vovt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ISVViewObject_QueryInterface, diff --git a/dlls/shell32/shv_bg_cmenu.c b/dlls/shell32/shv_bg_cmenu.c index b7e6b59012f..2865a4d11d2 100644 --- a/dlls/shell32/shv_bg_cmenu.c +++ b/dlls/shell32/shv_bg_cmenu.c @@ -47,7 +47,7 @@ typedef struct } BgCmImpl; -static struct ICOM_VTABLE(IContextMenu2) cmvt; +static struct IContextMenu2Vtbl cmvt; /************************************************************************** * ISVBgCm_Constructor() @@ -431,7 +431,7 @@ static HRESULT WINAPI ISVBgCm_fnHandleMenuMsg( * IContextMenu2 VTable * */ -static struct ICOM_VTABLE(IContextMenu2) cmvt = +static struct IContextMenu2Vtbl cmvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ISVBgCm_fnQueryInterface, diff --git a/dlls/shell32/shv_item_cmenu.c b/dlls/shell32/shv_item_cmenu.c index e41f97236e1..5cb4ff3466a 100644 --- a/dlls/shell32/shv_item_cmenu.c +++ b/dlls/shell32/shv_item_cmenu.c @@ -51,7 +51,7 @@ typedef struct } ItemCmImpl; -static struct ICOM_VTABLE(IContextMenu2) cmvt; +static struct IContextMenu2Vtbl cmvt; /************************************************************************** * ISvItemCm_CanRenameItems() @@ -513,7 +513,7 @@ static HRESULT WINAPI ISvItemCm_fnHandleMenuMsg( return E_NOTIMPL; } -static struct ICOM_VTABLE(IContextMenu2) cmvt = +static struct IContextMenu2Vtbl cmvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ISvItemCm_fnQueryInterface, diff --git a/dlls/shlwapi/assoc.c b/dlls/shlwapi/assoc.c index 97b173d2dea..127a41c4024 100644 --- a/dlls/shlwapi/assoc.c +++ b/dlls/shlwapi/assoc.c @@ -64,7 +64,7 @@ typedef struct HKEY hkeyProgID; } IQueryAssociationsImpl; -static struct ICOM_VTABLE(IQueryAssociations) IQueryAssociations_vtbl; +static struct IQueryAssociationsVtbl IQueryAssociations_vtbl; /************************************************************************** * IQueryAssociations_Constructor [internal] @@ -691,7 +691,7 @@ static HRESULT WINAPI IQueryAssociations_fnGetEnum( return E_NOTIMPL; } -static struct ICOM_VTABLE(IQueryAssociations) IQueryAssociations_vtbl = +static struct IQueryAssociationsVtbl IQueryAssociations_vtbl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IQueryAssociations_fnQueryInterface, diff --git a/dlls/shlwapi/istream.c b/dlls/shlwapi/istream.c index 2f8c3ed261f..0ec783f5a29 100644 --- a/dlls/shlwapi/istream.c +++ b/dlls/shlwapi/istream.c @@ -320,7 +320,7 @@ static HRESULT WINAPI IStream_fnClone(IStream *iface, IStream** ppstm) return E_NOTIMPL; } -static struct ICOM_VTABLE(IStream) SHLWAPI_fsVTable = +static struct IStreamVtbl SHLWAPI_fsVTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IStream_fnQueryInterface, diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c index 033e942da4f..9423fdc6225 100644 --- a/dlls/shlwapi/regstream.c +++ b/dlls/shlwapi/regstream.c @@ -251,7 +251,7 @@ static HRESULT WINAPI IStream_fnClone (IStream * iface, IStream** ppstm) return E_NOTIMPL; } -static struct ICOM_VTABLE(IStream) rstvt = +static struct IStreamVtbl rstvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IStream_fnQueryInterface, @@ -302,7 +302,7 @@ static HRESULT WINAPI IStream_fnReadDummy(IStream *iface, LPVOID pv, ULONG cb, U return E_NOTIMPL; } -static struct ICOM_VTABLE(IStream) DummyRegStreamVTable = +static struct IStreamVtbl DummyRegStreamVTable = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IStream_fnQueryInterface, diff --git a/dlls/urlmon/umon.c b/dlls/urlmon/umon.c index c1a1943c565..fcf5c7bf705 100644 --- a/dlls/urlmon/umon.c +++ b/dlls/urlmon/umon.c @@ -49,8 +49,8 @@ static const WCHAR BSCBHolder[] = { '_','B','S','C','B','_','H','o','l','d','e', /* filemoniker data structure */ typedef struct URLMonikerImpl{ - ICOM_VTABLE(IMoniker)* lpvtbl1; /* VTable relative to the IMoniker interface.*/ - ICOM_VTABLE(IBinding)* lpvtbl2; /* VTable to IBinding interface */ + IMonikerVtbl* lpvtbl1; /* VTable relative to the IMoniker interface.*/ + IBindingVtbl* lpvtbl2; /* VTable to IBinding interface */ ULONG ref; /* reference counter for this object */ @@ -113,7 +113,7 @@ static HRESULT URLMonikerImpl_Destroy(URLMonikerImpl* iface); /********************************************************************************/ /* Virtual function table for the URLMonikerImpl class which include IPersist,*/ /* IPersistStream and IMoniker functions. */ -static ICOM_VTABLE(IMoniker) VT_URLMonikerImpl = +static IMonikerVtbl VT_URLMonikerImpl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE URLMonikerImpl_QueryInterface, @@ -141,7 +141,7 @@ static ICOM_VTABLE(IMoniker) VT_URLMonikerImpl = URLMonikerImpl_IsSystemMoniker }; -static ICOM_VTABLE(IBinding) VTBinding_URLMonikerImpl = +static IBindingVtbl VTBinding_URLMonikerImpl = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE URLMonikerImpl_IBinding_QueryInterface, diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c index 5bbcd66be6c..d8ea34d0edc 100644 --- a/dlls/winmm/winealsa/audio.c +++ b/dlls/winmm/winealsa/audio.c @@ -2439,7 +2439,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Stop(PIDSDRIVERBUFFER iface) return DS_OK; } -static ICOM_VTABLE(IDsDriverBuffer) dsdbvt = +static IDsDriverBufferVtbl dsdbvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDsDriverBufferImpl_QueryInterface, @@ -2595,7 +2595,7 @@ static HRESULT WINAPI IDsDriverImpl_DuplicateSoundBuffer(PIDSDRIVER iface, return DSERR_INVALIDCALL; } -static ICOM_VTABLE(IDsDriver) dsdvt = +static IDsDriverVtbl dsdvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDsDriverImpl_QueryInterface, diff --git a/dlls/winmm/winealsa/audio_05.c b/dlls/winmm/winealsa/audio_05.c index 7b62bddcdcf..5a7113bef63 100644 --- a/dlls/winmm/winealsa/audio_05.c +++ b/dlls/winmm/winealsa/audio_05.c @@ -1537,7 +1537,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Stop(PIDSDRIVERBUFFER iface) return DSERR_BUFFERLOST; } -static ICOM_VTABLE(IDsDriverBuffer) dsdbvt = +static IDsDriverBufferVtbl dsdbvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDsDriverBufferImpl_QueryInterface, @@ -1730,7 +1730,7 @@ static HRESULT WINAPI IDsDriverImpl_DuplicateSoundBuffer(PIDSDRIVER iface, return DSERR_INVALIDCALL; } -static ICOM_VTABLE(IDsDriver) dsdvt = +static IDsDriverVtbl dsdvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDsDriverImpl_QueryInterface, diff --git a/dlls/winmm/wineaudioio/audio.c b/dlls/winmm/wineaudioio/audio.c index a1002cffaf6..955b8fc701c 100644 --- a/dlls/winmm/wineaudioio/audio.c +++ b/dlls/winmm/wineaudioio/audio.c @@ -1477,7 +1477,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Stop(PIDSDRIVERBUFFER iface) return DSERR_BUFFERLOST; } -static ICOM_VTABLE(IDsDriverBuffer) dsdbvt = +static IDsDriverBufferVtbl dsdbvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDsDriverBufferImpl_QueryInterface, @@ -1661,7 +1661,7 @@ static HRESULT WINAPI IDsDriverImpl_DuplicateSoundBuffer(PIDSDRIVER iface, return DSERR_INVALIDCALL; } -static ICOM_VTABLE(IDsDriver) dsdvt = +static IDsDriverVtbl dsdvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDsDriverImpl_QueryInterface, diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c index 5828f97daa2..1478b54245f 100644 --- a/dlls/winmm/wineoss/audio.c +++ b/dlls/winmm/wineoss/audio.c @@ -2456,7 +2456,7 @@ static HRESULT WINAPI IDsDriverPropertySetImpl_QuerySupport( return DSERR_UNSUPPORTED; } -ICOM_VTABLE(IDsDriverPropertySet) dsdpsvt = +IDsDriverPropertySetVtbl dsdpsvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDsDriverPropertySetImpl_QueryInterface, @@ -2552,7 +2552,7 @@ static HRESULT WINAPI IDsDriverNotifyImpl_SetNotificationPositions( return S_OK; } -ICOM_VTABLE(IDsDriverNotify) dsdnvt = +IDsDriverNotifyVtbl dsdnvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDsDriverNotifyImpl_QueryInterface, @@ -2871,7 +2871,7 @@ static HRESULT WINAPI IDsDriverBufferImpl_Stop(PIDSDRIVERBUFFER iface) return DS_OK; } -static ICOM_VTABLE(IDsDriverBuffer) dsdbvt = +static IDsDriverBufferVtbl dsdbvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDsDriverBufferImpl_QueryInterface, @@ -3097,7 +3097,7 @@ static HRESULT WINAPI IDsDriverImpl_DuplicateSoundBuffer(PIDSDRIVER iface, return DSERR_INVALIDCALL; } -static ICOM_VTABLE(IDsDriver) dsdvt = +static IDsDriverVtbl dsdvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDsDriverImpl_QueryInterface, @@ -4103,7 +4103,7 @@ static HRESULT WINAPI IDsCaptureDriverPropertySetImpl_QuerySupport( return DSERR_UNSUPPORTED; } -ICOM_VTABLE(IDsDriverPropertySet) dscdpsvt = +IDsDriverPropertySetVtbl dscdpsvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDsCaptureDriverPropertySetImpl_QueryInterface, @@ -4202,7 +4202,7 @@ static HRESULT WINAPI IDsCaptureDriverNotifyImpl_SetNotificationPositions( return S_OK; } -ICOM_VTABLE(IDsDriverNotify) dscdnvt = +IDsDriverNotifyVtbl dscdnvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDsCaptureDriverNotifyImpl_QueryInterface, @@ -4486,7 +4486,7 @@ static HRESULT WINAPI IDsCaptureDriverBufferImpl_SetFormat( return DSERR_UNSUPPORTED; } -static ICOM_VTABLE(IDsCaptureDriverBuffer) dscdbvt = +static IDsCaptureDriverBufferVtbl dscdbvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDsCaptureDriverBufferImpl_QueryInterface, @@ -4693,7 +4693,7 @@ static HRESULT WINAPI IDsCaptureDriverImpl_CreateCaptureBuffer( return DS_OK; } -static ICOM_VTABLE(IDsCaptureDriver) dscdvt = +static IDsCaptureDriverVtbl dscdvt = { ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE IDsCaptureDriverImpl_QueryInterface, diff --git a/include/objbase.h b/include/objbase.h index bed45fab2c7..c39f714c99d 100644 --- a/include/objbase.h +++ b/include/objbase.h @@ -200,7 +200,7 @@ * * } _IDirect3D; * - * static ICOM_VTABLE(IDirect3D) d3dvt; + * static IDirect3DVtbl d3dvt; * * // implement the IDirect3D methods here * @@ -212,7 +212,7 @@ * * // ... * - * static ICOM_VTABLE(IDirect3D) d3dvt = { + * static IDirect3DVtbl d3dvt = { * ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE * IDirect3D_QueryInterface, * IDirect3D_Add, @@ -297,7 +297,6 @@ /* Wine-specific macros */ -#define ICOM_VTABLE(iface) iface##Vtbl #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)) diff --git a/include/rpcproxy.h b/include/rpcproxy.h index 8e5a9c1323c..76e5bacc1a0 100644 --- a/include/rpcproxy.h +++ b/include/rpcproxy.h @@ -94,12 +94,12 @@ typedef struct tagCInterfaceStubHeader typedef struct tagCInterfaceStubVtbl { CInterfaceStubHeader header; - ICOM_VTABLE(IRpcStubBuffer) Vtbl; + IRpcStubBufferVtbl Vtbl; } CInterfaceStubVtbl; typedef struct tagCStdStubBuffer { - const ICOM_VTABLE(IRpcStubBuffer) *lpVtbl; + const IRpcStubBufferVtbl *lpVtbl; long RefCount; struct IUnknown *pvServerObject; const struct ICallFactoryVtbl *pCallFactoryVtbl;