October 2009 - Wine-commits

Damjan Jovanovic : sti: Add stubs for the IStillImageW interface.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 433163b1730f6c4db85687fd739be726e9099d8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=433163b1730f6c4db85687fd7… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Oct 5 21:06:06 2009 +0200 sti: Add stubs for the IStillImageW interface. --- dlls/sti/Makefile.in | 1 + dlls/sti/sti.c | 298 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/sti/sti_main.c | 16 --- dlls/sti/sti_private.h | 32 +++++ 4 files changed, 331 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=433163b1730f6c4db8568…

1 0

Damjan Jovanovic : sti: Add aggregation tests for the IStillImageW interface.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 6d2a5e190c38599e06f9d4e1c3e8b7dd34ded8a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d2a5e190c38599e06f9d4e1c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Mon Oct 5 21:07:47 2009 +0200 sti: Add aggregation tests for the IStillImageW interface. --- dlls/sti/tests/sti.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 95 insertions(+), 4 deletions(-) diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index 524ff9c..9a1aeee 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -36,6 +36,31 @@ static HRESULT (WINAPI *pStiCreateInstance)(HINSTANCE,DWORD,PSTIW*,LPUNKNOWN); static HRESULT (WINAPI *pStiCreateInstanceA)(HINSTANCE,DWORD,PSTIA*,LPUNKNOWN); static HRESULT (WINAPI *pStiCreateInstanceW)(HINSTANCE,DWORD,PSTIW*,LPUNKNOWN); +static BOOL aggregator_addref_called; + +static HRESULT WINAPI aggregator_QueryInterface(IUnknown *iface, REFIID riid, void **ppvObject) +{ + return E_NOTIMPL; +} + +static ULONG WINAPI aggregator_AddRef(IUnknown *iface) +{ + aggregator_addref_called = TRUE; + return 2; +} + +static ULONG WINAPI aggregator_Release(IUnknown *iface) +{ + return 1; +} + +static struct IUnknownVtbl aggregator_vtbl = +{ + aggregator_QueryInterface, + aggregator_AddRef, + aggregator_Release +}; + static BOOL init_function_pointers(void) { sti_dll = LoadLibrary("sti.dll"); @@ -52,7 +77,7 @@ static BOOL init_function_pointers(void) return FALSE; } -void test_version_flag_versus_aw(void) +static void test_version_flag_versus_aw(void) { HRESULT hr; @@ -74,7 +99,7 @@ void test_version_flag_versus_aw(void) IUnknown_Release((IUnknown*)pStiW); } else - todo_wine ok(0, "could not create StillImageA, hr = 0x%X\n", hr); + ok(0, "could not create StillImageA, hr = 0x%X\n", hr); hr = pStiCreateInstance(GetModuleHandle(NULL), STI_VERSION_REAL | STI_VERSION_FLAG_UNICODE, &pStiW, NULL); if (SUCCEEDED(hr)) { @@ -88,7 +113,7 @@ void test_version_flag_versus_aw(void) IUnknown_Release((IUnknown*)pStiW); } else - todo_wine ok(0, "could not create StillImageW, hr = 0x%X\n", hr); + ok(0, "could not create StillImageW, hr = 0x%X\n", hr); } else skip("No StiCreateInstance function\n"); @@ -130,7 +155,72 @@ void test_version_flag_versus_aw(void) IUnknown_Release((IUnknown*)pStiW); } else - todo_wine ok(0, "could not create StillImageW, hr = 0x%X\n", hr); + ok(0, "could not create StillImageW, hr = 0x%X\n", hr); + } + else + skip("No StiCreateInstanceW function\n"); +} + +static void test_stillimage_aggregation(void) +{ + if (pStiCreateInstanceW) + { + IUnknown aggregator = { &aggregator_vtbl }; + IStillImageW *pStiW; + IUnknown *pUnknown; + HRESULT hr; + + /* When aggregating, the outer object must get the non-delegating IUnknown to be + able to control the inner object's reference count and query its interfaces. + But StiCreateInstance* only take PSTI. So how does the non-delegating IUnknown + come back to the outer object calling this function? */ + + hr = pStiCreateInstanceW(GetModuleHandle(NULL), STI_VERSION_REAL, &pStiW, &aggregator); + if (SUCCEEDED(hr)) + { + IStillImageW *pStiW2 = NULL; + + /* Does this interface delegate? */ + aggregator_addref_called = FALSE; + IStillImage_AddRef(pStiW); + ok(!aggregator_addref_called, "the aggregated IStillImageW shouldn't delegate\n"); + IStillImage_Release(pStiW); + + /* Tests show calling IStillImageW_WriteToErrorLog on the interface segfaults on Windows, so I guess it's an IUnknown. + But querying for an IUnknown returns a different interface, which also delegates. + So much for COM being reflexive... + Anyway I doubt apps depend on any of this. */ + + /* And what about the IStillImageW interface? */ + hr = IStillImage_QueryInterface(pStiW, &IID_IStillImageW, (void**)&pStiW2); + if (SUCCEEDED(hr)) + { + ok(pStiW != pStiW2, "the aggregated IStillImageW and its queried IStillImageW unexpectedly match\n"); + /* Does it delegate? */ + aggregator_addref_called = FALSE; + IStillImage_AddRef(pStiW2); + ok(aggregator_addref_called, "the created IStillImageW's IStillImageW should delegate\n"); + IStillImage_Release(pStiW2); + IStillImage_Release(pStiW2); + } + else + ok(0, "could not query for IID_IStillImageW, hr = 0x%x\n", hr); + + IStillImage_Release(pStiW); + } + else + ok(0, "could not create StillImageW, hr = 0x%X\n", hr); + + /* Now do the above tests prove that STI.DLL isn't picky about querying for IUnknown + in CoCreateInterface when aggregating? */ + hr = CoCreateInstance(&CLSID_Sti, &aggregator, CLSCTX_ALL, &IID_IStillImageW, (void**)&pStiW); + ok(FAILED(hr), "CoCreateInstance unexpectedly succeeded when querying for IStillImageW during aggregation\n"); + if (SUCCEEDED(hr)) + IStillImage_Release(pStiW); + hr = CoCreateInstance(&CLSID_Sti, &aggregator, CLSCTX_ALL, &IID_IUnknown, (void**)&pUnknown); + ok(FAILED(hr), "CoCreateInstance unexpectedly succeeded when querying for IUnknown during aggregation\n"); + if (SUCCEEDED(hr)) + IUnknown_Release(pUnknown); } else skip("No StiCreateInstanceW function\n"); @@ -143,6 +233,7 @@ START_TEST(sti) if (init_function_pointers()) { test_version_flag_versus_aw(); + test_stillimage_aggregation(); FreeLibrary(sti_dll); } else

1 0

Nikolay Sivov : comctl32/monthcal: Parameter fixes for MCM_SETSELRANGE handler: swap selection bounds, store day of week.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 2c928de9e2ee615922ead254f8533a723efa1639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c928de9e2ee615922ead254f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Oct 5 20:26:43 2009 +0400 comctl32/monthcal: Parameter fixes for MCM_SETSELRANGE handler: swap selection bounds, store day of week. --- dlls/comctl32/monthcal.c | 21 +++++++++++++++++++-- dlls/comctl32/tests/monthcal.c | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a35d261..9c25472 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1252,8 +1252,25 @@ MONTHCAL_SetSelRange(MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) old_range[0] = infoPtr->minSel; old_range[1] = infoPtr->maxSel; - infoPtr->minSel = range[0]; - infoPtr->maxSel = range[1]; + /* swap if min > max */ + if(MONTHCAL_CompareSystemTime(&range[0], &range[1]) <= 0) + { + infoPtr->minSel = range[0]; + infoPtr->maxSel = range[1]; + } + else + { + infoPtr->minSel = range[1]; + infoPtr->maxSel = range[0]; + } + + /* update day of week */ + infoPtr->minSel.wDayOfWeek = + MONTHCAL_CalculateDayOfWeek(infoPtr->minSel.wDay, infoPtr->minSel.wMonth, + infoPtr->minSel.wYear); + infoPtr->maxSel.wDayOfWeek = + MONTHCAL_CalculateDayOfWeek(infoPtr->maxSel.wDay, infoPtr->maxSel.wMonth, + infoPtr->maxSel.wYear); /* redraw if bounds changed */ /* FIXME: no actual need to redraw everything */ diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 034487d..491cfa2 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1516,10 +1516,10 @@ 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) +static void test_monthcal_selrange(void) { HWND hwnd; - SYSTEMTIME st, range[2]; + SYSTEMTIME st, range[2], range2[2]; BOOL ret, old_comctl32 = FALSE; hwnd = create_monthcal_control(MCS_MULTISELECT); @@ -1560,6 +1560,38 @@ static void test_monthcal_getselrange(void) expect(st.wMilliseconds, range[1].wMilliseconds); } + /* bounds are swapped if min > max */ + memset(&range[0], 0, sizeof(range[0])); + range[0].wYear = 2009; + range[0].wMonth = 10; + range[0].wDay = 5; + range[1] = range[0]; + range[1].wDay = 3; + + ret = SendMessage(hwnd, MCM_SETSELRANGE, 0, (LPARAM)range); + expect(TRUE, ret); + + ret = SendMessage(hwnd, MCM_GETSELRANGE, 0, (LPARAM)range2); + expect(TRUE, ret); + + expect(range[1].wYear, range2[0].wYear); + expect(range[1].wMonth, range2[0].wMonth); + expect(range[1].wDay, range2[0].wDay); + expect(6, range2[0].wDayOfWeek); + expect(range[1].wHour, range2[0].wHour); + expect(range[1].wMinute, range2[0].wMinute); + expect(range[1].wSecond, range2[0].wSecond); + expect(range[1].wMilliseconds, range2[0].wMilliseconds); + + expect(range[0].wYear, range2[1].wYear); + expect(range[0].wMonth, range2[1].wMonth); + expect(range[0].wDay, range2[1].wDay); + expect(1, range2[1].wDayOfWeek); + expect(range[0].wHour, range2[1].wHour); + expect(range[0].wMinute, range2[1].wMinute); + expect(range[0].wSecond, range2[1].wSecond); + expect(range[0].wMilliseconds, range2[1].wMilliseconds); + DestroyWindow(hwnd); } @@ -1599,7 +1631,7 @@ START_TEST(monthcal) test_monthcal_todaylink(); test_monthcal_size(); test_monthcal_maxselday(); - test_monthcal_getselrange(); + test_monthcal_selrange(); flush_sequences(sequences, NUM_MSG_SEQUENCES); DestroyWindow(parent_wnd);

