system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-05 18:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

GetDateFormatA: Check range and recalculate wDayOfWeek.

Browse source 
OLE_GetFormatA|W: Fix transformation of wDayOfWeek to
LOCALE_S(ABBREV)DAYNAMEx.
This commit is contained in:
Uwe Bonnes 2000-10-02 03:40:15 +00:00 committed by Alexandre Julliard
parent bf8943c60c
commit 6dfaf18285
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
ole/ole2nls.c
View file

@ -2595,9 +2595,9 @@ static INT OLE_GetFormatA(LCID locale,
const char ** dgfmt = _dgfmt - 1; const char ** dgfmt = _dgfmt - 1;
/* report, for debugging */ /* report, for debugging */
TRACE("(0x%lx,0x%lx, 0x%lx, time(d=%d,h=%d,m=%d,s=%d), fmt=%p \'%s\' , %p, len=%d)\n", TRACE("(0x%lx,0x%lx, 0x%lx, time(y=%d m=%d wd=%d d=%d,h=%d,m=%d,s=%d), fmt=%p \'%s\' , %p, len=%d)\n",
locale, flags, tflags, locale, flags, tflags,
xtime->wDay, xtime->wHour, xtime->wMinute, xtime->wSecond, xtime->wYear,xtime->wMonth,xtime->wDayOfWeek,xtime->wDay, xtime->wHour, xtime->wMinute, xtime->wSecond,
_format, _format, date, datelen); _format, _format, date, datelen);
if(datelen == 0) { if(datelen == 0) {
@ -2658,12 +2658,12 @@ static INT OLE_GetFormatA(LCID locale,
if (count == 4) { if (count == 4) {
GetLocaleInfoA(locale, GetLocaleInfoA(locale,
LOCALE_SDAYNAME1 LOCALE_SDAYNAME1
+ xtime->wDayOfWeek - 1, + (xtime->wDayOfWeek+6)%7,
buf, sizeof(buf)); buf, sizeof(buf));
} else if (count == 3) { } else if (count == 3) {
GetLocaleInfoA(locale, GetLocaleInfoA(locale,
LOCALE_SABBREVDAYNAME1 LOCALE_SABBREVDAYNAME1
+ xtime->wDayOfWeek - 1, + (xtime->wDayOfWeek+6)%7,
buf, sizeof(buf)); buf, sizeof(buf));
} else { } else {
sprintf(buf, dgfmt[count], xtime->wDay); sprintf(buf, dgfmt[count], xtime->wDay);
@ -2862,12 +2862,12 @@ static INT OLE_GetFormatW(LCID locale, DWORD flags, DWORD tflags,
if (type == 'd') { if (type == 'd') {
if (count == 3) { if (count == 3) {
GetLocaleInfoW(locale, GetLocaleInfoW(locale,
LOCALE_SDAYNAME1 + xtime->wDayOfWeek -1, LOCALE_SDAYNAME1 + (xtime->wDayOfWeek +6)%7,
buf, sizeof(buf)/sizeof(WCHAR) ); buf, sizeof(buf)/sizeof(WCHAR) );
} else if (count == 3) { } else if (count == 3) {
GetLocaleInfoW(locale, GetLocaleInfoW(locale,
LOCALE_SABBREVDAYNAME1 + LOCALE_SABBREVDAYNAME1 +
xtime->wDayOfWeek -1, (xtime->wDayOfWeek +6)%7,
buf, sizeof(buf)/sizeof(WCHAR) ); buf, sizeof(buf)/sizeof(WCHAR) );
} else { } else {
wsnprintfW(buf, 5, argarr[count], xtime->wDay ); wsnprintfW(buf, 5, argarr[count], xtime->wDay );
@ -3023,6 +3023,8 @@ INT WINAPI GetDateFormatA(LCID locale,DWORD flags,
LPSYSTEMTIME thistime; LPSYSTEMTIME thistime;
LCID thislocale; LCID thislocale;
INT ret; INT ret;
FILETIME ft;
BOOL res;
TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n", TRACE("(0x%04lx,0x%08lx,%p,%s,%p,%d)\n",
locale,flags,xtime,format,date,datelen); locale,flags,xtime,format,date,datelen);
@ -3041,10 +3043,20 @@ INT WINAPI GetDateFormatA(LCID locale,DWORD flags,
if (xtime == NULL) { if (xtime == NULL) {
GetSystemTime(&t); GetSystemTime(&t);
thistime = &t;
} else { } else {
thistime = xtime; /* Silently correct wDayOfWeek by tranforming to FileTime and back again*/
res=SystemTimeToFileTime(xtime,&ft);
/* Check year(?)/month and date for range and set ERROR_INVALID_PARAMETER on error*/
/*FIXME: SystemTimeToFileTime doesn't yet do that ckeck*/
if(!res)
{
SetLastError(ERROR_INVALID_PARAMETER);
return 0;
}
FileTimeToSystemTime(&ft,&t);
}; };
thistime = &t;
if (format == NULL) { if (format == NULL) {
GetLocaleInfoA(thislocale, ((flags&DATE_LONGDATE) GetLocaleInfoA(thislocale, ((flags&DATE_LONGDATE)
@ -4156,6 +4168,7 @@ GetTimeFormatA(LCID locale, /* in */
} }
else else
{ thistime = xtime; { thistime = xtime;
/* Check that hour,min and sec is in range */
} }
ret = OLE_GetFormatA(thislocale, thisflags, flags, thistime, thisformat, ret = OLE_GetFormatA(thislocale, thisflags, flags, thistime, thisformat,
timestr, timelen); timestr, timelen);