[PATCH v10 4/4] user32: Send parent BN_CLICKED notification when a radio button get focused.

[Fabian Maurer]

From: Fabian Maurer

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=56109
---
 dlls/user32/button.c    | 9 +++++++--
 dlls/user32/tests/msg.c | 8 ++++----
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/dlls/user32/button.c b/dlls/user32/button.c
index 61e34f99246..ab6787899cb 100644
--- a/dlls/user32/button.c
+++ b/dlls/user32/button.c
@@ -25,7 +25,6 @@
  *
  *  Messages
  *  - WM_CHAR: Checks a (manual or automatic) check box on '+' or '=', clears it on '-' key.
- *  - WM_SETFOCUS: For (manual or automatic) radio buttons, send the parent window BN_CLICKED
  *  - WM_NCCREATE: Turns any BS_OWNERDRAW button into a BS_PUSHBUTTON button.
  *  - WM_SYSKEYUP
  *  
@@ -257,8 +256,8 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
         /* fall through */
     case WM_LBUTTONDOWN:
         NtUserSetCapture( hWnd );
-        NtUserSetFocus( hWnd );
         set_button_state( hWnd, get_button_state( hWnd ) | BUTTON_BTNPRESSED );
+        NtUserSetFocus( hWnd );
         SendMessageW( hWnd, BM_SETSTATE, TRUE, 0 );
         break;

@@ -381,6 +380,12 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam,
         paint_button( hWnd, btn_type, ODA_FOCUS );
         if (style & BS_NOTIFY)
             BUTTON_NOTIFY_PARENT(hWnd, BN_SETFOCUS);
+
+        if (((btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON)) &&
+            !(get_button_state(hWnd) & (BST_CHECKED | BUTTON_BTNPRESSED)))
+        {
+            BUTTON_NOTIFY_PARENT(hWnd, BN_CLICKED);
+        }
         break;

case WM_KILLFOCUS:
diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index 9b0dab69196..becf6a164b4 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -20575,7 +20575,7 @@ static void test_radiobutton_focus(void)
         flush_sequence();
         SendMessageA(button, WM_SETFOCUS, 0, 0);
         flush_events();
-        ok_sequence(set_focus_default_seq, "WM_SETFOCUS on default radiobutton", TRUE);
+        ok_sequence(set_focus_default_seq, "WM_SETFOCUS on default radiobutton", FALSE);
         DestroyWindow(button);

/* Test already checked button */
@@ -20596,7 +20596,7 @@ static void test_radiobutton_focus(void)
         flush_sequence();
         SendMessageA(button, WM_SETFOCUS, 0, 0);
         flush_events();
-        ok_sequence(set_focus_default_seq, "WM_SETFOCUS on focused radiobutton", TRUE);
+        ok_sequence(set_focus_default_seq, "WM_SETFOCUS on focused radiobutton", FALSE);
         DestroyWindow(button);

/* Test WM_LBUTTONDOWN */
@@ -20615,7 +20615,7 @@ static void test_radiobutton_focus(void)
         flush_sequence();
         SendMessageA(button, WM_SETFOCUS, 0, 0);
         flush_events();
-        ok_sequence(set_focus_without_notify_seq, "WM_SETFOCUS on radiobutton without BS_NOTIFY", TRUE);
+        ok_sequence(set_focus_without_notify_seq, "WM_SETFOCUS on radiobutton without BS_NOTIFY", FALSE);
         DestroyWindow(button);

/* Test disabled button */
@@ -20626,7 +20626,7 @@ static void test_radiobutton_focus(void)
         flush_sequence();
         SendMessageA(button, WM_SETFOCUS, 0, 0);
         flush_events();
-        ok_sequence(set_focus_default_seq, "WM_SETFOCUS on disabled radiobutton", TRUE);
+        ok_sequence(set_focus_default_seq, "WM_SETFOCUS on disabled radiobutton", FALSE);
         DestroyWindow(button);
     }