ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Correct GetDateFormat handling of uninitialised fields: only the year, 

month and day fields matter; the rest may be uninitialised.
This commit is contained in:
Bill Medland 2003-01-16 00:18:34 +00:00 committed by Alexandre Julliard
parent e1685e6bf5
commit 37bbb1c26e
2 changed files with 51 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
dlls/kernel/tests/locale.c
View File

@ -409,7 +409,6 @@ void TestGetDateFormatA()
eq(error, ERROR_INVALID_PARAMETER, "GetDateFormat", "%d"); eq(error, ERROR_INVALID_PARAMETER, "GetDateFormat", "%d");
/* test for a simple case of date conversion */ /* test for a simple case of date conversion */
todo_wine {
strcpy(Expected, "Sat, May 04 02"); strcpy(Expected, "Sat, May 04 02");
curtime.wYear = 2002; curtime.wYear = 2002;
curtime.wMonth = 5; curtime.wMonth = 5;
@ -419,32 +418,24 @@ void TestGetDateFormatA()
ret = GetDateFormatA(lcid, 0, &curtime, format, buffer, COUNTOF(buffer)); ret = GetDateFormatA(lcid, 0, &curtime, format, buffer, COUNTOF(buffer));
cmp = strncmp (Expected, buffer, strlen(Expected)+1); cmp = strncmp (Expected, buffer, strlen(Expected)+1);
ok (cmp == 0, "GetDateFormat got %s instead of %s", buffer, Expected); ok (cmp == 0, "GetDateFormat got %s instead of %s", buffer, Expected);
/* Uncomment the below when todo_wine is removed */ eq (ret, lstrlenA(Expected)+1, "GetDateFormat", "%d");
/* eq (ret, lstrlenA(Expected)+1, "GetDateFormat", "%d"); */
}
/* test format with "'" */ /* test format with "'" */
todo_wine {
strcpy(format, "ddd',' MMM dd ''''yy"); strcpy(format, "ddd',' MMM dd ''''yy");
strcpy(Expected, "Sat, May 04 '02"); strcpy(Expected, "Sat, May 04 '02");
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
ret = GetDateFormatA(lcid, 0, &curtime, format, buffer, COUNTOF(buffer)); ret = GetDateFormatA(lcid, 0, &curtime, format, buffer, COUNTOF(buffer));
cmp = strncmp (Expected, buffer, strlen(Expected)+1); cmp = strncmp (Expected, buffer, strlen(Expected)+1);
ok (cmp == 0, "GetDateFormat got %s instead of %s", buffer, Expected); ok (cmp == 0, "GetDateFormat got %s instead of %s", buffer, Expected);
/* Uncomment the below when todo_wine is removed */ eq (ret, lstrlenA(Expected)+1, "GetDateFormat", "%d");
/* eq (ret, lstrlenA(Expected)+1, "GetDateFormat", "%d"); */
}
/* test for success with dummy time data */ /* test for success with dummy time data */
todo_wine {
curtime.wHour = 36; curtime.wHour = 36;
memset(buffer, 0, sizeof(buffer)); memset(buffer, 0, sizeof(buffer));
ret = GetDateFormatA(lcid, 0, &curtime, format, buffer, COUNTOF(buffer)); ret = GetDateFormatA(lcid, 0, &curtime, format, buffer, COUNTOF(buffer));
cmp = strncmp (Expected, buffer, strlen(Expected)+1); cmp = strncmp (Expected, buffer, strlen(Expected)+1);
ok (cmp == 0, "GetDateFormat got %s instead of %s", buffer, Expected); ok (cmp == 0, "GetDateFormat got %s instead of %s", buffer, Expected);
/* Uncomment the below when the todo_wine is removed */ eq (ret, lstrlenA(Expected)+1, "GetDateFormat", "%d");
/* eq (ret, lstrlenA(Expected)+1, "GetDateFormat", "%d"); */
}
/* test that we retrieve the expected size for the necessary output of this string */ /* test that we retrieve the expected size for the necessary output of this string */
SetLastError(NO_ERROR); SetLastError(NO_ERROR);
@ -477,7 +468,6 @@ void TestGetDateFormatA()
} }
todo_wine {
/* test for expected DATE_LONGDATE behavior with null format */ /* test for expected DATE_LONGDATE behavior with null format */
strcpy(Expected, "Saturday, May 04, 2002"); strcpy(Expected, "Saturday, May 04, 2002");
memset(buffer, '0', sizeof(buffer)); memset(buffer, '0', sizeof(buffer));
@ -485,7 +475,6 @@ void TestGetDateFormatA()
cmp = strncmp (Expected, buffer, strlen(Expected)+1); cmp = strncmp (Expected, buffer, strlen(Expected)+1);
ok (cmp == 0, "GetDateFormat got '%s' instead of '%s'", buffer, Expected); ok (cmp == 0, "GetDateFormat got '%s' instead of '%s'", buffer, Expected);
eq (ret, lstrlenA(Expected)+1, "GetDateFormat", "%d"); eq (ret, lstrlenA(Expected)+1, "GetDateFormat", "%d");
}
/* test for expected DATE_YEARMONTH behavior with null format */ /* test for expected DATE_YEARMONTH behavior with null format */
/* NT4 returns ERROR_INVALID_FLAGS for DATE_YEARMONTH */ /* NT4 returns ERROR_INVALID_FLAGS for DATE_YEARMONTH */
@ -540,14 +529,16 @@ void TestGetDateFormatW()
ok (ret != 0 && error == 0, "GetDateFormatW did not permit null buffer pointer when counting."); ok (ret != 0 && error == 0, "GetDateFormatW did not permit null buffer pointer when counting.");
/* 1c An incorrect day of week is corrected. */ /* 1c An incorrect day of week is corrected. */
/* 1d The incorrect day of week can even be out of range. */
/* 1e The time doesn't matter */
curtime.wYear = 2002; curtime.wYear = 2002;
curtime.wMonth = 10; curtime.wMonth = 10;
curtime.wDay = 23; curtime.wDay = 23;
curtime.wDayOfWeek = 5; /* should be 3 - Wednesday */ curtime.wDayOfWeek = 45612; /* should be 3 - Wednesday */
curtime.wHour = 0; curtime.wHour = 65432;
curtime.wMinute = 0; curtime.wMinute = 34512;
curtime.wSecond = 0; curtime.wSecond = 65535;
curtime.wMilliseconds = 234; curtime.wMilliseconds = 12345;
MultiByteToWideChar (CP_ACP, 0, "dddd d MMMM yyyy", -1, format, COUNTOF(format)); MultiByteToWideChar (CP_ACP, 0, "dddd d MMMM yyyy", -1, format, COUNTOF(format));
ret = GetDateFormatW (lcid, 0, &curtime, format, buffer, COUNTOF(buffer)); ret = GetDateFormatW (lcid, 0, &curtime, format, buffer, COUNTOF(buffer));
error = ret ? 0 : GetLastError(); error = ret ? 0 : GetLastError();

