user32: Send the correct WM_CTLCOLOR* message in button WM_SETTEXT handler.

Signed-off-by: Sebastian Lackner <sebastian@fds-team.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org> (cherry picked from commit 35ab5f44) Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>

user32: Send the correct WM_CTLCOLOR* message in button WM_SETTEXT handler.
3cf5d768 · Alexander Lakhin · Michael Stefaniuc · 87fb7048 · 3cf5d768
Commit 3cf5d768 authored Apr 19, 2016 by Alexander Lakhin Committed by Michael Stefaniuc Jun 02, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

button.c dlls/user32/button.c +9 -4

No files found.
--- a/dlls/user32/button.c
+++ b/dlls/user32/button.c
@@ -389,13 +389,18 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
        HBRUSH hbrush;
        RECT client, rc;
        HWND parent = GetParent(hWnd);
+        UINT message = (btn_type == BS_PUSHBUTTON ||
+                        btn_type == BS_DEFPUSHBUTTON ||
+                        btn_type == BS_USERBUTTON ||
+                        btn_type == BS_OWNERDRAW) ?
+                        WM_CTLCOLORBTN : WM_CTLCOLORSTATIC;

        if (!parent) parent = hWnd;
-        hbrush = (HBRUSH)SendMessageW(parent, WM_CTLCOLORSTATIC,
-				      (WPARAM)hdc, (LPARAM)hWnd);
+        hbrush = (HBRUSH)SendMessageW(parent, message,
+                                      (WPARAM)hdc, (LPARAM)hWnd);
        if (!hbrush) /* did the app forget to call DefWindowProc ? */
-            hbrush = (HBRUSH)DefWindowProcW(parent, WM_CTLCOLORSTATIC,
-					    (WPARAM)hdc, (LPARAM)hWnd);
+            hbrush = (HBRUSH)DefWindowProcW(parent, message,
+                                            (WPARAM)hdc, (LPARAM)hWnd);

        GetClientRect(hWnd, &client);
        rc = client;