Huw Davies : msctf/tests: Return if the constructor fails. This avoids several clang warnings.

Alexandre Julliard julliard at winehq.org
Tue Jan 17 15:10:33 CST 2017


Module: wine
Branch: master
Commit: aac4cc8fbbad8236abfdae8086e1dc76ecc8b778
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=aac4cc8fbbad8236abfdae8086e1dc76ecc8b778

Author: Huw Davies <huw at codeweavers.com>
Date:   Tue Jan 17 11:41:22 2017 +0000

msctf/tests: Return if the constructor fails. This avoids several clang warnings.

Signed-off-by: Huw Davies <huw at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/msctf/tests/inputprocessor.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c
index e44eafd..7c12936 100644
--- a/dlls/msctf/tests/inputprocessor.c
+++ b/dlls/msctf/tests/inputprocessor.c
@@ -1550,11 +1550,11 @@ static void test_startSession(void)
     ITfDocumentMgr_Release(dmtest);
 
     hr = TextStoreACP_Constructor((IUnknown**)&ts);
-    if (SUCCEEDED(hr))
-    {
-        hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt, &editCookie);
-        ok(SUCCEEDED(hr),"CreateContext Failed\n");
-    }
+    ok(SUCCEEDED(hr),"Constructor Failed\n");
+    if (FAILED(hr)) return;
+
+    hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, (IUnknown*)ts, &cxt, &editCookie);
+    ok(SUCCEEDED(hr),"CreateContext Failed\n");
 
     hr = ITfDocumentMgr_CreateContext(g_dm, cid, 0, NULL, &cxt2, &editCookie);
     ok(SUCCEEDED(hr),"CreateContext Failed\n");




More information about the wine-cvs mailing list