September 2022 - Wine-Commits

Nikolay Sivov : msvcrt: Remove mention of obsolete libwine function.
by Alexandre Julliard Sept. 1, 2022

Sept. 1, 2022

Module: wine Branch: master Commit: b007ee923498c55a1a06b5fcd22a2a822dc70c83 URL: https://gitlab.winehq.org/wine/wine/-/commit/b007ee923498c55a1a06b5fcd22a2a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 1 13:13:37 2022 +0300 msvcrt: Remove mention of obsolete libwine function. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/msvcrt/wcs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 6942ecf3534..971c04c0f6c 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2519,7 +2519,7 @@ static int wctoint(WCHAR c, int base) else if ('a' <= c && c <= 'z') v = c - 'a' + 10; else { - /* NOTE: wine_fold_string(MAP_FOLDDIGITS) supports too many things. */ + /* NOTE: MAP_FOLDDIGITS supports too many things. */ /* Unicode points that contain digits 0-9; keep this sorted! */ static const WCHAR zeros[] = { 0x660, 0x6f0, 0x966, 0x9e6, 0xa66, 0xae6, 0xb66, 0xc66, 0xce6,

1 0

Andrey Gusev : user32: Implement DefRawInputProc.
by Alexandre Julliard Sept. 1, 2022

Sept. 1, 2022

Module: wine Branch: master Commit: da8a36c50e13595a2714733199cd82deb0017f59 URL: https://gitlab.winehq.org/wine/wine/-/commit/da8a36c50e13595a2714733199cd82… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Aug 30 17:15:47 2022 +0300 user32: Implement DefRawInputProc. Used in The Testament of Sherlock Holmes on mouse move. --- dlls/user32/input.c | 4 ++-- dlls/user32/tests/input.c | 20 ++++++++++++++++++++ 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index a329150f745..bb7477ed482 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -649,7 +649,7 @@ UINT WINAPI GetRawInputDeviceInfoA( HANDLE device, UINT command, void *data, UIN */ LRESULT WINAPI DefRawInputProc( RAWINPUT **data, INT data_count, UINT header_size ) { - FIXME( "data %p, data_count %d, header_size %u stub!\n", data, data_count, header_size ); + TRACE( "data %p, data_count %d, header_size %u.\n", data, data_count, header_size ); - return 0; + return header_size == sizeof(RAWINPUTHEADER) ? 0 : -1; } diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index f508ed69b74..8477645fad5 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2900,6 +2900,25 @@ static void test_rawinput(const char* argv0) CloseDesktop(params.desk); } +static void test_DefRawInputProc(void) +{ + LRESULT ret; + + SetLastError(0xdeadbeef); + ret = DefRawInputProc(NULL, 0, sizeof(RAWINPUTHEADER)); + ok(!ret, "got %Id\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %ld\n", GetLastError()); + ret = DefRawInputProc(LongToPtr(0xcafe), 0xbeef, sizeof(RAWINPUTHEADER)); + ok(!ret, "got %Id\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %ld\n", GetLastError()); + ret = DefRawInputProc(NULL, 0, sizeof(RAWINPUTHEADER) - 1); + ok(ret == -1, "got %Id\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %ld\n", GetLastError()); + ret = DefRawInputProc(NULL, 0, sizeof(RAWINPUTHEADER) + 1); + ok(ret == -1, "got %Id\n", ret); + ok(GetLastError() == 0xdeadbeef, "got %ld\n", GetLastError()); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -4589,6 +4608,7 @@ START_TEST(input) test_GetRawInputBuffer(); test_RegisterRawInputDevices(); test_rawinput(argv[0]); + test_DefRawInputProc(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx(argv[0]);

1 0

Zhiyi Zhang : comctl32/datetime: Do not paint parent background when painting arrows.
by Alexandre Julliard Sept. 1, 2022

Sept. 1, 2022

Module: wine Branch: master Commit: 46740a23fd6ee48378d866a169d906034e5414de URL: https://gitlab.winehq.org/wine/wine/-/commit/46740a23fd6ee48378d866a169d906… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 31 22:12:32 2022 +0800 comctl32/datetime: Do not paint parent background when painting arrows. This is tested manually on XP, Win7 and Win10. --- dlls/comctl32/datetime.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index f142ea8ede5..53c17798668 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -793,8 +793,6 @@ DATETIME_Refresh (DATETIME_INFO *infoPtr, HDC hdc) else state = ABS_DOWNNORMAL; - if (IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, state)) - DrawThemeParentBackground(infoPtr->hwndSelf, hdc, &infoPtr->calbutton); DrawThemeBackground(theme, hdc, SBP_ARROWBTN, state, &infoPtr->calbutton, NULL); } else

