commit 4cf122d2aa9a6fa8ee17ae499defd840acbb5a24
author Rein Klazes <rklazes@xs4all.nl> Tue Oct 26 00:11:43 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Oct 26 00:11:43 2004 +0000
tree e227f099e0a14dd36b97723e28e2c6463dd8e161
parent 63fe9d449043e3440e861fa684881242f5666fee

Correctly use the return value of GetTimeZoneInformation.

dlls/kernel/tests/time.c

diff --git a/dlls/kernel/tests/time.c b/dlls/kernel/tests/time.c
index 580f0f4..072bdf9 100644
--- a/dlls/kernel/tests/time.c
+++ b/dlls/kernel/tests/time.c
@@ -34,11 +34,11 @@
 {
     TIME_ZONE_INFORMATION tzinfo, tzinfo1;
     DWORD res =  GetTimeZoneInformation(&tzinfo);
-    ok(res != 0, "GetTimeZoneInformation failed\n");
+    ok(res != TIME_ZONE_ID_INVALID, "GetTimeZoneInformation failed\n");
     ok(SetEnvironmentVariableA("TZ","GMT0") != 0,
        "SetEnvironmentVariableA failed\n");
     res =  GetTimeZoneInformation(&tzinfo1);
-    ok(res != 0, "GetTimeZoneInformation failed\n");
+    ok(res != TIME_ZONE_ID_INVALID, "GetTimeZoneInformation failed\n");
 
     ok(((tzinfo.Bias == tzinfo1.Bias) && 
 	(tzinfo.StandardBias == tzinfo1.StandardBias) &&
@@ -82,10 +82,12 @@
     SYSTEMTIME st;
     TIME_ZONE_INFORMATION tzinfo;
     DWORD res =  GetTimeZoneInformation(&tzinfo);
-    ULONGLONG time = (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970 
-	+ (ULONGLONG)tzinfo.Bias*SECSPERMIN *TICKSPERSEC;
-
-    ok( res != 0, "GetTimeZoneInformation failed\n");
+    ULONGLONG time = (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970 +
+        (LONGLONG)(tzinfo.Bias + 
+            ( res == TIME_ZONE_ID_STANDARD ? tzinfo.StandardBias :
+            ( res == TIME_ZONE_ID_DAYLIGHT ? tzinfo.DaylightBias : 0 ))) *
+             SECSPERMIN *TICKSPERSEC;
+    ok( res != TIME_ZONE_ID_INVALID , "GetTimeZoneInformation failed\n");
     ft.dwHighDateTime = (UINT)(time >> 32);
     ft.dwLowDateTime  = (UINT)time;
     ok(FileTimeToLocalFileTime(&ft, &lft) !=0 ,
@@ -100,7 +102,7 @@
 
     ok(SetEnvironmentVariableA("TZ","GMT") != 0,
        "SetEnvironmentVariableA failed\n");
-    ok(res != 0, "GetTimeZoneInformation failed\n");
+    ok(res != TIME_ZONE_ID_INVALID, "GetTimeZoneInformation failed\n");
     ok(FileTimeToLocalFileTime(&ft, &lft) !=0 ,
        "FileTimeToLocalFileTime() failed with Error 0x%08lx\n",GetLastError());
     FileTimeToSystemTime(&lft, &st);