[PATCH 0/1] MR11112: windows.ui.core.textinput/tests: Only check interfaces if retrieval succeeded.
This is an attempt to avoid the test crashing. [Test pattern page windows.ui.core.textinput:textinput](https://test.winehq.org/data/patterns.html#windows.ui.core.textinput:textinp...) [Testbot run with this patch](https://testbot.winehq.org/JobDetails.pl?Key=163330) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/11112
From: Bernhard Übelacker <bernhardu@mailbox.org> --- .../windows.ui.core.textinput/tests/textinput.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/dlls/windows.ui.core.textinput/tests/textinput.c b/dlls/windows.ui.core.textinput/tests/textinput.c index 29b7496d1bb..df52bc33bdb 100644 --- a/dlls/windows.ui.core.textinput/tests/textinput.c +++ b/dlls/windows.ui.core.textinput/tests/textinput.c @@ -156,15 +156,18 @@ static void test_CoreTextServicesManager(void) ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); hr = ICoreTextServicesManagerStatics_GetForCurrentView(core_text_manager_stat, &core_text_manager); - ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + ok(hr == S_OK || broken(hr == RPC_E_WRONG_THREAD) /* <= Win10 2009 */, "Got unexpected hr %#lx.\n", hr); + if (hr == S_OK) + { + check_interface(core_text_manager, &IID_IUnknown, TRUE); + check_interface(core_text_manager, &IID_IInspectable, TRUE); + check_interface(core_text_manager, &IID_IAgileObject, TRUE); + check_interface(core_text_manager, &IID_ICoreTextServicesManagerStatics, FALSE); + check_interface(core_text_manager, &IID_ICoreTextServicesManager, TRUE); - check_interface(core_text_manager, &IID_IUnknown, TRUE); - check_interface(core_text_manager, &IID_IInspectable, TRUE); - check_interface(core_text_manager, &IID_IAgileObject, TRUE); - check_interface(core_text_manager, &IID_ICoreTextServicesManagerStatics, FALSE); - check_interface(core_text_manager, &IID_ICoreTextServicesManager, TRUE); + ICoreTextServicesManager_Release(core_text_manager); + } - ICoreTextServicesManager_Release(core_text_manager); ref = ICoreTextServicesManagerStatics_Release(core_text_manager_stat); ok(ref == 2, "Got unexpected refcount %ld.\n", ref); ref = IActivationFactory_Release(factory); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/11112
participants (2)
-
Bernhard Übelacker -
Bernhard Übelacker (@bernhardu)