Author: gadamopoulos
Date: Sun May 1 09:59:01 2011
New Revision: 51520
URL: http://svn.reactos.org/svn/reactos?rev=51520&view=rev
Log:
[winlogon]
- Implement restarting the shell in case of a failure. kudos to hpoussin
Modified:
trunk/reactos/base/system/winlogon/sas.c
Modified: trunk/reactos/base/system/winlogon/sas.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c?rev=51520&r1=51519&r2=51520&view=diff
==============================================================================
--- trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] (original)
+++ trunk/reactos/base/system/winlogon/sas.c [iso-8859-1] Sun May 1 09:59:01
2011
@@ -54,6 +54,37 @@
DestroyEnvironmentBlock(lpEnvironment);
return ret;
}
+
+static BOOL
+StartUserShell(
+ IN OUT PWLSESSION Session)
+{
+ LPVOID lpEnvironment = NULL;
+ BOOLEAN Old;
+ BOOL ret;
+
+ /* Create environment block for the user */
+ if (!CreateEnvironmentBlock(&lpEnvironment, Session->UserToken, TRUE))
+ {
+ WARN("WL: CreateEnvironmentBlock() failed\n");
+ return FALSE;
+ }
+
+ /* Get privilege */
+ /* FIXME: who should do it? winlogon or gina? */
+ /* FIXME: reverting to lower privileges after creating user shell? */
+ RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old);
+
+ ret = Session->Gina.Functions.WlxActivateUserShell(
+ Session->Gina.Context,
+ L"Default",
+ NULL, /* FIXME */
+ lpEnvironment);
+
+ DestroyEnvironmentBlock(lpEnvironment);
+ return ret;
+}
+
BOOL
SetDefaultLanguage(
@@ -167,8 +198,6 @@
IN OUT PWLSESSION Session)
{
PROFILEINFOW ProfileInfo;
- LPVOID lpEnvironment = NULL;
- BOOLEAN Old;
BOOL ret = FALSE;
/* Loading personal settings */
@@ -211,13 +240,6 @@
goto cleanup;
}
- /* Create environment block for the user */
- if (!CreateEnvironmentBlock(&lpEnvironment, Session->UserToken, TRUE))
- {
- WARN("WL: CreateEnvironmentBlock() failed\n");
- goto cleanup;
- }
-
DisplayStatusMessage(Session, Session->WinlogonDesktop,
IDS_APPLYINGYOURPERSONALSETTINGS);
UpdatePerUserSystemParameters(0, TRUE);
@@ -228,16 +250,7 @@
goto cleanup;
}
- /* Get privilege */
- /* FIXME: who should do it? winlogon or gina? */
- /* FIXME: reverting to lower privileges after creating user shell? */
- RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old);
-
- if (!Session->Gina.Functions.WlxActivateUserShell(
- Session->Gina.Context,
- L"Default",
- NULL, /* FIXME */
- lpEnvironment))
+ if (!StartUserShell(Session))
{
//WCHAR StatusMsg[256];
WARN("WL: WlxActivateUserShell() failed\n");
@@ -264,8 +277,6 @@
{
UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile);
}
- if (lpEnvironment)
- DestroyEnvironmentBlock(lpEnvironment);
RemoveStatusMessage(Session);
if (!ret)
{
@@ -942,12 +953,30 @@
{
return HandleMessageBeep(lParam);
}
+ case LN_SHELL_EXITED:
+ {
+ /* lParam is the exit code */
+ if(lParam != 1)
+ {
+ SetTimer(hwndDlg, 1, 1000, NULL);
+ }
+ break;
+ }
default:
{
ERR("WM_LOGONNOTIFY case %d is unimplemented\n", wParam);
}
}
return 0;
+ }
+ case WM_TIMER:
+ {
+ if (wParam == 1)
+ {
+ KillTimer(hwndDlg, 1);
+ StartUserShell(Session);
+ }
+ break;
}
case WLX_WM_SAS:
{