1 0

Nikolay Sivov : comctl32/monthcal: Check configured selection range max width in MCM_SETSELRANGE handler.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: f65c2f1d636b16f2b613ab0da49104b42c607a07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65c2f1d636b16f2b613ab0da… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Oct 5 20:29:31 2009 +0400 comctl32/monthcal: Check configured selection range max width in MCM_SETSELRANGE handler. --- dlls/comctl32/monthcal.c | 108 +++++++++++++++++++++++++--------------- dlls/comctl32/tests/monthcal.c | 27 ++++++++++ 2 files changed, 94 insertions(+), 41 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 9c25472..cccdaf3 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -258,6 +258,66 @@ static BOOL MONTHCAL_IsDateInValidRange(const MONTHCAL_INFO *infoPtr, const SYST return TRUE; } +/* Checks passed range width with configured maximum selection count + * + * PARAMETERS + * + * [I] infoPtr : valid pointer to control data + * [I] range0 : pointer to valid date data (requested bound) + * [I] range1 : pointer to valid date data (primary bound) + * [O] adjust : returns adjusted range bound to fit maximum range (optional) + * + * Adjust value computed basing on primary bound and current maximum selection + * count. For simple range check (without adjusted value required) (range0, range1) + * relation means nothing. + * + * RETURN VALUE + * + * TRUE - range is shorter or equal to maximum + * FALSE - range is larger than maximum + */ +static BOOL MONTHCAL_IsSelRangeValid(const MONTHCAL_INFO *infoPtr, + const SYSTEMTIME *range0, + const SYSTEMTIME *range1, + SYSTEMTIME *adjust) +{ + ULARGE_INTEGER ul_range0, ul_range1, ul_diff; + FILETIME ft_range0, ft_range1; + LONG cmp; + + SystemTimeToFileTime(range0, &ft_range0); + SystemTimeToFileTime(range1, &ft_range1); + + ul_range0.LowPart = ft_range0.dwLowDateTime; + ul_range0.HighPart = ft_range0.dwHighDateTime; + ul_range1.LowPart = ft_range1.dwLowDateTime; + ul_range1.HighPart = ft_range1.dwHighDateTime; + + cmp = CompareFileTime(&ft_range0, &ft_range1); + + if(cmp == 1) + ul_diff.QuadPart = ul_range0.QuadPart - ul_range1.QuadPart; + else + ul_diff.QuadPart = -ul_range0.QuadPart + ul_range1.QuadPart; + + if(ul_diff.QuadPart >= DAYSTO100NSECS(infoPtr->maxSelCount)) { + + if(adjust) { + if(cmp == 1) + ul_range0.QuadPart = ul_range1.QuadPart + DAYSTO100NSECS(infoPtr->maxSelCount - 1); + else + ul_range0.QuadPart = ul_range1.QuadPart - DAYSTO100NSECS(infoPtr->maxSelCount - 1); + + ft_range0.dwLowDateTime = ul_range0.LowPart; + ft_range0.dwHighDateTime = ul_range0.HighPart; + FileTimeToSystemTime(&ft_range0, adjust); + } + + return FALSE; + } + else 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) @@ -1249,6 +1309,9 @@ MONTHCAL_SetSelRange(MONTHCAL_INFO *infoPtr, SYSTEMTIME *range) if(!MONTHCAL_ValidateTime(&range[1])) MONTHCAL_CopyTime(&infoPtr->todaysDate, &range[1]); + /* maximum range exceeded */ + if(!MONTHCAL_IsSelRangeValid(infoPtr, &range[0], &range[1], NULL)) return FALSE; + old_range[0] = infoPtr->minSel; old_range[1] = infoPtr->maxSel; @@ -1825,22 +1888,17 @@ MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, LPARAM lParam) if(infoPtr->dwStyle & MCS_MULTISELECT) { SYSTEMTIME st[2]; - FILETIME ft_ht, ft_first; - ULARGE_INTEGER ul_ht, ul_first, ul_diff; int i; LONG cmp; MONTHCAL_GetSelRange(infoPtr, st); i = MONTHCAL_IsDateEqual(&infoPtr->firstSel, &st[0]) ? 1 : 0; - SystemTimeToFileTime(&st_ht, &ft_ht); - SystemTimeToFileTime(&infoPtr->firstSel, &ft_first); - - cmp = CompareFileTime(&ft_ht, &ft_first); + cmp = MONTHCAL_CompareSystemTime(&st_ht, &infoPtr->firstSel); if(MONTHCAL_IsDateEqual(&infoPtr->firstSel, &st[1])) { /* If we're still at the first selected date and range is empty, return. - If range isn't empty we should change range to a singel firstSel */ + If range isn't empty we should change range to a single firstSel */ if(MONTHCAL_IsDateEqual(&infoPtr->firstSel, &st_ht) && MONTHCAL_IsDateEqual(&st[0], &st[1])) goto done; @@ -1848,46 +1906,14 @@ MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, LPARAM lParam) if(cmp == -1) i = 0; } - ul_ht.LowPart = ft_ht.dwLowDateTime; - ul_ht.HighPart = ft_ht.dwHighDateTime; - ul_first.LowPart = ft_first.dwLowDateTime; - ul_first.HighPart = ft_first.dwHighDateTime; - - /* new selected date is later */ - if(cmp == 1) - ul_diff.QuadPart = ul_ht.QuadPart - ul_first.QuadPart; - else - ul_diff.QuadPart = -ul_ht.QuadPart + ul_first.QuadPart; - - if(ul_diff.QuadPart >= DAYSTO100NSECS(infoPtr->maxSelCount)) { - if(cmp == 1) - ul_ht.QuadPart = ul_first.QuadPart + DAYSTO100NSECS(infoPtr->maxSelCount - 1); - else - ul_ht.QuadPart = ul_first.QuadPart - DAYSTO100NSECS(infoPtr->maxSelCount - 1); - - ft_ht.dwLowDateTime = ul_ht.LowPart; - ft_ht.dwHighDateTime = ul_ht.HighPart; - FileTimeToSystemTime(&ft_ht, &st_ht); - } + MONTHCAL_IsSelRangeValid(infoPtr, &st_ht, &infoPtr->firstSel, &st_ht); if(!MONTHCAL_IsDateEqual(&st[i], &st_ht)) { - FILETIME ft_range0, ft_range1; - st[i] = st_ht; - SystemTimeToFileTime(&st[0], &ft_range0); - SystemTimeToFileTime(&st[1], &ft_range1); - - /* swap bounds if needed */ - if(CompareFileTime(&ft_range0, &ft_range1) == 1) { - SYSTEMTIME swap = st[1]; - - st[1] = st[0]; - st[0] = swap; - } - MONTHCAL_CopyTime(&infoPtr->todaysDate, &st[0]); MONTHCAL_CopyTime(&infoPtr->todaysDate, &st[1]); + /* bounds will be swapped here if needed */ MONTHCAL_SetSelRange(infoPtr, st); } } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 491cfa2..3b38e82 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1592,6 +1592,33 @@ static void test_monthcal_selrange(void) expect(range[0].wSecond, range2[1].wSecond); expect(range[0].wMilliseconds, range2[1].wMilliseconds); + /* try with range larger than maximum configured */ + memset(&range[0], 0, sizeof(range[0])); + range[0].wYear = 2009; + range[0].wMonth = 10; + range[0].wDay = 1; + range[1] = range[0]; + + ret = SendMessage(hwnd, MCM_SETSELRANGE, 0, (LPARAM)range); + expect(TRUE, ret); + + range[1] = range[0]; + /* default max. range is 7 days */ + range[1].wDay = 8; + + ret = SendMessage(hwnd, MCM_SETSELRANGE, 0, (LPARAM)range); + expect(FALSE, ret); + + ret = SendMessage(hwnd, MCM_GETSELRANGE, 0, (LPARAM)range2); + expect(TRUE, ret); + + expect(range[0].wYear, range2[0].wYear); + expect(range[0].wMonth, range2[0].wMonth); + expect(range[0].wDay, range2[0].wDay); + expect(range[0].wYear, range2[1].wYear); + expect(range[0].wMonth, range2[1].wMonth); + expect(range[0].wDay, range2[1].wDay); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/monthcal: Simplify WM_MOUSEMOVE handler.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 9723e6213da3129e55fe500ddac1497c813de03f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9723e6213da3129e55fe500dd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Oct 5 20:32:15 2009 +0400 comctl32/monthcal: Simplify WM_MOUSEMOVE handler. --- dlls/comctl32/monthcal.c | 81 ++++++++++++++++++++++++++------------------- 1 files changed, 47 insertions(+), 34 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index cccdaf3..43df19c 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -328,8 +328,13 @@ static BOOL MONTHCAL_ValidateTime(const SYSTEMTIME *time) return TRUE; } -/* Copies timestamp part only. Milliseconds are intentionaly not copied - cause it matches required behaviour for current use of this helper */ +/* Copies timestamp part only. + * + * PARAMETERS + * + * [I] from : source date + * [O] to : dest date + */ static void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to) { to->wHour = from->wHour; @@ -337,6 +342,21 @@ static void MONTHCAL_CopyTime(const SYSTEMTIME *from, SYSTEMTIME *to) to->wSecond = from->wSecond; } +/* Copies date part only. + * + * PARAMETERS + * + * [I] from : source date + * [O] to : dest date + */ +static void MONTHCAL_CopyDate(const SYSTEMTIME *from, SYSTEMTIME *to) +{ + to->wYear = from->wYear; + to->wMonth = from->wMonth; + to->wDay = from->wDay; + to->wDayOfWeek = from->wDayOfWeek; +} + /* 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. Above function assumes we have a valid data. @@ -437,8 +457,10 @@ static inline void MONTHCAL_CalcPosFromDay(const MONTHCAL_INFO *infoPtr, - set focused date to given value; - reset to zero value if NULL passed; - invalidate previous and new day rectangle only if needed. + + Returns TRUE if focused day changed, FALSE otherwise. */ -static void MONTHCAL_SetDayFocus(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *st) +static BOOL MONTHCAL_SetDayFocus(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *st) { RECT r; @@ -446,7 +468,7 @@ static void MONTHCAL_SetDayFocus(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *st) { /* there's nothing to do if it's the same date, mouse move within same date rectangle case */ - if(MONTHCAL_IsDateEqual(&infoPtr->focusedSel, st)) return; + if(MONTHCAL_IsDateEqual(&infoPtr->focusedSel, st)) return FALSE; /* invalidate old focused day */ MONTHCAL_CalcPosFromDay(infoPtr, infoPtr->focusedSel.wDay, @@ -468,6 +490,8 @@ static void MONTHCAL_SetDayFocus(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *st) /* on set invalidates new day, on reset clears previous focused day */ InvalidateRect(infoPtr->hwndSelf, &r, FALSE); + + return TRUE; } /* day is the day in the month(1 == 1st of the month) */ @@ -1719,7 +1743,6 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) } case MCHT_TODAYLINK: { - infoPtr->firstSel = infoPtr->todaysDate; infoPtr->curSel = infoPtr->todaysDate; infoPtr->minSel = infoPtr->todaysDate; infoPtr->maxSel = infoPtr->todaysDate; @@ -1733,7 +1756,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) case MCHT_CALENDARDATEPREV: case MCHT_CALENDARDATE: { - infoPtr->firstSel = ht.st; + MONTHCAL_CopyDate(&ht.st, &infoPtr->firstSel); if(infoPtr->dwStyle & MCS_MULTISELECT) { @@ -1882,49 +1905,39 @@ MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, LPARAM lParam) st_ht = ht.st; old_focused = infoPtr->focusedSel; - MONTHCAL_SetDayFocus(infoPtr, &ht.st); + + /* if pointer is over focused day still there's nothing to do */ + if(!MONTHCAL_SetDayFocus(infoPtr, &ht.st)) return 0; MONTHCAL_CalcPosFromDay(infoPtr, ht.st.wDay, ht.st.wMonth, &r); - if(infoPtr->dwStyle & MCS_MULTISELECT) { + if(infoPtr->dwStyle & MCS_MULTISELECT) { SYSTEMTIME st[2]; - int i; - LONG cmp; MONTHCAL_GetSelRange(infoPtr, st); - i = MONTHCAL_IsDateEqual(&infoPtr->firstSel, &st[0]) ? 1 : 0; - cmp = MONTHCAL_CompareSystemTime(&st_ht, &infoPtr->firstSel); - - if(MONTHCAL_IsDateEqual(&infoPtr->firstSel, &st[1])) { - /* If we're still at the first selected date and range is empty, return. - If range isn't empty we should change range to a single firstSel */ - if(MONTHCAL_IsDateEqual(&infoPtr->firstSel, &st_ht) && - MONTHCAL_IsDateEqual(&st[0], &st[1])) goto done; - - /* new selected date is earlier */ - if(cmp == -1) i = 0; - } + /* If we're still at the first selected date and range is empty, return. + If range isn't empty we should change range to a single firstSel */ + if(MONTHCAL_IsDateEqual(&infoPtr->firstSel, &st_ht) && + MONTHCAL_IsDateEqual(&st[0], &st[1])) goto done; MONTHCAL_IsSelRangeValid(infoPtr, &st_ht, &infoPtr->firstSel, &st_ht); - if(!MONTHCAL_IsDateEqual(&st[i], &st_ht)) { - st[i] = st_ht; + st[0] = infoPtr->firstSel; + /* we should overwrite timestamp here */ + MONTHCAL_CopyDate(&st_ht, &st[1]); - MONTHCAL_CopyTime(&infoPtr->todaysDate, &st[0]); - MONTHCAL_CopyTime(&infoPtr->todaysDate, &st[1]); - /* bounds will be swapped here if needed */ - MONTHCAL_SetSelRange(infoPtr, st); - } + /* bounds will be swapped here if needed */ + MONTHCAL_SetSelRange(infoPtr, st); + + return 0; } done: - /* only redraw if the currently selected day changed */ - /* FIXME: this should specify a rectangle containing only the days that changed */ - /* using InvalidateRect */ - if(!MONTHCAL_IsDateEqual(&old_focused, &infoPtr->focusedSel)) - InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); + /* FIXME: this should specify a rectangle containing only the days that changed + using InvalidateRect */ + InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); return 0; }

