Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Simplify LoadUserProfileW() and check for loaded profile.

Browse source 
svn path=/trunk/; revision=8774
This commit is contained in:
Eric Kohl 2004-03-17 14:46:23 +00:00
parent e816725be5
commit f396c8299f
1 changed files with 48 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

88
reactos/lib/userenv/profile.c
View file

@ -1,4 +1,4 @@
/* $Id: profile.c,v 1.7 2004/03/14 18:15:59 ekohl Exp $ /* $Id: profile.c,v 1.8 2004/03/17 14:46:23 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS system libraries * PROJECT: ReactOS system libraries
@ -582,9 +582,42 @@ GetUserProfileDirectoryW (HANDLE hToken,
szImagePath); szImagePath);
return TRUE; return TRUE;
#if 0 }
return GetDefaultUserProfileDirectoryW (lpProfileDir, lpcchSize);
#endif
static BOOL
CheckForLoadedProfile (HANDLE hToken)
{
UNICODE_STRING SidString;
HKEY hKey;
DPRINT ("CheckForLoadedProfile() called \n");
if (!GetUserSidFromToken (hToken,
&SidString))
{
DPRINT1 ("GetUserSidFromToken() failed\n");
return FALSE;
}
if (RegOpenKeyExW (HKEY_USERS,
SidString.Buffer,
0,
KEY_ALL_ACCESS,
&hKey))
{
DPRINT ("Profile not loaded\n");
RtlFreeUnicodeString (&SidString);
return FALSE;
}
RegCloseKey (hKey);
RtlFreeUnicodeString (&SidString);
DPRINT ("Profile already loaded\n");
return TRUE;
} }
@ -592,12 +625,9 @@ BOOL WINAPI
LoadUserProfileW (HANDLE hToken, LoadUserProfileW (HANDLE hToken,
LPPROFILEINFOW lpProfileInfo) LPPROFILEINFOW lpProfileInfo)
{ {
WCHAR szRawProfilesPath[MAX_PATH];
WCHAR szProfilesPath[MAX_PATH];
WCHAR szUserHivePath[MAX_PATH]; WCHAR szUserHivePath[MAX_PATH];
UNICODE_STRING SidString; UNICODE_STRING SidString;
DWORD dwLength; DWORD dwLength;
HKEY hKey;
DPRINT ("LoadUserProfileW() called\n"); DPRINT ("LoadUserProfileW() called\n");
@ -610,43 +640,21 @@ LoadUserProfileW (HANDLE hToken,
return FALSE; return FALSE;
} }
if (RegOpenKeyExW (HKEY_LOCAL_MACHINE, /* Don't load a profile twice */
L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList", if (CheckForLoadedProfile (hToken))
0,
KEY_ALL_ACCESS,
&hKey))
{ {
DPRINT1("Error: %lu\n", GetLastError()); DPRINT ("Profile already loaded\n");
lpProfileInfo->hProfile = NULL;
return TRUE;
}
if (!GetProfilesDirectoryW (szUserHivePath,
&dwLength))
{
DPRINT1("GetProfilesDirectoryW() failed\n", GetLastError());
return FALSE; return FALSE;
} }
/* Get profiles path */
dwLength = MAX_PATH * sizeof(WCHAR);
if (RegQueryValueExW (hKey,
L"ProfilesDirectory",
NULL,
NULL,
(LPBYTE)szRawProfilesPath,
&dwLength))
{
DPRINT1("Error: %lu\n", GetLastError());
RegCloseKey (hKey);
return FALSE;
}
/* Expand it */
if (!ExpandEnvironmentStringsW (szRawProfilesPath,
szProfilesPath,
MAX_PATH))
{
DPRINT1("Error: %lu\n", GetLastError());
RegCloseKey (hKey);
return FALSE;
}
RegCloseKey (hKey);
wcscpy (szUserHivePath, szProfilesPath);
wcscat (szUserHivePath, L"\\"); wcscat (szUserHivePath, L"\\");
wcscat (szUserHivePath, lpProfileInfo->lpUserName); wcscat (szUserHivePath, lpProfileInfo->lpUserName);
if (!AppendSystemPostfix (szUserHivePath, MAX_PATH)) if (!AppendSystemPostfix (szUserHivePath, MAX_PATH))