[PATCH 1/5] quartz/vmr9: Don't expose IVMRFilterConfig9 from the VMR7.
Gijs Vermeulen
gijsvrm at gmail.com
Mon Oct 26 09:37:19 CDT 2020
Signed-off-by: Gijs Vermeulen <gijsvrm at gmail.com>
---
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;
--
2.29.1
More information about the wine-devel
mailing list