From f643fb301bb194bc4574edc739aff045c98384e1 Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Fri, 17 Dec 2021 11:38:23 +0900
Subject: [PATCH] [NTUSER] Fix SwitchToThisWindow

Taskbar task buttons were not working correctly due to this bug.
CORE-17911
---
 win32ss/user/ntuser/simplecall.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c
index 2a2c92ac0ec..76ea0340c7b 100644
--- a/win32ss/user/ntuser/simplecall.c
+++ b/win32ss/user/ntuser/simplecall.c
@@ -521,11 +521,14 @@ NtUserCallTwoParam(
                 {
                     co_WinPosSetWindowPos(pwndActive, HWND_BOTTOM, 0, 0, 0, 0,
                                           SWP_NOMOVE | SWP_NOSIZE | SWP_NOACTIVATE |
-                                          SWP_NOSENDCHANGING | SWP_ASYNCWINDOWPOS);
+                                          SWP_ASYNCWINDOWPOS);
                 }
+
+                UserSetActiveWindow(Window);
+                break;
             }
 
-            UserSetActiveWindow(Window);
+            co_IntSetForegroundWindowMouse(Window);
 
             if (fAltTab && (Window->style & WS_MINIMIZE))
             {