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

[Alexandre Julliard]

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

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

quartz/vmr9: Don't expose IVMRFilterConfig9 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 | 2 +-
 dlls/quartz/vmr9.c       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c
index d7eafe53be8..9c70926330e 100644
--- a/dlls/quartz/tests/vmr7.c
+++ b/dlls/quartz/tests/vmr7.c
@@ -253,7 +253,7 @@ static void test_interfaces(void)
     check_interface(filter, &IID_IReferenceClock, FALSE);
     check_interface(filter, &IID_IVMRAspectRatioControl9, FALSE);
     check_interface(filter, &IID_IVMRDeinterlaceControl9, FALSE);
-    todo_wine check_interface(filter, &IID_IVMRFilterConfig9, FALSE);
+    check_interface(filter, &IID_IVMRFilterConfig9, FALSE);
     check_interface(filter, &IID_IVMRMixerBitmap9, FALSE);
     check_interface(filter, &IID_IVMRMixerControl, FALSE);
     check_interface(filter, &IID_IVMRMixerControl9, FALSE);
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index 5f95f547e33..aa4187404c6 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -605,7 +605,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid,
         *out = &filter->IAMFilterMiscFlags_iface;
     else if (IsEqualGUID(iid, &IID_IVMRFilterConfig))
         *out = &filter->IVMRFilterConfig_iface;
-    else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9))
+    else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9) && is_vmr9(filter))
         *out = &filter->IVMRFilterConfig9_iface;
     else if (IsEqualGUID(iid, &IID_IVMRMixerBitmap9) && is_vmr9(filter))
         *out = &filter->IVMRMixerBitmap9_iface;