mirror of
https://github.com/reactos/reactos.git
synced 2024-08-04 10:30:59 +00:00
Revert 39295 on request of hpoussin
svn path=/trunk/; revision=39340
This commit is contained in:
parent
613f4b1847
commit
98346f3252
|
@ -175,9 +175,6 @@ HandleLogon(
|
||||||
SIZE_T EnvBlockSize = 0, ProfileSize = 0;
|
SIZE_T EnvBlockSize = 0, ProfileSize = 0;
|
||||||
BOOLEAN Old;
|
BOOLEAN Old;
|
||||||
BOOL ret = FALSE;
|
BOOL ret = FALSE;
|
||||||
UNICODE_STRING VariableName;
|
|
||||||
UNICODE_STRING VariableValue;
|
|
||||||
WCHAR AppDataPath[MAX_PATH];
|
|
||||||
|
|
||||||
/* Loading personal settings */
|
/* Loading personal settings */
|
||||||
DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS);
|
DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_LOADINGYOURPERSONALSETTINGS);
|
||||||
|
@ -222,18 +219,6 @@ HandleLogon(
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Use SHGetFolderPathW for getting the AppData path */
|
|
||||||
if(SHGetFolderPathW(NULL, CSIDL_APPDATA, Session->UserToken, SHGFP_TYPE_CURRENT, AppDataPath) == E_FAIL)
|
|
||||||
{
|
|
||||||
WARN("WL: SHGetFolderPathW() failed\n");
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Some environment variables need to be set by winlogon (verified against Windows XP winlogon) */
|
|
||||||
RtlInitUnicodeString(&VariableName, L"APPDATA");
|
|
||||||
RtlInitUnicodeString(&VariableValue, AppDataPath);
|
|
||||||
RtlSetEnvironmentVariable((PWSTR*)&lpEnvironment, &VariableName, &VariableValue);
|
|
||||||
|
|
||||||
if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment)
|
if (Session->Profile->dwType == WLX_PROFILE_TYPE_V2_0 && Session->Profile->pszEnvironment)
|
||||||
{
|
{
|
||||||
/* Count required size for full environment */
|
/* Count required size for full environment */
|
||||||
|
@ -279,8 +264,6 @@ HandleLogon(
|
||||||
DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS);
|
DisplayStatusMessage(Session, Session->WinlogonDesktop, IDS_APPLYINGYOURPERSONALSETTINGS);
|
||||||
UpdatePerUserSystemParameters(0, TRUE);
|
UpdatePerUserSystemParameters(0, TRUE);
|
||||||
|
|
||||||
/* FIXME: Set the "Volatile Environment" key for the new user */
|
|
||||||
|
|
||||||
/* Set default language */
|
/* Set default language */
|
||||||
if (!SetDefaultLanguage(TRUE))
|
if (!SetDefaultLanguage(TRUE))
|
||||||
{
|
{
|
||||||
|
|
|
@ -39,7 +39,6 @@
|
||||||
#include <ntsecapi.h>
|
#include <ntsecapi.h>
|
||||||
#include <accctrl.h>
|
#include <accctrl.h>
|
||||||
#include <aclapi.h>
|
#include <aclapi.h>
|
||||||
#include <shlobj.h>
|
|
||||||
|
|
||||||
#include <reactos/winlogon.h>
|
#include <reactos/winlogon.h>
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,6 @@
|
||||||
<library>advapi32</library>
|
<library>advapi32</library>
|
||||||
<library>userenv</library>
|
<library>userenv</library>
|
||||||
<library>secur32</library>
|
<library>secur32</library>
|
||||||
<library>shell32</library>
|
|
||||||
<file>sas.c</file>
|
<file>sas.c</file>
|
||||||
<file>screensaver.c</file>
|
<file>screensaver.c</file>
|
||||||
<file>setup.c</file>
|
<file>setup.c</file>
|
||||||
|
|
Loading…
Reference in a new issue