Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 21:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USERENV] Use a reference counter when loading and unloading profiles. Unload the hive only when the reference counter reaches 0. This fixes the remaining bugs in "userenv_apitest LoadUserProfile".

Browse source
This commit is contained in:
Eric Kohl 2019-03-16 07:45:30 +01:00
parent e3e173ffaa
commit 7d28dfd184
1 changed files with 207 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

241
dll/win32/userenv/profile.c
View file

@ -197,6 +197,157 @@ CreateProfileMutex(
}
static
DWORD
IncrementRefCount(
PWSTR pszSidString,
PDWORD pdwRefCount)
{
HKEY hProfilesKey = NULL, hProfileKey = NULL;
DWORD dwRefCount = 0, dwLength, dwType;
DWORD dwError;
DPRINT1("IncrementRefCount(%S %p)\n",
pszSidString, pdwRefCount);
dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList",
0,
KEY_QUERY_VALUE,
&hProfilesKey);
if (dwError != ERROR_SUCCESS)
{
DPRINT1("Error: %lu\n", dwError);
goto done;
}
dwError = RegOpenKeyExW(hProfilesKey,
pszSidString,
0,
KEY_QUERY_VALUE | KEY_SET_VALUE,
&hProfileKey);
if (dwError != ERROR_SUCCESS)
{
DPRINT1("Error: %lu\n", dwError);
goto done;
}
/* Get the reference counter */
dwLength = sizeof(dwRefCount);
RegQueryValueExW(hProfileKey,
L"RefCount",
NULL,
&dwType,
(PBYTE)&dwRefCount,
&dwLength);
dwRefCount++;
dwLength = sizeof(dwRefCount);
dwError = RegSetValueExW(hProfileKey,
L"RefCount",
0,
REG_DWORD,
(PBYTE)&dwRefCount,
dwLength);
if (dwError != ERROR_SUCCESS)
{
DPRINT1("Error: %lu\n", dwError);
goto done;
}
if (pdwRefCount != NULL)
*pdwRefCount = dwRefCount;
done:
if (hProfileKey != NULL)
RegCloseKey(hProfileKey);
if (hProfilesKey != NULL)
RegCloseKey(hProfilesKey);
return dwError;
}
static
DWORD
DecrementRefCount(
PWSTR pszSidString,
PDWORD pdwRefCount)
{
HKEY hProfilesKey = NULL, hProfileKey = NULL;
DWORD dwRefCount = 0, dwLength, dwType;
DWORD dwError;
DPRINT1("DecrementRefCount(%S %p)\n",
pszSidString, pdwRefCount);
dwError = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\ProfileList",
0,
KEY_QUERY_VALUE,
&hProfilesKey);
if (dwError != ERROR_SUCCESS)
{
DPRINT1("Error: %lu\n", dwError);
goto done;
}
dwError = RegOpenKeyExW(hProfilesKey,
pszSidString,
0,
KEY_QUERY_VALUE | KEY_SET_VALUE,
&hProfileKey);
if (dwError != ERROR_SUCCESS)
{
DPRINT1("Error: %lu\n", dwError);
goto done;
}
/* Get the reference counter */
dwLength = sizeof(dwRefCount);
dwError = RegQueryValueExW(hProfileKey,
L"RefCount",
NULL,
&dwType,
(PBYTE)&dwRefCount,
&dwLength);
if (dwError != ERROR_SUCCESS)
{
DPRINT1("Error: %lu\n", dwError);
goto done;
}
dwRefCount--;
dwLength = sizeof(dwRefCount);
dwError = RegSetValueExW(hProfileKey,
L"RefCount",
0,
REG_DWORD,
(PBYTE)&dwRefCount,
dwLength);
if (dwError != ERROR_SUCCESS)
{
DPRINT1("Error: %lu\n", dwError);
goto done;
}
if (pdwRefCount != NULL)
*pdwRefCount = dwRefCount;
done:
if (hProfileKey != NULL)
RegCloseKey(hProfileKey);
if (hProfilesKey != NULL)
RegCloseKey(hProfilesKey);
return dwError;
}
/* PUBLIC FUNCTIONS ********************************************************/
BOOL
@ -1613,6 +1764,14 @@ LoadUserProfileW(
goto cleanup;
}
Error = IncrementRefCount(SidString.Buffer, NULL);
if (Error != ERROR_SUCCESS)
{
DPRINT1("IncrementRefCount() failed (Error %ld)\n", Error);
SetLastError((DWORD)Error);
goto cleanup;
}
ret = TRUE;
cleanup:
@ -1640,6 +1799,7 @@ UnloadUserProfile(
{
UNICODE_STRING SidString = {0, 0, NULL};
HANDLE hProfileMutex = NULL;
DWORD dwRefCount = 0;
LONG Error;
BOOL bRet = FALSE;
@ -1675,46 +1835,59 @@ UnloadUserProfile(
/* Close the profile handle */
RegCloseKey(hProfile);
/* Acquire restore privilege */
if (!AcquireRemoveRestorePrivilege(TRUE))
{
DPRINT1("AcquireRemoveRestorePrivilege() failed (Error %ld)\n", GetLastError());
goto cleanup;
}
/* HACK */
{
HKEY hUserKey;
Error = RegOpenKeyExW(HKEY_USERS,
SidString.Buffer,
0,
KEY_WRITE,
&hUserKey);
if (Error == ERROR_SUCCESS)
{
RegDeleteKeyW(hUserKey,
L"Volatile Environment");
RegCloseKey(hUserKey);
}
}
/* End of HACK */
/* Unload the hive */
Error = RegUnLoadKeyW(HKEY_USERS,
SidString.Buffer);
/* Remove restore privilege */
AcquireRemoveRestorePrivilege(FALSE);
Error = DecrementRefCount(SidString.Buffer, &dwRefCount);
if (Error != ERROR_SUCCESS)
{
DPRINT1("RegUnLoadKeyW() failed (Error %ld)\n", Error);
DPRINT1("DecrementRefCount() failed (Error %ld)\n", Error);
SetLastError((DWORD)Error);
goto cleanup;
}
if (dwRefCount == 0)
{
DPRINT1("RefCount is 0: Unload the Hive!\n");
/* Acquire restore privilege */
if (!AcquireRemoveRestorePrivilege(TRUE))
{
DPRINT1("AcquireRemoveRestorePrivilege() failed (Error %ld)\n", GetLastError());
goto cleanup;
}
/* HACK */
{
HKEY hUserKey;
Error = RegOpenKeyExW(HKEY_USERS,
SidString.Buffer,
0,
KEY_WRITE,
&hUserKey);
if (Error == ERROR_SUCCESS)
{
RegDeleteKeyW(hUserKey,
L"Volatile Environment");
RegCloseKey(hUserKey);
}
}
/* End of HACK */
/* Unload the hive */
Error = RegUnLoadKeyW(HKEY_USERS,
SidString.Buffer);
/* Remove restore privilege */
AcquireRemoveRestorePrivilege(FALSE);
if (Error != ERROR_SUCCESS)
{
DPRINT1("RegUnLoadKeyW() failed (Error %ld)\n", Error);
SetLastError((DWORD)Error);
goto cleanup;
}
}
bRet = TRUE;
cleanup: