Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-05 17:06:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Add a lazy-initializing hack until user32 is able to delay-load the advapi32 as it should. It fixes a problem of trying to enter a non-initialized critical section object and possibly hanging on every boot.

Browse source 
svn path=/trunk/; revision=41379
This commit is contained in:
Aleksey Bragin 2009-06-11 11:42:07 +00:00
parent 2023257ded
commit 0bc8e64ea2
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reactos/dll/win32/advapi32/reg/reg.c
View file

@ -31,6 +31,7 @@ static HANDLE DefaultHandleTable[MAX_DEFAULT_HANDLES];
static HANDLE ProcessHeap;
static BOOLEAN DefaultHandlesDisabled = FALSE;
static BOOLEAN DefaultHandleHKUDisabled = FALSE;
static BOOLEAN DllInitialized = FALSE; /* HACK */
/* PROTOTYPES ***************************************************************/
@ -66,10 +67,16 @@ RegInitialize(VOID)
{
TRACE("RegInitialize()\n");
ProcessHeap = RtlGetProcessHeap();
RtlZeroMemory(DefaultHandleTable,
MAX_DEFAULT_HANDLES * sizeof(HANDLE));
RtlInitializeCriticalSection(&HandleTableCS);
/* Lazy init hack */
if (!DllInitialized)
{
ProcessHeap = RtlGetProcessHeap();
RtlZeroMemory(DefaultHandleTable,
MAX_DEFAULT_HANDLES * sizeof(HANDLE));
RtlInitializeCriticalSection(&HandleTableCS);
DllInitialized = TRUE;
}
return TRUE;
}
@ -161,7 +168,7 @@ MapDefaultKey(OUT PHANDLE RealKey,
{
return STATUS_INVALID_PARAMETER;
}
RegInitialize(); /* HACK until delay-loading is implemented */
RtlEnterCriticalSection (&HandleTableCS);
if (Key == HKEY_CURRENT_USER)
@ -205,7 +212,7 @@ static VOID
CloseDefaultKeys(VOID)
{
ULONG i;
RegInitialize(); /* HACK until delay-loading is implemented */
RtlEnterCriticalSection(&HandleTableCS);
for (i = 0; i < MAX_DEFAULT_HANDLES; i++)
@ -311,6 +318,7 @@ OpenCurrentConfigKey (PHANDLE KeyHandle)
LONG WINAPI
RegDisablePredefinedCache(VOID)
{
RegInitialize(); /* HACK until delay-loading is implemented */
RtlEnterCriticalSection(&HandleTableCS);
DefaultHandleHKUDisabled = TRUE;
RtlLeaveCriticalSection(&HandleTableCS);
@ -326,6 +334,7 @@ RegDisablePredefinedCache(VOID)
LONG WINAPI
RegDisablePredefinedCacheEx(VOID)
{
RegInitialize(); /* HACK until delay-loading is implemented */
RtlEnterCriticalSection(&HandleTableCS);
DefaultHandlesDisabled = TRUE;
DefaultHandleHKUDisabled = TRUE;
@ -371,7 +380,7 @@ RegOverridePredefKey(IN HKEY hKey,
ASSERT(hNewHKey != NULL);
}
RegInitialize(); /* HACK until delay-loading is implemented */
RtlEnterCriticalSection(&HandleTableCS);
/* close the currently mapped handle if existing */
@ -3472,7 +3481,7 @@ ReadTokenSid:
handle for example! */
return RtlNtStatusToDosError(Status);
}
RegInitialize(); /* HACK until delay-loading is implemented */
TokenUserData = RtlAllocateHeap(ProcessHeap,
0,
RequiredLength);