From ab59e8a6cc24d1d85383190540858ee6cce2628a Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 15 May 2005 00:57:49 +0000 Subject: * win32/win32.c (unixtime_to_filetime): deal with DST. [ruby-talk:141817] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8459 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ win32/win32.c | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 81e72360d8..ab58372e9b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun May 15 09:57:30 2005 Nobuyoshi Nakada + + * win32/win32.c (unixtime_to_filetime): deal with DST. + [ruby-talk:141817] + Sat May 14 23:59:11 2005 Nobuyoshi Nakada * error.c (exc_exception, {exit,name_err,syserr}_initialize): call diff --git a/win32/win32.c b/win32/win32.c index ce194bb40d..1beb79d2c6 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3301,6 +3301,7 @@ unixtime_to_filetime(time_t time, FILETIME *ft) { struct tm *tm; SYSTEMTIME st; + FILETIME lt; tm = gmtime(&time); st.wYear = tm->tm_year + 1900; @@ -3311,7 +3312,8 @@ unixtime_to_filetime(time_t time, FILETIME *ft) st.wMinute = tm->tm_min; st.wSecond = tm->tm_sec; st.wMilliseconds = 0; - if (!SystemTimeToFileTime(&st, ft)) { + if (!SystemTimeToFileTime(&st, <) || + !LocalFileTimeToFileTime(<, ft)) { errno = map_errno(GetLastError()); return -1; } -- cgit v1.2.3