Gijs Vermeulen : quartz/vmr9: Don't expose IVMRMonitorConfig9 from the VMR7.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ef8acacaefe6aa5415366fc77824ab3515a74e78
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=ef8acacaefe6aa5415366fc77...

Author: Gijs Vermeulen <gijsvrm(a)gmail.com>
Date:   Mon Oct 26 15:37:20 2020 +0100

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

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/quartz/tests/vmr7.c | 6 +++---
 dlls/quartz/vmr9.c       | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c
index 9c70926330e..39592afce66 100644
--- a/dlls/quartz/tests/vmr7.c
+++ b/dlls/quartz/tests/vmr7.c
@@ -257,7 +257,7 @@ static void test_interfaces(void)
     check_interface(filter, &IID_IVMRMixerBitmap9, FALSE);
     check_interface(filter, &IID_IVMRMixerControl, FALSE);
     check_interface(filter, &IID_IVMRMixerControl9, FALSE);
-    todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE);
+    check_interface(filter, &IID_IVMRMonitorConfig9, FALSE);
     check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE);
     check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE);
     check_interface(filter, &IID_IVMRWindowlessControl, FALSE);
@@ -290,7 +290,7 @@ static void test_interfaces(void)
     check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE);
     check_interface(filter, &IID_IVMRMixerControl, FALSE);
     check_interface(filter, &IID_IVMRMixerControl9, FALSE);
-    todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE);
+    check_interface(filter, &IID_IVMRMonitorConfig9, FALSE);
     check_interface(filter, &IID_IVMRWindowlessControl9, FALSE);
 
     IBaseFilter_FindPin(filter, L"VMR Input0", &pin);
@@ -317,7 +317,7 @@ static void test_interfaces(void)
     todo_wine check_interface(filter, &IID_IVideoWindow, FALSE);
     check_interface(filter, &IID_IVMRMixerControl, FALSE);
     todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE);
-    todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE);
+    check_interface(filter, &IID_IVMRMonitorConfig9, FALSE);
     check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE);
     check_interface(filter, &IID_IVMRWindowlessControl, FALSE);
     check_interface(filter, &IID_IVMRWindowlessControl9, FALSE);
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index aa4187404c6..fb5a846c24b 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -613,7 +613,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid,
         *out = &filter->IVMRMixerControl9_iface;
     else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig))
         *out = &filter->IVMRMonitorConfig_iface;
-    else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9))
+    else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9) && is_vmr9(filter))
         *out = &filter->IVMRMonitorConfig9_iface;
     else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify)
             && filter->mode == (VMR9Mode)VMRMode_Renderless && !is_vmr9(filter))