ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get rid of the non-standard ICOM_VTABLE macro.

This commit is contained in:
Alexandre Julliard 2004-08-12 23:00:51 +00:00
parent 146d60697e
commit 48c4bb3c31
247 changed files with 972 additions and 973 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/amstream/amstream.c
View File

@ -37,7 +37,7 @@ typedef struct {
int ref; int ref;
} IAMMultiMediaStreamImpl; } IAMMultiMediaStreamImpl;
static struct ICOM_VTABLE(IAMMultiMediaStream) AM_Vtbl; static struct IAMMultiMediaStreamVtbl AM_Vtbl;
HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj)
{ {
@ -243,7 +243,7 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_Render(IAMMultiMediaStream* iface,
return S_FALSE; return S_FALSE;
} }
static ICOM_VTABLE(IAMMultiMediaStream) AM_Vtbl = static IAMMultiMediaStreamVtbl AM_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IAMMultiMediaStreamImpl_QueryInterface, IAMMultiMediaStreamImpl_QueryInterface,

2
dlls/amstream/main.c
View File

@ -140,7 +140,7 @@ static HRESULT WINAPI AMCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) DSCF_Vtbl = static IClassFactoryVtbl DSCF_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
AMCF_QueryInterface, AMCF_QueryInterface,

2
dlls/avifil32/acmstream.c
View File

@ -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_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size);
static HRESULT WINAPI ACMStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); static HRESULT WINAPI ACMStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen);
struct ICOM_VTABLE(IAVIStream) iacmst = { struct IAVIStreamVtbl iacmst = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ACMStream_fnQueryInterface, ACMStream_fnQueryInterface,
ACMStream_fnAddRef, ACMStream_fnAddRef,

6
dlls/avifil32/avifile.c
View File

@ -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_fnEndRecord(IAVIFile*iface);
static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam); static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam);
struct ICOM_VTABLE(IAVIFile) iavift = { struct IAVIFileVtbl iavift = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IAVIFile_fnQueryInterface, IAVIFile_fnQueryInterface,
IAVIFile_fnAddRef, 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_fnSaveCompleted(IPersistFile*iface,LPCOLESTR pszFileName);
static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile*iface,LPOLESTR*ppszFileName); static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile*iface,LPOLESTR*ppszFileName);
struct ICOM_VTABLE(IPersistFile) ipersistft = { struct IPersistFileVtbl ipersistft = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IPersistFile_fnQueryInterface, IPersistFile_fnQueryInterface,
IPersistFile_fnAddRef, 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_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size);
static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen);
struct ICOM_VTABLE(IAVIStream) iavist = { struct IAVIStreamVtbl iavist = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IAVIStream_fnQueryInterface, IAVIStream_fnQueryInterface,
IAVIStream_fnAddRef, IAVIStream_fnAddRef,

6
dlls/avifil32/editstream.c
View File

@ -75,7 +75,7 @@ static HRESULT WINAPI IAVIEditStream_fnClone(IAVIEditStream*iface,
static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface, static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface,
LPAVISTREAMINFOW asi,LONG size); LPAVISTREAMINFOW asi,LONG size);
struct ICOM_VTABLE(IAVIEditStream) ieditstream = { struct IAVIEditStreamVtbl ieditstream = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IAVIEditStream_fnQueryInterface, IAVIEditStream_fnQueryInterface,
IAVIEditStream_fnAddRef, IAVIEditStream_fnAddRef,
@ -111,7 +111,7 @@ static HRESULT WINAPI IEditAVIStream_fnWriteData(IAVIStream*iface,DWORD fcc,
LPVOID lp,LONG size); LPVOID lp,LONG size);
static HRESULT WINAPI IEditAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); static HRESULT WINAPI IEditAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen);
struct ICOM_VTABLE(IAVIStream) ieditstast = { struct IAVIStreamVtbl ieditstast = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IEditAVIStream_fnQueryInterface, IEditAVIStream_fnQueryInterface,
IEditAVIStream_fnAddRef, IEditAVIStream_fnAddRef,
@ -134,7 +134,7 @@ static ULONG WINAPI IEditStreamInternal_fnAddRef(IEditStreamInternal*iface);
static ULONG WINAPI IEditStreamInternal_fnRelease(IEditStreamInternal*iface); static ULONG WINAPI IEditStreamInternal_fnRelease(IEditStreamInternal*iface);
static HRESULT WINAPI IEditStreamInternal_fnGetEditStreamImpl(IEditStreamInternal*iface,LPVOID*ppimpl); static HRESULT WINAPI IEditStreamInternal_fnGetEditStreamImpl(IEditStreamInternal*iface,LPVOID*ppimpl);
struct ICOM_VTABLE(IEditStreamInternal) ieditstreaminternal = { struct IEditStreamInternalVtbl ieditstreaminternal = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IEditStreamInternal_fnQueryInterface, IEditStreamInternal_fnQueryInterface,
IEditStreamInternal_fnAddRef, IEditStreamInternal_fnAddRef,

2
dlls/avifil32/factory.c
View File

@ -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_fnCreateInstance(LPCLASSFACTORY iface,LPUNKNOWN pOuter,REFIID riid,LPVOID *ppobj);
static HRESULT WINAPI IClassFactory_fnLockServer(LPCLASSFACTORY iface,BOOL dolock); static HRESULT WINAPI IClassFactory_fnLockServer(LPCLASSFACTORY iface,BOOL dolock);
static ICOM_VTABLE(IClassFactory) iclassfact = { static IClassFactoryVtbl iclassfact = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IClassFactory_fnQueryInterface, IClassFactory_fnQueryInterface,
IClassFactory_fnAddRef, IClassFactory_fnAddRef,

2
dlls/avifil32/getframe.c
View File

@ -54,7 +54,7 @@ static HRESULT WINAPI IGetFrame_fnSetFormat(IGetFrame *iface,
LPVOID lpBits, INT x, INT y, LPVOID lpBits, INT x, INT y,
INT dx, INT dy); INT dx, INT dy);
struct ICOM_VTABLE(IGetFrame) igetframeVtbl = { struct IGetFrameVtbl igetframeVtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IGetFrame_fnQueryInterface, IGetFrame_fnQueryInterface,
IGetFrame_fnAddRef, IGetFrame_fnAddRef,

2
dlls/avifil32/icmstream.c
View File

@ -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_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size);
static HRESULT WINAPI ICMStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); static HRESULT WINAPI ICMStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen);
struct ICOM_VTABLE(IAVIStream) iicmst = { struct IAVIStreamVtbl iicmst = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ICMStream_fnQueryInterface, ICMStream_fnQueryInterface,
ICMStream_fnAddRef, ICMStream_fnAddRef,

2
dlls/avifil32/tmpfile.c
View File

@ -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_fnEndRecord(IAVIFile*iface);
static HRESULT WINAPI ITmpFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam); static HRESULT WINAPI ITmpFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam);
struct ICOM_VTABLE(IAVIFile) itmpft = { struct IAVIFileVtbl itmpft = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ITmpFile_fnQueryInterface, ITmpFile_fnQueryInterface,
ITmpFile_fnAddRef, ITmpFile_fnAddRef,

6
dlls/avifil32/wavfile.c
View File

@ -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_fnEndRecord(IAVIFile*iface);
static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam); static HRESULT WINAPI IAVIFile_fnDeleteStream(IAVIFile*iface,DWORD fccType,LONG lParam);
struct ICOM_VTABLE(IAVIFile) iwavft = { struct IAVIFileVtbl iwavft = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IAVIFile_fnQueryInterface, IAVIFile_fnQueryInterface,
IAVIFile_fnAddRef, 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_fnSaveCompleted(IPersistFile*iface,LPCOLESTR pszFileName);
static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile*iface,LPOLESTR*ppszFileName); static HRESULT WINAPI IPersistFile_fnGetCurFile(IPersistFile*iface,LPOLESTR*ppszFileName);
struct ICOM_VTABLE(IPersistFile) iwavpft = { struct IPersistFileVtbl iwavpft = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IPersistFile_fnQueryInterface, IPersistFile_fnQueryInterface,
IPersistFile_fnAddRef, 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_fnWriteData(IAVIStream*iface,DWORD fcc,LPVOID lp,LONG size);
static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen); static HRESULT WINAPI IAVIStream_fnSetInfo(IAVIStream*iface,AVISTREAMINFOW*info,LONG infolen);
struct ICOM_VTABLE(IAVIStream) iwavst = { struct IAVIStreamVtbl iwavst = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IAVIStream_fnQueryInterface, IAVIStream_fnQueryInterface,
IAVIStream_fnAddRef, IAVIStream_fnAddRef,

10
dlls/comcat/comcat_private.h
View File

@ -54,15 +54,15 @@ extern ClassFactoryImpl COMCAT_ClassFactory;
typedef struct typedef struct
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *unkVtbl; IUnknownVtbl *unkVtbl;
ICOM_VTABLE(ICatRegister) *regVtbl; ICatRegisterVtbl *regVtbl;
ICOM_VTABLE(ICatInformation) *infVtbl; ICatInformationVtbl *infVtbl;
DWORD ref; DWORD ref;
} ComCatMgrImpl; } ComCatMgrImpl;
extern ComCatMgrImpl COMCAT_ComCatMgr; extern ComCatMgrImpl COMCAT_ComCatMgr;
extern ICOM_VTABLE(ICatRegister) COMCAT_ICatRegister_Vtbl; extern ICatRegisterVtbl COMCAT_ICatRegister_Vtbl;
extern ICOM_VTABLE(ICatInformation) COMCAT_ICatInformation_Vtbl; extern ICatInformationVtbl COMCAT_ICatInformation_Vtbl;
/********************************************************************** /**********************************************************************
* Global string constant declarations * Global string constant declarations

2
dlls/comcat/factory.c
View File

@ -128,7 +128,7 @@ static HRESULT WINAPI COMCAT_IClassFactory_LockServer(
/********************************************************************** /**********************************************************************
* IClassFactory_Vtbl * IClassFactory_Vtbl
*/ */
static ICOM_VTABLE(IClassFactory) IClassFactory_Vtbl = static IClassFactoryVtbl IClassFactory_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
COMCAT_IClassFactory_QueryInterface, COMCAT_IClassFactory_QueryInterface,

8
dlls/comcat/information.c
View File

@ -276,7 +276,7 @@ static HRESULT WINAPI COMCAT_ICatInformation_EnumReqCategoriesOfClass(
/********************************************************************** /**********************************************************************
* COMCAT_ICatInformation_Vtbl * COMCAT_ICatInformation_Vtbl
*/ */
ICOM_VTABLE(ICatInformation) COMCAT_ICatInformation_Vtbl = ICatInformationVtbl COMCAT_ICatInformation_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
COMCAT_ICatInformation_QueryInterface, COMCAT_ICatInformation_QueryInterface,
@ -449,7 +449,7 @@ static HRESULT WINAPI COMCAT_IEnumCATEGORYINFO_Clone(
return S_OK; return S_OK;
} }
ICOM_VTABLE(IEnumCATEGORYINFO) COMCAT_IEnumCATEGORYINFO_Vtbl = IEnumCATEGORYINFOVtbl COMCAT_IEnumCATEGORYINFO_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
COMCAT_IEnumCATEGORYINFO_QueryInterface, COMCAT_IEnumCATEGORYINFO_QueryInterface,
@ -757,7 +757,7 @@ static HRESULT WINAPI COMCAT_CLSID_IEnumGUID_Clone(
return S_OK; return S_OK;
} }
ICOM_VTABLE(IEnumGUID) COMCAT_CLSID_IEnumGUID_Vtbl = IEnumGUIDVtbl COMCAT_CLSID_IEnumGUID_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
COMCAT_CLSID_IEnumGUID_QueryInterface, COMCAT_CLSID_IEnumGUID_QueryInterface,
@ -932,7 +932,7 @@ static HRESULT WINAPI COMCAT_CATID_IEnumGUID_Clone(
return S_OK; return S_OK;
} }
ICOM_VTABLE(IEnumGUID) COMCAT_CATID_IEnumGUID_Vtbl = IEnumGUIDVtbl COMCAT_CATID_IEnumGUID_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
COMCAT_CATID_IEnumGUID_QueryInterface, COMCAT_CATID_IEnumGUID_QueryInterface,

2
dlls/comcat/manager.c
View File

@ -95,7 +95,7 @@ static ULONG WINAPI COMCAT_IUnknown_Release(LPUNKNOWN iface)
/********************************************************************** /**********************************************************************
* COMCAT_IUnknown_Vtbl * COMCAT_IUnknown_Vtbl
*/ */
static ICOM_VTABLE(IUnknown) COMCAT_IUnknown_Vtbl = static IUnknownVtbl COMCAT_IUnknown_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
COMCAT_IUnknown_QueryInterface, COMCAT_IUnknown_QueryInterface,

2
dlls/comcat/register.c
View File

@ -236,7 +236,7 @@ static HRESULT WINAPI COMCAT_ICatRegister_UnRegisterClassReqCategories(
/********************************************************************** /**********************************************************************
* COMCAT_ICatRegister_Vtbl * COMCAT_ICatRegister_Vtbl
*/ */
ICOM_VTABLE(ICatRegister) COMCAT_ICatRegister_Vtbl = ICatRegisterVtbl COMCAT_ICatRegister_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
COMCAT_ICatRegister_QueryInterface, COMCAT_ICatRegister_QueryInterface,

18
dlls/commdlg/filedlgbrowser.c
View File

@ -45,9 +45,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(commdlg);
typedef struct typedef struct
{ {
ICOM_VTABLE(IShellBrowser) * lpVtbl; IShellBrowserVtbl * lpVtbl;
ICOM_VTABLE(ICommDlgBrowser) * lpVtblCommDlgBrowser; ICommDlgBrowserVtbl * lpVtblCommDlgBrowser;
ICOM_VTABLE(IServiceProvider)* lpVtblServiceProvider; IServiceProviderVtbl* lpVtblServiceProvider;
DWORD ref; /* Reference counter */ DWORD ref; /* Reference counter */
HWND hwndOwner; /* Owner dialog of the interface */ HWND hwndOwner; /* Owner dialog of the interface */
@ -56,9 +56,9 @@ typedef struct
/************************************************************************** /**************************************************************************
* vtable * vtable
*/ */
static ICOM_VTABLE(IShellBrowser) IShellBrowserImpl_Vtbl; static IShellBrowserVtbl IShellBrowserImpl_Vtbl;
static ICOM_VTABLE(ICommDlgBrowser) IShellBrowserImpl_ICommDlgBrowser_Vtbl; static ICommDlgBrowserVtbl IShellBrowserImpl_ICommDlgBrowser_Vtbl;
static ICOM_VTABLE(IServiceProvider) IShellBrowserImpl_IServiceProvider_Vtbl; static IServiceProviderVtbl IShellBrowserImpl_IServiceProvider_Vtbl;
/************************************************************************** /**************************************************************************
* Local Prototypes * Local Prototypes
@ -630,7 +630,7 @@ HRESULT WINAPI IShellBrowserImpl_TranslateAcceleratorSB(IShellBrowser *iface,
return E_NOTIMPL; return E_NOTIMPL;
} }
static ICOM_VTABLE(IShellBrowser) IShellBrowserImpl_Vtbl = static IShellBrowserVtbl IShellBrowserImpl_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
/* IUnknown */ /* IUnknown */
@ -855,7 +855,7 @@ HRESULT IShellBrowserImpl_ICommDlgBrowser_OnSelChange(ICommDlgBrowser *iface, IS
return S_OK; return S_OK;
} }
static ICOM_VTABLE(ICommDlgBrowser) IShellBrowserImpl_ICommDlgBrowser_Vtbl = static ICommDlgBrowserVtbl IShellBrowserImpl_ICommDlgBrowser_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
/* IUnknown */ /* 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 ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
/* IUnknown */ /* IUnknown */

2
dlls/d3d8/basetexture.c
View File

@ -125,7 +125,7 @@ DWORD WINAPI IDirect3DBaseTexture8Impl_GetLevelCount(LPDIRECT3DBASETEX
return This->levels; return This->levels;
} }
ICOM_VTABLE(IDirect3DBaseTexture8) Direct3DBaseTexture8_Vtbl = IDirect3DBaseTexture8Vtbl Direct3DBaseTexture8_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DBaseTexture8Impl_QueryInterface, IDirect3DBaseTexture8Impl_QueryInterface,

2
dlls/d3d8/cubetexture.c
View File

@ -280,7 +280,7 @@ HRESULT WINAPI IDirect3DCubeTexture8Impl_AddDirtyRect(LPDIRECT3DCUBETEXT
} }
ICOM_VTABLE(IDirect3DCubeTexture8) Direct3DCubeTexture8_Vtbl = IDirect3DCubeTexture8Vtbl Direct3DCubeTexture8_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DCubeTexture8Impl_QueryInterface, IDirect3DCubeTexture8Impl_QueryInterface,

