From: Zhiyi Zhang zzhang@codeweavers.com
Comctl32 v6 erases the background when TBSTYLE_TRANSPARENT is present when handling WM_PAINT, not when handling WM_ERASEBKGND. WxWidgets relies on this behavior to draw the toolbar background. Please see https://github.com/wxWidgets/wxWidgets/blob/v2.9.4/src/msw/toolbar.cpp#L1805.
Fix tlReader 10.1.0.2004 toolbar broken rendering after 5e70fef5. After the commit, the comctl32 v6 version is properly reported and wxWidgets decides to use a comctl32 v6 specific code path.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58800 --- dlls/comctl32/tests/toolbar.c | 3 +-- dlls/comctl32/toolbar.c | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index b3e8efd1759..eed70df2a64 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -3021,7 +3021,6 @@ static void test_WM_ERASEBKGND(BOOL v6) ok(lr == 1, "Got unexpected %Id.\n", lr); color = GetPixel(hdc, 10, 10); if (v6) - todo_wine ok(color == RGB(255, 0, 0), "Got unexpected color %#lx.\n", color); else ok(color == GetSysColor(COLOR_WINDOW), "Got unexpected color %#lx.\n", color); @@ -3092,7 +3091,7 @@ static void test_WM_PAINT(BOOL v6) flush_events(); if (v6) ok_sequence(sequences, PARENT_SEQ_INDEX, wm_paint_transparent_parent_v6_seq, - "WM_PAINT with TBSTYLE_TRANSPARENT v6", TRUE); + "WM_PAINT with TBSTYLE_TRANSPARENT v6", FALSE); else ok_sequence(sequences, PARENT_SEQ_INDEX, wm_paint_transparent_parent_v5_seq, "WM_PAINT with TBSTYLE_TRANSPARENT v5", FALSE); diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 64d09cb0b62..df4a6e73415 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -233,6 +233,7 @@ typedef enum #define GETHOTIMAGELIST(infoPtr, id) TOOLBAR_GetImageList(infoPtr->himlHot, infoPtr->cimlHot, id) #define GETDISIMAGELIST(infoPtr, id) TOOLBAR_GetImageList(infoPtr->himlDis, infoPtr->cimlDis, id)
+static LRESULT TOOLBAR_DoEraseBackground(TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam); static BOOL TOOLBAR_GetButtonInfo(const TOOLBAR_INFO *infoPtr, NMTOOLBARW *nmtb); static BOOL TOOLBAR_IsButtonRemovable(const TOOLBAR_INFO *infoPtr, int iItem, const CUSTOMBUTTON *btnInfo); static HIMAGELIST TOOLBAR_GetImageList(const PIMLENTRY *pies, INT cies, INT id); @@ -1188,6 +1189,13 @@ TOOLBAR_Refresh (TOOLBAR_INFO *infoPtr, HDC hdc, const PAINTSTRUCT *ps) if (!infoPtr->bDoRedraw) return;
+ /* Comctl32 v6 erases the background when TBSTYLE_TRANSPARENT is present when handling WM_PAINT, + * not when handling WM_ERASEBKGND */ +#if __WINE_COMCTL32_VERSION == 6 + if (infoPtr->dwStyle & TBSTYLE_TRANSPARENT) + TOOLBAR_DoEraseBackground(infoPtr, (WPARAM)hdc, 0); +#endif + /* if imagelist belongs to the app, it can be changed by the app after setting it */ if (GETDEFIMAGELIST(infoPtr, 0) != infoPtr->himlInt) @@ -5393,7 +5401,7 @@ TOOLBAR_Destroy (TOOLBAR_INFO *infoPtr)
static LRESULT -TOOLBAR_EraseBackground (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +TOOLBAR_DoEraseBackground (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) { NMTBCUSTOMDRAW tbcd; INT ret = FALSE; @@ -5463,6 +5471,18 @@ TOOLBAR_EraseBackground (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) return ret; }
+static LRESULT +TOOLBAR_EraseBackground (TOOLBAR_INFO *infoPtr, WPARAM wParam, LPARAM lParam) +{ + /* In comctl32 v6, erasing the background when TBSTYLE_TRANSPARENT is present is done in the + * WM_PAINT handler, not WM_ERASEBKGND */ +#if __WINE_COMCTL32_VERSION == 6 + if (infoPtr->dwStyle & TBSTYLE_TRANSPARENT) + return TRUE; +#endif + + return TOOLBAR_DoEraseBackground(infoPtr, wParam, lParam); +}
static inline LRESULT TOOLBAR_GetFont (const TOOLBAR_INFO *infoPtr)