[ros-diffs] [fireball] 31253: - Use CmPrepareKey only in cmlib, since it's a cmlib hack.

Author: fireball
Date: Sat Dec 15 21:25:08 2007
New Revision: 31253

URL: http://svn.reactos.org/svn/reactos?rev=31253&view=rev
Log:
- Use CmPrepareKey only in cmlib, since it's a cmlib hack.

Modified:
    trunk/reactos/lib/cmlib/hiveinit.c
    trunk/reactos/ntoskrnl/config/cmcontrl.c
    trunk/reactos/ntoskrnl/config/cmsysini.c

Modified: trunk/reactos/lib/cmlib/hiveinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=3…
==============================================================================
--- trunk/reactos/lib/cmlib/hiveinit.c (original)
+++ trunk/reactos/lib/cmlib/hiveinit.c Sat Dec 15 21:25:08 2007
@@ -503,6 +503,8 @@
       return Status;
    }
 
+   if (Operation != HINIT_CREATE) CmPrepareHive(Hive);
+
    return Status;
 }
 

Modified: trunk/reactos/ntoskrnl/config/cmcontrl.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmcontrl.c…
==============================================================================
--- trunk/reactos/ntoskrnl/config/cmcontrl.c (original)
+++ trunk/reactos/ntoskrnl/config/cmcontrl.c Sat Dec 15 21:25:08 2007
@@ -138,9 +138,6 @@
     /* Sanity check, flat hives don't have release routines */
     ASSERT(SystemHive->ReleaseCellRoutine == NULL);
 
-    /* FIXME: Prepare it */
-    CmPrepareHive(SystemHive);
-
     /* Set the Root Cell */
     RootCell = ((PHBASE_BLOCK)SystemHiveData)->RootCell;
 

Modified: trunk/reactos/ntoskrnl/config/cmsysini.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c…
==============================================================================
--- trunk/reactos/ntoskrnl/config/cmsysini.c (original)
+++ trunk/reactos/ntoskrnl/config/cmsysini.c Sat Dec 15 21:25:08 2007
@@ -216,7 +216,6 @@
 
     /* ROS: Init root key cell and prepare the hive */
     if (Operation == HINIT_CREATE) CmCreateRootNode(&NewHive->Hive,
L"");
-    CmPrepareHive(&NewHive->Hive);
 
     /* Duplicate the hive name */
     NewHive->FileFullPath.Buffer = ExAllocatePoolWithTag(PagedPool,
@@ -670,7 +669,6 @@
                                    &HiveName,
                                    2);
         if (!NT_SUCCESS(Status)) return FALSE;
-        CmPrepareHive(&SystemHive->Hive);
 
         /* Set the hive filename */
         RtlCreateUnicodeString(&SystemHive->FileFullPath,