[NTOS:CONFIG]

- Use the standard "CmHive" naming (that is used in all the rest of the 'config' module) for the first parameter of CmpInitializeHive.
[CMLIB]
- Fix the order of the 'HiveFlags'/'FileType' parameters in HvInitialize (the function 'CmGetSystemControlValues' in ntoskrnl/config/cmcontrl.c got them right already).

svn path=/trunk/; revision=70564

diff --git a/reactos/lib/cmlib/cmlib.h b/reactos/lib/cmlib/cmlib.h
index 35b6a26..93bb2ad 100644 (file)
--- a/reactos/lib/cmlib/cmlib.h
+++ b/reactos/lib/cmlib/cmlib.h
@@ -310,19 +310,19 @@ CmpIsKeyValueBig(IN PHHIVE Hive,
  */
 NTSTATUS CMAPI
 HvInitialize(
-   PHHIVE RegistryHive,
-   ULONG Operation,
-   ULONG HiveType,
-   ULONG HiveFlags,
-   PVOID HiveData OPTIONAL,
-   PALLOCATE_ROUTINE Allocate,
-   PFREE_ROUTINE Free,
-   PFILE_SET_SIZE_ROUTINE FileSetSize,
-   PFILE_WRITE_ROUTINE FileWrite,
-   PFILE_READ_ROUTINE FileRead,
-   PFILE_FLUSH_ROUTINE FileFlush,
-   ULONG Cluster OPTIONAL,
-   PCUNICODE_STRING FileName OPTIONAL);
+    PHHIVE RegistryHive,
+    ULONG OperationType,
+    ULONG HiveFlags,
+    ULONG FileType,
+    PVOID HiveData OPTIONAL,
+    PALLOCATE_ROUTINE Allocate,
+    PFREE_ROUTINE Free,
+    PFILE_SET_SIZE_ROUTINE FileSetSize,
+    PFILE_WRITE_ROUTINE FileWrite,
+    PFILE_READ_ROUTINE FileRead,
+    PFILE_FLUSH_ROUTINE FileFlush,
+    ULONG Cluster OPTIONAL,
+    PCUNICODE_STRING FileName OPTIONAL);
 
 VOID CMAPI
 HvFree(

diff --git a/reactos/lib/cmlib/hiveinit.c b/reactos/lib/cmlib/hiveinit.c
index 33e764c..c3d5924 100644 (file)
--- a/reactos/lib/cmlib/hiveinit.c
+++ b/reactos/lib/cmlib/hiveinit.c
@@ -420,7 +420,7 @@ HvLoadHive(IN PHHIVE Hive,
  *
  * @param RegistryHive
  *        Output variable to store pointer to the hive descriptor.
- * @param Operation
+ * @param OperationType
  *        - HV_OPERATION_CREATE_HIVE
  *          Create a new hive for read/write access.
  *        - HV_OPERATION_MEMORY
@@ -447,9 +447,9 @@ HvLoadHive(IN PHHIVE Hive,
 NTSTATUS CMAPI
 HvInitialize(
     PHHIVE RegistryHive,
-    ULONG Operation,
-    ULONG HiveType,
+    ULONG OperationType,
     ULONG HiveFlags,
+    ULONG FileType,
     PVOID HiveData OPTIONAL,
     PALLOCATE_ROUTINE Allocate,
     PFREE_ROUTINE Free,
@@ -463,7 +463,7 @@ HvInitialize(
     NTSTATUS Status;
     PHHIVE Hive = RegistryHive;
 
-    UNREFERENCED_PARAMETER(HiveType);
+    UNREFERENCED_PARAMETER(FileType);
 
     /*
      * Create a new hive structure that will hold all the maintenance data.
@@ -482,7 +482,7 @@ HvInitialize(
     Hive->Version = HSYS_MINOR;
     Hive->HiveFlags = HiveFlags &~ HIVE_NOLAZYFLUSH;
 
-    switch (Operation)
+    switch (OperationType)
     {
         case HINIT_CREATE:
             Status = HvpCreateHive(Hive, FileName);
@@ -520,7 +520,7 @@ HvInitialize(
 
     if (!NT_SUCCESS(Status)) return Status;
 
-    if (Operation != HINIT_CREATE) CmPrepareHive(Hive);
+    if (OperationType != HINIT_CREATE) CmPrepareHive(Hive);
 
     return Status;
 }

diff --git a/reactos/ntoskrnl/config/cminit.c b/reactos/ntoskrnl/config/cminit.c
index d74429b..6a66345 100644 (file)
--- a/reactos/ntoskrnl/config/cminit.c
+++ b/reactos/ntoskrnl/config/cminit.c
@@ -16,7 +16,7 @@
 
 NTSTATUS
 NTAPI
-CmpInitializeHive(OUT PCMHIVE *RegistryHive,
+CmpInitializeHive(OUT PCMHIVE *CmHive,
                   IN ULONG OperationType,
                   IN ULONG HiveFlags,
                   IN ULONG FileType,
@@ -35,7 +35,7 @@ CmpInitializeHive(OUT PCMHIVE *RegistryHive,
     ULONG Cluster;
 
     /* Assume failure */
-    *RegistryHive = NULL;
+    *CmHive = NULL;
 
     /*
      * The following are invalid:
@@ -187,8 +187,8 @@ CmpInitializeHive(OUT PCMHIVE *RegistryHive,
     /* Initialize it */
     Status = HvInitialize(&Hive->Hive,
                           OperationType,
-                          FileType,
                           HiveFlags,
+                          FileType,
                           HiveData,
                           CmpAllocate,
                           CmpFree,
@@ -237,7 +237,7 @@ CmpInitializeHive(OUT PCMHIVE *RegistryHive,
     ExReleasePushLock(&CmpHiveListHeadLock);
 
     /* Return the hive and success */
-    *RegistryHive = (PCMHIVE)Hive;
+    *CmHive = Hive;
     return STATUS_SUCCESS;
 }
 

diff --git a/reactos/ntoskrnl/include/internal/cm.h b/reactos/ntoskrnl/include/internal/cm.h
index 2124fe2..4d14e4b 100644 (file)
--- a/reactos/ntoskrnl/include/internal/cm.h
+++ b/reactos/ntoskrnl/include/internal/cm.h
@@ -792,8 +792,8 @@ NTSTATUS
 NTAPI
 CmpInitializeHive(
     OUT PCMHIVE *CmHive,
-    IN ULONG Operation,
-    IN ULONG Flags,
+    IN ULONG OperationType,
+    IN ULONG HiveFlags,
     IN ULONG FileType,
     IN PVOID HiveData OPTIONAL,
     IN HANDLE Primary,