inc: winapi: Add COBJMACROS declarations (COM helper macros)

These declarations are guarded by "#ifdef COBJMACROS" blocks in the C
headers. For now they're exposed in the .bi files directly though, as in
fbc's old headers. It makes sense anyways since they're part of the COM C
interface, rather than the C++ interface, which we currently don't expose.

(cherry picked from commit 73dca40)

Author: dkl

changelog.txt

@@ -4,7 +4,7 @@ Version 1.02.1
 
 [added]
 - Package name + version to all the new/updated bindings
-- Windows API binding: strsafe.bi and windowsx.bi
+- Windows API binding: strsafe.bi and windowsx.bi; COBJMACROS declarations (COM helper macros)
 
 [fixed]
 - 1.02.0 regression: win/winuser.bi: Renamed INPUT typedef to INPUT_ to avoid conflicts with the quirk keyword (due to bug #730)

inc/win/amvideo.bi

@@ -58,6 +58,26 @@ type IDirectDrawVideo_
 	lpVtbl as IDirectDrawVideoVtbl ptr
 end type
 
+#define IDirectDrawVideo_QueryInterface(This, riid, ppvObject) (This)->lpVtbl->QueryInterface(This, riid, ppvObject)
+#define IDirectDrawVideo_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IDirectDrawVideo_Release(This) (This)->lpVtbl->Release(This)
+#define IDirectDrawVideo_GetSwitches(This, pSwitches) (This)->lpVtbl->GetSwitches(This, pSwitches)
+#define IDirectDrawVideo_SetSwitches(This, Switches) (This)->lpVtbl->SetSwitches(This, Switches)
+#define IDirectDrawVideo_GetCaps(This, pCaps) (This)->lpVtbl->GetCaps(This, pCaps)
+#define IDirectDrawVideo_GetEmulatedCaps(This, pCaps) (This)->lpVtbl->GetEmulatedCaps(This, pCaps)
+#define IDirectDrawVideo_GetSurfaceDesc(This, pSurfaceDesc) (This)->lpVtbl->GetSurfaceDesc(This, pSurfaceDesc)
+#define IDirectDrawVideo_GetFourCCCodes(This, pCount, pCodes) (This)->lpVtbl->GetFourCCCodes(This, pCount, pCodes)
+#define IDirectDrawVideo_SetDirectDraw(This, ddraw) (This)->lpVtbl->SetDirectDraw(This, ddraw)
+#define IDirectDrawVideo_GetDirectDraw(This, ddraw) (This)->lpVtbl->GetDirectDraw(This, ddraw)
+#define IDirectDrawVideo_GetSurfaceType(This, pSurfaceType) (This)->lpVtbl->GetSurfaceType(This, pSurfaceType)
+#define IDirectDrawVideo_SetDefault(This) (This)->lpVtbl->SetDefault(This)
+#define IDirectDrawVideo_UseScanLine(This, UseScanLine) (This)->lpVtbl->UseScanLine(This, UseScanLine)
+#define IDirectDrawVideo_CanUseScanLine(This, UseScanLine) (This)->lpVtbl->CanUseScanLine(This, UseScanLine)
+#define IDirectDrawVideo_UseOverlayStretch(This, UseOverlayStretch) (This)->lpVtbl->UseOverlayStretch(This, UseOverlayStretch)
+#define IDirectDrawVideo_CanUseOverlayStretch(This, UseOverlayStretch) (This)->lpVtbl->CanUseOverlayStretch(This, UseOverlayStretch)
+#define IDirectDrawVideo_UseWhenFullScreen(This, UseWhenFullScreen) (This)->lpVtbl->UseWhenFullScreen(This, UseWhenFullScreen)
+#define IDirectDrawVideo_WillUseFullScreen(This, UseWhenFullScreen) (This)->lpVtbl->WillUseFullScreen(This, UseWhenFullScreen)
+
 declare function IDirectDrawVideo_GetSwitches_Proxy(byval This as IDirectDrawVideo ptr, byval pSwitches as DWORD ptr) as HRESULT
 declare sub IDirectDrawVideo_GetSwitches_Stub(byval This as IRpcStubBuffer ptr, byval pRpcChannelBuffer as IRpcChannelBuffer ptr, byval pRpcMessage as PRPC_MESSAGE, byval pdwStubPhase as DWORD ptr)
 declare function IDirectDrawVideo_SetSwitches_Proxy(byval This as IDirectDrawVideo ptr, byval Switches as DWORD) as HRESULT
@@ -109,6 +129,16 @@ type IQualProp_
 	lpVtbl as IQualPropVtbl ptr
 end type
 
+#define IQualProp_QueryInterface(This, riid, ppvObject) (This)->lpVtbl->QueryInterface(This, riid, ppvObject)
+#define IQualProp_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IQualProp_Release(This) (This)->lpVtbl->Release(This)
+#define IQualProp_get_FramesDroppedInRenderer(This, pcFrames) (This)->lpVtbl->get_FramesDroppedInRenderer(This, pcFrames)
+#define IQualProp_get_FramesDrawn(This, pcFramesDrawn) (This)->lpVtbl->get_FramesDrawn(This, pcFramesDrawn)
+#define IQualProp_get_AvgFrameRate(This, piAvgFrameRate) (This)->lpVtbl->get_AvgFrameRate(This, piAvgFrameRate)
+#define IQualProp_get_Jitter(This, iJitter) (This)->lpVtbl->get_Jitter(This, iJitter)
+#define IQualProp_get_AvgSyncOffset(This, piAvg) (This)->lpVtbl->get_AvgSyncOffset(This, piAvg)
+#define IQualProp_get_DevSyncOffset(This, piDev) (This)->lpVtbl->get_DevSyncOffset(This, piDev)
+
 declare function IQualProp_get_FramesDroppedInRenderer_Proxy(byval This as IQualProp ptr, byval pcFrames as long ptr) as HRESULT
 declare sub IQualProp_get_FramesDroppedInRenderer_Stub(byval This as IRpcStubBuffer ptr, byval pRpcChannelBuffer as IRpcChannelBuffer ptr, byval pRpcMessage as PRPC_MESSAGE, byval pdwStubPhase as DWORD ptr)
 declare function IQualProp_get_FramesDrawn_Proxy(byval This as IQualProp ptr, byval pcFramesDrawn as long ptr) as HRESULT
@@ -151,6 +181,27 @@ type IFullScreenVideo_
 	lpVtbl as IFullScreenVideoVtbl ptr
 end type
 
+#define IFullScreenVideo_QueryInterface(This, riid, ppvObject) (This)->lpVtbl->QueryInterface(This, riid, ppvObject)
+#define IFullScreenVideo_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IFullScreenVideo_Release(This) (This)->lpVtbl->Release(This)
+#define IFullScreenVideo_CountModes(This, pModes) (This)->lpVtbl->CountModes(This, pModes)
+#define IFullScreenVideo_GetModeInfo(This, Mode, pWidth, pHeight, pDepth) (This)->lpVtbl->GetModeInfo(This, Mode, pWidth, pHeight, pDepth)
+#define IFullScreenVideo_GetCurrentMode(This, pMode) (This)->lpVtbl->GetCurrentMode(This, pMode)
+#define IFullScreenVideo_IsModeAvailable(This, Mode) (This)->lpVtbl->IsModeAvailable(This, Mode)
+#define IFullScreenVideo_IsModeEnabled(This, Mode) (This)->lpVtbl->IsModeEnabled(This, Mode)
+#define IFullScreenVideo_SetEnabled(This, Mode, bEnabled) (This)->lpVtbl->SetEnabled(This, Mode, bEnabled)
+#define IFullScreenVideo_GetClipFactor(This, pClipFactor) (This)->lpVtbl->GetClipFactor(This, pClipFactor)
+#define IFullScreenVideo_SetClipFactor(This, ClipFactor) (This)->lpVtbl->SetClipFactor(This, ClipFactor)
+#define IFullScreenVideo_SetMessageDrain(This, hwnd) (This)->lpVtbl->SetMessageDrain(This, hwnd)
+#define IFullScreenVideo_GetMessageDrain(This, hwnd) (This)->lpVtbl->GetMessageDrain(This, hwnd)
+#define IFullScreenVideo_SetMonitor(This, Monitor) (This)->lpVtbl->SetMonitor(This, Monitor)
+#define IFullScreenVideo_GetMonitor(This, Monitor) (This)->lpVtbl->GetMonitor(This, Monitor)
+#define IFullScreenVideo_HideOnDeactivate(This, Hide) (This)->lpVtbl->HideOnDeactivate(This, Hide)
+#define IFullScreenVideo_IsHideOnDeactivate(This) (This)->lpVtbl->IsHideOnDeactivate(This)
+#define IFullScreenVideo_SetCaption(This, strCaption) (This)->lpVtbl->SetCaption(This, strCaption)
+#define IFullScreenVideo_GetCaption(This, pstrCaption) (This)->lpVtbl->GetCaption(This, pstrCaption)
+#define IFullScreenVideo_SetDefault(This) (This)->lpVtbl->SetDefault(This)
+
 declare function IFullScreenVideo_CountModes_Proxy(byval This as IFullScreenVideo ptr, byval pModes as LONG ptr) as HRESULT
 declare sub IFullScreenVideo_CountModes_Stub(byval This as IRpcStubBuffer ptr, byval pRpcChannelBuffer as IRpcChannelBuffer ptr, byval pRpcMessage as PRPC_MESSAGE, byval pdwStubPhase as DWORD ptr)
 declare function IFullScreenVideo_GetModeInfo_Proxy(byval This as IFullScreenVideo ptr, byval Mode as LONG, byval pWidth as LONG ptr, byval pHeight as LONG ptr, byval pDepth as LONG ptr) as HRESULT
@@ -219,6 +270,31 @@ type IFullScreenVideoEx_
 	lpVtbl as IFullScreenVideoExVtbl ptr
 end type
 
+#define IFullScreenVideoEx_QueryInterface(This, riid, ppvObject) (This)->lpVtbl->QueryInterface(This, riid, ppvObject)
+#define IFullScreenVideoEx_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IFullScreenVideoEx_Release(This) (This)->lpVtbl->Release(This)
+#define IFullScreenVideoEx_CountModes(This, pModes) (This)->lpVtbl->CountModes(This, pModes)
+#define IFullScreenVideoEx_GetModeInfo(This, Mode, pWidth, pHeight, pDepth) (This)->lpVtbl->GetModeInfo(This, Mode, pWidth, pHeight, pDepth)
+#define IFullScreenVideoEx_GetCurrentMode(This, pMode) (This)->lpVtbl->GetCurrentMode(This, pMode)
+#define IFullScreenVideoEx_IsModeAvailable(This, Mode) (This)->lpVtbl->IsModeAvailable(This, Mode)
+#define IFullScreenVideoEx_IsModeEnabled(This, Mode) (This)->lpVtbl->IsModeEnabled(This, Mode)
+#define IFullScreenVideoEx_SetEnabled(This, Mode, bEnabled) (This)->lpVtbl->SetEnabled(This, Mode, bEnabled)
+#define IFullScreenVideoEx_GetClipFactor(This, pClipFactor) (This)->lpVtbl->GetClipFactor(This, pClipFactor)
+#define IFullScreenVideoEx_SetClipFactor(This, ClipFactor) (This)->lpVtbl->SetClipFactor(This, ClipFactor)
+#define IFullScreenVideoEx_SetMessageDrain(This, hwnd) (This)->lpVtbl->SetMessageDrain(This, hwnd)
+#define IFullScreenVideoEx_GetMessageDrain(This, hwnd) (This)->lpVtbl->GetMessageDrain(This, hwnd)
+#define IFullScreenVideoEx_SetMonitor(This, Monitor) (This)->lpVtbl->SetMonitor(This, Monitor)
+#define IFullScreenVideoEx_GetMonitor(This, Monitor) (This)->lpVtbl->GetMonitor(This, Monitor)
+#define IFullScreenVideoEx_HideOnDeactivate(This, Hide) (This)->lpVtbl->HideOnDeactivate(This, Hide)
+#define IFullScreenVideoEx_IsHideOnDeactivate(This) (This)->lpVtbl->IsHideOnDeactivate(This)
+#define IFullScreenVideoEx_SetCaption(This, strCaption) (This)->lpVtbl->SetCaption(This, strCaption)
+#define IFullScreenVideoEx_GetCaption(This, pstrCaption) (This)->lpVtbl->GetCaption(This, pstrCaption)
+#define IFullScreenVideoEx_SetDefault(This) (This)->lpVtbl->SetDefault(This)
+#define IFullScreenVideoEx_SetAcceleratorTable(This, hwnd, hAccel) (This)->lpVtbl->SetAcceleratorTable(This, hwnd, hAccel)
+#define IFullScreenVideoEx_GetAcceleratorTable(This, phwnd, phAccel) (This)->lpVtbl->GetAcceleratorTable(This, phwnd, phAccel)
+#define IFullScreenVideoEx_KeepPixelAspectRatio(This, KeepAspect) (This)->lpVtbl->KeepPixelAspectRatio(This, KeepAspect)
+#define IFullScreenVideoEx_IsKeepPixelAspectRatio(This, pKeepAspect) (This)->lpVtbl->IsKeepPixelAspectRatio(This, pKeepAspect)
+
 declare function IFullScreenVideoEx_SetAcceleratorTable_Proxy(byval This as IFullScreenVideoEx ptr, byval hwnd as HWND, byval hAccel as HACCEL) as HRESULT
 declare sub IFullScreenVideoEx_SetAcceleratorTable_Stub(byval This as IRpcStubBuffer ptr, byval pRpcChannelBuffer as IRpcChannelBuffer ptr, byval pRpcMessage as PRPC_MESSAGE, byval pdwStubPhase as DWORD ptr)
 declare function IFullScreenVideoEx_GetAcceleratorTable_Proxy(byval This as IFullScreenVideoEx ptr, byval phwnd as HWND ptr, byval phAccel as HACCEL ptr) as HRESULT
@@ -247,6 +323,17 @@ type IBaseVideoMixer_
 	lpVtbl as IBaseVideoMixerVtbl ptr
 end type
 
+#define IBaseVideoMixer_QueryInterface(This, riid, ppvObject) (This)->lpVtbl->QueryInterface(This, riid, ppvObject)
+#define IBaseVideoMixer_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IBaseVideoMixer_Release(This) (This)->lpVtbl->Release(This)
+#define IBaseVideoMixer_SetLeadPin(This, iPin) (This)->lpVtbl->SetLeadPin(This, iPin)
+#define IBaseVideoMixer_GetLeadPin(This, piPin) (This)->lpVtbl->GetLeadPin(This, piPin)
+#define IBaseVideoMixer_GetInputPinCount(This, piPinCount) (This)->lpVtbl->GetInputPinCount(This, piPinCount)
+#define IBaseVideoMixer_IsUsingClock(This, pbValue) (This)->lpVtbl->IsUsingClock(This, pbValue)
+#define IBaseVideoMixer_SetUsingClock(This, bValue) (This)->lpVtbl->SetUsingClock(This, bValue)
+#define IBaseVideoMixer_GetClockPeriod(This, pbValue) (This)->lpVtbl->GetClockPeriod(This, pbValue)
+#define IBaseVideoMixer_SetClockPeriod(This, bValue) (This)->lpVtbl->SetClockPeriod(This, bValue)
+
 declare function IBaseVideoMixer_SetLeadPin_Proxy(byval This as IBaseVideoMixer ptr, byval iPin as long) as HRESULT
 declare sub IBaseVideoMixer_SetLeadPin_Stub(byval This as IRpcStubBuffer ptr, byval pRpcChannelBuffer as IRpcChannelBuffer ptr, byval pRpcMessage as PRPC_MESSAGE, byval pdwStubPhase as DWORD ptr)
 declare function IBaseVideoMixer_GetLeadPin_Proxy(byval This as IBaseVideoMixer ptr, byval piPin as long ptr) as HRESULT

inc/win/comcat.bi

@@ -66,6 +66,14 @@ type IEnumGUID_
 	lpVtbl as IEnumGUIDVtbl ptr
 end type
 
+#define IEnumGUID_QueryInterface(This, riid, ppvObject) (This)->lpVtbl->QueryInterface(This, riid, ppvObject)
+#define IEnumGUID_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IEnumGUID_Release(This) (This)->lpVtbl->Release(This)
+#define IEnumGUID_Next(This, celt, rgelt, pceltFetched) (This)->lpVtbl->Next(This, celt, rgelt, pceltFetched)
+#define IEnumGUID_Skip(This, celt) (This)->lpVtbl->Skip(This, celt)
+#define IEnumGUID_Reset(This) (This)->lpVtbl->Reset(This)
+#define IEnumGUID_Clone(This, ppenum) (This)->lpVtbl->Clone(This, ppenum)
+
 declare function IEnumGUID_RemoteNext_Proxy(byval This as IEnumGUID ptr, byval celt as ULONG, byval rgelt as GUID ptr, byval pceltFetched as ULONG ptr) as HRESULT
 declare sub IEnumGUID_RemoteNext_Stub(byval This as IRpcStubBuffer ptr, byval pRpcChannelBuffer as IRpcChannelBuffer ptr, byval pRpcMessage as PRPC_MESSAGE, byval pdwStubPhase as DWORD ptr)
 declare function IEnumGUID_Skip_Proxy(byval This as IEnumGUID ptr, byval celt as ULONG) as HRESULT
@@ -105,6 +113,14 @@ type IEnumCATEGORYINFO_
 	lpVtbl as IEnumCATEGORYINFOVtbl ptr
 end type
 
+#define IEnumCATEGORYINFO_QueryInterface(This, riid, ppvObject) (This)->lpVtbl->QueryInterface(This, riid, ppvObject)
+#define IEnumCATEGORYINFO_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define IEnumCATEGORYINFO_Release(This) (This)->lpVtbl->Release(This)
+#define IEnumCATEGORYINFO_Next(This, celt, rgelt, pceltFetched) (This)->lpVtbl->Next(This, celt, rgelt, pceltFetched)
+#define IEnumCATEGORYINFO_Skip(This, celt) (This)->lpVtbl->Skip(This, celt)
+#define IEnumCATEGORYINFO_Reset(This) (This)->lpVtbl->Reset(This)
+#define IEnumCATEGORYINFO_Clone(This, ppenum) (This)->lpVtbl->Clone(This, ppenum)
+
 declare function IEnumCATEGORYINFO_Next_Proxy(byval This as IEnumCATEGORYINFO ptr, byval celt as ULONG, byval rgelt as CATEGORYINFO ptr, byval pceltFetched as ULONG ptr) as HRESULT
 declare sub IEnumCATEGORYINFO_Next_Stub(byval This as IRpcStubBuffer ptr, byval pRpcChannelBuffer as IRpcChannelBuffer ptr, byval pRpcMessage as PRPC_MESSAGE, byval pdwStubPhase as DWORD ptr)
 declare function IEnumCATEGORYINFO_Skip_Proxy(byval This as IEnumCATEGORYINFO ptr, byval celt as ULONG) as HRESULT
@@ -135,6 +151,16 @@ type ICatRegister_
 	lpVtbl as ICatRegisterVtbl ptr
 end type
 
+#define ICatRegister_QueryInterface(This, riid, ppvObject) (This)->lpVtbl->QueryInterface(This, riid, ppvObject)
+#define ICatRegister_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define ICatRegister_Release(This) (This)->lpVtbl->Release(This)
+#define ICatRegister_RegisterCategories(This, cCategories, rgCategoryInfo) (This)->lpVtbl->RegisterCategories(This, cCategories, rgCategoryInfo)
+#define ICatRegister_UnRegisterCategories(This, cCategories, rgcatid) (This)->lpVtbl->UnRegisterCategories(This, cCategories, rgcatid)
+#define ICatRegister_RegisterClassImplCategories(This, rclsid, cCategories, rgcatid) (This)->lpVtbl->RegisterClassImplCategories(This, rclsid, cCategories, rgcatid)
+#define ICatRegister_UnRegisterClassImplCategories(This, rclsid, cCategories, rgcatid) (This)->lpVtbl->UnRegisterClassImplCategories(This, rclsid, cCategories, rgcatid)
+#define ICatRegister_RegisterClassReqCategories(This, rclsid, cCategories, rgcatid) (This)->lpVtbl->RegisterClassReqCategories(This, rclsid, cCategories, rgcatid)
+#define ICatRegister_UnRegisterClassReqCategories(This, rclsid, cCategories, rgcatid) (This)->lpVtbl->UnRegisterClassReqCategories(This, rclsid, cCategories, rgcatid)
+
 declare function ICatRegister_RegisterCategories_Proxy(byval This as ICatRegister ptr, byval cCategories as ULONG, byval rgCategoryInfo as CATEGORYINFO ptr) as HRESULT
 declare sub ICatRegister_RegisterCategories_Stub(byval This as IRpcStubBuffer ptr, byval pRpcChannelBuffer as IRpcChannelBuffer ptr, byval pRpcMessage as PRPC_MESSAGE, byval pdwStubPhase as DWORD ptr)
 declare function ICatRegister_UnRegisterCategories_Proxy(byval This as ICatRegister ptr, byval cCategories as ULONG, byval rgcatid as CATID ptr) as HRESULT
@@ -169,6 +195,16 @@ type ICatInformation_
 	lpVtbl as ICatInformationVtbl ptr
 end type
 
+#define ICatInformation_QueryInterface(This, riid, ppvObject) (This)->lpVtbl->QueryInterface(This, riid, ppvObject)
+#define ICatInformation_AddRef(This) (This)->lpVtbl->AddRef(This)
+#define ICatInformation_Release(This) (This)->lpVtbl->Release(This)
+#define ICatInformation_EnumCategories(This, lcid, ppenumCategoryInfo) (This)->lpVtbl->EnumCategories(This, lcid, ppenumCategoryInfo)
+#define ICatInformation_GetCategoryDesc(This, rcatid, lcid, pszDesc) (This)->lpVtbl->GetCategoryDesc(This, rcatid, lcid, pszDesc)
+#define ICatInformation_EnumClassesOfCategories(This, cImplemented, rgcatidImpl, cRequired, rgcatidReq, ppenumClsid) (This)->lpVtbl->EnumClassesOfCategories(This, cImplemented, rgcatidImpl, cRequired, rgcatidReq, ppenumClsid)
+#define ICatInformation_IsClassOfCategories(This, rclsid, cImplemented, rgcatidImpl, cRequired, rgcatidReq) (This)->lpVtbl->IsClassOfCategories(This, rclsid, cImplemented, rgcatidImpl, cRequired, rgcatidReq)
+#define ICatInformation_EnumImplCategoriesOfClass(This, rclsid, ppenumCatid) (This)->lpVtbl->EnumImplCategoriesOfClass(This, rclsid, ppenumCatid)
+#define ICatInformation_EnumReqCategoriesOfClass(This, rclsid, ppenumCatid) (This)->lpVtbl->EnumReqCategoriesOfClass(This, rclsid, ppenumCatid)
+
 declare function ICatInformation_EnumCategories_Proxy(byval This as ICatInformation ptr, byval lcid as LCID, byval ppenumCategoryInfo as IEnumCATEGORYINFO ptr ptr) as HRESULT
 declare sub ICatInformation_EnumCategories_Stub(byval This as IRpcStubBuffer ptr, byval pRpcChannelBuffer as IRpcChannelBuffer ptr, byval pRpcMessage as PRPC_MESSAGE, byval pdwStubPhase as DWORD ptr)
 declare function ICatInformation_GetCategoryDesc_Proxy(byval This as ICatInformation ptr, byval rcatid as REFCATID, byval lcid as LCID, byval pszDesc as LPWSTR ptr) as HRESULT