comctl32: Do ascii to integer conversion only once.
This commit is contained in:
parent
40bbe3da6f
commit
113a50a843
|
@ -954,30 +954,32 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode, LPARAM keyData)
|
||||||
int fieldNum = infoPtr->select & DTHT_DATEFIELD;
|
int fieldNum = infoPtr->select & DTHT_DATEFIELD;
|
||||||
|
|
||||||
if (vkCode >= '0' && vkCode <= '9') {
|
if (vkCode >= '0' && vkCode <= '9') {
|
||||||
|
int num = vkCode-'0';
|
||||||
|
|
||||||
/* this is a somewhat simplified version of what Windows does */
|
/* this is a somewhat simplified version of what Windows does */
|
||||||
SYSTEMTIME *date = &infoPtr->date;
|
SYSTEMTIME *date = &infoPtr->date;
|
||||||
switch (infoPtr->fieldspec[fieldNum]) {
|
switch (infoPtr->fieldspec[fieldNum]) {
|
||||||
case ONEDIGITYEAR:
|
case ONEDIGITYEAR:
|
||||||
case TWODIGITYEAR:
|
case TWODIGITYEAR:
|
||||||
date->wYear = date->wYear - (date->wYear%100) +
|
date->wYear = date->wYear - (date->wYear%100) +
|
||||||
(date->wYear%10)*10 + (vkCode-'0');
|
(date->wYear%10)*10 + num;
|
||||||
date->wDayOfWeek = DATETIME_CalculateDayOfWeek(
|
date->wDayOfWeek = DATETIME_CalculateDayOfWeek(
|
||||||
date->wDay,date->wMonth,date->wYear);
|
date->wDay,date->wMonth,date->wYear);
|
||||||
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
||||||
break;
|
break;
|
||||||
case INVALIDFULLYEAR:
|
case INVALIDFULLYEAR:
|
||||||
case FULLYEAR:
|
case FULLYEAR:
|
||||||
date->wYear = (date->wYear%1000)*10 + (vkCode-'0');
|
date->wYear = (date->wYear%1000)*10 + num;
|
||||||
date->wDayOfWeek = DATETIME_CalculateDayOfWeek(
|
date->wDayOfWeek = DATETIME_CalculateDayOfWeek(
|
||||||
date->wDay,date->wMonth,date->wYear);
|
date->wDay,date->wMonth,date->wYear);
|
||||||
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
||||||
break;
|
break;
|
||||||
case ONEDIGITMONTH:
|
case ONEDIGITMONTH:
|
||||||
case TWODIGITMONTH:
|
case TWODIGITMONTH:
|
||||||
if ((date->wMonth%10) > 1 || (vkCode-'0') > 2)
|
if ((date->wMonth%10) > 1 || num > 2)
|
||||||
date->wMonth = vkCode-'0';
|
date->wMonth = num;
|
||||||
else
|
else
|
||||||
date->wMonth = (date->wMonth%10)*10+vkCode-'0';
|
date->wMonth = (date->wMonth%10)*10+num;
|
||||||
date->wDayOfWeek = DATETIME_CalculateDayOfWeek(
|
date->wDayOfWeek = DATETIME_CalculateDayOfWeek(
|
||||||
date->wDay,date->wMonth,date->wYear);
|
date->wDay,date->wMonth,date->wYear);
|
||||||
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
||||||
|
@ -985,46 +987,46 @@ DATETIME_Char (DATETIME_INFO *infoPtr, WPARAM vkCode, LPARAM keyData)
|
||||||
case ONEDIGITDAY:
|
case ONEDIGITDAY:
|
||||||
case TWODIGITDAY:
|
case TWODIGITDAY:
|
||||||
/* probably better checking here would help */
|
/* probably better checking here would help */
|
||||||
if ((date->wDay%10) >= 3 && (vkCode-'0') > 1)
|
if ((date->wDay%10) >= 3 && num > 1)
|
||||||
date->wDay = vkCode-'0';
|
date->wDay = num;
|
||||||
else
|
else
|
||||||
date->wDay = (date->wDay%10)*10+vkCode-'0';
|
date->wDay = (date->wDay%10)*10+num;
|
||||||
date->wDayOfWeek = DATETIME_CalculateDayOfWeek(
|
date->wDayOfWeek = DATETIME_CalculateDayOfWeek(
|
||||||
date->wDay,date->wMonth,date->wYear);
|
date->wDay,date->wMonth,date->wYear);
|
||||||
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
||||||
break;
|
break;
|
||||||
case ONEDIGIT12HOUR:
|
case ONEDIGIT12HOUR:
|
||||||
case TWODIGIT12HOUR:
|
case TWODIGIT12HOUR:
|
||||||
if ((date->wHour%10) > 1 || (vkCode-'0') > 2)
|
if ((date->wHour%10) > 1 || num > 2)
|
||||||
date->wHour = vkCode-'0';
|
date->wHour = num;
|
||||||
else
|
else
|
||||||
date->wHour = (date->wHour%10)*10+vkCode-'0';
|
date->wHour = (date->wHour%10)*10+num;
|
||||||
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
||||||
break;
|
break;
|
||||||
case ONEDIGIT24HOUR:
|
case ONEDIGIT24HOUR:
|
||||||
case TWODIGIT24HOUR:
|
case TWODIGIT24HOUR:
|
||||||
if ((date->wHour%10) > 2)
|
if ((date->wHour%10) > 2)
|
||||||
date->wHour = vkCode-'0';
|
date->wHour = num;
|
||||||
else if ((date->wHour%10) == 2 && (vkCode-'0') > 3)
|
else if ((date->wHour%10) == 2 && num > 3)
|
||||||
date->wHour = vkCode-'0';
|
date->wHour = num;
|
||||||
else
|
else
|
||||||
date->wHour = (date->wHour%10)*10+vkCode-'0';
|
date->wHour = (date->wHour%10)*10+num;
|
||||||
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
||||||
break;
|
break;
|
||||||
case ONEDIGITMINUTE:
|
case ONEDIGITMINUTE:
|
||||||
case TWODIGITMINUTE:
|
case TWODIGITMINUTE:
|
||||||
if ((date->wMinute%10) > 5)
|
if ((date->wMinute%10) > 5)
|
||||||
date->wMinute = vkCode-'0';
|
date->wMinute = num;
|
||||||
else
|
else
|
||||||
date->wMinute = (date->wMinute%10)*10+vkCode-'0';
|
date->wMinute = (date->wMinute%10)*10+num;
|
||||||
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
||||||
break;
|
break;
|
||||||
case ONEDIGITSECOND:
|
case ONEDIGITSECOND:
|
||||||
case TWODIGITSECOND:
|
case TWODIGITSECOND:
|
||||||
if ((date->wSecond%10) > 5)
|
if ((date->wSecond%10) > 5)
|
||||||
date->wSecond = vkCode-'0';
|
date->wSecond = num;
|
||||||
else
|
else
|
||||||
date->wSecond = (date->wSecond%10)*10+vkCode-'0';
|
date->wSecond = (date->wSecond%10)*10+num;
|
||||||
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
DATETIME_SendDateTimeChangeNotify (infoPtr);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue