- Proper fix for the bug that 25558 attempted to fix. Kernel-mode registry handles...

- Also the system now boots again since this fix is correct.

svn path=/trunk/; revision=25587

diff --git a/reactos/ntoskrnl/cm/ntfunc.c b/reactos/ntoskrnl/cm/ntfunc.c
index 74b9c6b..115eeb5 100644 (file)
--- a/reactos/ntoskrnl/cm/ntfunc.c
+++ b/reactos/ntoskrnl/cm/ntfunc.c
@@ -49,7 +49,8 @@ CmpCreateHandle(PVOID ObjectBody,
                 */
 {
     HANDLE_TABLE_ENTRY NewEntry;
-    PEPROCESS Process, CurrentProcess;
+    PEPROCESS CurrentProcess;
+    PVOID HandleTable;
     POBJECT_HEADER ObjectHeader;
     HANDLE Handle;
     KAPC_STATE ApcState;
@@ -90,22 +91,20 @@ CmpCreateHandle(PVOID ObjectBody,
     if ((HandleAttributes & OBJ_KERNEL_HANDLE) &&
         ExGetPreviousMode() == KernelMode)
     {
-        Process = PsInitialSystemProcess;
-        if (Process != CurrentProcess)
+        HandleTable = ObpKernelHandleTable;
+        if (PsGetCurrentProcess() != PsInitialSystemProcess)
         {
-            KeStackAttachProcess(&Process->Pcb,
+            KeStackAttachProcess(&PsInitialSystemProcess->Pcb,
                 &ApcState);
             AttachedToProcess = TRUE;
         }
     }
     else
     {
-        Process = CurrentProcess;
-        /* mask out the OBJ_KERNEL_HANDLE attribute */
-        HandleAttributes &= ~OBJ_KERNEL_HANDLE;
+        HandleTable = PsGetCurrentProcess()->ObjectTable;
     }
 
-    Handle = ExCreateHandle(Process->ObjectTable,
+    Handle = ExCreateHandle(HandleTable,
         &NewEntry);
 
     if (AttachedToProcess)