James Hawkins : kernel32: Fix a test that fails on win9x.

Alexandre Julliard julliard at winehq.org
Wed Apr 23 07:59:47 CDT 2008


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

Author: James Hawkins <jhawkins at codeweavers.com>
Date:   Mon Apr 21 23:42:19 2008 -0500

kernel32: Fix a test that fails on win9x.

---

 dlls/kernel32/tests/time.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c
index 73aae4d..21a8232 100644
--- a/dlls/kernel32/tests/time.c
+++ b/dlls/kernel32/tests/time.c
@@ -104,9 +104,12 @@ static void test_conversions(void)
 
     memset(&ft,0,sizeof ft);
 
+    SetLastError(0xdeadbeef);
     SETUP_EARLY(st)
     ok (!SystemTimeToFileTime(&st, &ft), "Conversion succeeded EARLY\n");
-    ok (GetLastError() == ERROR_INVALID_PARAMETER, "EARLY should be INVALID\n");
+    ok (GetLastError() == ERROR_INVALID_PARAMETER ||
+        GetLastError() == 0xdeadbeef, /* win9x */
+        "EARLY should be INVALID\n");
 
     SETUP_ZEROTIME(st)
     ok (SystemTimeToFileTime(&st, &ft), "Conversion failed ZERO_TIME\n");




More information about the wine-cvs mailing list