[ros-diffs] [ion] 23577: - Parameter changes to HvInitialize

Author: ion
Date: Mon Aug 14 16:50:09 2006
New Revision: 23577

URL: http://svn.reactos.org/svn/reactos?rev=23577&view=rev
Log:
- Parameter changes to HvInitialize

Modified:
    trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c
    trunk/reactos/lib/cmlib/cmlib.h
    trunk/reactos/lib/cmlib/hiveinit.c
    trunk/reactos/ntoskrnl/cm/import.c
    trunk/reactos/ntoskrnl/cm/regfile.c

Modified: trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/react…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c (original)
+++ trunk/reactos/boot/freeldr/freeldr/reactos/binhive.c Mon Aug 14 16:50:09 2006
@@ -715,7 +715,7 @@
   Status = HvInitialize (&Hive, HV_OPERATION_MEMORY_INPLACE,
                          (ULONG_PTR)ChunkBase, ChunkSize,
                          CmpAllocate, CmpFree,
-                         NULL, NULL, NULL, NULL, NULL);
+                         NULL, NULL, NULL, NULL, NULL, NULL);
   if (!NT_SUCCESS(Status))
     {
       DbgPrint((DPRINT_REGISTRY, "Invalid hive id!\n"));
@@ -810,7 +810,7 @@
 
   Status = HvInitialize (&Hive, HV_OPERATION_CREATE_HIVE, 0, 0,
                          CmpAllocate, CmpFree,
-                         NULL, NULL, NULL, NULL, NULL);
+                         NULL, NULL, NULL, NULL, NULL, NULL);
   if (!NT_SUCCESS(Status))
     {
       return FALSE;

Modified: trunk/reactos/lib/cmlib/cmlib.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/cmlib.h?rev=2357…
==============================================================================
--- trunk/reactos/lib/cmlib/cmlib.h (original)
+++ trunk/reactos/lib/cmlib/cmlib.h Mon Aug 14 16:50:09 2006
@@ -130,15 +130,16 @@
 HvInitialize(
    PHHIVE *RegistryHive,
    ULONG Operation,
-   ULONG_PTR ChunkBase,
-   SIZE_T ChunkSize,
+   ULONG_PTR HiveData OPTIONAL,
+   SIZE_T Cluster, // HACK!!
    PALLOCATE_ROUTINE Allocate,
    PFREE_ROUTINE Free,
    PFILE_READ_ROUTINE FileRead,
    PFILE_WRITE_ROUTINE FileWrite,
    PFILE_SET_SIZE_ROUTINE FileSetSize,
    PFILE_FLUSH_ROUTINE FileFlush,
-   PVOID Opaque);
+   PVOID Opaque, // HACK!!
+   IN PUNICODE_STRING FileName);
 
 VOID CMAPI 
 HvFree(

Modified: trunk/reactos/lib/cmlib/hiveinit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/cmlib/hiveinit.c?rev=2…
==============================================================================
--- trunk/reactos/lib/cmlib/hiveinit.c (original)
+++ trunk/reactos/lib/cmlib/hiveinit.c Mon Aug 14 16:50:09 2006
@@ -309,7 +309,8 @@
    PFILE_WRITE_ROUTINE FileWrite,
    PFILE_SET_SIZE_ROUTINE FileSetSize,
    PFILE_FLUSH_ROUTINE FileFlush,
-   PVOID Opaque)
+   PVOID Opaque,
+   IN PUNICODE_STRING FileName)
 {
    NTSTATUS Status;
    PHHIVE Hive;

Modified: trunk/reactos/ntoskrnl/cm/import.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/import.c?rev=2…
==============================================================================
--- trunk/reactos/ntoskrnl/cm/import.c (original)
+++ trunk/reactos/ntoskrnl/cm/import.c Mon Aug 14 16:50:09 2006
@@ -55,7 +55,7 @@
                         (ULONG_PTR)ChunkBase, ChunkSize,
                         CmpAllocate, CmpFree,
                         CmpFileRead, CmpFileWrite, CmpFileSetSize,
-                        CmpFileFlush, Hive);
+                        CmpFileFlush, Hive, NULL);
   if (!NT_SUCCESS(Status))
     {
       DPRINT1 ("Opening hive failed (%x)\n", Status);

Modified: trunk/reactos/ntoskrnl/cm/regfile.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=…
==============================================================================
--- trunk/reactos/ntoskrnl/cm/regfile.c (original)
+++ trunk/reactos/ntoskrnl/cm/regfile.c Mon Aug 14 16:50:09 2006
@@ -143,7 +143,7 @@
   Status = HvInitialize(&Hive, HV_OPERATION_CREATE_HIVE, 0, 0,
                         CmpAllocate, CmpFree,
                         CmpFileRead, CmpFileWrite, CmpFileSetSize,
-                        CmpFileFlush, &CmHive);
+                        CmpFileFlush, &CmHive, NULL);
   if (!NT_SUCCESS(Status))
     {
       return FALSE;
@@ -571,7 +571,7 @@
                         (ULONG_PTR)ViewBase, ViewSize,
                         CmpAllocate, CmpFree,
                         CmpFileRead, CmpFileWrite, CmpFileSetSize,
-                        CmpFileFlush, RegistryHive);
+                        CmpFileFlush, RegistryHive, NULL);
   if (!NT_SUCCESS(Status))
     {
       DPRINT1("Failed to open hive\n");
@@ -622,7 +622,7 @@
   Status = HvInitialize(&Hive->Hive, HV_OPERATION_CREATE_HIVE, 0, 0,
                         CmpAllocate, CmpFree,
                         CmpFileRead, CmpFileWrite, CmpFileSetSize,
-                        CmpFileFlush, Hive);
+                        CmpFileFlush, Hive, NULL);
   if (!NT_SUCCESS(Status))
     {
       ExFreePool (Hive);