August 2010 - Wine-Commits - list.winehq.org

Andrew Talbot : comdlg32: Constify a variable.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: dc064443149af1976264f16b768135d40ddbcc91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc064443149af1976264f16b7… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Sun Aug 15 20:15:05 2010 +0100 comdlg32: Constify a variable. --- dlls/comdlg32/printdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 74a06ff..0bb3a7b 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -3584,7 +3584,7 @@ static WCHAR *get_default_printer(void) return name; } -static void pagesetup_dump_dlg_struct(pagesetup_data *data) +static void pagesetup_dump_dlg_struct(const pagesetup_data *data) { if(TRACE_ON(commdlg)) {

1 0

Nikolay Sivov : comctl32/monthcal: Remove macro used once.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 197a7164247328913ec43a3794f542e26091590e URL: http://source.winehq.org/git/wine.git/?a=commit;h=197a7164247328913ec43a379… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 8 15:45:46 2010 +0400 comctl32/monthcal: Remove macro used once. --- dlls/comctl32/monthcal.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 42f217c..bf7ea7a 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -156,8 +156,6 @@ enum nav_direction DIRECTION_FORWARD }; -#define MONTHCAL_GetInfoPtr(hwnd) ((MONTHCAL_INFO *)GetWindowLongPtrW(hwnd, 0)) - /* helper functions */ /* send a single MCN_SELCHANGE notification */ @@ -2661,11 +2659,10 @@ MONTHCAL_GetUnicodeFormat(const MONTHCAL_INFO *infoPtr) static LRESULT WINAPI MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { - MONTHCAL_INFO *infoPtr; + MONTHCAL_INFO *infoPtr = (MONTHCAL_INFO *)GetWindowLongPtrW(hwnd, 0); TRACE("hwnd=%p msg=%x wparam=%lx lparam=%lx\n", hwnd, uMsg, wParam, lParam); - infoPtr = MONTHCAL_GetInfoPtr(hwnd); if (!infoPtr && (uMsg != WM_CREATE)) return DefWindowProcW(hwnd, uMsg, wParam, lParam); switch(uMsg)

1 0

Nikolay Sivov : comctl32/monthcal: Use recently introduced enum in scroll buttons painting helper.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 9ce376181a14e68c72e7c0d42cabec9b72b0f09d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ce376181a14e68c72e7c0d42… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 8 17:24:38 2010 +0400 comctl32/monthcal: Use recently introduced enum in scroll buttons painting helper. --- dlls/comctl32/monthcal.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ac426c0..1cc64db 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -712,12 +712,12 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, const SYSTEM } -static void MONTHCAL_PaintButton(MONTHCAL_INFO *infoPtr, HDC hdc, BOOL btnNext) +static void MONTHCAL_PaintButton(MONTHCAL_INFO *infoPtr, HDC hdc, enum nav_direction button) { HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); - RECT *r = btnNext ? &infoPtr->titlebtnnext : &infoPtr->titlebtnprev; - BOOL pressed = btnNext ? (infoPtr->status & MC_NEXTPRESSED) : - (infoPtr->status & MC_PREVPRESSED); + RECT *r = button == DIRECTION_FORWARD ? &infoPtr->titlebtnnext : &infoPtr->titlebtnprev; + BOOL pressed = button == DIRECTION_FORWARD ? infoPtr->status & MC_NEXTPRESSED : + infoPtr->status & MC_PREVPRESSED; if (theme) { static const int states[] = { @@ -726,7 +726,7 @@ static void MONTHCAL_PaintButton(MONTHCAL_INFO *infoPtr, HDC hdc, BOOL btnNext) /* Next button */ ABS_RIGHTNORMAL, ABS_RIGHTPRESSED, ABS_RIGHTDISABLED }; - int stateNum = btnNext ? 3 : 0; + int stateNum = button == DIRECTION_FORWARD ? 3 : 0; if (pressed) stateNum += 1; else @@ -737,7 +737,7 @@ static void MONTHCAL_PaintButton(MONTHCAL_INFO *infoPtr, HDC hdc, BOOL btnNext) } else { - int style = btnNext ? DFCS_SCROLLRIGHT : DFCS_SCROLLLEFT; + int style = button == DIRECTION_FORWARD ? DFCS_SCROLLRIGHT : DFCS_SCROLLLEFT; if (pressed) style |= DFCS_PUSHED; else @@ -1083,8 +1083,8 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT MONTHCAL_PaintTodayTitle(infoPtr, hdc, ps); /* navigation buttons */ - MONTHCAL_PaintButton(infoPtr, hdc, FALSE); - MONTHCAL_PaintButton(infoPtr, hdc, TRUE); + MONTHCAL_PaintButton(infoPtr, hdc, DIRECTION_BACKWARD); + MONTHCAL_PaintButton(infoPtr, hdc, DIRECTION_FORWARD); /* restore context */ SetBkColor(hdc, old_bk_clr); @@ -2418,8 +2418,6 @@ static LRESULT MONTHCAL_Size(MONTHCAL_INFO *infoPtr, int Width, int Height) TRACE("(width=%d, height=%d)\n", Width, Height); MONTHCAL_UpdateSize(infoPtr); - - /* invalidate client area and erase background */ InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return 0;

1 0

Nikolay Sivov : comctl32/monthcal: Fix assumption about a single calendar for minimal rectangle calculation.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 8caeb2f735bdb024e9f7e36f03c43dc8f446393f URL: http://source.winehq.org/git/wine.git/?a=commit;h=8caeb2f735bdb024e9f7e36f0… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 8 15:58:13 2010 +0400 comctl32/monthcal: Fix assumption about a single calendar for minimal rectangle calculation. --- dlls/comctl32/monthcal.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index bf7ea7a..bf4e8b1 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1096,28 +1096,26 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT } static LRESULT -MONTHCAL_GetMinReqRect(const MONTHCAL_INFO *infoPtr, LPRECT lpRect) +MONTHCAL_GetMinReqRect(const MONTHCAL_INFO *infoPtr, RECT *rect) { - TRACE("rect %p\n", lpRect); + TRACE("rect %p\n", rect); - if(!lpRect) return FALSE; + if(!rect) return FALSE; - lpRect->left = infoPtr->calendars[0].title.left; - lpRect->top = infoPtr->calendars[0].title.top; - lpRect->right = infoPtr->calendars[0].title.right; - lpRect->bottom = infoPtr->todayrect.bottom; + *rect = infoPtr->calendars[0].title; + rect->bottom = infoPtr->calendars[0].days.bottom + infoPtr->todayrect.bottom - + infoPtr->todayrect.top; - AdjustWindowRect(lpRect, infoPtr->dwStyle, FALSE); + AdjustWindowRect(rect, infoPtr->dwStyle, FALSE); /* minimal rectangle is zero based */ - OffsetRect(lpRect, -lpRect->left, -lpRect->top); + OffsetRect(rect, -rect->left, -rect->top); - TRACE("%s\n", wine_dbgstr_rect(lpRect)); + TRACE("%s\n", wine_dbgstr_rect(rect)); return TRUE; } - static LRESULT MONTHCAL_GetColor(const MONTHCAL_INFO *infoPtr, INT index) {

1 0

Mike Kaplinskiy : ws2_32: Implement SO_UPDATE_CONNECT_CONTEXT.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: d596fa18593b00d963c22311f58369b49e1097a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d596fa18593b00d963c22311f… Author: Mike Kaplinskiy <mike.kaplinskiy(a)gmail.com> Date: Sun Aug 15 12:42:17 2010 -0400 ws2_32: Implement SO_UPDATE_CONNECT_CONTEXT. --- dlls/ws2_32/socket.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index f129b08..39c1d2a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3496,7 +3496,7 @@ int WINAPI WS_sendto(SOCKET s, const char *buf, int len, int flags, * setsockopt (WS2_32.21) */ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, - const char *optval, int optlen) + const char *optval, int optlen) { int fd; int woptval; @@ -3507,7 +3507,7 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, s, level, optname, optval, optlen); /* some broken apps pass the value directly instead of a pointer to it */ - if(IS_INTRESOURCE(optval)) + if(optlen && IS_INTRESOURCE(optval)) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -3585,6 +3585,12 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, TRACE("Ignoring SO_EXCLUSIVEADDRUSE, is always set.\n"); return 0; + /* After a ConnectEx call succeeds, the socket can't be used with half of the + * normal winsock functions on windows. We don't have that problem. */ + case WS_SO_UPDATE_CONNECT_CONTEXT: + TRACE("Ignoring SO_UPDATE_CONNECT_CONTEXT, since our sockets are normal"); + return 0; + /* SO_OPENTYPE does not require a valid socket handle. */ case WS_SO_OPENTYPE: if (!optlen || optlen < sizeof(int) || !optval)

1 0

Nikolay Sivov : comctl32/monthcal: Store all control colors in a single array.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: ae1062c12d65c990d7ac5c6428620fa14dd2b437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae1062c12d65c990d7ac5c642… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 8 16:54:23 2010 +0400 comctl32/monthcal: Store all control colors in a single array. --- dlls/comctl32/monthcal.c | 113 +++++++++------------------ dlls/comctl32/tests/monthcal.c | 170 ++++++++++++++++------------------------ 2 files changed, 102 insertions(+), 181 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae1062c12d65c990d7ac5…

1 0

Nikolay Sivov : comctl32/monthcal: Properly scroll calendars on year change .
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: af6ba8297fc7c0615d0b5f30b4860af1eb4f93c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6ba8297fc7c0615d0b5f30b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 8 15:32:52 2010 +0400 comctl32/monthcal: Properly scroll calendars on year change. --- dlls/comctl32/monthcal.c | 34 ++++++++++++++++------------------ 1 files changed, 16 insertions(+), 18 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 8425f67..42f217c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -457,11 +457,10 @@ int MONTHCAL_CalculateDayOfWeek(SYSTEMTIME *date, BOOL inplace) /* add/substract 'months' from date */ static inline void MONTHCAL_GetMonth(SYSTEMTIME *date, INT months) { - INT length; + INT length, m = date->wMonth + months; - date->wMonth += months; - date->wYear += date->wMonth > 0 ? (date->wMonth - 1) / 12 : date->wMonth / 12 - 1; - date->wMonth = date->wMonth > 0 ? (date->wMonth - 1) % 12 + 1 : 12 + date->wMonth % 12; + date->wYear += m > 0 ? (m - 1) / 12 : m / 12 - 1; + date->wMonth = m > 0 ? (m - 1) % 12 + 1 : 12 + m % 12; /* fix moving from last day in a month */ length = MONTHCAL_MonthLength(date->wMonth, date->wYear); if(date->wDay > length) date->wDay = length; @@ -1957,12 +1956,15 @@ static LRESULT CALLBACK EditWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM } /* creates updown control and edit box */ -static void MONTHCAL_EditYear(MONTHCAL_INFO *infoPtr) +static void MONTHCAL_EditYear(MONTHCAL_INFO *infoPtr, INT calIdx) { + RECT *rc = &infoPtr->calendars[calIdx].titleyear; + RECT *title = &infoPtr->calendars[calIdx].title; + infoPtr->hWndYearEdit = CreateWindowExW(0, WC_EDITW, 0, WS_VISIBLE | WS_CHILD | ES_READONLY, - infoPtr->calendars[0].titleyear.left + 3, infoPtr->titlebtnnext.top, - infoPtr->calendars[0].titleyear.right - infoPtr->calendars[0].titleyear.left + 4, + rc->left + 3, (title->bottom + title->top - infoPtr->textHeight) / 2, + rc->right - rc->left + 4, infoPtr->textHeight, infoPtr->hwndSelf, NULL, NULL, NULL); @@ -1971,7 +1973,7 @@ static void MONTHCAL_EditYear(MONTHCAL_INFO *infoPtr) infoPtr->hWndYearUpDown = CreateWindowExW(0, UPDOWN_CLASSW, 0, WS_VISIBLE | WS_CHILD | UDS_SETBUDDYINT | UDS_NOTHOUSANDS | UDS_ARROWKEYS, - infoPtr->calendars[0].titleyear.right + 7, infoPtr->titlebtnnext.top, + rc->right + 7, (title->bottom + title->top - infoPtr->textHeight) / 2, 18, infoPtr->textHeight, infoPtr->hwndSelf, NULL, NULL, NULL); @@ -1979,7 +1981,7 @@ static void MONTHCAL_EditYear(MONTHCAL_INFO *infoPtr) SendMessageW(infoPtr->hWndYearUpDown, UDM_SETRANGE, 0, MAKELONG(max_allowed_date.wYear, min_allowed_date.wYear)); SendMessageW(infoPtr->hWndYearUpDown, UDM_SETBUDDY, (WPARAM)infoPtr->hWndYearEdit, 0); - SendMessageW(infoPtr->hWndYearUpDown, UDM_SETPOS, 0, infoPtr->minSel.wYear); + SendMessageW(infoPtr->hWndYearUpDown, UDM_SETPOS, 0, infoPtr->calendars[calIdx].month.wYear); /* subclass edit box */ infoPtr->EditWndProc = (WNDPROC)SetWindowLongPtrW(infoPtr->hWndYearEdit, @@ -2068,7 +2070,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) } case MCHT_TITLEYEAR: { - MONTHCAL_EditYear(infoPtr); + MONTHCAL_EditYear(infoPtr, ht.iOffset); return 0; } case MCHT_TODAYLINK: @@ -2631,16 +2633,12 @@ MONTHCAL_Notify(MONTHCAL_INFO *infoPtr, NMHDR *hdr) { NMUPDOWN *nmud = (NMUPDOWN*)hdr; - if (hdr->hwndFrom == infoPtr->hWndYearUpDown) + if (hdr->hwndFrom == infoPtr->hWndYearUpDown && nmud->iDelta) { /* year value limits are set up explicitly after updown creation */ - if ((nmud->iDelta + nmud->iPos) != infoPtr->minSel.wYear) - { - SYSTEMTIME new_date = infoPtr->minSel; - - new_date.wYear = nmud->iDelta + nmud->iPos; - MONTHCAL_SetCurSel(infoPtr, &new_date); - } + MONTHCAL_Scroll(infoPtr, 12 * nmud->iDelta); + MONTHCAL_NotifyDayState(infoPtr); + MONTHCAL_NotifySelectionChange(infoPtr); } } return 0;

1 0

Paul Vriens : cmd: Add the Swedish translation.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 15c1071eb47e006d75f3cc9f77b18ae68f599a8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=15c1071eb47e006d75f3cc9f7… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Aug 6 12:09:08 2010 +0200 cmd: Add the Swedish translation. Translation by Rikard Dan Johansson. --- programs/cmd/Makefile.in | 1 + programs/cmd/Sv.rc | 281 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 282 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=15c1071eb47e006d75f3c…

1 0

Nikolay Sivov : comctl32/monthcal: Properly adjust selections on scrolling.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 09d883fbf0e4b5b0605e1f4d9dd1090e72789437 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09d883fbf0e4b5b0605e1f4d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 8 11:56:06 2010 +0400 comctl32/monthcal: Properly adjust selections on scrolling. --- dlls/comctl32/monthcal.c | 57 +++++++++++++++++++++++++++------------------ 1 files changed, 34 insertions(+), 23 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 0b72603..7ca5633 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1820,6 +1820,39 @@ static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr) } } +/* no valid range check performed */ +static void MONTHCAL_Scroll(MONTHCAL_INFO *infoPtr, INT delta) +{ + INT i, selIdx = -1; + + for(i = 0; i < infoPtr->cal_num; i++) + { + /* save selection position to shift it later */ + if (selIdx == -1 && MONTHCAL_CompareMonths(&infoPtr->minSel, &infoPtr->calendars[i].month) == 0) + selIdx = i; + + MONTHCAL_GetMonth(&infoPtr->calendars[i].month, delta); + } + + /* selection is always shifted to first calendar */ + if(infoPtr->dwStyle & MCS_MULTISELECT) + { + SYSTEMTIME range[2]; + + MONTHCAL_GetSelRange(infoPtr, range); + MONTHCAL_GetMonth(&range[0], delta - selIdx); + MONTHCAL_GetMonth(&range[1], delta - selIdx); + MONTHCAL_SetSelRange(infoPtr, range); + } + else + { + SYSTEMTIME st = infoPtr->minSel; + + MONTHCAL_GetMonth(&st, delta - selIdx); + MONTHCAL_SetCurSel(infoPtr, &st); + } +} + static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direction) { INT delta = infoPtr->delta ? infoPtr->delta : infoPtr->cal_num; @@ -1841,29 +1874,7 @@ static void MONTHCAL_GoToMonth(MONTHCAL_INFO *infoPtr, enum nav_direction direct if(!MONTHCAL_IsDateInValidRange(infoPtr, &st, FALSE)) return; - if(infoPtr->dwStyle & MCS_MULTISELECT) - { - SYSTEMTIME range[2]; - - range[0] = infoPtr->minSel; - range[1] = infoPtr->maxSel; - - if(direction == DIRECTION_BACKWARD) - { - MONTHCAL_GetMonth(&range[0], -delta); - MONTHCAL_GetMonth(&range[1], -delta); - } - else - { - MONTHCAL_GetMonth(&range[0], delta); - MONTHCAL_GetMonth(&range[1], delta); - } - - MONTHCAL_SetSelRange(infoPtr, range); - } - else - MONTHCAL_SetCurSel(infoPtr, &st); - + MONTHCAL_Scroll(infoPtr, direction == DIRECTION_BACKWARD ? -delta : delta); MONTHCAL_NotifyDayState(infoPtr); MONTHCAL_NotifySelectionChange(infoPtr); }

1 0

Nikolay Sivov : comctl32/monthcal: Make month popup menu respect multiple calendars.
by Alexandre Julliard Aug. 16, 2010

Aug. 16, 2010

Module: wine Branch: master Commit: 23d8d35e9e44dd1e3d330a8d9c034a9bc1890118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=23d8d35e9e44dd1e3d330a8d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Aug 8 12:14:32 2010 +0400 comctl32/monthcal: Make month popup menu respect multiple calendars. --- dlls/comctl32/monthcal.c | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 7ca5633..8425f67 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -2046,11 +2046,23 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) i = TrackPopupMenu(hMenu,TPM_LEFTALIGN | TPM_NONOTIFY | TPM_RIGHTBUTTON | TPM_RETURNCMD, menupoint.x, menupoint.y, 0, infoPtr->hwndSelf, NULL); - if ((i > 0) && (i < 13) && infoPtr->minSel.wMonth != i) + if ((i > 0) && (i < 13) && infoPtr->calendars[ht.iOffset].month.wMonth != i) { - infoPtr->minSel.wMonth = i; - MONTHCAL_IsDateInValidRange(infoPtr, &infoPtr->minSel, TRUE); - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + INT delta = i - infoPtr->calendars[ht.iOffset].month.wMonth; + SYSTEMTIME st; + + /* check if change allowed by range set */ + st = delta < 0 ? infoPtr->calendars[0].month : + infoPtr->calendars[infoPtr->cal_num-1].month; + MONTHCAL_GetMonth(&st, delta); + + if (MONTHCAL_IsDateInValidRange(infoPtr, &st, FALSE)) + { + MONTHCAL_Scroll(infoPtr, delta); + MONTHCAL_NotifyDayState(infoPtr); + MONTHCAL_NotifySelectionChange(infoPtr); + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + } } return 0; }

1 0