system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

quartz/vmr9: Don't expose IVMRMonitorConfig9 from the VMR7.

Browse source 
Signed-off-by: Gijs Vermeulen <gijsvrm@gmail.com>
Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Gijs Vermeulen 2020-10-26 15:37:20 +01:00 committed by Alexandre Julliard
parent 08166d7a2d
commit ef8acacaef
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dlls/quartz/tests/vmr7.c
View file

@ -257,7 +257,7 @@ static void test_interfaces(void)
check_interface(filter, &IID_IVMRMixerBitmap9, FALSE);
check_interface(filter, &IID_IVMRMixerControl, FALSE);
check_interface(filter, &IID_IVMRMixerControl9, FALSE);
todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE);
check_interface(filter, &IID_IVMRMonitorConfig9, FALSE);
check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE);
check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE);
check_interface(filter, &IID_IVMRWindowlessControl, FALSE);
@ -290,7 +290,7 @@ static void test_interfaces(void)
check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE);
check_interface(filter, &IID_IVMRMixerControl, FALSE);
check_interface(filter, &IID_IVMRMixerControl9, FALSE);
todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE);
check_interface(filter, &IID_IVMRMonitorConfig9, FALSE);
check_interface(filter, &IID_IVMRWindowlessControl9, FALSE);
IBaseFilter_FindPin(filter, L"VMR Input0", &pin);
@ -317,7 +317,7 @@ static void test_interfaces(void)
todo_wine check_interface(filter, &IID_IVideoWindow, FALSE);
check_interface(filter, &IID_IVMRMixerControl, FALSE);
todo_wine check_interface(filter, &IID_IVMRMonitorConfig, FALSE);
todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE);
check_interface(filter, &IID_IVMRMonitorConfig9, FALSE);
check_interface(filter, &IID_IVMRSurfaceAllocatorNotify9, FALSE);
check_interface(filter, &IID_IVMRWindowlessControl, FALSE);
check_interface(filter, &IID_IVMRWindowlessControl9, FALSE);

2
dlls/quartz/vmr9.c
View file

@ -613,7 +613,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid,
*out = &filter->IVMRMixerControl9_iface;
else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig))
*out = &filter->IVMRMonitorConfig_iface;
else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9))
else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9) && is_vmr9(filter))
*out = &filter->IVMRMonitorConfig9_iface;
else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify)
&& filter->mode == (VMR9Mode)VMRMode_Renderless && !is_vmr9(filter))