1 0

Nikolay Sivov : comctl32/monthcal: Remove today rectangle and focus drawing code from loops.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: b8e0a33455a1b4b30cf4dfe60376ccf03109ff26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8e0a33455a1b4b30cf4dfe60… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Oct 5 20:34:05 2009 +0400 comctl32/monthcal: Remove today rectangle and focus drawing code from loops. --- dlls/comctl32/monthcal.c | 41 +++++++++++++++++++---------------------- 1 files changed, 19 insertions(+), 22 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 43df19c..a7fb406 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -130,6 +130,9 @@ static const int DayOfWeekTable[] = {0, 3, 2, 5, 0, 3, 5, 1, 4, 6, 2, 4}; static const WCHAR themeClass[] = { 'S','c','r','o','l','l','b','a','r',0 }; +/* empty SYSTEMTIME const */ +static const SYSTEMTIME st_null; + #define MONTHCAL_GetInfoPtr(hwnd) ((MONTHCAL_INFO *)GetWindowLongPtrW(hwnd, 0)) /* helper functions */ @@ -482,11 +485,7 @@ static BOOL MONTHCAL_SetDayFocus(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *st) infoPtr->focusedSel.wMonth, &r); if(!st & MONTHCAL_ValidateDate(&infoPtr->focusedSel)) - { - static const SYSTEMTIME st_null; - infoPtr->focusedSel = st_null; - } /* on set invalidates new day, on reset clears previous focused day */ InvalidateRect(infoPtr->hwndSelf, &r, FALSE); @@ -573,10 +572,6 @@ static void MONTHCAL_DrawDay(const MONTHCAL_INFO *infoPtr, HDC hdc, int day, int SetTextColor(hdc, oldCol); SetBkColor(hdc, oldBk); } - - /* draw focus rectangle */ - if((day == infoPtr->focusedSel.wDay) && (month == infoPtr->focusedSel.wMonth)) - DrawFocusRect(hdc, &r); } @@ -777,16 +772,8 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT MONTHCAL_CalcDayRect(infoPtr, &rcDay, i, 0); if(IntersectRect(&rcTemp, &(ps->rcPaint), &rcDay)) { - MONTHCAL_DrawDay(infoPtr, hdc, day, infoPtr->curSel.wMonth, i, 0, infoPtr->monthdayState[m] & mask); - - if((infoPtr->curSel.wMonth == infoPtr->todaysDate.wMonth) && - (day==infoPtr->todaysDate.wDay) && - (infoPtr->curSel.wYear == infoPtr->todaysDate.wYear)) { - if(!(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) - MONTHCAL_CircleDay(infoPtr, hdc, day, infoPtr->curSel.wMonth); - } } mask<<=1; @@ -802,12 +789,6 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT { MONTHCAL_DrawDay(infoPtr, hdc, day, infoPtr->curSel.wMonth, i, j, infoPtr->monthdayState[m] & mask); - - if((infoPtr->curSel.wMonth == infoPtr->todaysDate.wMonth) && - (day==infoPtr->todaysDate.wDay) && - (infoPtr->curSel.wYear == infoPtr->todaysDate.wYear)) - if(!(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) - MONTHCAL_CircleDay(infoPtr, hdc, day, infoPtr->curSel.wMonth); } mask<<=1; day++; @@ -843,6 +824,22 @@ static void MONTHCAL_Refresh(MONTHCAL_INFO *infoPtr, HDC hdc, const PAINTSTRUCT } SetTextColor(hdc, infoPtr->txt); + /* draw today mark rectangle */ + if((infoPtr->curSel.wMonth == infoPtr->todaysDate.wMonth) && + (infoPtr->curSel.wYear == infoPtr->todaysDate.wYear) && + !(infoPtr->dwStyle & MCS_NOTODAYCIRCLE)) + { + MONTHCAL_CircleDay(infoPtr, hdc, infoPtr->todaysDate.wDay, infoPtr->todaysDate.wMonth); + } + + /* draw focused day */ + if(!MONTHCAL_IsDateEqual(&infoPtr->focusedSel, &st_null)) + { + MONTHCAL_CalcPosFromDay(infoPtr, infoPtr->focusedSel.wDay, + infoPtr->focusedSel.wMonth, &rcDay); + + DrawFocusRect(hdc, &rcDay); + } /* draw `today' date if style allows it, and draw a circle before today's * date if necessary */

