Module: wine Branch: master Commit: 23f52cb733b1e4e02b5a164c7eeec9352e94decb URL: https://source.winehq.org/git/wine.git/?a=commit;h=23f52cb733b1e4e02b5a164c7...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Tue Jun 30 16:34:02 2020 +0300
evr: Add IMFTopologyServiceLookupClient stub for the presenter.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/evr/presenter.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/evr/tests/evr.c | 5 +++++ 2 files changed, 59 insertions(+)
diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 34c9a06fcf..db2f85b46f 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -35,6 +35,7 @@ struct video_presenter { IMFVideoPresenter IMFVideoPresenter_iface; IMFVideoDeviceID IMFVideoDeviceID_iface; + IMFTopologyServiceLookupClient IMFTopologyServiceLookupClient_iface; IUnknown IUnknown_inner; IUnknown *outer_unk; LONG refcount; @@ -55,6 +56,11 @@ static struct video_presenter *impl_from_IMFVideoDeviceID(IMFVideoDeviceID *ifac return CONTAINING_RECORD(iface, struct video_presenter, IMFVideoDeviceID_iface); }
+static struct video_presenter *impl_from_IMFTopologyServiceLookupClient(IMFTopologyServiceLookupClient *iface) +{ + return CONTAINING_RECORD(iface, struct video_presenter, IMFTopologyServiceLookupClient_iface); +} + static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFIID riid, void **obj) { struct video_presenter *presenter = impl_from_IUnknown(iface); @@ -74,6 +80,10 @@ static HRESULT WINAPI video_presenter_inner_QueryInterface(IUnknown *iface, REFI { *obj = &presenter->IMFVideoDeviceID_iface; } + else if (IsEqualIID(riid, &IID_IMFTopologyServiceLookupClient)) + { + *obj = &presenter->IMFTopologyServiceLookupClient_iface; + } else { WARN("Unimplemented interface %s.\n", debugstr_guid(riid)); @@ -236,6 +246,49 @@ static const IMFVideoDeviceIDVtbl video_presenter_device_id_vtbl = video_presenter_device_id_GetDeviceID, };
+static HRESULT WINAPI video_presenter_service_client_QueryInterface(IMFTopologyServiceLookupClient *iface, + REFIID riid, void **obj) +{ + struct video_presenter *presenter = impl_from_IMFTopologyServiceLookupClient(iface); + return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj); +} + +static ULONG WINAPI video_presenter_service_client_AddRef(IMFTopologyServiceLookupClient *iface) +{ + struct video_presenter *presenter = impl_from_IMFTopologyServiceLookupClient(iface); + return IMFVideoPresenter_AddRef(&presenter->IMFVideoPresenter_iface); +} + +static ULONG WINAPI video_presenter_service_client_Release(IMFTopologyServiceLookupClient *iface) +{ + struct video_presenter *presenter = impl_from_IMFTopologyServiceLookupClient(iface); + return IMFVideoPresenter_Release(&presenter->IMFVideoPresenter_iface); +} + +static HRESULT WINAPI video_presenter_service_client_InitServicePointers(IMFTopologyServiceLookupClient *iface, + IMFTopologyServiceLookup *service_lookup) +{ + FIXME("%p, %p.\n", iface, service_lookup); + + return E_NOTIMPL; +} + +static HRESULT WINAPI video_presenter_service_client_ReleaseServicePointers(IMFTopologyServiceLookupClient *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static const IMFTopologyServiceLookupClientVtbl video_presenter_service_client_vtbl = +{ + video_presenter_service_client_QueryInterface, + video_presenter_service_client_AddRef, + video_presenter_service_client_Release, + video_presenter_service_client_InitServicePointers, + video_presenter_service_client_ReleaseServicePointers, +}; + HRESULT WINAPI MFCreateVideoPresenter(IUnknown *owner, REFIID riid_device, REFIID riid, void **obj) { TRACE("%p, %s, %s, %p.\n", owner, debugstr_guid(riid_device), debugstr_guid(riid), obj); @@ -257,6 +310,7 @@ HRESULT evr_presenter_create(IUnknown *outer, void **out)
object->IMFVideoPresenter_iface.lpVtbl = &video_presenter_vtbl; object->IMFVideoDeviceID_iface.lpVtbl = &video_presenter_device_id_vtbl; + object->IMFTopologyServiceLookupClient_iface.lpVtbl = &video_presenter_service_client_vtbl; object->IUnknown_inner.lpVtbl = &video_presenter_inner_vtbl; object->outer_unk = outer ? outer : &object->IUnknown_inner; object->refcount = 1; diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 965b921937..af9e656710 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -870,6 +870,7 @@ static void test_default_presenter(void) { IMFVideoPresenter *presenter; IMFVideoDeviceID *deviceid; + IUnknown *unk; HRESULT hr; GUID iid;
@@ -893,6 +894,10 @@ static void test_default_presenter(void)
IMFVideoDeviceID_Release(deviceid);
+ hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&unk); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IUnknown_Release(unk); + IMFVideoPresenter_Release(presenter); }