Paul Vriens : kernel32/tests: Split the test for ret and last error.

Alexandre Julliard julliard at winehq.org
Fri Sep 5 06:57:49 CDT 2008


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

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Thu Sep  4 19:51:37 2008 +0200

kernel32/tests: Split the test for ret and last error.

---

 dlls/kernel32/tests/version.c |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c
index 94b4311..1a9a40c 100644
--- a/dlls/kernel32/tests/version.c
+++ b/dlls/kernel32/tests/version.c
@@ -164,8 +164,11 @@ static void test_VerifyVersionInfo(void)
         pVerSetConditionMask(pVerSetConditionMask(0, VER_MINORVERSION, VER_GREATER_EQUAL),
             VER_MAJORVERSION, VER_GREATER_EQUAL));
     if (servicepack == 0)
-        ok(!ret && (GetLastError() == ERROR_OLD_WIN_VERSION),
-            "VerifyVersionInfoA should have failed with ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError());
+    {
+        ok(!ret, "VerifyVersionInfoA should have failed\n");
+        ok(GetLastError() == ERROR_OLD_WIN_VERSION,
+            "Expected ERROR_OLD_WIN_VERSION instead of %d\n", GetLastError());
+    }
     else
         ok(ret, "VerifyVersionInfoA failed with error %d\n", GetLastError());
 




More information about the wine-cvs mailing list