1 0

Nikolay Sivov : comctl32/monthcal: Check date limits on prev/ next month buttons and year UpDown control.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 42733f980b3652730364fed94b891d8529ff3255 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42733f980b3652730364fed94… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Oct 5 22:37:04 2009 +0400 comctl32/monthcal: Check date limits on prev/next month buttons and year UpDown control. --- dlls/comctl32/monthcal.c | 44 +++++++++++++------------------------------- 1 files changed, 13 insertions(+), 31 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a7fb406..ad54074 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -132,6 +132,10 @@ static const WCHAR themeClass[] = { 'S','c','r','o','l','l','b','a','r',0 }; /* empty SYSTEMTIME const */ static const SYSTEMTIME st_null; +/* valid date limits */ +static const SYSTEMTIME max_allowed_date = { .wYear = 9999, .wMonth = 12, .wDay = 31 }; +static const SYSTEMTIME min_allowed_date = { .wYear = 1752, .wMonth = 9, .wDay = 14 }; + #define MONTHCAL_GetInfoPtr(hwnd) ((MONTHCAL_INFO *)GetWindowLongPtrW(hwnd, 0)) @@ -244,11 +248,8 @@ static LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME */ static BOOL MONTHCAL_IsDateInValidRange(const MONTHCAL_INFO *infoPtr, const SYSTEMTIME *date) { - static const SYSTEMTIME max_date = { .wYear = 9999, .wMonth = 12, .wDay = 31 }; - static const SYSTEMTIME min_date = { .wYear = 1752, .wMonth = 9, .wDay = 14 }; - - if((MONTHCAL_CompareSystemTime(date, &max_date) == 1) || - (MONTHCAL_CompareSystemTime(date, &min_date) == -1)) return FALSE; + if((MONTHCAL_CompareSystemTime(date, &max_allowed_date) == 1) || + (MONTHCAL_CompareSystemTime(date, &min_allowed_date) == -1)) return FALSE; if(infoPtr->rangeValid & GDTR_MAX) { if((MONTHCAL_CompareSystemTime(date, &infoPtr->maxSel) == 1)) return FALSE; @@ -1194,12 +1195,10 @@ MONTHCAL_SetRange(MONTHCAL_INFO *infoPtr, SHORT limits, SYSTEMTIME *range) } else { - static const SYSTEMTIME zero; - /* reset the other limit */ - if (limits & GDTR_MIN) infoPtr->maxDate = zero; - if (limits & GDTR_MAX) infoPtr->minDate = zero; - infoPtr->rangeValid &= limits & GDTR_MIN ? ~GDTR_MAX : ~GDTR_MIN ; + if (limits & GDTR_MIN) infoPtr->maxDate = st_null; + if (limits & GDTR_MAX) infoPtr->minDate = st_null; + infoPtr->rangeValid &= limits & GDTR_MIN ? ~GDTR_MAX : ~GDTR_MIN; } } @@ -1554,16 +1553,7 @@ static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr) 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; - } + if(!MONTHCAL_IsDateInValidRange(infoPtr, &next)) return; infoPtr->curSel = next; @@ -1583,16 +1573,7 @@ static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr) 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; - } + if(!MONTHCAL_IsDateInValidRange(infoPtr, &prev)) return; infoPtr->curSel = prev; @@ -1651,7 +1632,8 @@ static void MONTHCAL_EditYear(MONTHCAL_INFO *infoPtr) NULL, NULL, NULL); /* attach edit box */ - SendMessageW(infoPtr->hWndYearUpDown, UDM_SETRANGE, 0, MAKELONG(9999, 1753)); + 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->curSel.wYear); }

