Author: hbelusca
Date: Sun Jan 10 01:28:04 2016
New Revision: 70564
URL: http://svn.reactos.org/svn/reactos?rev=70564&view=rev
Log:
[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).
Modified:
trunk/reactos/lib/cmlib/cmlib.h
trunk/reactos/lib/cmlib/hiveinit.c
trunk/reactos/ntoskrnl/config/cminit.c
trunk/reactos/ntoskrnl/include/internal/cm.h
Modified: trunk/reactos/lib/cmlib/cmlib.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=70564&r1=70563&r2=70564&view=diff
==============================================================================
--- trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] (original)
+++ trunk/reactos/lib/cmlib/cmlib.h [iso-8859-1] Sun Jan 10 01:28:04 2016
@@ -310,19 +310,19 @@
*/
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(
Modified: trunk/reactos/lib/cmlib/hiveinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=70564&r1=70563&r2=70564&view=diff
==============================================================================
--- trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] (original)
+++ trunk/reactos/lib/cmlib/hiveinit.c [iso-8859-1] Sun Jan 10 01:28:04 2016
@@ -420,7 +420,7 @@
*
* @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 @@
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 @@
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 @@
Hive->Version = HSYS_MINOR;
Hive->HiveFlags = HiveFlags &~ HIVE_NOLAZYFLUSH;
- switch (Operation)
+ switch (OperationType)
{
case HINIT_CREATE:
Status = HvpCreateHive(Hive, FileName);
@@ -520,7 +520,7 @@
if (!NT_SUCCESS(Status)) return Status;
- if (Operation != HINIT_CREATE) CmPrepareHive(Hive);
+ if (OperationType != HINIT_CREATE) CmPrepareHive(Hive);
return Status;
}
Modified: trunk/reactos/ntoskrnl/config/cminit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cminit.c?rev=70564&r1=70563&r2=70564&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/config/cminit.c [iso-8859-1] Sun Jan 10
01:28:04 2016
@@ -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 @@
ULONG Cluster;
/* Assume failure */
- *RegistryHive = NULL;
+ *CmHive = NULL;
/*
* The following are invalid:
@@ -187,8 +187,8 @@
/* Initialize it */
Status = HvInitialize(&Hive->Hive,
OperationType,
+ HiveFlags,
FileType,
- HiveFlags,
HiveData,
CmpAllocate,
CmpFree,
@@ -237,7 +237,7 @@
ExReleasePushLock(&CmpHiveListHeadLock);
/* Return the hive and success */
- *RegistryHive = (PCMHIVE)Hive;
+ *CmHive = Hive;
return STATUS_SUCCESS;
}
Modified: trunk/reactos/ntoskrnl/include/internal/cm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/cm.h?rev=70564&r1=70563&r2=70564&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Sun Jan 10
01:28:04 2016
@@ -792,8 +792,8 @@
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,
