[ros-diffs] [hbelusca] 63505: [NTOS:CM] - Add a DPRINT1 in CmCheckRegistry because it is unimplemented, and give the CheckFlags value to CmCheckRegistry, when it is called in CmpInitializeHive. - Give the Chec...

Author: hbelusca
Date: Fri May 30 20:40:02 2014
New Revision: 63505

URL: http://svn.reactos.org/svn/reactos?rev=63505&view=rev
Log:
[NTOS:CM]
- Add a DPRINT1 in CmCheckRegistry because it is unimplemented, and give the CheckFlags
value to CmCheckRegistry, when it is called in CmpInitializeHive.
- Give the CheckFlags value to CmpInitializeHive, when it is called in
CmpInitHiveFromFile.
- Really mention that the CmCreateRootNode call is a HACK for ROS.

Modified:
    trunk/reactos/ntoskrnl/config/cmcheck.c
    trunk/reactos/ntoskrnl/config/cminit.c
    trunk/reactos/ntoskrnl/config/cmsysini.c

Modified: trunk/reactos/ntoskrnl/config/cmcheck.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmcheck.c?…
==============================================================================
--- trunk/reactos/ntoskrnl/config/cmcheck.c	[iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/config/cmcheck.c	[iso-8859-1] Fri May 30 20:40:02 2014
@@ -22,5 +22,6 @@
                 IN ULONG Flags)
 {
     /* FIXME: HACK! */
+    DPRINT1("CmCheckRegistry(0x%p, %lu) is UNIMPLEMENTED!\n", RegistryHive,
Flags);
     return 0;
 }

Modified: trunk/reactos/ntoskrnl/config/cminit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?r…
==============================================================================
--- trunk/reactos/ntoskrnl/config/cminit.c	[iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/config/cminit.c	[iso-8859-1] Fri May 30 20:40:02 2014
@@ -214,7 +214,8 @@
         (OperationType == HINIT_MAPFILE))
     {
         /* Verify integrity */
-        if (CmCheckRegistry((PCMHIVE)Hive, TRUE))
+        ULONG CheckStatus = CmCheckRegistry(Hive, CheckFlags);
+        if (CheckStatus != 0)
         {
             /* Cleanup allocations and fail */
             ExFreePoolWithTag(Hive->FlusherLock, TAG_CM);

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	[iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/config/cmsysini.c	[iso-8859-1] Fri May 30 20:40:02 2014
@@ -358,7 +358,7 @@
                                LogHandle,
                                NULL,
                                HiveName,
-                               0);
+                               CheckFlags);
     if (!NT_SUCCESS(Status))
     {
         /* Fail */
@@ -370,7 +370,7 @@
     /* Success, return hive */
     *Hive = NewHive;
 
-    /* ROS: Init root key cell and prepare the hive */
+    /* HACK: ROS: Init root key cell and prepare the hive */
     if (Operation == HINIT_CREATE) CmCreateRootNode(&NewHive->Hive,
L"");
 
     /* Duplicate the hive name */