32
dlls/d3d8/d3d8_private.h
View File

@ -273,7 +273,7 @@ struct PLIGHTINFOEL {
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3D8) Direct3D8_Vtbl; extern IDirect3D8Vtbl Direct3D8_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3D implementation structure * IDirect3D implementation structure
@ -323,7 +323,7 @@ extern HRESULT WINAPI IDirect3D8Impl_CreateDevice(LPDIRECT3D8 iface, UINT Adap
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DDevice8) Direct3DDevice8_Vtbl; extern IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DDevice8 implementation structure * IDirect3DDevice8 implementation structure
@ -517,7 +517,7 @@ extern HRESULT WINAPI IDirect3DDevice8Impl_ActiveRender(LPDIRECT3DDEVICE8 ifac
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DVolume8) Direct3DVolume8_Vtbl; extern IDirect3DVolume8Vtbl Direct3DVolume8_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DVolume8 implementation structure * IDirect3DVolume8 implementation structure
@ -571,7 +571,7 @@ extern HRESULT WINAPI IDirect3DVolume8Impl_AddDirtyBox(LPDIRECT3DVOLUME8 iface,
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DSwapChain8) Direct3DSwapChain8_Vtbl; extern IDirect3DSwapChain8Vtbl Direct3DSwapChain8_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DSwapChain8 implementation structure * IDirect3DSwapChain8 implementation structure
@ -610,7 +610,7 @@ extern HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(LPDIRECT3DSWAPCHAIN8
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DSurface8) Direct3DSurface8_Vtbl; extern IDirect3DSurface8Vtbl Direct3DSurface8_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DSurface8 implementation structure * IDirect3DSurface8 implementation structure
@ -668,7 +668,7 @@ extern HRESULT WINAPI IDirect3DSurface8Impl_AddDirtyRect(LPDIRECT3DSURFACE8 ifac
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DResource8) Direct3DResource8_Vtbl; extern IDirect3DResource8Vtbl Direct3DResource8_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DResource8 implementation structure * IDirect3DResource8 implementation structure
@ -710,7 +710,7 @@ extern D3DPOOL WINAPI IDirect3DResource8Impl_GetPool(LPDIRECT3DRESOURCE8
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DVertexBuffer8) Direct3DVertexBuffer8_Vtbl; extern IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DVertexBuffer8 implementation structure * IDirect3DVertexBuffer8 implementation structure
@ -758,7 +758,7 @@ extern HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDesc(LPDIRECT3DVERTE
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DIndexBuffer8) Direct3DIndexBuffer8_Vtbl; extern IDirect3DIndexBuffer8Vtbl Direct3DIndexBuffer8_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DIndexBuffer8 implementation structure * IDirect3DIndexBuffer8 implementation structure
@ -806,7 +806,7 @@ extern HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDesc(LPDIRECT3DINDEXB
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DBaseTexture8) Direct3DBaseTexture8_Vtbl; extern IDirect3DBaseTexture8Vtbl Direct3DBaseTexture8_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DBaseTexture8 implementation structure * IDirect3DBaseTexture8 implementation structure
@ -863,7 +863,7 @@ extern BOOL WINAPI IDirect3DBaseTexture8Impl_SetDirty(LPDIRECT3DBASET
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DCubeTexture8) Direct3DCubeTexture8_Vtbl; extern IDirect3DCubeTexture8Vtbl Direct3DCubeTexture8_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DCubeTexture8 implementation structure * IDirect3DCubeTexture8 implementation structure
@ -925,7 +925,7 @@ extern HRESULT WINAPI IDirect3DCubeTexture8Impl_AddDirtyRect(LPDIRECT3DC
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DTexture8) Direct3DTexture8_Vtbl; extern IDirect3DTexture8Vtbl Direct3DTexture8_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DTexture8 implementation structure * IDirect3DTexture8 implementation structure
@ -988,7 +988,7 @@ extern HRESULT WINAPI IDirect3DTexture8Impl_AddDirtyRect(LPDIRECT3DTEXTU
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DVolumeTexture8) Direct3DVolumeTexture8_Vtbl; extern IDirect3DVolumeTexture8Vtbl Direct3DVolumeTexture8_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DVolumeTexture8 implementation structure * IDirect3DVolumeTexture8 implementation structure
@ -1077,7 +1077,7 @@ typedef struct SAVEDSTATES {
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
/*extern ICOM_VTABLE(IDirect3DStateBlock9) Direct3DStateBlock9_Vtbl;*/ /*extern IDirect3DStateBlock9Vtbl Direct3DStateBlock9_Vtbl;*/
/***************************************************************************** /*****************************************************************************
* IDirect3DStateBlock implementation structure * IDirect3DStateBlock implementation structure
@ -1166,7 +1166,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_CaptureStateBlock(IDirect3DDevice8Impl
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
/*extern ICOM_VTABLE(IDirect3DVertexShaderDeclaration9) Direct3DVertexShaderDeclaration9_Vtbl;*/ /*extern IDirect3DVertexShaderDeclaration9Vtbl Direct3DVertexShaderDeclaration9_Vtbl;*/
/***************************************************************************** /*****************************************************************************
* IDirect3DVertexShaderDeclaration implementation structure * IDirect3DVertexShaderDeclaration implementation structure
@ -1203,7 +1203,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_CreateVertexShaderDeclaration8(IDirect
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
/*extern ICOM_VTABLE(IDirect3DVertexShader9) Direct3DVertexShader9_Vtbl;*/ /*extern IDirect3DVertexShader9Vtbl Direct3DVertexShader9_Vtbl;*/
/***************************************************************************** /*****************************************************************************
* IDirect3DVertexShader implementation structure * IDirect3DVertexShader implementation structure
@ -1252,7 +1252,7 @@ extern HRESULT WINAPI IDirect3DDeviceImpl_FillVertexShaderInputArbHW(IDirect3DDe
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
/*extern ICOM_VTABLE(IDirect3DPixelShader9) Direct3DPixelShader9_Vtbl;*/ /*extern IDirect3DPixelShader9Vtbl Direct3DPixelShader9_Vtbl;*/
/***************************************************************************** /*****************************************************************************
* IDirect3DPixelShader implementation structure * IDirect3DPixelShader implementation structure

2
dlls/d3d8/device.c
View File

@ -4343,7 +4343,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_GetStreamSource(LPDIRECT3DDEVICE8 iface, U
} }
ICOM_VTABLE(IDirect3DDevice8) Direct3DDevice8_Vtbl = IDirect3DDevice8Vtbl Direct3DDevice8_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DDevice8Impl_QueryInterface, IDirect3DDevice8Impl_QueryInterface,

2
dlls/d3d8/directx.c
View File

@ -1479,7 +1479,7 @@ HRESULT WINAPI IDirect3D8Impl_CreateDevice (LPDIRECT3D8 iface,
return D3D_OK; return D3D_OK;
} }
ICOM_VTABLE(IDirect3D8) Direct3D8_Vtbl = IDirect3D8Vtbl Direct3D8_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3D8Impl_QueryInterface, IDirect3D8Impl_QueryInterface,

2
dlls/d3d8/indexbuffer.c
View File

@ -125,7 +125,7 @@ HRESULT WINAPI IDirect3DIndexBuffer8Impl_GetDesc(LPDIRECT3DINDEXBUFFER8
return D3D_OK; return D3D_OK;
} }
ICOM_VTABLE(IDirect3DIndexBuffer8) Direct3DIndexBuffer8_Vtbl = IDirect3DIndexBuffer8Vtbl Direct3DIndexBuffer8_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DIndexBuffer8Impl_QueryInterface, IDirect3DIndexBuffer8Impl_QueryInterface,

2
dlls/d3d8/resource.c
View File

@ -127,7 +127,7 @@ D3DPOOL WINAPI IDirect3DResource8Impl_GetPool(LPDIRECT3DRESOURCE8 iface) {
} }
} }
ICOM_VTABLE(IDirect3DResource8) Direct3DResource8_Vtbl = IDirect3DResource8Vtbl Direct3DResource8_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DResource8Impl_QueryInterface, IDirect3DResource8Impl_QueryInterface,

2
dlls/d3d8/surface.c
View File

@ -461,7 +461,7 @@ unlock_end:
} }
ICOM_VTABLE(IDirect3DSurface8) Direct3DSurface8_Vtbl = IDirect3DSurface8Vtbl Direct3DSurface8_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DSurface8Impl_QueryInterface, IDirect3DSurface8Impl_QueryInterface,

2
dlls/d3d8/swapchain.c
View File

@ -86,7 +86,7 @@ HRESULT WINAPI IDirect3DSwapChain8Impl_GetBackBuffer(LPDIRECT3DSWAPCHAIN8 iface,
return D3D_OK; return D3D_OK;
} }
ICOM_VTABLE(IDirect3DSwapChain8) Direct3DSwapChain8_Vtbl = IDirect3DSwapChain8Vtbl Direct3DSwapChain8_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DSwapChain8Impl_QueryInterface, IDirect3DSwapChain8Impl_QueryInterface,

2
dlls/d3d8/texture.c
View File

@ -233,7 +233,7 @@ HRESULT WINAPI IDirect3DTexture8Impl_AddDirtyRect(LPDIRECT3DTEXTURE8 ifa
} }
ICOM_VTABLE(IDirect3DTexture8) Direct3DTexture8_Vtbl = IDirect3DTexture8Vtbl Direct3DTexture8_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DTexture8Impl_QueryInterface, IDirect3DTexture8Impl_QueryInterface,

2
dlls/d3d8/vertexbuffer.c
View File

@ -130,7 +130,7 @@ HRESULT WINAPI IDirect3DVertexBuffer8Impl_GetDesc(LPDIRECT3DVERTEXBUFFER
return D3D_OK; return D3D_OK;
} }
ICOM_VTABLE(IDirect3DVertexBuffer8) Direct3DVertexBuffer8_Vtbl = IDirect3DVertexBuffer8Vtbl Direct3DVertexBuffer8_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DVertexBuffer8Impl_QueryInterface, IDirect3DVertexBuffer8Impl_QueryInterface,

2
dlls/d3d8/volume.c
View File

@ -185,7 +185,7 @@ HRESULT WINAPI IDirect3DVolume8Impl_UnlockBox(LPDIRECT3DVOLUME8 iface) {
} }
ICOM_VTABLE(IDirect3DVolume8) Direct3DVolume8_Vtbl = IDirect3DVolume8Vtbl Direct3DVolume8_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DVolume8Impl_QueryInterface, IDirect3DVolume8Impl_QueryInterface,

2
dlls/d3d8/volumetexture.c
View File

@ -257,7 +257,7 @@ HRESULT WINAPI IDirect3DVolumeTexture8Impl_AddDirtyBox(LPDIRECT3DVOLUMET
} }
ICOM_VTABLE(IDirect3DVolumeTexture8) Direct3DVolumeTexture8_Vtbl = IDirect3DVolumeTexture8Vtbl Direct3DVolumeTexture8_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DVolumeTexture8Impl_QueryInterface, IDirect3DVolumeTexture8Impl_QueryInterface,

2
dlls/d3d9/basetexture.c
View File

@ -149,7 +149,7 @@ void WINAPI IDirect3DBaseTexture9Impl_GenerateMipSubLevels(LPDIRECT3DBASETEXTURE
} }
ICOM_VTABLE(IDirect3DBaseTexture9) Direct3DBaseTexture9_Vtbl = IDirect3DBaseTexture9Vtbl Direct3DBaseTexture9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DBaseTexture9Impl_QueryInterface, IDirect3DBaseTexture9Impl_QueryInterface,

2
dlls/d3d9/cubetexture.c
View File

@ -220,7 +220,7 @@ HRESULT WINAPI IDirect3DCubeTexture9Impl_AddDirtyRect(LPDIRECT3DCUBETEXTURE9 if
} }
ICOM_VTABLE(IDirect3DCubeTexture9) Direct3DCubeTexture9_Vtbl = IDirect3DCubeTexture9Vtbl Direct3DCubeTexture9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DCubeTexture9Impl_QueryInterface, IDirect3DCubeTexture9Impl_QueryInterface,

34
dlls/d3d9/d3d9_private.h
View File

@ -169,7 +169,7 @@ typedef struct D3DSHADERVECTORI {
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3D9) Direct3D9_Vtbl; extern IDirect3D9Vtbl Direct3D9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3D implementation structure * IDirect3D implementation structure
@ -214,7 +214,7 @@ extern HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adap
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DDevice9) Direct3DDevice9_Vtbl; extern IDirect3DDevice9Vtbl Direct3DDevice9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DDevice9 implementation structure * IDirect3DDevice9 implementation structure
@ -419,7 +419,7 @@ extern HRESULT WINAPI IDirect3DDevice9Impl_CreateQuery(LPDIRECT3DDEVICE9 iface
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DVolume9) Direct3DVolume9_Vtbl; extern IDirect3DVolume9Vtbl Direct3DVolume9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DVolume9 implementation structure * IDirect3DVolume9 implementation structure
@ -470,7 +470,7 @@ extern HRESULT WINAPI IDirect3DVolume9Impl_UnlockBox(LPDIRECT3DVOLUME9 iface);
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DSwapChain9) Direct3DSwapChain9_Vtbl; extern IDirect3DSwapChain9Vtbl Direct3DSwapChain9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DSwapChain9 implementation structure * IDirect3DSwapChain9 implementation structure
@ -511,7 +511,7 @@ extern HRESULT WINAPI IDirect3DSwapChain9Impl_GetPresentParameters(LPDIRECT3DSWA
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DResource9) Direct3DResource9_Vtbl; extern IDirect3DResource9Vtbl Direct3DResource9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DResource9 implementation structure * IDirect3DResource9 implementation structure
@ -550,7 +550,7 @@ extern D3DRESOURCETYPE WINAPI IDirect3DResource9Impl_GetType(LPDIRECT3DRESOURCE9
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DSurface9) Direct3DSurface9_Vtbl; extern IDirect3DSurface9Vtbl Direct3DSurface9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DSurface9 implementation structure * IDirect3DSurface9 implementation structure
@ -610,7 +610,7 @@ extern HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(LPDIRECT3DSURFACE9 iface,
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DVertexBuffer9) Direct3DVertexBuffer9_Vtbl; extern IDirect3DVertexBuffer9Vtbl Direct3DVertexBuffer9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DVertexBuffer9 implementation structure * IDirect3DVertexBuffer9 implementation structure
@ -658,7 +658,7 @@ extern HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDesc(LPDIRECT3DVERTE
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DIndexBuffer9) Direct3DIndexBuffer9_Vtbl; extern IDirect3DIndexBuffer9Vtbl Direct3DIndexBuffer9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DIndexBuffer9 implementation structure * IDirect3DIndexBuffer9 implementation structure
@ -706,7 +706,7 @@ extern HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetDesc(LPDIRECT3DINDEXB
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DBaseTexture9) Direct3DBaseTexture9_Vtbl; extern IDirect3DBaseTexture9Vtbl Direct3DBaseTexture9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DBaseTexture9 implementation structure * IDirect3DBaseTexture9 implementation structure
@ -758,7 +758,7 @@ extern void WINAPI IDirect3DBaseTexture9Impl_GenerateMipSubLevels(LPD
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DCubeTexture9) Direct3DCubeTexture9_Vtbl; extern IDirect3DCubeTexture9Vtbl Direct3DCubeTexture9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DCubeTexture9 implementation structure * IDirect3DCubeTexture9 implementation structure
@ -822,7 +822,7 @@ extern HRESULT WINAPI IDirect3DCubeTexture9Impl_AddDirtyRect(LPDIRECT3DC
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DTexture9) Direct3DTexture9_Vtbl; extern IDirect3DTexture9Vtbl Direct3DTexture9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DTexture9 implementation structure * IDirect3DTexture9 implementation structure
@ -887,7 +887,7 @@ extern HRESULT WINAPI IDirect3DTexture9Impl_AddDirtyRect(LPDIRECT3DTEXTU
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DVolumeTexture9) Direct3DVolumeTexture9_Vtbl; extern IDirect3DVolumeTexture9Vtbl Direct3DVolumeTexture9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DVolumeTexture9 implementation structure * IDirect3DVolumeTexture9 implementation structure
@ -953,7 +953,7 @@ extern HRESULT WINAPI IDirect3DVolumeTexture9Impl_AddDirtyBox(LPDIRECT3D
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DStateBlock9) Direct3DStateBlock9_Vtbl; extern IDirect3DStateBlock9Vtbl Direct3DStateBlock9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DStateBlock9 implementation structure * IDirect3DStateBlock9 implementation structure
@ -1051,7 +1051,7 @@ extern HRESULT WINAPI IDirect3DStateBlock9Impl_Apply(LPDIRECT3DSTATEBLOC
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DVertexDeclaration9) Direct3DVertexDeclaration9_Vtbl; extern IDirect3DVertexDeclaration9Vtbl Direct3DVertexDeclaration9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DVertexShaderDeclaration implementation structure * IDirect3DVertexShaderDeclaration implementation structure
@ -1090,7 +1090,7 @@ extern HRESULT WINAPI IDirect3DVertexDeclaration9Impl_GetDeclaration(LPDIR
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DVertexShader9) Direct3DVertexShader9_Vtbl; extern IDirect3DVertexShader9Vtbl Direct3DVertexShader9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DVertexShader implementation structure * IDirect3DVertexShader implementation structure
@ -1132,7 +1132,7 @@ extern HRESULT WINAPI IDirect3DVertexShader9Impl_GetFunction(LPDIRECT3DV
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DPixelShader9) Direct3DPixelShader9_Vtbl; extern IDirect3DPixelShader9Vtbl Direct3DPixelShader9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DPixelShader implementation structure * IDirect3DPixelShader implementation structure
@ -1173,7 +1173,7 @@ extern HRESULT WINAPI IDirect3DPixelShader9Impl_GetFunction(LPDIRECT3DPI
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirect3DQuery9) Direct3DQuery9_Vtbl; extern IDirect3DQuery9Vtbl Direct3DQuery9_Vtbl;
/***************************************************************************** /*****************************************************************************
* IDirect3DPixelShader implementation structure * IDirect3DPixelShader implementation structure

2
dlls/d3d9/device.c
View File

@ -713,7 +713,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_DeletePatch(LPDIRECT3DDEVICE9 iface, UINT
} }
ICOM_VTABLE(IDirect3DDevice9) Direct3DDevice9_Vtbl = IDirect3DDevice9Vtbl Direct3DDevice9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DDevice9Impl_QueryInterface, IDirect3DDevice9Impl_QueryInterface,

2
dlls/d3d9/directx.c
View File

@ -164,7 +164,7 @@ HRESULT WINAPI IDirect3D9Impl_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3
return D3D_OK; return D3D_OK;
} }
ICOM_VTABLE(IDirect3D9) Direct3D9_Vtbl = IDirect3D9Vtbl Direct3D9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3D9Impl_QueryInterface, IDirect3D9Impl_QueryInterface,

2
dlls/d3d9/indexbuffer.c
View File

@ -134,7 +134,7 @@ HRESULT WINAPI IDirect3DIndexBuffer9Impl_GetDesc(LPDIRECT3DINDEXBUFFER9
} }
ICOM_VTABLE(IDirect3DIndexBuffer9) Direct3DIndexBuffer9_Vtbl = IDirect3DIndexBuffer9Vtbl Direct3DIndexBuffer9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DIndexBuffer9Impl_QueryInterface, IDirect3DIndexBuffer9Impl_QueryInterface,

2
dlls/d3d9/pixelshader.c
View File

@ -83,7 +83,7 @@ HRESULT WINAPI IDirect3DPixelShader9Impl_GetFunction(LPDIRECT3DPIXELSHADER9 ifac
} }
ICOM_VTABLE(IDirect3DPixelShader9) Direct3DPixelShader9_Vtbl = IDirect3DPixelShader9Vtbl Direct3DPixelShader9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DPixelShader9Impl_QueryInterface, IDirect3DPixelShader9Impl_QueryInterface,

2
dlls/d3d9/query.c
View File

@ -101,7 +101,7 @@ HRESULT WINAPI IDirect3DQuery9Impl_GetData(LPDIRECT3DQUERY9 iface, void* pData,
} }
ICOM_VTABLE(IDirect3DQuery9) Direct3DQuery9_Vtbl = IDirect3DQuery9Vtbl Direct3DQuery9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DQuery9Impl_QueryInterface, IDirect3DQuery9Impl_QueryInterface,

2
dlls/d3d9/resource.c
View File

@ -117,7 +117,7 @@ D3DRESOURCETYPE WINAPI IDirect3DResource9Impl_GetType(LPDIRECT3DRESOURCE9 iface)
} }
ICOM_VTABLE(IDirect3DResource9) Direct3DResource9_Vtbl = IDirect3DResource9Vtbl Direct3DResource9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DResource9Impl_QueryInterface, IDirect3DResource9Impl_QueryInterface,

2
dlls/d3d9/stateblock.c
View File

@ -89,7 +89,7 @@ HRESULT WINAPI IDirect3DStateBlock9Impl_Apply(LPDIRECT3DSTATEBLOCK9 iface) {
} }
ICOM_VTABLE(IDirect3DStateBlock9) Direct3DStateBlock9_Vtbl = IDirect3DStateBlock9Vtbl Direct3DStateBlock9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DStateBlock9Impl_QueryInterface, IDirect3DStateBlock9Impl_QueryInterface,

2
dlls/d3d9/surface.c
View File

@ -163,7 +163,7 @@ HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(LPDIRECT3DSURFACE9 iface, HDC hdc
} }
ICOM_VTABLE(IDirect3DSurface9) Direct3DSurface9_Vtbl = IDirect3DSurface9Vtbl Direct3DSurface9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DSurface9Impl_QueryInterface, IDirect3DSurface9Impl_QueryInterface,

2
dlls/d3d9/swapchain.c
View File

@ -117,7 +117,7 @@ HRESULT WINAPI IDirect3DSwapChain9Impl_GetPresentParameters(LPDIRECT3DSWAPCHAIN9
} }
ICOM_VTABLE(IDirect3DSwapChain9) Direct3DSwapChain9_Vtbl = IDirect3DSwapChain9Vtbl Direct3DSwapChain9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DSwapChain9Impl_QueryInterface, IDirect3DSwapChain9Impl_QueryInterface,

2
dlls/d3d9/texture.c
View File

@ -213,7 +213,7 @@ HRESULT WINAPI IDirect3DTexture9Impl_AddDirtyRect(LPDIRECT3DTEXTURE9 iface, CONS
} }
ICOM_VTABLE(IDirect3DTexture9) Direct3DTexture9_Vtbl = IDirect3DTexture9Vtbl Direct3DTexture9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DTexture9Impl_QueryInterface, IDirect3DTexture9Impl_QueryInterface,

2
dlls/d3d9/vertexbuffer.c
View File

@ -134,7 +134,7 @@ HRESULT WINAPI IDirect3DVertexBuffer9Impl_GetDesc(LPDIRECT3DVERTEXBUFFER9 iface,
} }
ICOM_VTABLE(IDirect3DVertexBuffer9) Direct3DVertexBuffer9_Vtbl = IDirect3DVertexBuffer9Vtbl Direct3DVertexBuffer9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DVertexBuffer9Impl_QueryInterface, IDirect3DVertexBuffer9Impl_QueryInterface,

2
dlls/d3d9/vertexdeclaration.c
View File

@ -83,7 +83,7 @@ HRESULT WINAPI IDirect3DVertexDeclaration9Impl_GetDeclaration(LPDIRECT3DVERTEXDE
} }
ICOM_VTABLE(IDirect3DVertexDeclaration9) Direct3DVertexDeclaration9_Vtbl = IDirect3DVertexDeclaration9Vtbl Direct3DVertexDeclaration9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DVertexDeclaration9Impl_QueryInterface, IDirect3DVertexDeclaration9Impl_QueryInterface,

2
dlls/d3d9/vertexshader.c
View File

@ -83,7 +83,7 @@ HRESULT WINAPI IDirect3DVertexShader9Impl_GetFunction(LPDIRECT3DVERTEXSHADER9 if
} }
ICOM_VTABLE(IDirect3DVertexShader9) Direct3DVertexShader9_Vtbl = IDirect3DVertexShader9Vtbl Direct3DVertexShader9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DVertexShader9Impl_QueryInterface, IDirect3DVertexShader9Impl_QueryInterface,

2
dlls/d3d9/volume.c
View File

@ -126,7 +126,7 @@ HRESULT WINAPI IDirect3DVolume9Impl_UnlockBox(LPDIRECT3DVOLUME9 iface) {
} }
ICOM_VTABLE(IDirect3DVolume9) Direct3DVolume9_Vtbl = IDirect3DVolume9Vtbl Direct3DVolume9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DVolume9Impl_QueryInterface, IDirect3DVolume9Impl_QueryInterface,

2
dlls/d3d9/volumetexture.c
View File

@ -217,7 +217,7 @@ HRESULT WINAPI IDirect3DVolumeTexture9Impl_AddDirtyBox(LPDIRECT3DVOLUMETEXTURE9
} }
ICOM_VTABLE(IDirect3DVolumeTexture9) Direct3DVolumeTexture9_Vtbl = IDirect3DVolumeTexture9Vtbl Direct3DVolumeTexture9_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirect3DVolumeTexture9Impl_QueryInterface, IDirect3DVolumeTexture9Impl_QueryInterface,

4
dlls/d3dx8/d3dx8core_private.h
View File

@ -38,7 +38,7 @@ typedef struct ID3DXFontImpl ID3DXFontImpl;
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(ID3DXBuffer) D3DXBuffer_Vtbl; extern ID3DXBufferVtbl D3DXBuffer_Vtbl;
/***************************************************************************** /*****************************************************************************
* ID3DXBufferImpl implementation structure * ID3DXBufferImpl implementation structure
@ -70,7 +70,7 @@ extern DWORD WINAPI ID3DXBufferImpl_GetBufferSize(LPD3DXBUFFER iface);
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(ID3DXFont) D3DXFont_Vtbl; extern ID3DXFontVtbl D3DXFont_Vtbl;
/***************************************************************************** /*****************************************************************************
* ID3DXFontImpl implementation structure * ID3DXFontImpl implementation structure

2
dlls/d3dx8/d3dxbuffer.c
View File

@ -77,7 +77,7 @@ DWORD WINAPI ID3DXBufferImpl_GetBufferSize(LPD3DXBUFFER iface) {
return This->bufferSize; return This->bufferSize;
} }
ICOM_VTABLE(ID3DXBuffer) D3DXBuffer_Vtbl = ID3DXBufferVtbl D3DXBuffer_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ID3DXBufferImpl_QueryInterface, ID3DXBufferImpl_QueryInterface,

28
dlls/d3dxof/d3dxof.c
View File

@ -32,13 +32,13 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3dxof); WINE_DEFAULT_DEBUG_CHANNEL(d3dxof);
static struct ICOM_VTABLE(IDirectXFile) IDirectXFile_Vtbl; static struct IDirectXFileVtbl IDirectXFile_Vtbl;
static struct ICOM_VTABLE(IDirectXFileBinary) IDirectXFileBinary_Vtbl; static struct IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl;
static struct ICOM_VTABLE(IDirectXFileData) IDirectXFileData_Vtbl; static struct IDirectXFileDataVtbl IDirectXFileData_Vtbl;
static struct ICOM_VTABLE(IDirectXFileDataReference) IDirectXFileDataReference_Vtbl; static struct IDirectXFileDataReferenceVtbl IDirectXFileDataReference_Vtbl;
static struct ICOM_VTABLE(IDirectXFileEnumObject) IDirectXFileEnumObject_Vtbl; static struct IDirectXFileEnumObjectVtbl IDirectXFileEnumObject_Vtbl;
static struct ICOM_VTABLE(IDirectXFileObject) IDirectXFileObject_Vtbl; static struct IDirectXFileObjectVtbl IDirectXFileObject_Vtbl;
static struct ICOM_VTABLE(IDirectXFileSaveObject) IDirectXFileSaveObject_Vtbl; static struct IDirectXFileSaveObjectVtbl IDirectXFileSaveObject_Vtbl;
HRESULT IDirectXFileImpl_Create(IUnknown* pUnkOuter, LPVOID* ppObj) HRESULT IDirectXFileImpl_Create(IUnknown* pUnkOuter, LPVOID* ppObj)
{ {
@ -139,7 +139,7 @@ static HRESULT WINAPI IDirectXFileImpl_RegisterTemplates(IDirectXFile* iface, LP
return S_FALSE; return S_FALSE;
} }
static ICOM_VTABLE(IDirectXFile) IDirectXFile_Vtbl = static IDirectXFileVtbl IDirectXFile_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectXFileImpl_QueryInterface, IDirectXFileImpl_QueryInterface,
@ -256,7 +256,7 @@ static HRESULT WINAPI IDirectXFileBinaryImpl_Read(IDirectXFileBinary* iface, LPV
return S_FALSE; return S_FALSE;
} }
static ICOM_VTABLE(IDirectXFileBinary) IDirectXFileBinary_Vtbl = static IDirectXFileBinaryVtbl IDirectXFileBinary_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectXFileBinaryImpl_QueryInterface, IDirectXFileBinaryImpl_QueryInterface,
@ -402,7 +402,7 @@ static HRESULT WINAPI IDirectXFileDataImpl_AddBinaryObject(IDirectXFileData* ifa
return S_FALSE; return S_FALSE;
} }
static ICOM_VTABLE(IDirectXFileData) IDirectXFileData_Vtbl = static IDirectXFileDataVtbl IDirectXFileData_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectXFileDataImpl_QueryInterface, IDirectXFileDataImpl_QueryInterface,
@ -505,7 +505,7 @@ static HRESULT WINAPI IDirectXFileDataReferenceImpl_Resolve(IDirectXFileDataRefe
return S_FALSE; return S_FALSE;
} }
static ICOM_VTABLE(IDirectXFileDataReference) IDirectXFileDataReference_Vtbl = static IDirectXFileDataReferenceVtbl IDirectXFileDataReference_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectXFileDataReferenceImpl_QueryInterface, IDirectXFileDataReferenceImpl_QueryInterface,
@ -609,7 +609,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectByName(IDirectXFil
return S_FALSE; return S_FALSE;
} }
static ICOM_VTABLE(IDirectXFileEnumObject) IDirectXFileEnumObject_Vtbl = static IDirectXFileEnumObjectVtbl IDirectXFileEnumObject_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectXFileEnumObjectImpl_QueryInterface, IDirectXFileEnumObjectImpl_QueryInterface,
@ -696,7 +696,7 @@ static HRESULT WINAPI IDirectXFileObjectImpl_GetId(IDirectXFileObject* iface, LP
return S_FALSE; return S_FALSE;
} }
static ICOM_VTABLE(IDirectXFileObject) IDirectXFileObject_Vtbl = static IDirectXFileObjectVtbl IDirectXFileObject_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectXFileObjectImpl_QueryInterface, IDirectXFileObjectImpl_QueryInterface,
@ -790,7 +790,7 @@ static HRESULT WINAPI IDirectXFileSaveObjectImpl_SaveData(IDirectXFileSaveObject
return S_FALSE; return S_FALSE;
} }
static ICOM_VTABLE(IDirectXFileSaveObject) IDirectXFileSaveObject_Vtbl = static IDirectXFileSaveObjectVtbl IDirectXFileSaveObject_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectXFileSaveObjectImpl_QueryInterface, IDirectXFileSaveObjectImpl_QueryInterface,

2
dlls/d3dxof/main.c
View File

@ -141,7 +141,7 @@ static HRESULT WINAPI XFCF_LockServer(LPCLASSFACTORY iface, BOOL dolock)
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) XFCF_Vtbl = static IClassFactoryVtbl XFCF_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XFCF_QueryInterface, XFCF_QueryInterface,

8
dlls/ddraw/d3ddevice/mesa.c
View File

@ -2570,7 +2570,7 @@ GL_IDirect3DDeviceImpl_7_SetViewport(LPDIRECT3DDEVICE7 iface,
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3DDevice7) VTABLE_IDirect3DDevice7 = IDirect3DDevice7Vtbl VTABLE_IDirect3DDevice7 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Main_IDirect3DDeviceImpl_7_3T_2T_1T_QueryInterface, XCAST(QueryInterface) Main_IDirect3DDeviceImpl_7_3T_2T_1T_QueryInterface,
@ -2635,7 +2635,7 @@ ICOM_VTABLE(IDirect3DDevice7) VTABLE_IDirect3DDevice7 =
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3DDevice3) VTABLE_IDirect3DDevice3 = IDirect3DDevice3Vtbl VTABLE_IDirect3DDevice3 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Thunk_IDirect3DDeviceImpl_3_QueryInterface, XCAST(QueryInterface) Thunk_IDirect3DDeviceImpl_3_QueryInterface,
@ -2693,7 +2693,7 @@ ICOM_VTABLE(IDirect3DDevice3) VTABLE_IDirect3DDevice3 =
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3DDevice2) VTABLE_IDirect3DDevice2 = IDirect3DDevice2Vtbl VTABLE_IDirect3DDevice2 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Thunk_IDirect3DDeviceImpl_2_QueryInterface, XCAST(QueryInterface) Thunk_IDirect3DDeviceImpl_2_QueryInterface,
@ -2742,7 +2742,7 @@ ICOM_VTABLE(IDirect3DDevice2) VTABLE_IDirect3DDevice2 =
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3DDevice) VTABLE_IDirect3DDevice = IDirect3DDeviceVtbl VTABLE_IDirect3DDevice =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Thunk_IDirect3DDeviceImpl_1_QueryInterface, XCAST(QueryInterface) Thunk_IDirect3DDeviceImpl_1_QueryInterface,

2
dlls/ddraw/d3dexecutebuffer.c
View File

@ -652,7 +652,7 @@ Main_IDirect3DExecuteBufferImpl_1_Optimize(LPDIRECT3DEXECUTEBUFFER iface,
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3DExecuteBuffer) VTABLE_IDirect3DExecuteBuffer = IDirect3DExecuteBufferVtbl VTABLE_IDirect3DExecuteBuffer =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Main_IDirect3DExecuteBufferImpl_1_QueryInterface, XCAST(QueryInterface) Main_IDirect3DExecuteBufferImpl_1_QueryInterface,

2
dlls/ddraw/d3dlight.c
View File

@ -207,7 +207,7 @@ GL_IDirect3DLightImpl_1_Release(LPDIRECT3DLIGHT iface)
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3DLight) VTABLE_IDirect3DLight = IDirect3DLightVtbl VTABLE_IDirect3DLight =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Main_IDirect3DLightImpl_1_QueryInterface, XCAST(QueryInterface) Main_IDirect3DLightImpl_1_QueryInterface,

6
dlls/ddraw/d3dmaterial.c
View File

@ -326,7 +326,7 @@ static void activate(IDirect3DMaterialImpl* This) {
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3DMaterial3) VTABLE_IDirect3DMaterial3 = IDirect3DMaterial3Vtbl VTABLE_IDirect3DMaterial3 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Main_IDirect3DMaterialImpl_3_2T_1T_QueryInterface, XCAST(QueryInterface) Main_IDirect3DMaterialImpl_3_2T_1T_QueryInterface,
@ -348,7 +348,7 @@ ICOM_VTABLE(IDirect3DMaterial3) VTABLE_IDirect3DMaterial3 =
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3DMaterial2) VTABLE_IDirect3DMaterial2 = IDirect3DMaterial2Vtbl VTABLE_IDirect3DMaterial2 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Thunk_IDirect3DMaterialImpl_2_QueryInterface, XCAST(QueryInterface) Thunk_IDirect3DMaterialImpl_2_QueryInterface,
@ -370,7 +370,7 @@ ICOM_VTABLE(IDirect3DMaterial2) VTABLE_IDirect3DMaterial2 =
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3DMaterial) VTABLE_IDirect3DMaterial = IDirect3DMaterialVtbl VTABLE_IDirect3DMaterial =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Thunk_IDirect3DMaterialImpl_1_QueryInterface, XCAST(QueryInterface) Thunk_IDirect3DMaterialImpl_1_QueryInterface,

4
dlls/ddraw/d3dtexture.c
View File

@ -825,7 +825,7 @@ Thunk_IDirect3DTextureImpl_1_Load(LPDIRECT3DTEXTURE iface,
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3DTexture2) VTABLE_IDirect3DTexture2 = IDirect3DTexture2Vtbl VTABLE_IDirect3DTexture2 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Thunk_IDirect3DTextureImpl_2_QueryInterface, XCAST(QueryInterface) Thunk_IDirect3DTextureImpl_2_QueryInterface,
@ -847,7 +847,7 @@ ICOM_VTABLE(IDirect3DTexture2) VTABLE_IDirect3DTexture2 =
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3DTexture) VTABLE_IDirect3DTexture = IDirect3DTextureVtbl VTABLE_IDirect3DTexture =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Thunk_IDirect3DTextureImpl_1_QueryInterface, XCAST(QueryInterface) Thunk_IDirect3DTextureImpl_1_QueryInterface,

4
dlls/ddraw/d3dvertexbuffer.c
View File

@ -469,7 +469,7 @@ GL_IDirect3DVertexBufferImpl_7_ProcessVerticesStrided(LPDIRECT3DVERTEXBUFFER7 if
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3DVertexBuffer7) VTABLE_IDirect3DVertexBuffer7 = IDirect3DVertexBuffer7Vtbl VTABLE_IDirect3DVertexBuffer7 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Main_IDirect3DVertexBufferImpl_7_1T_QueryInterface, XCAST(QueryInterface) Main_IDirect3DVertexBufferImpl_7_1T_QueryInterface,
@ -494,7 +494,7 @@ ICOM_VTABLE(IDirect3DVertexBuffer7) VTABLE_IDirect3DVertexBuffer7 =
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3DVertexBuffer) VTABLE_IDirect3DVertexBuffer = IDirect3DVertexBufferVtbl VTABLE_IDirect3DVertexBuffer =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Thunk_IDirect3DVertexBufferImpl_1_QueryInterface, XCAST(QueryInterface) Thunk_IDirect3DVertexBufferImpl_1_QueryInterface,

2
dlls/ddraw/d3dviewport.c
View File

@ -477,7 +477,7 @@ Main_IDirect3DViewportImpl_3_Clear2(LPDIRECT3DVIEWPORT3 iface,
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3DViewport3) VTABLE_IDirect3DViewport3 = IDirect3DViewport3Vtbl VTABLE_IDirect3DViewport3 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Main_IDirect3DViewportImpl_3_2_1_QueryInterface, XCAST(QueryInterface) Main_IDirect3DViewportImpl_3_2_1_QueryInterface,

4
dlls/ddraw/dclipper/main.c
View File

@ -42,7 +42,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
* DirectDrawCreateClipper (DDRAW.@) * DirectDrawCreateClipper (DDRAW.@)
*/ */
static ICOM_VTABLE(IDirectDrawClipper) DDRAW_Clipper_VTable; static IDirectDrawClipperVtbl DDRAW_Clipper_VTable;
HRESULT WINAPI DirectDrawCreateClipper( HRESULT WINAPI DirectDrawCreateClipper(
DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, LPUNKNOWN pUnkOuter DWORD dwFlags, LPDIRECTDRAWCLIPPER *lplpDDClipper, LPUNKNOWN pUnkOuter
@ -207,7 +207,7 @@ HRESULT WINAPI Main_DirectDrawClipper_IsClipListChanged(
return DD_OK; return DD_OK;
} }
static ICOM_VTABLE(IDirectDrawClipper) DDRAW_Clipper_VTable = static IDirectDrawClipperVtbl DDRAW_Clipper_VTable =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
Main_DirectDrawClipper_QueryInterface, Main_DirectDrawClipper_QueryInterface,

4
dlls/ddraw/ddraw/hal.c
View File

@ -45,7 +45,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
static ICOM_VTABLE(IDirectDraw7) HAL_DirectDraw_VTable; static IDirectDraw7Vtbl HAL_DirectDraw_VTable;
static DDVERSIONDATA hal_version; static DDVERSIONDATA hal_version;
static DD32BITDRIVERDATA hal_driverdata; 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 ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
Main_DirectDraw_QueryInterface, Main_DirectDraw_QueryInterface,

10
dlls/ddraw/ddraw/main.c
View File

@ -74,9 +74,9 @@
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
extern ICOM_VTABLE(IDirectDraw) DDRAW_IDirectDraw_VTable; extern IDirectDrawVtbl DDRAW_IDirectDraw_VTable;
extern ICOM_VTABLE(IDirectDraw2) DDRAW_IDirectDraw2_VTable; extern IDirectDraw2Vtbl DDRAW_IDirectDraw2_VTable;
extern ICOM_VTABLE(IDirectDraw4) DDRAW_IDirectDraw4_VTable; extern IDirectDraw4Vtbl DDRAW_IDirectDraw4_VTable;
static void DDRAW_UnsubclassWindow(IDirectDrawImpl* This); static void DDRAW_UnsubclassWindow(IDirectDrawImpl* This);
@ -1418,7 +1418,7 @@ void Uninit_DirectDraw_final_release(IDirectDrawImpl *This)
Main_DirectDraw_final_release(This); Main_DirectDraw_final_release(This);
} }
static ICOM_VTABLE(IDirectDraw7) Uninit_DirectDraw_VTable; static IDirectDraw7Vtbl Uninit_DirectDraw_VTable;
/* Not called from the vtable. */ /* Not called from the vtable. */
HRESULT Uninit_DirectDraw_Construct(IDirectDrawImpl *This, BOOL ex) HRESULT Uninit_DirectDraw_Construct(IDirectDrawImpl *This, BOOL ex)
@ -1658,7 +1658,7 @@ Uninit_DirectDraw_EvaluateMode(LPDIRECTDRAW7 iface, DWORD dwFlags,
return DDERR_NOTINITIALIZED; return DDERR_NOTINITIALIZED;
} }
static ICOM_VTABLE(IDirectDraw7) Uninit_DirectDraw_VTable = static IDirectDraw7Vtbl Uninit_DirectDraw_VTable =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
Main_DirectDraw_QueryInterface, Main_DirectDraw_QueryInterface,

