From 77ea021e5f11e24f03ff937b40f660648e387e8c Mon Sep 17 00:00:00 2001 From: Mike McCormack Date: Sun, 22 Aug 2004 02:25:05 +0000 Subject: [PATCH] Generate BEGIN_INTERFACE,END_INTERFACE macros instead of ICOM_MSVTABLE_COMPAT_FIELDS. --- include/activscp.h | 30 ++++++--- include/amstream.h | 21 ++++-- include/amvideo.h | 15 +++-- include/austream.h | 12 ++-- include/comcat.h | 12 ++-- include/ddstream.h | 6 +- include/dispex.h | 12 ++-- include/docobj.h | 21 ++++-- include/exdisp.h | 9 ++- include/mlang.h | 24 ++++--- include/mmstream.h | 9 ++- include/oaidl.h | 60 +++++++++++------ include/objidl.h | 156 +++++++++++++++++++++++++++++--------------- include/ocidl.h | 111 ++++++++++++++++++++----------- include/oleidl.h | 66 ++++++++++++------- include/pstore.h | 9 ++- include/servprov.h | 3 +- include/shldisp.h | 9 ++- include/shobjidl.h | 69 +++++++++++++------- include/strmif.h | 135 +++++++++++++++++++++++++------------- include/unknwn.h | 10 ++- include/unknwn.idl | 4 ++ include/urlmon.h | 24 ++++--- tools/widl/header.c | 3 +- 24 files changed, 556 insertions(+), 274 deletions(-) diff --git a/include/activscp.h b/include/activscp.h index 42d2c8fa95..cb018fe7b9 100644 --- a/include/activscp.h +++ b/include/activscp.h @@ -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 diff --git a/include/amstream.h b/include/amstream.h index 44e5ff158f..07e470724d 100644 --- a/include/amstream.h +++ b/include/amstream.h @@ -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 diff --git a/include/amvideo.h b/include/amvideo.h index cadc5703f7..70a7dc37df 100644 --- a/include/amvideo.h +++ b/include/amvideo.h @@ -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 diff --git a/include/austream.h b/include/austream.h index cb0a9469aa..3e265859ac 100644 --- a/include/austream.h +++ b/include/austream.h @@ -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 diff --git a/include/comcat.h b/include/comcat.h index 2c4d8715af..ab3bb515d0 100644 --- a/include/comcat.h +++ b/include/comcat.h @@ -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 diff --git a/include/ddstream.h b/include/ddstream.h index cb48768337..f28cbc7b13 100644 --- a/include/ddstream.h +++ b/include/ddstream.h @@ -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 diff --git a/include/dispex.h b/include/dispex.h index 99e0d01496..6d40674a2a 100644 --- a/include/dispex.h +++ b/include/dispex.h @@ -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 diff --git a/include/docobj.h b/include/docobj.h index 17a725ee35..41bd370878 100644 --- a/include/docobj.h +++ b/include/docobj.h @@ -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 diff --git a/include/exdisp.h b/include/exdisp.h index 02e7df7663..0e0a2d3915 100644 --- a/include/exdisp.h +++ b/include/exdisp.h @@ -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 diff --git a/include/mlang.h b/include/mlang.h index cbfea106f9..190a5edab0 100644 --- a/include/mlang.h +++ b/include/mlang.h @@ -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 diff --git a/include/mmstream.h b/include/mmstream.h index 15a8fdb054..1d4a43597b 100644 --- a/include/mmstream.h +++ b/include/mmstream.h @@ -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 diff --git a/include/oaidl.h b/include/oaidl.h index 312a9c3bee..ba40ea8b19 100644 --- a/include/oaidl.h +++ b/include/oaidl.h @@ -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 diff --git a/include/objidl.h b/include/objidl.h index cc0723d27a..bf1ca1c331 100644 --- a/include/objidl.h +++ b/include/objidl.h @@ -97,7 +97,7 @@ struct IMarshal { const IMarshalVtbl* lpVtbl; }; struct IMarshalVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -153,6 +153,7 @@ struct IMarshalVtbl { IMarshal* This, DWORD dwReserved); + END_INTERFACE }; #ifdef COBJMACROS @@ -282,7 +283,7 @@ struct IStdMarshalInfo { const IStdMarshalInfoVtbl* lpVtbl; }; struct IStdMarshalInfoVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -303,6 +304,7 @@ struct IStdMarshalInfoVtbl { void* pvDestContext, CLSID* pClsid); + END_INTERFACE }; #ifdef COBJMACROS @@ -377,7 +379,7 @@ struct IExternalConnection { const IExternalConnectionVtbl* lpVtbl; }; struct IExternalConnectionVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -403,6 +405,7 @@ struct IExternalConnectionVtbl { DWORD reserved, BOOL fLastReleaseCloses); + END_INTERFACE }; #ifdef COBJMACROS @@ -483,7 +486,7 @@ struct IMultiQI { const IMultiQIVtbl* lpVtbl; }; struct IMultiQIVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -503,6 +506,7 @@ struct IMultiQIVtbl { ULONG cMQIs, MULTI_QI* pMQIs); + END_INTERFACE }; #ifdef COBJMACROS @@ -580,7 +584,7 @@ struct IMalloc { const IMallocVtbl* lpVtbl; }; struct IMallocVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -619,6 +623,7 @@ struct IMallocVtbl { void (STDMETHODCALLTYPE *HeapMinimize)( IMalloc* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -772,7 +777,7 @@ struct IMallocSpy { const IMallocSpyVtbl* lpVtbl; }; struct IMallocSpyVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -843,6 +848,7 @@ struct IMallocSpyVtbl { void (STDMETHODCALLTYPE *PostHeapMinimize)( IMallocSpy* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -1032,7 +1038,7 @@ struct IEnumUnknown { const IEnumUnknownVtbl* lpVtbl; }; struct IEnumUnknownVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1064,6 +1070,7 @@ struct IEnumUnknownVtbl { IEnumUnknown* This, IEnumUnknown** ppenum); + END_INTERFACE }; #ifdef COBJMACROS @@ -1168,7 +1175,7 @@ struct ISurrogate { const ISurrogateVtbl* lpVtbl; }; struct ISurrogateVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1190,6 +1197,7 @@ struct ISurrogateVtbl { HRESULT (STDMETHODCALLTYPE *FreeSurrogate)( ISurrogate* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -1269,7 +1277,7 @@ struct IGlobalInterfaceTable { const IGlobalInterfaceTableVtbl* lpVtbl; }; struct IGlobalInterfaceTableVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1300,6 +1308,7 @@ struct IGlobalInterfaceTableVtbl { REFIID riid, void** ppv); + END_INTERFACE }; #ifdef COBJMACROS @@ -1438,7 +1447,7 @@ struct IBindCtx { const IBindCtxVtbl* lpVtbl; }; struct IBindCtxVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1494,6 +1503,7 @@ struct IBindCtxVtbl { IBindCtx* This, LPOLESTR pszKey); + END_INTERFACE }; #ifdef COBJMACROS @@ -1668,7 +1678,7 @@ struct IEnumMoniker { const IEnumMonikerVtbl* lpVtbl; }; struct IEnumMonikerVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1700,6 +1710,7 @@ struct IEnumMonikerVtbl { IEnumMoniker* This, IEnumMoniker** ppenum); + END_INTERFACE }; #ifdef COBJMACROS @@ -1814,7 +1825,7 @@ struct IRunnableObject { const IRunnableObjectVtbl* lpVtbl; }; struct IRunnableObjectVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1849,6 +1860,7 @@ struct IRunnableObjectVtbl { IRunnableObject* This, BOOL fContained); + END_INTERFACE }; #ifdef COBJMACROS @@ -1975,7 +1987,7 @@ struct IRunningObjectTable { const IRunningObjectTableVtbl* lpVtbl; }; struct IRunningObjectTableVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2024,6 +2036,7 @@ struct IRunningObjectTableVtbl { IRunningObjectTable* This, IEnumMoniker** ppenumMoniker); + END_INTERFACE }; #ifdef COBJMACROS @@ -2150,7 +2163,7 @@ struct IPersist { const IPersistVtbl* lpVtbl; }; struct IPersistVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2169,6 +2182,7 @@ struct IPersistVtbl { IPersist* This, CLSID* pClassID); + END_INTERFACE }; #ifdef COBJMACROS @@ -2239,7 +2253,7 @@ struct IPersistStream { const IPersistStreamVtbl* lpVtbl; }; struct IPersistStreamVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2275,6 +2289,7 @@ struct IPersistStreamVtbl { IPersistStream* This, ULARGE_INTEGER* pcbSize); + END_INTERFACE }; #ifdef COBJMACROS @@ -2447,7 +2462,7 @@ struct IMoniker { const IMonikerVtbl* lpVtbl; }; struct IMonikerVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2568,6 +2583,7 @@ struct IMonikerVtbl { IMoniker* This, DWORD* pdwMksys); + END_INTERFACE }; #ifdef COBJMACROS @@ -2830,7 +2846,7 @@ struct IROTData { const IROTDataVtbl* lpVtbl; }; struct IROTDataVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2851,6 +2867,7 @@ struct IROTDataVtbl { ULONG cbMax, ULONG* pcbData); + END_INTERFACE }; #ifdef COBJMACROS @@ -2919,7 +2936,7 @@ struct IEnumString { const IEnumStringVtbl* lpVtbl; }; struct IEnumStringVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2951,6 +2968,7 @@ struct IEnumStringVtbl { IEnumString* This, IEnumString** ppenum); + END_INTERFACE }; #ifdef COBJMACROS @@ -3054,7 +3072,7 @@ struct IClassActivator { const IClassActivatorVtbl* lpVtbl; }; struct IClassActivatorVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -3077,6 +3095,7 @@ struct IClassActivatorVtbl { REFIID riid, void** ppv); + END_INTERFACE }; #ifdef COBJMACROS @@ -3146,7 +3165,7 @@ struct ISequentialStream { const ISequentialStreamVtbl* lpVtbl; }; struct ISequentialStreamVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -3173,6 +3192,7 @@ struct ISequentialStreamVtbl { ULONG cb, ULONG* pcbWritten); + END_INTERFACE }; #ifdef COBJMACROS @@ -3333,7 +3353,7 @@ struct IStream { const IStreamVtbl* lpVtbl; }; struct IStreamVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -3406,6 +3426,7 @@ struct IStreamVtbl { IStream* This, IStream** ppstm); + END_INTERFACE }; #ifdef COBJMACROS @@ -3594,7 +3615,7 @@ struct IEnumSTATSTG { const IEnumSTATSTGVtbl* lpVtbl; }; struct IEnumSTATSTGVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -3626,6 +3647,7 @@ struct IEnumSTATSTGVtbl { IEnumSTATSTG* This, IEnumSTATSTG** ppenum); + END_INTERFACE }; #ifdef COBJMACROS @@ -3815,7 +3837,7 @@ struct IStorage { const IStorageVtbl* lpVtbl; }; struct IStorageVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -3921,6 +3943,7 @@ struct IStorageVtbl { STATSTG* pstatstg, DWORD grfStatFlag); + END_INTERFACE }; #ifdef COBJMACROS @@ -4196,7 +4219,7 @@ struct IPersistFile { const IPersistFileVtbl* lpVtbl; }; struct IPersistFileVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4237,6 +4260,7 @@ struct IPersistFileVtbl { IPersistFile* This, LPOLESTR* ppszFileName); + END_INTERFACE }; #ifdef COBJMACROS @@ -4358,7 +4382,7 @@ struct IPersistStorage { const IPersistStorageVtbl* lpVtbl; }; struct IPersistStorageVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4401,6 +4425,7 @@ struct IPersistStorageVtbl { HRESULT (STDMETHODCALLTYPE *HandsOffStorage)( IPersistStorage* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -4514,7 +4539,7 @@ struct IRootStorage { const IRootStorageVtbl* lpVtbl; }; struct IRootStorageVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4533,6 +4558,7 @@ struct IRootStorageVtbl { IRootStorage* This, LPOLESTR pszFile); + END_INTERFACE }; #ifdef COBJMACROS @@ -4622,7 +4648,7 @@ struct ILockBytes { const ILockBytesVtbl* lpVtbl; }; struct ILockBytesVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4675,6 +4701,7 @@ struct ILockBytesVtbl { STATSTG* pstatstg, DWORD grfStatFlag); + END_INTERFACE }; #ifdef COBJMACROS @@ -4841,7 +4868,7 @@ struct IFillLockBytes { const IFillLockBytesVtbl* lpVtbl; }; struct IFillLockBytesVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4877,6 +4904,7 @@ struct IFillLockBytesVtbl { IFillLockBytes* This, BOOL bCanceled); + END_INTERFACE }; #ifdef COBJMACROS @@ -4995,7 +5023,7 @@ struct IProgressNotify { const IProgressNotifyVtbl* lpVtbl; }; struct IProgressNotifyVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5017,6 +5045,7 @@ struct IProgressNotifyVtbl { BOOL fAccurate, BOOL fOwner); + END_INTERFACE }; #ifdef COBJMACROS @@ -5099,7 +5128,7 @@ struct ILayoutStorage { const ILayoutStorageVtbl* lpVtbl; }; struct ILayoutStorageVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5134,6 +5163,7 @@ struct ILayoutStorageVtbl { ILayoutStorage* This, ILockBytes* pILockBytes); + END_INTERFACE }; #ifdef COBJMACROS @@ -5264,7 +5294,7 @@ struct IEnumFORMATETC { const IEnumFORMATETCVtbl* lpVtbl; }; struct IEnumFORMATETCVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5296,6 +5326,7 @@ struct IEnumFORMATETCVtbl { IEnumFORMATETC* This, IEnumFORMATETC** ppenum); + END_INTERFACE }; #ifdef COBJMACROS @@ -5425,7 +5456,7 @@ struct IEnumSTATDATA { const IEnumSTATDATAVtbl* lpVtbl; }; struct IEnumSTATDATAVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5457,6 +5488,7 @@ struct IEnumSTATDATAVtbl { IEnumSTATDATA* This, IEnumSTATDATA** ppenum); + END_INTERFACE }; #ifdef COBJMACROS @@ -5662,7 +5694,7 @@ struct IAdviseSink { const IAdviseSinkVtbl* lpVtbl; }; struct IAdviseSinkVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5697,6 +5729,7 @@ struct IAdviseSinkVtbl { void (STDMETHODCALLTYPE *OnClose)( IAdviseSink* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -5835,7 +5868,7 @@ struct IAdviseSink2 { const IAdviseSink2Vtbl* lpVtbl; }; struct IAdviseSink2Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5875,6 +5908,7 @@ struct IAdviseSink2Vtbl { IAdviseSink2* This, IMoniker* pmk); + END_INTERFACE }; #ifdef COBJMACROS @@ -5993,7 +6027,7 @@ struct IDataObject { const IDataObjectVtbl* lpVtbl; }; struct IDataObjectVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -6053,6 +6087,7 @@ struct IDataObjectVtbl { IDataObject* This, IEnumSTATDATA** ppenumAdvise); + END_INTERFACE }; #ifdef COBJMACROS @@ -6243,7 +6278,7 @@ struct IDataAdviseHolder { const IDataAdviseHolderVtbl* lpVtbl; }; struct IDataAdviseHolderVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -6280,6 +6315,7 @@ struct IDataAdviseHolderVtbl { DWORD dwReserved, DWORD advf); + END_INTERFACE }; #ifdef COBJMACROS @@ -6420,7 +6456,7 @@ struct IMessageFilter { const IMessageFilterVtbl* lpVtbl; }; struct IMessageFilterVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -6454,6 +6490,7 @@ struct IMessageFilterVtbl { DWORD dwTickCount, DWORD dwPendingType); + END_INTERFACE }; #ifdef COBJMACROS @@ -6570,7 +6607,7 @@ struct IRpcChannelBuffer { const IRpcChannelBufferVtbl* lpVtbl; }; struct IRpcChannelBufferVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -6607,6 +6644,7 @@ struct IRpcChannelBufferVtbl { HRESULT (STDMETHODCALLTYPE *IsConnected)( IRpcChannelBuffer* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -6709,7 +6747,7 @@ struct IRpcChannelBuffer2 { const IRpcChannelBuffer2Vtbl* lpVtbl; }; struct IRpcChannelBuffer2Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -6751,6 +6789,7 @@ struct IRpcChannelBuffer2Vtbl { IRpcChannelBuffer2* This, DWORD* pdwVersion); + END_INTERFACE }; #ifdef COBJMACROS @@ -6850,7 +6889,7 @@ struct IRpcChannelBuffer3 { const IRpcChannelBuffer3Vtbl* lpVtbl; }; struct IRpcChannelBuffer3Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -6930,6 +6969,7 @@ struct IRpcChannelBuffer3Vtbl { RPCOLEMESSAGE* pMsg, IAsyncManager* pAsyncMgr); + END_INTERFACE }; #ifdef COBJMACROS @@ -7078,7 +7118,7 @@ struct IRpcProxyBuffer { const IRpcProxyBufferVtbl* lpVtbl; }; struct IRpcProxyBufferVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -7100,6 +7140,7 @@ struct IRpcProxyBufferVtbl { void (STDMETHODCALLTYPE *Disconnect)( IRpcProxyBuffer* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -7188,7 +7229,7 @@ struct IRpcStubBuffer { const IRpcStubBufferVtbl* lpVtbl; }; struct IRpcStubBufferVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -7230,6 +7271,7 @@ struct IRpcStubBufferVtbl { IRpcStubBuffer* This, void* pv); + END_INTERFACE }; #ifdef COBJMACROS @@ -7357,7 +7399,7 @@ struct IPSFactoryBuffer { const IPSFactoryBufferVtbl* lpVtbl; }; struct IPSFactoryBufferVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -7385,6 +7427,7 @@ struct IPSFactoryBufferVtbl { IUnknown* pUnkServer, IRpcStubBuffer** ppStub); + END_INTERFACE }; #ifdef COBJMACROS @@ -7505,7 +7548,7 @@ struct IChannelHook { const IChannelHookVtbl* lpVtbl; }; struct IChannelHookVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -7565,6 +7608,7 @@ struct IChannelHookVtbl { void* pDataBuffer, HRESULT hrFault); + END_INTERFACE }; #ifdef COBJMACROS @@ -7959,7 +8003,7 @@ struct IPropertyStorage { const IPropertyStorageVtbl* lpVtbl; }; struct IPropertyStorageVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -8034,6 +8078,7 @@ struct IPropertyStorageVtbl { IPropertyStorage* This, STATPROPSETSTG* statpsstg); + END_INTERFACE }; #ifdef COBJMACROS @@ -8231,7 +8276,7 @@ struct IPropertySetStorage { const IPropertySetStorageVtbl* lpVtbl; }; struct IPropertySetStorageVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -8268,6 +8313,7 @@ struct IPropertySetStorageVtbl { IPropertySetStorage* This, IEnumSTATPROPSETSTG** ppenum); + END_INTERFACE }; #ifdef COBJMACROS @@ -8370,7 +8416,7 @@ struct IEnumSTATPROPSTG { const IEnumSTATPROPSTGVtbl* lpVtbl; }; struct IEnumSTATPROPSTGVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -8402,6 +8448,7 @@ struct IEnumSTATPROPSTGVtbl { IEnumSTATPROPSTG* This, IEnumSTATPROPSTG** ppenum); + END_INTERFACE }; #ifdef COBJMACROS @@ -8509,7 +8556,7 @@ struct IEnumSTATPROPSETSTG { const IEnumSTATPROPSETSTGVtbl* lpVtbl; }; struct IEnumSTATPROPSETSTGVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -8541,6 +8588,7 @@ struct IEnumSTATPROPSETSTGVtbl { IEnumSTATPROPSETSTG* This, IEnumSTATPROPSETSTG** ppenum); + END_INTERFACE }; #ifdef COBJMACROS @@ -8679,7 +8727,7 @@ struct IClientSecurity { const IClientSecurityVtbl* lpVtbl; }; struct IClientSecurityVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -8721,6 +8769,7 @@ struct IClientSecurityVtbl { IUnknown* pProxy, IUnknown** ppCopy); + END_INTERFACE }; #ifdef COBJMACROS @@ -8829,7 +8878,7 @@ struct IServerSecurity { const IServerSecurityVtbl* lpVtbl; }; struct IServerSecurityVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -8863,6 +8912,7 @@ struct IServerSecurityVtbl { BOOL (STDMETHODCALLTYPE *IsImpersonating)( IServerSecurity* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -8958,7 +9008,7 @@ struct IAsyncSetup { const IAsyncSetupVtbl* lpVtbl; }; struct IAsyncSetupVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -8981,6 +9031,7 @@ struct IAsyncSetupVtbl { IUnknown** ppInner, IAsyncManager** ppAsyncMgr); + END_INTERFACE }; #ifdef COBJMACROS @@ -9051,7 +9102,7 @@ struct IAsyncManager { const IAsyncManagerVtbl* lpVtbl; }; struct IAsyncManagerVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -9079,6 +9130,7 @@ struct IAsyncManagerVtbl { IAsyncManager* This, ULONG* pulStateFlags); + END_INTERFACE }; #ifdef COBJMACROS diff --git a/include/ocidl.h b/include/ocidl.h index b615159270..ee46a5777a 100644 --- a/include/ocidl.h +++ b/include/ocidl.h @@ -128,7 +128,7 @@ struct IFont { const IFontVtbl* lpVtbl; }; struct IFontVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -240,6 +240,7 @@ struct IFontVtbl { IFont* This, HDC hdc); + END_INTERFACE }; #ifdef COBJMACROS @@ -528,7 +529,7 @@ struct IFontDisp { const IFontDispVtbl* lpVtbl; }; struct IFontDispVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -572,6 +573,7 @@ struct IFontDispVtbl { EXCEPINFO* pExcepInfo, UINT* puArgErr); + END_INTERFACE }; #ifdef COBJMACROS @@ -697,7 +699,7 @@ struct IPicture { const IPictureVtbl* lpVtbl; }; struct IPictureVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -780,6 +782,7 @@ struct IPictureVtbl { IPicture* This, DWORD* pDwAttr); + END_INTERFACE }; #ifdef COBJMACROS @@ -979,7 +982,7 @@ struct IPictureDisp { const IPictureDispVtbl* lpVtbl; }; struct IPictureDispVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1023,6 +1026,7 @@ struct IPictureDispVtbl { EXCEPINFO* pExcepInfo, UINT* puArgErr); + END_INTERFACE }; #ifdef COBJMACROS @@ -1102,7 +1106,7 @@ struct IOleControl { const IOleControlVtbl* lpVtbl; }; struct IOleControlVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1133,6 +1137,7 @@ struct IOleControlVtbl { IOleControl* This, BOOL bFreeze); + END_INTERFACE }; #ifdef COBJMACROS @@ -1257,7 +1262,7 @@ struct IOleControlSite { const IOleControlSiteVtbl* lpVtbl; }; struct IOleControlSiteVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1301,6 +1306,7 @@ struct IOleControlSiteVtbl { HRESULT (STDMETHODCALLTYPE *ShowPropertyFrame)( IOleControlSite* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -1433,7 +1439,7 @@ struct IOleInPlaceSiteEx { const IOleInPlaceSiteExVtbl* lpVtbl; }; struct IOleInPlaceSiteExVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1508,6 +1514,7 @@ struct IOleInPlaceSiteExVtbl { HRESULT (STDMETHODCALLTYPE *RequestUIActivate)( IOleInPlaceSiteEx* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -1665,7 +1672,7 @@ struct IOleInPlaceSiteWindowless { const IOleInPlaceSiteWindowlessVtbl* lpVtbl; }; struct IOleInPlaceSiteWindowlessVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1796,6 +1803,7 @@ struct IOleInPlaceSiteWindowlessVtbl { LPARAM lParam, LRESULT* plResult); + END_INTERFACE }; #ifdef COBJMACROS @@ -2015,7 +2023,7 @@ struct IOleInPlaceObjectWindowless { const IOleInPlaceObjectWindowlessVtbl* lpVtbl; }; struct IOleInPlaceObjectWindowlessVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2065,6 +2073,7 @@ struct IOleInPlaceObjectWindowlessVtbl { IOleInPlaceObjectWindowless* This, IDropTarget** ppDropTarget); + END_INTERFACE }; #ifdef COBJMACROS @@ -2171,7 +2180,7 @@ struct IClassFactory2 { const IClassFactory2Vtbl* lpVtbl; }; struct IClassFactory2Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2214,6 +2223,7 @@ struct IClassFactory2Vtbl { BSTR bstrKey, PVOID* ppvObj); + END_INTERFACE }; #ifdef COBJMACROS @@ -2377,7 +2387,7 @@ struct IViewObjectEx { const IViewObjectExVtbl* lpVtbl; }; struct IViewObjectExVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2480,6 +2490,7 @@ struct IViewObjectExVtbl { DVEXTENTINFO* pExtentInfo, LPSIZEL pSizel); + END_INTERFACE }; #ifdef COBJMACROS @@ -2615,7 +2626,7 @@ struct IProvideClassInfo { const IProvideClassInfoVtbl* lpVtbl; }; struct IProvideClassInfoVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2634,6 +2645,7 @@ struct IProvideClassInfoVtbl { IProvideClassInfo* This, ITypeInfo** ppTI); + END_INTERFACE }; #ifdef COBJMACROS @@ -2699,7 +2711,7 @@ struct IProvideClassInfo2 { const IProvideClassInfo2Vtbl* lpVtbl; }; struct IProvideClassInfo2Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2724,6 +2736,7 @@ struct IProvideClassInfo2Vtbl { DWORD dwGuidKind, GUID* pGUID); + END_INTERFACE }; #ifdef COBJMACROS @@ -2812,7 +2825,7 @@ struct IConnectionPoint { const IConnectionPointVtbl* lpVtbl; }; struct IConnectionPointVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2848,6 +2861,7 @@ struct IConnectionPointVtbl { IConnectionPoint* This, IEnumConnections** ppEnum); + END_INTERFACE }; #ifdef COBJMACROS @@ -2953,7 +2967,7 @@ struct IConnectionPointContainer { const IConnectionPointContainerVtbl* lpVtbl; }; struct IConnectionPointContainerVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2977,6 +2991,7 @@ struct IConnectionPointContainerVtbl { REFIID riid, IConnectionPoint** ppCP); + END_INTERFACE }; #ifdef COBJMACROS @@ -3059,7 +3074,7 @@ struct IEnumConnections { const IEnumConnectionsVtbl* lpVtbl; }; struct IEnumConnectionsVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -3091,6 +3106,7 @@ struct IEnumConnectionsVtbl { IEnumConnections* This, IEnumConnections** ppEnum); + END_INTERFACE }; #ifdef COBJMACROS @@ -3198,7 +3214,7 @@ struct IEnumConnectionPoints { const IEnumConnectionPointsVtbl* lpVtbl; }; struct IEnumConnectionPointsVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -3230,6 +3246,7 @@ struct IEnumConnectionPointsVtbl { IEnumConnectionPoints* This, IEnumConnectionPoints** ppEnum); + END_INTERFACE }; #ifdef COBJMACROS @@ -3378,7 +3395,7 @@ struct IPropertyPage { const IPropertyPageVtbl* lpVtbl; }; struct IPropertyPageVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -3437,6 +3454,7 @@ struct IPropertyPageVtbl { IPropertyPage* This, MSG* pMsg); + END_INTERFACE }; #ifdef COBJMACROS @@ -3597,7 +3615,7 @@ struct IPropertyPage2 { const IPropertyPage2Vtbl* lpVtbl; }; struct IPropertyPage2Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -3661,6 +3679,7 @@ struct IPropertyPage2Vtbl { IPropertyPage2* This, DISPID dispID); + END_INTERFACE }; #ifdef COBJMACROS @@ -3755,7 +3774,7 @@ struct IPropertyPageSite { const IPropertyPageSiteVtbl* lpVtbl; }; struct IPropertyPageSiteVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -3786,6 +3805,7 @@ struct IPropertyPageSiteVtbl { IPropertyPageSite* This, MSG* pMsg); + END_INTERFACE }; #ifdef COBJMACROS @@ -3879,7 +3899,7 @@ struct IPropertyNotifySink { const IPropertyNotifySinkVtbl* lpVtbl; }; struct IPropertyNotifySinkVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -3902,6 +3922,7 @@ struct IPropertyNotifySinkVtbl { IPropertyNotifySink* This, DISPID dispID); + END_INTERFACE }; #ifdef COBJMACROS @@ -3985,7 +4006,7 @@ struct ISimpleFrameSite { const ISimpleFrameSiteVtbl* lpVtbl; }; struct ISimpleFrameSiteVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4018,6 +4039,7 @@ struct ISimpleFrameSiteVtbl { LRESULT* plResult, DWORD dwCookie); + END_INTERFACE }; #ifdef COBJMACROS @@ -4111,7 +4133,7 @@ struct IPersistStreamInit { const IPersistStreamInitVtbl* lpVtbl; }; struct IPersistStreamInitVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4150,6 +4172,7 @@ struct IPersistStreamInitVtbl { HRESULT (STDMETHODCALLTYPE *InitNew)( IPersistStreamInit* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -4268,7 +4291,7 @@ struct IPersistMemory { const IPersistMemoryVtbl* lpVtbl; }; struct IPersistMemoryVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4309,6 +4332,7 @@ struct IPersistMemoryVtbl { HRESULT (STDMETHODCALLTYPE *InitNew)( IPersistMemory* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -4441,7 +4465,7 @@ struct IPersistPropertyBag { const IPersistPropertyBagVtbl* lpVtbl; }; struct IPersistPropertyBagVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4475,6 +4499,7 @@ struct IPersistPropertyBagVtbl { BOOL fClearDirty, BOOL fSaveAllProperties); + END_INTERFACE }; #ifdef COBJMACROS @@ -4604,7 +4629,7 @@ struct IPropertyBag2 { const IPropertyBag2Vtbl* lpVtbl; }; struct IPropertyBag2Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4651,6 +4676,7 @@ struct IPropertyBag2Vtbl { IUnknown* pUnkObject, IErrorLog* pErrLog); + END_INTERFACE }; #ifdef COBJMACROS @@ -4775,7 +4801,7 @@ struct IPersistPropertyBag2 { const IPersistPropertyBag2Vtbl* lpVtbl; }; struct IPersistPropertyBag2Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4812,6 +4838,7 @@ struct IPersistPropertyBag2Vtbl { HRESULT (STDMETHODCALLTYPE *IsDirty)( IPersistPropertyBag2* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -4912,7 +4939,7 @@ struct ISpecifyPropertyPages { const ISpecifyPropertyPagesVtbl* lpVtbl; }; struct ISpecifyPropertyPagesVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4931,6 +4958,7 @@ struct ISpecifyPropertyPagesVtbl { ISpecifyPropertyPages* This, CAUUID* pPages); + END_INTERFACE }; #ifdef COBJMACROS @@ -5016,7 +5044,7 @@ struct IPerPropertyBrowsing { const IPerPropertyBrowsingVtbl* lpVtbl; }; struct IPerPropertyBrowsingVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5053,6 +5081,7 @@ struct IPerPropertyBrowsingVtbl { DWORD dwCookie, VARIANT* pVarOut); + END_INTERFACE }; #ifdef COBJMACROS @@ -5149,7 +5178,7 @@ struct IAdviseSinkEx { const IAdviseSinkExVtbl* lpVtbl; }; struct IAdviseSinkExVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5189,6 +5218,7 @@ struct IAdviseSinkExVtbl { IAdviseSinkEx* This, DWORD dwViewStatus); + END_INTERFACE }; #ifdef COBJMACROS @@ -5280,7 +5310,7 @@ struct IPointerInactive { const IPointerInactiveVtbl* lpVtbl; }; struct IPointerInactiveVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5314,6 +5344,7 @@ struct IPointerInactiveVtbl { DWORD dwMouseMsg, BOOL fSetAlways); + END_INTERFACE }; #ifdef COBJMACROS @@ -5405,7 +5436,7 @@ struct IObjectWithSite { const IObjectWithSiteVtbl* lpVtbl; }; struct IObjectWithSiteVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5429,6 +5460,7 @@ struct IObjectWithSiteVtbl { REFIID riid, PVOID* ppvSite); + END_INTERFACE }; #ifdef COBJMACROS @@ -5515,7 +5547,7 @@ struct IOleUndoUnit { const IOleUndoUnitVtbl* lpVtbl; }; struct IOleUndoUnitVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5546,6 +5578,7 @@ struct IOleUndoUnitVtbl { HRESULT (STDMETHODCALLTYPE *OnNextAdd)( IOleUndoUnit* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -5649,7 +5682,7 @@ struct IOleParentUndoUnit { const IOleParentUndoUnitVtbl* lpVtbl; }; struct IOleParentUndoUnitVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5702,6 +5735,7 @@ struct IOleParentUndoUnitVtbl { IOleParentUndoUnit* This, DWORD* pdwState); + END_INTERFACE }; #ifdef COBJMACROS @@ -5824,7 +5858,7 @@ struct IEnumOleUndoUnits { const IEnumOleUndoUnitsVtbl* lpVtbl; }; struct IEnumOleUndoUnitsVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5856,6 +5890,7 @@ struct IEnumOleUndoUnitsVtbl { IEnumOleUndoUnits* This, IEnumOleUndoUnits** ppEnum); + END_INTERFACE }; #ifdef COBJMACROS @@ -5986,7 +6021,7 @@ struct IOleUndoManager { const IOleUndoManagerVtbl* lpVtbl; }; struct IOleUndoManagerVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -6050,6 +6085,7 @@ struct IOleUndoManagerVtbl { IOleUndoManager* This, BOOL fEnable); + END_INTERFACE }; #ifdef COBJMACROS @@ -6269,7 +6305,7 @@ struct IQuickActivate { const IQuickActivateVtbl* lpVtbl; }; struct IQuickActivateVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -6297,6 +6333,7 @@ struct IQuickActivateVtbl { IQuickActivate* This, LPSIZEL pSizel); + END_INTERFACE }; #ifdef COBJMACROS diff --git a/include/oleidl.h b/include/oleidl.h index 53877d961c..c93d13869b 100644 --- a/include/oleidl.h +++ b/include/oleidl.h @@ -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 diff --git a/include/pstore.h b/include/pstore.h index 6ed38d561e..79242cc3b8 100644 --- a/include/pstore.h +++ b/include/pstore.h @@ -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 diff --git a/include/servprov.h b/include/servprov.h index f9d53bfd2c..593b8054eb 100644 --- a/include/servprov.h +++ b/include/servprov.h @@ -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 diff --git a/include/shldisp.h b/include/shldisp.h index e545a07502..05c5558005 100644 --- a/include/shldisp.h +++ b/include/shldisp.h @@ -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 diff --git a/include/shobjidl.h b/include/shobjidl.h index 4230643a54..e4ad09b58b 100644 --- a/include/shobjidl.h +++ b/include/shobjidl.h @@ -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 diff --git a/include/strmif.h b/include/strmif.h index 10ef561ba9..26ef0b1bea 100644 --- a/include/strmif.h +++ b/include/strmif.h @@ -40,7 +40,7 @@ struct ICreateDevEnum { const ICreateDevEnumVtbl* lpVtbl; }; struct ICreateDevEnumVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -61,6 +61,7 @@ struct ICreateDevEnumVtbl { IEnumMoniker** ppEnumMoniker, DWORD dwFlags); + END_INTERFACE }; #ifdef COBJMACROS @@ -275,7 +276,7 @@ struct IPin { const IPinVtbl* lpVtbl; }; struct IPinVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -351,6 +352,7 @@ struct IPinVtbl { REFERENCE_TIME tStop, double dRate); + END_INTERFACE }; #ifdef COBJMACROS @@ -558,7 +560,7 @@ struct IEnumPins { const IEnumPinsVtbl* lpVtbl; }; struct IEnumPinsVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -590,6 +592,7 @@ struct IEnumPinsVtbl { IEnumPins* This, IEnumPins** ppEnum); + END_INTERFACE }; #ifdef COBJMACROS @@ -687,7 +690,7 @@ struct IEnumMediaTypes { const IEnumMediaTypesVtbl* lpVtbl; }; struct IEnumMediaTypesVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -719,6 +722,7 @@ struct IEnumMediaTypesVtbl { IEnumMediaTypes* This, IEnumMediaTypes** ppEnum); + END_INTERFACE }; #ifdef COBJMACROS @@ -830,7 +834,7 @@ struct IFilterGraph { const IFilterGraphVtbl* lpVtbl; }; struct IFilterGraphVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -880,6 +884,7 @@ struct IFilterGraphVtbl { HRESULT (STDMETHODCALLTYPE *SetDefaultSyncSource)( IFilterGraph* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -1019,7 +1024,7 @@ struct IEnumFilters { const IEnumFiltersVtbl* lpVtbl; }; struct IEnumFiltersVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1051,6 +1056,7 @@ struct IEnumFiltersVtbl { IEnumFilters* This, IEnumFilters** ppEnum); + END_INTERFACE }; #ifdef COBJMACROS @@ -1159,7 +1165,7 @@ struct IMediaFilter { const IMediaFilterVtbl* lpVtbl; }; struct IMediaFilterVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1202,6 +1208,7 @@ struct IMediaFilterVtbl { IMediaFilter* This, IReferenceClock** pClock); + END_INTERFACE }; #ifdef COBJMACROS @@ -1329,7 +1336,7 @@ struct IBaseFilter { const IBaseFilterVtbl* lpVtbl; }; struct IBaseFilterVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1395,6 +1402,7 @@ struct IBaseFilterVtbl { IBaseFilter* This, LPWSTR* pVendorInfo); + END_INTERFACE }; #ifdef COBJMACROS @@ -1525,7 +1533,7 @@ struct IReferenceClock { const IReferenceClockVtbl* lpVtbl; }; struct IReferenceClockVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1562,6 +1570,7 @@ struct IReferenceClockVtbl { IReferenceClock* This, DWORD_PTR dwAdviseCookie); + END_INTERFACE }; #ifdef COBJMACROS @@ -1702,7 +1711,7 @@ struct IMediaSample { const IMediaSampleVtbl* lpVtbl; }; struct IMediaSampleVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -1780,6 +1789,7 @@ struct IMediaSampleVtbl { LONGLONG* pTimeStart, LONGLONG* pTimeEnd); + END_INTERFACE }; #ifdef COBJMACROS @@ -2021,7 +2031,7 @@ struct IMediaSample2 { const IMediaSample2Vtbl* lpVtbl; }; struct IMediaSample2Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2110,6 +2120,7 @@ struct IMediaSample2Vtbl { DWORD cbProperties, const BYTE* pbProperties); + END_INTERFACE }; #ifdef COBJMACROS @@ -2233,7 +2244,7 @@ struct IMemAllocator { const IMemAllocatorVtbl* lpVtbl; }; struct IMemAllocatorVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2274,6 +2285,7 @@ struct IMemAllocatorVtbl { IMemAllocator* This, IMediaSample* pBuffer); + END_INTERFACE }; #ifdef COBJMACROS @@ -2384,7 +2396,7 @@ struct IMemAllocatorCallbackTemp { const IMemAllocatorCallbackTempVtbl* lpVtbl; }; struct IMemAllocatorCallbackTempVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2434,6 +2446,7 @@ struct IMemAllocatorCallbackTempVtbl { IMemAllocatorCallbackTemp* This, LONG* plBuffersFree); + END_INTERFACE }; #ifdef COBJMACROS @@ -2511,7 +2524,7 @@ struct IMemAllocatorNotifyCallbackTemp { const IMemAllocatorNotifyCallbackTempVtbl* lpVtbl; }; struct IMemAllocatorNotifyCallbackTempVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2529,6 +2542,7 @@ struct IMemAllocatorNotifyCallbackTempVtbl { HRESULT (STDMETHODCALLTYPE *NotifyRelease)( IMemAllocatorNotifyCallbackTemp* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -2599,7 +2613,7 @@ struct IMemInputPin { const IMemInputPinVtbl* lpVtbl; }; struct IMemInputPinVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2640,6 +2654,7 @@ struct IMemInputPinVtbl { HRESULT (STDMETHODCALLTYPE *ReceiveCanBlock)( IMemInputPin* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -2750,7 +2765,7 @@ struct IAMovieSetup { const IAMovieSetupVtbl* lpVtbl; }; struct IAMovieSetupVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -2771,6 +2786,7 @@ struct IAMovieSetupVtbl { HRESULT (STDMETHODCALLTYPE *Unregister)( IAMovieSetup* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -2919,7 +2935,7 @@ struct IMediaSeeking { const IMediaSeekingVtbl* lpVtbl; }; struct IMediaSeekingVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -3010,6 +3026,7 @@ struct IMediaSeekingVtbl { IMediaSeeking* This, LONGLONG* pllPreroll); + END_INTERFACE }; #ifdef COBJMACROS @@ -3513,7 +3530,7 @@ struct IEnumRegFilters { const IEnumRegFiltersVtbl* lpVtbl; }; struct IEnumRegFiltersVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -3545,6 +3562,7 @@ struct IEnumRegFiltersVtbl { IEnumRegFilters* This, IEnumRegFilters** ppEnum); + END_INTERFACE }; #ifdef COBJMACROS @@ -3684,7 +3702,7 @@ struct IFilterMapper { const IFilterMapperVtbl* lpVtbl; }; struct IFilterMapperVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -3754,6 +3772,7 @@ struct IFilterMapperVtbl { CLSID clsOutMaj, CLSID clsOutSub); + END_INTERFACE }; #ifdef COBJMACROS @@ -3987,7 +4006,7 @@ struct IFilterMapper2 { const IFilterMapper2Vtbl* lpVtbl; }; struct IFilterMapper2Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4041,6 +4060,7 @@ struct IFilterMapper2Vtbl { const REGPINMEDIUM* pMedOut, const CLSID* pPinCategoryOut); + END_INTERFACE }; #ifdef COBJMACROS @@ -4152,7 +4172,7 @@ struct IFilterMapper3 { const IFilterMapper3Vtbl* lpVtbl; }; struct IFilterMapper3Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4211,6 +4231,7 @@ struct IFilterMapper3Vtbl { IFilterMapper3* This, ICreateDevEnum** ppEnum); + END_INTERFACE }; #ifdef COBJMACROS @@ -4292,7 +4313,7 @@ struct IQualityControl { const IQualityControlVtbl* lpVtbl; }; struct IQualityControlVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4316,6 +4337,7 @@ struct IQualityControlVtbl { IQualityControl* This, IQualityControl* piqc); + END_INTERFACE }; #ifdef COBJMACROS @@ -4434,7 +4456,7 @@ struct IOverlayNotify { const IOverlayNotifyVtbl* lpVtbl; }; struct IOverlayNotifyVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4469,6 +4491,7 @@ struct IOverlayNotifyVtbl { const RECT* pSourceRect, const RECT* pDestinationRect); + END_INTERFACE }; #ifdef COBJMACROS @@ -4562,7 +4585,7 @@ struct IOverlayNotify2 { const IOverlayNotify2Vtbl* lpVtbl; }; struct IOverlayNotify2Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4602,6 +4625,7 @@ struct IOverlayNotify2Vtbl { IOverlayNotify2* This, HMONITOR hMonitor); + END_INTERFACE }; #ifdef COBJMACROS @@ -4700,7 +4724,7 @@ struct IOverlay { const IOverlayVtbl* lpVtbl; }; struct IOverlayVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4760,6 +4784,7 @@ struct IOverlayVtbl { HRESULT (STDMETHODCALLTYPE *Unadvise)( IOverlay* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -4912,7 +4937,7 @@ struct IMediaEventSink { const IMediaEventSinkVtbl* lpVtbl; }; struct IMediaEventSinkVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -4933,6 +4958,7 @@ struct IMediaEventSinkVtbl { LONG_PTR EventParam1, LONG_PTR EventParam2); + END_INTERFACE }; #ifdef COBJMACROS @@ -4995,7 +5021,7 @@ struct IFileSourceFilter { const IFileSourceFilterVtbl* lpVtbl; }; struct IFileSourceFilterVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5020,6 +5046,7 @@ struct IFileSourceFilterVtbl { LPOLESTR* ppszFileName, AM_MEDIA_TYPE* pmt); + END_INTERFACE }; #ifdef COBJMACROS @@ -5092,7 +5119,7 @@ struct IFileSinkFilter { const IFileSinkFilterVtbl* lpVtbl; }; struct IFileSinkFilterVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5117,6 +5144,7 @@ struct IFileSinkFilterVtbl { LPOLESTR* ppszFileName, AM_MEDIA_TYPE* pmt); + END_INTERFACE }; #ifdef COBJMACROS @@ -5187,7 +5215,7 @@ struct IFileSinkFilter2 { const IFileSinkFilter2Vtbl* lpVtbl; }; struct IFileSinkFilter2Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5221,6 +5249,7 @@ struct IFileSinkFilter2Vtbl { IFileSinkFilter2* This, DWORD* pdwFlags); + END_INTERFACE }; #ifdef COBJMACROS @@ -5318,7 +5347,7 @@ struct IGraphBuilder { const IGraphBuilderVtbl* lpVtbl; }; struct IGraphBuilderVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5399,6 +5428,7 @@ struct IGraphBuilderVtbl { HRESULT (STDMETHODCALLTYPE *ShouldOperationContinue)( IGraphBuilder* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -5571,7 +5601,7 @@ struct ICaptureGraphBuilder { const ICaptureGraphBuilderVtbl* lpVtbl; }; struct ICaptureGraphBuilderVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5636,6 +5666,7 @@ struct ICaptureGraphBuilderVtbl { int fAllowEscAbort, IAMCopyCaptureFileProgress* pCallback); + END_INTERFACE }; #ifdef COBJMACROS @@ -5789,7 +5820,7 @@ struct IAMCopyCaptureFileProgress { const IAMCopyCaptureFileProgressVtbl* lpVtbl; }; struct IAMCopyCaptureFileProgressVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5808,6 +5839,7 @@ struct IAMCopyCaptureFileProgressVtbl { IAMCopyCaptureFileProgress* This, int iProgress); + END_INTERFACE }; #ifdef COBJMACROS @@ -5912,7 +5944,7 @@ struct ICaptureGraphBuilder2 { const ICaptureGraphBuilder2Vtbl* lpVtbl; }; struct ICaptureGraphBuilder2Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -5990,6 +6022,7 @@ struct ICaptureGraphBuilder2Vtbl { int num, IPin** ppPin); + END_INTERFACE }; #ifdef COBJMACROS @@ -6185,7 +6218,7 @@ struct IFilterGraph2 { const IFilterGraph2Vtbl* lpVtbl; }; struct IFilterGraph2Vtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -6285,6 +6318,7 @@ struct IFilterGraph2Vtbl { DWORD dwFlags, DWORD* pvContext); + END_INTERFACE }; #ifdef COBJMACROS @@ -6408,7 +6442,7 @@ struct IStreamBuilder { const IStreamBuilderVtbl* lpVtbl; }; struct IStreamBuilderVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -6433,6 +6467,7 @@ struct IStreamBuilderVtbl { IPin* ppinOut, IGraphBuilder* pGraph); + END_INTERFACE }; #ifdef COBJMACROS @@ -6532,7 +6567,7 @@ struct IAsyncReader { const IAsyncReaderVtbl* lpVtbl; }; struct IAsyncReaderVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -6585,6 +6620,7 @@ struct IAsyncReaderVtbl { HRESULT (STDMETHODCALLTYPE *EndFlush)( IAsyncReader* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -6719,7 +6755,7 @@ struct IGraphVersion { const IGraphVersionVtbl* lpVtbl; }; struct IGraphVersionVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -6738,6 +6774,7 @@ struct IGraphVersionVtbl { IGraphVersion* This, LONG* pVersion); + END_INTERFACE }; #ifdef COBJMACROS @@ -6799,7 +6836,7 @@ struct IResourceConsumer { const IResourceConsumerVtbl* lpVtbl; }; struct IResourceConsumerVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -6822,6 +6859,7 @@ struct IResourceConsumerVtbl { IResourceConsumer* This, LONG idResource); + END_INTERFACE }; #ifdef COBJMACROS @@ -6923,7 +6961,7 @@ struct IResourceManager { const IResourceManagerVtbl* lpVtbl; }; struct IResourceManagerVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -6982,6 +7020,7 @@ struct IResourceManagerVtbl { IResourceManager* This, IUnknown* pFocusObject); + END_INTERFACE }; #ifdef COBJMACROS @@ -7140,7 +7179,7 @@ struct IKsPropertySet { const IKsPropertySetVtbl* lpVtbl; }; struct IKsPropertySetVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -7180,6 +7219,7 @@ struct IKsPropertySetVtbl { DWORD dwPropID, DWORD* pTypeSupport); + END_INTERFACE }; #ifdef COBJMACROS @@ -7296,7 +7336,7 @@ struct IPinConnection { const IPinConnectionVtbl* lpVtbl; }; struct IPinConnectionVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -7325,6 +7365,7 @@ struct IPinConnectionVtbl { HRESULT (STDMETHODCALLTYPE *DynamicDisconnect)( IPinConnection* This); + END_INTERFACE }; #ifdef COBJMACROS @@ -7407,7 +7448,7 @@ struct IPinFlowControl { const IPinFlowControlVtbl* lpVtbl; }; struct IPinFlowControlVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -7427,6 +7468,7 @@ struct IPinFlowControlVtbl { DWORD dwBlockFlags, HANDLE hEvent); + END_INTERFACE }; #ifdef COBJMACROS @@ -7539,7 +7581,7 @@ struct IGraphConfig { const IGraphConfigVtbl* lpVtbl; }; struct IGraphConfigVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -7607,6 +7649,7 @@ struct IGraphConfigVtbl { IBaseFilter* pFilter, DWORD Flags); + END_INTERFACE }; #ifdef COBJMACROS @@ -7764,7 +7807,7 @@ struct IGraphConfigCallback { const IGraphConfigCallbackVtbl* lpVtbl; }; struct IGraphConfigCallbackVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -7784,6 +7827,7 @@ struct IGraphConfigCallbackVtbl { PVOID pvContext, DWORD dwFlags); + END_INTERFACE }; #ifdef COBJMACROS @@ -7856,7 +7900,7 @@ struct IFilterChain { const IFilterChainVtbl* lpVtbl; }; struct IFilterChainVtbl { - ICOM_MSVTABLE_COMPAT_FIELDS + BEGIN_INTERFACE /*** IUnknown methods ***/ HRESULT (STDMETHODCALLTYPE *QueryInterface)( @@ -7891,6 +7935,7 @@ struct IFilterChainVtbl { IBaseFilter* pStartFilter, IBaseFilter* pEndFilter); + END_INTERFACE }; #ifdef COBJMACROS diff --git a/include/unknwn.h b/include/unknwn.h index 9838ca4a14..8ae8a5fdc6 100644 --- a/include/unknwn.h +++ b/include/unknwn.h @@ -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 diff --git a/include/unknwn.idl b/include/unknwn.idl index 922aae9cce..6d4c186d02 100644 --- a/include/unknwn.idl +++ b/include/unknwn.idl @@ -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 */ diff --git a/include/urlmon.h b/include/urlmon.h index 2b02d795a2..7f5add03e6 100644 --- a/include/urlmon.h +++ b/include/urlmon.h @@ -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 diff --git a/tools/widl/header.c b/tools/widl/header.c index ea0cc28be5..dbf19fd7d1 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -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"); -- 2.32.0.93.g670b81a890