marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

comctl32/datetime: Get rid of duplicated helper.

oldstable
Nikolay Sivov 2009-10-11 17:05:36 +04:00 committed by Alexandre Julliard
parent a4b5c5db1c
commit 8431bed5f6
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
dlls/comctl32/datetime.c
View File

@ -448,19 +448,6 @@ DATETIME_ReturnTxt (const DATETIME_INFO *infoPtr, int count, LPWSTR result, int
TRACE ("arg%d=%x->[%s]\n", count, infoPtr->fieldspec[count], debugstr_w(result)); TRACE ("arg%d=%x->[%s]\n", count, infoPtr->fieldspec[count], debugstr_w(result));
} }
/* Offsets of days in the week to the weekday of january 1 in a leap year. */
static const int DayOfWeekTable[] = {0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4};
/* returns the day in the week(0 == sunday, 6 == saturday) */
/* day(1 == 1st, 2 == 2nd... etc), year is the year value */
static int DATETIME_CalculateDayOfWeek(DWORD day, DWORD month, DWORD year)
{
year-=(month < 3);
return((year + year/4 - year/100 + year/400 +
DayOfWeekTable[month-1] + day ) % 7);
}
static int wrap(int val, int delta, int minVal, int maxVal) static int wrap(int val, int delta, int minVal, int maxVal)
{ {
val += delta; val += delta;
@ -484,14 +471,14 @@ DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta)
case TWODIGITYEAR: case TWODIGITYEAR:
case FULLYEAR: case FULLYEAR:
date->wYear = wrap(date->wYear, delta, 1752, 9999); date->wYear = wrap(date->wYear, delta, 1752, 9999);
date->wDayOfWeek = DATETIME_CalculateDayOfWeek(date->wDay,date->wMonth,date->wYear); MONTHCAL_CalculateDayOfWeek(date, TRUE);
break; break;
case ONEDIGITMONTH: case ONEDIGITMONTH:
case TWODIGITMONTH: case TWODIGITMONTH:
case THREECHARMONTH: case THREECHARMONTH:
case FULLMONTH: case FULLMONTH:
date->wMonth = wrap(date->wMonth, delta, 1, 12); date->wMonth = wrap(date->wMonth, delta, 1, 12);
date->wDayOfWeek = DATETIME_CalculateDayOfWeek(date->wDay,date->wMonth,date->wYear); MONTHCAL_CalculateDayOfWeek(date, TRUE);
delta = 0; delta = 0;
/* fall through */ /* fall through */
case ONEDIGITDAY: case ONEDIGITDAY:
@ -499,7 +486,7 @@ DATETIME_IncreaseField (DATETIME_INFO *infoPtr, int number, int delta)
case THREECHARDAY: case THREECHARDAY:
case FULLDAY: case FULLDAY:
date->wDay = wrap(date->wDay, delta, 1, MONTHCAL_MonthLength(date->wMonth, date->wYear)); date->wDay = wrap(date->wDay, delta, 1, MONTHCAL_MonthLength(date->wMonth, date->wYear));
date->wDayOfWeek = DATETIME_CalculateDayOfWeek(date->wDay,date->wMonth,date->wYear); MONTHCAL_CalculateDayOfWeek(date, TRUE);
break; break;
case ONELETTERAMPM: case ONELETTERAMPM:
case TWOLETTERAMPM: case TWOLETTERAMPM:
@ -1042,16 +1029,14 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode)
case TWODIGITYEAR: case TWODIGITYEAR:
date->wYear = date->wYear - (date->wYear%100) + date->wYear = date->wYear - (date->wYear%100) +
(date->wYear%10)*10 + num; (date->wYear%10)*10 + num;
date->wDayOfWeek = DATETIME_CalculateDayOfWeek( MONTHCAL_CalculateDayOfWeek(date, TRUE);
date->wDay,date->wMonth,date->wYear);
DATETIME_SendDateTimeChangeNotify (infoPtr); DATETIME_SendDateTimeChangeNotify (infoPtr);
break; break;
case INVALIDFULLYEAR: case INVALIDFULLYEAR:
case FULLYEAR: case FULLYEAR:
/* reset current year initialy */ /* reset current year initialy */
date->wYear = ((date->wYear/1000) ? 0 : 1)*(date->wYear%1000)*10 + num; date->wYear = ((date->wYear/1000) ? 0 : 1)*(date->wYear%1000)*10 + num;
date->wDayOfWeek = DATETIME_CalculateDayOfWeek( MONTHCAL_CalculateDayOfWeek(date, TRUE);
date->wDay,date->wMonth,date->wYear);
DATETIME_SendDateTimeChangeNotify (infoPtr); DATETIME_SendDateTimeChangeNotify (infoPtr);
break; break;
case ONEDIGITMONTH: case ONEDIGITMONTH:
@ -1060,8 +1045,7 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode)
date->wMonth = num; date->wMonth = num;
else else
date->wMonth = (date->wMonth%10)*10+num; date->wMonth = (date->wMonth%10)*10+num;
date->wDayOfWeek = DATETIME_CalculateDayOfWeek( MONTHCAL_CalculateDayOfWeek(date, TRUE);
date->wDay,date->wMonth,date->wYear);
DATETIME_SendDateTimeChangeNotify (infoPtr); DATETIME_SendDateTimeChangeNotify (infoPtr);
break; break;
case ONEDIGITDAY: case ONEDIGITDAY:
@ -1071,8 +1055,7 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode)
date->wDay = num; date->wDay = num;
else else
date->wDay = newDays; date->wDay = newDays;
date->wDayOfWeek = DATETIME_CalculateDayOfWeek( MONTHCAL_CalculateDayOfWeek(date, TRUE);
date->wDay,date->wMonth,date->wYear);
DATETIME_SendDateTimeChangeNotify (infoPtr); DATETIME_SendDateTimeChangeNotify (infoPtr);
break; break;
case ONEDIGIT12HOUR: case ONEDIGIT12HOUR: