quartz/vmr9: Don't expose IVMRWindowlessControl9 from the VMR7.

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

quartz/vmr9: Don't expose IVMRWindowlessControl9 from the VMR7.
a0b6c65d · Zebediah Figura · Alexandre Julliard · dd6a8d1d · a0b6c65d · a0b6c65d
Commit a0b6c65d authored Apr 28, 2020 by Zebediah Figura Committed by Alexandre Julliard Apr 29, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

vmr7.c dlls/quartz/tests/vmr7.c +1 -1

vmr9.c dlls/quartz/vmr9.c +2 -1

No files found.
--- a/dlls/quartz/tests/vmr7.c
+++ b/dlls/quartz/tests/vmr7.c
@@ -273,7 +273,7 @@ static void test_interfaces(void)
    check_interface(filter, &IID_IVMRMixerControl, FALSE);
    check_interface(filter, &IID_IVMRMixerControl9, FALSE);
    todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE);
-    todo_wine check_interface(filter, &IID_IVMRWindowlessControl9, FALSE);
+    check_interface(filter, &IID_IVMRWindowlessControl9, FALSE);

    IBaseFilter_FindPin(filter, L"VMR Input0", &pin);


--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -635,7 +635,8 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, 
    else if (IsEqualGUID(iid, &IID_IVMRWindowlessControl)
            && filter->mode == (VMR9Mode)VMRMode_Windowless && !is_vmr9(filter))
        *out = &filter->IVMRWindowlessControl_iface;
-    else if (IsEqualGUID(iid, &IID_IVMRWindowlessControl9) && filter->mode == VMR9Mode_Windowless)
+    else if (IsEqualGUID(iid, &IID_IVMRWindowlessControl9)
+            && filter->mode == VMR9Mode_Windowless && is_vmr9(filter))
        *out = &filter->IVMRWindowlessControl9_iface;
    else
        return E_NOINTERFACE;