mirror of
https://github.com/reactos/reactos.git
synced 2025-04-25 08:00:24 +00:00
- Fix LiveCD boot error.
- Remove MPW thread hack. svn path=/trunk/; revision=26970
This commit is contained in:
parent
337e46a378
commit
d6d5cf7f99
2 changed files with 21 additions and 11 deletions
|
@ -250,17 +250,27 @@ CmpCreateControlSet(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
|
|||
OBJ_CASE_INSENSITIVE,
|
||||
NULL,
|
||||
NULL);
|
||||
Status = NtCreateKey(&KeyHandle,
|
||||
KEY_CREATE_LINK,
|
||||
&ObjectAttributes,
|
||||
0,
|
||||
NULL,
|
||||
REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK,
|
||||
&Disposition);
|
||||
if (!NT_SUCCESS(Status)) return Status;
|
||||
|
||||
/* Sanity check */
|
||||
ASSERT(Disposition == REG_CREATED_NEW_KEY);
|
||||
/* The key has been created by mkhive */
|
||||
if ((CmpMiniNTBoot) && (CmpShareSystemHives))
|
||||
{
|
||||
Status = NtOpenKey(&KeyHandle, KEY_READ | KEY_WRITE, &ObjectAttributes);
|
||||
if (!NT_SUCCESS(Status)) return Status;
|
||||
}
|
||||
else
|
||||
{
|
||||
Status = NtCreateKey(&KeyHandle,
|
||||
KEY_CREATE_LINK,
|
||||
&ObjectAttributes,
|
||||
0,
|
||||
NULL,
|
||||
REG_OPTION_VOLATILE | REG_OPTION_CREATE_LINK,
|
||||
&Disposition);
|
||||
if (!NT_SUCCESS(Status)) return Status;
|
||||
|
||||
/* Sanity check */
|
||||
ASSERT(Disposition == REG_CREATED_NEW_KEY);
|
||||
}
|
||||
|
||||
/* Initialize the symbolic link name */
|
||||
sprintf(Buffer,
|
||||
|
|
|
@ -516,7 +516,7 @@ MmInitSystem(IN ULONG Phase,
|
|||
/*
|
||||
* Initialise the modified page writer.
|
||||
*/
|
||||
if (!strstr(LoaderBlock->LoadOptions, "MININT")) MmInitMpwThread();
|
||||
MmInitMpwThread();
|
||||
|
||||
/* Initialize the balance set manager */
|
||||
MmInitBsmThread();
|
||||
|
|
Loading…
Reference in a new issue