From d6d5cf7f99729044311bdff01fd257d3d2d7e8d9 Mon Sep 17 00:00:00 2001
From: Dmitry Gorbachev <gorbachev@reactos.org>
Date: Sat, 2 Jun 2007 21:20:12 +0000
Subject: [PATCH] - Fix LiveCD boot error. - Remove MPW thread hack.

svn path=/trunk/; revision=26970
---
 reactos/ntoskrnl/config/cmsysini.c | 30 ++++++++++++++++++++----------
 reactos/ntoskrnl/mm/mminit.c       |  2 +-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/reactos/ntoskrnl/config/cmsysini.c b/reactos/ntoskrnl/config/cmsysini.c
index d2c6a7da545..f31b94b1559 100644
--- a/reactos/ntoskrnl/config/cmsysini.c
+++ b/reactos/ntoskrnl/config/cmsysini.c
@@ -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,
diff --git a/reactos/ntoskrnl/mm/mminit.c b/reactos/ntoskrnl/mm/mminit.c
index 99140324e68..1c4b0642216 100644
--- a/reactos/ntoskrnl/mm/mminit.c
+++ b/reactos/ntoskrnl/mm/mminit.c
@@ -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();