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

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 35ab5f4499185f8df0504b95a99613fa4e30440a
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=35ab5f4499185f8df0504b95a9...

Author: Alexander Lakhin <exclusion(a)gmail.com>
Date:   Tue Apr 19 22:14:49 2016 +0200

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

Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/user32/button.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/dlls/user32/button.c b/dlls/user32/button.c
index 9c52147..efd74f9 100644
--- 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;