msvcrt: Use _timezone in _ftime64.

Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

msvcrt: Use _timezone in _ftime64.
b8bafa2c · Piotr Caban · Alexandre Julliard · 61a1dae3 · b8bafa2c
Commit b8bafa2c authored Dec 21, 2018 by Piotr Caban Committed by Alexandre Julliard Dec 21, 2018
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 5 deletions

time.c dlls/msvcrt/time.c +4 -5

No files found.
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -769,17 +769,16 @@ void CDECL MSVCRT__ftime64(struct MSVCRT___timeb64 *buf)
  FILETIME ft;
  ULONGLONG time;

-  DWORD tzid = GetTimeZoneInformation(&tzinfo);
+  _tzset_init();
+
  GetSystemTimeAsFileTime(&ft);

  time = ((ULONGLONG)ft.dwHighDateTime << 32) | ft.dwLowDateTime;

  buf->time = time / TICKSPERSEC - SECS_1601_TO_1970;
  buf->millitm = (time % TICKSPERSEC) / TICKSPERMSEC;
-  buf->timezone = tzinfo.Bias +
-      ( tzid == TIME_ZONE_ID_STANDARD ? tzinfo.StandardBias :
-      ( tzid == TIME_ZONE_ID_DAYLIGHT ? tzinfo.DaylightBias : 0 ));
-  buf->dstflag = (tzid == TIME_ZONE_ID_DAYLIGHT?1:0);
+  buf->timezone = MSVCRT___timezone / 60;
+  buf->dstflag = GetTimeZoneInformation(&tzinfo) == TIME_ZONE_ID_DAYLIGHT;
 }

 /*********************************************************************