The COM virtual tables must use the

'ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE' macro to provide padding in C++.
This commit is contained in:
Francois Gouget 2000-01-30 02:55:16 +00:00 committed by Alexandre Julliard
parent 0b7a532acf
commit f82a723a43
6 changed files with 9 additions and 1 deletions

View File

@ -31,6 +31,7 @@ DEFAULT_DEBUG_CHANNEL(commdlg)
*/ */
static ICOM_VTABLE(IShellBrowser) IShellBrowserImpl_Vtbl = static ICOM_VTABLE(IShellBrowser) IShellBrowserImpl_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
/* IUnknown */ /* IUnknown */
IShellBrowserImpl_QueryInterface, IShellBrowserImpl_QueryInterface,
IShellBrowserImpl_AddRef, IShellBrowserImpl_AddRef,
@ -56,6 +57,7 @@ static ICOM_VTABLE(IShellBrowser) IShellBrowserImpl_Vtbl =
static ICOM_VTABLE(ICommDlgBrowser) IShellBrowserImpl_ICommDlgBrowser_Vtbl = static ICOM_VTABLE(ICommDlgBrowser) IShellBrowserImpl_ICommDlgBrowser_Vtbl =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
/* IUnknown */ /* IUnknown */
IShellBrowserImpl_ICommDlgBrowser_QueryInterface, IShellBrowserImpl_ICommDlgBrowser_QueryInterface,
IShellBrowserImpl_ICommDlgBrowser_AddRef, IShellBrowserImpl_ICommDlgBrowser_AddRef,

View File

@ -67,6 +67,7 @@ static HRESULT WINAPI DP_and_DPL_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
} }
static ICOM_VTABLE(IClassFactory) DP_and_DPL_Vtbl = { static ICOM_VTABLE(IClassFactory) DP_and_DPL_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
DP_and_DPL_QueryInterface, DP_and_DPL_QueryInterface,
DP_and_DPL_AddRef, DP_and_DPL_AddRef,
DP_and_DPL_Release, DP_and_DPL_Release,

View File

@ -2384,6 +2384,7 @@ static HRESULT WINAPI DSCF_LockServer(LPCLASSFACTORY iface,BOOL dolock) {
} }
static ICOM_VTABLE(IClassFactory) DSCF_Vtbl = { static ICOM_VTABLE(IClassFactory) DSCF_Vtbl = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
DSCF_QueryInterface, DSCF_QueryInterface,
DSCF_AddRef, DSCF_AddRef,
DSCF_Release, DSCF_Release,

View File

@ -47,6 +47,7 @@ static HRESULT WINAPI OleAdviseHolderImpl_SendOnClose (LPOLEADVISEHOLDER);
*/ */
static struct ICOM_VTABLE(IOleAdviseHolder) oahvt = static struct ICOM_VTABLE(IOleAdviseHolder) oahvt =
{ {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
OleAdviseHolderImpl_QueryInterface, OleAdviseHolderImpl_QueryInterface,
OleAdviseHolderImpl_AddRef, OleAdviseHolderImpl_AddRef,
OleAdviseHolderImpl_Release, OleAdviseHolderImpl_Release,

View File

@ -347,6 +347,7 @@ static HRESULT WINAPI ITypeLib2_fnGetDocumentation2( ITypeLib * This,
static HRESULT WINAPI ITypeLib2_fnGetAllCustData( ITypeLib * This, static HRESULT WINAPI ITypeLib2_fnGetAllCustData( ITypeLib * This,
CUSTDATA *pCustData); CUSTDATA *pCustData);
static ICOM_VTABLE(ITypeLib) tlbvt = { static ICOM_VTABLE(ITypeLib) tlbvt = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ITypeLib_fnQueryInterface, ITypeLib_fnQueryInterface,
ITypeLib_fnAddRef, ITypeLib_fnAddRef,
ITypeLib_fnRelease, ITypeLib_fnRelease,
@ -466,6 +467,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllImplTypeCustData( ITypeInfo * This,
UINT index, CUSTDATA *pCustData); UINT index, CUSTDATA *pCustData);
static ICOM_VTABLE(ITypeInfo) tinfvt = { static ICOM_VTABLE(ITypeInfo) tinfvt = {
ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
ITypeInfo_fnQueryInterface, ITypeInfo_fnQueryInterface,
ITypeInfo_fnAddRef, ITypeInfo_fnAddRef,
ITypeInfo_fnRelease, ITypeInfo_fnRelease,

View File

@ -307,7 +307,8 @@ inline BOOL operator!=(const GUID& guidOne, const GUID& guidOther)
* // ... * // ...
* *
* static ICOM_VTABLE(IDirect3D) d3dvt = { * static ICOM_VTABLE(IDirect3D) d3dvt = {
* IDirect3D_fnQueryInterface, * ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
* IDirect3D_fnQueryInterface,
* IDirect3D_fnAdd, * IDirect3D_fnAdd,
* IDirect3D_fnAdd2, * IDirect3D_fnAdd2,
* IDirect3D_fnInitialize, * IDirect3D_fnInitialize,