October 2009 - Wine-commits

Joel Holdsworth : gdi32: Added tests for StretchDIBits.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 170e425b00c2846f3fa61fb2f3397e1b325e9cb7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=170e425b00c2846f3fa61fb2f… Author: Joel Holdsworth <joel(a)airwebreathe.org.uk> Date: Wed Jul 15 22:17:48 2009 +0100 gdi32: Added tests for StretchDIBits. --- dlls/gdi32/tests/bitmap.c | 172 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 172 insertions(+), 0 deletions(-) diff --git a/dlls/gdi32/tests/bitmap.c b/dlls/gdi32/tests/bitmap.c index 0b4c993..517033c 100644 --- a/dlls/gdi32/tests/bitmap.c +++ b/dlls/gdi32/tests/bitmap.c @@ -2544,6 +2544,177 @@ static void test_StretchBlt(void) DeleteDC(hdcScreen); } +static void check_StretchDIBits_pixel(HDC hdcDst, UINT32 *dstBuffer, UINT32 *srcBuffer, + DWORD dwRop, UINT32 expected, int line) +{ + const UINT32 buffer[2] = { 0xFEDCBA98, 0 }; + BITMAPINFO bitmapInfo; + + memset(&bitmapInfo, 0, sizeof(BITMAPINFO)); + bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmapInfo.bmiHeader.biWidth = 2; + bitmapInfo.bmiHeader.biHeight = 1; + bitmapInfo.bmiHeader.biPlanes = 1; + bitmapInfo.bmiHeader.biBitCount = 32; + bitmapInfo.bmiHeader.biCompression = BI_RGB; + bitmapInfo.bmiHeader.biSizeImage = sizeof(buffer); + + *dstBuffer = 0x89ABCDEF; + + StretchDIBits(hdcDst, 0, 0, 2, 1, 0, 0, 1, 1, &buffer, &bitmapInfo, DIB_RGB_COLORS, dwRop); + ok(expected == *dstBuffer, + "StretchDIBits with dwRop %06X. Expected 0x%08X, got 0x%08X from line %d\n", + dwRop, expected, *dstBuffer, line); +} + +static void check_StretchDIBits_stretch(HDC hdcDst, UINT32 *dstBuffer, UINT32 *srcBuffer, + int nXOriginDest, int nYOriginDest, int nWidthDest, int nHeightDest, + int nXOriginSrc, int nYOriginSrc, int nWidthSrc, int nHeightSrc, + UINT32 expected[4], UINT32 legacy_expected[4], int line) +{ + BITMAPINFO bitmapInfo; + + memset(&bitmapInfo, 0, sizeof(BITMAPINFO)); + bitmapInfo.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmapInfo.bmiHeader.biWidth = 2; + bitmapInfo.bmiHeader.biHeight = -2; + bitmapInfo.bmiHeader.biPlanes = 1; + bitmapInfo.bmiHeader.biBitCount = 32; + bitmapInfo.bmiHeader.biCompression = BI_RGB; + + memset(dstBuffer, 0, 16); + StretchDIBits(hdcDst, nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, + nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, + srcBuffer, &bitmapInfo, DIB_RGB_COLORS, SRCCOPY); + ok(memcmp(dstBuffer, expected, 16) == 0 || /* Win2k/XP */ + broken(compare_buffers_no_alpha(dstBuffer, legacy_expected, 4)) || /* Win9X/ME */ + broken(nWidthSrc < 0 || nHeightSrc < 0), /* Win9X/ME */ + "StretchDIBits expected { %08X, %08X, %08X, %08X } got { %08X, %08X, %08X, %08X } " + "stretching { %d, %d, %d, %d } to { %d, %d, %d, %d } from line %d\n", + expected[0], expected[1], expected[2], expected[3], + dstBuffer[0], dstBuffer[1], dstBuffer[2], dstBuffer[3], + nXOriginSrc, nYOriginSrc, nWidthSrc, nHeightSrc, + nXOriginDest, nYOriginDest, nWidthDest, nHeightDest, line); +} + +static void test_StretchDIBits(void) +{ + HBITMAP bmpDst; + HBITMAP oldDst; + HDC hdcScreen, hdcDst; + UINT32 *dstBuffer, srcBuffer[4]; + HBRUSH hBrush, hOldBrush; + BITMAPINFO biDst; + UINT32 expected[4], legacy_expected[4]; + + memset(&biDst, 0, sizeof(BITMAPINFO)); + biDst.bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + biDst.bmiHeader.biWidth = 2; + biDst.bmiHeader.biHeight = -2; + biDst.bmiHeader.biPlanes = 1; + biDst.bmiHeader.biBitCount = 32; + biDst.bmiHeader.biCompression = BI_RGB; + + hdcScreen = CreateCompatibleDC(0); + hdcDst = CreateCompatibleDC(hdcScreen); + + /* Pixel Tests */ + bmpDst = CreateDIBSection(hdcScreen, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, + NULL, 0); + oldDst = SelectObject(hdcDst, bmpDst); + + hBrush = CreateSolidBrush(0x012345678); + hOldBrush = SelectObject(hdcDst, hBrush); + + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, SRCCOPY, 0xFEDCBA98, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, SRCPAINT, 0xFFFFFFFF, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, SRCAND, 0x88888888, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, SRCINVERT, 0x77777777, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, SRCERASE, 0x76543210, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, NOTSRCCOPY, 0x01234567, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, NOTSRCERASE, 0x00000000, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, MERGECOPY, 0x00581210, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, MERGEPAINT, 0x89ABCDEF, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, PATCOPY, 0x00785634, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, PATPAINT, 0x89FBDFFF, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, PATINVERT, 0x89D39BDB, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, DSTINVERT, 0x76543210, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, BLACKNESS, 0x00000000, __LINE__); + check_StretchDIBits_pixel(hdcDst, dstBuffer, srcBuffer, WHITENESS, 0xFFFFFFFF, __LINE__); + + SelectObject(hdcDst, hOldBrush); + DeleteObject(hBrush); + + /* Top-down destination tests */ + srcBuffer[0] = 0xCAFED00D, srcBuffer[1] = 0xFEEDFACE; + srcBuffer[2] = 0xFEDCBA98, srcBuffer[3] = 0x76543210; + + expected[0] = 0xCAFED00D, expected[1] = 0xFEEDFACE; + expected[2] = 0xFEDCBA98, expected[3] = 0x76543210; + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 2, 2, expected, expected, __LINE__); + + expected[0] = 0xCAFED00D, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + legacy_expected[0] = 0xFEDCBA98, legacy_expected[1] = 0x00000000; + legacy_expected[2] = 0x00000000, legacy_expected[3] = 0x00000000; + todo_wine check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 1, 1, expected, legacy_expected, __LINE__); + + expected[0] = 0xFEDCBA98, expected[1] = 0xFEDCBA98; + expected[2] = 0xFEDCBA98, expected[3] = 0xFEDCBA98; + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 1, 1, expected, expected, __LINE__); + + expected[0] = 0x42441000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + legacy_expected[0] = 0x00543210, legacy_expected[1] = 0x00000000; + legacy_expected[2] = 0x00000000, legacy_expected[3] = 0x00000000; + todo_wine check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 1, 1, 0, 0, 2, 2, expected, legacy_expected, __LINE__); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 1, 1, -2, -2, expected, expected, __LINE__); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 1, 1, -2, -2, expected, expected, __LINE__); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0x00000000; + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 1, 1, -2, -2, 1, 1, -2, -2, expected, expected, __LINE__); + + expected[0] = 0x00000000, expected[1] = 0x00000000; + expected[2] = 0x00000000, expected[3] = 0xCAFED00D; + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 1, 1, 2, 2, 0, 0, 2, 2, expected, expected, __LINE__); + + SelectObject(hdcDst, oldDst); + DeleteObject(bmpDst); + + /* Bottom up destination tests */ + biDst.bmiHeader.biHeight = 2; + bmpDst = CreateDIBSection(hdcScreen, &biDst, DIB_RGB_COLORS, (void**)&dstBuffer, + NULL, 0); + oldDst = SelectObject(hdcDst, bmpDst); + + expected[0] = 0xFEDCBA98, expected[1] = 0x76543210; + expected[2] = 0xCAFED00D, expected[3] = 0xFEEDFACE; + check_StretchDIBits_stretch(hdcDst, dstBuffer, srcBuffer, + 0, 0, 2, 2, 0, 0, 2, 2, expected, expected, __LINE__); + + /* Tidy up */ + SelectObject(hdcDst, oldDst); + DeleteObject(bmpDst); + DeleteDC(hdcDst); + + DeleteDC(hdcScreen); +} + static void test_GdiAlphaBlend(void) { /* test out-of-bound parameters for GdiAlphaBlend */ @@ -2691,6 +2862,7 @@ START_TEST(bitmap) test_CreateBitmap(); test_BitBlt(); test_StretchBlt(); + test_StretchDIBits(); test_GdiAlphaBlend(); test_bitmapinfoheadersize(); test_get16dibits();

1 0

Nikolay Sivov : comctl32/datetime: Use SDK defined class name instead of another local constant.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 7bd581e62c4c49421368de789e69a4693fb5f118 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bd581e62c4c49421368de789… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 21:35:44 2009 +0400 comctl32/datetime: Use SDK defined class name instead of another local constant. --- dlls/comctl32/datetime.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index 8f7f5dd..891ca91 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -1241,7 +1241,6 @@ DATETIME_SetFont (DATETIME_INFO *infoPtr, HFONT font, BOOL repaint) static LRESULT DATETIME_Create (HWND hwnd, const CREATESTRUCTW *lpcs) { - static const WCHAR SysMonthCal32W[] = { 'S', 'y', 's', 'M', 'o', 'n', 't', 'h', 'C', 'a', 'l', '3', '2', 0 }; DATETIME_INFO *infoPtr = Alloc (sizeof(DATETIME_INFO)); STYLESTRUCT ss = { 0, lpcs->style }; @@ -1262,7 +1261,7 @@ DATETIME_Create (HWND hwnd, const CREATESTRUCTW *lpcs) DATETIME_SetFormatW (infoPtr, 0); /* create the monthcal control */ - infoPtr->hMonthCal = CreateWindowExW (0, SysMonthCal32W, 0, WS_BORDER | WS_POPUP | WS_CLIPSIBLINGS, + infoPtr->hMonthCal = CreateWindowExW (0, MONTHCAL_CLASSW, 0, WS_BORDER | WS_POPUP | WS_CLIPSIBLINGS, 0, 0, 0, 0, infoPtr->hwndSelf, 0, 0, 0); /* initialize info structure */

1 0

Nikolay Sivov : comctl32/monthcal: Don't request locale data when it isn' t needed.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 28ec8565f036849e25eeffc0f30835863bf65e77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=28ec8565f036849e25eeffc0f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 21:52:16 2009 +0400 comctl32/monthcal: Don't request locale data when it isn't needed. --- dlls/comctl32/monthcal.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 71e477e..16d3dcf 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -877,18 +877,19 @@ static LRESULT MONTHCAL_SetFirstDayOfWeek(MONTHCAL_INFO *infoPtr, INT day) { int prev = MAKELONG(infoPtr->firstDay, infoPtr->firstDayHighWord); - int localFirstDay; - WCHAR buf[40]; TRACE("day %d\n", day); - GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK, buf, countof(buf)); - TRACE("%s %d\n", debugstr_w(buf), strlenW(buf)); - - localFirstDay = atoiW(buf); - if(day == -1) { + int localFirstDay; + WCHAR buf[80]; + + GetLocaleInfoW(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK, buf, countof(buf)); + TRACE("%s %d\n", debugstr_w(buf), strlenW(buf)); + + localFirstDay = atoiW(buf); + infoPtr->firstDay = localFirstDay; infoPtr->firstDayHighWord = FALSE; }

1 0

Nikolay Sivov : comctl32/monthcal: Move MCN_SELCHANGE/ MCN_SELECT notifications to helpers.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: eb87332f144ac635f417a96c5b6ee9fe26b94b52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb87332f144ac635f417a96c5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 22:12:21 2009 +0400 comctl32/monthcal: Move MCN_SELCHANGE/MCN_SELECT notifications to helpers. --- dlls/comctl32/monthcal.c | 59 ++++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 28 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index ed454da..e9aeac6 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -130,6 +130,33 @@ static const WCHAR themeClass[] = { 'S','c','r','o','l','l','b','a','r',0 }; /* helper functions */ +/* send a single MCN_SELCHANGE notification */ +static inline void MONTHCAL_NotifySelectionChange(const MONTHCAL_INFO *infoPtr) +{ + NMSELCHANGE nmsc; + + nmsc.nmhdr.hwndFrom = infoPtr->hwndSelf; + nmsc.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); + nmsc.nmhdr.code = MCN_SELCHANGE; + nmsc.stSelStart = infoPtr->minSel; + nmsc.stSelEnd = infoPtr->maxSel; + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); +} + +/* send a single MCN_SELECT notification */ +static inline void MONTHCAL_NotifySelect(const MONTHCAL_INFO *infoPtr) +{ + NMSELCHANGE nmsc; + + nmsc.nmhdr.hwndFrom = infoPtr->hwndSelf; + nmsc.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); + nmsc.nmhdr.code = MCN_SELECT; + nmsc.stSelStart = infoPtr->minSel; + nmsc.stSelEnd = infoPtr->maxSel; + + SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); +} + /* returns the number of days in any given month, checking for leap days */ /* january is 1, december is 12 */ int MONTHCAL_MonthLength(int month, int year) @@ -1478,23 +1505,14 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) } case MCHT_TODAYLINK: { - NMSELCHANGE nmsc; - infoPtr->firstSelDay = infoPtr->todaysDate.wDay; infoPtr->curSel = infoPtr->todaysDate; infoPtr->minSel = infoPtr->todaysDate; infoPtr->maxSel = infoPtr->todaysDate; InvalidateRect(infoPtr->hwndSelf, NULL, FALSE); - nmsc.nmhdr.hwndFrom = infoPtr->hwndSelf; - nmsc.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); - nmsc.nmhdr.code = MCN_SELCHANGE; - nmsc.stSelStart = infoPtr->minSel; - nmsc.stSelEnd = infoPtr->maxSel; - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); - - nmsc.nmhdr.code = MCN_SELECT; - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); + MONTHCAL_NotifySelectionChange(infoPtr); + MONTHCAL_NotifySelect(infoPtr); return 0; } case MCHT_CALENDARDATE: @@ -1514,7 +1532,6 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) static LRESULT MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) { - NMSELCHANGE nmsc; NMHDR nmhdr; BOOL redraw = FALSE; MCHITTESTINFO ht; @@ -1561,23 +1578,9 @@ MONTHCAL_LButtonUp(MONTHCAL_INFO *infoPtr, LPARAM lParam) /* send MCN_SELCHANGE only if new date selected */ if (!MONTHCAL_IsDateEqual(&sel, &ht.st)) - { - nmsc.nmhdr.hwndFrom = infoPtr->hwndSelf; - nmsc.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); - nmsc.nmhdr.code = MCN_SELCHANGE; - nmsc.stSelStart = infoPtr->minSel; - nmsc.stSelEnd = infoPtr->maxSel; - - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); - } + MONTHCAL_NotifySelectionChange(infoPtr); - nmsc.nmhdr.hwndFrom = infoPtr->hwndSelf; - nmsc.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); - nmsc.nmhdr.code = MCN_SELECT; - nmsc.stSelStart = infoPtr->minSel; - nmsc.stSelEnd = infoPtr->maxSel; - - SendMessageW(infoPtr->hwndNotify, WM_NOTIFY, nmsc.nmhdr.idFrom, (LPARAM)&nmsc); + MONTHCAL_NotifySelect(infoPtr); return 0; }

1 0

Nikolay Sivov : comctl32/monthcal: No need to redraw if month didn' t change after popup menu.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 3088bb31291340256a16e1163f6a64c39cfa6830 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3088bb31291340256a16e1163… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 21:59:49 2009 +0400 comctl32/monthcal: No need to redraw if month didn't change after popup menu. --- 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 16d3dcf..ed454da 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1464,7 +1464,7 @@ 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)) + if ((i > 0) && (i < 13) && infoPtr->curSel.wMonth != i) { infoPtr->curSel.wMonth = i; InvalidateRect(infoPtr->hwndSelf, NULL, FALSE);

1 0

Nikolay Sivov : comctl32/monthcal: Changing MCS_MULTISELECT isn' t allowed after creation, set default value properly.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 3df0823085db35b4bf22b25be6dbfb0fad0d03c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3df0823085db35b4bf22b25be… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 22:49:02 2009 +0400 comctl32/monthcal: Changing MCS_MULTISELECT isn't allowed after creation, set default value properly. --- dlls/comctl32/monthcal.c | 23 ++++++++++++++++++++++- dlls/comctl32/tests/monthcal.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index e9aeac6..384efe7 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1937,6 +1937,24 @@ static INT MONTHCAL_StyleChanged(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, return 0; } +static INT MONTHCAL_StyleChanging(MONTHCAL_INFO *infoPtr, WPARAM wStyleType, + STYLESTRUCT *lpss) +{ + TRACE("(styletype=%lx, styleOld=0x%08x, styleNew=0x%08x)\n", + wStyleType, lpss->styleOld, lpss->styleNew); + + /* block MCS_MULTISELECT change */ + if ((lpss->styleNew ^ lpss->styleOld) & MCS_MULTISELECT) + { + if (lpss->styleOld & MCS_MULTISELECT) + lpss->styleNew |= MCS_MULTISELECT; + else + lpss->styleNew &= ~MCS_MULTISELECT; + } + + return 0; +} + /* FIXME: check whether dateMin/dateMax need to be adjusted. */ static LRESULT MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) @@ -1965,7 +1983,7 @@ MONTHCAL_Create(HWND hwnd, LPCREATESTRUCTW lpcs) infoPtr->firstDayHighWord = FALSE; MONTHCAL_SetFirstDayOfWeek(infoPtr, -1); - infoPtr->maxSelCount = 7; + infoPtr->maxSelCount = (infoPtr->dwStyle & MCS_MULTISELECT) ? 7 : 1; infoPtr->monthRange = 3; infoPtr->monthdayState = Alloc(infoPtr->monthRange * sizeof(MONTHDAYSTATE)); infoPtr->titlebk = comctl32_color.clrActiveCaption; @@ -2131,6 +2149,9 @@ MONTHCAL_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) case WM_STYLECHANGED: return MONTHCAL_StyleChanged(infoPtr, wParam, (LPSTYLESTRUCT)lParam); + case WM_STYLECHANGING: + return MONTHCAL_StyleChanging(infoPtr, wParam, (LPSTYLESTRUCT)lParam); + default: if ((uMsg >= WM_USER) && (uMsg < WM_APP) && !COMCTL32_IsReflectedMessage(uMsg)) ERR( "unknown msg %04x wp=%08lx lp=%08lx\n", uMsg, wParam, lParam); diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index 268c25a..cd9d15e 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -580,6 +580,14 @@ static LRESULT WINAPI monthcal_subclass_proc(HWND hwnd, UINT message, WPARAM wPa msg.lParam = lParam; add_message(sequences, MONTHCAL_SEQ_INDEX, &msg); + /* some debug output for style changing */ + if ((message == WM_STYLECHANGING || + message == WM_STYLECHANGED) && lParam) + { + STYLESTRUCT *style = (STYLESTRUCT*)lParam; + trace("\told style: 0x%08x, new style: 0x%08x\n", style->styleOld, style->styleNew); + } + defwndproc_counter++; ret = CallWindowProcA(info->oldproc, hwnd, message, wParam, lParam); defwndproc_counter--; @@ -1302,8 +1310,33 @@ static void test_monthcal_maxselday(void) { int res; HWND hwnd; + DWORD style; + + hwnd = create_monthcal_control(0); + /* if no style specified default to 1 */ + res = SendMessage(hwnd, MCM_GETMAXSELCOUNT, 0, 0); + expect(1, res); + + /* try to set style */ + style = GetWindowLong(hwnd, GWL_STYLE); + SetWindowLong(hwnd, GWL_STYLE, style | MCS_MULTISELECT); + style = GetWindowLong(hwnd, GWL_STYLE); + ok(!(style & MCS_MULTISELECT), "Expected MCS_MULTISELECT not to be set\n"); + DestroyWindow(hwnd); hwnd = create_monthcal_control(MCS_MULTISELECT); + /* try to remove style */ + style = GetWindowLong(hwnd, GWL_STYLE); + SetWindowLong(hwnd, GWL_STYLE, style & ~MCS_MULTISELECT); + style = GetWindowLong(hwnd, GWL_STYLE); + ok(style & MCS_MULTISELECT, "Expected MCS_MULTISELECT to be set\n"); + DestroyWindow(hwnd); + + hwnd = create_monthcal_control(MCS_MULTISELECT); + + /* default width is a week */ + res = SendMessage(hwnd, MCM_GETMAXSELCOUNT, 0, 0); + expect(7, res); flush_sequences(sequences, NUM_MSG_SEQUENCES);

1 0

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

02 Oct '09

Module: wine Branch: master Commit: 5d530fee54d8c976432eb8328e02be62d6bfa226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d530fee54d8c976432eb8328… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Oct 1 23:02:56 2009 +0400 comctl32/monthcal: Fix parameter validation in MCM_SETMAXSELCOUNT handler. --- dlls/comctl32/monthcal.c | 7 ++++--- dlls/comctl32/tests/monthcal.c | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index 384efe7..ed059ff 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1087,9 +1087,10 @@ MONTHCAL_SetMaxSelCount(MONTHCAL_INFO *infoPtr, INT max) { TRACE("%d\n", max); - if(infoPtr->dwStyle & MCS_MULTISELECT) { - infoPtr->maxSelCount = max; - } + if(!(infoPtr->dwStyle & MCS_MULTISELECT)) return FALSE; + if(max <= 0) return FALSE; + + infoPtr->maxSelCount = max; return TRUE; } diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index cd9d15e..e0479cd 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1316,6 +1316,10 @@ static void test_monthcal_maxselday(void) /* if no style specified default to 1 */ res = SendMessage(hwnd, MCM_GETMAXSELCOUNT, 0, 0); expect(1, res); + res = SendMessage(hwnd, MCM_SETMAXSELCOUNT, 5, 0); + expect(0, res); + res = SendMessage(hwnd, MCM_GETMAXSELCOUNT, 0, 0); + expect(1, res); /* try to set style */ style = GetWindowLong(hwnd, GWL_STYLE); @@ -1351,13 +1355,20 @@ static void test_monthcal_maxselday(void) res = SendMessage(hwnd, MCM_GETMAXSELCOUNT, 0, 0); expect(15, res); + /* test invalid value */ res = SendMessage(hwnd, MCM_SETMAXSELCOUNT, -1, 0); - todo_wine {expect(0, res);} + expect(0, res); res = SendMessage(hwnd, MCM_GETMAXSELCOUNT, 0, 0); - todo_wine {expect(15, res);} + expect(15, res); ok_sequence(sequences, MONTHCAL_SEQ_INDEX, monthcal_max_sel_day_seq, "monthcal MaxSelDay", FALSE); + /* zero value is invalid too */ + res = SendMessage(hwnd, MCM_SETMAXSELCOUNT, 0, 0); + expect(0, res); + res = SendMessage(hwnd, MCM_GETMAXSELCOUNT, 0, 0); + expect(15, res); + DestroyWindow(hwnd); }

1 0

Jeff Zaroyko : imm32: dwIndex flags are mutually exclusive.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 4ae16e37eec8e7398ffc2b68170b5dfffd80b369 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae16e37eec8e7398ffc2b681… Author: Jeff Zaroyko <jeffz(a)jeffz.name> Date: Fri Oct 2 12:51:49 2009 +1000 imm32: dwIndex flags are mutually exclusive. --- dlls/imm32/imm.c | 14 ++++++++++++++ dlls/imm32/tests/imm32.c | 4 ---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index f085080..6f97448 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2130,6 +2130,13 @@ BOOL WINAPI ImmSetCompositionStringA( if (!data) return FALSE; + if (!(dwIndex == SCS_SETSTR || + dwIndex == SCS_CHANGEATTR || + dwIndex == SCS_CHANGECLAUSE || + dwIndex == SCS_SETRECONVERTSTRING || + dwIndex == SCS_QUERYRECONVERTSTRING)) + return FALSE; + if (!is_himc_ime_unicode(data)) return data->immKbd->pImeSetCompositionString(hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); @@ -2178,6 +2185,13 @@ BOOL WINAPI ImmSetCompositionStringW( if (!data) return FALSE; + if (!(dwIndex == SCS_SETSTR || + dwIndex == SCS_CHANGEATTR || + dwIndex == SCS_CHANGECLAUSE || + dwIndex == SCS_SETRECONVERTSTRING || + dwIndex == SCS_QUERYRECONVERTSTRING)) + return FALSE; + if (is_himc_ime_unicode(data)) return data->immKbd->pImeSetCompositionString(hIMC, dwIndex, lpComp, dwCompLen, lpRead, dwReadLen); diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 97a7201..7b76226 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -274,22 +274,18 @@ static void test_ImmSetCompositionString(void) ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGEATTR, NULL, 0, NULL, 0); - todo_wine ok(!ret, "ImmSetCompositionStringW() succeeded.\n"); ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGECLAUSE, NULL, 0, NULL, 0); - todo_wine ok(!ret, "ImmSetCompositionStringW() succeeded.\n"); ret = ImmSetCompositionStringW(imc, SCS_CHANGEATTR | SCS_CHANGECLAUSE, NULL, 0, NULL, 0); - todo_wine ok(!ret, "ImmSetCompositionStringW() succeeded.\n"); ret = ImmSetCompositionStringW(imc, SCS_SETSTR | SCS_CHANGEATTR | SCS_CHANGECLAUSE, NULL, 0, NULL, 0); - todo_wine ok(!ret, "ImmSetCompositionStringW() succeeded.\n"); ImmReleaseContext(hwnd, imc);

1 0

Marcus Meissner : mapi32: Fixed uninitialized variable (Coverity).
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 4eb51234f37c2145e59e52ddf29620c207de13e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4eb51234f37c2145e59e52ddf… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Fri Oct 2 10:00:45 2009 +0200 mapi32: Fixed uninitialized variable (Coverity). --- dlls/mapi32/sendmail.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mapi32/sendmail.c b/dlls/mapi32/sendmail.c index 6bf7b0f..13fb4c7 100644 --- a/dlls/mapi32/sendmail.c +++ b/dlls/mapi32/sendmail.c @@ -59,7 +59,7 @@ static ULONG sendmail_extended_mapi(LHANDLE mapi_session, ULONG_PTR uiparam, lpM IMAPITable* msg_table; LPSRowSet rows = NULL; IMsgStore* msg_store; - IMAPIFolder* folder; + IMAPIFolder* folder = NULL; LPENTRYID entry_id; LPSPropValue props; ULONG entry_len;

1 0

Paul Vriens : comctl32/tests: Fix some test failures.
by Alexandre Julliard 02 Oct '09

02 Oct '09

Module: wine Branch: master Commit: 46bba98bdf1a8984a2157f7e682482b3503721d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=46bba98bdf1a8984a2157f7e6… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Oct 2 09:21:44 2009 +0200 comctl32/tests: Fix some test failures. --- dlls/comctl32/tests/monthcal.c | 114 ++++++++++++++++++++++------------------ 1 files changed, 63 insertions(+), 51 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index e0479cd..28b3646 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -216,9 +216,6 @@ static const struct message monthcal_hit_test_seq[] = { { MCM_HITTEST, sent|wparam, 0}, { MCM_HITTEST, sent|wparam, 0}, { MCM_HITTEST, sent|wparam, 0}, - { MCM_HITTEST, sent|wparam, 0}, - { MCM_HITTEST, sent|wparam, 0}, - { MCM_HITTEST, sent|wparam, 0}, { 0 } }; @@ -868,12 +865,14 @@ static void test_monthcal_hittest(void) } hittest_test_t; static const hittest_test_t title_hits[] = { - { MCHT_NOWHERE, 0 }, + /* Start is the same everywhere */ + { MCHT_TITLE, 0 }, { MCHT_TITLEBTNPREV, 0 }, - { MCHT_TITLEMONTH, 1 }, - { MCHT_TITLEYEAR, 1 }, + /* The middle piece is only tested for presence of items */ + /* End is the same everywhere */ { MCHT_TITLEBTNNEXT, 0 }, - { MCHT_NOWHERE, 0 } + { MCHT_TITLE, 0 }, + { MCHT_NOWHERE, 1 } }; MCHITTESTINFO mchit; @@ -883,6 +882,9 @@ static void test_monthcal_hittest(void) UINT title_index; HWND hwnd; RECT r; + char yearmonth[80], *locale_month, *locale_year; + int month_count, year_count; + BOOL in_the_middle; memset(&mchit, 0, sizeof(MCHITTESTINFO)); @@ -991,33 +993,6 @@ static void test_monthcal_hittest(void) expect(MCHT_CALENDARDATE, res); #endif - /* in active area - background section of the title */ - mchit.pt.x = 2 * r.right / 7; - mchit.pt.y = 2 * r.bottom / 19; - res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); - expect(2 * r.right / 7, mchit.pt.x); - expect(2 * r.bottom / 19, mchit.pt.y); - expect(mchit.uHit, res); - expect_hex(MCHT_TITLEBK, res); - - /* in active area - month section of the title */ - mchit.pt.x = r.right / 2; - mchit.pt.y = 2 * r.bottom / 19; - res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); - expect(r.right / 2, mchit.pt.x); - expect(2 * r.bottom / 19, mchit.pt.y); - expect(mchit.uHit, res); - expect_hex(MCHT_TITLE, res); - - /* in active area - year section of the title */ - mchit.pt.x = 3 * r.right / 4; - mchit.pt.y = 2 * r.bottom / 19; - res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); - expect(3 * r.right / 4, mchit.pt.x); - expect(2 * r.bottom / 19, mchit.pt.y); - expect(mchit.uHit, res); - expect_hex(MCHT_TITLE, res); - /* in active area - date from next month */ mchit.pt.x = 11 * r.right / 14; mchit.pt.y = 16 * r.bottom / 19; @@ -1059,38 +1034,75 @@ static void test_monthcal_hittest(void) /* The horizontal position of title bar elements depends on locale (y pos is constant), so we sample across a horizontal line and make sure we find all elements. */ + + /* Get the format of the title */ + GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SYEARMONTH, yearmonth, 80); + /* Find out if we have a month and/or year */ + locale_year = strstr(yearmonth, "y"); + locale_month = strstr(yearmonth, "M"); + mchit.pt.x = 0; mchit.pt.y = (5/2) * r.bottom / 19; title_index = 0; old_res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); + expect_hex(title_hits[title_index].ht, old_res); + in_the_middle = FALSE; + month_count = year_count = 0; for (x = 0; x < r.right; x++){ mchit.pt.x = x; res = SendMessage(hwnd, MCM_HITTEST, 0, (LPARAM) & mchit); expect(x, mchit.pt.x); expect((5/2) * r.bottom / 19, mchit.pt.y); expect(mchit.uHit, res); - - if (res != MCHT_TITLEBK && res != old_res) { - title_index++; - old_res = res; - - if (sizeof(title_hits) / sizeof(title_hits[0]) <= title_index) - break; - - if (title_hits[title_index].todo) { - todo_wine - ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", - title_hits[title_index].ht, res, x); + if (res != old_res) { + + if (old_res == MCHT_TITLEBTNPREV) + in_the_middle = TRUE; + + if (res == MCHT_TITLEBTNNEXT) + in_the_middle = FALSE; + + if (in_the_middle) { + if (res == MCHT_TITLEMONTH) + month_count++; + else if (res == MCHT_TITLEYEAR) + year_count++; + } else { + title_index++; + + if (sizeof(title_hits) / sizeof(title_hits[0]) <= title_index) + break; + + if (title_hits[title_index].todo) { + todo_wine + ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", + title_hits[title_index].ht, res, x); + } else { + ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", + title_hits[title_index].ht, res, x); + } } - else ok(title_hits[title_index].ht == res, "Expected %x, got %x, pos %d\n", - title_hits[title_index].ht, res, x); + old_res = res; } } - todo_wine - ok(r.right <= x && title_index + 1 == sizeof(title_hits) / sizeof(title_hits[0]), - "Wrong title layout\n"); + /* There are some limits, even if LOCALE_SYEARMONTH contains rubbish + * or no month/year indicators at all */ + if (locale_month) + todo_wine ok(month_count == 1, "Expected 1 month item, got %d\n", month_count); + else + ok(month_count <= 1, "Too many month items: %d\n", month_count); + + if (locale_year) + todo_wine ok(year_count == 1, "Expected 1 year item, got %d\n", year_count); + else + ok(year_count <= 1, "Too many year items: %d\n", year_count); + + todo_wine ok(month_count + year_count >= 1, "Not enough month and year items\n"); + + ok(r.right <= x && title_index + 1 == sizeof(title_hits) / sizeof(title_hits[0]), + "Wrong title layout\n"); DestroyWindow(hwnd); }

1 0