[PATCH 1/5] quartz/vmr9: Don't expose IVMRFilterConfig9 from the VMR7.
Signed-off-by: Gijs Vermeulen <gijsvrm(a)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
Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/quartz/tests/vmr7.c | 6 +++--- dlls/quartz/vmr9.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 9c70926330e..39592afce66 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -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); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index aa4187404c6..fb5a846c24b 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -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)) -- 2.29.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=80989 Your paranoid android. === w1064v1809 (32 bit report) === quartz: vmr7.c:2117: Test failed: Got unexpected status 0. vmr7.c:2120: Test failed: Wait timed out. vmr7.c:2128: Test failed: Got unexpected status 0x400040. === w10pro64 (32 bit report) === quartz: vmr7.c:2117: Test failed: Got unexpected status 0. vmr7.c:2120: Test failed: Wait timed out. vmr7.c:2128: Test failed: Got unexpected status 0x400040. === w10pro64_2scr (32 bit report) === quartz: vmr7.c:2117: Test failed: Got unexpected status 0. vmr7.c:2120: Test failed: Wait timed out. vmr7.c:2128: Test failed: Got unexpected status 0x400040. === w10pro64_2scr (64 bit report) === quartz: vmr7.c:2117: Test failed: Got unexpected status 0. vmr7.c:2120: Test failed: Wait timed out. vmr7.c:2128: Test failed: Got unexpected status 0x480048. === w10pro64_ar (64 bit report) === quartz: vmr7.c:1216: Test failed: Got hr 0x1.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 2 +- dlls/quartz/vmr9.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 2d09caea14e..7f8ce5b26f4 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -322,7 +322,7 @@ static void test_interfaces(void) todo_wine check_interface(filter, &IID_IBasicVideo, FALSE); check_interface(filter, &IID_IBasicVideo2, FALSE); todo_wine check_interface(filter, &IID_IVideoWindow, FALSE); - todo_wine check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); + check_interface(filter, &IID_IVMRMonitorConfig9, FALSE); check_interface(filter, &IID_IVMRWindowlessControl9, FALSE); ref = IBaseFilter_Release(filter); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index fb5a846c24b..8bad3f5bdb7 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -613,7 +613,8 @@ 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) && is_vmr9(filter)) + else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9) + && filter->mode != VMR9Mode_Renderless && is_vmr9(filter)) *out = &filter->IVMRMonitorConfig9_iface; else if (IsEqualGUID(iid, &IID_IVMRSurfaceAllocatorNotify) && filter->mode == (VMR9Mode)VMRMode_Renderless && !is_vmr9(filter)) -- 2.29.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=80990 Your paranoid android. === w10pro64 (32 bit report) === quartz: vmr9.c:1446: Test failed: Got hr 0x1. === w10pro64_2scr (32 bit report) === quartz: vmr9.c:1436: Test failed: Thread should block in Receive(). === w10pro64_zh_CN (32 bit report) === quartz: vmr9.c:1436: Test failed: Thread should block in Receive(). === w10pro64_ar (64 bit report) === quartz: vmr9.c:1228: Test failed: Got hr 0x1.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- 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; -- 2.29.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=80991 Your paranoid android. === w10pro64_2scr (32 bit report) === quartz: vmr9.c:1436: Test failed: Thread should block in Receive(). === w10pro64_ar (32 bit report) === quartz: vmr9.c:1228: Test failed: Got hr 0x1. === w10pro64_he (32 bit report) === quartz: vmr9.c:1456: Test failed: Got hr 0x80040227. === w10pro64_ja (32 bit report) === quartz: vmr9.c:1339: Test failed: Wait failed. vmr9.c:1340: Test failed: Got hr 0x103. === w10pro64_2scr (64 bit report) === quartz: vmr9.c:1446: Test failed: Got hr 0x1.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- 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 b682aa10adf..df18bd5f2d5 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -257,7 +257,7 @@ static void test_common_interfaces(IBaseFilter *filter) 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); + check_interface(filter, &IID_IVMRMonitorConfig, FALSE); check_interface(filter, &IID_IVMRSurfaceAllocatorNotify, FALSE); check_interface(filter, &IID_IVMRWindowlessControl, FALSE); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 5bbc107cc2d..a24dbc62977 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -611,7 +611,7 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IVMRMixerBitmap9_iface; else if (IsEqualGUID(iid, &IID_IVMRMixerControl9) && is_vmr9(filter) && filter->stream_count) *out = &filter->IVMRMixerControl9_iface; - else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig)) + else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig) && !is_vmr9(filter)) *out = &filter->IVMRMonitorConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRMonitorConfig9) && filter->mode != VMR9Mode_Renderless && is_vmr9(filter)) -- 2.29.1
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=80992 Your paranoid android. === w10pro64_2scr (32 bit report) === quartz: vmr9.c:1436: Test failed: Thread should block in Receive(). === w10pro64_he (32 bit report) === quartz: vmr9.c:1446: Test failed: Got hr 0x1. === w10pro64 (64 bit report) === quartz: vmr9.c:1446: Test failed: Got hr 0x1. === w10pro64_ar (64 bit report) === quartz: vmr9.c:1204: Test failed: Got hr 0x40237. vmr9.c:1210: Test failed: Got hr 0x1. === w10pro64_zh_CN (64 bit report) === quartz: vmr9.c:1446: Test failed: Got hr 0x1.
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=80988 Your paranoid android. === w10pro64 (32 bit report) === quartz: vmr7.c:1192: Test failed: Got hr 0x40237. vmr7.c:1198: Test failed: Got hr 0x1. === w10pro64_zh_CN (32 bit report) === quartz: vmr7.c:2117: Test failed: Got unexpected status 0. vmr7.c:2120: Test failed: Wait timed out. vmr7.c:2128: Test failed: Got unexpected status 0x400040. === w10pro64_ar (64 bit report) === quartz: vmr7.c:2117: Test failed: Got unexpected status 0x480048. vmr7.c:2120: Test failed: Wait timed out. vmr7.c:2128: Test failed: Got unexpected status 0x400040. === w10pro64_he (64 bit report) === quartz: vmr7.c:2117: Test failed: Got unexpected status 0. vmr7.c:2120: Test failed: Wait timed out. vmr7.c:2128: Test failed: Got unexpected status 0x400040. === w10pro64_ja (64 bit report) === quartz: vmr7.c:2117: Test failed: Got unexpected status 0. vmr7.c:2120: Test failed: Wait timed out. vmr7.c:2128: Test failed: Got unexpected status 0x400040.
participants (3)
-
Gijs Vermeulen -
Marvin -
Zebediah Figura