Skip to content

W
wine-winehq
Commit ef8acaca authored by Gijs Vermeulen's avatar Gijs Vermeulen Committed by Alexandre Julliard
Browse files
Options

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

Signed-off-by: 's avatarGijs Vermeulen <gijsvrm@gmail.com> Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 08166d7a
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/quartz/tests/vmr7.c
View file @ ef8acaca
......@@ -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);
......
dlls/quartz/vmr9.c
View file @ ef8acaca
......@@ -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))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment