evr/presenter: Expose all interfaces for MR_VIDEO_RENDER_SERVICE.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

evr/presenter: Expose all interfaces for MR_VIDEO_RENDER_SERVICE.
26aae271 · Nikolay Sivov · Alexandre Julliard · c7ce8d5a · 26aae271 · 26aae271
Commit 26aae271 authored Nov 16, 2020 by Nikolay Sivov Committed by Alexandre Julliard Nov 16, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 14 deletions

presenter.c dlls/evr/presenter.c +1 -12

evr.c dlls/evr/tests/evr.c +8 -2

No files found.
--- a/dlls/evr/presenter.c
+++ b/dlls/evr/presenter.c
@@ -1254,18 +1254,7 @@ static HRESULT WINAPI video_presenter_getservice_GetService(IMFGetService *iface
        return IDirect3DDeviceManager9_QueryInterface(presenter->device_manager, riid, obj);

    if (IsEqualGUID(&MR_VIDEO_RENDER_SERVICE, service))
-    {
-        if (IsEqualIID(riid, &IID_IMFVideoDisplayControl) ||
-                IsEqualIID(riid, &IID_IMFVideoPositionMapper))
-        {
-            return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj);
-        }
-        else
-        {
-            FIXME("Unsupported interface %s.\n", debugstr_guid(riid));
-            return E_NOTIMPL;
-        }
-    }
+        return IMFVideoPresenter_QueryInterface(&presenter->IMFVideoPresenter_iface, riid, obj);

    FIXME("Unimplemented service %s.\n", debugstr_guid(service));


--- a/dlls/evr/tests/evr.c
+++ b/dlls/evr/tests/evr.c
@@ -1150,8 +1150,14 @@ static void test_default_presenter(void)
    check_interface(presenter, &IID_IMFQualityAdvise, TRUE);
    check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPositionMapper, TRUE);
    check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDisplayControl, TRUE);
-    todo_wine check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPresenter, TRUE);
-    todo_wine check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFClockStateSink, TRUE);
+    check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoPresenter, TRUE);
+    check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFClockStateSink, TRUE);
+    check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFTopologyServiceLookupClient, TRUE);
+    check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IQualProp, TRUE);
+    check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFRateSupport, TRUE);
+    check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFGetService, TRUE);
+    check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFVideoDeviceID, TRUE);
+    check_service_interface(presenter, &MR_VIDEO_RENDER_SERVICE, &IID_IMFQualityAdvise, TRUE);
    check_service_interface(presenter, &MR_VIDEO_ACCELERATION_SERVICE, &IID_IDirect3DDeviceManager9, TRUE);

    hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDeviceID, (void **)&deviceid);