Alexandre Julliard : ntdll: Consistently use time_t in timezone matching.

Alexandre Julliard julliard at winehq.org
Wed Feb 2 16:38:03 CST 2022


Module: wine
Branch: master
Commit: abfa6bf8609f92d8ecb9bff816f18d43bd787a29
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=abfa6bf8609f92d8ecb9bff816f18d43bd787a29

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Jan 21 14:18:26 2022 +0100

ntdll: Consistently use time_t in timezone matching.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/unix/system.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c
index 9f49b9e6f58..4052d28f644 100644
--- a/dlls/ntdll/unix/system.c
+++ b/dlls/ntdll/unix/system.c
@@ -2254,12 +2254,12 @@ static void find_reg_tz_info(RTL_DYNAMIC_TIME_ZONE_INFORMATION *tzi, const char*
           tzi->DaylightDate.wDay, tzi->DaylightDate.wMonth, tzi->DaylightDate.wYear);
 }
 
-static time_t find_dst_change(unsigned long min, unsigned long max, int *is_dst)
+static time_t find_dst_change(time_t start, time_t end, int *is_dst)
 {
-    time_t start;
     struct tm *tm;
+    ULONGLONG min = (sizeof(time_t) == sizeof(int)) ? (ULONG)start : start;
+    ULONGLONG max = (sizeof(time_t) == sizeof(int)) ? (ULONG)end : end;
 
-    start = min;
     tm = localtime(&start);
     *is_dst = !tm->tm_isdst;
     TRACE("starting date isdst %d, %s", !*is_dst, ctime(&start));




More information about the wine-cvs mailing list