16
ole/ole2nls.c
View File

@ -1789,14 +1789,26 @@ INT WINAPI GetDateFormatW(LCID locale,DWORD flags,
/* because this conversion will fix invalid time values */ /* because this conversion will fix invalid time values */
/* check to see if the time/date is valid */ /* check to see if the time/date is valid */
/* set ERROR_INVALID_PARAMETER and return 0 if invalid */ /* set ERROR_INVALID_PARAMETER and return 0 if invalid */
if((xtime->wDay > 31) || (xtime->wDayOfWeek > 6) || (xtime->wMonth > 12)) if((xtime->wDay > 31) || (xtime->wMonth > 12))
{ {
SetLastError(ERROR_INVALID_PARAMETER); SetLastError(ERROR_INVALID_PARAMETER);
return 0; return 0;
} }
/* For all we know the day of week and the time may be absolute
* rubbish. Therefore if we are going to use conversion through
* FileTime we had better use a clean time (and hopefully we won't
* fall over any timezone complications).
* If we go with an alternative method of correcting the day of week
* (e.g. Zeller's congruence) then we won't need to, but we will need
* to check the date.
*/
memset (&t, 0, sizeof(t));
t.wYear = xtime->wYear;
t.wMonth = xtime->wMonth;
t.wDay = xtime->wDay;
/* Silently correct wDayOfWeek by transforming to FileTime and back again */ /* Silently correct wDayOfWeek by transforming to FileTime and back again */
res=SystemTimeToFileTime(xtime,&ft); res=SystemTimeToFileTime(&t,&ft);
/* Check year(?)/month and date for range and set ERROR_INVALID_PARAMETER on error */ /* Check year(?)/month and date for range and set ERROR_INVALID_PARAMETER on error */
if(!res) if(!res)