Skip to content

W
wine-cw
Commit 5e63f7f9 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

quartz: Use strmbase IUnknown methods for IVideoWindow.

Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 89cf4cba
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 67 deletions
dlls/quartz/videorenderer.c
View file @ 5e63f7f9
......@@ -708,34 +708,6 @@ static const IBaseFilterVtbl VideoRenderer_Vtbl =
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,
LONG *FullScreenMode)
{
......@@ -781,9 +753,9 @@ static HRESULT WINAPI VideoWindow_put_FullScreenMode(IVideoWindow *iface,
static const IVideoWindowVtbl IVideoWindow_VTable =
{
VideoWindow_QueryInterface,
VideoWindow_AddRef,
VideoWindow_Release,
BaseControlWindowImpl_QueryInterface,
BaseControlWindowImpl_AddRef,
BaseControlWindowImpl_Release,
BaseControlWindowImpl_GetTypeInfoCount,
BaseControlWindowImpl_GetTypeInfo,
BaseControlWindowImpl_GetIDsOfNames,
......
dlls/quartz/vmr9.c
View file @ 5e63f7f9
......@@ -95,11 +95,6 @@ static inline struct quartz_vmr *impl_from_BaseWindow(BaseWindow *wnd)
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)
{
return CONTAINING_RECORD(cvid, struct quartz_vmr, baseControlVideo);
......@@ -809,39 +804,11 @@ static const IBaseFilterVtbl VMR_Vtbl =
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 =
{
Videowindow_QueryInterface,
Videowindow_AddRef,
Videowindow_Release,
BaseControlWindowImpl_QueryInterface,
BaseControlWindowImpl_AddRef,
BaseControlWindowImpl_Release,
BaseControlWindowImpl_GetTypeInfoCount,
BaseControlWindowImpl_GetTypeInfo,
BaseControlWindowImpl_GetIDsOfNames,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment