[ros-diffs] [hpoussin] 28316: Use the profile returned by GINA before calling LoadUserProfileW() Destroy the environment when not needed anymore Better cleanup in case of error
hpoussin at svn.reactos.org
hpoussin at svn.reactos.org
Mon Aug 13 16:23:03 CEST 2007
Author: hpoussin
Date: Mon Aug 13 18:23:03 2007
New Revision: 28316
URL: http://svn.reactos.org/svn/reactos?rev=28316&view=rev
Log:
Use the profile returned by GINA before calling LoadUserProfileW()
Destroy the environment when not needed anymore
Better cleanup in case of error
Modified:
trunk/reactos/base/system/winlogon/sas.c
trunk/reactos/base/system/winlogon/winlogon.h
Modified: trunk/reactos/base/system/winlogon/sas.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/sas.c?rev=28316&r1=28315&r2=28316&view=diff
==============================================================================
--- trunk/reactos/base/system/winlogon/sas.c (original)
+++ trunk/reactos/base/system/winlogon/sas.c Mon Aug 13 18:23:03 2007
@@ -37,6 +37,7 @@
IN OUT PWLSESSION Session)
{
LPVOID lpEnvironment;
+ BOOL ret;
if (!Session->Gina.Functions.WlxStartApplication)
return FALSE;
@@ -49,11 +50,14 @@
return FALSE;
}
- return Session->Gina.Functions.WlxStartApplication(
+ ret = Session->Gina.Functions.WlxStartApplication(
Session->Gina.Context,
L"Default",
lpEnvironment,
L"taskmgr.exe");
+
+ DestroyEnvironmentBlock(lpEnvironment);
+ return ret;
}
BOOL
@@ -167,26 +171,41 @@
HandleLogon(
IN OUT PWLSESSION Session)
{
- PROFILEINFOW ProfileInfo = { 0, };
+ PROFILEINFOW ProfileInfo;
LPVOID lpEnvironment = NULL;
BOOLEAN Old;
-
+ BOOL ret = FALSE;
+
+ /* Loading personal settings */
+ DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS);
+ ProfileInfo.hProfile = INVALID_HANDLE_VALUE;
if (0 == (Session->Options & WLX_LOGON_OPT_NO_PROFILE))
{
+ if (Session->Profile == NULL
+ || (Session->Profile->dwType != WLX_PROFILE_TYPE_V1_0
+ && Session->Profile->dwType != WLX_PROFILE_TYPE_V2_0))
+ {
+ ERR("WL: Wrong profile\n");
+ goto cleanup;
+ }
+
/* Load the user profile */
+ ZeroMemory(&ProfileInfo, sizeof(PROFILEINFOW));
ProfileInfo.dwSize = sizeof(PROFILEINFOW);
ProfileInfo.dwFlags = 0;
ProfileInfo.lpUserName = Session->MprNotifyInfo.pszUserName;
- ProfileInfo.lpProfilePath = Session->Profile.pszProfile;
- ProfileInfo.lpDefaultPath = Session->Profile.pszNetworkDefaultUserProfile;
- ProfileInfo.lpServerName = Session->Profile.pszServerName;
- ProfileInfo.lpPolicyPath = Session->Profile.pszPolicy;
- ProfileInfo.hProfile = NULL;
+ ProfileInfo.lpProfilePath = Session->Profile->pszProfile;
+ if (Session->Profile->dwType >= WLX_PROFILE_TYPE_V2_0)
+ {
+ ProfileInfo.lpDefaultPath = Session->Profile->pszNetworkDefaultUserProfile;
+ ProfileInfo.lpServerName = Session->Profile->pszServerName;
+ ProfileInfo.lpPolicyPath = Session->Profile->pszPolicy;
+ }
if (!LoadUserProfileW(Session->UserToken, &ProfileInfo))
{
ERR("WL: LoadUserProfileW() failed\n");
- return FALSE;
+ goto cleanup;
}
}
@@ -196,16 +215,12 @@
Session->UserToken,
TRUE))
{
- ERR("WL: CreateEnvironmentBlock() failed\n");
- if (0 == (Session->Options & WLX_LOGON_OPT_NO_PROFILE))
- {
- UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile);
- CloseHandle(Session->UserToken);
- Session->UserToken = NULL;
- }
- return FALSE;
- }
- /* FIXME: use Session->Profile.pszEnvironment */
+ WARN("WL: CreateEnvironmentBlock() failed\n");
+ goto cleanup;
+ }
+ /* FIXME: Append variables of Session->Profile->pszEnvironment */
+
+ //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS);
/* FIXME: UpdatePerUserSystemParameters(0, TRUE); */
/* Get privilege */
@@ -213,19 +228,11 @@
/* FIXME: reverting to lower privileges after creating user shell? */
RtlAdjustPrivilege(SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, TRUE, FALSE, &Old);
- //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS);
- //DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS);
-
/* Set default language */
if (!SetDefaultLanguage(TRUE))
{
- if (0 == (Session->Options & WLX_LOGON_OPT_NO_PROFILE))
- {
- UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile);
- CloseHandle(Session->UserToken);
- Session->UserToken = NULL;
- }
- return FALSE;
+ WARN("WL: SetDefaultLanguage() failed\n");
+ goto cleanup;
}
if (!Session->Gina.Functions.WlxActivateUserShell(
@@ -234,34 +241,36 @@
NULL, /* FIXME */
lpEnvironment))
{
- if (0 == (Session->Options & WLX_LOGON_OPT_NO_PROFILE))
- {
- UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile);
- CloseHandle(Session->UserToken);
- Session->UserToken = NULL;
- }
- return FALSE;
- }
- /*if(!GinaInst->Functions->WlxActivateUserShell(GinaInst->Context,
- L"WinSta0\\Default",
- NULL,
- NULL))
- {
- LoadString(hAppInstance, IDS_FAILEDACTIVATEUSERSHELL, StatusMsg, 256 * sizeof(WCHAR));
- MessageBox(0, StatusMsg, NULL, MB_ICONERROR);
- SetEvent(hShutdownEvent);
- }
-
- WaitForSingleObject(hShutdownEvent, INFINITE);
- CloseHandle(hShutdownEvent);
-
- RemoveStatusMessage(Session);
- */
+ //WCHAR StatusMsg[256];
+ WARN("WL: WlxActivateUserShell() failed\n");
+ //LoadStringW(hAppInstance, IDS_FAILEDACTIVATEUSERSHELL, StatusMsg, sizeof(StatusMsg));
+ //MessageBoxW(0, StatusMsg, NULL, MB_ICONERROR);
+ goto cleanup;
+ }
if (!InitializeScreenSaver(Session))
WARN("WL: Failed to initialize screen saver\n");
- return TRUE;
+ Session->hProfileInfo = ProfileInfo.hProfile;
+ ret = TRUE;
+
+cleanup:
+ HeapFree(GetProcessHeap(), 0, Session->Profile);
+ Session->Profile = NULL;
+ if (!ret
+ && ProfileInfo.hProfile != INVALID_HANDLE_VALUE)
+ {
+ UnloadUserProfile(WLSession->UserToken, ProfileInfo.hProfile);
+ }
+ if (lpEnvironment)
+ DestroyEnvironmentBlock(lpEnvironment);
+ RemoveStatusMessage(Session);
+ if (!ret)
+ {
+ Session->UserToken = NULL;
+ CloseHandle(Session->UserToken);
+ }
+ return ret;
}
#define EWX_ACTION_MASK 0xffffffeb
@@ -347,7 +356,7 @@
return STATUS_UNSUCCESSFUL;
}
- //UnloadUserProfile(Session->UserToken, ProfileInfo.hProfile);
+ //UnloadUserProfile(Session->UserToken, Session->hProfileInfo);
//CloseHandle(Session->UserToken);
//UpdatePerUserSystemParameters(0, FALSE);
Session->LogonStatus = WKSTA_IS_LOGGED_OFF;
@@ -562,7 +571,6 @@
{
PSID LogonSid = NULL; /* FIXME */
- ZeroMemory(&Session->Profile, sizeof(Session->Profile));
Session->Options = 0;
wlxAction = (DWORD)Session->Gina.Functions.WlxLoggedOutSAS(
Modified: trunk/reactos/base/system/winlogon/winlogon.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlogon.h?rev=28316&r1=28315&r2=28316&view=diff
==============================================================================
--- trunk/reactos/base/system/winlogon/winlogon.h (original)
+++ trunk/reactos/base/system/winlogon/winlogon.h Mon Aug 13 18:23:03 2007
@@ -134,6 +134,7 @@
HDESK ScreenSaverDesktop;
LUID LogonId;
HANDLE UserToken;
+ HANDLE hProfileInfo;
DWORD LogonStatus;
DWORD DialogTimeout; /* Timeout for dialog boxes, in seconds */
@@ -153,7 +154,7 @@
/* Logon informations */
DWORD Options;
WLX_MPR_NOTIFY_INFO MprNotifyInfo;
- WLX_PROFILE_V2_0 Profile;
+ WLX_PROFILE_V2_0 *Profile;
} WLSESSION, *PWLSESSION;
extern HINSTANCE hAppInstance;
More information about the Ros-diffs
mailing list