Zebediah Figura : quartz/vmr9: Don't expose IVMRSurfaceAllocatorNotify9 from the VMR7.
Alexandre Julliard
julliard at winehq.org
Wed Apr 29 16:11:12 CDT 2020
Module: wine
Branch: master
Commit: ab99701a7938640c3f437fe6bcb0146066a38cac
URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab99701a7938640c3f437fe6bcb0146066a38cac
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Apr 28 17:44:44 2020 -0500
quartz/vmr9: Don't expose IVMRSurfaceAllocatorNotify9 from the VMR7.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/tests/vmr7.c | 2 +-
dlls/quartz/vmr9.c | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c
index f4b26db554..c242854659 100644
--- a/dlls/quartz/tests/vmr7.c
+++ b/dlls/quartz/tests/vmr7.c
@@ -300,7 +300,7 @@ static void test_interfaces(void)
check_interface(filter, &IID_IVMRMixerControl, FALSE);
todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE);
todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE);
- todo_wine check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, 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 c847b9c448..aa125ddb89 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -629,7 +629,8 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid,
else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify)
&& filter->mode == (VMR9Mode)VMRMode_Renderless && !is_vmr9(filter))
*out = &filter->IVMRSurfaceAllocatorNotify_iface;
- else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify9) && filter->mode == VMR9Mode_Renderless)
+ else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify9)
+ && filter->mode == VMR9Mode_Renderless && is_vmr9(filter))
*out = &filter->IVMRSurfaceAllocatorNotify9_iface;
else if (IsEqualGUID(iid, &IID_IVMRWindowlessControl) && filter->mode == (VMR9Mode)VMRMode_Windowless)
*out = &filter->IVMRWindowlessControl_iface;
More information about the wine-cvs
mailing list