reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-12-02 08:46:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

comctl32/monthcal: Prevent configured range exceeding with prev/next buttons.

Browse Source
This commit is contained in:
Nikolay Sivov 2009-09-26 17:15:17 +04:00 committed by Alexandre Julliard
parent 7030296ece
commit 211a55b877
1 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
dlls/comctl32/monthcal.c
View File

@ -1248,28 +1248,58 @@ static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr)
static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr)
{ {
SYSTEMTIME next = infoPtr->curSel;
TRACE("\n"); TRACE("\n");
infoPtr->curSel.wMonth++; next.wMonth++;
if(infoPtr->curSel.wMonth > 12) { if(next.wMonth > 12) {
infoPtr->curSel.wYear++; next.wYear++;
infoPtr->curSel.wMonth = 1; next.wMonth = 1;
} }
/* prevent max range exceeding */
if(infoPtr->rangeValid & GDTR_MAX)
{
FILETIME ft_next, ft_max;
SystemTimeToFileTime(&infoPtr->maxDate, &ft_max);
SystemTimeToFileTime(&next, &ft_next);
if (CompareFileTime(&ft_next, &ft_max) > 0) return;
}
infoPtr->curSel = next;
MONTHCAL_NotifyDayState(infoPtr); MONTHCAL_NotifyDayState(infoPtr);
} }
static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr)
{ {
SYSTEMTIME prev = infoPtr->curSel;
TRACE("\n"); TRACE("\n");
infoPtr->curSel.wMonth--; prev.wMonth--;
if(infoPtr->curSel.wMonth < 1) { if(prev.wMonth < 1) {
infoPtr->curSel.wYear--; prev.wYear--;
infoPtr->curSel.wMonth = 12; prev.wMonth = 12;
} }
/* prevent min range exceeding */
if(infoPtr->rangeValid & GDTR_MIN)
{
FILETIME ft_prev, ft_min;
SystemTimeToFileTime(&infoPtr->minDate, &ft_min);
SystemTimeToFileTime(&prev, &ft_prev);
if (CompareFileTime(&ft_prev, &ft_min) < 0) return;
}
infoPtr->curSel = prev;
MONTHCAL_NotifyDayState(infoPtr); MONTHCAL_NotifyDayState(infoPtr);
} }
@ -1495,7 +1525,7 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam)
infoPtr->status = MC_SEL_LBUTUP; infoPtr->status = MC_SEL_LBUTUP;
if(hit ==MCHT_CALENDARDATENEXT) { if(hit == MCHT_CALENDARDATENEXT) {
MONTHCAL_GoToNextMonth(infoPtr); MONTHCAL_GoToNextMonth(infoPtr);
InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE);
return TRUE; return TRUE;
@ -1858,8 +1888,7 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs)
GetLocalTime(&infoPtr->todaysDate); GetLocalTime(&infoPtr->todaysDate);
infoPtr->firstDayHighWord = FALSE; infoPtr->firstDayHighWord = FALSE;
MONTHCAL_SetFirstDayOfWeek(infoPtr, -1); MONTHCAL_SetFirstDayOfWeek(infoPtr, -1);
infoPtr->curSel.wMonth = infoPtr->todaysDate.wMonth;
infoPtr->curSel.wYear = infoPtr->todaysDate.wYear;
infoPtr->maxSelCount = 7; infoPtr->maxSelCount = 7;
infoPtr->monthRange = 3; infoPtr->monthRange = 3;
infoPtr->monthdayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE)); infoPtr->monthdayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE));
@ -1872,6 +1901,7 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs)
infoPtr->minSel = infoPtr->todaysDate; infoPtr->minSel = infoPtr->todaysDate;
infoPtr->maxSel = infoPtr->todaysDate; infoPtr->maxSel = infoPtr->todaysDate;
infoPtr->curSel = infoPtr->todaysDate;
/* call MONTHCAL_UpdateSize to set all of the dimensions */ /* call MONTHCAL_UpdateSize to set all of the dimensions */
/* of the control */ /* of the control */