1 0

Zhiyi Zhang : uxtheme: Do not draw parent background even if scrollbar arrows and thumb are transparent.
by Alexandre Julliard Sept. 1, 2022

Sept. 1, 2022

Module: wine Branch: master Commit: b9c882a127d2e71160295fc91aad09c90c179bc0 URL: https://gitlab.winehq.org/wine/wine/-/commit/b9c882a127d2e71160295fc91aad09… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 31 22:01:51 2022 +0800 uxtheme: Do not draw parent background even if scrollbar arrows and thumb are transparent. This is confirmed by the tests in test_scrollbar() and manual tests on XP. Even though scrollbar arrows and thumb are in fact transparent, DrawThemeParentBackground() is not called to paint the parent background, leaving the transparent area untouched. On Windows, even if the scrollbar arrows are reported to be transparent, the bitmaps for arrow parts in the stock themes are in fact opaque. Fix Ice Cream Calculator slow scrolling after 4cb229a because the WM_PRINTCLIENT handling in the application is slow. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53337 --- dlls/comctl32/tests/misc.c | 2 +- dlls/uxtheme/scrollbar.c | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 9f6eb611388..ac4c3abaf30 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -887,7 +887,7 @@ static void test_themed_background(void) {TRACKBAR_CLASSA, 0, wm_ctlcolorstatic_seq}, {WC_TREEVIEWA, 0, treeview_seq}, {UPDOWN_CLASSA, 0, empty_seq}, - {WC_SCROLLBARA, 0, scrollbar_seq, TRUE}, + {WC_SCROLLBARA, 0, scrollbar_seq}, {WC_SCROLLBARA, SBS_SIZEBOX, empty_seq}, {WC_SCROLLBARA, SBS_SIZEGRIP, empty_seq}, /* Scrollbars in non-client area */ diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index 1f1c61d74e1..d5735c5279a 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -138,14 +138,10 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect = *rect; partrect.bottom = partrect.top + arrowsize; - if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, uparrowstate)) - DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, uparrowstate, &partrect, NULL); partrect.bottom = rect->bottom; partrect.top = partrect.bottom - arrowsize; - if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, downarrowstate)) - DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, downarrowstate, &partrect, NULL); if (thumbpos > 0) { @@ -161,9 +157,6 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES if (thumbsize > 0) { partrect.top = rect->top + thumbpos; partrect.bottom = partrect.top + thumbsize; - - if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_THUMBBTNVERT, thumbstate)) - DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_THUMBBTNVERT, thumbstate, &partrect, NULL); if (SUCCEEDED(GetThemePartSize(theme, dc, SBP_GRIPPERVERT, thumbstate, NULL, TS_DRAW, &grippersize))) { @@ -217,14 +210,10 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect = *rect; partrect.right = partrect.left + arrowsize; - if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, leftarrowstate)) - DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, leftarrowstate, &partrect, NULL); partrect.right = rect->right; partrect.left = partrect.right - arrowsize; - if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_ARROWBTN, rightarrowstate)) - DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_ARROWBTN, rightarrowstate, &partrect, NULL); if (thumbpos > 0) { @@ -240,9 +229,6 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES if (thumbsize > 0) { partrect.left = rect->left + thumbpos; partrect.right = partrect.left + thumbsize; - - if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_THUMBBTNHORZ, thumbstate)) - DrawThemeParentBackground(hwnd, dc, &partrect); DrawThemeBackground(theme, dc, SBP_THUMBBTNHORZ, thumbstate, &partrect, NULL); if (SUCCEEDED(GetThemePartSize(theme, dc, SBP_GRIPPERHORZ, thumbstate, NULL, TS_DRAW, &grippersize))) {

1 0

Nikolay Sivov : dwrite: Handle variation selectors 17-256 in MapCharacters().
by Alexandre Julliard Sept. 1, 2022

Sept. 1, 2022

Module: wine Branch: master Commit: 5d9f0be0012a66cba70de79753b66058be362654 URL: https://gitlab.winehq.org/wine/wine/-/commit/5d9f0be0012a66cba70de79753b660… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Aug 31 23:34:08 2022 +0300 dwrite: Handle variation selectors 17-256 in MapCharacters(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 4 ++- dlls/dwrite/tests/layout.c | 71 +++++++++++++++++++++++++++++++++------------- 2 files changed, 54 insertions(+), 21 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index ab378cd7057..7e1da2e58ce 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -2374,6 +2374,8 @@ static inline BOOL fallback_is_uvs(const struct text_source_context *context) if (context->ch >= 0x180b && context->ch <= 0x180d) return TRUE; /* VARIATION SELECTOR-1..16 */ if (context->ch >= 0xfe00 && context->ch <= 0xfe0f) return TRUE; + /* VARIATION SELECTOR-17..256 */ + if (context->ch >= 0xe0100 && context->ch <= 0xe01ef) return TRUE; return FALSE; } @@ -2434,7 +2436,7 @@ static HRESULT fallback_map_characters(const struct dwrite_fontfallback *fallbac /* Find a mapping for given locale. */ text_source_get_next_u32_char(&context); mapping = find_fallback_mapping(data, locale, context.ch); - mapped = 1; + mapped = text_source_get_char_length(&context); while (!text_source_get_next_u32_char(&context)) { if (find_fallback_mapping(data, locale, context.ch) != mapping) break; diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index d69480dc83c..93ae62ff92c 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -4972,23 +4972,43 @@ static void get_font_name(IDWriteFont *font, WCHAR *name, UINT32 size) IDWriteFontFamily_Release(family); } +static void utf32_to_utf16(UINT32 C, WCHAR **ptr) +{ + if (C > 0xffff) + { + WCHAR X = (WCHAR)C; + UINT32 U = (C >> 16) & ((1 << 5) - 1); + WCHAR W = (WCHAR)U - 1; + + **ptr = 0xD800 | (W << 6) | X >> 10; *ptr += 1; + **ptr = (WCHAR)(0xDC00 | (X & ((1 << 10) - 1))); *ptr += 1; + } + else + { + **ptr = C; *ptr += 1; + } +} + static void test_MapCharacters(void) { static const WCHAR str2W[] = {'a',0x3058,'b',0}; - static const WCHAR variation_selectors[] = + static const UINT32 variation_selectors[] = { 0x180b, 0x180c, 0x180d, + 0xfe00, 0xfe01, 0xfe02, 0xfe03, 0xfe04, 0xfe05, 0xfe06, 0xfe07, 0xfe08, 0xfe09, 0xfe0a, 0xfe0b, 0xfe0c, 0xfe0d, 0xfe0e, 0xfe0f, + + 0xe0100, 0xe0121, 0xe01ef, }; IDWriteFontCollectionLoader *resource_collection_loader; IDWriteFontFileLoader *resource_loader; IDWriteFontCollection *collection; IDWriteLocalizedStrings *strings; + UINT32 mappedlength, vs_length; IDWriteFontFallback *fallback; IDWriteFactory2 *factory2; IDWriteFactory *factory; - UINT32 mappedlength; IDWriteFont *font; WCHAR buffW[50]; WCHAR name[64]; @@ -4996,6 +5016,7 @@ static void test_MapCharacters(void) HRSRC hrsrc; BOOL exists; FLOAT scale; + WCHAR *ptr; HRESULT hr; factory = create_factory(); @@ -5155,27 +5176,35 @@ static void test_MapCharacters(void) { g_source = buffW; + vs_length = variation_selectors[i] > 0xffff ? 2 : 1; + winetest_push_context("Test %#x", variation_selectors[i]); /* Selector within supported text. */ + font = NULL; - buffW[0] = buffW[2] = 'A'; - buffW[1] = variation_selectors[i]; - hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 3, collection, L"wine_test", + ptr = buffW; + + *ptr = 'A'; ptr++; + utf32_to_utf16(variation_selectors[i], &ptr); + *ptr = 'A'; + + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, vs_length + 1, collection, L"wine_test", DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(mappedlength == 3, "Unexpected mapped length %u.\n", mappedlength); + ok(mappedlength == vs_length + 1, "Unexpected mapped length %u.\n", mappedlength); get_font_name(font, name, ARRAY_SIZE(name)); ok(!wcscmp(name, L"wine_test"), "Unexpected font %s.\n", debugstr_w(name)); IDWriteFont_Release(font); /* Only selectors. */ font = NULL; - buffW[0] = variation_selectors[i]; - hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 1, collection, L"wine_test", + ptr = buffW; + utf32_to_utf16(variation_selectors[i], &ptr); + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, vs_length, collection, L"wine_test", DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(mappedlength == 1, "Unexpected mapped length %u.\n", mappedlength); + ok(mappedlength == vs_length, "Unexpected mapped length %u.\n", mappedlength); if (variation_selectors[i] < 0xfe00) { /* Mongolian selectors belong to Mongolian range, and are mapped to a specific font. */ @@ -5190,33 +5219,35 @@ static void test_MapCharacters(void) /* Leading selector. Only use VS-1..16 so we don't hit a valid mapping range. */ if (variation_selectors[i] >= 0xfe00) { - buffW[0] = variation_selectors[i]; - buffW[1] = variation_selectors[i]; - buffW[2] = 'A'; + ptr = buffW; + utf32_to_utf16(variation_selectors[i], &ptr); + utf32_to_utf16(variation_selectors[i], &ptr); + *ptr = 'A'; font = (void *)0xdeadbeef; - hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 3, collection, L"wine_test", + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, vs_length * 2 + 1, collection, L"wine_test", DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(mappedlength == 2, "Unexpected mapped length %u.\n", mappedlength); + ok(mappedlength == vs_length * 2, "Unexpected mapped length %u.\n", mappedlength); ok(!font, "Unexpected font instance.\n"); - hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 3, NULL, NULL, + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, vs_length * 2 + 1, NULL, NULL, DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(mappedlength == 2, "Unexpected mapped length %u.\n", mappedlength); + ok(mappedlength == vs_length * 2, "Unexpected mapped length %u.\n", mappedlength); ok(!font, "Unexpected font instance.\n"); } /* Trailing selector. */ - buffW[0] = 'A'; - buffW[1] = variation_selectors[i]; + ptr = buffW; + *ptr = 'A'; ptr++; + utf32_to_utf16(variation_selectors[i], &ptr); font = (void *)0xdeadbeef; - hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, 2, collection, L"wine_test", + hr = IDWriteFontFallback_MapCharacters(fallback, &analysissource, 0, vs_length + 1, collection, L"wine_test", DWRITE_FONT_WEIGHT_NORMAL, DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, &mappedlength, &font, &scale); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - ok(mappedlength == 2, "Unexpected mapped length %u.\n", mappedlength); + ok(mappedlength == vs_length + 1, "Unexpected mapped length %u.\n", mappedlength); get_font_name(font, name, ARRAY_SIZE(name)); ok(!wcscmp(name, L"wine_test"), "Unexpected font %s.\n", debugstr_w(name)); IDWriteFont_Release(font);

1 0

Zhiyi Zhang : uxtheme: Use the brush from WM_CTLCOLORSCROLLBAR to paint SB_CTL scrollbar tracks if present.
by Alexandre Julliard Sept. 1, 2022

Sept. 1, 2022

Module: wine Branch: master Commit: cf4c4d2f2553542e0509ba4d06265b127c79e061 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf4c4d2f2553542e0509ba4d06265b… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 31 21:56:41 2022 +0800 uxtheme: Use the brush from WM_CTLCOLORSCROLLBAR to paint SB_CTL scrollbar tracks if present. --- dlls/comctl32/tests/misc.c | 1 - dlls/uxtheme/scrollbar.c | 32 ++++++++++++++++++++------------ 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 61b2149a463..9f6eb611388 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -979,7 +979,6 @@ static void test_themed_background(void) ok(color != RGB(255, 0, 0), "Got unexpected color %#08lx.\n", color); color = GetPixel(hdc, 10, 60); - todo_wine ok(color == RGB(255, 0, 0) || broken(color == CLR_INVALID), /* Win7 on TestBots */ "Got unexpected color %#08lx.\n", color); } diff --git a/dlls/uxtheme/scrollbar.c b/dlls/uxtheme/scrollbar.c index 4ae1b2a8724..1f1c61d74e1 100644 --- a/dlls/uxtheme/scrollbar.c +++ b/dlls/uxtheme/scrollbar.c @@ -68,9 +68,13 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES DrawThemeBackground(theme, dc, SBP_SIZEBOX, state, rect, NULL); } else { int uppertrackstate, lowertrackstate, thumbstate; + HBRUSH track_brush = NULL; RECT partrect; SIZE grippersize; + if (bar == SB_CTL) + track_brush = (HBRUSH)SendMessageW(GetParent(hwnd), WM_CTLCOLORSCROLLBAR, (WPARAM)dc, (LPARAM)hwnd); + if (disabled) { uppertrackstate = SCRBS_DISABLED; lowertrackstate = SCRBS_DISABLED; @@ -148,9 +152,10 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect.top = rect->top + arrowsize; partrect.bottom = rect->top + thumbpos; - if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_UPPERTRACKVERT, uppertrackstate)) - DrawThemeParentBackground(hwnd, dc, &partrect); - DrawThemeBackground(theme, dc, SBP_UPPERTRACKVERT, uppertrackstate, &partrect, NULL); + if (bar == SB_CTL && track_brush) + FillRect(dc, &partrect, track_brush); + else + DrawThemeBackground(theme, dc, SBP_UPPERTRACKVERT, uppertrackstate, &partrect, NULL); } if (thumbsize > 0) { @@ -178,9 +183,10 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect.top = rect->top + arrowsize; if (partrect.bottom > partrect.top) { - if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_LOWERTRACKVERT, lowertrackstate)) - DrawThemeParentBackground(hwnd, dc, &partrect); - DrawThemeBackground(theme, dc, SBP_LOWERTRACKVERT, lowertrackstate, &partrect, NULL); + if (bar == SB_CTL && track_brush) + FillRect(dc, &partrect, track_brush); + else + DrawThemeBackground(theme, dc, SBP_LOWERTRACKVERT, lowertrackstate, &partrect, NULL); } } else { int leftarrowstate, rightarrowstate; @@ -225,9 +231,10 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect.left = rect->left + arrowsize; partrect.right = rect->left + thumbpos; - if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_UPPERTRACKHORZ, uppertrackstate)) - DrawThemeParentBackground(hwnd, dc, &partrect); - DrawThemeBackground(theme, dc, SBP_UPPERTRACKHORZ, uppertrackstate, &partrect, NULL); + if (bar == SB_CTL && track_brush) + FillRect(dc, &partrect, track_brush); + else + DrawThemeBackground(theme, dc, SBP_UPPERTRACKHORZ, uppertrackstate, &partrect, NULL); } if (thumbsize > 0) { @@ -255,9 +262,10 @@ void WINAPI UXTHEME_ScrollBarDraw(HWND hwnd, HDC dc, INT bar, enum SCROLL_HITTES partrect.left = rect->left + arrowsize; if (partrect.right > partrect.left) { - if (bar == SB_CTL && IsThemeBackgroundPartiallyTransparent(theme, SBP_LOWERTRACKHORZ, lowertrackstate)) - DrawThemeParentBackground(hwnd, dc, &partrect); - DrawThemeBackground(theme, dc, SBP_LOWERTRACKHORZ, lowertrackstate, &partrect, NULL); + if (bar == SB_CTL && track_brush) + FillRect(dc, &partrect, track_brush); + else + DrawThemeBackground(theme, dc, SBP_LOWERTRACKHORZ, lowertrackstate, &partrect, NULL); } } }

1 0

Zhiyi Zhang : uxtheme/tests: Add theme tests.
by Alexandre Julliard Sept. 1, 2022

Sept. 1, 2022

Module: wine Branch: master Commit: b710458069674d89f66765ee9477d8d3d0a01988 URL: https://gitlab.winehq.org/wine/wine/-/commit/b710458069674d89f66765ee9477d8… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 31 21:40:30 2022 +0800 uxtheme/tests: Add theme tests. --- dlls/uxtheme/tests/system.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c index debc712a73c..a90c512091f 100644 --- a/dlls/uxtheme/tests/system.c +++ b/dlls/uxtheme/tests/system.c @@ -2550,6 +2550,50 @@ static void test_GetThemeBackgroundRegion(void) DestroyWindow(hwnd); } +static void test_theme(void) +{ + BOOL transparent; + HTHEME htheme; + HRESULT hr; + HWND hwnd; + + if (!IsThemeActive()) + { + skip("Theming is inactive.\n"); + return; + } + + hwnd = CreateWindowA(WC_STATICA, "", WS_POPUP, 0, 0, 1, 1, 0, 0, 0, NULL); + ok(!!hwnd, "CreateWindowA failed, error %#lx.\n", GetLastError()); + + /* Test that scrollbar arrow parts are transparent */ + htheme = OpenThemeData(hwnd, L"ScrollBar"); + ok(!!htheme, "OpenThemeData failed.\n"); + + transparent = FALSE; + hr = GetThemeBool(htheme, SBP_ARROWBTN, 0, TMT_TRANSPARENT, &transparent); + /* XP does use opaque scrollbar arrow parts and TMT_TRANSPARENT is FALSE */ + if (LOBYTE(LOWORD(GetVersion())) < 6) + { + ok(hr == E_PROP_ID_UNSUPPORTED, "Got unexpected hr %#lx.\n", hr); + + transparent = IsThemeBackgroundPartiallyTransparent(htheme, SBP_ARROWBTN, 0); + ok(!transparent, "Expected opaque.\n"); + } + /* > XP use opaque scrollbar arrow parts, but TMT_TRANSPARENT is TRUE */ + else + { + ok(hr == S_OK, "Got unexpected hr %#lx,\n", hr); + ok(transparent, "Expected transparent.\n"); + + transparent = IsThemeBackgroundPartiallyTransparent(htheme, SBP_ARROWBTN, 0); + ok(transparent, "Expected transparent.\n"); + } + CloseThemeData(htheme); + + DestroyWindow(hwnd); +} + START_TEST(system) { ULONG_PTR ctx_cookie; @@ -2574,6 +2618,7 @@ START_TEST(system) test_DrawThemeParentBackground(); test_DrawThemeBackgroundEx(); test_GetThemeBackgroundRegion(); + test_theme(); if (load_v6_module(&ctx_cookie, &ctx)) {

