[fireball] 29935: - Ugh, a few more leftovers... Hopefully nothing is forgotten now.

Author: fireball
Date: Sun Oct 28 21:36:09 2007
New Revision: 29935

URL: http://svn.reactos.org/svn/reactos?rev=29935&view=rev
Log:
- Ugh, a few more leftovers... Hopefully nothing is forgotten now.

Modified:
    branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c

Modified: branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c
URL:
http://svn.reactos.org/svn/reactos/branches/alex-cm-branch/reactos/ntoskrnl…
==============================================================================
--- branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c (original)
+++ branches/alex-cm-branch/reactos/ntoskrnl/cm/cmwraprs.c Sun Oct 28 21:36:09 2007
@@ -77,8 +77,8 @@
             OUT PVOID Buffer,
             IN SIZE_T BufferLength)
 {
-    PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive;
-    HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle :
CmHive->LogHandle;
+    PCMHIVE CmHive = (PCMHIVE)RegistryHive;
+    HANDLE HiveHandle = CmHive->FileHandles[FileType];
     LARGE_INTEGER _FileOffset;
     IO_STATUS_BLOCK IoStatusBlock;
     NTSTATUS Status;
@@ -97,8 +97,8 @@
              IN PVOID Buffer,
              IN SIZE_T BufferLength)
 {
-    PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive;
-    HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle :
CmHive->LogHandle;
+    PCMHIVE CmHive = (PCMHIVE)RegistryHive;
+    HANDLE HiveHandle = CmHive->FileHandles[FileType];
     LARGE_INTEGER _FileOffset;
     IO_STATUS_BLOCK IoStatusBlock;
     NTSTATUS Status;
@@ -116,8 +116,8 @@
                IN ULONG FileSize,
                IN ULONG OldFileSize)
 {
-    PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive;
-    HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle :
CmHive->LogHandle;
+    PCMHIVE CmHive = (PCMHIVE)RegistryHive;
+    HANDLE HiveHandle = CmHive->FileHandles[FileType];
     FILE_END_OF_FILE_INFORMATION EndOfFileInfo;
     FILE_ALLOCATION_INFORMATION FileAllocationInfo;
     IO_STATUS_BLOCK IoStatusBlock;
@@ -149,8 +149,8 @@
              IN OUT PLARGE_INTEGER FileOffset,
              IN ULONG Length)
 {
-    PEREGISTRY_HIVE CmHive = (PEREGISTRY_HIVE)RegistryHive;
-    HANDLE HiveHandle = FileType == HFILE_TYPE_PRIMARY ? CmHive->HiveHandle :
CmHive->LogHandle;
+    PCMHIVE CmHive = (PCMHIVE)RegistryHive;
+    HANDLE HiveHandle = CmHive->FileHandles[FileType];
     IO_STATUS_BLOCK IoStatusBlock;
     NTSTATUS Status;