system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-01 06:06:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

comctl32/monthcal: Properly compute maximum date for control.

Browse source
This commit is contained in:
Nikolay Sivov 2011-09-14 22:59:13 +04:00 committed by Alexandre Julliard
parent e716421393
commit fec346b36d
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
dlls/comctl32/monthcal.c
View file

@ -521,15 +521,27 @@ static void MONTHCAL_GetMinDate(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *date)
static void MONTHCAL_GetMaxDate(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *date)
{
/* the latest date is in latest calendar */
SYSTEMTIME st, lt_month = infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month;
SYSTEMTIME st, *lt_month = &infoPtr->calendars[MONTHCAL_GetCalCount(infoPtr)-1].month;
INT first_day;
*date = *lt_month;
st = *lt_month;
/* day of week of first day of current month */
st.wDay = 1;
first_day = MONTHCAL_CalculateDayOfWeek(&st, FALSE);
*date = lt_month;
MONTHCAL_GetNextMonth(date);
MONTHCAL_GetPrevMonth(&st);
/* last calendar starts with some date from previous month that not displayed */
st.wDay = MONTHCAL_MonthLength(st.wMonth, st.wYear) +
(infoPtr->firstDay - first_day) % 7 + 1;
if (st.wDay > MONTHCAL_MonthLength(st.wMonth, st.wYear)) st.wDay -= 7;
MONTHCAL_GetMinDate(infoPtr, &st);
/* Use month length to get max day. 42 means max day count in calendar area */
date->wDay = 42 - (MONTHCAL_MonthLength(st.wMonth, st.wYear) - st.wDay + 1) -
MONTHCAL_MonthLength(lt_month.wMonth, lt_month.wYear);
MONTHCAL_MonthLength(lt_month->wMonth, lt_month->wYear);
/* fix day of week */
MONTHCAL_CalculateDayOfWeek(date, TRUE);