1 0

Zhiyi Zhang : comctl32/tests: Add themed scrollbar background tests.
by Alexandre Julliard Sept. 1, 2022

Sept. 1, 2022

Module: wine Branch: master Commit: 69a0acb536a1f4a00f29940329e37d96612f0e4a URL: https://gitlab.winehq.org/wine/wine/-/commit/69a0acb536a1f4a00f29940329e37d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Thu Sep 1 12:35:46 2022 +0800 comctl32/tests: Add themed scrollbar background tests. --- dlls/comctl32/tests/misc.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index 737778a836d..61b2149a463 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -890,6 +890,9 @@ static void test_themed_background(void) {WC_SCROLLBARA, 0, scrollbar_seq, TRUE}, {WC_SCROLLBARA, SBS_SIZEBOX, empty_seq}, {WC_SCROLLBARA, SBS_SIZEGRIP, empty_seq}, + /* Scrollbars in non-client area */ + {"ChildClass", WS_HSCROLL, empty_seq}, + {"ChildClass", WS_VSCROLL, empty_seq}, }; uxtheme = LoadLibraryA("uxtheme.dll"); @@ -915,7 +918,11 @@ static void test_themed_background(void) cls.lpszClassName = "ParentClass"; RegisterClassA(&cls); - parent = CreateWindowA(cls.lpszClassName, "parent", WS_POPUP | WS_VISIBLE, 100, 100, 100, 100, + cls.lpfnWndProc = DefWindowProcA; + cls.lpszClassName = "ChildClass"; + RegisterClassA(&cls); + + parent = CreateWindowA("ParentClass", "parent", WS_POPUP | WS_VISIBLE, 100, 100, 100, 100, 0, 0, 0, 0); ok(parent != NULL, "CreateWindowA failed, error %lu.\n", GetLastError()); @@ -924,7 +931,7 @@ static void test_themed_background(void) winetest_push_context("%s %#lx", tests[i].class_name, tests[i].style); child = CreateWindowA(tests[i].class_name, " ", WS_CHILD | WS_VISIBLE | tests[i].style, - 0, 0, 50, 50, parent, 0, 0, 0); + 0, 0, 50, 100, parent, 0, 0, 0); ok(child != NULL, "CreateWindowA failed, error %lu.\n", GetLastError()); flush_events(); flush_sequences(sequences, NUM_MSG_SEQUENCES); @@ -965,6 +972,17 @@ static void test_themed_background(void) color = GetPixel(hdc, 10, 10); ok(color == 0x808080, "Expected color %#x, got %#lx.\n", 0x808080, color); } + else if (tests[i].seq == scrollbar_seq) + { + /* WM_CTLCOLORSCROLLBAR is used to fill tracks only */ + color = GetPixel(hdc, 10, 10); + ok(color != RGB(255, 0, 0), "Got unexpected color %#08lx.\n", color); + + color = GetPixel(hdc, 10, 60); + todo_wine + ok(color == RGB(255, 0, 0) || broken(color == CLR_INVALID), /* Win7 on TestBots */ + "Got unexpected color %#08lx.\n", color); + } ReleaseDC(child, hdc); } @@ -974,7 +992,8 @@ static void test_themed_background(void) } DestroyWindow(parent); - UnregisterClassA(cls.lpszClassName, GetModuleHandleA(0)); + UnregisterClassA("ChildClass", GetModuleHandleA(0)); + UnregisterClassA("ParentClass", GetModuleHandleA(0)); if (pSetThreadDpiAwarenessContext) pSetThreadDpiAwarenessContext(old_context); }

