[PATCH] msctf/tests: Fix a crash on unsupported interface
Nikolay Sivov
nsivov at codeweavers.com
Tue Mar 22 02:55:03 CDT 2016
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/msctf/tests/inputprocessor.c | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c
index 080d7f0..8c9c884 100644
--- a/dlls/msctf/tests/inputprocessor.c
+++ b/dlls/msctf/tests/inputprocessor.c
@@ -1427,13 +1427,16 @@ static void test_startSession(void)
ok(cid == cid2, "Second activate client ID does not match\n");
hr = ITfThreadMgr_QueryInterface(g_tm, &IID_ITfThreadMgrEx, (void **)&tmex);
- ok(SUCCEEDED(hr), "Unable to acquire ITfThreadMgrEx interface\n");
-
- hr = ITfThreadMgrEx_ActivateEx(tmex, &cid2, 0);
- ok(SUCCEEDED(hr), "Failed to Activate\n");
- ok(cid == cid2, "ActivateEx client ID does not match\n");
+ if (hr == S_OK)
+ {
+ hr = ITfThreadMgrEx_ActivateEx(tmex, &cid2, 0);
+ ok(SUCCEEDED(hr), "Failed to Activate\n");
+ ok(cid == cid2, "ActivateEx client ID does not match\n");
- ITfThreadMgrEx_Release(tmex);
+ ITfThreadMgrEx_Release(tmex);
+ }
+ else
+ win_skip("ITfThreadMgrEx is not supported\n");
hr = ITfThreadMgr_Deactivate(g_tm);
ok(SUCCEEDED(hr), "Failed to Deactivate\n");
--
2.7.0
More information about the wine-patches
mailing list