[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690
The following commit has been merged in the wheezy branch:
commit bc73b91e791230c1e8084ea5b7195c12a3ccdcd7
Author: Owen Rudge <orudge@codeweavers.com>
Date: Thu Mar 8 11:34:23 2012 +0000
comctl32/datetime: Don't allow an invalid year to be typed in.
(cherry picked from commit 9de240bd0ea38c1c23803c01c425cc0c57fe5cd8)
diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index 3ad9204..d67e6e3 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -847,6 +847,7 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr)
int fieldNum = infoPtr->select & DTHT_DATEFIELD;
int i, val=0, clamp_day=0;
SYSTEMTIME date = infoPtr->date;
+ int oldyear;
if (infoPtr->select == -1 || infoPtr->nCharsEntered == 0)
return;
@@ -859,13 +860,25 @@ DATETIME_ApplySelectedField (DATETIME_INFO *infoPtr)
switch (infoPtr->fieldspec[fieldNum]) {
case ONEDIGITYEAR:
case TWODIGITYEAR:
+ oldyear = date.wYear;
date.wYear = date.wYear - (date.wYear%100) + val;
- clamp_day = 1;
+
+ if (DATETIME_IsDateInValidRange(infoPtr, &date))
+ clamp_day = 1;
+ else
+ date.wYear = oldyear;
+
break;
case INVALIDFULLYEAR:
case FULLYEAR:
+ oldyear = date.wYear;
date.wYear = val;
- clamp_day = 1;
+
+ if (DATETIME_IsDateInValidRange(infoPtr, &date))
+ clamp_day = 1;
+ else
+ date.wYear = oldyear;
+
break;
case ONEDIGITMONTH:
case TWODIGITMONTH:
--
Debian Wine packaging
Reply to: