Michael Stefaniuc : mlang/tests: Avoid always true ok() checks (PVS-Studio ).
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Dec 22 16:20:52 CST 2014
Module: wine
Branch: master
Commit: ef8db24b9c77bdc110c4c2b6acb4581b9fd6d193
URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef8db24b9c77bdc110c4c2b6acb4581b9fd6d193
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Mon Dec 22 15:09:15 2014 +0100
mlang/tests: Avoid always true ok() checks (PVS-Studio).
---
dlls/mlang/tests/mlang.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c
index a24dbbf..0078f6e 100644
--- a/dlls/mlang/tests/mlang.c
+++ b/dlls/mlang/tests/mlang.c
@@ -487,15 +487,15 @@ static void test_EnumCodePages(IMultiLanguage2 *iML2, DWORD flags)
ok(ret == S_OK, "IEnumCodePage_Reset: expected S_OK, got %08x\n", ret);
n = 65536;
ret = IEnumCodePage_Next(iEnumCP, 0, NULL, &n);
+ ok(ret == S_FALSE || ret == E_FAIL,
+ "IEnumCodePage_Next: expected S_FALSE or E_FAIL, got %08x\n", ret);
if (ret == S_FALSE)
- ok(n == 0 && ret == S_FALSE, "IEnumCodePage_Next: expected 0/S_FALSE, got %u/%08x\n", n, ret);
+ ok(n == 0, "IEnumCodePage_Next: expected 0/S_FALSE, got %u/%08x\n", n, ret);
else if (ret == E_FAIL)
- ok(n == 65536 && ret == E_FAIL, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret);
+ ok(n == 65536, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret);
ret = IEnumCodePage_Next(iEnumCP, 0, NULL, NULL);
- if (ret == S_FALSE)
- ok(ret == S_FALSE, "IEnumCodePage_Next: expected S_FALSE, got %08x\n", ret);
- else if (ret == E_FAIL)
- ok(n == 65536 && ret == E_FAIL, "IEnumCodePage_Next: expected 65536/E_FAIL, got %u/%08x\n", n, ret);
+ ok(ret == S_FALSE || ret == E_FAIL,
+ "IEnumCodePage_Next: expected S_FALSE or E_FAIL, got %08x\n", ret);
cpinfo = HeapAlloc(GetProcessHeap(), 0, sizeof(*cpinfo) * total * 2);
More information about the wine-cvs
mailing list