diff --git a/dlls/dmband/dmband_private.h b/dlls/dmband/dmband_private.h index 1a6e289a481..6f1b2fd4814 100644 --- a/dlls/dmband/dmband_private.h +++ b/dlls/dmband/dmband_private.h @@ -24,6 +24,8 @@ #include #include +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dmband/dmutils.c b/dlls/dmband/dmutils.c index 3da649d3a05..852834b664a 100644 --- a/dlls/dmband/dmutils.c +++ b/dlls/dmband/dmutils.c @@ -22,6 +22,8 @@ #include #include +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dmcompos/dmcompos_private.h b/dlls/dmcompos/dmcompos_private.h index 2fc40114755..0588026f095 100644 --- a/dlls/dmcompos/dmcompos_private.h +++ b/dlls/dmcompos/dmcompos_private.h @@ -24,6 +24,8 @@ #include #include +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dmime/dmime_private.h b/dlls/dmime/dmime_private.h index f8d52b185c8..c1c52aa44f3 100644 --- a/dlls/dmime/dmime_private.h +++ b/dlls/dmime/dmime_private.h @@ -24,6 +24,8 @@ #include #include +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dmime/dmutils.c b/dlls/dmime/dmutils.c index 3da649d3a05..852834b664a 100644 --- a/dlls/dmime/dmutils.c +++ b/dlls/dmime/dmutils.c @@ -22,6 +22,8 @@ #include #include +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index 4e284c3f9cc..454f5dbabcc 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -24,6 +24,8 @@ #include #include +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dmscript/dmscript_private.h b/dlls/dmscript/dmscript_private.h index 0e9b933fecf..e777d223ac3 100644 --- a/dlls/dmscript/dmscript_private.h +++ b/dlls/dmscript/dmscript_private.h @@ -24,6 +24,8 @@ #include #include +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dmstyle/dmstyle_private.h b/dlls/dmstyle/dmstyle_private.h index be904b66f9a..ccd23b96eaa 100644 --- a/dlls/dmstyle/dmstyle_private.h +++ b/dlls/dmstyle/dmstyle_private.h @@ -24,6 +24,8 @@ #include #include +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dmstyle/dmutils.c b/dlls/dmstyle/dmutils.c index 3da649d3a05..852834b664a 100644 --- a/dlls/dmstyle/dmutils.c +++ b/dlls/dmstyle/dmutils.c @@ -22,6 +22,8 @@ #include #include +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dmsynth/dmsynth_private.h b/dlls/dmsynth/dmsynth_private.h index 5296860c9e4..f9f2c137041 100644 --- a/dlls/dmsynth/dmsynth_private.h +++ b/dlls/dmsynth/dmsynth_private.h @@ -22,6 +22,8 @@ #include +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dmusic/dmusic_private.h b/dlls/dmusic/dmusic_private.h index 0f4af53879e..07195777671 100644 --- a/dlls/dmusic/dmusic_private.h +++ b/dlls/dmusic/dmusic_private.h @@ -22,6 +22,8 @@ #include +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 02fc3e5fd20..90a344773ab 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -22,6 +22,8 @@ #include +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winnt.h" diff --git a/dlls/msi/record.c b/dlls/msi/record.c index b831c3a30ad..64eb85642c0 100644 --- a/dlls/msi/record.c +++ b/dlls/msi/record.c @@ -20,6 +20,8 @@ #include +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c index a946f4516d0..6f30afbbe59 100644 --- a/dlls/ole32/errorinfo.c +++ b/dlls/ole32/errorinfo.c @@ -26,6 +26,8 @@ #include #include +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "oleauto.h" diff --git a/dlls/oleaut32/olefont.c b/dlls/oleaut32/olefont.c index 0576d4a9168..7f8498d8a51 100644 --- a/dlls/oleaut32/olefont.c +++ b/dlls/oleaut32/olefont.c @@ -24,8 +24,10 @@ #include #include +#define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT + #include "winerror.h" #include "windef.h" #include "winbase.h" diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c index 76c30a69640..88763233181 100644 --- a/dlls/oleaut32/safearray.c +++ b/dlls/oleaut32/safearray.c @@ -36,6 +36,9 @@ #include #include #include + +#define COBJMACROS + #include "windef.h" #include "winerror.h" #include "winbase.h" diff --git a/dlls/oleaut32/tests/olefont.c b/dlls/oleaut32/tests/olefont.c index 24cd84df493..6c0f26f52ce 100644 --- a/dlls/oleaut32/tests/olefont.c +++ b/dlls/oleaut32/tests/olefont.c @@ -36,6 +36,7 @@ #include #include +#define COBJMACROS #include static HMODULE hOleaut32; diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 1755a68349c..45d0748bbea 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -28,8 +28,10 @@ #include #include +#define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "oleauto.h" diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index 43ae1a6352b..93945a276eb 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -17,8 +17,11 @@ * License along with this library; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ + +#define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT + #include "wine/debug.h" #include "wine/unicode.h" #include "winbase.h" diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index 24589c6217e..45a315452c7 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -43,8 +43,10 @@ #include #include +#define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT + #include "windef.h" #include "winerror.h" #include "winbase.h" diff --git a/dlls/shlwapi/ordinal.c b/dlls/shlwapi/ordinal.c index 10bb801bf4b..99171557bfb 100644 --- a/dlls/shlwapi/ordinal.c +++ b/dlls/shlwapi/ordinal.c @@ -28,8 +28,10 @@ #include #include +#define COBJMACROS #define NONAMELESSUNION #define NONAMELESSSTRUCT + #include "windef.h" #include "winbase.h" #include "winuser.h" diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index d9caaab828e..2c4041bf5bd 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -19,6 +19,9 @@ */ #include + +#define COBJMACROS + #include "windef.h" #include "winbase.h" #include "urlmon.h" diff --git a/include/activscp.h b/include/activscp.h index d5da185b38c..42d2c8fa958 100644 --- a/include/activscp.h +++ b/include/activscp.h @@ -134,6 +134,7 @@ struct IActiveScriptErrorVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IActiveScriptError_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IActiveScriptError_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -142,6 +143,7 @@ struct IActiveScriptErrorVtbl { #define IActiveScriptError_GetExceptionInfo(p,a) (p)->lpVtbl->GetExceptionInfo(p,a) #define IActiveScriptError_GetSourcePosition(p,a,b,c) (p)->lpVtbl->GetSourcePosition(p,a,b,c) #define IActiveScriptError_GetSourceLineText(p,a) (p)->lpVtbl->GetSourceLineText(p,a) +#endif #endif @@ -286,6 +288,7 @@ struct IActiveScriptSiteVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IActiveScriptSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IActiveScriptSite_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -299,6 +302,7 @@ struct IActiveScriptSiteVtbl { #define IActiveScriptSite_OnScriptError(p,a) (p)->lpVtbl->OnScriptError(p,a) #define IActiveScriptSite_OnEnterScript(p) (p)->lpVtbl->OnEnterScript(p) #define IActiveScriptSite_OnLeaveScript(p) (p)->lpVtbl->OnLeaveScript(p) +#endif #endif @@ -441,6 +445,7 @@ struct IActiveScriptSiteWindowVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IActiveScriptSiteWindow_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IActiveScriptSiteWindow_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -448,6 +453,7 @@ struct IActiveScriptSiteWindowVtbl { /*** IActiveScriptSiteWindow methods ***/ #define IActiveScriptSiteWindow_GetWindow(p,a) (p)->lpVtbl->GetWindow(p,a) #define IActiveScriptSiteWindow_EnableModeless(p,a) (p)->lpVtbl->EnableModeless(p,a) +#endif #endif @@ -525,12 +531,14 @@ struct IActiveScriptSiteInterruptPollVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IActiveScriptSiteInterruptPoll_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IActiveScriptSiteInterruptPoll_AddRef(p) (p)->lpVtbl->AddRef(p) #define IActiveScriptSiteInterruptPoll_Release(p) (p)->lpVtbl->Release(p) /*** IActiveScriptSiteInterruptPoll methods ***/ #define IActiveScriptSiteInterruptPoll_QueryContinue(p) (p)->lpVtbl->QueryContinue(p) +#endif #endif @@ -702,6 +710,7 @@ struct IActiveScriptVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IActiveScript_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IActiveScript_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -720,6 +729,7 @@ struct IActiveScriptVtbl { #define IActiveScript_GetScriptThreadState(p,a,b) (p)->lpVtbl->GetScriptThreadState(p,a,b) #define IActiveScript_InterruptScriptThread(p,a,b,c) (p)->lpVtbl->InterruptScriptThread(p,a,b,c) #define IActiveScript_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -956,6 +966,7 @@ struct IActiveScriptParseVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IActiveScriptParse_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IActiveScriptParse_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -964,6 +975,7 @@ struct IActiveScriptParseVtbl { #define IActiveScriptParse_InitNew(p) (p)->lpVtbl->InitNew(p) #define IActiveScriptParse_AddScriptlet(p,a,b,c,d,e,f,g,h,i,j,k) (p)->lpVtbl->AddScriptlet(p,a,b,c,d,e,f,g,h,i,j,k) #define IActiveScriptParse_ParseScriptText(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->ParseScriptText(p,a,b,c,d,e,f,g,h,i) +#endif #endif @@ -1085,12 +1097,14 @@ struct IActiveScriptParseProcedureOldVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IActiveScriptParseProcedureOld_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IActiveScriptParseProcedureOld_AddRef(p) (p)->lpVtbl->AddRef(p) #define IActiveScriptParseProcedureOld_Release(p) (p)->lpVtbl->Release(p) /*** IActiveScriptParseProcedureOld methods ***/ #define IActiveScriptParseProcedureOld_ParseProcedureText(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->ParseProcedureText(p,a,b,c,d,e,f,g,h,i) +#endif #endif @@ -1186,12 +1200,14 @@ struct IActiveScriptParseProcedureVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IActiveScriptParseProcedure_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IActiveScriptParseProcedure_AddRef(p) (p)->lpVtbl->AddRef(p) #define IActiveScriptParseProcedure_Release(p) (p)->lpVtbl->Release(p) /*** IActiveScriptParseProcedure methods ***/ #define IActiveScriptParseProcedure_ParseProcedureText(p,a,b,c,d,e,f,g,h,i,j) (p)->lpVtbl->ParseProcedureText(p,a,b,c,d,e,f,g,h,i,j) +#endif #endif @@ -1272,12 +1288,14 @@ struct IBindEventHandlerVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IBindEventHandler_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IBindEventHandler_AddRef(p) (p)->lpVtbl->AddRef(p) #define IBindEventHandler_Release(p) (p)->lpVtbl->Release(p) /*** IBindEventHandler methods ***/ #define IBindEventHandler_BindHandler(p,a,b) (p)->lpVtbl->BindHandler(p,a,b) +#endif #endif @@ -1369,6 +1387,7 @@ struct IActiveScriptStatsVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IActiveScriptStats_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IActiveScriptStats_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1377,6 +1396,7 @@ struct IActiveScriptStatsVtbl { #define IActiveScriptStats_GetStat(p,a,b,c) (p)->lpVtbl->GetStat(p,a,b,c) #define IActiveScriptStats_GetStatEx(p,a,b,c) (p)->lpVtbl->GetStatEx(p,a,b,c) #define IActiveScriptStats_ResetStats(p) (p)->lpVtbl->ResetStats(p) +#endif #endif diff --git a/include/amstream.h b/include/amstream.h index b01ec3d1d86..44e5ff158fd 100644 --- a/include/amstream.h +++ b/include/amstream.h @@ -215,6 +215,7 @@ struct IAMMultiMediaStreamVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAMMultiMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAMMultiMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -237,6 +238,7 @@ struct IAMMultiMediaStreamVtbl { #define IAMMultiMediaStream_OpenFile(p,a,b) (p)->lpVtbl->OpenFile(p,a,b) #define IAMMultiMediaStream_OpenMoniker(p,a,b,c) (p)->lpVtbl->OpenMoniker(p,a,b,c) #define IAMMultiMediaStream_Render(p,a) (p)->lpVtbl->Render(p,a) +#endif #endif @@ -437,6 +439,7 @@ struct IAMMediaStreamVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAMMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAMMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -454,6 +457,7 @@ struct IAMMediaStreamVtbl { #define IAMMediaStream_JoinAMMultiMediaStream(p,a) (p)->lpVtbl->JoinAMMultiMediaStream(p,a) #define IAMMediaStream_JoinFilter(p,a) (p)->lpVtbl->JoinFilter(p,a) #define IAMMediaStream_JoinFilterGraph(p,a) (p)->lpVtbl->JoinFilterGraph(p,a) +#endif #endif @@ -675,6 +679,7 @@ struct IMediaStreamFilterVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMediaStreamFilter_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMediaStreamFilter_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -704,6 +709,7 @@ struct IMediaStreamFilterVtbl { #define IMediaStreamFilter_WaitUntil(p,a) (p)->lpVtbl->WaitUntil(p,a) #define IMediaStreamFilter_Flush(p,a) (p)->lpVtbl->Flush(p,a) #define IMediaStreamFilter_EndOfStream(p) (p)->lpVtbl->EndOfStream(p) +#endif #endif @@ -861,12 +867,14 @@ struct IDirectDrawMediaSampleAllocatorVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDirectDrawMediaSampleAllocator_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDirectDrawMediaSampleAllocator_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirectDrawMediaSampleAllocator_Release(p) (p)->lpVtbl->Release(p) /*** IDirectDrawMediaSampleAllocator methods ***/ #define IDirectDrawMediaSampleAllocator_GetDirectDraw(p,a) (p)->lpVtbl->GetDirectDraw(p,a) +#endif #endif @@ -944,6 +952,7 @@ struct IDirectDrawMediaSampleVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDirectDrawMediaSample_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDirectDrawMediaSample_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -951,6 +960,7 @@ struct IDirectDrawMediaSampleVtbl { /*** IDirectDrawMediaSample methods ***/ #define IDirectDrawMediaSample_GetSurfaceAndReleaseLock(p,a,b) (p)->lpVtbl->GetSurfaceAndReleaseLock(p,a,b) #define IDirectDrawMediaSample_LockMediaSamplePointer(p) (p)->lpVtbl->LockMediaSamplePointer(p) +#endif #endif @@ -1094,6 +1104,7 @@ struct IAMMediaTypeStreamVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAMMediaTypeStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAMMediaTypeStream_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1111,6 +1122,7 @@ struct IAMMediaTypeStreamVtbl { #define IAMMediaTypeStream_CreateSample(p,a,b,c,d,e) (p)->lpVtbl->CreateSample(p,a,b,c,d,e) #define IAMMediaTypeStream_GetStreamAllocatorRequirements(p,a) (p)->lpVtbl->GetStreamAllocatorRequirements(p,a) #define IAMMediaTypeStream_SetStreamAllocatorRequirements(p,a) (p)->lpVtbl->SetStreamAllocatorRequirements(p,a) +#endif #endif @@ -1369,6 +1381,7 @@ struct IAMMediaTypeSampleVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAMMediaTypeSample_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAMMediaTypeSample_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1397,6 +1410,7 @@ struct IAMMediaTypeSampleVtbl { #define IAMMediaTypeSample_SetDiscontinuity(p,a) (p)->lpVtbl->SetDiscontinuity(p,a) #define IAMMediaTypeSample_GetMediaTime(p,a,b) (p)->lpVtbl->GetMediaTime(p,a,b) #define IAMMediaTypeSample_SetMediaTime(p,a,b) (p)->lpVtbl->SetMediaTime(p,a,b) +#endif #endif diff --git a/include/amvideo.h b/include/amvideo.h index 7fdeb978413..cadc5703f77 100644 --- a/include/amvideo.h +++ b/include/amvideo.h @@ -198,6 +198,7 @@ struct IDirectDrawVideoVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDirectDrawVideo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDirectDrawVideo_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -219,6 +220,7 @@ struct IDirectDrawVideoVtbl { #define IDirectDrawVideo_CanUseOverlayStretch(p,a) (p)->lpVtbl->CanUseOverlayStretch(p,a) #define IDirectDrawVideo_UseWhenFullScreen(p,a) (p)->lpVtbl->UseWhenFullScreen(p,a) #define IDirectDrawVideo_WillUseFullScreen(p,a) (p)->lpVtbl->WillUseFullScreen(p,a) +#endif #endif @@ -457,6 +459,7 @@ struct IQualPropVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IQualProp_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IQualProp_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -468,6 +471,7 @@ struct IQualPropVtbl { #define IQualProp_get_Jitter(p,a) (p)->lpVtbl->get_Jitter(p,a) #define IQualProp_get_AvgSyncOffset(p,a) (p)->lpVtbl->get_AvgSyncOffset(p,a) #define IQualProp_get_DevSyncOffset(p,a) (p)->lpVtbl->get_DevSyncOffset(p,a) +#endif #endif @@ -699,6 +703,7 @@ struct IFullScreenVideoVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFullScreenVideo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFullScreenVideo_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -721,6 +726,7 @@ struct IFullScreenVideoVtbl { #define IFullScreenVideo_SetCaption(p,a) (p)->lpVtbl->SetCaption(p,a) #define IFullScreenVideo_GetCaption(p,a) (p)->lpVtbl->GetCaption(p,a) #define IFullScreenVideo_SetDefault(p) (p)->lpVtbl->SetDefault(p) +#endif #endif @@ -1031,6 +1037,7 @@ struct IFullScreenVideoExVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFullScreenVideoEx_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFullScreenVideoEx_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1058,6 +1065,7 @@ struct IFullScreenVideoExVtbl { #define IFullScreenVideoEx_GetAcceleratorTable(p,a,b) (p)->lpVtbl->GetAcceleratorTable(p,a,b) #define IFullScreenVideoEx_KeepPixelAspectRatio(p,a) (p)->lpVtbl->KeepPixelAspectRatio(p,a) #define IFullScreenVideoEx_IsKeepPixelAspectRatio(p,a) (p)->lpVtbl->IsKeepPixelAspectRatio(p,a) +#endif #endif @@ -1215,6 +1223,7 @@ struct IBaseVideoMixerVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IBaseVideoMixer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IBaseVideoMixer_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1227,6 +1236,7 @@ struct IBaseVideoMixerVtbl { #define IBaseVideoMixer_SetUsingClock(p,a) (p)->lpVtbl->SetUsingClock(p,a) #define IBaseVideoMixer_GetClockPeriod(p,a) (p)->lpVtbl->GetClockPeriod(p,a) #define IBaseVideoMixer_SetClockPeriod(p,a) (p)->lpVtbl->SetClockPeriod(p,a) +#endif #endif diff --git a/include/austream.h b/include/austream.h index 090f7bd2c6a..cb0a9469aad 100644 --- a/include/austream.h +++ b/include/austream.h @@ -122,6 +122,7 @@ struct IAudioMediaStreamVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAudioMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAudioMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -137,6 +138,7 @@ struct IAudioMediaStreamVtbl { #define IAudioMediaStream_GetFormat(p,a) (p)->lpVtbl->GetFormat(p,a) #define IAudioMediaStream_SetFormat(p,a) (p)->lpVtbl->SetFormat(p,a) #define IAudioMediaStream_CreateSample(p,a,b,c) (p)->lpVtbl->CreateSample(p,a,b,c) +#endif #endif @@ -256,6 +258,7 @@ struct IAudioStreamSampleVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAudioStreamSample_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAudioStreamSample_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -268,6 +271,7 @@ struct IAudioStreamSampleVtbl { #define IAudioStreamSample_CompletionStatus(p,a,b) (p)->lpVtbl->CompletionStatus(p,a,b) /*** IAudioStreamSample methods ***/ #define IAudioStreamSample_GetAudioData(p,a) (p)->lpVtbl->GetAudioData(p,a) +#endif #endif @@ -360,6 +364,7 @@ struct IMemoryDataVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMemoryData_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMemoryData_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -368,6 +373,7 @@ struct IMemoryDataVtbl { #define IMemoryData_SetBuffer(p,a,b,c) (p)->lpVtbl->SetBuffer(p,a,b,c) #define IMemoryData_GetInfo(p,a,b,c) (p)->lpVtbl->GetInfo(p,a,b,c) #define IMemoryData_SetActual(p,a) (p)->lpVtbl->SetActual(p,a) +#endif #endif @@ -478,6 +484,7 @@ struct IAudioDataVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAudioData_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAudioData_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -489,6 +496,7 @@ struct IAudioDataVtbl { /*** IAudioData methods ***/ #define IAudioData_GetFormat(p,a) (p)->lpVtbl->GetFormat(p,a) #define IAudioData_SetFormat(p,a) (p)->lpVtbl->SetFormat(p,a) +#endif #endif diff --git a/include/comcat.h b/include/comcat.h index 4e0d4358b06..2c4d8715af0 100644 --- a/include/comcat.h +++ b/include/comcat.h @@ -92,6 +92,7 @@ struct IEnumGUIDVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumGUID_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumGUID_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -101,6 +102,7 @@ struct IEnumGUIDVtbl { #define IEnumGUID_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumGUID_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumGUID_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -230,6 +232,7 @@ struct IEnumCATEGORYINFOVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumCATEGORYINFO_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumCATEGORYINFO_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -239,6 +242,7 @@ struct IEnumCATEGORYINFOVtbl { #define IEnumCATEGORYINFO_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumCATEGORYINFO_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumCATEGORYINFO_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -399,6 +403,7 @@ struct ICatInformationVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ICatInformation_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICatInformation_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -410,6 +415,7 @@ struct ICatInformationVtbl { #define ICatInformation_IsClassOfCategories(p,a,b,c,d,e) (p)->lpVtbl->IsClassOfCategories(p,a,b,c,d,e) #define ICatInformation_EnumImplCategoriesOfClass(p,a,b) (p)->lpVtbl->EnumImplCategoriesOfClass(p,a,b) #define ICatInformation_EnumReqCategoriesOfClass(p,a,b) (p)->lpVtbl->EnumReqCategoriesOfClass(p,a,b) +#endif #endif @@ -622,6 +628,7 @@ struct ICatRegisterVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ICatRegister_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICatRegister_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -633,6 +640,7 @@ struct ICatRegisterVtbl { #define ICatRegister_UnRegisterClassImplCategories(p,a,b,c) (p)->lpVtbl->UnRegisterClassImplCategories(p,a,b,c) #define ICatRegister_RegisterClassReqCategories(p,a,b,c) (p)->lpVtbl->RegisterClassReqCategories(p,a,b,c) #define ICatRegister_UnRegisterClassReqCategories(p,a,b,c) (p)->lpVtbl->UnRegisterClassReqCategories(p,a,b,c) +#endif #endif diff --git a/include/ddstream.h b/include/ddstream.h index 05eb2e85c7d..cb487683379 100644 --- a/include/ddstream.h +++ b/include/ddstream.h @@ -165,6 +165,7 @@ struct IDirectDrawMediaStreamVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDirectDrawMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDirectDrawMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -183,6 +184,7 @@ struct IDirectDrawMediaStreamVtbl { #define IDirectDrawMediaStream_SetDirectDraw(p,a) (p)->lpVtbl->SetDirectDraw(p,a) #define IDirectDrawMediaStream_CreateSample(p,a,b,c,d) (p)->lpVtbl->CreateSample(p,a,b,c,d) #define IDirectDrawMediaStream_GetTimePerFrame(p,a) (p)->lpVtbl->GetTimePerFrame(p,a) +#endif #endif @@ -343,6 +345,7 @@ struct IDirectDrawStreamSampleVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDirectDrawStreamSample_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDirectDrawStreamSample_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -356,6 +359,7 @@ struct IDirectDrawStreamSampleVtbl { /*** IDirectDrawStreamSample methods ***/ #define IDirectDrawStreamSample_GetSurface(p,a,b) (p)->lpVtbl->GetSurface(p,a,b) #define IDirectDrawStreamSample_SetRect(p,a) (p)->lpVtbl->SetRect(p,a) +#endif #endif diff --git a/include/dispex.h b/include/dispex.h index 3e80ae48edf..99e0d014968 100644 --- a/include/dispex.h +++ b/include/dispex.h @@ -199,6 +199,7 @@ struct IDispatchExVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDispatchEx_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDispatchEx_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -217,6 +218,7 @@ struct IDispatchExVtbl { #define IDispatchEx_GetMemberName(p,a,b) (p)->lpVtbl->GetMemberName(p,a,b) #define IDispatchEx_GetNextDispID(p,a,b,c) (p)->lpVtbl->GetNextDispID(p,a,b,c) #define IDispatchEx_GetNameSpaceParent(p,a) (p)->lpVtbl->GetNameSpaceParent(p,a) +#endif #endif @@ -431,6 +433,7 @@ struct IDispErrorVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDispError_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDispError_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -442,6 +445,7 @@ struct IDispErrorVtbl { #define IDispError_GetSource(p,a) (p)->lpVtbl->GetSource(p,a) #define IDispError_GetHelpInfo(p,a,b) (p)->lpVtbl->GetHelpInfo(p,a,b) #define IDispError_GetDescription(p,a) (p)->lpVtbl->GetDescription(p,a) +#endif #endif @@ -564,12 +568,14 @@ struct IVariantChangeTypeVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IVariantChangeType_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IVariantChangeType_AddRef(p) (p)->lpVtbl->AddRef(p) #define IVariantChangeType_Release(p) (p)->lpVtbl->Release(p) /*** IVariantChangeType methods ***/ #define IVariantChangeType_ChangeType(p,a,b,c,d) (p)->lpVtbl->ChangeType(p,a,b,c,d) +#endif #endif @@ -642,12 +648,14 @@ struct IObjectIdentityVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IObjectIdentity_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IObjectIdentity_AddRef(p) (p)->lpVtbl->AddRef(p) #define IObjectIdentity_Release(p) (p)->lpVtbl->Release(p) /*** IObjectIdentity methods ***/ #define IObjectIdentity_IsEqualObject(p,a) (p)->lpVtbl->IsEqualObject(p,a) +#endif #endif diff --git a/include/docobj.h b/include/docobj.h index 5f2debadf67..17a725ee357 100644 --- a/include/docobj.h +++ b/include/docobj.h @@ -99,6 +99,7 @@ struct IOleDocumentVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleDocument_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleDocument_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -107,6 +108,7 @@ struct IOleDocumentVtbl { #define IOleDocument_CreateView(p,a,b,c,d) (p)->lpVtbl->CreateView(p,a,b,c,d) #define IOleDocument_GetDocMiscStatus(p,a) (p)->lpVtbl->GetDocMiscStatus(p,a) #define IOleDocument_EnumViews(p,a,b) (p)->lpVtbl->EnumViews(p,a,b) +#endif #endif @@ -200,12 +202,14 @@ struct IOleDocumentSiteVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleDocumentSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleDocumentSite_AddRef(p) (p)->lpVtbl->AddRef(p) #define IOleDocumentSite_Release(p) (p)->lpVtbl->Release(p) /*** IOleDocumentSite methods ***/ #define IOleDocumentSite_ActivateMe(p,a) (p)->lpVtbl->ActivateMe(p,a) +#endif #endif @@ -363,6 +367,7 @@ struct IOleDocumentViewVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleDocumentView_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleDocumentView_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -381,6 +386,7 @@ struct IOleDocumentViewVtbl { #define IOleDocumentView_SaveViewState(p,a) (p)->lpVtbl->SaveViewState(p,a) #define IOleDocumentView_ApplyViewState(p,a) (p)->lpVtbl->ApplyViewState(p,a) #define IOleDocumentView_Clone(p,a,b) (p)->lpVtbl->Clone(p,a,b) +#endif #endif @@ -582,6 +588,7 @@ struct IEnumOleDocumentViewsVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumOleDocumentViews_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumOleDocumentViews_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -591,6 +598,7 @@ struct IEnumOleDocumentViewsVtbl { #define IEnumOleDocumentViews_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumOleDocumentViews_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumOleDocumentViews_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -810,6 +818,7 @@ struct IOleCommandTargetVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleCommandTarget_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleCommandTarget_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -817,6 +826,7 @@ struct IOleCommandTargetVtbl { /*** IOleCommandTarget methods ***/ #define IOleCommandTarget_QueryStatus(p,a,b,c,d) (p)->lpVtbl->QueryStatus(p,a,b,c,d) #define IOleCommandTarget_Exec(p,a,b,c,d,e) (p)->lpVtbl->Exec(p,a,b,c,d,e) +#endif #endif @@ -914,6 +924,7 @@ struct IContinueCallbackVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IContinueCallback_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IContinueCallback_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -921,6 +932,7 @@ struct IContinueCallbackVtbl { /*** IContinueCallback methods ***/ #define IContinueCallback_FContinue(p) (p)->lpVtbl->FContinue(p) #define IContinueCallback_FContinuePrinting(p,a,b,c) (p)->lpVtbl->FContinuePrinting(p,a,b,c) +#endif #endif @@ -1055,6 +1067,7 @@ struct IPrintVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPrint_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPrint_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1063,6 +1076,7 @@ struct IPrintVtbl { #define IPrint_SetInitialPageNum(p,a) (p)->lpVtbl->SetInitialPageNum(p,a) #define IPrint_GetPageInfo(p,a,b) (p)->lpVtbl->GetPageInfo(p,a,b) #define IPrint_Print(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->Print(p,a,b,c,d,e,f,g,h) +#endif #endif diff --git a/include/exdisp.h b/include/exdisp.h index b5c54489a17..02e7df76638 100644 --- a/include/exdisp.h +++ b/include/exdisp.h @@ -272,6 +272,7 @@ struct IWebBrowserVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IWebBrowser_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IWebBrowser_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -307,6 +308,7 @@ struct IWebBrowserVtbl { #define IWebBrowser_get_LocationName(p,a) (p)->lpVtbl->get_LocationName(p,a) #define IWebBrowser_get_LocationURL(p,a) (p)->lpVtbl->get_LocationURL(p,a) #define IWebBrowser_get_Busy(p,a) (p)->lpVtbl->get_Busy(p,a) +#endif #endif @@ -862,6 +864,7 @@ struct IWebBrowserAppVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IWebBrowserApp_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IWebBrowserApp_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -918,6 +921,7 @@ struct IWebBrowserAppVtbl { #define IWebBrowserApp_put_MenuBar(p,a) (p)->lpVtbl->put_MenuBar(p,a) #define IWebBrowserApp_get_FullScreen(p,a) (p)->lpVtbl->get_FullScreen(p,a) #define IWebBrowserApp_put_FullScreen(p,a) (p)->lpVtbl->put_FullScreen(p,a) +#endif #endif @@ -1323,6 +1327,7 @@ struct IShellWindowsVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IShellWindows_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IShellWindows_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1344,6 +1349,7 @@ struct IShellWindowsVtbl { #define IShellWindows_FindWindowSW(p,a,b,c,d,e,f) (p)->lpVtbl->FindWindowSW(p,a,b,c,d,e,f) #define IShellWindows_OnCreated(p,a,b) (p)->lpVtbl->OnCreated(p,a,b) #define IShellWindows_ProcessAttachDetach(p,a) (p)->lpVtbl->ProcessAttachDetach(p,a) +#endif #endif diff --git a/include/mlang.h b/include/mlang.h index 20c79d0a559..cbfea106f91 100644 --- a/include/mlang.h +++ b/include/mlang.h @@ -99,6 +99,7 @@ struct IMLangCodePagesVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMLangCodePages_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMLangCodePages_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -108,6 +109,7 @@ struct IMLangCodePagesVtbl { #define IMLangCodePages_GetStrCodePages(p,a,b,c,d,e) (p)->lpVtbl->GetStrCodePages(p,a,b,c,d,e) #define IMLangCodePages_CodePageToCodePages(p,a,b) (p)->lpVtbl->CodePageToCodePages(p,a,b) #define IMLangCodePages_CodePagesToCodePage(p,a,b,c) (p)->lpVtbl->CodePagesToCodePage(p,a,b,c) +#endif #endif @@ -266,6 +268,7 @@ struct IMLangFontLinkVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMLangFontLink_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMLangFontLink_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -280,6 +283,7 @@ struct IMLangFontLinkVtbl { #define IMLangFontLink_MapFont(p,a,b,c,d) (p)->lpVtbl->MapFont(p,a,b,c,d) #define IMLangFontLink_ReleaseFont(p,a) (p)->lpVtbl->ReleaseFont(p,a) #define IMLangFontLink_ResetFontMapping(p) (p)->lpVtbl->ResetFontMapping(p) +#endif #endif @@ -484,6 +488,7 @@ struct IEnumScriptVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumScript_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumScript_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -493,6 +498,7 @@ struct IEnumScriptVtbl { #define IEnumScript_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c) #define IEnumScript_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumScript_Skip(p,a) (p)->lpVtbl->Skip(p,a) +#endif #endif @@ -652,6 +658,7 @@ struct IEnumCodePageVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumCodePage_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumCodePage_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -661,6 +668,7 @@ struct IEnumCodePageVtbl { #define IEnumCodePage_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c) #define IEnumCodePage_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumCodePage_Skip(p,a) (p)->lpVtbl->Skip(p,a) +#endif #endif @@ -821,6 +829,7 @@ struct IMLangConvertCharsetVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMLangConvertCharset_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMLangConvertCharset_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -833,6 +842,7 @@ struct IMLangConvertCharsetVtbl { #define IMLangConvertCharset_DoConversion(p,a,b,c,d) (p)->lpVtbl->DoConversion(p,a,b,c,d) #define IMLangConvertCharset_DoConversionToUnicode(p,a,b,c,d) (p)->lpVtbl->DoConversionToUnicode(p,a,b,c,d) #define IMLangConvertCharset_DoConversionFromUnicode(p,a,b,c,d) (p)->lpVtbl->DoConversionFromUnicode(p,a,b,c,d) +#endif #endif @@ -996,6 +1006,7 @@ struct IEnumRfc1766Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumRfc1766_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumRfc1766_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1005,6 +1016,7 @@ struct IEnumRfc1766Vtbl { #define IEnumRfc1766_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c) #define IEnumRfc1766_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumRfc1766_Skip(p,a) (p)->lpVtbl->Skip(p,a) +#endif #endif @@ -1252,6 +1264,7 @@ struct IMultiLanguageVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMultiLanguage_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMultiLanguage_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1272,6 +1285,7 @@ struct IMultiLanguageVtbl { #define IMultiLanguage_EnumRfc1766(p,a) (p)->lpVtbl->EnumRfc1766(p,a) #define IMultiLanguage_GetRfc1766Info(p,a,b) (p)->lpVtbl->GetRfc1766Info(p,a,b) #define IMultiLanguage_CreateConvertCharset(p,a,b,c,d) (p)->lpVtbl->CreateConvertCharset(p,a,b,c,d) +#endif #endif @@ -1816,6 +1830,7 @@ struct IMultiLanguage2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMultiLanguage2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMultiLanguage2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1848,6 +1863,7 @@ struct IMultiLanguage2Vtbl { #define IMultiLanguage2_GetNumberOfScripts(p,a) (p)->lpVtbl->GetNumberOfScripts(p,a) #define IMultiLanguage2_EnumScripts(p,a,b,c) (p)->lpVtbl->EnumScripts(p,a,b,c) #define IMultiLanguage2_ValidateCodePageEx(p,a,b,c) (p)->lpVtbl->ValidateCodePageEx(p,a,b,c) +#endif #endif diff --git a/include/mmstream.h b/include/mmstream.h index 91e86c3a3c3..15a8fdb054e 100644 --- a/include/mmstream.h +++ b/include/mmstream.h @@ -181,6 +181,7 @@ struct IMultiMediaStreamVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMultiMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMultiMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -195,6 +196,7 @@ struct IMultiMediaStreamVtbl { #define IMultiMediaStream_GetDuration(p,a) (p)->lpVtbl->GetDuration(p,a) #define IMultiMediaStream_Seek(p,a) (p)->lpVtbl->Seek(p,a) #define IMultiMediaStream_GetEndOfStreamEventHandle(p,a) (p)->lpVtbl->GetEndOfStreamEventHandle(p,a) +#endif #endif @@ -379,6 +381,7 @@ struct IMediaStreamVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMediaStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMediaStream_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -390,6 +393,7 @@ struct IMediaStreamVtbl { #define IMediaStream_AllocateSample(p,a,b) (p)->lpVtbl->AllocateSample(p,a,b) #define IMediaStream_CreateSharedSample(p,a,b,c) (p)->lpVtbl->CreateSharedSample(p,a,b,c) #define IMediaStream_SendEndOfStream(p,a) (p)->lpVtbl->SendEndOfStream(p,a) +#endif #endif @@ -546,6 +550,7 @@ struct IStreamSampleVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IStreamSample_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IStreamSample_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -556,6 +561,7 @@ struct IStreamSampleVtbl { #define IStreamSample_SetSampleTimes(p,a,b) (p)->lpVtbl->SetSampleTimes(p,a,b) #define IStreamSample_Update(p,a,b,c,d) (p)->lpVtbl->Update(p,a,b,c,d) #define IStreamSample_CompletionStatus(p,a,b) (p)->lpVtbl->CompletionStatus(p,a,b) +#endif #endif diff --git a/include/oaidl.h b/include/oaidl.h index c2cffe4302e..312a9c3beec 100644 --- a/include/oaidl.h +++ b/include/oaidl.h @@ -688,6 +688,7 @@ struct IDispatchVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDispatch_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDispatch_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -697,6 +698,7 @@ struct IDispatchVtbl { #define IDispatch_GetTypeInfo(p,a,b,c) (p)->lpVtbl->GetTypeInfo(p,a,b,c) #define IDispatch_GetIDsOfNames(p,a,b,c,d,e) (p)->lpVtbl->GetIDsOfNames(p,a,b,c,d,e) #define IDispatch_Invoke(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->Invoke(p,a,b,c,d,e,f,g,h) +#endif #endif @@ -858,6 +860,7 @@ struct IEnumVARIANTVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumVARIANT_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumVARIANT_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -867,6 +870,7 @@ struct IEnumVARIANTVtbl { #define IEnumVARIANT_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumVARIANT_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumVARIANT_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -1014,6 +1018,7 @@ struct ITypeCompVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ITypeComp_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ITypeComp_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1021,6 +1026,7 @@ struct ITypeCompVtbl { /*** ITypeComp methods ***/ #define ITypeComp_Bind(p,a,b,c,d,e,f) (p)->lpVtbl->Bind(p,a,b,c,d,e,f) #define ITypeComp_BindType(p,a,b,c,d) (p)->lpVtbl->BindType(p,a,b,c,d) +#endif #endif @@ -1322,6 +1328,7 @@ struct ITypeInfoVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ITypeInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ITypeInfo_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1346,6 +1353,7 @@ struct ITypeInfoVtbl { #define ITypeInfo_ReleaseTypeAttr(p,a) (p)->lpVtbl->ReleaseTypeAttr(p,a) #define ITypeInfo_ReleaseFuncDesc(p,a) (p)->lpVtbl->ReleaseFuncDesc(p,a) #define ITypeInfo_ReleaseVarDesc(p,a) (p)->lpVtbl->ReleaseVarDesc(p,a) +#endif #endif @@ -1970,6 +1978,7 @@ struct ITypeInfo2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ITypeInfo2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ITypeInfo2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2010,6 +2019,7 @@ struct ITypeInfo2Vtbl { #define ITypeInfo2_GetAllParamCustData(p,a,b,c) (p)->lpVtbl->GetAllParamCustData(p,a,b,c) #define ITypeInfo2_GetAllVarCustData(p,a,b) (p)->lpVtbl->GetAllVarCustData(p,a,b) #define ITypeInfo2_GetAllImplTypeCustData(p,a,b) (p)->lpVtbl->GetAllImplTypeCustData(p,a,b) +#endif #endif @@ -2370,6 +2380,7 @@ struct ITypeLibVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ITypeLib_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ITypeLib_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2385,6 +2396,7 @@ struct ITypeLibVtbl { #define ITypeLib_IsName(p,a,b,c) (p)->lpVtbl->IsName(p,a,b,c) #define ITypeLib_FindName(p,a,b,c,d,e) (p)->lpVtbl->FindName(p,a,b,c,d,e) #define ITypeLib_ReleaseTLibAttr(p,a) (p)->lpVtbl->ReleaseTLibAttr(p,a) +#endif #endif @@ -2697,6 +2709,7 @@ struct ITypeLib2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ITypeLib2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ITypeLib2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2717,6 +2730,7 @@ struct ITypeLib2Vtbl { #define ITypeLib2_GetLibStatistics(p,a,b) (p)->lpVtbl->GetLibStatistics(p,a,b) #define ITypeLib2_GetDocumentation2(p,a,b,c,d,e) (p)->lpVtbl->GetDocumentation2(p,a,b,c,d,e) #define ITypeLib2_GetAllCustData(p,a) (p)->lpVtbl->GetAllCustData(p,a) +#endif #endif @@ -2884,6 +2898,7 @@ struct ITypeChangeEventsVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ITypeChangeEvents_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ITypeChangeEvents_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2891,6 +2906,7 @@ struct ITypeChangeEventsVtbl { /*** ITypeChangeEvents methods ***/ #define ITypeChangeEvents_RequestTypeChange(p,a,b,c,d) (p)->lpVtbl->RequestTypeChange(p,a,b,c,d) #define ITypeChangeEvents_AfterTypeChange(p,a,b,c) (p)->lpVtbl->AfterTypeChange(p,a,b,c) +#endif #endif @@ -3004,6 +3020,7 @@ struct IErrorInfoVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IErrorInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IErrorInfo_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3014,6 +3031,7 @@ struct IErrorInfoVtbl { #define IErrorInfo_GetDescription(p,a) (p)->lpVtbl->GetDescription(p,a) #define IErrorInfo_GetHelpFile(p,a) (p)->lpVtbl->GetHelpFile(p,a) #define IErrorInfo_GetHelpContext(p,a) (p)->lpVtbl->GetHelpContext(p,a) +#endif #endif @@ -3149,6 +3167,7 @@ struct ICreateErrorInfoVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ICreateErrorInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICreateErrorInfo_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3159,6 +3178,7 @@ struct ICreateErrorInfoVtbl { #define ICreateErrorInfo_SetDescription(p,a) (p)->lpVtbl->SetDescription(p,a) #define ICreateErrorInfo_SetHelpFile(p,a) (p)->lpVtbl->SetHelpFile(p,a) #define ICreateErrorInfo_SetHelpContext(p,a) (p)->lpVtbl->SetHelpContext(p,a) +#endif #endif @@ -3266,12 +3286,14 @@ struct ISupportErrorInfoVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ISupportErrorInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ISupportErrorInfo_AddRef(p) (p)->lpVtbl->AddRef(p) #define ISupportErrorInfo_Release(p) (p)->lpVtbl->Release(p) /*** ISupportErrorInfo methods ***/ #define ISupportErrorInfo_InterfaceSupportsErrorInfo(p,a) (p)->lpVtbl->InterfaceSupportsErrorInfo(p,a) +#endif #endif @@ -3345,12 +3367,14 @@ struct ITypeFactoryVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ITypeFactory_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ITypeFactory_AddRef(p) (p)->lpVtbl->AddRef(p) #define ITypeFactory_Release(p) (p)->lpVtbl->Release(p) /*** ITypeFactory methods ***/ #define ITypeFactory_CreateFromTypeInfo(p,a,b,c) (p)->lpVtbl->CreateFromTypeInfo(p,a,b,c) +#endif #endif @@ -3467,6 +3491,7 @@ struct ITypeMarshalVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ITypeMarshal_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ITypeMarshal_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3476,6 +3501,7 @@ struct ITypeMarshalVtbl { #define ITypeMarshal_Marshal(p,a,b,c,d,e,f) (p)->lpVtbl->Marshal(p,a,b,c,d,e,f) #define ITypeMarshal_Unmarshal(p,a,b,c,d,e) (p)->lpVtbl->Unmarshal(p,a,b,c,d,e) #define ITypeMarshal_Free(p,a) (p)->lpVtbl->Free(p,a) +#endif #endif @@ -3713,6 +3739,7 @@ struct IRecordInfoVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IRecordInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IRecordInfo_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3734,6 +3761,7 @@ struct IRecordInfoVtbl { #define IRecordInfo_RecordCreate(p) (p)->lpVtbl->RecordCreate(p) #define IRecordInfo_RecordCreateCopy(p,a,b) (p)->lpVtbl->RecordCreateCopy(p,a,b) #define IRecordInfo_RecordDestroy(p,a) (p)->lpVtbl->RecordDestroy(p,a) +#endif #endif @@ -4138,6 +4166,7 @@ struct ICreateTypeInfoVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ICreateTypeInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICreateTypeInfo_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4166,6 +4195,7 @@ struct ICreateTypeInfoVtbl { #define ICreateTypeInfo_SetMops(p,a,b) (p)->lpVtbl->SetMops(p,a,b) #define ICreateTypeInfo_SetTypeIdldesc(p,a) (p)->lpVtbl->SetTypeIdldesc(p,a) #define ICreateTypeInfo_LayOut(p) (p)->lpVtbl->LayOut(p) +#endif #endif @@ -4681,6 +4711,7 @@ struct ICreateTypeInfo2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ICreateTypeInfo2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICreateTypeInfo2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4725,6 +4756,7 @@ struct ICreateTypeInfo2Vtbl { #define ICreateTypeInfo2_SetVarHelpStringContext(p,a,b) (p)->lpVtbl->SetVarHelpStringContext(p,a,b) #define ICreateTypeInfo2_Invalidate(p) (p)->lpVtbl->Invalidate(p) #define ICreateTypeInfo2_SetName(p,a) (p)->lpVtbl->SetName(p,a) +#endif #endif @@ -5026,6 +5058,7 @@ struct ICreateTypeLibVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ICreateTypeLib_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICreateTypeLib_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5041,6 +5074,7 @@ struct ICreateTypeLibVtbl { #define ICreateTypeLib_SetLcid(p,a) (p)->lpVtbl->SetLcid(p,a) #define ICreateTypeLib_SetLibFlags(p,a) (p)->lpVtbl->SetLibFlags(p,a) #define ICreateTypeLib_SaveAllChanges(p) (p)->lpVtbl->SaveAllChanges(p) +#endif #endif @@ -5261,6 +5295,7 @@ struct ICreateTypeLib2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ICreateTypeLib2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICreateTypeLib2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5281,6 +5316,7 @@ struct ICreateTypeLib2Vtbl { #define ICreateTypeLib2_SetCustData(p,a,b) (p)->lpVtbl->SetCustData(p,a,b) #define ICreateTypeLib2_SetHelpStringContext(p,a) (p)->lpVtbl->SetHelpStringContext(p,a) #define ICreateTypeLib2_SetHelpStringDll(p,a) (p)->lpVtbl->SetHelpStringDll(p,a) +#endif #endif @@ -5393,12 +5429,14 @@ struct IErrorLogVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IErrorLog_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IErrorLog_AddRef(p) (p)->lpVtbl->AddRef(p) #define IErrorLog_Release(p) (p)->lpVtbl->Release(p) /*** IErrorLog methods ***/ #define IErrorLog_AddError(p,a,b) (p)->lpVtbl->AddError(p,a,b) +#endif #endif @@ -5484,6 +5522,7 @@ struct IPropertyBagVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPropertyBag_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPropertyBag_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5491,6 +5530,7 @@ struct IPropertyBagVtbl { /*** IPropertyBag methods ***/ #define IPropertyBag_Read(p,a,b,c) (p)->lpVtbl->Read(p,a,b,c) #define IPropertyBag_Write(p,a,b) (p)->lpVtbl->Write(p,a,b) +#endif #endif diff --git a/include/objidl.h b/include/objidl.h index 059c5d31a9a..cc0723d27a0 100644 --- a/include/objidl.h +++ b/include/objidl.h @@ -155,6 +155,7 @@ struct IMarshalVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMarshal_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMarshal_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -166,6 +167,7 @@ struct IMarshalVtbl { #define IMarshal_UnmarshalInterface(p,a,b,c) (p)->lpVtbl->UnmarshalInterface(p,a,b,c) #define IMarshal_ReleaseMarshalData(p,a) (p)->lpVtbl->ReleaseMarshalData(p,a) #define IMarshal_DisconnectObject(p,a) (p)->lpVtbl->DisconnectObject(p,a) +#endif #endif @@ -303,12 +305,14 @@ struct IStdMarshalInfoVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IStdMarshalInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IStdMarshalInfo_AddRef(p) (p)->lpVtbl->AddRef(p) #define IStdMarshalInfo_Release(p) (p)->lpVtbl->Release(p) /*** IStdMarshalInfo methods ***/ #define IStdMarshalInfo_GetClassForHandler(p,a,b,c) (p)->lpVtbl->GetClassForHandler(p,a,b,c) +#endif #endif @@ -401,6 +405,7 @@ struct IExternalConnectionVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IExternalConnection_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IExternalConnection_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -408,6 +413,7 @@ struct IExternalConnectionVtbl { /*** IExternalConnection methods ***/ #define IExternalConnection_AddConnection(p,a,b) (p)->lpVtbl->AddConnection(p,a,b) #define IExternalConnection_ReleaseConnection(p,a,b,c) (p)->lpVtbl->ReleaseConnection(p,a,b,c) +#endif #endif @@ -499,12 +505,14 @@ struct IMultiQIVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMultiQI_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMultiQI_AddRef(p) (p)->lpVtbl->AddRef(p) #define IMultiQI_Release(p) (p)->lpVtbl->Release(p) /*** IMultiQI methods ***/ #define IMultiQI_QueryMultipleInterfaces(p,a,b) (p)->lpVtbl->QueryMultipleInterfaces(p,a,b) +#endif #endif @@ -613,6 +621,7 @@ struct IMallocVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMalloc_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMalloc_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -624,6 +633,7 @@ struct IMallocVtbl { #define IMalloc_GetSize(p,a) (p)->lpVtbl->GetSize(p,a) #define IMalloc_DidAlloc(p,a) (p)->lpVtbl->DidAlloc(p,a) #define IMalloc_HeapMinimize(p) (p)->lpVtbl->HeapMinimize(p) +#endif #endif @@ -835,6 +845,7 @@ struct IMallocSpyVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMallocSpy_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMallocSpy_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -852,6 +863,7 @@ struct IMallocSpyVtbl { #define IMallocSpy_PostDidAlloc(p,a,b,c) (p)->lpVtbl->PostDidAlloc(p,a,b,c) #define IMallocSpy_PreHeapMinimize(p) (p)->lpVtbl->PreHeapMinimize(p) #define IMallocSpy_PostHeapMinimize(p) (p)->lpVtbl->PostHeapMinimize(p) +#endif #endif @@ -1054,6 +1066,7 @@ struct IEnumUnknownVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumUnknown_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumUnknown_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1063,6 +1076,7 @@ struct IEnumUnknownVtbl { #define IEnumUnknown_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumUnknown_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumUnknown_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -1178,6 +1192,7 @@ struct ISurrogateVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ISurrogate_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ISurrogate_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1185,6 +1200,7 @@ struct ISurrogateVtbl { /*** ISurrogate methods ***/ #define ISurrogate_LoadDllServer(p,a) (p)->lpVtbl->LoadDllServer(p,a) #define ISurrogate_FreeSurrogate(p) (p)->lpVtbl->FreeSurrogate(p) +#endif #endif @@ -1286,6 +1302,7 @@ struct IGlobalInterfaceTableVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IGlobalInterfaceTable_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IGlobalInterfaceTable_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1294,6 +1311,7 @@ struct IGlobalInterfaceTableVtbl { #define IGlobalInterfaceTable_RegisterInterfaceInGlobal(p,a,b,c) (p)->lpVtbl->RegisterInterfaceInGlobal(p,a,b,c) #define IGlobalInterfaceTable_RevokeInterfaceFromGlobal(p,a) (p)->lpVtbl->RevokeInterfaceFromGlobal(p,a) #define IGlobalInterfaceTable_GetInterfaceFromGlobal(p,a,b,c) (p)->lpVtbl->GetInterfaceFromGlobal(p,a,b,c) +#endif #endif @@ -1478,6 +1496,7 @@ struct IBindCtxVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IBindCtx_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IBindCtx_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1493,6 +1512,7 @@ struct IBindCtxVtbl { #define IBindCtx_GetObjectParam(p,a,b) (p)->lpVtbl->GetObjectParam(p,a,b) #define IBindCtx_EnumObjectParam(p,a) (p)->lpVtbl->EnumObjectParam(p,a) #define IBindCtx_RevokeObjectParam(p,a) (p)->lpVtbl->RevokeObjectParam(p,a) +#endif #endif @@ -1682,6 +1702,7 @@ struct IEnumMonikerVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumMoniker_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumMoniker_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1691,6 +1712,7 @@ struct IEnumMonikerVtbl { #define IEnumMoniker_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumMoniker_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumMoniker_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -1829,6 +1851,7 @@ struct IRunnableObjectVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IRunnableObject_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IRunnableObject_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1839,6 +1862,7 @@ struct IRunnableObjectVtbl { #define IRunnableObject_IsRunning(p) (p)->lpVtbl->IsRunning(p) #define IRunnableObject_LockRunning(p,a,b) (p)->lpVtbl->LockRunning(p,a,b) #define IRunnableObject_SetContainedObject(p,a) (p)->lpVtbl->SetContainedObject(p,a) +#endif #endif @@ -2002,6 +2026,7 @@ struct IRunningObjectTableVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IRunningObjectTable_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IRunningObjectTable_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2014,6 +2039,7 @@ struct IRunningObjectTableVtbl { #define IRunningObjectTable_NoteChangeTime(p,a,b) (p)->lpVtbl->NoteChangeTime(p,a,b) #define IRunningObjectTable_GetTimeOfLastChange(p,a,b) (p)->lpVtbl->GetTimeOfLastChange(p,a,b) #define IRunningObjectTable_EnumRunning(p,a) (p)->lpVtbl->EnumRunning(p,a) +#endif #endif @@ -2145,12 +2171,14 @@ struct IPersistVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPersist_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPersist_AddRef(p) (p)->lpVtbl->AddRef(p) #define IPersist_Release(p) (p)->lpVtbl->Release(p) /*** IPersist methods ***/ #define IPersist_GetClassID(p,a) (p)->lpVtbl->GetClassID(p,a) +#endif #endif @@ -2249,6 +2277,7 @@ struct IPersistStreamVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPersistStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPersistStream_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2260,6 +2289,7 @@ struct IPersistStreamVtbl { #define IPersistStream_Load(p,a) (p)->lpVtbl->Load(p,a) #define IPersistStream_Save(p,a,b) (p)->lpVtbl->Save(p,a,b) #define IPersistStream_GetSizeMax(p,a) (p)->lpVtbl->GetSizeMax(p,a) +#endif #endif @@ -2540,6 +2570,7 @@ struct IMonikerVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMoniker_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMoniker_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2567,6 +2598,7 @@ struct IMonikerVtbl { #define IMoniker_GetDisplayName(p,a,b,c) (p)->lpVtbl->GetDisplayName(p,a,b,c) #define IMoniker_ParseDisplayName(p,a,b,c,d,e) (p)->lpVtbl->ParseDisplayName(p,a,b,c,d,e) #define IMoniker_IsSystemMoniker(p,a) (p)->lpVtbl->IsSystemMoniker(p,a) +#endif #endif @@ -2821,12 +2853,14 @@ struct IROTDataVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IROTData_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IROTData_AddRef(p) (p)->lpVtbl->AddRef(p) #define IROTData_Release(p) (p)->lpVtbl->Release(p) /*** IROTData methods ***/ #define IROTData_GetComparisonData(p,a,b,c) (p)->lpVtbl->GetComparisonData(p,a,b,c) +#endif #endif @@ -2919,6 +2953,7 @@ struct IEnumStringVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumString_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumString_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2928,6 +2963,7 @@ struct IEnumStringVtbl { #define IEnumString_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumString_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumString_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -3043,12 +3079,14 @@ struct IClassActivatorVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IClassActivator_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IClassActivator_AddRef(p) (p)->lpVtbl->AddRef(p) #define IClassActivator_Release(p) (p)->lpVtbl->Release(p) /*** IClassActivator methods ***/ #define IClassActivator_GetClassObject(p,a,b,c,d,e) (p)->lpVtbl->GetClassObject(p,a,b,c,d,e) +#endif #endif @@ -3137,6 +3175,7 @@ struct ISequentialStreamVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ISequentialStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ISequentialStream_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3144,6 +3183,7 @@ struct ISequentialStreamVtbl { /*** ISequentialStream methods ***/ #define ISequentialStream_Read(p,a,b,c) (p)->lpVtbl->Read(p,a,b,c) #define ISequentialStream_Write(p,a,b,c) (p)->lpVtbl->Write(p,a,b,c) +#endif #endif @@ -3368,6 +3408,7 @@ struct IStreamVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IStream_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IStream_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3385,6 +3426,7 @@ struct IStreamVtbl { #define IStream_UnlockRegion(p,a,b,c) (p)->lpVtbl->UnlockRegion(p,a,b,c) #define IStream_Stat(p,a,b) (p)->lpVtbl->Stat(p,a,b) #define IStream_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -3586,6 +3628,7 @@ struct IEnumSTATSTGVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumSTATSTG_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumSTATSTG_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3595,6 +3638,7 @@ struct IEnumSTATSTGVtbl { #define IEnumSTATSTG_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumSTATSTG_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumSTATSTG_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -3879,6 +3923,7 @@ struct IStorageVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IStorage_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IStorage_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3899,6 +3944,7 @@ struct IStorageVtbl { #define IStorage_SetClass(p,a) (p)->lpVtbl->SetClass(p,a) #define IStorage_SetStateBits(p,a,b) (p)->lpVtbl->SetStateBits(p,a,b) #define IStorage_Stat(p,a,b) (p)->lpVtbl->Stat(p,a,b) +#endif #endif @@ -4193,6 +4239,7 @@ struct IPersistFileVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPersistFile_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPersistFile_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4205,6 +4252,7 @@ struct IPersistFileVtbl { #define IPersistFile_Save(p,a,b) (p)->lpVtbl->Save(p,a,b) #define IPersistFile_SaveCompleted(p,a) (p)->lpVtbl->SaveCompleted(p,a) #define IPersistFile_GetCurFile(p,a) (p)->lpVtbl->GetCurFile(p,a) +#endif #endif @@ -4355,6 +4403,7 @@ struct IPersistStorageVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPersistStorage_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPersistStorage_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4368,6 +4417,7 @@ struct IPersistStorageVtbl { #define IPersistStorage_Save(p,a,b) (p)->lpVtbl->Save(p,a,b) #define IPersistStorage_SaveCompleted(p,a) (p)->lpVtbl->SaveCompleted(p,a) #define IPersistStorage_HandsOffStorage(p) (p)->lpVtbl->HandsOffStorage(p) +#endif #endif @@ -4485,12 +4535,14 @@ struct IRootStorageVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IRootStorage_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IRootStorage_AddRef(p) (p)->lpVtbl->AddRef(p) #define IRootStorage_Release(p) (p)->lpVtbl->Release(p) /*** IRootStorage methods ***/ #define IRootStorage_SwitchToFile(p,a) (p)->lpVtbl->SwitchToFile(p,a) +#endif #endif @@ -4625,6 +4677,7 @@ struct ILockBytesVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ILockBytes_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ILockBytes_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4637,6 +4690,7 @@ struct ILockBytesVtbl { #define ILockBytes_LockRegion(p,a,b,c) (p)->lpVtbl->LockRegion(p,a,b,c) #define ILockBytes_UnlockRegion(p,a,b,c) (p)->lpVtbl->UnlockRegion(p,a,b,c) #define ILockBytes_Stat(p,a,b) (p)->lpVtbl->Stat(p,a,b) +#endif #endif @@ -4825,6 +4879,7 @@ struct IFillLockBytesVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFillLockBytes_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFillLockBytes_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4834,6 +4889,7 @@ struct IFillLockBytesVtbl { #define IFillLockBytes_FillAt(p,a,b,c,d) (p)->lpVtbl->FillAt(p,a,b,c,d) #define IFillLockBytes_SetFillSize(p,a) (p)->lpVtbl->SetFillSize(p,a) #define IFillLockBytes_Terminate(p,a) (p)->lpVtbl->Terminate(p,a) +#endif #endif @@ -4963,12 +5019,14 @@ struct IProgressNotifyVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IProgressNotify_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IProgressNotify_AddRef(p) (p)->lpVtbl->AddRef(p) #define IProgressNotify_Release(p) (p)->lpVtbl->Release(p) /*** IProgressNotify methods ***/ #define IProgressNotify_OnProgress(p,a,b,c,d) (p)->lpVtbl->OnProgress(p,a,b,c,d) +#endif #endif @@ -5078,6 +5136,7 @@ struct ILayoutStorageVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ILayoutStorage_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ILayoutStorage_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5088,6 +5147,7 @@ struct ILayoutStorageVtbl { #define ILayoutStorage_EndMonitor(p) (p)->lpVtbl->EndMonitor(p) #define ILayoutStorage_ReLayoutDocfile(p,a) (p)->lpVtbl->ReLayoutDocfile(p,a) #define ILayoutStorage_ReLayoutDocfileOnILockBytes(p,a) (p)->lpVtbl->ReLayoutDocfileOnILockBytes(p,a) +#endif #endif @@ -5238,6 +5298,7 @@ struct IEnumFORMATETCVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumFORMATETC_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumFORMATETC_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5247,6 +5308,7 @@ struct IEnumFORMATETCVtbl { #define IEnumFORMATETC_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumFORMATETC_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumFORMATETC_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -5397,6 +5459,7 @@ struct IEnumSTATDATAVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumSTATDATA_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumSTATDATA_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5406,6 +5469,7 @@ struct IEnumSTATDATAVtbl { #define IEnumSTATDATA_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumSTATDATA_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumSTATDATA_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -5635,6 +5699,7 @@ struct IAdviseSinkVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAdviseSink_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAdviseSink_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5645,6 +5710,7 @@ struct IAdviseSinkVtbl { #define IAdviseSink_OnRename(p,a) (p)->lpVtbl->OnRename(p,a) #define IAdviseSink_OnSave(p) (p)->lpVtbl->OnSave(p) #define IAdviseSink_OnClose(p) (p)->lpVtbl->OnClose(p) +#endif #endif @@ -5811,6 +5877,7 @@ struct IAdviseSink2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAdviseSink2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAdviseSink2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5823,6 +5890,7 @@ struct IAdviseSink2Vtbl { #define IAdviseSink2_OnClose(p) (p)->lpVtbl->OnClose(p) /*** IAdviseSink2 methods ***/ #define IAdviseSink2_OnLinkSrcChange(p,a) (p)->lpVtbl->OnLinkSrcChange(p,a) +#endif #endif @@ -5987,6 +6055,7 @@ struct IDataObjectVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDataObject_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDataObject_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -6001,6 +6070,7 @@ struct IDataObjectVtbl { #define IDataObject_DAdvise(p,a,b,c,d) (p)->lpVtbl->DAdvise(p,a,b,c,d) #define IDataObject_DUnadvise(p,a) (p)->lpVtbl->DUnadvise(p,a) #define IDataObject_EnumDAdvise(p,a) (p)->lpVtbl->EnumDAdvise(p,a) +#endif #endif @@ -6212,6 +6282,7 @@ struct IDataAdviseHolderVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDataAdviseHolder_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDataAdviseHolder_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -6221,6 +6292,7 @@ struct IDataAdviseHolderVtbl { #define IDataAdviseHolder_Unadvise(p,a) (p)->lpVtbl->Unadvise(p,a) #define IDataAdviseHolder_EnumAdvise(p,a) (p)->lpVtbl->EnumAdvise(p,a) #define IDataAdviseHolder_SendOnDataChange(p,a,b,c) (p)->lpVtbl->SendOnDataChange(p,a,b,c) +#endif #endif @@ -6384,6 +6456,7 @@ struct IMessageFilterVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMessageFilter_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMessageFilter_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -6392,6 +6465,7 @@ struct IMessageFilterVtbl { #define IMessageFilter_HandleIncomingCall(p,a,b,c,d) (p)->lpVtbl->HandleIncomingCall(p,a,b,c,d) #define IMessageFilter_RetryRejectedCall(p,a,b,c) (p)->lpVtbl->RetryRejectedCall(p,a,b,c) #define IMessageFilter_MessagePending(p,a,b,c) (p)->lpVtbl->MessagePending(p,a,b,c) +#endif #endif @@ -6535,6 +6609,7 @@ struct IRpcChannelBufferVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IRpcChannelBuffer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IRpcChannelBuffer_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -6545,6 +6620,7 @@ struct IRpcChannelBufferVtbl { #define IRpcChannelBuffer_FreeBuffer(p,a) (p)->lpVtbl->FreeBuffer(p,a) #define IRpcChannelBuffer_GetDestCtx(p,a,b) (p)->lpVtbl->GetDestCtx(p,a,b) #define IRpcChannelBuffer_IsConnected(p) (p)->lpVtbl->IsConnected(p) +#endif #endif @@ -6677,6 +6753,7 @@ struct IRpcChannelBuffer2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IRpcChannelBuffer2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IRpcChannelBuffer2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -6689,6 +6766,7 @@ struct IRpcChannelBuffer2Vtbl { #define IRpcChannelBuffer2_IsConnected(p) (p)->lpVtbl->IsConnected(p) /*** IRpcChannelBuffer2 methods ***/ #define IRpcChannelBuffer2_GetProtocolVersion(p,a) (p)->lpVtbl->GetProtocolVersion(p,a) +#endif #endif @@ -6854,6 +6932,7 @@ struct IRpcChannelBuffer3Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IRpcChannelBuffer3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IRpcChannelBuffer3_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -6874,6 +6953,7 @@ struct IRpcChannelBuffer3Vtbl { #define IRpcChannelBuffer3_GetDestCtxEx(p,a,b,c) (p)->lpVtbl->GetDestCtxEx(p,a,b,c) #define IRpcChannelBuffer3_GetState(p,a,b) (p)->lpVtbl->GetState(p,a,b) #define IRpcChannelBuffer3_RegisterAsync(p,a,b) (p)->lpVtbl->RegisterAsync(p,a,b) +#endif #endif @@ -7022,6 +7102,7 @@ struct IRpcProxyBufferVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IRpcProxyBuffer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IRpcProxyBuffer_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -7029,6 +7110,7 @@ struct IRpcProxyBufferVtbl { /*** IRpcProxyBuffer methods ***/ #define IRpcProxyBuffer_Connect(p,a) (p)->lpVtbl->Connect(p,a) #define IRpcProxyBuffer_Disconnect(p) (p)->lpVtbl->Disconnect(p) +#endif #endif @@ -7150,6 +7232,7 @@ struct IRpcStubBufferVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IRpcStubBuffer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IRpcStubBuffer_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -7162,6 +7245,7 @@ struct IRpcStubBufferVtbl { #define IRpcStubBuffer_CountRefs(p) (p)->lpVtbl->CountRefs(p) #define IRpcStubBuffer_DebugServerQueryInterface(p,a) (p)->lpVtbl->DebugServerQueryInterface(p,a) #define IRpcStubBuffer_DebugServerRelease(p,a) (p)->lpVtbl->DebugServerRelease(p,a) +#endif #endif @@ -7303,6 +7387,7 @@ struct IPSFactoryBufferVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPSFactoryBuffer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPSFactoryBuffer_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -7310,6 +7395,7 @@ struct IPSFactoryBufferVtbl { /*** IPSFactoryBuffer methods ***/ #define IPSFactoryBuffer_CreateProxy(p,a,b,c,d) (p)->lpVtbl->CreateProxy(p,a,b,c,d) #define IPSFactoryBuffer_CreateStub(p,a,b,c) (p)->lpVtbl->CreateStub(p,a,b,c) +#endif #endif @@ -7481,6 +7567,7 @@ struct IChannelHookVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IChannelHook_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IChannelHook_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -7492,6 +7579,7 @@ struct IChannelHookVtbl { #define IChannelHook_ServerNotify(p,a,b,c,d,e) (p)->lpVtbl->ServerNotify(p,a,b,c,d,e) #define IChannelHook_ServerGetSize(p,a,b,c,d) (p)->lpVtbl->ServerGetSize(p,a,b,c,d) #define IChannelHook_ServerFillBuffer(p,a,b,c,d,e) (p)->lpVtbl->ServerFillBuffer(p,a,b,c,d,e) +#endif #endif @@ -7948,6 +8036,7 @@ struct IPropertyStorageVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPropertyStorage_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPropertyStorage_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -7965,6 +8054,7 @@ struct IPropertyStorageVtbl { #define IPropertyStorage_SetTimes(p,a,b,c) (p)->lpVtbl->SetTimes(p,a,b,c) #define IPropertyStorage_SetClass(p,a) (p)->lpVtbl->SetClass(p,a) #define IPropertyStorage_Stat(p,a) (p)->lpVtbl->Stat(p,a) +#endif #endif @@ -8180,6 +8270,7 @@ struct IPropertySetStorageVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPropertySetStorage_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPropertySetStorage_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -8189,6 +8280,7 @@ struct IPropertySetStorageVtbl { #define IPropertySetStorage_Open(p,a,b,c) (p)->lpVtbl->Open(p,a,b,c) #define IPropertySetStorage_Delete(p,a) (p)->lpVtbl->Delete(p,a) #define IPropertySetStorage_Enum(p,a) (p)->lpVtbl->Enum(p,a) +#endif #endif @@ -8312,6 +8404,7 @@ struct IEnumSTATPROPSTGVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumSTATPROPSTG_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumSTATPROPSTG_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -8321,6 +8414,7 @@ struct IEnumSTATPROPSTGVtbl { #define IEnumSTATPROPSTG_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumSTATPROPSTG_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumSTATPROPSTG_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -8449,6 +8543,7 @@ struct IEnumSTATPROPSETSTGVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumSTATPROPSETSTG_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumSTATPROPSETSTG_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -8458,6 +8553,7 @@ struct IEnumSTATPROPSETSTGVtbl { #define IEnumSTATPROPSETSTG_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumSTATPROPSETSTG_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumSTATPROPSETSTG_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -8627,6 +8723,7 @@ struct IClientSecurityVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IClientSecurity_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IClientSecurity_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -8635,6 +8732,7 @@ struct IClientSecurityVtbl { #define IClientSecurity_QueryBlanket(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->QueryBlanket(p,a,b,c,d,e,f,g,h) #define IClientSecurity_SetBlanket(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->SetBlanket(p,a,b,c,d,e,f,g,h) #define IClientSecurity_CopyProxy(p,a,b) (p)->lpVtbl->CopyProxy(p,a,b) +#endif #endif @@ -8767,6 +8865,7 @@ struct IServerSecurityVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IServerSecurity_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IServerSecurity_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -8776,6 +8875,7 @@ struct IServerSecurityVtbl { #define IServerSecurity_ImpersonateClient(p) (p)->lpVtbl->ImpersonateClient(p) #define IServerSecurity_RevertToSelf(p) (p)->lpVtbl->RevertToSelf(p) #define IServerSecurity_IsImpersonating(p) (p)->lpVtbl->IsImpersonating(p) +#endif #endif @@ -8883,12 +8983,14 @@ struct IAsyncSetupVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAsyncSetup_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAsyncSetup_AddRef(p) (p)->lpVtbl->AddRef(p) #define IAsyncSetup_Release(p) (p)->lpVtbl->Release(p) /*** IAsyncSetup methods ***/ #define IAsyncSetup_GetAsyncManager(p,a,b,c,d,e) (p)->lpVtbl->GetAsyncManager(p,a,b,c,d,e) +#endif #endif @@ -8979,6 +9081,7 @@ struct IAsyncManagerVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAsyncManager_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAsyncManager_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -8987,6 +9090,7 @@ struct IAsyncManagerVtbl { #define IAsyncManager_CompleteCall(p,a) (p)->lpVtbl->CompleteCall(p,a) #define IAsyncManager_GetCallContext(p,a,b) (p)->lpVtbl->GetCallContext(p,a,b) #define IAsyncManager_GetState(p,a) (p)->lpVtbl->GetState(p,a) +#endif #endif diff --git a/include/ocidl.h b/include/ocidl.h index ff74849a7bf..b6151592704 100644 --- a/include/ocidl.h +++ b/include/ocidl.h @@ -242,6 +242,7 @@ struct IFontVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFont_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFont_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -271,6 +272,7 @@ struct IFontVtbl { #define IFont_AddRefHfont(p,a) (p)->lpVtbl->AddRefHfont(p,a) #define IFont_ReleaseHfont(p,a) (p)->lpVtbl->ReleaseHfont(p,a) #define IFont_SetHdc(p,a) (p)->lpVtbl->SetHdc(p,a) +#endif #endif @@ -572,6 +574,7 @@ struct IFontDispVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFontDisp_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFontDisp_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -581,6 +584,7 @@ struct IFontDispVtbl { #define IFontDisp_GetTypeInfo(p,a,b,c) (p)->lpVtbl->GetTypeInfo(p,a,b,c) #define IFontDisp_GetIDsOfNames(p,a,b,c,d,e) (p)->lpVtbl->GetIDsOfNames(p,a,b,c,d,e) #define IFontDisp_Invoke(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->Invoke(p,a,b,c,d,e,f,g,h) +#endif #endif @@ -778,6 +782,7 @@ struct IPictureVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPicture_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPicture_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -797,6 +802,7 @@ struct IPictureVtbl { #define IPicture_PictureChanged(p) (p)->lpVtbl->PictureChanged(p) #define IPicture_SaveAsFile(p,a,b,c) (p)->lpVtbl->SaveAsFile(p,a,b,c) #define IPicture_get_Attributes(p,a) (p)->lpVtbl->get_Attributes(p,a) +#endif #endif @@ -1019,6 +1025,7 @@ struct IPictureDispVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPictureDisp_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPictureDisp_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1028,6 +1035,7 @@ struct IPictureDispVtbl { #define IPictureDisp_GetTypeInfo(p,a,b,c) (p)->lpVtbl->GetTypeInfo(p,a,b,c) #define IPictureDisp_GetIDsOfNames(p,a,b,c,d,e) (p)->lpVtbl->GetIDsOfNames(p,a,b,c,d,e) #define IPictureDisp_Invoke(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->Invoke(p,a,b,c,d,e,f,g,h) +#endif #endif @@ -1127,6 +1135,7 @@ struct IOleControlVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleControl_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleControl_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1136,6 +1145,7 @@ struct IOleControlVtbl { #define IOleControl_OnMnemonic(p,a) (p)->lpVtbl->OnMnemonic(p,a) #define IOleControl_OnAmbientPropertyChange(p,a) (p)->lpVtbl->OnAmbientPropertyChange(p,a) #define IOleControl_FreezeEvents(p,a) (p)->lpVtbl->FreezeEvents(p,a) +#endif #endif @@ -1293,6 +1303,7 @@ struct IOleControlSiteVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleControlSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleControlSite_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1305,6 +1316,7 @@ struct IOleControlSiteVtbl { #define IOleControlSite_TranslateAccelerator(p,a,b) (p)->lpVtbl->TranslateAccelerator(p,a,b) #define IOleControlSite_OnFocus(p,a) (p)->lpVtbl->OnFocus(p,a) #define IOleControlSite_ShowPropertyFrame(p) (p)->lpVtbl->ShowPropertyFrame(p) +#endif #endif @@ -1498,6 +1510,7 @@ struct IOleInPlaceSiteExVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleInPlaceSiteEx_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleInPlaceSiteEx_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1520,6 +1533,7 @@ struct IOleInPlaceSiteExVtbl { #define IOleInPlaceSiteEx_OnInPlaceActivateEx(p,a,b) (p)->lpVtbl->OnInPlaceActivateEx(p,a,b) #define IOleInPlaceSiteEx_OnInPlaceDeactivateEx(p,a) (p)->lpVtbl->OnInPlaceDeactivateEx(p,a) #define IOleInPlaceSiteEx_RequestUIActivate(p) (p)->lpVtbl->RequestUIActivate(p) +#endif #endif @@ -1784,6 +1798,7 @@ struct IOleInPlaceSiteWindowlessVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleInPlaceSiteWindowless_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleInPlaceSiteWindowless_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1819,6 +1834,7 @@ struct IOleInPlaceSiteWindowlessVtbl { #define IOleInPlaceSiteWindowless_ScrollRect(p,a,b,c,d) (p)->lpVtbl->ScrollRect(p,a,b,c,d) #define IOleInPlaceSiteWindowless_AdjustRect(p,a) (p)->lpVtbl->AdjustRect(p,a) #define IOleInPlaceSiteWindowless_OnDefWindowMessage(p,a,b,c,d) (p)->lpVtbl->OnDefWindowMessage(p,a,b,c,d) +#endif #endif @@ -2051,6 +2067,7 @@ struct IOleInPlaceObjectWindowlessVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleInPlaceObjectWindowless_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleInPlaceObjectWindowless_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2066,6 +2083,7 @@ struct IOleInPlaceObjectWindowlessVtbl { /*** IOleInPlaceObjectWindowless methods ***/ #define IOleInPlaceObjectWindowless_OnWindowMessage(p,a,b,c,d) (p)->lpVtbl->OnWindowMessage(p,a,b,c,d) #define IOleInPlaceObjectWindowless_GetDropTarget(p,a) (p)->lpVtbl->GetDropTarget(p,a) +#endif #endif @@ -2198,6 +2216,7 @@ struct IClassFactory2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IClassFactory2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IClassFactory2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2209,6 +2228,7 @@ struct IClassFactory2Vtbl { #define IClassFactory2_GetLicInfo(p,a) (p)->lpVtbl->GetLicInfo(p,a) #define IClassFactory2_RequestLicKey(p,a,b) (p)->lpVtbl->RequestLicKey(p,a,b) #define IClassFactory2_CreateInstanceLic(p,a,b,c,d,e) (p)->lpVtbl->CreateInstanceLic(p,a,b,c,d,e) +#endif #endif @@ -2462,6 +2482,7 @@ struct IViewObjectExVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IViewObjectEx_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IViewObjectEx_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2481,6 +2502,7 @@ struct IViewObjectExVtbl { #define IViewObjectEx_QueryHitPoint(p,a,b,c,d,e) (p)->lpVtbl->QueryHitPoint(p,a,b,c,d,e) #define IViewObjectEx_QueryHitRect(p,a,b,c,d,e) (p)->lpVtbl->QueryHitRect(p,a,b,c,d,e) #define IViewObjectEx_GetNaturalExtent(p,a,b,c,d,e,f) (p)->lpVtbl->GetNaturalExtent(p,a,b,c,d,e,f) +#endif #endif @@ -2614,12 +2636,14 @@ struct IProvideClassInfoVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IProvideClassInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IProvideClassInfo_AddRef(p) (p)->lpVtbl->AddRef(p) #define IProvideClassInfo_Release(p) (p)->lpVtbl->Release(p) /*** IProvideClassInfo methods ***/ #define IProvideClassInfo_GetClassInfo(p,a) (p)->lpVtbl->GetClassInfo(p,a) +#endif #endif @@ -2702,6 +2726,7 @@ struct IProvideClassInfo2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IProvideClassInfo2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IProvideClassInfo2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2710,6 +2735,7 @@ struct IProvideClassInfo2Vtbl { #define IProvideClassInfo2_GetClassInfo(p,a) (p)->lpVtbl->GetClassInfo(p,a) /*** IProvideClassInfo2 methods ***/ #define IProvideClassInfo2_GetGUID(p,a,b) (p)->lpVtbl->GetGUID(p,a,b) +#endif #endif @@ -2824,6 +2850,7 @@ struct IConnectionPointVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IConnectionPoint_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IConnectionPoint_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2834,6 +2861,7 @@ struct IConnectionPointVtbl { #define IConnectionPoint_Advise(p,a,b) (p)->lpVtbl->Advise(p,a,b) #define IConnectionPoint_Unadvise(p,a) (p)->lpVtbl->Unadvise(p,a) #define IConnectionPoint_EnumConnections(p,a) (p)->lpVtbl->EnumConnections(p,a) +#endif #endif @@ -2951,6 +2979,7 @@ struct IConnectionPointContainerVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IConnectionPointContainer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IConnectionPointContainer_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2958,6 +2987,7 @@ struct IConnectionPointContainerVtbl { /*** IConnectionPointContainer methods ***/ #define IConnectionPointContainer_EnumConnectionPoints(p,a) (p)->lpVtbl->EnumConnectionPoints(p,a) #define IConnectionPointContainer_FindConnectionPoint(p,a,b) (p)->lpVtbl->FindConnectionPoint(p,a,b) +#endif #endif @@ -3063,6 +3093,7 @@ struct IEnumConnectionsVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumConnections_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumConnections_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3072,6 +3103,7 @@ struct IEnumConnectionsVtbl { #define IEnumConnections_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumConnections_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumConnections_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -3200,6 +3232,7 @@ struct IEnumConnectionPointsVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumConnectionPoints_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumConnectionPoints_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3209,6 +3242,7 @@ struct IEnumConnectionPointsVtbl { #define IEnumConnectionPoints_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumConnectionPoints_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumConnectionPoints_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -3405,6 +3439,7 @@ struct IPropertyPageVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPropertyPage_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPropertyPage_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3421,6 +3456,7 @@ struct IPropertyPageVtbl { #define IPropertyPage_Apply(p) (p)->lpVtbl->Apply(p) #define IPropertyPage_Help(p,a) (p)->lpVtbl->Help(p,a) #define IPropertyPage_TranslateAccelerator(p,a) (p)->lpVtbl->TranslateAccelerator(p,a) +#endif #endif @@ -3627,6 +3663,7 @@ struct IPropertyPage2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPropertyPage2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPropertyPage2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3645,6 +3682,7 @@ struct IPropertyPage2Vtbl { #define IPropertyPage2_TranslateAccelerator(p,a) (p)->lpVtbl->TranslateAccelerator(p,a) /*** IPropertyPage2 methods ***/ #define IPropertyPage2_EditProperty(p,a) (p)->lpVtbl->EditProperty(p,a) +#endif #endif @@ -3750,6 +3788,7 @@ struct IPropertyPageSiteVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPropertyPageSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPropertyPageSite_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3759,6 +3798,7 @@ struct IPropertyPageSiteVtbl { #define IPropertyPageSite_GetLocaleID(p,a) (p)->lpVtbl->GetLocaleID(p,a) #define IPropertyPageSite_GetPageContainer(p,a) (p)->lpVtbl->GetPageContainer(p,a) #define IPropertyPageSite_TranslateAccelerator(p,a) (p)->lpVtbl->TranslateAccelerator(p,a) +#endif #endif @@ -3864,6 +3904,7 @@ struct IPropertyNotifySinkVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPropertyNotifySink_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPropertyNotifySink_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3871,6 +3912,7 @@ struct IPropertyNotifySinkVtbl { /*** IPropertyNotifySink methods ***/ #define IPropertyNotifySink_OnChanged(p,a) (p)->lpVtbl->OnChanged(p,a) #define IPropertyNotifySink_OnRequestEdit(p,a) (p)->lpVtbl->OnRequestEdit(p,a) +#endif #endif @@ -3978,6 +4020,7 @@ struct ISimpleFrameSiteVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ISimpleFrameSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ISimpleFrameSite_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3985,6 +4028,7 @@ struct ISimpleFrameSiteVtbl { /*** ISimpleFrameSite methods ***/ #define ISimpleFrameSite_PreMessageFilter(p,a,b,c,d,e,f) (p)->lpVtbl->PreMessageFilter(p,a,b,c,d,e,f) #define ISimpleFrameSite_PostMessageFilter(p,a,b,c,d,e,f) (p)->lpVtbl->PostMessageFilter(p,a,b,c,d,e,f) +#endif #endif @@ -4108,6 +4152,7 @@ struct IPersistStreamInitVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPersistStreamInit_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPersistStreamInit_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4120,6 +4165,7 @@ struct IPersistStreamInitVtbl { #define IPersistStreamInit_Save(p,a,b) (p)->lpVtbl->Save(p,a,b) #define IPersistStreamInit_GetSizeMax(p,a) (p)->lpVtbl->GetSizeMax(p,a) #define IPersistStreamInit_InitNew(p) (p)->lpVtbl->InitNew(p) +#endif #endif @@ -4265,6 +4311,7 @@ struct IPersistMemoryVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPersistMemory_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPersistMemory_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4277,6 +4324,7 @@ struct IPersistMemoryVtbl { #define IPersistMemory_Save(p,a,b,c) (p)->lpVtbl->Save(p,a,b,c) #define IPersistMemory_GetSizeMax(p,a) (p)->lpVtbl->GetSizeMax(p,a) #define IPersistMemory_InitNew(p) (p)->lpVtbl->InitNew(p) +#endif #endif @@ -4429,6 +4477,7 @@ struct IPersistPropertyBagVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPersistPropertyBag_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPersistPropertyBag_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4439,6 +4488,7 @@ struct IPersistPropertyBagVtbl { #define IPersistPropertyBag_InitNew(p) (p)->lpVtbl->InitNew(p) #define IPersistPropertyBag_Load(p,a,b) (p)->lpVtbl->Load(p,a,b) #define IPersistPropertyBag_Save(p,a,b,c) (p)->lpVtbl->Save(p,a,b,c) +#endif #endif @@ -4603,6 +4653,7 @@ struct IPropertyBag2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPropertyBag2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPropertyBag2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4613,6 +4664,7 @@ struct IPropertyBag2Vtbl { #define IPropertyBag2_CountProperties(p,a) (p)->lpVtbl->CountProperties(p,a) #define IPropertyBag2_GetPropertyInfo(p,a,b,c,d) (p)->lpVtbl->GetPropertyInfo(p,a,b,c,d) #define IPropertyBag2_LoadObject(p,a,b,c,d) (p)->lpVtbl->LoadObject(p,a,b,c,d) +#endif #endif @@ -4762,6 +4814,7 @@ struct IPersistPropertyBag2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPersistPropertyBag2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPersistPropertyBag2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4773,6 +4826,7 @@ struct IPersistPropertyBag2Vtbl { #define IPersistPropertyBag2_Load(p,a,b) (p)->lpVtbl->Load(p,a,b) #define IPersistPropertyBag2_Save(p,a,b,c) (p)->lpVtbl->Save(p,a,b,c) #define IPersistPropertyBag2_IsDirty(p) (p)->lpVtbl->IsDirty(p) +#endif #endif @@ -4879,12 +4933,14 @@ struct ISpecifyPropertyPagesVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ISpecifyPropertyPages_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ISpecifyPropertyPages_AddRef(p) (p)->lpVtbl->AddRef(p) #define ISpecifyPropertyPages_Release(p) (p)->lpVtbl->Release(p) /*** ISpecifyPropertyPages methods ***/ #define ISpecifyPropertyPages_GetPages(p,a) (p)->lpVtbl->GetPages(p,a) +#endif #endif @@ -4999,6 +5055,7 @@ struct IPerPropertyBrowsingVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPerPropertyBrowsing_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPerPropertyBrowsing_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5008,6 +5065,7 @@ struct IPerPropertyBrowsingVtbl { #define IPerPropertyBrowsing_MapPropertyToPage(p,a,b) (p)->lpVtbl->MapPropertyToPage(p,a,b) #define IPerPropertyBrowsing_GetPredefinedStrings(p,a,b,c) (p)->lpVtbl->GetPredefinedStrings(p,a,b,c) #define IPerPropertyBrowsing_GetPredefinedValue(p,a,b,c) (p)->lpVtbl->GetPredefinedValue(p,a,b,c) +#endif #endif @@ -5133,6 +5191,7 @@ struct IAdviseSinkExVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAdviseSinkEx_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAdviseSinkEx_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5145,6 +5204,7 @@ struct IAdviseSinkExVtbl { #define IAdviseSinkEx_OnClose(p) (p)->lpVtbl->OnClose(p) /*** IAdviseSinkEx methods ***/ #define IAdviseSinkEx_OnViewStatusChange(p,a) (p)->lpVtbl->OnViewStatusChange(p,a) +#endif #endif @@ -5256,6 +5316,7 @@ struct IPointerInactiveVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPointerInactive_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPointerInactive_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5264,6 +5325,7 @@ struct IPointerInactiveVtbl { #define IPointerInactive_GetActivationPolicy(p,a) (p)->lpVtbl->GetActivationPolicy(p,a) #define IPointerInactive_OnInactiveMouseMove(p,a,b,c,d) (p)->lpVtbl->OnInactiveMouseMove(p,a,b,c,d) #define IPointerInactive_OnInactiveSetCursor(p,a,b,c,d,e) (p)->lpVtbl->OnInactiveSetCursor(p,a,b,c,d,e) +#endif #endif @@ -5369,6 +5431,7 @@ struct IObjectWithSiteVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IObjectWithSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IObjectWithSite_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5376,6 +5439,7 @@ struct IObjectWithSiteVtbl { /*** IObjectWithSite methods ***/ #define IObjectWithSite_SetSite(p,a) (p)->lpVtbl->SetSite(p,a) #define IObjectWithSite_GetSite(p,a,b) (p)->lpVtbl->GetSite(p,a,b) +#endif #endif @@ -5484,6 +5548,7 @@ struct IOleUndoUnitVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleUndoUnit_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleUndoUnit_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5493,6 +5558,7 @@ struct IOleUndoUnitVtbl { #define IOleUndoUnit_GetDescription(p,a) (p)->lpVtbl->GetDescription(p,a) #define IOleUndoUnit_GetUnitType(p,a,b) (p)->lpVtbl->GetUnitType(p,a,b) #define IOleUndoUnit_OnNextAdd(p) (p)->lpVtbl->OnNextAdd(p) +#endif #endif @@ -5638,6 +5704,7 @@ struct IOleParentUndoUnitVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleParentUndoUnit_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleParentUndoUnit_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5653,6 +5720,7 @@ struct IOleParentUndoUnitVtbl { #define IOleParentUndoUnit_Add(p,a) (p)->lpVtbl->Add(p,a) #define IOleParentUndoUnit_FindUnit(p,a) (p)->lpVtbl->FindUnit(p,a) #define IOleParentUndoUnit_GetParentState(p,a) (p)->lpVtbl->GetParentState(p,a) +#endif #endif @@ -5790,6 +5858,7 @@ struct IEnumOleUndoUnitsVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumOleUndoUnits_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumOleUndoUnits_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5799,6 +5868,7 @@ struct IEnumOleUndoUnitsVtbl { #define IEnumOleUndoUnits_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumOleUndoUnits_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumOleUndoUnits_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -5982,6 +6052,7 @@ struct IOleUndoManagerVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleUndoManager_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleUndoManager_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5999,6 +6070,7 @@ struct IOleUndoManagerVtbl { #define IOleUndoManager_GetLastUndoDescription(p,a) (p)->lpVtbl->GetLastUndoDescription(p,a) #define IOleUndoManager_GetLastRedoDescription(p,a) (p)->lpVtbl->GetLastRedoDescription(p,a) #define IOleUndoManager_Enable(p,a) (p)->lpVtbl->Enable(p,a) +#endif #endif @@ -6227,6 +6299,7 @@ struct IQuickActivateVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IQuickActivate_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IQuickActivate_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -6235,6 +6308,7 @@ struct IQuickActivateVtbl { #define IQuickActivate_QuickActivate(p,a,b) (p)->lpVtbl->QuickActivate(p,a,b) #define IQuickActivate_SetContentExtent(p,a) (p)->lpVtbl->SetContentExtent(p,a) #define IQuickActivate_GetContentExtent(p,a) (p)->lpVtbl->GetContentExtent(p,a) +#endif #endif diff --git a/include/oleidl.h b/include/oleidl.h index e4d57b9d3e6..53877d961c8 100644 --- a/include/oleidl.h +++ b/include/oleidl.h @@ -81,6 +81,7 @@ struct IOleWindowVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleWindow_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleWindow_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -88,6 +89,7 @@ struct IOleWindowVtbl { /*** IOleWindow methods ***/ #define IOleWindow_GetWindow(p,a) (p)->lpVtbl->GetWindow(p,a) #define IOleWindow_ContextSensitiveHelp(p,a) (p)->lpVtbl->ContextSensitiveHelp(p,a) +#endif #endif @@ -197,6 +199,7 @@ struct IOleInPlaceObjectVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleInPlaceObject_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleInPlaceObject_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -209,6 +212,7 @@ struct IOleInPlaceObjectVtbl { #define IOleInPlaceObject_UIDeactivate(p) (p)->lpVtbl->UIDeactivate(p) #define IOleInPlaceObject_SetObjectRects(p,a,b) (p)->lpVtbl->SetObjectRects(p,a,b) #define IOleInPlaceObject_ReactivateAndUndo(p) (p)->lpVtbl->ReactivateAndUndo(p) +#endif #endif @@ -357,6 +361,7 @@ struct IOleInPlaceActiveObjectVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleInPlaceActiveObject_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleInPlaceActiveObject_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -370,6 +375,7 @@ struct IOleInPlaceActiveObjectVtbl { #define IOleInPlaceActiveObject_OnDocWindowActivate(p,a) (p)->lpVtbl->OnDocWindowActivate(p,a) #define IOleInPlaceActiveObject_ResizeBorder(p,a,b,c) (p)->lpVtbl->ResizeBorder(p,a,b,c) #define IOleInPlaceActiveObject_EnableModeless(p,a) (p)->lpVtbl->EnableModeless(p,a) +#endif #endif @@ -531,6 +537,7 @@ struct IOleInPlaceUIWindowVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleInPlaceUIWindow_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleInPlaceUIWindow_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -543,6 +550,7 @@ struct IOleInPlaceUIWindowVtbl { #define IOleInPlaceUIWindow_RequestBorderSpace(p,a) (p)->lpVtbl->RequestBorderSpace(p,a) #define IOleInPlaceUIWindow_SetBorderSpace(p,a) (p)->lpVtbl->SetBorderSpace(p,a) #define IOleInPlaceUIWindow_SetActiveObject(p,a,b) (p)->lpVtbl->SetActiveObject(p,a,b) +#endif #endif @@ -729,6 +737,7 @@ struct IOleInPlaceFrameVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleInPlaceFrame_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleInPlaceFrame_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -748,6 +757,7 @@ struct IOleInPlaceFrameVtbl { #define IOleInPlaceFrame_SetStatusText(p,a) (p)->lpVtbl->SetStatusText(p,a) #define IOleInPlaceFrame_EnableModeless(p,a) (p)->lpVtbl->EnableModeless(p,a) #define IOleInPlaceFrame_TranslateAccelerator(p,a,b) (p)->lpVtbl->TranslateAccelerator(p,a,b) +#endif #endif @@ -950,6 +960,7 @@ struct IOleInPlaceSiteVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleInPlaceSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleInPlaceSite_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -968,6 +979,7 @@ struct IOleInPlaceSiteVtbl { #define IOleInPlaceSite_DiscardUndoState(p) (p)->lpVtbl->DiscardUndoState(p) #define IOleInPlaceSite_DeactivateAndUndo(p) (p)->lpVtbl->DeactivateAndUndo(p) #define IOleInPlaceSite_OnPosRectChange(p,a) (p)->lpVtbl->OnPosRectChange(p,a) +#endif #endif @@ -1127,12 +1139,14 @@ struct IParseDisplayNameVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IParseDisplayName_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IParseDisplayName_AddRef(p) (p)->lpVtbl->AddRef(p) #define IParseDisplayName_Release(p) (p)->lpVtbl->Release(p) /*** IParseDisplayName methods ***/ #define IParseDisplayName_ParseDisplayName(p,a,b,c,d) (p)->lpVtbl->ParseDisplayName(p,a,b,c,d) +#endif #endif @@ -1224,6 +1238,7 @@ struct IOleContainerVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleContainer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleContainer_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1233,6 +1248,7 @@ struct IOleContainerVtbl { /*** IOleContainer methods ***/ #define IOleContainer_EnumObjects(p,a,b) (p)->lpVtbl->EnumObjects(p,a,b) #define IOleContainer_LockContainer(p,a) (p)->lpVtbl->LockContainer(p,a) +#endif #endif @@ -1379,6 +1395,7 @@ struct IOleItemContainerVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleItemContainer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleItemContainer_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1392,6 +1409,7 @@ struct IOleItemContainerVtbl { #define IOleItemContainer_GetObject(p,a,b,c,d,e) (p)->lpVtbl->GetObject(p,a,b,c,d,e) #define IOleItemContainer_GetObjectStorage(p,a,b,c,d) (p)->lpVtbl->GetObjectStorage(p,a,b,c,d) #define IOleItemContainer_IsRunning(p,a) (p)->lpVtbl->IsRunning(p,a) +#endif #endif @@ -1574,6 +1592,7 @@ struct IOleLinkVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleLink_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleLink_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1590,6 +1609,7 @@ struct IOleLinkVtbl { #define IOleLink_GetBoundSource(p,a) (p)->lpVtbl->GetBoundSource(p,a) #define IOleLink_UnbindSource(p) (p)->lpVtbl->UnbindSource(p) #define IOleLink_Update(p,a) (p)->lpVtbl->Update(p,a) +#endif #endif @@ -1787,6 +1807,7 @@ struct IOleClientSiteVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleClientSite_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleClientSite_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1798,6 +1819,7 @@ struct IOleClientSiteVtbl { #define IOleClientSite_ShowObject(p) (p)->lpVtbl->ShowObject(p) #define IOleClientSite_OnShowWindow(p,a) (p)->lpVtbl->OnShowWindow(p,a) #define IOleClientSite_RequestNewObjectLayout(p) (p)->lpVtbl->RequestNewObjectLayout(p) +#endif #endif @@ -1949,6 +1971,7 @@ struct IOleCacheVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleCache_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleCache_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1959,6 +1982,7 @@ struct IOleCacheVtbl { #define IOleCache_EnumCache(p,a) (p)->lpVtbl->EnumCache(p,a) #define IOleCache_InitCache(p,a) (p)->lpVtbl->InitCache(p,a) #define IOleCache_SetData(p,a,b,c) (p)->lpVtbl->SetData(p,a,b,c) +#endif #endif @@ -2129,6 +2153,7 @@ struct IOleCache2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleCache2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleCache2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2142,6 +2167,7 @@ struct IOleCache2Vtbl { /*** IOleCache2 methods ***/ #define IOleCache2_UpdateCache(p,a,b,c) (p)->lpVtbl->UpdateCache(p,a,b,c) #define IOleCache2_DiscardCache(p,a) (p)->lpVtbl->DiscardCache(p,a) +#endif #endif @@ -2246,6 +2272,7 @@ struct IOleCacheControlVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleCacheControl_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleCacheControl_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2253,6 +2280,7 @@ struct IOleCacheControlVtbl { /*** IOleCacheControl methods ***/ #define IOleCacheControl_OnRun(p,a) (p)->lpVtbl->OnRun(p,a) #define IOleCacheControl_OnStop(p) (p)->lpVtbl->OnStop(p) +#endif #endif @@ -2368,6 +2396,7 @@ struct IEnumOLEVERBVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumOLEVERB_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumOLEVERB_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2377,6 +2406,7 @@ struct IEnumOLEVERBVtbl { #define IEnumOLEVERB_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumOLEVERB_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumOLEVERB_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -2708,6 +2738,7 @@ struct IOleObjectVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleObject_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleObject_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2734,6 +2765,7 @@ struct IOleObjectVtbl { #define IOleObject_EnumAdvise(p,a) (p)->lpVtbl->EnumAdvise(p,a) #define IOleObject_GetMiscStatus(p,a,b) (p)->lpVtbl->GetMiscStatus(p,a,b) #define IOleObject_SetColorScheme(p,a) (p)->lpVtbl->SetColorScheme(p,a) +#endif #endif @@ -3035,6 +3067,7 @@ struct IOleAdviseHolderVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOleAdviseHolder_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOleAdviseHolder_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3046,6 +3079,7 @@ struct IOleAdviseHolderVtbl { #define IOleAdviseHolder_SendOnRename(p,a) (p)->lpVtbl->SendOnRename(p,a) #define IOleAdviseHolder_SendOnSave(p) (p)->lpVtbl->SendOnSave(p) #define IOleAdviseHolder_SendOnClose(p) (p)->lpVtbl->SendOnClose(p) +#endif #endif @@ -3158,12 +3192,14 @@ struct IContinueVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IContinue_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IContinue_AddRef(p) (p)->lpVtbl->AddRef(p) #define IContinue_Release(p) (p)->lpVtbl->Release(p) /*** IContinue methods ***/ #define IContinue_FContinue(p) (p)->lpVtbl->FContinue(p) +#endif #endif @@ -3311,6 +3347,7 @@ struct IViewObjectVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IViewObject_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IViewObject_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3322,6 +3359,7 @@ struct IViewObjectVtbl { #define IViewObject_Unfreeze(p,a) (p)->lpVtbl->Unfreeze(p,a) #define IViewObject_SetAdvise(p,a,b,c) (p)->lpVtbl->SetAdvise(p,a,b,c) #define IViewObject_GetAdvise(p,a,b,c) (p)->lpVtbl->GetAdvise(p,a,b,c) +#endif #endif @@ -3571,6 +3609,7 @@ struct IViewObject2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IViewObject2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IViewObject2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3584,6 +3623,7 @@ struct IViewObject2Vtbl { #define IViewObject2_GetAdvise(p,a,b,c) (p)->lpVtbl->GetAdvise(p,a,b,c) /*** IViewObject2 methods ***/ #define IViewObject2_GetExtent(p,a,b,c,d) (p)->lpVtbl->GetExtent(p,a,b,c,d) +#endif #endif @@ -3674,6 +3714,7 @@ struct IDropSourceVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDropSource_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDropSource_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3681,6 +3722,7 @@ struct IDropSourceVtbl { /*** IDropSource methods ***/ #define IDropSource_QueryContinueDrag(p,a,b) (p)->lpVtbl->QueryContinueDrag(p,a,b) #define IDropSource_GiveFeedback(p,a) (p)->lpVtbl->GiveFeedback(p,a) +#endif #endif @@ -3820,6 +3862,7 @@ struct IDropTargetVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDropTarget_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDropTarget_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3829,6 +3872,7 @@ struct IDropTargetVtbl { #define IDropTarget_DragOver(p,a,b,c) (p)->lpVtbl->DragOver(p,a,b,c) #define IDropTarget_DragLeave(p) (p)->lpVtbl->DragLeave(p) #define IDropTarget_Drop(p,a,b,c,d) (p)->lpVtbl->Drop(p,a,b,c,d) +#endif #endif diff --git a/include/pstore.h b/include/pstore.h index 79b40346e63..6ed38d561e1 100644 --- a/include/pstore.h +++ b/include/pstore.h @@ -135,6 +135,7 @@ struct IEnumPStoreItemsVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumPStoreItems_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumPStoreItems_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -144,6 +145,7 @@ struct IEnumPStoreItemsVtbl { #define IEnumPStoreItems_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c) #define IEnumPStoreItems_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumPStoreItems_Skip(p,a) (p)->lpVtbl->Skip(p,a) +#endif #endif @@ -264,6 +266,7 @@ struct IEnumPStoreTypesVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumPStoreTypes_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumPStoreTypes_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -273,6 +276,7 @@ struct IEnumPStoreTypesVtbl { #define IEnumPStoreTypes_Next(p,a,b,c) (p)->lpVtbl->Next(p,a,b,c) #define IEnumPStoreTypes_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumPStoreTypes_Skip(p,a) (p)->lpVtbl->Skip(p,a) +#endif #endif @@ -645,6 +649,7 @@ struct IPStoreVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPStore_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPStore_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -669,6 +674,7 @@ struct IPStoreVtbl { #define IPStore_OpenItem(p,a,b,c,d,e,f,g) (p)->lpVtbl->OpenItem(p,a,b,c,d,e,f,g) #define IPStore_CloseItem(p,a,b,c,d,e) (p)->lpVtbl->CloseItem(p,a,b,c,d,e) #define IPStore_EnumItems(p,a,b,c,d,e) (p)->lpVtbl->EnumItems(p,a,b,c,d,e) +#endif #endif diff --git a/include/servprov.h b/include/servprov.h index ecb39d55719..f9d53bfd2ca 100644 --- a/include/servprov.h +++ b/include/servprov.h @@ -60,12 +60,14 @@ struct IServiceProviderVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IServiceProvider_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IServiceProvider_AddRef(p) (p)->lpVtbl->AddRef(p) #define IServiceProvider_Release(p) (p)->lpVtbl->Release(p) /*** IServiceProvider methods ***/ #define IServiceProvider_QueryService(p,a,b,c) (p)->lpVtbl->QueryService(p,a,b,c) +#endif #endif diff --git a/include/shldisp.h b/include/shldisp.h index 2c07317958b..e545a07502c 100644 --- a/include/shldisp.h +++ b/include/shldisp.h @@ -74,6 +74,7 @@ struct IAutoCompleteVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAutoComplete_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAutoComplete_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -81,6 +82,7 @@ struct IAutoCompleteVtbl { /*** IAutoComplete methods ***/ #define IAutoComplete_Init(p,a,b,c,d) (p)->lpVtbl->Init(p,a,b,c,d) #define IAutoComplete_Enable(p,a) (p)->lpVtbl->Enable(p,a) +#endif #endif @@ -194,6 +196,7 @@ struct IAutoComplete2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAutoComplete2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAutoComplete2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -204,6 +207,7 @@ struct IAutoComplete2Vtbl { /*** IAutoComplete2 methods ***/ #define IAutoComplete2_SetOptions(p,a) (p)->lpVtbl->SetOptions(p,a) #define IAutoComplete2_GetOptions(p,a) (p)->lpVtbl->GetOptions(p,a) +#endif #endif @@ -315,6 +319,7 @@ struct IFolderViewOCVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFolderViewOC_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFolderViewOC_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -326,6 +331,7 @@ struct IFolderViewOCVtbl { #define IFolderViewOC_Invoke(p,a,b,c,d,e,f,g,h) (p)->lpVtbl->Invoke(p,a,b,c,d,e,f,g,h) /*** IFolderViewOC methods ***/ #define IFolderViewOC_SetFolderView(p,a) (p)->lpVtbl->SetFolderView(p,a) +#endif #endif diff --git a/include/shobjidl.h b/include/shobjidl.h index 77a741bbcd0..4230643a54f 100644 --- a/include/shobjidl.h +++ b/include/shobjidl.h @@ -66,6 +66,7 @@ struct IPersistFolderVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPersistFolder_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPersistFolder_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -74,6 +75,7 @@ struct IPersistFolderVtbl { #define IPersistFolder_GetClassID(p,a) (p)->lpVtbl->GetClassID(p,a) /*** IPersistFolder methods ***/ #define IPersistFolder_Initialize(p,a) (p)->lpVtbl->Initialize(p,a) +#endif #endif @@ -157,6 +159,7 @@ struct IPersistFolder2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPersistFolder2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPersistFolder2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -167,6 +170,7 @@ struct IPersistFolder2Vtbl { #define IPersistFolder2_Initialize(p,a) (p)->lpVtbl->Initialize(p,a) /*** IPersistFolder2 methods ***/ #define IPersistFolder2_GetCurFolder(p,a) (p)->lpVtbl->GetCurFolder(p,a) +#endif #endif @@ -266,6 +270,7 @@ struct IEnumIDListVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumIDList_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumIDList_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -275,6 +280,7 @@ struct IEnumIDListVtbl { #define IEnumIDList_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumIDList_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumIDList_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -547,6 +553,7 @@ struct IShellFolderVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IShellFolder_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IShellFolder_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -562,6 +569,7 @@ struct IShellFolderVtbl { #define IShellFolder_GetUIObjectOf(p,a,b,c,d,e,f) (p)->lpVtbl->GetUIObjectOf(p,a,b,c,d,e,f) #define IShellFolder_GetDisplayNameOf(p,a,b,c) (p)->lpVtbl->GetDisplayNameOf(p,a,b,c) #define IShellFolder_SetNameOf(p,a,b,c,d,e) (p)->lpVtbl->SetNameOf(p,a,b,c,d,e) +#endif #endif @@ -774,6 +782,7 @@ struct IEnumExtraSearchVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumExtraSearch_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumExtraSearch_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -783,6 +792,7 @@ struct IEnumExtraSearchVtbl { #define IEnumExtraSearch_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumExtraSearch_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumExtraSearch_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -1031,6 +1041,7 @@ struct IShellFolder2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IShellFolder2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IShellFolder2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1054,6 +1065,7 @@ struct IShellFolder2Vtbl { #define IShellFolder2_GetDetailsEx(p,a,b,c) (p)->lpVtbl->GetDetailsEx(p,a,b,c) #define IShellFolder2_GetDetailsOf(p,a,b,c) (p)->lpVtbl->GetDetailsOf(p,a,b,c) #define IShellFolder2_MapColumnToSCID(p,a,b) (p)->lpVtbl->MapColumnToSCID(p,a,b) +#endif #endif @@ -1376,6 +1388,7 @@ struct IShellViewVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IShellView_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IShellView_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1395,6 +1408,7 @@ struct IShellViewVtbl { #define IShellView_SaveViewState(p) (p)->lpVtbl->SaveViewState(p) #define IShellView_SelectItem(p,a,b) (p)->lpVtbl->SelectItem(p,a,b) #define IShellView_GetItemObject(p,a,b,c) (p)->lpVtbl->GetItemObject(p,a,b,c) +#endif #endif @@ -1702,6 +1716,7 @@ struct IShellBrowserVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IShellBrowser_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IShellBrowser_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1723,6 +1738,7 @@ struct IShellBrowserVtbl { #define IShellBrowser_QueryActiveShellView(p,a) (p)->lpVtbl->QueryActiveShellView(p,a) #define IShellBrowser_OnViewWindowActive(p,a) (p)->lpVtbl->OnViewWindowActive(p,a) #define IShellBrowser_SetToolbarItems(p,a,b,c) (p)->lpVtbl->SetToolbarItems(p,a,b,c) +#endif #endif @@ -2053,6 +2069,7 @@ struct IShellLinkAVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IShellLinkA_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IShellLinkA_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2076,6 +2093,7 @@ struct IShellLinkAVtbl { #define IShellLinkA_SetRelativePath(p,a,b) (p)->lpVtbl->SetRelativePath(p,a,b) #define IShellLinkA_Resolve(p,a,b) (p)->lpVtbl->Resolve(p,a,b) #define IShellLinkA_SetPath(p,a) (p)->lpVtbl->SetPath(p,a) +#endif #endif @@ -2450,6 +2468,7 @@ struct IShellLinkWVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IShellLinkW_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IShellLinkW_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2473,6 +2492,7 @@ struct IShellLinkWVtbl { #define IShellLinkW_SetRelativePath(p,a,b) (p)->lpVtbl->SetRelativePath(p,a,b) #define IShellLinkW_Resolve(p,a,b) (p)->lpVtbl->Resolve(p,a,b) #define IShellLinkW_SetPath(p,a) (p)->lpVtbl->SetPath(p,a) +#endif #endif @@ -2713,12 +2733,14 @@ struct IShellExtInitVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IShellExtInit_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IShellExtInit_AddRef(p) (p)->lpVtbl->AddRef(p) #define IShellExtInit_Release(p) (p)->lpVtbl->Release(p) /*** IShellExtInit methods ***/ #define IShellExtInit_Initialize(p,a,b,c) (p)->lpVtbl->Initialize(p,a,b,c) +#endif #endif @@ -2824,6 +2846,7 @@ struct IPersistFolder3Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPersistFolder3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPersistFolder3_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2837,6 +2860,7 @@ struct IPersistFolder3Vtbl { /*** IPersistFolder3 methods ***/ #define IPersistFolder3_InitializeEx(p,a,b,c) (p)->lpVtbl->InitializeEx(p,a,b,c) #define IPersistFolder3_GetFolderTargetInfo(p,a) (p)->lpVtbl->GetFolderTargetInfo(p,a) +#endif #endif @@ -2958,6 +2982,7 @@ struct IExtractIconAVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IExtractIconA_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IExtractIconA_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2965,6 +2990,7 @@ struct IExtractIconAVtbl { /*** IExtractIconA methods ***/ #define IExtractIconA_GetIconLocation(p,a,b,c,d,e) (p)->lpVtbl->GetIconLocation(p,a,b,c,d,e) #define IExtractIconA_Extract(p,a,b,c,d,e) (p)->lpVtbl->Extract(p,a,b,c,d,e) +#endif #endif @@ -3076,6 +3102,7 @@ struct IExtractIconWVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IExtractIconW_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IExtractIconW_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3083,6 +3110,7 @@ struct IExtractIconWVtbl { /*** IExtractIconW methods ***/ #define IExtractIconW_GetIconLocation(p,a,b,c,d,e) (p)->lpVtbl->GetIconLocation(p,a,b,c,d,e) #define IExtractIconW_Extract(p,a,b,c,d,e) (p)->lpVtbl->Extract(p,a,b,c,d,e) +#endif #endif @@ -3196,6 +3224,7 @@ struct ICommDlgBrowserVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ICommDlgBrowser_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICommDlgBrowser_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3204,6 +3233,7 @@ struct ICommDlgBrowserVtbl { #define ICommDlgBrowser_OnDefaultCommand(p,a) (p)->lpVtbl->OnDefaultCommand(p,a) #define ICommDlgBrowser_OnStateChange(p,a,b) (p)->lpVtbl->OnStateChange(p,a,b) #define ICommDlgBrowser_IncludeObject(p,a,b) (p)->lpVtbl->IncludeObject(p,a,b) +#endif #endif @@ -3329,6 +3359,7 @@ struct IDockingWindowFrameVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDockingWindowFrame_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDockingWindowFrame_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3340,6 +3371,7 @@ struct IDockingWindowFrameVtbl { #define IDockingWindowFrame_AddToolbar(p,a,b,c) (p)->lpVtbl->AddToolbar(p,a,b,c) #define IDockingWindowFrame_RemoveToolbar(p,a,b) (p)->lpVtbl->RemoveToolbar(p,a,b) #define IDockingWindowFrame_FindToolbar(p,a,b,c) (p)->lpVtbl->FindToolbar(p,a,b,c) +#endif #endif @@ -3455,6 +3487,7 @@ struct IDragSourceHelperVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDragSourceHelper_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDragSourceHelper_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3462,6 +3495,7 @@ struct IDragSourceHelperVtbl { /*** IDragSourceHelper methods ***/ #define IDragSourceHelper_InitializeFromBitmap(p,a,b) (p)->lpVtbl->InitializeFromBitmap(p,a,b) #define IDragSourceHelper_InitializeFromWindow(p,a,b,c) (p)->lpVtbl->InitializeFromWindow(p,a,b,c) +#endif #endif @@ -3582,6 +3616,7 @@ struct IDropTargetHelperVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IDropTargetHelper_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IDropTargetHelper_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3592,6 +3627,7 @@ struct IDropTargetHelperVtbl { #define IDropTargetHelper_DragOver(p,a,b) (p)->lpVtbl->DragOver(p,a,b) #define IDropTargetHelper_Drop(p,a,b,c) (p)->lpVtbl->Drop(p,a,b,c) #define IDropTargetHelper_Show(p,a) (p)->lpVtbl->Show(p,a) +#endif #endif @@ -3817,6 +3853,7 @@ struct IContextMenuVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IContextMenu_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IContextMenu_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3825,6 +3862,7 @@ struct IContextMenuVtbl { #define IContextMenu_QueryContextMenu(p,a,b,c,d,e) (p)->lpVtbl->QueryContextMenu(p,a,b,c,d,e) #define IContextMenu_InvokeCommand(p,a) (p)->lpVtbl->InvokeCommand(p,a) #define IContextMenu_GetCommandString(p,a,b,c,d,e) (p)->lpVtbl->GetCommandString(p,a,b,c,d,e) +#endif #endif @@ -3947,6 +3985,7 @@ struct IContextMenu2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IContextMenu2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IContextMenu2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3957,6 +3996,7 @@ struct IContextMenu2Vtbl { #define IContextMenu2_GetCommandString(p,a,b,c,d,e) (p)->lpVtbl->GetCommandString(p,a,b,c,d,e) /*** IContextMenu2 methods ***/ #define IContextMenu2_HandleMenuMsg(p,a,b,c) (p)->lpVtbl->HandleMenuMsg(p,a,b,c) +#endif #endif @@ -4068,6 +4108,7 @@ struct IContextMenu3Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IContextMenu3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IContextMenu3_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4080,6 +4121,7 @@ struct IContextMenu3Vtbl { #define IContextMenu3_HandleMenuMsg(p,a,b,c) (p)->lpVtbl->HandleMenuMsg(p,a,b,c) /*** IContextMenu3 methods ***/ #define IContextMenu3_HandleMenuMsg2(p,a,b,c,d) (p)->lpVtbl->HandleMenuMsg2(p,a,b,c,d) +#endif #endif @@ -4159,12 +4201,14 @@ struct IShellExecuteHookAVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IShellExecuteHookA_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IShellExecuteHookA_AddRef(p) (p)->lpVtbl->AddRef(p) #define IShellExecuteHookA_Release(p) (p)->lpVtbl->Release(p) /*** IShellExecuteHookA methods ***/ #define IShellExecuteHookA_Execute(p,a) (p)->lpVtbl->Execute(p,a) +#endif #endif @@ -4235,12 +4279,14 @@ struct IShellExecuteHookWVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IShellExecuteHookW_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IShellExecuteHookW_AddRef(p) (p)->lpVtbl->AddRef(p) #define IShellExecuteHookW_Release(p) (p)->lpVtbl->Release(p) /*** IShellExecuteHookW methods ***/ #define IShellExecuteHookW_Execute(p,a) (p)->lpVtbl->Execute(p,a) +#endif #endif diff --git a/include/strmif.h b/include/strmif.h index 1ff27d0db08..10ef561ba9b 100644 --- a/include/strmif.h +++ b/include/strmif.h @@ -63,12 +63,14 @@ struct ICreateDevEnumVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ICreateDevEnum_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICreateDevEnum_AddRef(p) (p)->lpVtbl->AddRef(p) #define ICreateDevEnum_Release(p) (p)->lpVtbl->Release(p) /*** ICreateDevEnum methods ***/ #define ICreateDevEnum_CreateClassEnumerator(p,a,b,c) (p)->lpVtbl->CreateClassEnumerator(p,a,b,c) +#endif #endif @@ -351,6 +353,7 @@ struct IPinVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPin_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPin_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -371,6 +374,7 @@ struct IPinVtbl { #define IPin_BeginFlush(p) (p)->lpVtbl->BeginFlush(p) #define IPin_EndFlush(p) (p)->lpVtbl->EndFlush(p) #define IPin_NewSegment(p,a,b,c) (p)->lpVtbl->NewSegment(p,a,b,c) +#endif #endif @@ -588,6 +592,7 @@ struct IEnumPinsVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumPins_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumPins_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -597,6 +602,7 @@ struct IEnumPinsVtbl { #define IEnumPins_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumPins_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumPins_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -715,6 +721,7 @@ struct IEnumMediaTypesVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumMediaTypes_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumMediaTypes_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -724,6 +731,7 @@ struct IEnumMediaTypesVtbl { #define IEnumMediaTypes_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumMediaTypes_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumMediaTypes_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -874,6 +882,7 @@ struct IFilterGraphVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFilterGraph_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFilterGraph_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -887,6 +896,7 @@ struct IFilterGraphVtbl { #define IFilterGraph_Reconnect(p,a) (p)->lpVtbl->Reconnect(p,a) #define IFilterGraph_Disconnect(p,a) (p)->lpVtbl->Disconnect(p,a) #define IFilterGraph_SetDefaultSyncSource(p) (p)->lpVtbl->SetDefaultSyncSource(p) +#endif #endif @@ -1043,6 +1053,7 @@ struct IEnumFiltersVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumFilters_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumFilters_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1052,6 +1063,7 @@ struct IEnumFiltersVtbl { #define IEnumFilters_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumFilters_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumFilters_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -1192,6 +1204,7 @@ struct IMediaFilterVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMediaFilter_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMediaFilter_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1205,6 +1218,7 @@ struct IMediaFilterVtbl { #define IMediaFilter_GetState(p,a,b) (p)->lpVtbl->GetState(p,a,b) #define IMediaFilter_SetSyncSource(p,a) (p)->lpVtbl->SetSyncSource(p,a) #define IMediaFilter_GetSyncSource(p,a) (p)->lpVtbl->GetSyncSource(p,a) +#endif #endif @@ -1383,6 +1397,7 @@ struct IBaseFilterVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IBaseFilter_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IBaseFilter_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1402,6 +1417,7 @@ struct IBaseFilterVtbl { #define IBaseFilter_QueryFilterInfo(p,a) (p)->lpVtbl->QueryFilterInfo(p,a) #define IBaseFilter_JoinFilterGraph(p,a,b) (p)->lpVtbl->JoinFilterGraph(p,a,b) #define IBaseFilter_QueryVendorInfo(p,a) (p)->lpVtbl->QueryVendorInfo(p,a) +#endif #endif @@ -1548,6 +1564,7 @@ struct IReferenceClockVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IReferenceClock_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IReferenceClock_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1557,6 +1574,7 @@ struct IReferenceClockVtbl { #define IReferenceClock_AdviseTime(p,a,b,c,d) (p)->lpVtbl->AdviseTime(p,a,b,c,d) #define IReferenceClock_AdvisePeriodic(p,a,b,c,d) (p)->lpVtbl->AdvisePeriodic(p,a,b,c,d) #define IReferenceClock_Unadvise(p,a) (p)->lpVtbl->Unadvise(p,a) +#endif #endif @@ -1764,6 +1782,7 @@ struct IMediaSampleVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMediaSample_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMediaSample_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1785,6 +1804,7 @@ struct IMediaSampleVtbl { #define IMediaSample_SetDiscontinuity(p,a) (p)->lpVtbl->SetDiscontinuity(p,a) #define IMediaSample_GetMediaTime(p,a,b) (p)->lpVtbl->GetMediaTime(p,a,b) #define IMediaSample_SetMediaTime(p,a,b) (p)->lpVtbl->SetMediaTime(p,a,b) +#endif #endif @@ -2092,6 +2112,7 @@ struct IMediaSample2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMediaSample2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMediaSample2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2116,6 +2137,7 @@ struct IMediaSample2Vtbl { /*** IMediaSample2 methods ***/ #define IMediaSample2_GetProperties(p,a,b) (p)->lpVtbl->GetProperties(p,a,b) #define IMediaSample2_SetProperties(p,a,b) (p)->lpVtbl->SetProperties(p,a,b) +#endif #endif @@ -2254,6 +2276,7 @@ struct IMemAllocatorVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMemAllocator_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMemAllocator_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2265,6 +2288,7 @@ struct IMemAllocatorVtbl { #define IMemAllocator_Decommit(p) (p)->lpVtbl->Decommit(p) #define IMemAllocator_GetBuffer(p,a,b,c,d) (p)->lpVtbl->GetBuffer(p,a,b,c,d) #define IMemAllocator_ReleaseBuffer(p,a) (p)->lpVtbl->ReleaseBuffer(p,a) +#endif #endif @@ -2412,6 +2436,7 @@ struct IMemAllocatorCallbackTempVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMemAllocatorCallbackTemp_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMemAllocatorCallbackTemp_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2426,6 +2451,7 @@ struct IMemAllocatorCallbackTempVtbl { /*** IMemAllocatorCallbackTemp methods ***/ #define IMemAllocatorCallbackTemp_SetNotify(p,a) (p)->lpVtbl->SetNotify(p,a) #define IMemAllocatorCallbackTemp_GetFreeCount(p,a) (p)->lpVtbl->GetFreeCount(p,a) +#endif #endif @@ -2505,12 +2531,14 @@ struct IMemAllocatorNotifyCallbackTempVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMemAllocatorNotifyCallbackTemp_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMemAllocatorNotifyCallbackTemp_AddRef(p) (p)->lpVtbl->AddRef(p) #define IMemAllocatorNotifyCallbackTemp_Release(p) (p)->lpVtbl->Release(p) /*** IMemAllocatorNotifyCallbackTemp methods ***/ #define IMemAllocatorNotifyCallbackTemp_NotifyRelease(p) (p)->lpVtbl->NotifyRelease(p) +#endif #endif @@ -2614,6 +2642,7 @@ struct IMemInputPinVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMemInputPin_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMemInputPin_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2625,6 +2654,7 @@ struct IMemInputPinVtbl { #define IMemInputPin_Receive(p,a) (p)->lpVtbl->Receive(p,a) #define IMemInputPin_ReceiveMultiple(p,a,b,c) (p)->lpVtbl->ReceiveMultiple(p,a,b,c) #define IMemInputPin_ReceiveCanBlock(p) (p)->lpVtbl->ReceiveCanBlock(p) +#endif #endif @@ -2743,6 +2773,7 @@ struct IAMovieSetupVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAMovieSetup_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAMovieSetup_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -2750,6 +2781,7 @@ struct IAMovieSetupVtbl { /*** IAMovieSetup methods ***/ #define IAMovieSetup_Register(p) (p)->lpVtbl->Register(p) #define IAMovieSetup_Unregister(p) (p)->lpVtbl->Unregister(p) +#endif #endif @@ -2980,6 +3012,7 @@ struct IMediaSeekingVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMediaSeeking_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMediaSeeking_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3002,6 +3035,7 @@ struct IMediaSeekingVtbl { #define IMediaSeeking_SetRate(p,a) (p)->lpVtbl->SetRate(p,a) #define IMediaSeeking_GetRate(p,a) (p)->lpVtbl->GetRate(p,a) #define IMediaSeeking_GetPreroll(p,a) (p)->lpVtbl->GetPreroll(p,a) +#endif #endif @@ -3513,6 +3547,7 @@ struct IEnumRegFiltersVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IEnumRegFilters_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IEnumRegFilters_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3522,6 +3557,7 @@ struct IEnumRegFiltersVtbl { #define IEnumRegFilters_Skip(p,a) (p)->lpVtbl->Skip(p,a) #define IEnumRegFilters_Reset(p) (p)->lpVtbl->Reset(p) #define IEnumRegFilters_Clone(p,a) (p)->lpVtbl->Clone(p,a) +#endif #endif @@ -3720,6 +3756,7 @@ struct IFilterMapperVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFilterMapper_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFilterMapper_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -3733,6 +3770,7 @@ struct IFilterMapperVtbl { #define IFilterMapper_UnregisterFilterInstance(p,a) (p)->lpVtbl->UnregisterFilterInstance(p,a) #define IFilterMapper_UnregisterPin(p,a,b) (p)->lpVtbl->UnregisterPin(p,a,b) #define IFilterMapper_EnumMatchingFilters(p,a,b,c,d,e,f,g,h,i) (p)->lpVtbl->EnumMatchingFilters(p,a,b,c,d,e,f,g,h,i) +#endif #endif @@ -4005,6 +4043,7 @@ struct IFilterMapper2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFilterMapper2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFilterMapper2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4014,6 +4053,7 @@ struct IFilterMapper2Vtbl { #define IFilterMapper2_UnregisterFilter(p,a,b,c) (p)->lpVtbl->UnregisterFilter(p,a,b,c) #define IFilterMapper2_RegisterFilter(p,a,b,c,d,e,f) (p)->lpVtbl->RegisterFilter(p,a,b,c,d,e,f) #define IFilterMapper2_EnumMatchingFilters(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) (p)->lpVtbl->EnumMatchingFilters(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) +#endif #endif @@ -4173,6 +4213,7 @@ struct IFilterMapper3Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFilterMapper3_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFilterMapper3_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4184,6 +4225,7 @@ struct IFilterMapper3Vtbl { #define IFilterMapper3_EnumMatchingFilters(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) (p)->lpVtbl->EnumMatchingFilters(p,a,b,c,d,e,f,g,h,i,j,k,l,m,n,o) /*** IFilterMapper3 methods ***/ #define IFilterMapper3_GetICreateDevEnum(p,a) (p)->lpVtbl->GetICreateDevEnum(p,a) +#endif #endif @@ -4276,6 +4318,7 @@ struct IQualityControlVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IQualityControl_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IQualityControl_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4283,6 +4326,7 @@ struct IQualityControlVtbl { /*** IQualityControl methods ***/ #define IQualityControl_Notify(p,a,b) (p)->lpVtbl->Notify(p,a,b) #define IQualityControl_SetSink(p,a) (p)->lpVtbl->SetSink(p,a) +#endif #endif @@ -4427,6 +4471,7 @@ struct IOverlayNotifyVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOverlayNotify_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOverlayNotify_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4436,6 +4481,7 @@ struct IOverlayNotifyVtbl { #define IOverlayNotify_OnClipChange(p,a,b,c) (p)->lpVtbl->OnClipChange(p,a,b,c) #define IOverlayNotify_OnColorKeyChange(p,a) (p)->lpVtbl->OnColorKeyChange(p,a) #define IOverlayNotify_OnPositionChange(p,a,b) (p)->lpVtbl->OnPositionChange(p,a,b) +#endif #endif @@ -4558,6 +4604,7 @@ struct IOverlayNotify2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOverlayNotify2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOverlayNotify2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4569,6 +4616,7 @@ struct IOverlayNotify2Vtbl { #define IOverlayNotify2_OnPositionChange(p,a,b) (p)->lpVtbl->OnPositionChange(p,a,b) /*** IOverlayNotify2 methods ***/ #define IOverlayNotify2_OnDisplayChange(p,a) (p)->lpVtbl->OnDisplayChange(p,a) +#endif #endif @@ -4714,6 +4762,7 @@ struct IOverlayVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IOverlay_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IOverlay_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4729,6 +4778,7 @@ struct IOverlayVtbl { #define IOverlay_GetVideoPosition(p,a,b) (p)->lpVtbl->GetVideoPosition(p,a,b) #define IOverlay_Advise(p,a,b) (p)->lpVtbl->Advise(p,a,b) #define IOverlay_Unadvise(p) (p)->lpVtbl->Unadvise(p) +#endif #endif @@ -4885,12 +4935,14 @@ struct IMediaEventSinkVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IMediaEventSink_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IMediaEventSink_AddRef(p) (p)->lpVtbl->AddRef(p) #define IMediaEventSink_Release(p) (p)->lpVtbl->Release(p) /*** IMediaEventSink methods ***/ #define IMediaEventSink_Notify(p,a,b,c) (p)->lpVtbl->Notify(p,a,b,c) +#endif #endif @@ -4970,6 +5022,7 @@ struct IFileSourceFilterVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFileSourceFilter_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFileSourceFilter_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -4977,6 +5030,7 @@ struct IFileSourceFilterVtbl { /*** IFileSourceFilter methods ***/ #define IFileSourceFilter_Load(p,a,b) (p)->lpVtbl->Load(p,a,b) #define IFileSourceFilter_GetCurFile(p,a,b) (p)->lpVtbl->GetCurFile(p,a,b) +#endif #endif @@ -5065,6 +5119,7 @@ struct IFileSinkFilterVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFileSinkFilter_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFileSinkFilter_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5072,6 +5127,7 @@ struct IFileSinkFilterVtbl { /*** IFileSinkFilter methods ***/ #define IFileSinkFilter_SetFileName(p,a,b) (p)->lpVtbl->SetFileName(p,a,b) #define IFileSinkFilter_GetCurFile(p,a,b) (p)->lpVtbl->GetCurFile(p,a,b) +#endif #endif @@ -5167,6 +5223,7 @@ struct IFileSinkFilter2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFileSinkFilter2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFileSinkFilter2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5177,6 +5234,7 @@ struct IFileSinkFilter2Vtbl { /*** IFileSinkFilter2 methods ***/ #define IFileSinkFilter2_SetMode(p,a) (p)->lpVtbl->SetMode(p,a) #define IFileSinkFilter2_GetMode(p,a) (p)->lpVtbl->GetMode(p,a) +#endif #endif @@ -5343,6 +5401,7 @@ struct IGraphBuilderVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IGraphBuilder_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IGraphBuilder_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5364,6 +5423,7 @@ struct IGraphBuilderVtbl { #define IGraphBuilder_SetLogFile(p,a) (p)->lpVtbl->SetLogFile(p,a) #define IGraphBuilder_Abort(p) (p)->lpVtbl->Abort(p) #define IGraphBuilder_ShouldOperationContinue(p) (p)->lpVtbl->ShouldOperationContinue(p) +#endif #endif @@ -5578,6 +5638,7 @@ struct ICaptureGraphBuilderVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ICaptureGraphBuilder_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICaptureGraphBuilder_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5591,6 +5652,7 @@ struct ICaptureGraphBuilderVtbl { #define ICaptureGraphBuilder_ControlStream(p,a,b,c,d,e,f) (p)->lpVtbl->ControlStream(p,a,b,c,d,e,f) #define ICaptureGraphBuilder_AllocCapFile(p,a,b) (p)->lpVtbl->AllocCapFile(p,a,b) #define ICaptureGraphBuilder_CopyCaptureFile(p,a,b,c,d) (p)->lpVtbl->CopyCaptureFile(p,a,b,c,d) +#endif #endif @@ -5748,12 +5810,14 @@ struct IAMCopyCaptureFileProgressVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAMCopyCaptureFileProgress_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAMCopyCaptureFileProgress_AddRef(p) (p)->lpVtbl->AddRef(p) #define IAMCopyCaptureFileProgress_Release(p) (p)->lpVtbl->Release(p) /*** IAMCopyCaptureFileProgress methods ***/ #define IAMCopyCaptureFileProgress_Progress(p,a) (p)->lpVtbl->Progress(p,a) +#endif #endif @@ -5928,6 +5992,7 @@ struct ICaptureGraphBuilder2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define ICaptureGraphBuilder2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define ICaptureGraphBuilder2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -5942,6 +6007,7 @@ struct ICaptureGraphBuilder2Vtbl { #define ICaptureGraphBuilder2_AllocCapFile(p,a,b) (p)->lpVtbl->AllocCapFile(p,a,b) #define ICaptureGraphBuilder2_CopyCaptureFile(p,a,b,c,d) (p)->lpVtbl->CopyCaptureFile(p,a,b,c,d) #define ICaptureGraphBuilder2_FindPin(p,a,b,c,d,e,f,g) (p)->lpVtbl->FindPin(p,a,b,c,d,e,f,g) +#endif #endif @@ -6221,6 +6287,7 @@ struct IFilterGraph2Vtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFilterGraph2_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFilterGraph2_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -6246,6 +6313,7 @@ struct IFilterGraph2Vtbl { #define IFilterGraph2_AddSourceFilterForMoniker(p,a,b,c,d) (p)->lpVtbl->AddSourceFilterForMoniker(p,a,b,c,d) #define IFilterGraph2_ReconnectEx(p,a,b) (p)->lpVtbl->ReconnectEx(p,a,b) #define IFilterGraph2_RenderEx(p,a,b,c) (p)->lpVtbl->RenderEx(p,a,b,c) +#endif #endif @@ -6367,6 +6435,7 @@ struct IStreamBuilderVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IStreamBuilder_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IStreamBuilder_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -6374,6 +6443,7 @@ struct IStreamBuilderVtbl { /*** IStreamBuilder methods ***/ #define IStreamBuilder_Render(p,a,b) (p)->lpVtbl->Render(p,a,b) #define IStreamBuilder_Backout(p,a,b) (p)->lpVtbl->Backout(p,a,b) +#endif #endif @@ -6517,6 +6587,7 @@ struct IAsyncReaderVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IAsyncReader_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IAsyncReader_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -6530,6 +6601,7 @@ struct IAsyncReaderVtbl { #define IAsyncReader_Length(p,a,b) (p)->lpVtbl->Length(p,a,b) #define IAsyncReader_BeginFlush(p) (p)->lpVtbl->BeginFlush(p) #define IAsyncReader_EndFlush(p) (p)->lpVtbl->EndFlush(p) +#endif #endif @@ -6668,12 +6740,14 @@ struct IGraphVersionVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IGraphVersion_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IGraphVersion_AddRef(p) (p)->lpVtbl->AddRef(p) #define IGraphVersion_Release(p) (p)->lpVtbl->Release(p) /*** IGraphVersion methods ***/ #define IGraphVersion_QueryVersion(p,a) (p)->lpVtbl->QueryVersion(p,a) +#endif #endif @@ -6750,6 +6824,7 @@ struct IResourceConsumerVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IResourceConsumer_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IResourceConsumer_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -6757,6 +6832,7 @@ struct IResourceConsumerVtbl { /*** IResourceConsumer methods ***/ #define IResourceConsumer_AcquireResource(p,a) (p)->lpVtbl->AcquireResource(p,a) #define IResourceConsumer_ReleaseResource(p,a) (p)->lpVtbl->ReleaseResource(p,a) +#endif #endif @@ -6908,6 +6984,7 @@ struct IResourceManagerVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IResourceManager_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IResourceManager_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -6921,6 +6998,7 @@ struct IResourceManagerVtbl { #define IResourceManager_CancelRequest(p,a,b) (p)->lpVtbl->CancelRequest(p,a,b) #define IResourceManager_SetFocus(p,a) (p)->lpVtbl->SetFocus(p,a) #define IResourceManager_ReleaseFocus(p,a) (p)->lpVtbl->ReleaseFocus(p,a) +#endif #endif @@ -7104,6 +7182,7 @@ struct IKsPropertySetVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IKsPropertySet_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IKsPropertySet_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -7112,6 +7191,7 @@ struct IKsPropertySetVtbl { #define IKsPropertySet_Set(p,a,b,c,d,e,f) (p)->lpVtbl->Set(p,a,b,c,d,e,f) #define IKsPropertySet_Get(p,a,b,c,d,e,f,g) (p)->lpVtbl->Get(p,a,b,c,d,e,f,g) #define IKsPropertySet_QuerySupported(p,a,b,c) (p)->lpVtbl->QuerySupported(p,a,b,c) +#endif #endif @@ -7247,6 +7327,7 @@ struct IPinConnectionVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPinConnection_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPinConnection_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -7256,6 +7337,7 @@ struct IPinConnectionVtbl { #define IPinConnection_NotifyEndOfStream(p,a) (p)->lpVtbl->NotifyEndOfStream(p,a) #define IPinConnection_IsEndPin(p) (p)->lpVtbl->IsEndPin(p) #define IPinConnection_DynamicDisconnect(p) (p)->lpVtbl->DynamicDisconnect(p) +#endif #endif @@ -7347,12 +7429,14 @@ struct IPinFlowControlVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPinFlowControl_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPinFlowControl_AddRef(p) (p)->lpVtbl->AddRef(p) #define IPinFlowControl_Release(p) (p)->lpVtbl->Release(p) /*** IPinFlowControl methods ***/ #define IPinFlowControl_Block(p,a,b) (p)->lpVtbl->Block(p,a,b) +#endif #endif @@ -7525,6 +7609,7 @@ struct IGraphConfigVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IGraphConfig_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IGraphConfig_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -7540,6 +7625,7 @@ struct IGraphConfigVtbl { #define IGraphConfig_SetFilterFlags(p,a,b) (p)->lpVtbl->SetFilterFlags(p,a,b) #define IGraphConfig_GetFilterFlags(p,a,b) (p)->lpVtbl->GetFilterFlags(p,a,b) #define IGraphConfig_RemoveFilterEx(p,a,b) (p)->lpVtbl->RemoveFilterEx(p,a,b) +#endif #endif @@ -7700,12 +7786,14 @@ struct IGraphConfigCallbackVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IGraphConfigCallback_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IGraphConfigCallback_AddRef(p) (p)->lpVtbl->AddRef(p) #define IGraphConfigCallback_Release(p) (p)->lpVtbl->Release(p) /*** IGraphConfigCallback methods ***/ #define IGraphConfigCallback_Reconfigure(p,a,b) (p)->lpVtbl->Reconfigure(p,a,b) +#endif #endif @@ -7805,6 +7893,7 @@ struct IFilterChainVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IFilterChain_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IFilterChain_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -7814,6 +7903,7 @@ struct IFilterChainVtbl { #define IFilterChain_PauseChain(p,a,b) (p)->lpVtbl->PauseChain(p,a,b) #define IFilterChain_StopChain(p,a,b) (p)->lpVtbl->StopChain(p,a,b) #define IFilterChain_RemoveChain(p,a,b) (p)->lpVtbl->RemoveChain(p,a,b) +#endif #endif diff --git a/include/unknwn.h b/include/unknwn.h index 643d4940819..9838ca4a144 100644 --- a/include/unknwn.h +++ b/include/unknwn.h @@ -69,10 +69,12 @@ struct IUnknownVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IUnknown_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IUnknown_AddRef(p) (p)->lpVtbl->AddRef(p) #define IUnknown_Release(p) (p)->lpVtbl->Release(p) +#endif #endif @@ -168,6 +170,7 @@ struct IClassFactoryVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IClassFactory_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IClassFactory_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -175,6 +178,7 @@ struct IClassFactoryVtbl { /*** IClassFactory methods ***/ #define IClassFactory_CreateInstance(p,a,b,c) (p)->lpVtbl->CreateInstance(p,a,b,c) #define IClassFactory_LockServer(p,a) (p)->lpVtbl->LockServer(p,a) +#endif #endif diff --git a/include/urlmon.h b/include/urlmon.h index 3a0b660475a..2b02d795a28 100644 --- a/include/urlmon.h +++ b/include/urlmon.h @@ -96,6 +96,7 @@ struct IBindingVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IBinding_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IBinding_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -107,6 +108,7 @@ struct IBindingVtbl { #define IBinding_SetPriority(p,a) (p)->lpVtbl->SetPriority(p,a) #define IBinding_GetPriority(p,a) (p)->lpVtbl->GetPriority(p,a) #define IBinding_GetBindResult(p,a,b,c,d) (p)->lpVtbl->GetBindResult(p,a,b,c,d) +#endif #endif @@ -437,6 +439,7 @@ struct IBindStatusCallbackVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IBindStatusCallback_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IBindStatusCallback_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -450,6 +453,7 @@ struct IBindStatusCallbackVtbl { #define IBindStatusCallback_GetBindInfo(p,a,b) (p)->lpVtbl->GetBindInfo(p,a,b) #define IBindStatusCallback_OnDataAvailable(p,a,b,c,d) (p)->lpVtbl->OnDataAvailable(p,a,b,c,d) #define IBindStatusCallback_OnObjectAvailable(p,a,b) (p)->lpVtbl->OnObjectAvailable(p,a,b) +#endif #endif @@ -654,6 +658,7 @@ struct IBindHostVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IBindHost_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IBindHost_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -662,6 +667,7 @@ struct IBindHostVtbl { #define IBindHost_CreateMoniker(p,a,b,c,d) (p)->lpVtbl->CreateMoniker(p,a,b,c,d) #define IBindHost_MonikerBindToStorage(p,a,b,c,d,e) (p)->lpVtbl->MonikerBindToStorage(p,a,b,c,d,e) #define IBindHost_MonikerBindToObject(p,a,b,c,d,e) (p)->lpVtbl->MonikerBindToObject(p,a,b,c,d,e) +#endif #endif @@ -794,12 +800,14 @@ struct IWinInetInfoVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IWinInetInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IWinInetInfo_AddRef(p) (p)->lpVtbl->AddRef(p) #define IWinInetInfo_Release(p) (p)->lpVtbl->Release(p) /*** IWinInetInfo methods ***/ #define IWinInetInfo_QueryOption(p,a,b,c) (p)->lpVtbl->QueryOption(p,a,b,c) +#endif #endif @@ -898,6 +906,7 @@ struct IWinInetHttpInfoVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IWinInetHttpInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IWinInetHttpInfo_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -906,6 +915,7 @@ struct IWinInetHttpInfoVtbl { #define IWinInetHttpInfo_QueryOption(p,a,b,c) (p)->lpVtbl->QueryOption(p,a,b,c) /*** IWinInetHttpInfo methods ***/ #define IWinInetHttpInfo_QueryInfo(p,a,b,c,d,e) (p)->lpVtbl->QueryInfo(p,a,b,c,d,e) +#endif #endif @@ -1043,6 +1053,7 @@ struct IPersistMonikerVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IPersistMoniker_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IPersistMoniker_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1054,6 +1065,7 @@ struct IPersistMonikerVtbl { #define IPersistMoniker_Save(p,a,b,c) (p)->lpVtbl->Save(p,a,b,c) #define IPersistMoniker_SaveCompleted(p,a,b) (p)->lpVtbl->SaveCompleted(p,a,b) #define IPersistMoniker_GetCurMoniker(p,a) (p)->lpVtbl->GetCurMoniker(p,a) +#endif #endif @@ -1280,6 +1292,7 @@ struct IInternetProtocolInfoVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IInternetProtocolInfo_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IInternetProtocolInfo_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1289,6 +1302,7 @@ struct IInternetProtocolInfoVtbl { #define IInternetProtocolInfo_CombineUrl(p,a,b,c,d,e,f,g) (p)->lpVtbl->CombineUrl(p,a,b,c,d,e,f,g) #define IInternetProtocolInfo_CompareUrl(p,a,b,c) (p)->lpVtbl->CompareUrl(p,a,b,c) #define IInternetProtocolInfo_QueryInfo(p,a,b,c,d,e,f,g) (p)->lpVtbl->QueryInfo(p,a,b,c,d,e,f,g) +#endif #endif @@ -1481,6 +1495,7 @@ struct IInternetSessionVtbl { }; +#ifdef COBJMACROS /*** IUnknown methods ***/ #define IInternetSession_QueryInterface(p,a,b) (p)->lpVtbl->QueryInterface(p,a,b) #define IInternetSession_AddRef(p) (p)->lpVtbl->AddRef(p) @@ -1492,6 +1507,7 @@ struct IInternetSessionVtbl { #define IInternetSession_UnregisterMimeFilter(p,a,b) (p)->lpVtbl->UnregisterMimeFilter(p,a,b) #define IInternetSession_CreateBinding(p,a,b,c,d,e,f) (p)->lpVtbl->CreateBinding(p,a,b,c,d,e,f) #define IInternetSession_SetSessionOption(p,a,b,c,d) (p)->lpVtbl->SetSessionOption(p,a,b,c,d) +#endif #endif diff --git a/tools/widl/header.c b/tools/widl/header.c index 5d8ebfbb459..ea0cc28be58 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -773,7 +773,9 @@ void write_com_interface(type_t *iface) indentation--; fprintf(header, "};\n"); fprintf(header, "\n"); + fprintf(header, "#ifdef COBJMACROS\n"); write_method_macro(iface, iface->name); + fprintf(header, "#endif\n"); fprintf(header, "\n"); fprintf(header, "#endif\n"); fprintf(header, "\n");