1 0

Alexandre Julliard : shell32: Fix sharing modes when loading/saving link files.
by Alexandre Julliard Sept. 1, 2022

Sept. 1, 2022

Module: wine Branch: master Commit: f49a30167a945062e197dcbd8848c9f46ef3da26 URL: https://gitlab.winehq.org/wine/wine/-/commit/f49a30167a945062e197dcbd8848c9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 15:59:41 2022 +0200 shell32: Fix sharing modes when loading/saving link files. --- dlls/shell32/shelllink.c | 5 ++--- dlls/shell32/tests/shelllink.c | 49 +++++++++++++++++++++++++++++++++++++++--- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 042b3bf5829..2827b700372 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -277,8 +277,7 @@ static HRESULT WINAPI IPersistFile_fnLoad(IPersistFile* iface, LPCOLESTR pszFile TRACE("(%p, %s, %lx)\n",This, debugstr_w(pszFileName), dwMode); - if( dwMode == 0 ) - dwMode = STGM_READ | STGM_SHARE_DENY_WRITE; + if( dwMode == 0 ) dwMode = STGM_READ; r = SHCreateStreamOnFileW(pszFileName, dwMode, &stm); if( SUCCEEDED( r ) ) { @@ -371,7 +370,7 @@ static HRESULT WINAPI IPersistFile_fnSave(IPersistFile* iface, LPCOLESTR pszFile fRemember = FALSE; } - r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_EXCLUSIVE, &stm ); + r = SHCreateStreamOnFileW( pszFileName, STGM_READWRITE | STGM_CREATE | STGM_SHARE_DENY_WRITE, &stm ); if( SUCCEEDED( r ) ) { r = IPersistStream_Save(StreamThis, stm, FALSE); diff --git a/dlls/shell32/tests/shelllink.c b/dlls/shell32/tests/shelllink.c index 345484d9a5d..e7cc3c51aba 100644 --- a/dlls/shell32/tests/shelllink.c +++ b/dlls/shell32/tests/shelllink.c @@ -26,6 +26,7 @@ #include "shlguid.h" #include "shobjidl.h" #include "shlobj.h" +#include "shlwapi.h" #include "shellapi.h" #include "commoncontrols.h" @@ -619,6 +620,9 @@ static void test_load_save(void) char mypath[MAX_PATH]; char mydir[MAX_PATH]; char realpath[MAX_PATH]; + IPersistFile *pf; + IShellLinkA *sl; + IStream *stm; char* p; HANDLE hf; DWORD r; @@ -809,13 +813,52 @@ static void test_load_save(void) r = DeleteFileA(realpath); ok(r, "failed to delete file %s (%ld)\n", realpath, GetLastError()); + /* test sharing modes */ + r = CoCreateInstance(&CLSID_ShellLink, NULL, CLSCTX_INPROC_SERVER, &IID_IShellLinkA, (LPVOID*)&sl); + ok( r == S_OK, "no IID_IShellLinkA (0x%08lx)\n", r ); + r = IShellLinkA_QueryInterface(sl, &IID_IPersistFile, (void**)&pf); + ok( r == S_OK, "no IID_IPersistFile (0x%08lx)\n", r ); + + r = SHCreateStreamOnFileW(lnkfile, STGM_READ, &stm); + ok( !r, "SHCreateStreamOnFileW failed %lx\n", r ); + r = IPersistFile_Save(pf, lnkfile, FALSE); + ok(r == S_OK, "IPersistFile_Save failed (0x%08lx)\n", r); + r = IPersistFile_Load(pf, lnkfile, 0); + ok(r == S_OK, "IPersistFile_Load failed (0x%08lx)\n", r); + IStream_Release( stm ); + + r = SHCreateStreamOnFileW(lnkfile, STGM_READ | STGM_SHARE_DENY_WRITE, &stm); + ok( r == S_OK, "SHCreateStreamOnFileW failed %lx\n", r ); + r = IPersistFile_Save(pf, lnkfile, FALSE); + ok( r == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "IPersistFile_Save failed (0x%08lx)\n", r ); + r = IPersistFile_Load(pf, lnkfile, 0); + ok(r == S_OK, "IPersistFile_Load failed (0x%08lx)\n", r); + IStream_Release( stm ); + + r = SHCreateStreamOnFileW(lnkfile, STGM_READWRITE | STGM_SHARE_DENY_WRITE, &stm); + ok( r == S_OK, "SHCreateStreamOnFileW failed %lx\n", r ); + r = IPersistFile_Save(pf, lnkfile, FALSE); + ok( r == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "IPersistFile_Save failed (0x%08lx)\n", r ); + r = IPersistFile_Load(pf, lnkfile, 0); + ok(r == S_OK, "IPersistFile_Load failed (0x%08lx)\n", r); + IStream_Release( stm ); + + r = SHCreateStreamOnFileW(lnkfile, STGM_READWRITE | STGM_SHARE_EXCLUSIVE, &stm); + ok( r == S_OK, "SHCreateStreamOnFileW failed %lx\n", r ); + r = IPersistFile_Save(pf, lnkfile, FALSE); + ok( r == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "IPersistFile_Save failed (0x%08lx)\n", r ); + r = IPersistFile_Load(pf, lnkfile, 0); + ok( r == HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION), "IPersistFile_Load failed (0x%08lx)\n", r ); + IStream_Release( stm ); + + IShellLinkA_Release( sl ); + IPersistFile_Release( pf ); + /* FIXME: Also test saving a .lnk pointing to a pidl that cannot be * represented as a path. */ - /* DeleteFileW is not implemented on Win9x */ - r=DeleteFileA(lnkfileA); - ok(r, "failed to delete link '%s' (%ld)\n", lnkfileA, GetLastError()); + DeleteFileW(lnkfile); } static void test_datalink(void)

