[PATCH] Split the test for ret and last error

Paul Vriens Paul.Vriens.Wine at gmail.com
Thu Sep 4 12:51:37 CDT 2008


---
 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());
 
-- 
1.5.4.1


--------------090006050103060600000705--



More information about the wine-patches mailing list