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

[Fabian Maurer]

From: Fabian Maurer

We need to make sure here that the button is marked pressed before
it gets the focus.

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

diff --git a/dlls/comctl32/button.c b/dlls/comctl32/button.c
index 11a9760e3e2..a0eb41fec20 100644
--- a/dlls/comctl32/button.c
+++ b/dlls/comctl32/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
  *
@@ -628,15 +627,18 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L
         }
         /* fall through */
     case WM_LBUTTONDOWN:
+        infoPtr->state |= BUTTON_BTNPRESSED;
         SetFocus( hWnd );

if ((btn_type == BS_SPLITBUTTON || btn_type == BS_DEFSPLITBUTTON) &&
             !(infoPtr->split_style & BCSS_NOSPLIT) &&
             notify_split_button_dropdown(infoPtr, &pt, hWnd))
+        {
+            infoPtr->state &= ~BUTTON_BTNPRESSED;
             break;
+        }

SetCapture( hWnd );
-        infoPtr->state |= BUTTON_BTNPRESSED;
         SendMessageW( hWnd, BM_SETSTATE, TRUE, 0 );
         break;

@@ -867,6 +869,12 @@ static LRESULT CALLBACK BUTTON_WindowProc(HWND hWnd, UINT uMsg, WPARAM wParam, L

if (style & BS_NOTIFY)
             BUTTON_NOTIFY_PARENT(hWnd, BN_SETFOCUS);
+
+        if (((btn_type == BS_RADIOBUTTON) || (btn_type == BS_AUTORADIOBUTTON)) &&
+            !(infoPtr->state & (BST_CHECKED | BUTTON_BTNPRESSED)))
+        {
+            BUTTON_NOTIFY_PARENT(hWnd, BN_CLICKED);
+        }
         break;

case WM_KILLFOCUS:
diff --git a/dlls/comctl32/tests/button.c b/dlls/comctl32/tests/button.c
index 9cfbe1b8646..676062f0132 100644
--- a/dlls/comctl32/tests/button.c
+++ b/dlls/comctl32/tests/button.c
@@ -2523,7 +2523,7 @@ static void test_radiobutton_focus(void)
         flush_sequences(sequences, NUM_MSG_SEQUENCES);
         SendMessageA(button, WM_SETFOCUS, 0, 0);
         flush_events();
-        ok_sequence(sequences, COMBINED_SEQ_INDEX, set_focus_default_seq, "WM_SETFOCUS on default radiobutton", TRUE);
+        ok_sequence(sequences, COMBINED_SEQ_INDEX, set_focus_default_seq, "WM_SETFOCUS on default radiobutton", FALSE);
         DestroyWindow(button);

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

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

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