1 0

Nikolay Sivov : comctl32/monthcal: Fix parameter validation in MCM_SETCURSEL handler.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 2d2edc9a837127c622a964a0d9cde7daa388348b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d2edc9a837127c622a964a0d… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Oct 5 23:05:53 2009 +0400 comctl32/monthcal: Fix parameter validation in MCM_SETCURSEL handler. --- dlls/comctl32/monthcal.c | 10 +++++----- dlls/comctl32/tests/monthcal.c | 17 +++++++++++++++++ 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ad54074..02751b6 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -252,11 +252,11 @@ static BOOL MONTHCAL_IsDateInValidRange(const MONTHCAL_INFO *infoPtr, const SYST (MONTHCAL_CompareSystemTime(date, &min_allowed_date) == -1)) return FALSE; if(infoPtr->rangeValid & GDTR_MAX) { - if((MONTHCAL_CompareSystemTime(date, &infoPtr->maxSel) == 1)) return FALSE; + if((MONTHCAL_CompareSystemTime(date, &infoPtr->maxDate) == 1)) return FALSE; } if(infoPtr->rangeValid & GDTR_MIN) { - if((MONTHCAL_CompareSystemTime(date, &infoPtr->minSel) == -1)) return FALSE; + if((MONTHCAL_CompareSystemTime(date, &infoPtr->minDate) == -1)) return FALSE; } return TRUE; @@ -1255,14 +1255,14 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel) if(infoPtr->dwStyle & MCS_MULTISELECT) return FALSE; if(!MONTHCAL_ValidateDate(curSel)) return FALSE; + /* exit earlier if selection equals current */ + if (MONTHCAL_IsDateEqual(&infoPtr->curSel, curSel)) return TRUE; + if(!MONTHCAL_IsDateInValidRange(infoPtr, curSel)) return FALSE; infoPtr->minSel = *curSel; infoPtr->maxSel = *curSel; - /* exit earlier if selection equals current */ - if (MONTHCAL_IsDateEqual(&infoPtr->curSel, curSel)) return TRUE; - infoPtr->curSel = *curSel; /* FIXME: it's possible to reduce rectangle here */ diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 3b38e82..8234126 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -822,6 +822,23 @@ static void test_monthcal_currdate(void) expect(st_original.wMinute, st_test.wMinute); expect(st_original.wSecond, st_test.wSecond); + /* setting selection equal to current reports success even if out range */ + memset(&st_new, 0, sizeof(st_new)); + st_new.wYear = 2009; + st_new.wDay = 5; + st_new.wMonth = 10; + res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st_new); + expect(1, res); + memset(&st_test, 0, sizeof(st_test)); + st_test.wYear = 2009; + st_test.wDay = 6; + st_test.wMonth = 10; + res = SendMessage(hwnd, MCM_SETRANGE, GDTR_MIN, (LPARAM)&st_test); + expect(1, res); + /* set to current again */ + res = SendMessage(hwnd, MCM_SETCURSEL, 0, (LPARAM)&st_new); + expect(1, res); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : ole32: Check source pointer in StringFromGUID2.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 5b723235d8302469f86f585a44fe336d5df6bdf6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b723235d8302469f86f585a4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Oct 5 23:06:22 2009 +0400 ole32: Check source pointer in StringFromGUID2. --- dlls/ole32/compobj.c | 2 +- dlls/ole32/tests/compobj.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index b2013cf..c8c4808 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1621,7 +1621,7 @@ INT WINAPI StringFromGUID2(REFGUID id, LPOLESTR str, INT cmax) '%','0','4','X','-','%','0','2','X','%','0','2','X','-', '%','0','2','X','%','0','2','X','%','0','2','X','%','0','2','X', '%','0','2','X','%','0','2','X','}',0 }; - if (cmax < CHARS_IN_GUID) return 0; + if (!id || cmax < CHARS_IN_GUID) return 0; sprintfW( str, formatW, id->Data1, id->Data2, id->Data3, id->Data4[0], id->Data4[1], id->Data4[2], id->Data4[3], id->Data4[4], id->Data4[5], id->Data4[6], id->Data4[7] ); diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 1cfe86b..442e7b0 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -203,6 +203,13 @@ static void test_StringFromGUID2(void) { WCHAR str[50]; int len; + + /* invalid pointer */ + SetLastError(0xdeadbeef); + len = StringFromGUID2(NULL,str,50); + ok(len == 0, "len: %d (expected 0)\n", len); + ok(GetLastError() == 0xdeadbeef, "Expected 0xdeadbeef, got %x\n", GetLastError()); + /* Test corner cases for buffer size */ len = StringFromGUID2(&CLSID_StdFont,str,50); ok(len == 39, "len: %d (expected 39)\n", len);

1 0

Nikolay Sivov : comctl32/monthcal: Fix '&->&&' typo in focused day helper.
by Alexandre Julliard 06 Oct '09

06 Oct '09

Module: wine Branch: master Commit: 87e9e3c37030c293df099395cb0c8e3ef080495a URL: http://source.winehq.org/git/wine.git/?a=commit;h=87e9e3c37030c293df099395c… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Oct 6 00:06:55 2009 +0400 comctl32/monthcal: Fix '&->&&' typo in focused day helper. --- dlls/comctl32/monthcal.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 02751b6..42710c0 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -485,7 +485,7 @@ static BOOL MONTHCAL_SetDayFocus(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *st) MONTHCAL_CalcPosFromDay(infoPtr, infoPtr->focusedSel.wDay, infoPtr->focusedSel.wMonth, &r); - if(!st & MONTHCAL_ValidateDate(&infoPtr->focusedSel)) + if(!st && MONTHCAL_ValidateDate(&infoPtr->focusedSel)) infoPtr->focusedSel = st_null; /* on set invalidates new day, on reset clears previous focused day */

1 0