Module: wine Branch: master Commit: cb0b2d81d2d88b8390a31d5122ca1b67d1d6dbe5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb0b2d81d2d88b8390a31d512...
Author: Zebediah Figura z.figura12@gmail.com Date: Tue Jun 11 18:54:36 2019 -0500
quartz: Use strmbase IUnknown methods for IBasicVideo.
Signed-off-by: Zebediah Figura z.figura12@gmail.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/quartz/videorenderer.c | 39 +++------------------------------------ dlls/quartz/vmr9.c | 39 +++------------------------------------ 2 files changed, 6 insertions(+), 72 deletions(-)
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 4f279b0..f4d6e54 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -86,11 +86,6 @@ static inline VideoRendererImpl *impl_from_BaseControlVideo(BaseControlVideo *if return CONTAINING_RECORD(iface, VideoRendererImpl, baseControlVideo); }
-static inline VideoRendererImpl *impl_from_IBasicVideo(IBasicVideo *iface) -{ - return CONTAINING_RECORD(iface, VideoRendererImpl, baseControlVideo.IBasicVideo_iface); -} - static DWORD WINAPI MessageLoop(LPVOID lpParameter) { VideoRendererImpl* This = lpParameter; @@ -713,39 +708,11 @@ static const IBaseFilterVtbl VideoRenderer_Vtbl = BaseFilterImpl_QueryVendorInfo };
-/*** IUnknown methods ***/ -static HRESULT WINAPI BasicVideo_QueryInterface(IBasicVideo *iface, REFIID riid, LPVOID *ppvObj) -{ - VideoRendererImpl *This = impl_from_IBasicVideo(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 BasicVideo_AddRef(IBasicVideo *iface) -{ - VideoRendererImpl *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->renderer.filter.outer_unk); -} - -static ULONG WINAPI BasicVideo_Release(IBasicVideo *iface) -{ - VideoRendererImpl *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->renderer.filter.outer_unk); -} - static const IBasicVideoVtbl IBasicVideo_VTable = { - BasicVideo_QueryInterface, - BasicVideo_AddRef, - BasicVideo_Release, + BaseControlVideoImpl_QueryInterface, + BaseControlVideoImpl_AddRef, + BaseControlVideoImpl_Release, BaseControlVideoImpl_GetTypeInfoCount, BaseControlVideoImpl_GetTypeInfo, BaseControlVideoImpl_GetIDsOfNames, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 751eeeb..8f4aa8e 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -105,11 +105,6 @@ static inline struct quartz_vmr *impl_from_BaseControlVideo(BaseControlVideo *cv return CONTAINING_RECORD(cvid, struct quartz_vmr, baseControlVideo); }
-static inline struct quartz_vmr *impl_from_IBasicVideo(IBasicVideo *iface) -{ - return CONTAINING_RECORD(iface, struct quartz_vmr, baseControlVideo.IBasicVideo_iface); -} - static inline struct quartz_vmr *impl_from_IAMCertifiedOutputProtection(IAMCertifiedOutputProtection *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, IAMCertifiedOutputProtection_iface); @@ -892,39 +887,11 @@ static const IVideoWindowVtbl IVideoWindow_VTable = BaseControlWindowImpl_IsCursorHidden };
-/*** IUnknown methods ***/ -static HRESULT WINAPI Basicvideo_QueryInterface(IBasicVideo *iface, REFIID riid, LPVOID * ppvObj) -{ - struct quartz_vmr *This = impl_from_IBasicVideo(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 Basicvideo_AddRef(IBasicVideo *iface) -{ - struct quartz_vmr *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_AddRef(This->renderer.filter.outer_unk); -} - -static ULONG WINAPI Basicvideo_Release(IBasicVideo *iface) -{ - struct quartz_vmr *This = impl_from_IBasicVideo(iface); - - TRACE("(%p/%p)->()\n", This, iface); - - return IUnknown_Release(This->renderer.filter.outer_unk); -} - static const IBasicVideoVtbl IBasicVideo_VTable = { - Basicvideo_QueryInterface, - Basicvideo_AddRef, - Basicvideo_Release, + BaseControlVideoImpl_QueryInterface, + BaseControlVideoImpl_AddRef, + BaseControlVideoImpl_Release, BaseControlVideoImpl_GetTypeInfoCount, BaseControlVideoImpl_GetTypeInfo, BaseControlVideoImpl_GetIDsOfNames,