From 7aecedf7900e48ce8c3a22586db388f9aefce76e Mon Sep 17 00:00:00 2001
From: Giannis Adamopoulos <gadamopoulos@reactos.org>
Date: Fri, 19 Apr 2013 08:12:10 +0000
Subject: [PATCH] [msgina] - Switch to the winlogon desktop when we show the
 LogedOn dialog

svn path=/trunk/; revision=58785
---
 reactos/dll/win32/msgina/gui.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/reactos/dll/win32/msgina/gui.c b/reactos/dll/win32/msgina/gui.c
index 23adb8913b1..99c3a61c809 100644
--- a/reactos/dll/win32/msgina/gui.c
+++ b/reactos/dll/win32/msgina/gui.c
@@ -322,6 +322,9 @@ GUILoggedOnSAS(
 		return WLX_SAS_ACTION_NONE;
 	}
 
+	result = pgContext->pWlxFuncs->WlxSwitchDesktopToWinlogon(
+		pgContext->hWlx);
+
 	result = pgContext->pWlxFuncs->WlxDialogBoxParam(
 		pgContext->hWlx,
 		pgContext->hDllInstance,
@@ -329,12 +332,20 @@ GUILoggedOnSAS(
 		GetDesktopWindow(),
 		LoggedOnWindowProc,
 		(LPARAM)pgContext);
-	if (result >= WLX_SAS_ACTION_LOGON &&
-	    result <= WLX_SAS_ACTION_SWITCH_CONSOLE)
+
+	if (result < WLX_SAS_ACTION_LOGON ||
+		result > WLX_SAS_ACTION_SWITCH_CONSOLE)
 	{
-		return result;
+		result = WLX_SAS_ACTION_NONE;
 	}
-	return WLX_SAS_ACTION_NONE;
+
+	if (result == WLX_SAS_ACTION_NONE)
+	{
+		result = pgContext->pWlxFuncs->WlxSwitchDesktopToUser(
+			pgContext->hWlx);
+	}
+
+	return result;
 }
 
 static INT_PTR CALLBACK