Gijs Vermeulen : quartz/vmr9: Don't expose IVMRFilterConfig from the VMR9.
Module: wine Branch: master Commit: 80fa0b93a69a8784d35fc672136240fa701595be URL: https://source.winehq.org/git/wine.git/?a=commit;h=80fa0b93a69a8784d35fc6721... Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Oct 26 15:37:22 2020 +0100 quartz/vmr9: Don't expose IVMRFilterConfig from the VMR9. 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/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 7f8ce5b26f4..b682aa10adf 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -254,7 +254,7 @@ static void test_common_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVMRAspectRatioControl, FALSE); check_interface(filter, &IID_IVMRDeinterlaceControl, FALSE); - todo_wine check_interface(filter, &IID_IVMRFilterConfig, FALSE); + 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); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 8bad3f5bdb7..5bbc107cc2d 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -603,7 +603,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IAMCertifiedOutputProtection_iface; else if (IsEqualGUID(iid, &IID_IAMFilterMiscFlags)) *out = &filter->IAMFilterMiscFlags_iface; - else if (IsEqualGUID(iid, &IID_IVMRFilterConfig)) + else if (IsEqualGUID(iid, &IID_IVMRFilterConfig) && !is_vmr9(filter)) *out = &filter->IVMRFilterConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9) && is_vmr9(filter)) *out = &filter->IVMRFilterConfig9_iface;
participants (1)
-
Alexandre Julliard