[PATCH 8/8] user32: Send WM_NCACTIVATE on SetForegroundWindow call.

[Rémi Bernon]

When window is already active but has lost foreground, as shown by
concurrent SetForegroundWindow tests.

Signed-off-by: Rémi Bernon <rbernon at codeweavers.com>
---
 dlls/user32/focus.c     |  4 ++++
 dlls/user32/tests/win.c | 14 +++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dlls/user32/focus.c b/dlls/user32/focus.c
index cab557eb3a3..cc2714658b3 100644
--- a/dlls/user32/focus.c
+++ b/dlls/user32/focus.c
@@ -207,6 +207,10 @@ static BOOL set_foreground_window( HWND hwnd, BOOL mouse )
         else if (send_msg_new)  /* old window belongs to us but new one to other thread */
             ret = set_active_window( 0, NULL, mouse, TRUE, FALSE );
 
+        /* already active, set_active_window will do no nothing */
+        if (!send_msg_new && hwnd == GetActiveWindow())
+            SendMessageW( hwnd, WM_NCACTIVATE, TRUE, (LPARAM)hwnd );
+
         if (send_msg_new)  /* new window belongs to other thread */
             SendNotifyMessageW( hwnd, WM_WINE_SETACTIVEWINDOW, (WPARAM)hwnd, 0 );
         else  /* new window belongs to us */
diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c
index 389731ff69d..e4943b85a0d 100644
--- a/dlls/user32/tests/win.c
+++ b/dlls/user32/tests/win.c
@@ -3276,25 +3276,25 @@ struct test_sfw_test_desc
 
 static struct test_sfw_test_desc test_sfw_tests[] = {
     {1, FALSE, FALSE, FALSE,  FALSE, 0, FALSE, 0, FALSE, 6, FALSE, 0},
-    {1, TRUE, FALSE, FALSE,   FALSE, 0,  TRUE, 1, FALSE, 6, FALSE, 0},
+    {1, TRUE, FALSE, FALSE,   FALSE, 0, FALSE, 1, FALSE, 6, FALSE, 0},
     {1, FALSE, TRUE, FALSE,   FALSE, 0, FALSE, 0, FALSE, 6, FALSE, 0},
-    {1, TRUE, TRUE, FALSE,    FALSE, 0,  TRUE, 1, FALSE, 6, FALSE, 0},
+    {1, TRUE, TRUE, FALSE,    FALSE, 0, FALSE, 1, FALSE, 6, FALSE, 0},
     {1, FALSE, FALSE, TRUE,   FALSE, 0, FALSE, 0, FALSE, 6, FALSE, 0},
-    {1, TRUE, FALSE, TRUE,    FALSE, 0,  TRUE, 1, FALSE, 6, FALSE, 0},
+    {1, TRUE, FALSE, TRUE,    FALSE, 0, FALSE, 1, FALSE, 6, FALSE, 0},
 
     {2, FALSE, FALSE, FALSE,  FALSE, 0, FALSE, 6, FALSE, 0, FALSE, 1},
     {2, TRUE, FALSE, FALSE,   FALSE, 0, FALSE, 6, FALSE, 0, FALSE, 1},
     {2, FALSE, TRUE, FALSE,   FALSE, 6, FALSE, 0, FALSE, 0, FALSE, 1},
-    {2, TRUE, TRUE, FALSE,    FALSE, 6,  TRUE, 1, FALSE, 6, FALSE, 0},
+    {2, TRUE, TRUE, FALSE,    FALSE, 6, FALSE, 1, FALSE, 6, FALSE, 0},
     {2, FALSE, FALSE, TRUE,    TRUE, 8, FALSE, 0, FALSE, 0, FALSE, 1},
-    {2, TRUE, FALSE, TRUE,     TRUE, 8,  TRUE, 1, FALSE, 6, FALSE, 0},
+    {2, TRUE, FALSE, TRUE,     TRUE, 8, FALSE, 1, FALSE, 6, FALSE, 0},
 
     {0, FALSE, FALSE, FALSE,  FALSE, 0, FALSE, 6, FALSE, 0, FALSE, 1},
     {0, TRUE, FALSE, FALSE,   FALSE, 0, FALSE, 6, FALSE, 0, FALSE, 1},
     {0, FALSE, TRUE, FALSE,   FALSE, 6, FALSE, 0, FALSE, 0, FALSE, 1},
-    {0, TRUE, TRUE, FALSE,    FALSE, 6,  TRUE, 1, FALSE, 6, FALSE, 0},
+    {0, TRUE, TRUE, FALSE,    FALSE, 6, FALSE, 1, FALSE, 6, FALSE, 0},
     {0, FALSE, FALSE, TRUE,    TRUE, 8, FALSE, 0, FALSE, 0, FALSE, 1},
-    {0, TRUE, FALSE, TRUE,     TRUE, 8,  TRUE, 1, FALSE, 6, FALSE, 0},
+    {0, TRUE, FALSE, TRUE,     TRUE, 8, FALSE, 1, FALSE, 6, FALSE, 0},
 };
 
 static DWORD WINAPI test_sfw_thread(void *param)
-- 
2.28.0