Skip to content

W
wine-cw
Commit 77ea021e authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard
Browse files
Options

Generate BEGIN_INTERFACE,END_INTERFACE macros instead of

ICOM_MSVTABLE_COMPAT_FIELDS.
parent 493cf88b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 288 additions and 140 deletions
include/activscp.h
View file @ 77ea021e
......@@ -103,7 +103,7 @@ struct IActiveScriptError {
const IActiveScriptErrorVtbl* lpVtbl;
};
struct IActiveScriptErrorVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -132,6 +132,7 @@ struct IActiveScriptErrorVtbl {
IActiveScriptError* This,
BSTR* pbstrSourceLine);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -237,7 +238,7 @@ struct IActiveScriptSite {
const IActiveScriptSiteVtbl* lpVtbl;
};
struct IActiveScriptSiteVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -286,6 +287,7 @@ struct IActiveScriptSiteVtbl {
HRESULT (STDMETHODCALLTYPE *OnLeaveScript)(
IActiveScriptSite* This);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -420,7 +422,7 @@ struct IActiveScriptSiteWindow {
const IActiveScriptSiteWindowVtbl* lpVtbl;
};
struct IActiveScriptSiteWindowVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -443,6 +445,7 @@ struct IActiveScriptSiteWindowVtbl {
IActiveScriptSiteWindow* This,
BOOL fEnable);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -511,7 +514,7 @@ struct IActiveScriptSiteInterruptPoll {
const IActiveScriptSiteInterruptPollVtbl* lpVtbl;
};
struct IActiveScriptSiteInterruptPollVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -529,6 +532,7 @@ struct IActiveScriptSiteInterruptPollVtbl {
HRESULT (STDMETHODCALLTYPE *QueryContinue)(
IActiveScriptSiteInterruptPoll* This);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -632,7 +636,7 @@ struct IActiveScript {
const IActiveScriptVtbl* lpVtbl;
};
struct IActiveScriptVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -708,6 +712,7 @@ struct IActiveScriptVtbl {
IActiveScript* This,
IActiveScript** ppscript);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -920,7 +925,7 @@ struct IActiveScriptParse {
const IActiveScriptParseVtbl* lpVtbl;
};
struct IActiveScriptParseVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -964,6 +969,7 @@ struct IActiveScriptParseVtbl {
VARIANT* pvarResult,
EXCEPINFO* pexcepinfo);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1068,7 +1074,7 @@ struct IActiveScriptParseProcedureOld {
const IActiveScriptParseProcedureOldVtbl* lpVtbl;
};
struct IActiveScriptParseProcedureOldVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1095,6 +1101,7 @@ struct IActiveScriptParseProcedureOldVtbl {
DWORD dwFlags,
IDispatch** ppdisp);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1170,7 +1177,7 @@ struct IActiveScriptParseProcedure {
const IActiveScriptParseProcedureVtbl* lpVtbl;
};
struct IActiveScriptParseProcedureVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1198,6 +1205,7 @@ struct IActiveScriptParseProcedureVtbl {
DWORD dwFlags,
IDispatch** ppdisp);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1266,7 +1274,7 @@ struct IBindEventHandler {
const IBindEventHandlerVtbl* lpVtbl;
};
struct IBindEventHandlerVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1286,6 +1294,7 @@ struct IBindEventHandlerVtbl {
LPCOLESTR pstrEvent,
IDispatch* pdisp);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1355,7 +1364,7 @@ struct IActiveScriptStats {
const IActiveScriptStatsVtbl* lpVtbl;
};
struct IActiveScriptStatsVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1385,6 +1394,7 @@ struct IActiveScriptStatsVtbl {
HRESULT (STDMETHODCALLTYPE *ResetStats)(
IActiveScriptStats* This);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/amstream.h
View file @ 77ea021e
......@@ -122,7 +122,7 @@ struct IAMMultiMediaStream {
const IAMMultiMediaStreamVtbl* lpVtbl;
};
struct IAMMultiMediaStreamVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -213,6 +213,7 @@ struct IAMMultiMediaStreamVtbl {
IAMMultiMediaStream* This,
DWORD dwFlags);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -369,7 +370,7 @@ struct IAMMediaStream {
const IAMMediaStreamVtbl* lpVtbl;
};
struct IAMMediaStreamVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -437,6 +438,7 @@ struct IAMMediaStreamVtbl {
IAMMediaStream* This,
IFilterGraph* pFilterGraph);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -573,7 +575,7 @@ struct IMediaStreamFilter {
const IMediaStreamFilterVtbl* lpVtbl;
};
struct IMediaStreamFilterVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -677,6 +679,7 @@ struct IMediaStreamFilterVtbl {
HRESULT (STDMETHODCALLTYPE *EndOfStream)(
IMediaStreamFilter* This);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -846,7 +849,7 @@ struct IDirectDrawMediaSampleAllocator {
const IDirectDrawMediaSampleAllocatorVtbl* lpVtbl;
};
struct IDirectDrawMediaSampleAllocatorVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -865,6 +868,7 @@ struct IDirectDrawMediaSampleAllocatorVtbl {
IDirectDrawMediaSampleAllocator* This,
IDirectDraw** ppDirectDraw);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -927,7 +931,7 @@ struct IDirectDrawMediaSample {
const IDirectDrawMediaSampleVtbl* lpVtbl;
};
struct IDirectDrawMediaSampleVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -950,6 +954,7 @@ struct IDirectDrawMediaSampleVtbl {
HRESULT (STDMETHODCALLTYPE *LockMediaSamplePointer)(
IDirectDrawMediaSample* This);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1031,7 +1036,7 @@ struct IAMMediaTypeStream {
const IAMMediaTypeStreamVtbl* lpVtbl;
};
struct IAMMediaTypeStreamVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1102,6 +1107,7 @@ struct IAMMediaTypeStreamVtbl {
IAMMediaTypeStream* This,
ALLOCATOR_PROPERTIES* pProps);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1268,7 +1274,7 @@ struct IAMMediaTypeSample {
const IAMMediaTypeSampleVtbl* lpVtbl;
};
struct IAMMediaTypeSampleVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1379,6 +1385,7 @@ struct IAMMediaTypeSampleVtbl {
LONGLONG* pTimeStart,
LONGLONG* pTimeEnd);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/amvideo.h
View file @ 77ea021e
......@@ -117,7 +117,7 @@ struct IDirectDrawVideo {
const IDirectDrawVideoVtbl* lpVtbl;
};
struct IDirectDrawVideoVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -196,6 +196,7 @@ struct IDirectDrawVideoVtbl {
IDirectDrawVideo* This,
long* UseWhenFullScreen);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -418,7 +419,7 @@ struct IQualProp {
const IQualPropVtbl* lpVtbl;
};
struct IQualPropVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -457,6 +458,7 @@ struct IQualPropVtbl {
IQualProp* This,
int* piDev);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -616,7 +618,7 @@ struct IFullScreenVideo {
const IFullScreenVideoVtbl* lpVtbl;
};
struct IFullScreenVideoVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -701,6 +703,7 @@ struct IFullScreenVideoVtbl {
HRESULT (STDMETHODCALLTYPE *SetDefault)(
IFullScreenVideo* This);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -931,7 +934,7 @@ struct IFullScreenVideoEx {
const IFullScreenVideoExVtbl* lpVtbl;
};
struct IFullScreenVideoExVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1035,6 +1038,7 @@ struct IFullScreenVideoExVtbl {
IFullScreenVideoEx* This,
long* pKeepAspect);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1178,7 +1182,7 @@ struct IBaseVideoMixer {
const IBaseVideoMixerVtbl* lpVtbl;
};
struct IBaseVideoMixerVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1221,6 +1225,7 @@ struct IBaseVideoMixerVtbl {
IBaseVideoMixer* This,
int bValue);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/austream.h
View file @ 77ea021e
......@@ -61,7 +61,7 @@ struct IAudioMediaStream {
const IAudioMediaStreamVtbl* lpVtbl;
};
struct IAudioMediaStreamVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -120,6 +120,7 @@ struct IAudioMediaStreamVtbl {
DWORD dwFlags,
IAudioStreamSample** ppSample);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -209,7 +210,7 @@ struct IAudioStreamSample {
const IAudioStreamSampleVtbl* lpVtbl;
};
struct IAudioStreamSampleVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -256,6 +257,7 @@ struct IAudioStreamSampleVtbl {
IAudioStreamSample* This,
IAudioData** ppAudio);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -331,7 +333,7 @@ struct IMemoryData {
const IMemoryDataVtbl* lpVtbl;
};
struct IMemoryDataVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -362,6 +364,7 @@ struct IMemoryDataVtbl {
IMemoryData* This,
DWORD cbDataValid);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -442,7 +445,7 @@ struct IAudioData {
const IAudioDataVtbl* lpVtbl;
};
struct IAudioDataVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -482,6 +485,7 @@ struct IAudioDataVtbl {
IAudioData* This,
const WAVEFORMATEX* lpWaveFormat);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/comcat.h
View file @ 77ea021e
......@@ -58,7 +58,7 @@ struct IEnumGUID {
const IEnumGUIDVtbl* lpVtbl;
};
struct IEnumGUIDVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -90,6 +90,7 @@ struct IEnumGUIDVtbl {
IEnumGUID* This,
IEnumGUID** ppenum);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -198,7 +199,7 @@ struct IEnumCATEGORYINFO {
const IEnumCATEGORYINFOVtbl* lpVtbl;
};
struct IEnumCATEGORYINFOVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -230,6 +231,7 @@ struct IEnumCATEGORYINFOVtbl {
IEnumCATEGORYINFO* This,
IEnumCATEGORYINFO** ppenum);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -349,7 +351,7 @@ struct ICatInformation {
const ICatInformationVtbl* lpVtbl;
};
struct ICatInformationVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -401,6 +403,7 @@ struct ICatInformationVtbl {
REFCLSID rclsid,
IEnumGUID** ppenumCatid);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -577,7 +580,7 @@ struct ICatRegister {
const ICatRegisterVtbl* lpVtbl;
};
struct ICatRegisterVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -626,6 +629,7 @@ struct ICatRegisterVtbl {
ULONG cCategories,
CATID rgcatid[]);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/ddstream.h
View file @ 77ea021e
......@@ -87,7 +87,7 @@ struct IDirectDrawMediaStream {
const IDirectDrawMediaStreamVtbl* lpVtbl;
};
struct IDirectDrawMediaStreamVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -163,6 +163,7 @@ struct IDirectDrawMediaStreamVtbl {
IDirectDrawMediaStream* This,
STREAM_TIME* pFrameTime);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -291,7 +292,7 @@ struct IDirectDrawStreamSample {
const IDirectDrawStreamSampleVtbl* lpVtbl;
};
struct IDirectDrawStreamSampleVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -343,6 +344,7 @@ struct IDirectDrawStreamSampleVtbl {
IDirectDrawStreamSample* This,
const RECT* pRect);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/dispex.h
View file @ 77ea021e
......@@ -106,7 +106,7 @@ struct IDispatchEx {
const IDispatchExVtbl* lpVtbl;
};
struct IDispatchExVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -197,6 +197,7 @@ struct IDispatchExVtbl {
IDispatchEx* This,
IUnknown** ppunk);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -390,7 +391,7 @@ struct IDispError {
const IDispErrorVtbl* lpVtbl;
};
struct IDispErrorVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -431,6 +432,7 @@ struct IDispErrorVtbl {
IDispError* This,
BSTR* pbstrDescription);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -544,7 +546,7 @@ struct IVariantChangeType {
const IVariantChangeTypeVtbl* lpVtbl;
};
struct IVariantChangeTypeVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -566,6 +568,7 @@ struct IVariantChangeTypeVtbl {
LCID lcid,
VARTYPE vtNew);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -627,7 +630,7 @@ struct IObjectIdentity {
const IObjectIdentityVtbl* lpVtbl;
};
struct IObjectIdentityVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -646,6 +649,7 @@ struct IObjectIdentityVtbl {
IObjectIdentity* This,
IUnknown* punk);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/docobj.h
View file @ 77ea021e
......@@ -66,7 +66,7 @@ struct IOleDocument {
const IOleDocumentVtbl* lpVtbl;
};
struct IOleDocumentVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -97,6 +97,7 @@ struct IOleDocumentVtbl {
IEnumOleDocumentViews** ppEnum,
IOleDocumentView** ppView);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -181,7 +182,7 @@ struct IOleDocumentSite {
const IOleDocumentSiteVtbl* lpVtbl;
};
struct IOleDocumentSiteVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -200,6 +201,7 @@ struct IOleDocumentSiteVtbl {
IOleDocumentSite* This,
IOleDocumentView* pViewToActivate);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -295,7 +297,7 @@ struct IOleDocumentView {
const IOleDocumentViewVtbl* lpVtbl;
};
struct IOleDocumentViewVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -365,6 +367,7 @@ struct IOleDocumentViewVtbl {
IOleInPlaceSite* pIPSiteNew,
IOleDocumentView** ppViewNew);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -554,7 +557,7 @@ struct IEnumOleDocumentViews {
const IEnumOleDocumentViewsVtbl* lpVtbl;
};
struct IEnumOleDocumentViewsVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -586,6 +589,7 @@ struct IEnumOleDocumentViewsVtbl {
IEnumOleDocumentViews* This,
IEnumOleDocumentViews** ppEnum);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -786,7 +790,7 @@ struct IOleCommandTarget {
const IOleCommandTargetVtbl* lpVtbl;
};
struct IOleCommandTargetVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -816,6 +820,7 @@ struct IOleCommandTargetVtbl {
VARIANT* pvaIn,
VARIANT* pvaOut);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -898,7 +903,7 @@ struct IContinueCallback {
const IContinueCallbackVtbl* lpVtbl;
};
struct IContinueCallbackVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -922,6 +927,7 @@ struct IContinueCallbackVtbl {
LONG nCurPage,
WCHAR* pwszPrintStatus);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1030,7 +1036,7 @@ struct IPrint {
const IPrintVtbl* lpVtbl;
};
struct IPrintVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1065,6 +1071,7 @@ struct IPrintVtbl {
LONG* pcPagesPrinted,
LONG* pnLastPage);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/exdisp.h
View file @ 77ea021e
......@@ -127,7 +127,7 @@ struct IWebBrowser {
const IWebBrowserVtbl* lpVtbl;
};
struct IWebBrowserVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -270,6 +270,7 @@ struct IWebBrowserVtbl {
IWebBrowser* This,
VARIANT_BOOL* pBool);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -636,7 +637,7 @@ struct IWebBrowserApp {
const IWebBrowserAppVtbl* lpVtbl;
};
struct IWebBrowserAppVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -862,6 +863,7 @@ struct IWebBrowserAppVtbl {
IWebBrowserApp* This,
VARIANT_BOOL bFullScreen);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1220,7 +1222,7 @@ struct IShellWindows {
const IShellWindowsVtbl* lpVtbl;
};
struct IShellWindowsVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1325,6 +1327,7 @@ struct IShellWindowsVtbl {
IShellWindows* This,
VARIANT_BOOL fAttach);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/mlang.h
View file @ 77ea021e
......@@ -58,7 +58,7 @@ struct IMLangCodePages {
const IMLangCodePagesVtbl* lpVtbl;
};
struct IMLangCodePagesVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -97,6 +97,7 @@ struct IMLangCodePagesVtbl {
UINT uDefaultCodePage,
UINT* puCodePage);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -206,7 +207,7 @@ struct IMLangFontLink {
const IMLangFontLinkVtbl* lpVtbl;
};
struct IMLangFontLinkVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -266,6 +267,7 @@ struct IMLangFontLinkVtbl {
HRESULT (STDMETHODCALLTYPE *ResetFontMapping)(
IMLangFontLink* This);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -454,7 +456,7 @@ struct IEnumScript {
const IEnumScriptVtbl* lpVtbl;
};
struct IEnumScriptVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -486,6 +488,7 @@ struct IEnumScriptVtbl {
IEnumScript* This,
ULONG celt);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -624,7 +627,7 @@ struct IEnumCodePage {
const IEnumCodePageVtbl* lpVtbl;
};
struct IEnumCodePageVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -656,6 +659,7 @@ struct IEnumCodePageVtbl {
IEnumCodePage* This,
ULONG celt);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -773,7 +777,7 @@ struct IMLangConvertCharset {
const IMLangConvertCharsetVtbl* lpVtbl;
};
struct IMLangConvertCharsetVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -827,6 +831,7 @@ struct IMLangConvertCharsetVtbl {
CHAR* pDstStr,
UINT* pcDstSize);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -972,7 +977,7 @@ struct IEnumRfc1766 {
const IEnumRfc1766Vtbl* lpVtbl;
};
struct IEnumRfc1766Vtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1004,6 +1009,7 @@ struct IEnumRfc1766Vtbl {
IEnumRfc1766* This,
ULONG celt);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1161,7 +1167,7 @@ struct IMultiLanguage {
const IMultiLanguageVtbl* lpVtbl;
};
struct IMultiLanguageVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1262,6 +1268,7 @@ struct IMultiLanguageVtbl {
DWORD dwProperty,
IMLangConvertCharset** ppMLangConvertCharset);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1638,7 +1645,7 @@ struct IMultiLanguage2 {
const IMultiLanguage2Vtbl* lpVtbl;
};
struct IMultiLanguage2Vtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1828,6 +1835,7 @@ struct IMultiLanguage2Vtbl {
HWND hwnd,
DWORD dwfIODControl);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/mmstream.h
View file @ 77ea021e
......@@ -125,7 +125,7 @@ struct IMultiMediaStream {
const IMultiMediaStreamVtbl* lpVtbl;
};
struct IMultiMediaStreamVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -179,6 +179,7 @@ struct IMultiMediaStreamVtbl {
IMultiMediaStream* This,
HANDLE* phEOS);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -335,7 +336,7 @@ struct IMediaStream {
const IMediaStreamVtbl* lpVtbl;
};
struct IMediaStreamVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -379,6 +380,7 @@ struct IMediaStreamVtbl {
IMediaStream* This,
DWORD dwFlags);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -506,7 +508,7 @@ struct IStreamSample {
const IStreamSampleVtbl* lpVtbl;
};
struct IStreamSampleVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -548,6 +550,7 @@ struct IStreamSampleVtbl {
DWORD dwFlags,
DWORD dwMilliseconds);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/oaidl.h
View file @ 77ea021e
......@@ -642,7 +642,7 @@ struct IDispatch {
const IDispatchVtbl* lpVtbl;
};
struct IDispatchVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -686,6 +686,7 @@ struct IDispatchVtbl {
EXCEPINFO* pExcepInfo,
UINT* puArgErr);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -826,7 +827,7 @@ struct IEnumVARIANT {
const IEnumVARIANTVtbl* lpVtbl;
};
struct IEnumVARIANTVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -858,6 +859,7 @@ struct IEnumVARIANTVtbl {
IEnumVARIANT* This,
IEnumVARIANT** ppEnum);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -985,7 +987,7 @@ struct ITypeComp {
const ITypeCompVtbl* lpVtbl;
};
struct ITypeCompVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1016,6 +1018,7 @@ struct ITypeCompVtbl {
ITypeInfo** ppTInfo,
ITypeComp** ppTComp);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1205,7 +1208,7 @@ struct ITypeInfo {
const ITypeInfoVtbl* lpVtbl;
};
struct ITypeInfoVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1326,6 +1329,7 @@ struct ITypeInfoVtbl {
ITypeInfo* This,
VARDESC* pVarDesc);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1772,7 +1776,7 @@ struct ITypeInfo2 {
const ITypeInfo2Vtbl* lpVtbl;
};
struct ITypeInfo2Vtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1976,6 +1980,7 @@ struct ITypeInfo2Vtbl {
UINT index,
CUSTDATA* pCustData);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -2311,7 +2316,7 @@ struct ITypeLib {
const ITypeLibVtbl* lpVtbl;
};
struct ITypeLibVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -2378,6 +2383,7 @@ struct ITypeLibVtbl {
ITypeLib* This,
TLIBATTR* pTLibAttr);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -2617,7 +2623,7 @@ struct ITypeLib2 {
const ITypeLib2Vtbl* lpVtbl;
};
struct ITypeLib2Vtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -2707,6 +2713,7 @@ struct ITypeLib2Vtbl {
ITypeLib2* This,
CUSTDATA* pCustData);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -2868,7 +2875,7 @@ struct ITypeChangeEvents {
const ITypeChangeEventsVtbl* lpVtbl;
};
struct ITypeChangeEventsVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -2896,6 +2903,7 @@ struct ITypeChangeEventsVtbl {
ITypeInfo* pTInfoAfter,
LPOLESTR pStrName);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -2983,7 +2991,7 @@ struct IErrorInfo {
const IErrorInfoVtbl* lpVtbl;
};
struct IErrorInfoVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3018,6 +3026,7 @@ struct IErrorInfoVtbl {
IErrorInfo* This,
DWORD* pdwHelpContext);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3130,7 +3139,7 @@ struct ICreateErrorInfo {
const ICreateErrorInfoVtbl* lpVtbl;
};
struct ICreateErrorInfoVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3165,6 +3174,7 @@ struct ICreateErrorInfoVtbl {
ICreateErrorInfo* This,
DWORD dwHelpContext);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3265,7 +3275,7 @@ struct ISupportErrorInfo {
const ISupportErrorInfoVtbl* lpVtbl;
};
struct ISupportErrorInfoVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3284,6 +3294,7 @@ struct ISupportErrorInfoVtbl {
ISupportErrorInfo* This,
REFIID riid);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3344,7 +3355,7 @@ struct ITypeFactory {
const ITypeFactoryVtbl* lpVtbl;
};
struct ITypeFactoryVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3365,6 +3376,7 @@ struct ITypeFactoryVtbl {
REFIID riid,
IUnknown** ppv);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3446,7 +3458,7 @@ struct ITypeMarshal {
const ITypeMarshalVtbl* lpVtbl;
};
struct ITypeMarshalVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3489,6 +3501,7 @@ struct ITypeMarshalVtbl {
ITypeMarshal* This,
PVOID pvType);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3645,7 +3658,7 @@ struct IRecordInfo {
const IRecordInfoVtbl* lpVtbl;
};
struct IRecordInfoVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3737,6 +3750,7 @@ struct IRecordInfoVtbl {
IRecordInfo* This,
PVOID pvRecord);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -4042,7 +4056,7 @@ struct ICreateTypeInfo {
const ICreateTypeInfoVtbl* lpVtbl;
};
struct ICreateTypeInfoVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -4164,6 +4178,7 @@ struct ICreateTypeInfoVtbl {
HRESULT (STDMETHODCALLTYPE *LayOut)(
ICreateTypeInfo* This);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -4514,7 +4529,7 @@ struct ICreateTypeInfo2 {
const ICreateTypeInfo2Vtbl* lpVtbl;
};
struct ICreateTypeInfo2Vtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -4709,6 +4724,7 @@ struct ICreateTypeInfo2Vtbl {
ICreateTypeInfo2* This,
LPOLESTR szName);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -4999,7 +5015,7 @@ struct ICreateTypeLib {
const ICreateTypeLibVtbl* lpVtbl;
};
struct ICreateTypeLibVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -5056,6 +5072,7 @@ struct ICreateTypeLibVtbl {
HRESULT (STDMETHODCALLTYPE *SaveAllChanges)(
ICreateTypeLib* This);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -5218,7 +5235,7 @@ struct ICreateTypeLib2 {
const ICreateTypeLib2Vtbl* lpVtbl;
};
struct ICreateTypeLib2Vtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -5293,6 +5310,7 @@ struct ICreateTypeLib2Vtbl {
ICreateTypeLib2* This,
LPOLESTR szFileName);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -5407,7 +5425,7 @@ struct IErrorLog {
const IErrorLogVtbl* lpVtbl;
};
struct IErrorLogVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -5427,6 +5445,7 @@ struct IErrorLogVtbl {
LPCOLESTR pszPropName,
EXCEPINFO* pExcepInfo);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -5494,7 +5513,7 @@ struct IPropertyBag {
const IPropertyBagVtbl* lpVtbl;
};
struct IPropertyBagVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -5520,6 +5539,7 @@ struct IPropertyBagVtbl {
LPCOLESTR pszPropName,
VARIANT* pVar);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/oleidl.h
View file @ 77ea021e
......@@ -56,7 +56,7 @@ struct IOleWindow {
const IOleWindowVtbl* lpVtbl;
};
struct IOleWindowVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -79,6 +79,7 @@ struct IOleWindowVtbl {
IOleWindow* This,
BOOL fEnterMode);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -159,7 +160,7 @@ struct IOleInPlaceObject {
const IOleInPlaceObjectVtbl* lpVtbl;
};
struct IOleInPlaceObjectVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -197,6 +198,7 @@ struct IOleInPlaceObjectVtbl {
HRESULT (STDMETHODCALLTYPE *ReactivateAndUndo)(
IOleInPlaceObject* This);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -313,7 +315,7 @@ struct IOleInPlaceActiveObject {
const IOleInPlaceActiveObjectVtbl* lpVtbl;
};
struct IOleInPlaceActiveObjectVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -359,6 +361,7 @@ struct IOleInPlaceActiveObjectVtbl {
IOleInPlaceActiveObject* This,
BOOL fEnable);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -494,7 +497,7 @@ struct IOleInPlaceUIWindow {
const IOleInPlaceUIWindowVtbl* lpVtbl;
};
struct IOleInPlaceUIWindowVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -535,6 +538,7 @@ struct IOleInPlaceUIWindowVtbl {
IOleInPlaceActiveObject* pActiveObject,
LPCOLESTR pszObjName);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -665,7 +669,7 @@ struct IOleInPlaceFrame {
const IOleInPlaceFrameVtbl* lpVtbl;
};
struct IOleInPlaceFrameVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -735,6 +739,7 @@ struct IOleInPlaceFrameVtbl {
LPMSG lpmsg,
WORD wID);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -896,7 +901,7 @@ struct IOleInPlaceSite {
const IOleInPlaceSiteVtbl* lpVtbl;
};
struct IOleInPlaceSiteVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -958,6 +963,7 @@ struct IOleInPlaceSiteVtbl {
IOleInPlaceSite* This,
LPCRECT lprcPosRect);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1115,7 +1121,7 @@ struct IParseDisplayName {
const IParseDisplayNameVtbl* lpVtbl;
};
struct IParseDisplayNameVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1137,6 +1143,7 @@ struct IParseDisplayNameVtbl {
ULONG* pchEaten,
IMoniker** ppmkOut);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1204,7 +1211,7 @@ struct IOleContainer {
const IOleContainerVtbl* lpVtbl;
};
struct IOleContainerVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1236,6 +1243,7 @@ struct IOleContainerVtbl {
IOleContainer* This,
BOOL fLock);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1341,7 +1349,7 @@ struct IOleItemContainer {
const IOleItemContainerVtbl* lpVtbl;
};
struct IOleItemContainerVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1393,6 +1401,7 @@ struct IOleItemContainerVtbl {
IOleItemContainer* This,
LPOLESTR pszItem);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1531,7 +1540,7 @@ struct IOleLink {
const IOleLinkVtbl* lpVtbl;
};
struct IOleLinkVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1590,6 +1599,7 @@ struct IOleLinkVtbl {
IOleLink* This,
IBindCtx* pbc);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1767,7 +1777,7 @@ struct IOleClientSite {
const IOleClientSiteVtbl* lpVtbl;
};
struct IOleClientSiteVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1805,6 +1815,7 @@ struct IOleClientSiteVtbl {
HRESULT (STDMETHODCALLTYPE *RequestNewObjectLayout)(
IOleClientSite* This);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1930,7 +1941,7 @@ struct IOleCache {
const IOleCacheVtbl* lpVtbl;
};
struct IOleCacheVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1969,6 +1980,7 @@ struct IOleCacheVtbl {
STGMEDIUM* pmedium,
BOOL fRelease);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -2101,7 +2113,7 @@ struct IOleCache2 {
const IOleCache2Vtbl* lpVtbl;
};
struct IOleCache2Vtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -2151,6 +2163,7 @@ struct IOleCache2Vtbl {
IOleCache2* This,
DWORD dwDiscardOptions);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -2248,7 +2261,7 @@ struct IOleCacheControl {
const IOleCacheControlVtbl* lpVtbl;
};
struct IOleCacheControlVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -2270,6 +2283,7 @@ struct IOleCacheControlVtbl {
HRESULT (STDMETHODCALLTYPE *OnStop)(
IOleCacheControl* This);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -2362,7 +2376,7 @@ struct IEnumOLEVERB {
const IEnumOLEVERBVtbl* lpVtbl;
};
struct IEnumOLEVERBVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -2394,6 +2408,7 @@ struct IEnumOLEVERBVtbl {
IEnumOLEVERB* This,
IEnumOLEVERB** ppenum);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -2622,7 +2637,7 @@ struct IOleObject {
const IOleObjectVtbl* lpVtbl;
};
struct IOleObjectVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -2736,6 +2751,7 @@ struct IOleObjectVtbl {
IOleObject* This,
LOGPALETTE* pLogpal);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3027,7 +3043,7 @@ struct IOleAdviseHolder {
const IOleAdviseHolderVtbl* lpVtbl;
};
struct IOleAdviseHolderVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3065,6 +3081,7 @@ struct IOleAdviseHolderVtbl {
HRESULT (STDMETHODCALLTYPE *SendOnClose)(
IOleAdviseHolder* This);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3172,7 +3189,7 @@ struct IContinue {
const IContinueVtbl* lpVtbl;
};
struct IContinueVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3190,6 +3207,7 @@ struct IContinueVtbl {
HRESULT (STDMETHODCALLTYPE *FContinue)(
IContinue* This);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3285,7 +3303,7 @@ struct IViewObject {
const IViewObjectVtbl* lpVtbl;
};
struct IViewObjectVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3345,6 +3363,7 @@ struct IViewObjectVtbl {
DWORD* pAdvf,
IAdviseSink** ppAdvSink);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3539,7 +3558,7 @@ struct IViewObject2 {
const IViewObject2Vtbl* lpVtbl;
};
struct IViewObject2Vtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3607,6 +3626,7 @@ struct IViewObject2Vtbl {
DVTARGETDEVICE* ptd,
LPSIZEL lpsizel);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3688,7 +3708,7 @@ struct IDropSource {
const IDropSourceVtbl* lpVtbl;
};
struct IDropSourceVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3712,6 +3732,7 @@ struct IDropSourceVtbl {
IDropSource* This,
DWORD dwEffect);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3822,7 +3843,7 @@ struct IDropTarget {
const IDropTargetVtbl* lpVtbl;
};
struct IDropTargetVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3860,6 +3881,7 @@ struct IDropTargetVtbl {
POINTL pt,
DWORD* pdwEffect);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/pstore.h
View file @ 77ea021e
......@@ -101,7 +101,7 @@ struct IEnumPStoreItems {
const IEnumPStoreItemsVtbl* lpVtbl;
};
struct IEnumPStoreItemsVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -133,6 +133,7 @@ struct IEnumPStoreItemsVtbl {
IEnumPStoreItems* This,
DWORD celt);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -232,7 +233,7 @@ struct IEnumPStoreTypes {
const IEnumPStoreTypesVtbl* lpVtbl;
};
struct IEnumPStoreTypesVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -264,6 +265,7 @@ struct IEnumPStoreTypesVtbl {
IEnumPStoreTypes* This,
DWORD celt);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -481,7 +483,7 @@ struct IPStore {
const IPStoreVtbl* lpVtbl;
};
struct IPStoreVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -647,6 +649,7 @@ struct IPStoreVtbl {
DWORD dwFlags,
IEnumPStoreItems** ppenum);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/servprov.h
View file @ 77ea021e
......@@ -37,7 +37,7 @@ struct IServiceProvider {
const IServiceProviderVtbl* lpVtbl;
};
struct IServiceProviderVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -58,6 +58,7 @@ struct IServiceProviderVtbl {
REFIID riid,
void** ppvObject);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/shldisp.h
View file @ 77ea021e
......@@ -46,7 +46,7 @@ struct IAutoComplete {
const IAutoCompleteVtbl* lpVtbl;
};
struct IAutoCompleteVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -72,6 +72,7 @@ struct IAutoCompleteVtbl {
IAutoComplete* This,
BOOL fEnable);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -159,7 +160,7 @@ struct IAutoComplete2 {
const IAutoComplete2Vtbl* lpVtbl;
};
struct IAutoComplete2Vtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -194,6 +195,7 @@ struct IAutoComplete2Vtbl {
IAutoComplete2* This,
DWORD* pdwFlag);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -268,7 +270,7 @@ struct IFolderViewOC {
const IFolderViewOCVtbl* lpVtbl;
};
struct IFolderViewOCVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -317,6 +319,7 @@ struct IFolderViewOCVtbl {
IFolderViewOC* This,
IDispatch* pdisp);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/shobjidl.h
View file @ 77ea021e
......@@ -40,7 +40,7 @@ struct IPersistFolder {
const IPersistFolderVtbl* lpVtbl;
};
struct IPersistFolderVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -64,6 +64,7 @@ struct IPersistFolderVtbl {
IPersistFolder* This,
LPCITEMIDLIST pidl);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -128,7 +129,7 @@ struct IPersistFolder2 {
const IPersistFolder2Vtbl* lpVtbl;
};
struct IPersistFolder2Vtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -157,6 +158,7 @@ struct IPersistFolder2Vtbl {
IPersistFolder2* This,
LPITEMIDLIST* ppidl);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -236,7 +238,7 @@ struct IEnumIDList {
const IEnumIDListVtbl* lpVtbl;
};
struct IEnumIDListVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -268,6 +270,7 @@ struct IEnumIDListVtbl {
IEnumIDList* This,
IEnumIDList** ppenum);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -466,7 +469,7 @@ struct IShellFolder {
const IShellFolderVtbl* lpVtbl;
};
struct IShellFolderVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -551,6 +554,7 @@ struct IShellFolderVtbl {
SHGDNF uFlags,
LPITEMIDLIST* ppidlOut);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -748,7 +752,7 @@ struct IEnumExtraSearch {
const IEnumExtraSearchVtbl* lpVtbl;
};
struct IEnumExtraSearchVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -780,6 +784,7 @@ struct IEnumExtraSearchVtbl {
IEnumExtraSearch* This,
IEnumExtraSearch** ppenum);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -917,7 +922,7 @@ struct IShellFolder2 {
const IShellFolder2Vtbl* lpVtbl;
};
struct IShellFolder2Vtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1039,6 +1044,7 @@ struct IShellFolder2Vtbl {
UINT iColumn,
SHCOLUMNID* pscid);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1312,7 +1318,7 @@ struct IShellView {
const IShellViewVtbl* lpVtbl;
};
struct IShellViewVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1386,6 +1392,7 @@ struct IShellViewVtbl {
REFIID riid,
void** ppv);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1625,7 +1632,7 @@ struct IShellBrowser {
const IShellBrowserVtbl* lpVtbl;
};
struct IShellBrowserVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1714,6 +1721,7 @@ struct IShellBrowserVtbl {
UINT nButtons,
UINT uFlags);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1969,7 +1977,7 @@ struct IShellLinkA {
const IShellLinkAVtbl* lpVtbl;
};
struct IShellLinkAVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -2067,6 +2075,7 @@ struct IShellLinkAVtbl {
IShellLinkA* This,
LPCSTR pszFile);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -2368,7 +2377,7 @@ struct IShellLinkW {
const IShellLinkWVtbl* lpVtbl;
};
struct IShellLinkWVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -2466,6 +2475,7 @@ struct IShellLinkWVtbl {
IShellLinkW* This,
LPCWSTR pszFile);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -2710,7 +2720,7 @@ struct IShellExtInit {
const IShellExtInitVtbl* lpVtbl;
};
struct IShellExtInitVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -2731,6 +2741,7 @@ struct IShellExtInitVtbl {
IDataObject* pdtobj,
HKEY hkeyProgID);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -2804,7 +2815,7 @@ struct IPersistFolder3 {
const IPersistFolder3Vtbl* lpVtbl;
};
struct IPersistFolder3Vtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -2844,6 +2855,7 @@ struct IPersistFolder3Vtbl {
IPersistFolder3* This,
PERSIST_FOLDER_TARGET_INFO* ppfti);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -2949,7 +2961,7 @@ struct IExtractIconA {
const IExtractIconAVtbl* lpVtbl;
};
struct IExtractIconAVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -2980,6 +2992,7 @@ struct IExtractIconAVtbl {
HICON* phiconSmall,
UINT nIconSize);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3069,7 +3082,7 @@ struct IExtractIconW {
const IExtractIconWVtbl* lpVtbl;
};
struct IExtractIconWVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3100,6 +3113,7 @@ struct IExtractIconWVtbl {
HICON* phiconSmall,
UINT nIconSize);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3193,7 +3207,7 @@ struct ICommDlgBrowser {
const ICommDlgBrowserVtbl* lpVtbl;
};
struct ICommDlgBrowserVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3222,6 +3236,7 @@ struct ICommDlgBrowserVtbl {
IShellView* shv,
LPCITEMIDLIST pidl);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3316,7 +3331,7 @@ struct IDockingWindowFrame {
const IDockingWindowFrameVtbl* lpVtbl;
};
struct IDockingWindowFrameVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3357,6 +3372,7 @@ struct IDockingWindowFrameVtbl {
REFIID riid,
LPVOID* ppvObj);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3459,7 +3475,7 @@ struct IDragSourceHelper {
const IDragSourceHelperVtbl* lpVtbl;
};
struct IDragSourceHelperVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3485,6 +3501,7 @@ struct IDragSourceHelperVtbl {
POINT* ppt,
IDataObject* pDataObject);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3574,7 +3591,7 @@ struct IDropTargetHelper {
const IDropTargetHelperVtbl* lpVtbl;
};
struct IDropTargetHelperVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3614,6 +3631,7 @@ struct IDropTargetHelperVtbl {
IDropTargetHelper* This,
BOOL fShow);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3816,7 +3834,7 @@ struct IContextMenu {
const IContextMenuVtbl* lpVtbl;
};
struct IContextMenuVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3851,6 +3869,7 @@ struct IContextMenuVtbl {
LPSTR pszName,
UINT cchMax);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -3941,7 +3960,7 @@ struct IContextMenu2 {
const IContextMenu2Vtbl* lpVtbl;
};
struct IContextMenu2Vtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -3983,6 +4002,7 @@ struct IContextMenu2Vtbl {
WPARAM wParam,
LPARAM lParam);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -4056,7 +4076,7 @@ struct IContextMenu3 {
const IContextMenu3Vtbl* lpVtbl;
};
struct IContextMenu3Vtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -4106,6 +4126,7 @@ struct IContextMenu3Vtbl {
LPARAM lParam,
LRESULT* plResult);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -4180,7 +4201,7 @@ struct IShellExecuteHookA {
const IShellExecuteHookAVtbl* lpVtbl;
};
struct IShellExecuteHookAVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -4199,6 +4220,7 @@ struct IShellExecuteHookAVtbl {
IShellExecuteHookA* This,
struct _SHELLEXECUTEINFOA* pei);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -4258,7 +4280,7 @@ struct IShellExecuteHookW {
const IShellExecuteHookWVtbl* lpVtbl;
};
struct IShellExecuteHookWVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -4277,6 +4299,7 @@ struct IShellExecuteHookWVtbl {
IShellExecuteHookW* This,
struct _SHELLEXECUTEINFOW* pei);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/unknwn.h
View file @ 77ea021e
......@@ -11,9 +11,13 @@ extern "C" {
#if defined(ICOM_MSVTABLE_COMPAT) && (!defined(__cplusplus) || defined(CINTERFACE))
# define ICOM_MSVTABLE_COMPAT_FIELDS long dummyRTTI1,dummyRTTI2;
# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE 0,0,
# define BEGIN_INTERFACE ICOM_MSVTABLE_COMPAT_FIELDS
# define END_INTERFACE
#else
# define ICOM_MSVTABLE_COMPAT_FIELDS
# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE
# define BEGIN_INTERFACE
# define END_INTERFACE
#endif
#ifndef __IUnknown_FWD_DEFINED__
#define __IUnknown_FWD_DEFINED__
......@@ -53,7 +57,7 @@ struct IUnknown {
const IUnknownVtbl* lpVtbl;
};
struct IUnknownVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -67,6 +71,7 @@ struct IUnknownVtbl {
ULONG (STDMETHODCALLTYPE *Release)(
IUnknown* This);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -143,7 +148,7 @@ struct IClassFactory {
const IClassFactoryVtbl* lpVtbl;
};
struct IClassFactoryVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -168,6 +173,7 @@ struct IClassFactoryVtbl {
IClassFactory* This,
BOOL fLock);
END_INTERFACE
};
#ifdef COBJMACROS
......
include/unknwn.idl
View file @ 77ea021e
......@@ -24,9 +24,13 @@ import "wtypes.idl";
cpp_quote("#if defined(ICOM_MSVTABLE_COMPAT) && (!defined(__cplusplus) || defined(CINTERFACE))")
cpp_quote("# define ICOM_MSVTABLE_COMPAT_FIELDS long dummyRTTI1,dummyRTTI2;")
cpp_quote("# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE 0,0,")
cpp_quote("# define BEGIN_INTERFACE ICOM_MSVTABLE_COMPAT_FIELDS")
cpp_quote("# define END_INTERFACE")
cpp_quote("#else")
cpp_quote("# define ICOM_MSVTABLE_COMPAT_FIELDS")
cpp_quote("# define ICOM_MSVTABLE_COMPAT_DummyRTTIVALUE")
cpp_quote("# define BEGIN_INTERFACE")
cpp_quote("# define END_INTERFACE")
cpp_quote("#endif")
/* Interfaces */
......
include/urlmon.h
View file @ 77ea021e
......@@ -55,7 +55,7 @@ struct IBinding {
const IBindingVtbl* lpVtbl;
};
struct IBindingVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -94,6 +94,7 @@ struct IBindingVtbl {
LPOLESTR* pszResult,
DWORD* pdwReserved);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -380,7 +381,7 @@ struct IBindStatusCallback {
const IBindStatusCallbackVtbl* lpVtbl;
};
struct IBindStatusCallbackVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -437,6 +438,7 @@ struct IBindStatusCallbackVtbl {
REFIID riid,
IUnknown* punk);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -618,7 +620,7 @@ struct IBindHost {
const IBindHostVtbl* lpVtbl;
};
struct IBindHostVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -656,6 +658,7 @@ struct IBindHostVtbl {
REFIID riid,
void** ppvObj);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -777,7 +780,7 @@ struct IWinInetInfo {
const IWinInetInfoVtbl* lpVtbl;
};
struct IWinInetInfoVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -798,6 +801,7 @@ struct IWinInetInfoVtbl {
LPVOID pBuffer,
DWORD* pcbBuf);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -874,7 +878,7 @@ struct IWinInetHttpInfo {
const IWinInetHttpInfoVtbl* lpVtbl;
};
struct IWinInetHttpInfoVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -904,6 +908,7 @@ struct IWinInetHttpInfoVtbl {
DWORD* pdwFlags,
DWORD* pdwReserved);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1007,7 +1012,7 @@ struct IPersistMoniker {
const IPersistMonikerVtbl* lpVtbl;
};
struct IPersistMonikerVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1051,6 +1056,7 @@ struct IPersistMonikerVtbl {
IPersistMoniker* This,
IMoniker** ppimkName);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1239,7 +1245,7 @@ struct IInternetProtocolInfo {
const IInternetProtocolInfoVtbl* lpVtbl;
};
struct IInternetProtocolInfoVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1290,6 +1296,7 @@ struct IInternetProtocolInfoVtbl {
DWORD* pcbBuf,
DWORD dwReserved);
END_INTERFACE
};
#ifdef COBJMACROS
......@@ -1437,7 +1444,7 @@ struct IInternetSession {
const IInternetSessionVtbl* lpVtbl;
};
struct IInternetSessionVtbl {
ICOM_MSVTABLE_COMPAT_FIELDS
BEGIN_INTERFACE
/*** IUnknown methods ***/
HRESULT (STDMETHODCALLTYPE *QueryInterface)(
......@@ -1493,6 +1500,7 @@ struct IInternetSessionVtbl {
DWORD dwBufferLength,
DWORD dwReserved);
END_INTERFACE
};
#ifdef COBJMACROS
......
tools/widl/header.c
View file @ 77ea021e
......@@ -767,10 +767,11 @@ void write_com_interface(type_t *iface)
fprintf(header, "};\n");
fprintf(header, "struct %sVtbl {\n", iface->name);
indentation++;
fprintf(header, " ICOM_MSVTABLE_COMPAT_FIELDS\n");
fprintf(header, " BEGIN_INTERFACE\n");
fprintf(header, "\n");
write_c_method_def(iface);
indentation--;
fprintf(header, " END_INTERFACE\n");
fprintf(header, "};\n");
fprintf(header, "\n");
fprintf(header, "#ifdef COBJMACROS\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment