September 2009 - Wine-Commits

Dylan Smith : secur32: Remove redendant call to gnutls_certificate_get_peers.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: fdcfbe21c38254d75f03741c72b50e2735d7ad54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fdcfbe21c38254d75f03741c7… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Sep 28 03:48:32 2009 -0400 secur32: Remove redendant call to gnutls_certificate_get_peers. Two identical calls are made with the same parameters, and there are no documented side effects of this function, so I removed one of them. --- dlls/secur32/schannel.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index cd204c1..3912fbd 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -958,8 +958,7 @@ static SECURITY_STATUS SEC_ENTRY schan_QueryContextAttributesW( case SECPKG_ATTR_REMOTE_CERT_CONTEXT: { unsigned int list_size; - const gnutls_datum_t *datum = pgnutls_certificate_get_peers( - ctx->session, &list_size); + const gnutls_datum_t *datum; datum = pgnutls_certificate_get_peers(ctx->session, &list_size); if (datum)

1 0

Nikolay Sivov : comctl32/monthcal: Fix memory leak on MCN_GETDAYSTATE notification.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: e3a7c6c7e7a18afaa9e47c3ddb9115a41e2fda51 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e3a7c6c7e7a18afaa9e47c3dd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 15:55:27 2009 +0400 comctl32/monthcal: Fix memory leak on MCN_GETDAYSTATE notification. --- dlls/comctl32/monthcal.c | 19 +++++++++++-------- 1 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 9cee5fc..da45828 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1233,7 +1233,7 @@ static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) if(infoPtr->dwStyle & MCS_DAYSTATE) { NMDAYSTATE nmds; - int i; + INT i; nmds.nmhdr.hwndFrom = infoPtr->hwndSelf; nmds.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); @@ -1242,13 +1242,15 @@ static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) nmds.prgDayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE)); nmds.stStart = infoPtr->todaysDate; - nmds.stStart.wYear = infoPtr->curSel.wYear; + nmds.stStart.wYear = infoPtr->curSel.wYear; nmds.stStart.wMonth = infoPtr->curSel.wMonth; nmds.stStart.wDay = 1; SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); - for(i=0; i<infoPtr->monthRange; i++) + for(i = 0; i < infoPtr->monthRange; i++) infoPtr->monthdayState[i] = nmds.prgDayState[i]; + + Free(nmds.prgDayState); } } @@ -1265,23 +1267,24 @@ static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) if(infoPtr->dwStyle & MCS_DAYSTATE) { NMDAYSTATE nmds; - int i; + INT i; nmds.nmhdr.hwndFrom = infoPtr->hwndSelf; nmds.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); nmds.nmhdr.code = MCN_GETDAYSTATE; nmds.cDayState = infoPtr->monthRange; - nmds.prgDayState = Alloc - (infoPtr->monthRange * sizeof(MONTHDAYSTATE)); + nmds.prgDayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE)); nmds.stStart = infoPtr->todaysDate; - nmds.stStart.wYear = infoPtr->curSel.wYear; + nmds.stStart.wYear = infoPtr->curSel.wYear; nmds.stStart.wMonth = infoPtr->curSel.wMonth; nmds.stStart.wDay = 1; SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); - for(i=0; i<infoPtr->monthRange; i++) + for(i = 0; i < infoPtr->monthRange; i++) infoPtr->monthdayState[i] = nmds.prgDayState[i]; + + Free(nmds.prgDayState); } }

1 0

Nikolay Sivov : comctl32/monthcal: Move MCN_GETDAYSTATE notification to a helper.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 7030296eceeb8288a578283d9d4dc6b6f7a94cb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7030296eceeb8288a578283d9… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 16:03:34 2009 +0400 comctl32/monthcal: Move MCN_GETDAYSTATE notification to a helper. --- dlls/comctl32/monthcal.c | 47 +++++++++++++++------------------------------ 1 files changed, 16 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index da45828..cee1f9e 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1220,17 +1220,9 @@ MONTHCAL_HitTest(const MONTHCAL_INFO *infoPtr, MCHITTESTINFO *lpht) return retval; } - -static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) +/* MCN_GETDAYSTATE notification helper */ +static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr) { - TRACE("MONTHCAL_GoToNextMonth\n"); - - infoPtr->curSel.wMonth++; - if(infoPtr->curSel.wMonth > 12) { - infoPtr->curSel.wYear++; - infoPtr->curSel.wMonth = 1; - } - if(infoPtr->dwStyle & MCS_DAYSTATE) { NMDAYSTATE nmds; INT i; @@ -1254,6 +1246,19 @@ static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) } } +static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) +{ + TRACE("\n"); + + infoPtr->curSel.wMonth++; + if(infoPtr->curSel.wMonth > 12) { + infoPtr->curSel.wYear++; + infoPtr->curSel.wMonth = 1; + } + + MONTHCAL_NotifyDayState(infoPtr); +} + static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) { @@ -1265,27 +1270,7 @@ static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) infoPtr->curSel.wMonth = 12; } - if(infoPtr->dwStyle & MCS_DAYSTATE) { - NMDAYSTATE nmds; - INT i; - - nmds.nmhdr.hwndFrom = infoPtr->hwndSelf; - nmds.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); - nmds.nmhdr.code = MCN_GETDAYSTATE; - nmds.cDayState = infoPtr->monthRange; - nmds.prgDayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE)); - - nmds.stStart = infoPtr->todaysDate; - nmds.stStart.wYear = infoPtr->curSel.wYear; - nmds.stStart.wMonth = infoPtr->curSel.wMonth; - nmds.stStart.wDay = 1; - - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmds.nmhdr.idFrom, (LPARAM)&nmds); - for(i = 0; i < infoPtr->monthRange; i++) - infoPtr->monthdayState[i] = nmds.prgDayState[i]; - - Free(nmds.prgDayState); - } + MONTHCAL_NotifyDayState(infoPtr); } static LRESULT

1 0

Nikolay Sivov : comctl32/monthcal: Properly handle Goto Today popup menu ( on RButton).
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 818aab58f5b4398f817abedd8c67c85e06b97a47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=818aab58f5b4398f817abedd8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 15:33:47 2009 +0400 comctl32/monthcal: Properly handle Goto Today popup menu (on RButton). --- dlls/comctl32/monthcal.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 498c84f..9cee5fc 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1294,22 +1294,24 @@ MONTHCAL_RButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) WCHAR buf[32]; hMenu = CreatePopupMenu(); - if (!LoadStringW(COMCTL32_hModule,IDM_GOTODAY,buf,countof(buf))) - { + if (!LoadStringW(COMCTL32_hModule, IDM_GOTODAY, buf, countof(buf))) + { WARN("Can't load resource\n"); strcpyW(buf, todayW); - } - AppendMenuW(hMenu, MF_STRING|MF_ENABLED,1, buf); - menupoint.x=(short)LOWORD(lParam); - menupoint.y=(short)HIWORD(lParam); + } + AppendMenuW(hMenu, MF_STRING|MF_ENABLED, 1, buf); + menupoint.x = (short)LOWORD(lParam); + menupoint.y = (short)HIWORD(lParam); ClientToScreen(infoPtr->hwndSelf, &menupoint); - if( TrackPopupMenu(hMenu,TPM_RIGHTBUTTON| TPM_NONOTIFY|TPM_RETURNCMD, + if( TrackPopupMenu(hMenu, TPM_RIGHTBUTTON | TPM_NONOTIFY | TPM_RETURNCMD, menupoint.x, menupoint.y, 0, infoPtr->hwndSelf, NULL)) - { - infoPtr->curSel.wMonth = infoPtr->todaysDate.wMonth; - infoPtr->curSel.wYear = infoPtr->todaysDate.wYear; + { + infoPtr->curSel = infoPtr->todaysDate; + infoPtr->minSel = infoPtr->todaysDate; + infoPtr->maxSel = infoPtr->todaysDate; InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - } + } + return 0; }

1 0

Nikolay Sivov : comctl32/monthcal: Prevent configured range exceeding with prev/next buttons.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 211a55b8777ee5f91976d75d4813e1ec0014c365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=211a55b8777ee5f91976d75d4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 17:15:17 2009 +0400 comctl32/monthcal: Prevent configured range exceeding with prev/next buttons. --- dlls/comctl32/monthcal.c | 52 ++++++++++++++++++++++++++++++++++++--------- 1 files changed, 41 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index cee1f9e..3aa0693 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1248,28 +1248,58 @@ static void MONTHCAL_NotifyDayState(MONTHCAL_INFO *infoPtr) static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) { + SYSTEMTIME next = infoPtr->curSel; + TRACE("\n"); - infoPtr->curSel.wMonth++; - if(infoPtr->curSel.wMonth > 12) { - infoPtr->curSel.wYear++; - infoPtr->curSel.wMonth = 1; + next.wMonth++; + if(next.wMonth > 12) { + next.wYear++; + 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); } static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) { + SYSTEMTIME prev = infoPtr->curSel; + TRACE("\n"); - infoPtr->curSel.wMonth--; - if(infoPtr->curSel.wMonth < 1) { - infoPtr->curSel.wYear--; - infoPtr->curSel.wMonth = 12; + prev.wMonth--; + if(prev.wMonth < 1) { + prev.wYear--; + 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); } @@ -1495,7 +1525,7 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) infoPtr->status = MC_SEL_LBUTUP; - if(hit ==MCHT_CALENDARDATENEXT) { + if(hit == MCHT_CALENDARDATENEXT) { MONTHCAL_GoToNextMonth(infoPtr); InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return TRUE; @@ -1858,8 +1888,7 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) GetLocalTime(&infoPtr->todaysDate); infoPtr->firstDayHighWord = FALSE; MONTHCAL_SetFirstDayOfWeek(infoPtr, -1); - infoPtr->curSel.wMonth = infoPtr->todaysDate.wMonth; - infoPtr->curSel.wYear = infoPtr->todaysDate.wYear; + infoPtr->maxSelCount = 7; infoPtr->monthRange = 3; infoPtr->monthdayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE)); @@ -1872,6 +1901,7 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->minSel = infoPtr->todaysDate; infoPtr->maxSel = infoPtr->todaysDate; + infoPtr->curSel = infoPtr->todaysDate; /* call MONTHCAL_UpdateSize to set all of the dimensions */ /* of the control */

1 0

Nikolay Sivov : comctl32/monthcal: Fix timestamp storing on MCM_SETRANGE/ MCM_SETSELRANGE.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 1224cc461dc95608dfce31479cc06b503d3f32d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1224cc461dc95608dfce31479… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 20:06:48 2009 +0400 comctl32/monthcal: Fix timestamp storing on MCM_SETRANGE/MCM_SETSELRANGE. --- dlls/comctl32/monthcal.c | 49 ++++++++++++++++++++++++++++++++------- dlls/comctl32/tests/monthcal.c | 30 +++++++++++++++++++++++- 2 files changed, 69 insertions(+), 10 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 3aa0693..1389622 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -160,17 +160,35 @@ static inline BOOL MONTHCAL_IsDateEqual(const SYSTEMTIME *first, const SYSTEMTIM (first->wDay == second->wDay); } -/* make sure that time is valid */ -static BOOL MONTHCAL_ValidateTime(SYSTEMTIME time) +/* make sure that date fields are valid */ +static BOOL MONTHCAL_ValidateDate(const SYSTEMTIME *time) { - if(time.wMonth < 1 || time.wMonth > 12 ) return FALSE; - if(time.wDayOfWeek > 6) return FALSE; - if(time.wDay > MONTHCAL_MonthLength(time.wMonth, time.wYear)) + if(time->wMonth < 1 || time->wMonth > 12 ) return FALSE; + if(time->wDayOfWeek > 6) return FALSE; + if(time->wDay > MONTHCAL_MonthLength(time->wMonth, time->wYear)) return FALSE; return TRUE; } +/* Used in MCM_SETRANGE/MCM_SETSELRANGE to determine resulting time part. + Milliseconds are intentionaly not validated. */ +static BOOL MONTHCAL_ValidateTime(const SYSTEMTIME *time) +{ + if((time->wHour > 24) || (time->wMinute > 59) || (time->wSecond > 59)) + return FALSE; + else + return TRUE; +} + +/* Copies timestamp part only. Milliseconds are intentionaly not copied + cause it matches required behaviour for current use of this helper */ +static void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to) +{ + to->wHour = from->wHour; + to->wMinute = from->wMinute; + to->wSecond = from->wSecond; +} /* Note:Depending on DST, this may be offset by a day. Need to find out if we're on a DST place & adjust the clock accordingly. @@ -908,17 +926,23 @@ MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr, SHORT limits, SYSTEMTIME *range) TRACE("%x %p\n", limits, range); - if ((limits & GDTR_MIN && !MONTHCAL_ValidateTime(range[0])) || - (limits & GDTR_MAX && !MONTHCAL_ValidateTime(range[1]))) + if ((limits & GDTR_MIN && !MONTHCAL_ValidateDate(&range[0])) || + (limits & GDTR_MAX && !MONTHCAL_ValidateDate(&range[1]))) return FALSE; if (limits & GDTR_MIN) { + if (!MONTHCAL_ValidateTime(&range[0])) + MONTHCAL_CopyTime(&infoPtr->todaysDate, &range[0]); + infoPtr->minDate = range[0]; infoPtr->rangeValid |= GDTR_MIN; } if (limits & GDTR_MAX) { + if (!MONTHCAL_ValidateTime(&range[1])) + MONTHCAL_CopyTime(&infoPtr->todaysDate, &range[1]); + infoPtr->maxDate = range[1]; infoPtr->rangeValid |= GDTR_MAX; } @@ -1003,7 +1027,7 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) if(!curSel) return FALSE; if(infoPtr->dwStyle & MCS_MULTISELECT) return FALSE; - if(!MONTHCAL_ValidateTime(*curSel)) return FALSE; + if(!MONTHCAL_ValidateDate(curSel)) return FALSE; infoPtr->minSel = *curSel; infoPtr->maxSel = *curSel; @@ -1067,8 +1091,15 @@ MONTHCAL_SetSelRange(MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) if(infoPtr->dwStyle & MCS_MULTISELECT) { - infoPtr->maxSel = range[1]; + /* adjust timestamps */ + if(!MONTHCAL_ValidateTime(&range[0])) + MONTHCAL_CopyTime(&infoPtr->todaysDate, &range[0]); + if(!MONTHCAL_ValidateTime(&range[1])) + MONTHCAL_CopyTime(&infoPtr->todaysDate, &range[1]); + infoPtr->minSel = range[0]; + infoPtr->maxSel = range[1]; + TRACE("[min,max]=[%d %d]\n", infoPtr->minSel.wDay, infoPtr->maxSel.wDay); return TRUE; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index e5282ff..109d8a8 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -322,7 +322,7 @@ static const struct message destroy_parent_seq[] = { static void test_monthcal(void) { HWND hwnd; - SYSTEMTIME st[2], st1[2]; + SYSTEMTIME st[2], st1[2], today; int res, month_range; hwnd = CreateWindowA(MONTHCAL_CLASSA, "MonthCal", WS_POPUP | WS_VISIBLE, CW_USEDEFAULT, @@ -354,13 +354,41 @@ static void test_monthcal(void) GetSystemTime(&st[0]); st[1] = st[0]; + SendMessage(hwnd, MCM_GETTODAY, 0, (LPARAM)&today); + /* Invalid date/time */ st[0].wYear = 2000; /* Time should not matter */ st[1].wHour = st[1].wMinute = st[1].wSecond = 70; + st[1].wMilliseconds = 1200; ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set MAX limit\n"); + /* invalid timestamp is written back with today data and msecs untouched */ + expect(today.wHour, st[1].wHour); + expect(today.wMinute, st[1].wMinute); + expect(today.wSecond, st[1].wSecond); + expect(1200, st[1].wMilliseconds); + ok(SendMessage(hwnd, MCM_GETRANGE, 0, (LPARAM)st1) == GDTR_MAX, "No limits should be set\n"); ok(st1[0].wYear != 2000, "Lover limit changed\n"); + /* invalid timestamp should be replaced with today data, except msecs */ + expect(today.wHour, st1[1].wHour); + expect(today.wMinute, st1[1].wMinute); + expect(today.wSecond, st1[1].wSecond); + expect(1200, st1[1].wMilliseconds); + + /* Invalid date/time with invalid milliseconds only */ + GetSystemTime(&st[0]); + st[1] = st[0]; + /* Time should not matter */ + st[1].wMilliseconds = 1200; + ok(SendMessage(hwnd, MCM_SETRANGE, GDTR_MAX, (LPARAM)st), "Failed to set MAX limit\n"); + /* invalid milliseconds field doesn't lead to invalid timestamp */ + expect(st[0].wHour, st[1].wHour); + expect(st[0].wMinute, st[1].wMinute); + expect(st[0].wSecond, st[1].wSecond); + expect(1200, st[1].wMilliseconds); + + GetSystemTime(&st[0]); st[1].wMonth = 0; ok(!SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN | GDTR_MAX, (LPARAM)st), "Should have failed to set limits\n");

1 0

Nikolay Sivov : comctl32/monthcal: Store full date info to current date on todaylink with LButton.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: a95b63efccf51c4f52d8a0c41d1d6672acdb7477 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a95b63efccf51c4f52d8a0c41… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 15:23:44 2009 +0400 comctl32/monthcal: Store full date info to current date on todaylink with LButton. --- dlls/comctl32/monthcal.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index bb5b6de..498c84f 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1421,10 +1421,8 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) { NMSELCHANGE nmsc; - infoPtr->curSel.wDay = infoPtr->todaysDate.wDay; infoPtr->firstSelDay = infoPtr->todaysDate.wDay; - infoPtr->curSel.wMonth = infoPtr->todaysDate.wMonth; - infoPtr->curSel.wYear = infoPtr->todaysDate.wYear; + infoPtr->curSel = infoPtr->todaysDate; infoPtr->minSel = infoPtr->todaysDate; infoPtr->maxSel = infoPtr->todaysDate; InvalidateRect(infoPtr->hwndSelf, NULL, FALSE);

1 0

Nikolay Sivov : comctl32/monthcal: Copy SYSTEMTIME with a simple assignment .
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: b0d3db5b291a6ea7b54dc03f36f9cbbbe34cde53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0d3db5b291a6ea7b54dc03f3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Fri Sep 25 23:41:08 2009 +0400 comctl32/monthcal: Copy SYSTEMTIME with a simple assignment. --- dlls/comctl32/comctl32.h | 12 --------- dlls/comctl32/datetime.c | 34 +++++++++++++------------- dlls/comctl32/monthcal.c | 60 +++++++++++++++++++++++----------------------- 3 files changed, 47 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b0d3db5b291a6ea7b54dc…

1 0

Nikolay Sivov : comctl32/monthcal: Make tests not depend on each other.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: 0617baf2c3e3b53e9a47a55c899a2199b282e430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0617baf2c3e3b53e9a47a55c8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 00:51:04 2009 +0400 comctl32/monthcal: Make tests not depend on each other. --- dlls/comctl32/tests/monthcal.c | 189 +++++++++++++++++++++++++++++----------- 1 files changed, 138 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0617baf2c3e3b53e9a47a…

1 0

Nikolay Sivov : comctl32/monthcal: Store full date info for selection at creation time.
by Alexandre Julliard Sept. 28, 2009

Sept. 28, 2009

Module: wine Branch: master Commit: d66dcb4ff8f1332c102d97178d36ada54db52576 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d66dcb4ff8f1332c102d97178… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sat Sep 26 01:20:33 2009 +0400 comctl32/monthcal: Store full date info for selection at creation time. --- dlls/comctl32/monthcal.c | 32 +++++++++++++++----------------- dlls/comctl32/tests/monthcal.c | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 17 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index b23a990..0d4c96b 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1872,25 +1872,23 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->firstDayHighWord = FALSE; MONTHCAL_SetFirstDayOfWeek(infoPtr, -1); infoPtr->currentMonth = infoPtr->todaysDate.wMonth; - infoPtr->currentYear = infoPtr->todaysDate.wYear; + infoPtr->currentYear = infoPtr->todaysDate.wYear; infoPtr->minDate = infoPtr->todaysDate; infoPtr->maxDate = infoPtr->todaysDate; - infoPtr->maxDate.wYear=2050; - infoPtr->minDate.wYear=1950; - infoPtr->maxSelCount = 7; - infoPtr->monthRange = 3; - infoPtr->monthdayState = Alloc - (infoPtr->monthRange * sizeof(MONTHDAYSTATE)); - infoPtr->titlebk = comctl32_color.clrActiveCaption; - infoPtr->titletxt = comctl32_color.clrWindow; - infoPtr->monthbk = comctl32_color.clrWindow; - infoPtr->trailingtxt = comctl32_color.clrGrayText; - infoPtr->bk = comctl32_color.clrWindow; - infoPtr->txt = comctl32_color.clrWindowText; - - /* set the current day for highlighing */ - infoPtr->minSel.wDay = infoPtr->todaysDate.wDay; - infoPtr->maxSel.wDay = infoPtr->todaysDate.wDay; + infoPtr->maxDate.wYear = 2050; + infoPtr->minDate.wYear = 1950; + infoPtr->maxSelCount = 7; + infoPtr->monthRange = 3; + infoPtr->monthdayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE)); + infoPtr->titlebk = comctl32_color.clrActiveCaption; + infoPtr->titletxt = comctl32_color.clrWindow; + infoPtr->monthbk = comctl32_color.clrWindow; + infoPtr->trailingtxt = comctl32_color.clrGrayText; + infoPtr->bk = comctl32_color.clrWindow; + infoPtr->txt = comctl32_color.clrWindowText; + + infoPtr->minSel = infoPtr->todaysDate; + infoPtr->maxSel = infoPtr->todaysDate; /* call MONTHCAL_UpdateSize to set all of the dimensions */ /* of the control */ diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 32b4d14..8cd3494 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1237,6 +1237,41 @@ static void test_monthcal_destroy(void) ok_sequence(sequences, MONTHCAL_SEQ_INDEX, destroy_monthcal_multi_sel_style_seq, "Destroy monthcal (multi sel style)", FALSE); } +static void test_monthcal_getselrange(void) +{ + HWND hwnd; + SYSTEMTIME st, range[2]; + BOOL ret; + + hwnd = create_monthcal_control(MCS_MULTISELECT); + + /* just after creation selection should start and end today */ + ret = SendMessage(hwnd, MCM_GETTODAY, 0, (LPARAM)&st); + expect(TRUE, ret); + + ret = SendMessage(hwnd, MCM_GETSELRANGE, 0, (LPARAM)range); + expect(TRUE, ret); + expect(st.wYear, range[0].wYear); + expect(st.wMonth, range[0].wMonth); + expect(st.wDay, range[0].wDay); + expect(st.wDayOfWeek, range[0].wDayOfWeek); + expect(st.wHour, range[0].wHour); + expect(st.wMinute, range[0].wMinute); + expect(st.wSecond, range[0].wSecond); + expect(st.wMilliseconds, range[0].wMilliseconds); + + expect(st.wYear, range[1].wYear); + expect(st.wMonth, range[1].wMonth); + expect(st.wDay, range[1].wDay); + expect(st.wDayOfWeek, range[1].wDayOfWeek); + expect(st.wHour, range[1].wHour); + expect(st.wMinute, range[1].wMinute); + expect(st.wSecond, range[1].wSecond); + expect(st.wMilliseconds, range[1].wMilliseconds); + + DestroyWindow(hwnd); +} + START_TEST(monthcal) { HMODULE hComctl32; @@ -1273,6 +1308,7 @@ START_TEST(monthcal) test_monthcal_todaylink(); test_monthcal_size(); test_monthcal_maxselday(); + test_monthcal_getselrange(); flush_sequences(sequences, NUM_MSG_SEQUENCES); DestroyWindow(parent_wnd);

1 0