Kanit Therdsteerasukdi : comctl32: datetime:
Test for out of range dates in DTM_SETSYSTEMTIME only when
flag=GDT_VALID.
Alexandre Julliard
julliard at wine.codeweavers.com
Fri Mar 16 07:20:25 CDT 2007
Module: wine
Branch: master
Commit: 7cc0b970b6d1aad9df4481e960073fbe17168c29
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cc0b970b6d1aad9df4481e960073fbe17168c29
Author: Kanit Therdsteerasukdi <therdste at ucla.edu>
Date: Thu Mar 15 14:26:59 2007 -0700
comctl32: datetime: Test for out of range dates in DTM_SETSYSTEMTIME only when flag=GDT_VALID.
---
dlls/comctl32/datetime.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c
index c495666..d092308 100644
--- a/dlls/comctl32/datetime.c
+++ b/dlls/comctl32/datetime.c
@@ -160,18 +160,18 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, SYSTEMTIME *lprgSysT
lprgSysTimeArray->wYear, lprgSysTimeArray->wMonth, lprgSysTimeArray->wDay,
lprgSysTimeArray->wHour, lprgSysTimeArray->wMinute, lprgSysTimeArray->wSecond);
- if (lprgSysTimeArray->wYear < 1601 || lprgSysTimeArray->wYear > 30827 ||
- lprgSysTimeArray->wMonth < 1 || lprgSysTimeArray->wMonth > 12 ||
- lprgSysTimeArray->wDayOfWeek > 6 ||
- lprgSysTimeArray->wDay < 1 || lprgSysTimeArray->wDay > 31 ||
- lprgSysTimeArray->wHour > 23 ||
- lprgSysTimeArray->wMinute > 59 ||
- lprgSysTimeArray->wSecond > 59 ||
- lprgSysTimeArray->wMilliseconds > 999
- )
- return 0;
-
if (flag == GDT_VALID) {
+ if (lprgSysTimeArray->wYear < 1601 || lprgSysTimeArray->wYear > 30827 ||
+ lprgSysTimeArray->wMonth < 1 || lprgSysTimeArray->wMonth > 12 ||
+ lprgSysTimeArray->wDayOfWeek > 6 ||
+ lprgSysTimeArray->wDay < 1 || lprgSysTimeArray->wDay > 31 ||
+ lprgSysTimeArray->wHour > 23 ||
+ lprgSysTimeArray->wMinute > 59 ||
+ lprgSysTimeArray->wSecond > 59 ||
+ lprgSysTimeArray->wMilliseconds > 999
+ )
+ return 0;
+
infoPtr->dateValid = TRUE;
MONTHCAL_CopyTime (lprgSysTimeArray, &infoPtr->date);
SendMessageW (infoPtr->hMonthCal, MCM_SETCURSEL, 0, (LPARAM)(&infoPtr->date));
More information about the wine-cvs
mailing list