6
dlls/ddraw/ddraw/thunks.c
View File

@ -942,7 +942,7 @@ IDirectDraw4Impl_GetDeviceIdentifier(LPDIRECTDRAW4 This,
return hr; return hr;
} }
ICOM_VTABLE(IDirectDraw) DDRAW_IDirectDraw_VTable = IDirectDrawVtbl DDRAW_IDirectDraw_VTable =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectDrawImpl_QueryInterface, IDirectDrawImpl_QueryInterface,
@ -970,7 +970,7 @@ ICOM_VTABLE(IDirectDraw) DDRAW_IDirectDraw_VTable =
IDirectDrawImpl_WaitForVerticalBlank, IDirectDrawImpl_WaitForVerticalBlank,
}; };
ICOM_VTABLE(IDirectDraw2) DDRAW_IDirectDraw2_VTable = IDirectDraw2Vtbl DDRAW_IDirectDraw2_VTable =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectDraw2Impl_QueryInterface, IDirectDraw2Impl_QueryInterface,
@ -999,7 +999,7 @@ ICOM_VTABLE(IDirectDraw2) DDRAW_IDirectDraw2_VTable =
IDirectDraw2Impl_GetAvailableVidMem IDirectDraw2Impl_GetAvailableVidMem
}; };
ICOM_VTABLE(IDirectDraw4) DDRAW_IDirectDraw4_VTable = IDirectDraw4Vtbl DDRAW_IDirectDraw4_VTable =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectDraw4Impl_QueryInterface, IDirectDraw4Impl_QueryInterface,

4
dlls/ddraw/ddraw/user.c
View File

@ -42,7 +42,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
static ICOM_VTABLE(IDirectDraw7) User_DirectDraw_VTable; static IDirectDraw7Vtbl User_DirectDraw_VTable;
static const DDDEVICEIDENTIFIER2 user_device = static const DDDEVICEIDENTIFIER2 user_device =
{ {
@ -525,7 +525,7 @@ User_DirectDraw_SetDisplayMode(LPDIRECTDRAW7 iface, DWORD dwWidth,
/* TestCooperativeLevel: generic? */ /* TestCooperativeLevel: generic? */
/* WaitForVerticalBlank: ??? */ /* WaitForVerticalBlank: ??? */
static ICOM_VTABLE(IDirectDraw7) User_DirectDraw_VTable = static IDirectDraw7Vtbl User_DirectDraw_VTable =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
Main_DirectDraw_QueryInterface, Main_DirectDraw_QueryInterface,

8
dlls/ddraw/direct3d/mesa.c
View File

@ -302,7 +302,7 @@ static void light_released(IDirectDrawImpl *This, GLenum light_num)
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3D7) VTABLE_IDirect3D7 = IDirect3D7Vtbl VTABLE_IDirect3D7 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Thunk_IDirect3DImpl_7_QueryInterface, XCAST(QueryInterface) Thunk_IDirect3DImpl_7_QueryInterface,
@ -326,7 +326,7 @@ ICOM_VTABLE(IDirect3D7) VTABLE_IDirect3D7 =
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3D3) VTABLE_IDirect3D3 = IDirect3D3Vtbl VTABLE_IDirect3D3 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Thunk_IDirect3DImpl_3_QueryInterface, XCAST(QueryInterface) Thunk_IDirect3DImpl_3_QueryInterface,
@ -354,7 +354,7 @@ ICOM_VTABLE(IDirect3D3) VTABLE_IDirect3D3 =
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3D2) VTABLE_IDirect3D2 = IDirect3D2Vtbl VTABLE_IDirect3D2 =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Thunk_IDirect3DImpl_2_QueryInterface, XCAST(QueryInterface) Thunk_IDirect3DImpl_2_QueryInterface,
@ -379,7 +379,7 @@ ICOM_VTABLE(IDirect3D2) VTABLE_IDirect3D2 =
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
ICOM_VTABLE(IDirect3D) VTABLE_IDirect3D = IDirect3DVtbl VTABLE_IDirect3D =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface) Thunk_IDirect3DImpl_1_QueryInterface, XCAST(QueryInterface) Thunk_IDirect3DImpl_1_QueryInterface,

4
dlls/ddraw/dpalette/hal.c
View File

@ -31,7 +31,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
static ICOM_VTABLE(IDirectDrawPalette) DDRAW_HAL_Palette_VTable; static IDirectDrawPaletteVtbl DDRAW_HAL_Palette_VTable;
/****************************************************************************** /******************************************************************************
* IDirectDrawPalette * IDirectDrawPalette
@ -125,7 +125,7 @@ void HAL_DirectDrawPalette_final_release(IDirectDrawPaletteImpl* This)
Main_DirectDrawPalette_final_release(This); Main_DirectDrawPalette_final_release(This);
} }
static ICOM_VTABLE(IDirectDrawPalette) DDRAW_HAL_Palette_VTable = static IDirectDrawPaletteVtbl DDRAW_HAL_Palette_VTable =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
Main_DirectDrawPalette_QueryInterface, Main_DirectDrawPalette_QueryInterface,

4
dlls/ddraw/dpalette/main.c
View File

@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
/* For unsigned x. 0 is not a power of 2. */ /* For unsigned x. 0 is not a power of 2. */
#define IS_POW_2(x) (((x) & ((x) - 1)) == 0) #define IS_POW_2(x) (((x) & ((x) - 1)) == 0)
static ICOM_VTABLE(IDirectDrawPalette) DDRAW_Main_Palette_VTable; static IDirectDrawPaletteVtbl DDRAW_Main_Palette_VTable;
/****************************************************************************** /******************************************************************************
* IDirectDrawPalette * 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 ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
Main_DirectDrawPalette_QueryInterface, Main_DirectDrawPalette_QueryInterface,

4
dlls/ddraw/dsurface/dib.c
View File

@ -40,7 +40,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
extern HBITMAP DIB_CreateDIBSection( HDC hdc, const BITMAPINFO *bmi, UINT usage, VOID **bits, extern HBITMAP DIB_CreateDIBSection( HDC hdc, const BITMAPINFO *bmi, UINT usage, VOID **bits,
HANDLE section, DWORD offset, DWORD ovr_pitch ); 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. */ /* 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 ) inline static int get_dib_width_bytes( int width, int depth )
@ -1356,7 +1356,7 @@ DIB_DirectDrawSurface_SetSurfaceDesc(LPDIRECTDRAWSURFACE7 iface,
/* UpdateOverlayDisplay: generic */ /* UpdateOverlayDisplay: generic */
/* UpdateOverlayZOrder: generic */ /* UpdateOverlayZOrder: generic */
static ICOM_VTABLE(IDirectDrawSurface7) DIB_IDirectDrawSurface7_VTable = static IDirectDrawSurface7Vtbl DIB_IDirectDrawSurface7_VTable =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
Main_DirectDrawSurface_QueryInterface, Main_DirectDrawSurface_QueryInterface,

4
dlls/ddraw/dsurface/fakezbuffer.c
View File

@ -46,7 +46,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); WINE_DEFAULT_DEBUG_CHANNEL(ddraw);
static ICOM_VTABLE(IDirectDrawSurface7) FakeZBuffer_IDirectDrawSurface7_VTable; static IDirectDrawSurface7Vtbl FakeZBuffer_IDirectDrawSurface7_VTable;
#ifdef HAVE_OPENGL #ifdef HAVE_OPENGL
static void zbuffer_lock_update(IDirectDrawSurfaceImpl* This, LPCRECT pRect, DWORD dwFlags) 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 ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
Main_DirectDrawSurface_QueryInterface, Main_DirectDrawSurface_QueryInterface,

2
dlls/ddraw/dsurface/gamma.c
View File

@ -70,7 +70,7 @@ DirectDrawGammaControl_SetGammaRamp(LPDIRECTDRAWGAMMACONTROL iface, DWORD dwFlag
return This->set_gamma_ramp(This, dwFlags, lpGammaRamp); return This->set_gamma_ramp(This, dwFlags, lpGammaRamp);
} }
ICOM_VTABLE(IDirectDrawGammaControl) DDRAW_IDDGC_VTable = IDirectDrawGammaControlVtbl DDRAW_IDDGC_VTable =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
DirectDrawGammaControl_QueryInterface, DirectDrawGammaControl_QueryInterface,

4
dlls/ddraw/dsurface/hal.c
View File

@ -35,7 +35,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(ddraw); 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, static HRESULT HAL_DirectDrawSurface_create_surface(IDirectDrawSurfaceImpl* This,
IDirectDrawImpl* pDD) IDirectDrawImpl* pDD)
@ -362,7 +362,7 @@ HWND HAL_DirectDrawSurface_get_display_window(IDirectDrawSurfaceImpl* This)
return 0; return 0;
} }
static ICOM_VTABLE(IDirectDrawSurface7) HAL_IDirectDrawSurface7_VTable = static IDirectDrawSurface7Vtbl HAL_IDirectDrawSurface7_VTable =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
Main_DirectDrawSurface_QueryInterface, Main_DirectDrawSurface_QueryInterface,

2
dlls/ddraw/dsurface/main.h
View File

@ -45,7 +45,7 @@ typedef struct PrivateData
DWORD size; DWORD size;
} PrivateData; } PrivateData;
extern ICOM_VTABLE(IDirectDrawGammaControl) DDRAW_IDDGC_VTable; extern IDirectDrawGammaControlVtbl DDRAW_IDDGC_VTable;
/* Non-interface functions */ /* Non-interface functions */
HRESULT HRESULT

2
dlls/ddraw/dsurface/thunks.c
View File

@ -390,7 +390,7 @@ IDirectDrawSurface3Impl_SetSurfaceDesc(LPDIRECTDRAWSURFACE3 This,
dwFlags); dwFlags);
} }
ICOM_VTABLE(IDirectDrawSurface3) DDRAW_IDDS3_Thunk_VTable = IDirectDrawSurface3Vtbl DDRAW_IDDS3_Thunk_VTable =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectDrawSurface3Impl_QueryInterface, IDirectDrawSurface3Impl_QueryInterface,

2
dlls/ddraw/dsurface/thunks.h
View File

@ -19,6 +19,6 @@
#ifndef DDRAW_DSURFACE_THUNKS_H_INCLUDED #ifndef DDRAW_DSURFACE_THUNKS_H_INCLUDED
#define 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 #endif

4
dlls/ddraw/dsurface/user.c
View File

@ -52,7 +52,7 @@ static void User_copy_to_screen(IDirectDrawSurfaceImpl* This, LPCRECT rc);
static HWND get_display_window(IDirectDrawSurfaceImpl* This, LPPOINT pt); static HWND get_display_window(IDirectDrawSurfaceImpl* This, LPPOINT pt);
static ICOM_VTABLE(IDirectDrawSurface7) User_IDirectDrawSurface7_VTable; static IDirectDrawSurface7Vtbl User_IDirectDrawSurface7_VTable;
HRESULT HRESULT
User_DirectDrawSurface_Construct(IDirectDrawSurfaceImpl* This, User_DirectDrawSurface_Construct(IDirectDrawSurfaceImpl* This,
@ -625,7 +625,7 @@ static void User_copy_from_screen(IDirectDrawSurfaceImpl* This, LPCRECT rc)
} }
#endif #endif
static ICOM_VTABLE(IDirectDrawSurface7) User_IDirectDrawSurface7_VTable = static IDirectDrawSurface7Vtbl User_IDirectDrawSurface7_VTable =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
Main_DirectDrawSurface_QueryInterface, Main_DirectDrawSurface_QueryInterface,

2
dlls/ddraw/main.c
View File

@ -515,7 +515,7 @@ static HRESULT WINAPI DDCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) DDCF_Vtbl = static IClassFactoryVtbl DDCF_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
DDCF_QueryInterface, DDCF_QueryInterface,

4
dlls/devenum/createdevenum.c
View File

@ -33,7 +33,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(devenum); WINE_DEFAULT_DEBUG_CHANNEL(devenum);
extern ICOM_VTABLE(IEnumMoniker) IEnumMoniker_Vtbl; extern IEnumMonikerVtbl IEnumMoniker_Vtbl;
extern HINSTANCE DEVENUM_hInstance; extern HINSTANCE DEVENUM_hInstance;
@ -190,7 +190,7 @@ HRESULT WINAPI DEVENUM_ICreateDevEnum_CreateClassEnumerator(
/********************************************************************** /**********************************************************************
* ICreateDevEnum_Vtbl * ICreateDevEnum_Vtbl
*/ */
static ICOM_VTABLE(ICreateDevEnum) ICreateDevEnum_Vtbl = static ICreateDevEnumVtbl ICreateDevEnum_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
DEVENUM_ICreateDevEnum_QueryInterface, DEVENUM_ICreateDevEnum_QueryInterface,

2
dlls/devenum/factory.c
View File

@ -139,7 +139,7 @@ static HRESULT WINAPI DEVENUM_IClassFactory_LockServer(
/********************************************************************** /**********************************************************************
* IClassFactory_Vtbl * IClassFactory_Vtbl
*/ */
static ICOM_VTABLE(IClassFactory) IClassFactory_Vtbl = static IClassFactoryVtbl IClassFactory_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
DEVENUM_IClassFactory_QueryInterface, DEVENUM_IClassFactory_QueryInterface,

6
dlls/devenum/mediacatenum.c
View File

@ -253,7 +253,7 @@ static HRESULT WINAPI DEVENUM_IPropertyBag_Write(
return res; return res;
} }
static ICOM_VTABLE(IPropertyBag) IPropertyBag_Vtbl = static IPropertyBagVtbl IPropertyBag_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
DEVENUM_IPropertyBag_QueryInterface, DEVENUM_IPropertyBag_QueryInterface,
@ -631,7 +631,7 @@ static HRESULT WINAPI DEVENUM_IMediaCatMoniker_IsSystemMoniker(
return S_FALSE; return S_FALSE;
} }
static ICOM_VTABLE(IMoniker) IMoniker_Vtbl = static IMonikerVtbl IMoniker_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
DEVENUM_IMediaCatMoniker_QueryInterface, DEVENUM_IMediaCatMoniker_QueryInterface,
@ -807,7 +807,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Clone(LPENUMMONIKER iface, IEnumMonik
/********************************************************************** /**********************************************************************
* IEnumMoniker_Vtbl * IEnumMoniker_Vtbl
*/ */
ICOM_VTABLE(IEnumMoniker) IEnumMoniker_Vtbl = IEnumMonikerVtbl IEnumMoniker_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
DEVENUM_IEnumMoniker_QueryInterface, DEVENUM_IEnumMoniker_QueryInterface,

2
dlls/devenum/parsedisplayname.c
View File

@ -167,7 +167,7 @@ static HRESULT WINAPI DEVENUM_IParseDisplayName_ParseDisplayName(
/********************************************************************** /**********************************************************************
* IParseDisplayName_Vtbl * IParseDisplayName_Vtbl
*/ */
static ICOM_VTABLE(IParseDisplayName) IParseDisplayName_Vtbl = static IParseDisplayNameVtbl IParseDisplayName_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
DEVENUM_IParseDisplayName_QueryInterface, DEVENUM_IParseDisplayName_QueryInterface,

18
dlls/dinput/dinput_main.c
View File

@ -44,10 +44,10 @@
WINE_DEFAULT_DEBUG_CHANNEL(dinput); WINE_DEFAULT_DEBUG_CHANNEL(dinput);
static ICOM_VTABLE(IDirectInput7A) ddi7avt; static IDirectInput7AVtbl ddi7avt;
static ICOM_VTABLE(IDirectInput7W) ddi7wvt; static IDirectInput7WVtbl ddi7wvt;
static ICOM_VTABLE(IDirectInput8A) ddi8avt; static IDirectInput8AVtbl ddi8avt;
static ICOM_VTABLE(IDirectInput8W) ddi8wvt; static IDirectInput8WVtbl ddi8wvt;
/* This array will be filled a dinput.so loading */ /* This array will be filled a dinput.so loading */
#define MAX_WINE_DINPUT_DEVICES 4 #define MAX_WINE_DINPUT_DEVICES 4
@ -542,7 +542,7 @@ static HRESULT WINAPI IDirectInput8WImpl_ConfigureDevices(
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
static ICOM_VTABLE(IDirectInput7A) ddi7avt = { static IDirectInput7AVtbl ddi7avt = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface)IDirectInputAImpl_QueryInterface, XCAST(QueryInterface)IDirectInputAImpl_QueryInterface,
XCAST(AddRef)IDirectInputAImpl_AddRef, XCAST(AddRef)IDirectInputAImpl_AddRef,
@ -563,7 +563,7 @@ static ICOM_VTABLE(IDirectInput7A) ddi7avt = {
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
static ICOM_VTABLE(IDirectInput7W) ddi7wvt = { static IDirectInput7WVtbl ddi7wvt = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface)IDirectInputWImpl_QueryInterface, XCAST(QueryInterface)IDirectInputWImpl_QueryInterface,
XCAST(AddRef)IDirectInputAImpl_AddRef, XCAST(AddRef)IDirectInputAImpl_AddRef,
@ -584,7 +584,7 @@ static ICOM_VTABLE(IDirectInput7W) ddi7wvt = {
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
static ICOM_VTABLE(IDirectInput8A) ddi8avt = { static IDirectInput8AVtbl ddi8avt = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface)IDirectInput8AImpl_QueryInterface, XCAST(QueryInterface)IDirectInput8AImpl_QueryInterface,
XCAST(AddRef)IDirectInputAImpl_AddRef, XCAST(AddRef)IDirectInputAImpl_AddRef,
@ -605,7 +605,7 @@ static ICOM_VTABLE(IDirectInput8A) ddi8avt = {
#else #else
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
static ICOM_VTABLE(IDirectInput8W) ddi8wvt = { static IDirectInput8WVtbl ddi8wvt = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
XCAST(QueryInterface)IDirectInput8WImpl_QueryInterface, XCAST(QueryInterface)IDirectInput8WImpl_QueryInterface,
XCAST(AddRef)IDirectInputAImpl_AddRef, XCAST(AddRef)IDirectInputAImpl_AddRef,
@ -677,7 +677,7 @@ static HRESULT WINAPI DICF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) DICF_Vtbl = { static IClassFactoryVtbl DICF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
DICF_QueryInterface, DICF_QueryInterface,
DICF_AddRef, DICF_AddRef,

8
dlls/dinput/joystick_linux.c
View File

@ -67,8 +67,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput);
#define WINE_JOYSTICK_BUTTON_BASE 8 #define WINE_JOYSTICK_BUTTON_BASE 8
typedef struct JoystickImpl JoystickImpl; typedef struct JoystickImpl JoystickImpl;
static ICOM_VTABLE(IDirectInputDevice8A) JoystickAvt; static IDirectInputDevice8AVtbl JoystickAvt;
static ICOM_VTABLE(IDirectInputDevice8W) JoystickWvt; static IDirectInputDevice8WVtbl JoystickWvt;
struct JoystickImpl struct JoystickImpl
{ {
LPVOID lpVtbl; LPVOID lpVtbl;
@ -638,7 +638,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface,
return DI_OK; return DI_OK;
} }
static ICOM_VTABLE(IDirectInputDevice8A) JoystickAvt = static IDirectInputDevice8AVtbl JoystickAvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectInputDevice2AImpl_QueryInterface, IDirectInputDevice2AImpl_QueryInterface,
@ -681,7 +681,7 @@ static ICOM_VTABLE(IDirectInputDevice8A) JoystickAvt =
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
static ICOM_VTABLE(IDirectInputDevice8W) SysJoystickWvt = static IDirectInputDevice8WVtbl SysJoystickWvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectInputDevice2WImpl_QueryInterface, IDirectInputDevice2WImpl_QueryInterface,

8
dlls/dinput/joystick_linuxinput.c
View File

@ -70,8 +70,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput);
#define WINE_JOYSTICK_BUTTON_BASE 8 #define WINE_JOYSTICK_BUTTON_BASE 8
typedef struct JoystickImpl JoystickImpl; typedef struct JoystickImpl JoystickImpl;
static ICOM_VTABLE(IDirectInputDevice8A) JoystickAvt; static IDirectInputDevice8AVtbl JoystickAvt;
static ICOM_VTABLE(IDirectInputDevice8W) JoystickWvt; static IDirectInputDevice8WVtbl JoystickWvt;
struct JoystickImpl struct JoystickImpl
{ {
LPVOID lpVtbl; LPVOID lpVtbl;
@ -998,7 +998,7 @@ static HRESULT WINAPI JoystickAImpl_GetProperty(LPDIRECTINPUTDEVICE8A iface,
return DI_OK; return DI_OK;
} }
static ICOM_VTABLE(IDirectInputDevice8A) JoystickAvt = static IDirectInputDevice8AVtbl JoystickAvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectInputDevice2AImpl_QueryInterface, IDirectInputDevice2AImpl_QueryInterface,
@ -1041,7 +1041,7 @@ static ICOM_VTABLE(IDirectInputDevice8A) JoystickAvt =
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
static ICOM_VTABLE(IDirectInputDevice8W) JoystickWvt = static IDirectInputDevice8WVtbl JoystickWvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectInputDevice2WImpl_QueryInterface, IDirectInputDevice2WImpl_QueryInterface,

8
dlls/dinput/keyboard.c
View File

@ -37,8 +37,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(dinput); WINE_DEFAULT_DEBUG_CHANNEL(dinput);
static ICOM_VTABLE(IDirectInputDevice8A) SysKeyboardAvt; static IDirectInputDevice8AVtbl SysKeyboardAvt;
static ICOM_VTABLE(IDirectInputDevice8W) SysKeyboardWvt; static IDirectInputDevice8WVtbl SysKeyboardWvt;
typedef struct SysKeyboardImpl SysKeyboardImpl; typedef struct SysKeyboardImpl SysKeyboardImpl;
struct SysKeyboardImpl struct SysKeyboardImpl
@ -695,7 +695,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface
return DI_OK; return DI_OK;
} }
static ICOM_VTABLE(IDirectInputDevice8A) SysKeyboardAvt = static IDirectInputDevice8AVtbl SysKeyboardAvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectInputDevice2AImpl_QueryInterface, IDirectInputDevice2AImpl_QueryInterface,
@ -738,7 +738,7 @@ static ICOM_VTABLE(IDirectInputDevice8A) SysKeyboardAvt =
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
static ICOM_VTABLE(IDirectInputDevice8W) SysKeyboardWvt = static IDirectInputDevice8WVtbl SysKeyboardWvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectInputDevice2WImpl_QueryInterface, IDirectInputDevice2WImpl_QueryInterface,

8
dlls/dinput/mouse.c
View File

@ -95,8 +95,8 @@ static const DIDATAFORMAT Wine_InternalMouseFormat = {
(LPDIOBJECTDATAFORMAT) Wine_InternalMouseObjectFormat (LPDIOBJECTDATAFORMAT) Wine_InternalMouseObjectFormat
}; };
static ICOM_VTABLE(IDirectInputDevice8A) SysMouseAvt; static IDirectInputDevice8AVtbl SysMouseAvt;
static ICOM_VTABLE(IDirectInputDevice8W) SysMouseWvt; static IDirectInputDevice8WVtbl SysMouseWvt;
typedef struct SysMouseImpl SysMouseImpl; 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 ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectInputDevice2AImpl_QueryInterface, IDirectInputDevice2AImpl_QueryInterface,
@ -1111,7 +1111,7 @@ static ICOM_VTABLE(IDirectInputDevice8A) SysMouseAvt =
# define XCAST(fun) (void*) # define XCAST(fun) (void*)
#endif #endif
static ICOM_VTABLE(IDirectInputDevice8W) SysMouseWvt = static IDirectInputDevice8WVtbl SysMouseWvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectInputDevice2WImpl_QueryInterface, IDirectInputDevice2WImpl_QueryInterface,

8
dlls/dmband/band.c
View File

@ -70,7 +70,7 @@ ULONG WINAPI IDirectMusicBandImpl_IUnknown_Release (LPUNKNOWN iface) {
return ref; return ref;
} }
ICOM_VTABLE(IUnknown) DirectMusicBand_Unknown_Vtbl = { IUnknownVtbl DirectMusicBand_Unknown_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicBandImpl_IUnknown_QueryInterface, IDirectMusicBandImpl_IUnknown_QueryInterface,
IDirectMusicBandImpl_IUnknown_AddRef, IDirectMusicBandImpl_IUnknown_AddRef,
@ -111,7 +111,7 @@ HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicBand_Unload (LPDIRECTMUSICBAND i
return S_OK; return S_OK;
} }
ICOM_VTABLE(IDirectMusicBand) DirectMusicBand_Band_Vtbl = { IDirectMusicBandVtbl DirectMusicBand_Band_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicBandImpl_IDirectMusicBand_QueryInterface, IDirectMusicBandImpl_IDirectMusicBand_QueryInterface,
IDirectMusicBandImpl_IDirectMusicBand_AddRef, IDirectMusicBandImpl_IDirectMusicBand_AddRef,
@ -327,7 +327,7 @@ HRESULT WINAPI IDirectMusicBandImpl_IDirectMusicObject_ParseDescriptor (LPDIRECT
return S_OK; return S_OK;
} }
ICOM_VTABLE(IDirectMusicObject) DirectMusicBand_Object_Vtbl = { IDirectMusicObjectVtbl DirectMusicBand_Object_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicBandImpl_IDirectMusicObject_QueryInterface, IDirectMusicBandImpl_IDirectMusicObject_QueryInterface,
IDirectMusicBandImpl_IDirectMusicObject_AddRef, IDirectMusicBandImpl_IDirectMusicObject_AddRef,
@ -668,7 +668,7 @@ HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_GetSizeMax (LPPERSISTSTREAM i
return E_NOTIMPL; return E_NOTIMPL;
} }
ICOM_VTABLE(IPersistStream) DirectMusicBand_PersistStream_Vtbl = { IPersistStreamVtbl DirectMusicBand_PersistStream_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicBandImpl_IPersistStream_QueryInterface, IDirectMusicBandImpl_IPersistStream_QueryInterface,
IDirectMusicBandImpl_IPersistStream_AddRef, IDirectMusicBandImpl_IPersistStream_AddRef,

6
dlls/dmband/bandtrack.c
View File

@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicBandTrack_IUnknown_Release (LPUNKNOWN iface) {
return ref; return ref;
} }
ICOM_VTABLE(IUnknown) DirectMusicBandTrack_Unknown_Vtbl = { IUnknownVtbl DirectMusicBandTrack_Unknown_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicBandTrack_IUnknown_QueryInterface, IDirectMusicBandTrack_IUnknown_QueryInterface,
IDirectMusicBandTrack_IUnknown_AddRef, IDirectMusicBandTrack_IUnknown_AddRef,
@ -203,7 +203,7 @@ HRESULT WINAPI IDirectMusicBandTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRACK8
return S_OK; return S_OK;
} }
ICOM_VTABLE(IDirectMusicTrack8) DirectMusicBandTrack_DirectMusicTrack_Vtbl = { IDirectMusicTrack8Vtbl DirectMusicBandTrack_DirectMusicTrack_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicBandTrack_IDirectMusicTrack_QueryInterface, IDirectMusicBandTrack_IDirectMusicTrack_QueryInterface,
IDirectMusicBandTrack_IDirectMusicTrack_AddRef, IDirectMusicBandTrack_IDirectMusicTrack_AddRef,
@ -567,7 +567,7 @@ HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM
return E_NOTIMPL; return E_NOTIMPL;
} }
ICOM_VTABLE(IPersistStream) DirectMusicBandTrack_PerststStream_Vtbl = { IPersistStreamVtbl DirectMusicBandTrack_PerststStream_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicBandTrack_IPersistStream_QueryInterface, IDirectMusicBandTrack_IPersistStream_QueryInterface,
IDirectMusicBandTrack_IPersistStream_AddRef, IDirectMusicBandTrack_IPersistStream_AddRef,

4
dlls/dmband/dmband_main.c
View File

@ -60,7 +60,7 @@ static HRESULT WINAPI BandCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) BandCF_Vtbl = { static IClassFactoryVtbl BandCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
BandCF_QueryInterface, BandCF_QueryInterface,
BandCF_AddRef, BandCF_AddRef,
@ -106,7 +106,7 @@ static HRESULT WINAPI BandTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) BandTrackCF_Vtbl = { static IClassFactoryVtbl BandTrackCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
BandTrackCF_QueryInterface, BandTrackCF_QueryInterface,
BandTrackCF_AddRef, BandTrackCF_AddRef,

28
dlls/dmband/dmband_private.h
View File

@ -51,14 +51,14 @@ typedef struct IDirectMusicBandTrack IDirectMusicBandTrack;
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IUnknown) DirectMusicBand_Uknown_Vtbl; extern IUnknownVtbl DirectMusicBand_Uknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicBand) DirectMusicBand_Band_Vtbl; extern IDirectMusicBandVtbl DirectMusicBand_Band_Vtbl;
extern ICOM_VTABLE(IDirectMusicObject) DirectMusicBand_Object_Vtbl; extern IDirectMusicObjectVtbl DirectMusicBand_Object_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicBand_PeristStream_Vtbl; extern IPersistStreamVtbl DirectMusicBand_PeristStream_Vtbl;
extern ICOM_VTABLE(IUnknown) DirectMusicBandTrack_Unknown_Vtbl; extern IUnknownVtbl DirectMusicBandTrack_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicBandTrack_DirectMusicTrack_Vtbl; extern IDirectMusicTrack8Vtbl DirectMusicBandTrack_DirectMusicTrack_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicBandTrack_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicBandTrack_PersistStream_Vtbl;
/***************************************************************************** /*****************************************************************************
* ClassFactory * ClassFactory
@ -99,10 +99,10 @@ typedef struct _DMUS_PRIVATE_BAND {
*/ */
struct IDirectMusicBandImpl { struct IDirectMusicBandImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicBand) *BandVtbl; IDirectMusicBandVtbl *BandVtbl;
ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; IDirectMusicObjectVtbl *ObjectVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicBandImpl fields */ /* IDirectMusicBandImpl fields */
@ -145,9 +145,9 @@ extern HRESULT WINAPI IDirectMusicBandImpl_IPersistStream_GetSizeMax (LPPERSISTS
*/ */
struct IDirectMusicBandTrack { struct IDirectMusicBandTrack {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; IDirectMusicTrack8Vtbl *TrackVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicBandTrack fields */ /* IDirectMusicBandTrack fields */

8
dlls/dmcompos/chordmap.c
View File

@ -68,7 +68,7 @@ ULONG WINAPI IDirectMusicChordMapImpl_IUnknown_Release (LPUNKNOWN iface) {
return ref; return ref;
} }
ICOM_VTABLE(IUnknown) DirectMusicChordMap_Unknown_Vtbl = { IUnknownVtbl DirectMusicChordMap_Unknown_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicChordMapImpl_IUnknown_QueryInterface, IDirectMusicChordMapImpl_IUnknown_QueryInterface,
IDirectMusicChordMapImpl_IUnknown_AddRef, IDirectMusicChordMapImpl_IUnknown_AddRef,
@ -97,7 +97,7 @@ HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicChordMap_GetScale (LPDIRECTM
return S_OK; return S_OK;
} }
ICOM_VTABLE(IDirectMusicChordMap) DirectMusicChordMap_ChordMap_Vtbl = { IDirectMusicChordMapVtbl DirectMusicChordMap_ChordMap_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicChordMapImpl_IDirectMusicChordMap_QueryInterface, IDirectMusicChordMapImpl_IDirectMusicChordMap_QueryInterface,
IDirectMusicChordMapImpl_IDirectMusicChordMap_AddRef, IDirectMusicChordMapImpl_IDirectMusicChordMap_AddRef,
@ -311,7 +311,7 @@ HRESULT WINAPI IDirectMusicChordMapImpl_IDirectMusicObject_ParseDescriptor (LPDI
return S_OK; return S_OK;
} }
ICOM_VTABLE(IDirectMusicObject) DirectMusicChordMap_Object_Vtbl = { IDirectMusicObjectVtbl DirectMusicChordMap_Object_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicChordMapImpl_IDirectMusicObject_QueryInterface, IDirectMusicChordMapImpl_IDirectMusicObject_QueryInterface,
IDirectMusicChordMapImpl_IDirectMusicObject_AddRef, IDirectMusicChordMapImpl_IDirectMusicObject_AddRef,
@ -501,7 +501,7 @@ HRESULT WINAPI IDirectMusicChordMapImpl_IPersistStream_GetSizeMax (LPPERSISTSTRE
return E_NOTIMPL; return E_NOTIMPL;
} }
ICOM_VTABLE(IPersistStream) DirectMusicChordMap_PersistStream_Vtbl = { IPersistStreamVtbl DirectMusicChordMap_PersistStream_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicChordMapImpl_IPersistStream_QueryInterface, IDirectMusicChordMapImpl_IPersistStream_QueryInterface,
IDirectMusicChordMapImpl_IPersistStream_AddRef, IDirectMusicChordMapImpl_IPersistStream_AddRef,

6
dlls/dmcompos/chordmaptrack.c
View File

@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicChordMapTrack_IUnknown_Release (LPUNKNOWN iface) {
return ref; return ref;
} }
ICOM_VTABLE(IUnknown) DirectMusicChordMapTrack_Unknown_Vtbl = { IUnknownVtbl DirectMusicChordMapTrack_Unknown_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicChordMapTrack_IUnknown_QueryInterface, IDirectMusicChordMapTrack_IUnknown_QueryInterface,
IDirectMusicChordMapTrack_IUnknown_AddRef, IDirectMusicChordMapTrack_IUnknown_AddRef,
@ -183,7 +183,7 @@ HRESULT WINAPI IDirectMusicChordMapTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTR
return S_OK; return S_OK;
} }
ICOM_VTABLE(IDirectMusicTrack8) DirectMusicChordMapTrack_Track_Vtbl = { IDirectMusicTrack8Vtbl DirectMusicChordMapTrack_Track_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicChordMapTrack_IDirectMusicTrack_QueryInterface, IDirectMusicChordMapTrack_IDirectMusicTrack_QueryInterface,
IDirectMusicChordMapTrack_IDirectMusicTrack_AddRef, IDirectMusicChordMapTrack_IDirectMusicTrack_AddRef,
@ -243,7 +243,7 @@ HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_GetSizeMax (LPPERSISTSTR
return E_NOTIMPL; return E_NOTIMPL;
} }
ICOM_VTABLE(IPersistStream) DirectMusicChordMapTrack_PersistStream_Vtbl = { IPersistStreamVtbl DirectMusicChordMapTrack_PersistStream_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicChordMapTrack_IPersistStream_QueryInterface, IDirectMusicChordMapTrack_IPersistStream_QueryInterface,
IDirectMusicChordMapTrack_IPersistStream_AddRef, IDirectMusicChordMapTrack_IPersistStream_AddRef,

2
dlls/dmcompos/composer.c
View File

@ -89,7 +89,7 @@ HRESULT WINAPI IDirectMusicComposerImpl_ChangeChordMap (LPDIRECTMUSICCOMPOSER if
return S_OK; return S_OK;
} }
ICOM_VTABLE(IDirectMusicComposer) DirectMusicComposer_Vtbl = { IDirectMusicComposerVtbl DirectMusicComposer_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicComposerImpl_QueryInterface, IDirectMusicComposerImpl_QueryInterface,
IDirectMusicComposerImpl_AddRef, IDirectMusicComposerImpl_AddRef,

10
dlls/dmcompos/dmcompos_main.c
View File

@ -59,7 +59,7 @@ static HRESULT WINAPI ChordMapCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) ChordMapCF_Vtbl = { static IClassFactoryVtbl ChordMapCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ChordMapCF_QueryInterface, ChordMapCF_QueryInterface,
ChordMapCF_AddRef, ChordMapCF_AddRef,
@ -102,7 +102,7 @@ static HRESULT WINAPI ComposerCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) ComposerCF_Vtbl = { static IClassFactoryVtbl ComposerCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ComposerCF_QueryInterface, ComposerCF_QueryInterface,
ComposerCF_AddRef, ComposerCF_AddRef,
@ -145,7 +145,7 @@ static HRESULT WINAPI ChordMapTrackCF_LockServer(LPCLASSFACTORY iface,BOOL doloc
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) ChordMapTrackCF_Vtbl = { static IClassFactoryVtbl ChordMapTrackCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ChordMapTrackCF_QueryInterface, ChordMapTrackCF_QueryInterface,
ChordMapTrackCF_AddRef, ChordMapTrackCF_AddRef,
@ -190,7 +190,7 @@ static HRESULT WINAPI TemplateCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) TemplateCF_Vtbl = { static IClassFactoryVtbl TemplateCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
TemplateCF_QueryInterface, TemplateCF_QueryInterface,
TemplateCF_AddRef, TemplateCF_AddRef,
@ -233,7 +233,7 @@ static HRESULT WINAPI SignPostTrackCF_LockServer(LPCLASSFACTORY iface,BOOL doloc
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) SignPostTrackCF_Vtbl = { static IClassFactoryVtbl SignPostTrackCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
SignPostTrackCF_QueryInterface, SignPostTrackCF_QueryInterface,
SignPostTrackCF_AddRef, SignPostTrackCF_AddRef,

42
dlls/dmcompos/dmcompos_private.h
View File

@ -52,20 +52,20 @@ typedef struct IDirectMusicSignPostTrack IDirectMusicSignPostTrack;
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IUnknown) DirectMusicChordMap_Unknown_Vtbl; extern IUnknownVtbl DirectMusicChordMap_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicChordMap) DirectMusicChordMap_ChordMap_Vtbl; extern IDirectMusicChordMapVtbl DirectMusicChordMap_ChordMap_Vtbl;
extern ICOM_VTABLE(IDirectMusicObject) DirectMusicChordMap_Object_Vtbl; extern IDirectMusicObjectVtbl DirectMusicChordMap_Object_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicChordMap_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicChordMap_PersistStream_Vtbl;
extern ICOM_VTABLE(IDirectMusicComposer) DirectMusicComposer_Vtbl; extern IDirectMusicComposerVtbl DirectMusicComposer_Vtbl;
extern ICOM_VTABLE(IUnknown) DirectMusicChordMapTrack_Unknown_Vtbl; extern IUnknownVtbl DirectMusicChordMapTrack_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicChordMapTrack_Track_Vtbl; extern IDirectMusicTrack8Vtbl DirectMusicChordMapTrack_Track_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicChordMapTrack_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicChordMapTrack_PersistStream_Vtbl;
extern ICOM_VTABLE(IUnknown) DirectMusicSignPostTrack_Unknown_Vtbl; extern IUnknownVtbl DirectMusicSignPostTrack_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicSignPostTrack_Track_Vtbl; extern IDirectMusicTrack8Vtbl DirectMusicSignPostTrack_Track_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicSignPostTrack_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicSignPostTrack_PersistStream_Vtbl;
/***************************************************************************** /*****************************************************************************
* ClassFactory * ClassFactory
@ -80,10 +80,10 @@ extern HRESULT WINAPI DMUSIC_CreateDirectMusicSignPostTrack (LPCGUID lpcGUID, LP
*/ */
struct IDirectMusicChordMapImpl { struct IDirectMusicChordMapImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicChordMap) *ChordMapVtbl; IDirectMusicChordMapVtbl *ChordMapVtbl;
ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; IDirectMusicObjectVtbl *ObjectVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicChordMapImpl fields */ /* IDirectMusicChordMapImpl fields */
@ -146,9 +146,9 @@ extern HRESULT WINAPI IDirectMusicComposerImpl_ChangeChordMap (LPDIRECTMUSICCOMP
*/ */
struct IDirectMusicChordMapTrack { struct IDirectMusicChordMapTrack {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; IDirectMusicTrack8Vtbl *TrackVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicChordMapTrack fields */ /* IDirectMusicChordMapTrack fields */
@ -194,9 +194,9 @@ extern HRESULT WINAPI IDirectMusicChordMapTrack_IPersistStream_GetSizeMax (LPPER
*/ */
struct IDirectMusicSignPostTrack { struct IDirectMusicSignPostTrack {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; IDirectMusicTrack8Vtbl *TrackVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicSignPostTrack fields */ /* IDirectMusicSignPostTrack fields */

6
dlls/dmcompos/signposttrack.c
View File

@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicSignPostTrack_IUnknown_Release (LPUNKNOWN iface) {
return ref; return ref;
} }
ICOM_VTABLE(IUnknown) DirectMusicSignPostTrack_Unknown_Vtbl = { IUnknownVtbl DirectMusicSignPostTrack_Unknown_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicSignPostTrack_IUnknown_QueryInterface, IDirectMusicSignPostTrack_IUnknown_QueryInterface,
IDirectMusicSignPostTrack_IUnknown_AddRef, IDirectMusicSignPostTrack_IUnknown_AddRef,
@ -180,7 +180,7 @@ HRESULT WINAPI IDirectMusicSignPostTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTR
return S_OK; return S_OK;
} }
ICOM_VTABLE(IDirectMusicTrack8) DirectMusicSignPostTrack_Track_Vtbl = { IDirectMusicTrack8Vtbl DirectMusicSignPostTrack_Track_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicSignPostTrack_IDirectMusicTrack_QueryInterface, IDirectMusicSignPostTrack_IDirectMusicTrack_QueryInterface,
IDirectMusicSignPostTrack_IDirectMusicTrack_AddRef, IDirectMusicSignPostTrack_IDirectMusicTrack_AddRef,
@ -240,7 +240,7 @@ HRESULT WINAPI IDirectMusicSignPostTrack_IPersistStream_GetSizeMax (LPPERSISTSTR
return E_NOTIMPL; return E_NOTIMPL;
} }
ICOM_VTABLE(IPersistStream) DirectMusicSignPostTrack_PersistStream_Vtbl = IPersistStreamVtbl DirectMusicSignPostTrack_PersistStream_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicSignPostTrack_IPersistStream_QueryInterface, IDirectMusicSignPostTrack_IPersistStream_QueryInterface,

8
dlls/dmime/audiopath.c
View File

@ -71,7 +71,7 @@ ULONG WINAPI IDirectMusicAudioPathImpl_IUnknown_Release (LPUNKNOWN iface) {
return ref; return ref;
} }
ICOM_VTABLE(IUnknown) DirectMusicAudioPath_Unknown_Vtbl = { IUnknownVtbl DirectMusicAudioPath_Unknown_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicAudioPathImpl_IUnknown_QueryInterface, IDirectMusicAudioPathImpl_IUnknown_QueryInterface,
IDirectMusicAudioPathImpl_IUnknown_AddRef, IDirectMusicAudioPathImpl_IUnknown_AddRef,
@ -210,7 +210,7 @@ HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicAudioPath_ConvertPChannel (
return S_OK; return S_OK;
} }
ICOM_VTABLE(IDirectMusicAudioPath) DirectMusicAudioPath_AudioPath_Vtbl = { IDirectMusicAudioPathVtbl DirectMusicAudioPath_AudioPath_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicAudioPathImpl_IDirectMusicAudioPath_QueryInterface, IDirectMusicAudioPathImpl_IDirectMusicAudioPath_QueryInterface,
IDirectMusicAudioPathImpl_IDirectMusicAudioPath_AddRef, IDirectMusicAudioPathImpl_IDirectMusicAudioPath_AddRef,
@ -428,7 +428,7 @@ HRESULT WINAPI IDirectMusicAudioPathImpl_IDirectMusicObject_ParseDescriptor (LPD
return S_OK; return S_OK;
} }
ICOM_VTABLE(IDirectMusicObject) DirectMusicAudioPath_Object_Vtbl = { IDirectMusicObjectVtbl DirectMusicAudioPath_Object_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicAudioPathImpl_IDirectMusicObject_QueryInterface, IDirectMusicAudioPathImpl_IDirectMusicObject_QueryInterface,
IDirectMusicAudioPathImpl_IDirectMusicObject_AddRef, IDirectMusicAudioPathImpl_IDirectMusicObject_AddRef,
@ -617,7 +617,7 @@ HRESULT WINAPI IDirectMusicAudioPathImpl_IPersistStream_GetSizeMax (LPPERSISTSTR
return E_NOTIMPL; return E_NOTIMPL;
} }
ICOM_VTABLE(IPersistStream) DirectMusicAudioPath_PersistStream_Vtbl = { IPersistStreamVtbl DirectMusicAudioPath_PersistStream_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicAudioPathImpl_IPersistStream_QueryInterface, IDirectMusicAudioPathImpl_IPersistStream_QueryInterface,
IDirectMusicAudioPathImpl_IPersistStream_AddRef, IDirectMusicAudioPathImpl_IPersistStream_AddRef,

28
dlls/dmime/dmime_main.c
View File

@ -61,7 +61,7 @@ static HRESULT WINAPI PerformanceCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) PerformanceCF_Vtbl = { static IClassFactoryVtbl PerformanceCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
PerformanceCF_QueryInterface, PerformanceCF_QueryInterface,
PerformanceCF_AddRef, PerformanceCF_AddRef,
@ -104,7 +104,7 @@ static HRESULT WINAPI SegmentCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) SegmentCF_Vtbl = { static IClassFactoryVtbl SegmentCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
SegmentCF_QueryInterface, SegmentCF_QueryInterface,
SegmentCF_AddRef, SegmentCF_AddRef,
@ -147,7 +147,7 @@ static HRESULT WINAPI SegmentStateCF_LockServer(LPCLASSFACTORY iface,BOOL dolock
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) SegmentStateCF_Vtbl = { static IClassFactoryVtbl SegmentStateCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
SegmentStateCF_QueryInterface, SegmentStateCF_QueryInterface,
SegmentStateCF_AddRef, SegmentStateCF_AddRef,
@ -190,7 +190,7 @@ static HRESULT WINAPI GraphCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) GraphCF_Vtbl = { static IClassFactoryVtbl GraphCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
GraphCF_QueryInterface, GraphCF_QueryInterface,
GraphCF_AddRef, GraphCF_AddRef,
@ -233,7 +233,7 @@ static HRESULT WINAPI TempoTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) TempoTrackCF_Vtbl = { static IClassFactoryVtbl TempoTrackCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
TempoTrackCF_QueryInterface, TempoTrackCF_QueryInterface,
TempoTrackCF_AddRef, TempoTrackCF_AddRef,
@ -276,7 +276,7 @@ static HRESULT WINAPI SeqTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) SeqTrackCF_Vtbl = { static IClassFactoryVtbl SeqTrackCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
SeqTrackCF_QueryInterface, SeqTrackCF_QueryInterface,
SeqTrackCF_AddRef, SeqTrackCF_AddRef,
@ -319,7 +319,7 @@ static HRESULT WINAPI SysExTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) SysExTrackCF_Vtbl = { static IClassFactoryVtbl SysExTrackCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
SysExTrackCF_QueryInterface, SysExTrackCF_QueryInterface,
SysExTrackCF_AddRef, SysExTrackCF_AddRef,
@ -362,7 +362,7 @@ static HRESULT WINAPI TimeSigTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) TimeSigTrackCF_Vtbl = { static IClassFactoryVtbl TimeSigTrackCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
TimeSigTrackCF_QueryInterface, TimeSigTrackCF_QueryInterface,
TimeSigTrackCF_AddRef, TimeSigTrackCF_AddRef,
@ -405,7 +405,7 @@ static HRESULT WINAPI ParamControlTrackCF_LockServer(LPCLASSFACTORY iface,BOOL d
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) ParamControlTrackCF_Vtbl = { static IClassFactoryVtbl ParamControlTrackCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ParamControlTrackCF_QueryInterface, ParamControlTrackCF_QueryInterface,
ParamControlTrackCF_AddRef, ParamControlTrackCF_AddRef,
@ -448,7 +448,7 @@ static HRESULT WINAPI MarkerTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) MarkerTrackCF_Vtbl = { static IClassFactoryVtbl MarkerTrackCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
MarkerTrackCF_QueryInterface, MarkerTrackCF_QueryInterface,
MarkerTrackCF_AddRef, MarkerTrackCF_AddRef,
@ -491,7 +491,7 @@ static HRESULT WINAPI LyricsTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock)
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) LyricsTrackCF_Vtbl = { static IClassFactoryVtbl LyricsTrackCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
LyricsTrackCF_QueryInterface, LyricsTrackCF_QueryInterface,
LyricsTrackCF_AddRef, LyricsTrackCF_AddRef,
@ -535,7 +535,7 @@ static HRESULT WINAPI SegTriggerTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dol
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) SegTriggerTrackCF_Vtbl = { static IClassFactoryVtbl SegTriggerTrackCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
SegTriggerTrackCF_QueryInterface, SegTriggerTrackCF_QueryInterface,
SegTriggerTrackCF_AddRef, SegTriggerTrackCF_AddRef,
@ -578,7 +578,7 @@ static HRESULT WINAPI AudioPathCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) AudioPathCF_Vtbl = { static IClassFactoryVtbl AudioPathCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
AudioPathCF_QueryInterface, AudioPathCF_QueryInterface,
AudioPathCF_AddRef, AudioPathCF_AddRef,
@ -621,7 +621,7 @@ static HRESULT WINAPI WaveTrackCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
return S_OK; return S_OK;
} }
static ICOM_VTABLE(IClassFactory) WaveTrackCF_Vtbl = { static IClassFactoryVtbl WaveTrackCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
WaveTrackCF_QueryInterface, WaveTrackCF_QueryInterface,
WaveTrackCF_AddRef, WaveTrackCF_AddRef,

164
dlls/dmime/dmime_private.h
View File

@ -65,64 +65,64 @@ typedef struct IDirectMusicWaveTrack IDirectMusicWaveTrack;
/***************************************************************************** /*****************************************************************************
* Predeclare the interface implementation structures * Predeclare the interface implementation structures
*/ */
extern ICOM_VTABLE(IDirectMusicPerformance8) DirectMusicPerformance8_Vtbl; extern IDirectMusicPerformance8Vtbl DirectMusicPerformance8_Vtbl;
extern ICOM_VTABLE(IUnknown) DirectMusicSegment8_Unknown_Vtbl; extern IUnknownVtbl DirectMusicSegment8_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicSegment8) DirectMusicSegment8_Segment_Vtbl; extern IDirectMusicSegment8Vtbl DirectMusicSegment8_Segment_Vtbl;
extern ICOM_VTABLE(IDirectMusicObject) DirectMusicSegment8_Object_Vtbl; extern IDirectMusicObjectVtbl DirectMusicSegment8_Object_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicSegment8_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicSegment8_PersistStream_Vtbl;
extern ICOM_VTABLE(IDirectMusicSegmentState8) DirectMusicSegmentState8_Vtbl; extern IDirectMusicSegmentState8Vtbl DirectMusicSegmentState8_Vtbl;
extern ICOM_VTABLE(IUnknown) DirectMusicGraph_Unknown_Vtbl; extern IUnknownVtbl DirectMusicGraph_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicGraph) DirectMusicGraph_Gtaph_Vtbl; extern IDirectMusicGraphVtbl DirectMusicGraph_Gtaph_Vtbl;
extern ICOM_VTABLE(IDirectMusicObject) DirectMusicGraph_Object_Vtbl; extern IDirectMusicObjectVtbl DirectMusicGraph_Object_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicGraph_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicGraph_PersistStream_Vtbl;
extern ICOM_VTABLE(IUnknown) DirectMusicAudioPath_Unknown_Vtbl; extern IUnknownVtbl DirectMusicAudioPath_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicAudioPath) DirectMusicAudioPath_AudioPath_Vtbl; extern IDirectMusicAudioPathVtbl DirectMusicAudioPath_AudioPath_Vtbl;
extern ICOM_VTABLE(IDirectMusicObject) DirectMusicAudioPath_Object_Vtbl; extern IDirectMusicObjectVtbl DirectMusicAudioPath_Object_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicAudioPath_Persist_Stream_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 IUnknownVtbl DirectMusicLyricsTrack_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicLyricsTrack_Track_Vtbl; extern IDirectMusicTrack8Vtbl DirectMusicLyricsTrack_Track_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicLyricsTrack_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicLyricsTrack_PersistStream_Vtbl;
extern ICOM_VTABLE(IUnknown) DirectMusicMarkerTrack_Unknown_Vtbl; extern IUnknownVtbl DirectMusicMarkerTrack_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicMarkerTrack_Track_Vtbl; extern IDirectMusicTrack8Vtbl DirectMusicMarkerTrack_Track_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicMarkerTrack_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicMarkerTrack_PersistStream_Vtbl;
extern ICOM_VTABLE(IUnknown) DirectMusicParamControlTrack_Unknown_Vtbl; extern IUnknownVtbl DirectMusicParamControlTrack_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicParamControlTrack_Track_Vtbl; extern IDirectMusicTrack8Vtbl DirectMusicParamControlTrack_Track_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicParamControlTrack_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicParamControlTrack_PersistStream_Vtbl;
extern ICOM_VTABLE(IUnknown) DirectMusicSegTriggerTrack_Unknown_Vtbl; extern IUnknownVtbl DirectMusicSegTriggerTrack_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicSegTriggerTrack_Track_Vtbl; extern IDirectMusicTrack8Vtbl DirectMusicSegTriggerTrack_Track_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicSegTriggerTrack_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicSegTriggerTrack_PersistStream_Vtbl;
extern ICOM_VTABLE(IUnknown) DirectMusicSeqTrack_Unknown_Vtbl; extern IUnknownVtbl DirectMusicSeqTrack_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicSeqTrack_Track_Vtbl; extern IDirectMusicTrack8Vtbl DirectMusicSeqTrack_Track_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicSeqTrack_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicSeqTrack_PersistStream_Vtbl;
extern ICOM_VTABLE(IUnknown) DirectMusicSysExTrack_Unknown_Vtbl; extern IUnknownVtbl DirectMusicSysExTrack_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicSysExTrack_Track_Vtbl; extern IDirectMusicTrack8Vtbl DirectMusicSysExTrack_Track_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicSysExTrack_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicSysExTrack_PersistStream_Vtbl;
extern ICOM_VTABLE(IUnknown) DirectMusicTempoTrack_Unknown_Vtbl; extern IUnknownVtbl DirectMusicTempoTrack_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicTempoTrack_Track_Vtbl; extern IDirectMusicTrack8Vtbl DirectMusicTempoTrack_Track_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicTempoTrack_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicTempoTrack_PersistStream_Vtbl;
extern ICOM_VTABLE(IUnknown) DirectMusicTimeSigTrack_Unknown_Vtbl; extern IUnknownVtbl DirectMusicTimeSigTrack_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicTimeSigTrack_Track_Vtbl; extern IDirectMusicTrack8Vtbl DirectMusicTimeSigTrack_Track_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicTimeSigTrack_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicTimeSigTrack_PersistStream_Vtbl;
extern ICOM_VTABLE(IUnknown) DirectMusicWaveTrack_Unknown_Vtbl; extern IUnknownVtbl DirectMusicWaveTrack_Unknown_Vtbl;
extern ICOM_VTABLE(IDirectMusicTrack8) DirectMusicWaveTrack_Track_Vtbl; extern IDirectMusicTrack8Vtbl DirectMusicWaveTrack_Track_Vtbl;
extern ICOM_VTABLE(IPersistStream) DirectMusicWaveTrack_PersistStream_Vtbl; extern IPersistStreamVtbl DirectMusicWaveTrack_PersistStream_Vtbl;
/***************************************************************************** /*****************************************************************************
* ClassFactory * ClassFactory
@ -290,10 +290,10 @@ extern HRESULT WINAPI IDirectMusicPerformance8Impl_GetParamEx (LPDIRECTMUSICPERF
*/ */
struct IDirectMusicSegment8Impl { struct IDirectMusicSegment8Impl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicSegment8) *SegmentVtbl; IDirectMusicSegment8Vtbl *SegmentVtbl;
ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; IDirectMusicObjectVtbl *ObjectVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicSegment8Impl fields */ /* IDirectMusicSegment8Impl fields */
@ -385,10 +385,10 @@ extern HRESULT WINAPI IDirectMusicSegmentState8Impl_GetObjectInPath (LPDIRECTMUS
*/ */
struct IDirectMusicGraphImpl { struct IDirectMusicGraphImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicGraph) *GraphVtbl; IDirectMusicGraphVtbl *GraphVtbl;
ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; IDirectMusicObjectVtbl *ObjectVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicGraphImpl fields */ /* IDirectMusicGraphImpl fields */
@ -430,10 +430,10 @@ extern HRESULT WINAPI IDirectMusicGraphImpl_IPersistStream_GetSizeMax (LPPERSIST
*/ */
struct IDirectMusicAudioPathImpl { struct IDirectMusicAudioPathImpl {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicAudioPath) *AudioPathVtbl; IDirectMusicAudioPathVtbl *AudioPathVtbl;
ICOM_VTABLE(IDirectMusicObject) *ObjectVtbl; IDirectMusicObjectVtbl *ObjectVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicAudioPathImpl fields */ /* IDirectMusicAudioPathImpl fields */
@ -526,9 +526,9 @@ extern HRESULT WINAPI IDirectMusicPatternTrackImpl_SetPatternByName (LPDIRECTMUS
struct IDirectMusicLyricsTrack struct IDirectMusicLyricsTrack
{ {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; IDirectMusicTrack8Vtbl *TrackVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicLyricsTrack fields */ /* IDirectMusicLyricsTrack fields */
@ -573,9 +573,9 @@ extern HRESULT WINAPI IDirectMusicLyricsTrack_IPersistStream_GetSizeMax (LPPERSI
*/ */
struct IDirectMusicMarkerTrack { struct IDirectMusicMarkerTrack {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; IDirectMusicTrack8Vtbl *TrackVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicMarkerTrack fields */ /* IDirectMusicMarkerTrack fields */
@ -620,9 +620,9 @@ extern HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_GetSizeMax (LPPERSI
*/ */
struct IDirectMusicParamControlTrack { struct IDirectMusicParamControlTrack {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; IDirectMusicTrack8Vtbl *TrackVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicParamControlTrack fields */ /* IDirectMusicParamControlTrack fields */
@ -667,9 +667,9 @@ extern HRESULT WINAPI IDirectMusicParamControlTrack_IPersistStream_GetSizeMax (L
*/ */
struct IDirectMusicSegTriggerTrack { struct IDirectMusicSegTriggerTrack {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; IDirectMusicTrack8Vtbl *TrackVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicSegTriggerTrack fields */ /* IDirectMusicSegTriggerTrack fields */
@ -716,9 +716,9 @@ extern HRESULT WINAPI IDirectMusicSegTriggerTrack_IPersistStream_GetSizeMax (LPP
*/ */
struct IDirectMusicSeqTrack { struct IDirectMusicSeqTrack {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; IDirectMusicTrack8Vtbl *TrackVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicSeqTrack fields */ /* IDirectMusicSeqTrack fields */
@ -763,9 +763,9 @@ extern HRESULT WINAPI IDirectMusicSeqTrack_IPersistStream_GetSizeMax (LPPERSISTS
*/ */
struct IDirectMusicSysExTrack { struct IDirectMusicSysExTrack {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; IDirectMusicTrack8Vtbl *TrackVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicSysExTrack fields */ /* IDirectMusicSysExTrack fields */
@ -810,9 +810,9 @@ extern HRESULT WINAPI IDirectMusicSysExTrack_IPersistStream_GetSizeMax (LPPERSIS
*/ */
struct IDirectMusicTempoTrack { struct IDirectMusicTempoTrack {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; IDirectMusicTrack8Vtbl *TrackVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicTempoTrack fields */ /* IDirectMusicTempoTrack fields */
@ -859,9 +859,9 @@ extern HRESULT WINAPI IDirectMusicTempoTrack_IPersistStream_GetSizeMax (LPPERSIS
*/ */
struct IDirectMusicTimeSigTrack { struct IDirectMusicTimeSigTrack {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; IDirectMusicTrack8Vtbl *TrackVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicTimeSigTrack fields */ /* IDirectMusicTimeSigTrack fields */
@ -906,9 +906,9 @@ extern HRESULT WINAPI IDirectMusicTimeSigTrack_IPersistStream_GetSizeMax (LPPERS
*/ */
struct IDirectMusicWaveTrack { struct IDirectMusicWaveTrack {
/* IUnknown fields */ /* IUnknown fields */
ICOM_VTABLE(IUnknown) *UnknownVtbl; IUnknownVtbl *UnknownVtbl;
ICOM_VTABLE(IDirectMusicTrack8) *TrackVtbl; IDirectMusicTrack8Vtbl *TrackVtbl;
ICOM_VTABLE(IPersistStream) *PersistStreamVtbl; IPersistStreamVtbl *PersistStreamVtbl;
DWORD ref; DWORD ref;
/* IDirectMusicWaveTrack fields */ /* IDirectMusicWaveTrack fields */

8
dlls/dmime/graph.c
View File

@ -68,7 +68,7 @@ ULONG WINAPI IDirectMusicGraphImpl_IUnknown_Release (LPUNKNOWN iface) {
return ref; return ref;
} }
ICOM_VTABLE(IUnknown) DirectMusicGraph_Unknown_Vtbl = { IUnknownVtbl DirectMusicGraph_Unknown_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicGraphImpl_IUnknown_QueryInterface, IDirectMusicGraphImpl_IUnknown_QueryInterface,
IDirectMusicGraphImpl_IUnknown_AddRef, IDirectMusicGraphImpl_IUnknown_AddRef,
@ -175,7 +175,7 @@ HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicGraph_RemoveTool (LPDIRECTMUSIC
return S_OK; return S_OK;
} }
ICOM_VTABLE(IDirectMusicGraph) DirectMusicGraph_Graph_Vtbl = { IDirectMusicGraphVtbl DirectMusicGraph_Graph_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicGraphImpl_IDirectMusicGraph_QueryInterface, IDirectMusicGraphImpl_IDirectMusicGraph_QueryInterface,
IDirectMusicGraphImpl_IDirectMusicGraph_AddRef, IDirectMusicGraphImpl_IDirectMusicGraph_AddRef,
@ -394,7 +394,7 @@ HRESULT WINAPI IDirectMusicGraphImpl_IDirectMusicObject_ParseDescriptor (LPDIREC
return S_OK; return S_OK;
} }
ICOM_VTABLE(IDirectMusicObject) DirectMusicGraph_Object_Vtbl = { IDirectMusicObjectVtbl DirectMusicGraph_Object_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicGraphImpl_IDirectMusicObject_QueryInterface, IDirectMusicGraphImpl_IDirectMusicObject_QueryInterface,
IDirectMusicGraphImpl_IDirectMusicObject_AddRef, IDirectMusicGraphImpl_IDirectMusicObject_AddRef,
@ -582,7 +582,7 @@ HRESULT WINAPI IDirectMusicGraphImpl_IPersistStream_GetSizeMax (LPPERSISTSTREAM
return E_NOTIMPL; return E_NOTIMPL;
} }
ICOM_VTABLE(IPersistStream) DirectMusicGraph_PersistStream_Vtbl = { IPersistStreamVtbl DirectMusicGraph_PersistStream_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicGraphImpl_IPersistStream_QueryInterface, IDirectMusicGraphImpl_IPersistStream_QueryInterface,
IDirectMusicGraphImpl_IPersistStream_AddRef, IDirectMusicGraphImpl_IPersistStream_AddRef,

6
dlls/dmime/lyricstrack.c
View File

@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicLyricsTrack_IUnknown_Release (LPUNKNOWN iface) {
return ref; return ref;
} }
ICOM_VTABLE(IUnknown) DirectMusicLyricsTrack_Unknown_Vtbl = { IUnknownVtbl DirectMusicLyricsTrack_Unknown_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicLyricsTrack_IUnknown_QueryInterface, IDirectMusicLyricsTrack_IUnknown_QueryInterface,
IDirectMusicLyricsTrack_IUnknown_AddRef, IDirectMusicLyricsTrack_IUnknown_AddRef,
@ -185,7 +185,7 @@ HRESULT WINAPI IDirectMusicLyricsTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRAC
return S_OK; return S_OK;
} }
ICOM_VTABLE(IDirectMusicTrack8) DirectMusicLyricsTrack_Track_Vtbl = { IDirectMusicTrack8Vtbl DirectMusicLyricsTrack_Track_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicLyricsTrack_IDirectMusicTrack_QueryInterface, IDirectMusicLyricsTrack_IDirectMusicTrack_QueryInterface,
IDirectMusicLyricsTrack_IDirectMusicTrack_AddRef, IDirectMusicLyricsTrack_IDirectMusicTrack_AddRef,
@ -244,7 +244,7 @@ HRESULT WINAPI IDirectMusicLyricsTrack_IPersistStream_GetSizeMax (LPPERSISTSTREA
return E_NOTIMPL; return E_NOTIMPL;
} }
ICOM_VTABLE(IPersistStream) DirectMusicLyricsTrack_PersistStream_Vtbl = { IPersistStreamVtbl DirectMusicLyricsTrack_PersistStream_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicLyricsTrack_IPersistStream_QueryInterface, IDirectMusicLyricsTrack_IPersistStream_QueryInterface,
IDirectMusicLyricsTrack_IPersistStream_AddRef, IDirectMusicLyricsTrack_IPersistStream_AddRef,

6
dlls/dmime/markertrack.c
View File

@ -65,7 +65,7 @@ ULONG WINAPI IDirectMusicMarkerTrack_IUnknown_Release (LPUNKNOWN iface) {
return ref; return ref;
} }
ICOM_VTABLE(IUnknown) DirectMusicMarkerTrack_Unknown_Vtbl = { IUnknownVtbl DirectMusicMarkerTrack_Unknown_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicMarkerTrack_IUnknown_QueryInterface, IDirectMusicMarkerTrack_IUnknown_QueryInterface,
IDirectMusicMarkerTrack_IUnknown_AddRef, IDirectMusicMarkerTrack_IUnknown_AddRef,
@ -185,7 +185,7 @@ HRESULT WINAPI IDirectMusicMarkerTrack_IDirectMusicTrack_Join (LPDIRECTMUSICTRAC
return S_OK; return S_OK;
} }
ICOM_VTABLE(IDirectMusicTrack8) DirectMusicMarkerTrack_Track_Vtbl = { IDirectMusicTrack8Vtbl DirectMusicMarkerTrack_Track_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicMarkerTrack_IDirectMusicTrack_QueryInterface, IDirectMusicMarkerTrack_IDirectMusicTrack_QueryInterface,
IDirectMusicMarkerTrack_IDirectMusicTrack_AddRef, IDirectMusicMarkerTrack_IDirectMusicTrack_AddRef,
@ -244,7 +244,7 @@ HRESULT WINAPI IDirectMusicMarkerTrack_IPersistStream_GetSizeMax (LPPERSISTSTREA
return E_NOTIMPL; return E_NOTIMPL;
} }
ICOM_VTABLE(IPersistStream) DirectMusicMarkerTrack_PersistStream_Vtbl = { IPersistStreamVtbl DirectMusicMarkerTrack_PersistStream_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
IDirectMusicMarkerTrack_IPersistStream_QueryInterface, IDirectMusicMarkerTrack_IPersistStream_QueryInterface,
IDirectMusicMarkerTrack_IPersistStream_AddRef, IDirectMusicMarkerTrack_IPersistStream_AddRef,

Some files were not shown because too many files have changed in this diff Show More