ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

quartz: Use strmbase IUnknown methods for IVideoWindow. 

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-06-11 18:54:39 -05:00 committed by Alexandre Julliard
parent 89cf4cba6e
commit 5e63f7f93a
2 changed files with 6 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
dlls/quartz/videorenderer.c
View File

@ -708,34 +708,6 @@ static const IBaseFilterVtbl VideoRenderer_Vtbl =
BaseFilterImpl_QueryVendorInfo BaseFilterImpl_QueryVendorInfo
}; };
/*** IUnknown methods ***/
static HRESULT WINAPI VideoWindow_QueryInterface(IVideoWindow *iface, REFIID riid, LPVOID *ppvObj)
{
VideoRendererImpl *This = impl_from_IVideoWindow(iface);
TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->renderer.filter.outer_unk, riid, ppvObj);
}
static ULONG WINAPI VideoWindow_AddRef(IVideoWindow *iface)
{
VideoRendererImpl *This = impl_from_IVideoWindow(iface);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_AddRef(This->renderer.filter.outer_unk);
}
static ULONG WINAPI VideoWindow_Release(IVideoWindow *iface)
{
VideoRendererImpl *This = impl_from_IVideoWindow(iface);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_Release(This->renderer.filter.outer_unk);
}
static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface, static HRESULT WINAPI VideoWindow_get_FullScreenMode(IVideoWindow *iface,
LONG *FullScreenMode) LONG *FullScreenMode)
{ {
@ -781,9 +753,9 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface,
static const IVideoWindowVtbl IVideoWindow_VTable = static const IVideoWindowVtbl IVideoWindow_VTable =
{ {
VideoWindow_QueryInterface, BaseControlWindowImpl_QueryInterface,
VideoWindow_AddRef, BaseControlWindowImpl_AddRef,
VideoWindow_Release, BaseControlWindowImpl_Release,
BaseControlWindowImpl_GetTypeInfoCount, BaseControlWindowImpl_GetTypeInfoCount,
BaseControlWindowImpl_GetTypeInfo, BaseControlWindowImpl_GetTypeInfo,
BaseControlWindowImpl_GetIDsOfNames, BaseControlWindowImpl_GetIDsOfNames,

39
dlls/quartz/vmr9.c
View File

@ -95,11 +95,6 @@ static inline struct quartz_vmr *impl_from_BaseWindow(BaseWindow *wnd)
return CONTAINING_RECORD(wnd, struct quartz_vmr, baseControlWindow.baseWindow); return CONTAINING_RECORD(wnd, struct quartz_vmr, baseControlWindow.baseWindow);
} }
static inline struct quartz_vmr *impl_from_IVideoWindow(IVideoWindow *iface)
{
return CONTAINING_RECORD(iface, struct quartz_vmr, baseControlWindow.IVideoWindow_iface);
}
static inline struct quartz_vmr *impl_from_BaseControlVideo(BaseControlVideo *cvid) static inline struct quartz_vmr *impl_from_BaseControlVideo(BaseControlVideo *cvid)
{ {
return CONTAINING_RECORD(cvid, struct quartz_vmr, baseControlVideo); return CONTAINING_RECORD(cvid, struct quartz_vmr, baseControlVideo);
@ -809,39 +804,11 @@ static const IBaseFilterVtbl VMR_Vtbl =
BaseFilterImpl_QueryVendorInfo BaseFilterImpl_QueryVendorInfo
}; };
/*** IUnknown methods ***/
static HRESULT WINAPI Videowindow_QueryInterface(IVideoWindow *iface, REFIID riid, LPVOID*ppvObj)
{
struct quartz_vmr *This = impl_from_IVideoWindow(iface);
TRACE("(%p/%p)->(%s, %p)\n", This, iface, debugstr_guid(riid), ppvObj);
return IUnknown_QueryInterface(This->renderer.filter.outer_unk, riid, ppvObj);
}
static ULONG WINAPI Videowindow_AddRef(IVideoWindow *iface)
{
struct quartz_vmr *This = impl_from_IVideoWindow(iface);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_AddRef(This->renderer.filter.outer_unk);
}
static ULONG WINAPI Videowindow_Release(IVideoWindow *iface)
{
struct quartz_vmr *This = impl_from_IVideoWindow(iface);
TRACE("(%p/%p)->()\n", This, iface);
return IUnknown_Release(This->renderer.filter.outer_unk);
}
static const IVideoWindowVtbl IVideoWindow_VTable = static const IVideoWindowVtbl IVideoWindow_VTable =
{ {
Videowindow_QueryInterface, BaseControlWindowImpl_QueryInterface,
Videowindow_AddRef, BaseControlWindowImpl_AddRef,
Videowindow_Release, BaseControlWindowImpl_Release,
BaseControlWindowImpl_GetTypeInfoCount, BaseControlWindowImpl_GetTypeInfoCount,
BaseControlWindowImpl_GetTypeInfo, BaseControlWindowImpl_GetTypeInfo,
BaseControlWindowImpl_GetIDsOfNames, BaseControlWindowImpl_GetIDsOfNames,