Gijs Vermeulen : quartz/vmr9: Don't expose IVMRMonitorConfig from the VMR9.

[Alexandre Julliard]

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

Author: Gijs Vermeulen <gijsvrm at gmail.com>
Date:   Mon Oct 26 15:37:23 2020 +0100

quartz/vmr9: Don't expose IVMRMonitorConfig from the VMR9.

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

---

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

diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c
index b682aa10adf..df18bd5f2d5 100644
--- a/dlls/quartz/tests/vmr9.c
+++ b/dlls/quartz/tests/vmr9.c
@@ -257,7 +257,7 @@ static void test_common_interfaces(IBaseFilter *filter)
     check_interface(filter, &IID_IVMRFilterConfig, FALSE);
     check_interface(filter, &IID_IVMRMixerBitmap, FALSE);
     check_interface(filter, &IID_IVMRMixerControl, FALSE);
-    todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE);
+    check_interface(filter, &IID_IVMRMonitorConfig, FALSE);
     check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE);
     check_interface(filter, &IID_IVMRWindowlessControl, FALSE);
 
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index 5bbc107cc2d..a24dbc62977 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -611,7 +611,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid,
         *out = &filter->IVMRMixerBitmap9_iface;
     else if (IsEqualGUID(iid, &IID_IVMRMixerControl9) && is_vmr9(filter) && filter->stream_count)
         *out = &filter->IVMRMixerControl9_iface;
-    else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig))
+    else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig) && !is_vmr9(filter))
         *out = &filter->IVMRMonitorConfig_iface;
     else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9)
             && filter->mode != VMR9Mode_Renderless && is_vmr9(filter))