From 41b5f295142de30df8cff0e333b9a9cdc28b3d79 Mon Sep 17 00:00:00 2001
From: Katayama Hirofumi MZ <katayama.hirofumi.mz@gmail.com>
Date: Tue, 30 Oct 2018 08:13:05 +0900
Subject: [PATCH] [WIN32SS] Make window foreground in SwitchToThisWindow (#995)

CORE-15165
---
 win32ss/user/ntuser/simplecall.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/win32ss/user/ntuser/simplecall.c b/win32ss/user/ntuser/simplecall.c
index 97879bda10b..0c9b184f0d0 100644
--- a/win32ss/user/ntuser/simplecall.c
+++ b/win32ss/user/ntuser/simplecall.c
@@ -521,8 +521,13 @@ NtUserCallTwoParam(
                 {
                     UserPostMessage(hwnd, WM_SYSCOMMAND, SC_RESTORE, 0);
                 }
+                /* bring window to top and activate */
+                co_WinPosSetWindowPos(Window, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
+            }
+            else
+            {
+                UserSetActiveWindow(Window);
             }
-            UserSetActiveWindow(Window);
             break;
         }