[PATCH 0/2] MR6113: comctl32/tests: Add more treeview background tests.
From: Zhiyi Zhang <zzhang(a)codeweavers.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56861 --- dlls/comctl32/tests/Makefile.in | 2 +- dlls/comctl32/tests/misc.c | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/Makefile.in b/dlls/comctl32/tests/Makefile.in index c9b0d5c578f..0c96203a2f6 100644 --- a/dlls/comctl32/tests/Makefile.in +++ b/dlls/comctl32/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = comctl32.dll -IMPORTS = ole32 user32 gdi32 advapi32 imm32 +IMPORTS = ole32 user32 gdi32 advapi32 imm32 uxtheme SOURCES = \ animate.c \ diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index ff6336f31af..ed31dfb8719 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -21,6 +21,7 @@ #include <stdio.h> #include <windows.h> #include <commctrl.h> +#include <uxtheme.h> #include "wine/test.h" #include "v6util.h" @@ -829,6 +830,7 @@ static void test_themed_background(void) HMODULE uxtheme; COLORREF color; WNDCLASSA cls; + HRESULT hr; HDC hdc; int i; @@ -838,6 +840,7 @@ static void test_themed_background(void) DWORD style; const struct message *seq; BOOL todo; + const WCHAR *window_theme; } tests[] = { @@ -886,6 +889,8 @@ static void test_themed_background(void) {TOOLTIPS_CLASSA, 0, empty_seq}, {TRACKBAR_CLASSA, 0, wm_ctlcolorstatic_seq}, {WC_TREEVIEWA, 0, treeview_seq}, + {WC_TREEVIEWA, TVS_HASBUTTONS, treeview_seq}, + {WC_TREEVIEWA, TVS_HASBUTTONS, treeview_seq, TRUE, L"explorer"}, {UPDOWN_CLASSA, 0, empty_seq}, {WC_SCROLLBARA, 0, scrollbar_seq}, {WC_SCROLLBARA, SBS_SIZEBOX, empty_seq}, @@ -933,12 +938,30 @@ static void test_themed_background(void) child = CreateWindowA(tests[i].class_name, " ", WS_CHILD | WS_VISIBLE | tests[i].style, 0, 0, 50, 100, parent, 0, 0, 0); ok(child != NULL, "CreateWindowA failed, error %lu.\n", GetLastError()); + + /* Extra preparations */ + if (tests[i].window_theme) + { + hr = SetWindowTheme(child, tests[i].window_theme, NULL); + ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + } + flush_events(); flush_sequences(sequences, NUM_MSG_SEQUENCES); RedrawWindow(child, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_UPDATENOW | RDW_ERASENOW | RDW_FRAME); ok_sequence(sequences, PARENT_SEQ_INDEX, tests[i].seq, "paint background", tests[i].todo); + /* Extra background tests */ + if (!lstrcmpA(tests[i].class_name, WC_TREEVIEWA)) + { + hdc = GetDC(child); + color = GetPixel(hdc, 40, 40); + todo_wine_if(tests[i].window_theme && !lstrcmpW(tests[i].window_theme, L"explorer")) + ok(color == 0xffffff, "Expected color %#x, got %#lx.\n", 0xffffff, color); + ReleaseDC(child, hdc); + } + /* For message sequences that contain both DrawThemeParentBackground() messages and * WM_CTLCOLOR*, do a color test to check which is really in effect for controls that can be * tested automatically. For WM_ERASEBKGND from DrawThemeParentBackground(), a red brush is -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6113
From: Zhiyi Zhang <zzhang(a)codeweavers.com> Tests show that DrawThemeParentBackground() is not used to draw the background when the plus/minus signs are transparent. Fix Becky email client having incorrect background for its folder tree view. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56861 --- dlls/comctl32/tests/misc.c | 3 +-- dlls/comctl32/treeview.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index ed31dfb8719..bb3f1993a83 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -890,7 +890,7 @@ static void test_themed_background(void) {TRACKBAR_CLASSA, 0, wm_ctlcolorstatic_seq}, {WC_TREEVIEWA, 0, treeview_seq}, {WC_TREEVIEWA, TVS_HASBUTTONS, treeview_seq}, - {WC_TREEVIEWA, TVS_HASBUTTONS, treeview_seq, TRUE, L"explorer"}, + {WC_TREEVIEWA, TVS_HASBUTTONS, treeview_seq, FALSE, L"explorer"}, {UPDOWN_CLASSA, 0, empty_seq}, {WC_SCROLLBARA, 0, scrollbar_seq}, {WC_SCROLLBARA, SBS_SIZEBOX, empty_seq}, @@ -957,7 +957,6 @@ static void test_themed_background(void) { hdc = GetDC(child); color = GetPixel(hdc, 40, 40); - todo_wine_if(tests[i].window_theme && !lstrcmpW(tests[i].window_theme, L"explorer")) ok(color == 0xffffff, "Expected color %#x, got %#lx.\n", 0xffffff, color); ReleaseDC(child, hdc); } diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 036afd15c69..e2a4280f131 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -2918,7 +2918,7 @@ TREEVIEW_Refresh(TREEVIEW_INFO *infoPtr, HDC hdc, const RECT *rc) if (infoPtr->dwStyle & TVS_HASBUTTONS && (theme = GetWindowTheme(infoPtr->hwnd))) { if (IsThemeBackgroundPartiallyTransparent(theme, TVP_GLYPH, 0)) - DrawThemeParentBackground(infoPtr->hwnd, hdc, NULL); + FillRect(hdc, &rect, (HBRUSH)(COLOR_WINDOW + 1)); } for (item = infoPtr->root->firstChild; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/6113
This merge request was approved by Nikolay Sivov. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/6113
participants (3)
-
Nikolay Sivov (＠nsivov) -
Zhiyi Zhang
-
Zhiyi Zhang (＠zhiyi)