Fix msvcrt time updates
Uwe Bonnes
bon at elektron.ikp.physik.tu-darmstadt.de
Sat Mar 20 13:34:04 CST 2004
Changelog:
dll/msvcrt/time.c:
Correct errors foer move to kernel time functions
Add test case
--
Uwe Bonnes bon at elektron.ikp.physik.tu-darmstadt.de
Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------
Index: wine/dlls/msvcrt/time.c
===================================================================
RCS file: /home/wine/wine/dlls/msvcrt/time.c,v
retrieving revision 1.13
diff -u -r1.13 time.c
--- wine/dlls/msvcrt/time.c 19 Mar 2004 01:16:59 -0000 1.13
+++ wine/dlls/msvcrt/time.c 20 Mar 2004 19:29:16 -0000
@@ -71,11 +71,12 @@
FILETIME lft, uft;
ULONGLONG time;
+ memset(&st, 0, sizeof(SYSTEMTIME));
st.wSecond = t->tm_sec;
st.wMinute = t->tm_min;
st.wHour = t->tm_hour;
- st.wDay = t->tm_mday - 1;
- st.wMonth = t->tm_mon;
+ st.wDay = t->tm_mday;
+ st.wMonth = t->tm_mon + 1;
st.wYear = t->tm_year + 1900;
SystemTimeToFileTime(&st, &lft);
@@ -109,19 +110,20 @@
if (st.wYear < 1970) return NULL;
+ memset(&tm, 0, sizeof(struct MSVCRT_tm));
tm.tm_sec = st.wSecond;
tm.tm_min = st.wMinute;
tm.tm_hour = st.wHour;
tm.tm_mday = st.wDay;
tm.tm_year = st.wYear - 1900;
- tm.tm_mon = st.wMonth + 1;
+ tm.tm_mon = st.wMonth - 1;
tm.tm_wday = st.wDayOfWeek;
- for (i = 0; i < st.wMonth; i++) {
+ for (i = 0; i < st.wMonth - 1; i++) {
tm.tm_yday += MonthLengths[IsLeapYear(st.wYear)][i];
}
- tm.tm_yday += st.wDay;
+ tm.tm_yday += st.wDay - 1;
tzid = GetTimeZoneInformation(&tzinfo);
@@ -138,7 +140,7 @@
{
int i;
- FILETIME ft, lft;
+ FILETIME ft;
SYSTEMTIME st;
ULONGLONG time = *secs * (ULONGLONG)TICKSPERSEC + TICKS_1601_TO_1970;
@@ -146,23 +148,23 @@
ft.dwHighDateTime = (UINT)(time >> 32);
ft.dwLowDateTime = (UINT)time;
- FileTimeToSystemTime(&lft, &st);
+ FileTimeToSystemTime(&ft, &st);
if (st.wYear < 1970) return NULL;
+ memset(&tm, 0, sizeof(struct MSVCRT_tm));
tm.tm_sec = st.wSecond;
tm.tm_min = st.wMinute;
tm.tm_hour = st.wHour;
tm.tm_mday = st.wDay;
tm.tm_year = st.wYear - 1900;
- tm.tm_mon = st.wMonth + 1;
+ tm.tm_mon = st.wMonth - 1;
tm.tm_wday = st.wDayOfWeek;
-
- for (i = 0; i < st.wMonth; i++) {
+ for (i = 0; i < st.wMonth - 1; i++) {
tm.tm_yday += MonthLengths[IsLeapYear(st.wYear)][i];
}
- tm.tm_yday += st.wDay;
+ tm.tm_yday += st.wDay - 1;
tm.tm_isdst = 0;
return &tm;
Index: wine/dlls/msvcrt/tests/Makefile.in
===================================================================
RCS file: /home/wine/wine/dlls/msvcrt/tests/Makefile.in,v
retrieving revision 1.5
diff -u -r1.5 Makefile.in
--- wine/dlls/msvcrt/tests/Makefile.in 19 Mar 2004 01:53:11 -0000 1.5
+++ wine/dlls/msvcrt/tests/Makefile.in 20 Mar 2004 19:29:16 -0000
@@ -11,7 +11,8 @@
file.c \
heap.c \
scanf.c \
- string.c
+ string.c \
+ time.c
@MAKE_TEST_RULES@
--- /dev/null 2003-09-23 19:59:22.000000000 +0200
+++ wine/dlls/msvcrt/tests/time.c 2004-03-20 19:23:25.000000000 +0100
@@ -0,0 +1,100 @@
+#include "wine/test.h"
+#include "winbase.h"
+#include "time.h"
+
+#include <stdlib.h> /*setenv*/
+#include <stdio.h> /*printf*/
+
+#define SECSPERDAY 86400
+#define SECSPERHOUR 3600
+#define SECSPERMIN 60
+#define MINSPERHOUR 60
+#define HOURSPERDAY 24
+
+void test_gmtime()
+{
+ time_t gmt = (time_t)NULL;
+ struct tm* gmt_tm = gmtime(&gmt);
+ if(gmt_tm == 0)
+ {
+ ok(0,"gmtime() error\n");
+ return;
+ }
+ ok(((gmt_tm->tm_year == 70) && (gmt_tm->tm_mon == 0) && (gmt_tm->tm_yday == 0) &&
+ (gmt_tm->tm_mday == 1) && (gmt_tm->tm_wday == 4) && (gmt_tm->tm_hour == 0) &&
+ (gmt_tm->tm_min == 0) && (gmt_tm->tm_sec == 0) && (gmt_tm->tm_isdst == 0)),
+ "Wrong date:Year %4d mon %2d yday %3d mday %2d wday %1d hour%2d min %2d sec %2d dst %2d\n",
+ gmt_tm->tm_year, gmt_tm->tm_mon, gmt_tm->tm_yday, gmt_tm->tm_mday, gmt_tm->tm_wday,
+ gmt_tm->tm_hour, gmt_tm->tm_min, gmt_tm->tm_sec, gmt_tm->tm_isdst);
+
+}
+void test_mktime()
+{
+ TIME_ZONE_INFORMATION tzinfo;
+ DWORD res = GetTimeZoneInformation(&tzinfo);
+ struct tm my_tm;
+ time_t nulltime, local_time;
+ char TZ_env[256];
+
+ ok (res != 0, "GetTimeZoneInformation faile\n");
+ /* Bias may be positive or negative, to use offset of one day */
+ int secs= SECSPERDAY - tzinfo.Bias*SECSPERMIN;
+ my_tm.tm_mday = 1 + secs/SECSPERDAY;
+ secs = secs % SECSPERDAY;
+ my_tm.tm_hour = secs / SECSPERHOUR;
+ secs = secs % SECSPERHOUR;
+ my_tm.tm_min = secs / SECSPERMIN;
+ secs = secs % SECSPERMIN;
+ my_tm.tm_sec = secs;
+
+ my_tm.tm_year = 70;
+ my_tm.tm_mon = 0;
+ my_tm.tm_isdst= 0;
+
+ local_time = mktime(&my_tm);
+ ok(((DWORD)local_time == SECSPERDAY), "mktime returned 0x%08lx\n",(DWORD)local_time);
+
+ /* TEST that we are indepentant from the TZ variable */
+ /*Argh, msvcrt doesn't have setenv() */
+ _snprintf(TZ_env,255,"TZ=%s",(getenv("TZ")?getenv("TZ"):""));
+ putenv("TZ=GMT");
+ nulltime = mktime(&my_tm);
+ ok(((DWORD)nulltime == SECSPERDAY),"mktime returned 0x%08lx\n",(DWORD)nulltime);
+ putenv(TZ_env);
+}
+void test_localtime()
+{
+ TIME_ZONE_INFORMATION tzinfo;
+ DWORD res = GetTimeZoneInformation(&tzinfo);
+ time_t gmt = (time_t)(SECSPERDAY + tzinfo.Bias*SECSPERMIN);
+ char TZ_env[256];
+ struct tm* lt;
+
+ ok (res != 0, "GetTimeZoneInformation faile\n");
+ lt = localtime(&gmt);
+ ok(((lt->tm_year == 70) && (lt->tm_mon == 0) && (lt->tm_yday == 1) &&
+ (lt->tm_mday == 2) && (lt->tm_wday == 5) && (lt->tm_hour == 0) &&
+ (lt->tm_min == 0) && (lt->tm_sec == 0) && (lt->tm_isdst == 0)),
+ "Wrong date:Year %4d mon %2d yday %3d mday %2d wday %1d hour%2d min %2d sec %2d dst %2d\n",
+ lt->tm_year, lt->tm_mon, lt->tm_yday, lt->tm_mday, lt->tm_wday, lt->tm_hour,
+ lt->tm_min, lt->tm_sec, lt->tm_isdst);
+
+ _snprintf(TZ_env,255,"TZ=%s",(getenv("TZ")?getenv("TZ"):""));
+ putenv("TZ=GMT");
+ lt = localtime(&gmt);
+ ok(((lt->tm_year == 70) && (lt->tm_mon == 0) && (lt->tm_yday == 1) &&
+ (lt->tm_mday == 2) && (lt->tm_wday == 5) && (lt->tm_hour == 0) &&
+ (lt->tm_min == 0) && (lt->tm_sec == 0) && (lt->tm_isdst == 0)),
+ "Wrong date:Year %4d mon %2d yday %3d mday %2d wday %1d hour%2d min %2d sec %2d dst %2d\n",
+ lt->tm_year, lt->tm_mon, lt->tm_yday, lt->tm_mday, lt->tm_wday, lt->tm_hour,
+ lt->tm_min, lt->tm_sec, lt->tm_isdst);
+ putenv(TZ_env);
+}
+
+
+START_TEST(time)
+{
+ test_gmtime();
+ test_mktime();
+ test_localtime();
+}
More information about the wine-patches
mailing list