1 0

Alexandre Julliard : kernel32/tests: Don't assume that notifications are instantaneous.
by Alexandre Julliard Sept. 1, 2022

Sept. 1, 2022

Module: wine Branch: master Commit: 7c7e7e916309c229cff9b83394a7473f07251db4 URL: https://gitlab.winehq.org/wine/wine/-/commit/7c7e7e916309c229cff9b83394a747… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 1 11:58:18 2022 +0200 kernel32/tests: Don't assume that notifications are instantaneous. --- dlls/kernel32/tests/change.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/kernel32/tests/change.c b/dlls/kernel32/tests/change.c index 609cf30bcfa..15d5a4e0fe6 100644 --- a/dlls/kernel32/tests/change.c +++ b/dlls/kernel32/tests/change.c @@ -290,7 +290,7 @@ static void test_ffcn(void) ok( file != INVALID_HANDLE_VALUE, "CreateFile error %lu\n", GetLastError() ); CloseHandle(file); - r = WaitForSingleObject( handle, 0 ); + r = WaitForSingleObject( handle, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n"); r = WaitForSingleObject( handle, 0 ); @@ -305,7 +305,7 @@ static void test_ffcn(void) r = DeleteFileW( filename ); ok( r == TRUE, "failed to remove file\n"); - r = WaitForSingleObject( handle, 0 ); + r = WaitForSingleObject( handle, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n"); r = WaitForSingleObject( handle, 0 ); @@ -320,7 +320,7 @@ static void test_ffcn(void) r = CreateDirectoryW( subdir, NULL ); ok( r == TRUE, "failed to create subdir\n"); - r = WaitForSingleObject( handle, 0 ); + r = WaitForSingleObject( handle, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n"); r = WaitForSingleObject( handle, 0 ); @@ -335,7 +335,7 @@ static void test_ffcn(void) r = RemoveDirectoryW( subdir ); ok( r == TRUE, "failed to remove subdir\n"); - r = WaitForSingleObject( handle, 0 ); + r = WaitForSingleObject( handle, 1000 ); ok( r == WAIT_OBJECT_0, "should be ready\n"); r = WaitForSingleObject( handle, 0 );

1 0