X-Git-Url: http://git.jankratochvil.net/?p=reactos.git;a=blobdiff_plain;f=ntoskrnl%2Fcm%2Fimport.c;h=2d3cd132f48626f7acb400b149449a0be32a57d2;hp=652f8d4ab5a90cdea372ee43371744e72a825d82;hb=HEAD;hpb=7c0db166f81fbe8c8b913d7f26048e337d383605

diff --git a/ntoskrnl/cm/import.c b/ntoskrnl/cm/import.c
index 652f8d4..2d3cd13 100644
--- a/ntoskrnl/cm/import.c
+++ b/ntoskrnl/cm/import.c
@@ -3,10 +3,12 @@
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS kernel
  * FILE:            ntoskrnl/cm/import.c
- * PURPOSE:         Registry functions
- * PROGRAMMERS:     Rex Jolliff
+ * PURPOSE:         Registry-Hive import functions
+ * PROGRAMMERS:     Eric Kohl
  */
 
+/* INCLUDES *****************************************************************/
+
 #include <ctype.h>
 
 #include <ddk/ntddk.h>
@@ -27,593 +29,8 @@
 
 static BOOLEAN CmiHardwareHiveImported = FALSE;
 
-/* FUNCTIONS ****************************************************************/
-
-static PCHAR 
-checkAndSkipMagic (PCHAR  regChunk)
-{
-  if (strncmp (regChunk, 
-               REGISTRY_FILE_MAGIC, 
-               strlen (REGISTRY_FILE_MAGIC)) != 0)
-  {
-    CPRINT ("incorrect magic number in registry chunk. expected: %s got:%.*s\n",
-            REGISTRY_FILE_MAGIC,
-            strlen (REGISTRY_FILE_MAGIC),
-            regChunk);
-    return  0;
-  }
-  regChunk += strlen (REGISTRY_FILE_MAGIC);
-  DPRINT ("Found regsitry chunk magic value\n");
-
-  return  regChunk;
-}
-
-static PCHAR
-skipWhitespaceInChunk (PCHAR regChunk)
-{
-  while (*regChunk && isspace (*regChunk))
-    regChunk++;
-
-  return *regChunk ? regChunk : 0;
-}
-
-static int
-computeKeyNameSize (PCHAR  regChunk)
-{
-  int  copyCount = 0;
-
-  while (*regChunk != 0 && *regChunk != ']')
-  {
-    copyCount++;
-    regChunk++;
-  }
-
-  return  copyCount;
-}
-
-static BOOLEAN
-allocateKeyName (PUNICODE_STRING  newKeyName, int  newKeySize)
-{
-  if (newKeyName->MaximumLength < (newKeySize + 1) * sizeof (WCHAR))
-  {
-    if (newKeyName->Buffer != 0)
-      ExFreePool (newKeyName->Buffer);
-    newKeyName->Length = 0;
-    newKeyName->MaximumLength = (newKeySize + 1) * sizeof (WCHAR);
-    newKeyName->Buffer = ExAllocatePool (NonPagedPool, newKeyName->MaximumLength);
-    if (newKeyName->Buffer == 0)
-    {
-      CPRINT ("Could not allocate space for key name\n");
-      return  FALSE;
-    }
-    newKeyName->Buffer [0] = 0;
-  }
-  else
-  {
-    newKeyName->Length = 0;
-    newKeyName->Buffer [0] = 0;
-  }
-
-  return  TRUE;
-}
-
-static PCHAR
-skipToNextKeyInChunk (PCHAR  regChunk)
-{
-  while (*regChunk != 0 && *regChunk != '[')
-  {
-    while (*regChunk != 0 && *regChunk != '\n')
-    {
-      regChunk++;
-    }
-    regChunk++;
-  }
-
-  return  *regChunk ? regChunk : 0;
-}
-
-static PCHAR
-getKeyNameFromChunk (PCHAR  regChunk, PUNICODE_STRING  newKeyName)
-{
-  int index = 0;
-
-  while (*regChunk != 0 && *regChunk != ']')
-  {
-    newKeyName->Buffer [index++] = *regChunk++;
-  }
-  newKeyName->Buffer [index] = '\0';
-  newKeyName->Length = index * sizeof (WCHAR);
-
-  return  *regChunk ? regChunk : 0;
-}
-
-static HANDLE
-createNewKey (PUNICODE_STRING  newKeyName)
-{
-  NTSTATUS  status;
-  OBJECT_ATTRIBUTES  attributes;
-  HANDLE  handleToReturn;
-
-  DPRINT ("Creating key (%wZ)\n", newKeyName);
-  InitializeObjectAttributes (&attributes,
-                              newKeyName,
-                              0,
-                              0,
-                              NULL);
-  status = NtCreateKey (&handleToReturn,
-                        KEY_ALL_ACCESS,
-                        &attributes,
-                        0,
-                        NULL,
-                        REG_OPTION_VOLATILE,
-                        NULL);
-  if (!NT_SUCCESS(status))
-  {
-    CPRINT ("Could not crete key (%wZ)\n", newKeyName);
-    return  INVALID_HANDLE_VALUE;
-  }
-
-  return  handleToReturn;
-}
-
-static PCHAR
-skipToNextKeyValueInChunk (PCHAR  regChunk)
-{
-  while (*regChunk != 0 && *regChunk != '\n')
-    regChunk++;
-  regChunk = skipWhitespaceInChunk (regChunk);
-  
-  return  regChunk;
-}
-
-static int
-computeKeyValueNameSize (PCHAR  regChunk)
-{
-  int size = 0;
-
-  if (*regChunk != '\"')
-    return  0;
-  regChunk++;
-  while (*regChunk != 0 && *regChunk != '\"')
-  {
-    size++;
-    regChunk++;
-  }
-
-  return  regChunk ? size : 0;
-}
-
-static PCHAR
-getKeyValueNameFromChunk (PCHAR  regChunk, PUNICODE_STRING  newKeyName)
-{
-  int  index = 0;
-
-  regChunk++;
-  while (*regChunk != 0 && *regChunk != '\"')
-  {
-    newKeyName->Buffer [index++] = *regChunk++;
-  }
-  newKeyName->Buffer [index] = '\0';
-  newKeyName->Length = index * sizeof (WCHAR);
-  regChunk++;
-
-  return  *regChunk ? regChunk : 0;
-}
-
-static PCHAR 
-getKeyValueTypeFromChunk (PCHAR  regChunk, PCHAR  dataFormat, int *keyValueType)
-{
-  if (*regChunk == '\"')
-  {
-    strcpy (dataFormat, "string");
-    *keyValueType = REG_SZ;
-  }
-  else if (strncmp (regChunk, "hex", 3) == 0)
-  {
-    strcpy (dataFormat, "hex");
-    regChunk += 3;
-    if (*regChunk == '(')
-    {
-      regChunk++;
-      *keyValueType = atoi (regChunk);
-      while (*regChunk != 0 && *regChunk != ')')
-        regChunk++;
-      regChunk++;
-    }
-    else
-      *keyValueType = REG_BINARY;
-    if (*regChunk == ':')
-      regChunk++;
-  }
-  else if (strncmp (regChunk, "dword", 5) == 0)
-  {
-    strcpy (dataFormat, "dword");
-    *keyValueType = REG_DWORD;
-    regChunk += 5;
-    if (*regChunk == ':')
-      regChunk++;
-  }
-  else if (strncmp (regChunk, "multi", 5) == 0)
-  {
-    strcpy (dataFormat, "multi");
-    *keyValueType = REG_MULTI_SZ;
-    regChunk += 5;
-    if (*regChunk == ':')
-      regChunk++;
-  }
-  else if (strncmp (regChunk, "expand", 6) == 0)
-  {
-    strcpy (dataFormat, "expand");
-    *keyValueType = REG_EXPAND_SZ;
-    regChunk += 6;
-    if (*regChunk == ':')
-      regChunk++;
-  }
-  else
-  {
-    UNIMPLEMENTED;
-  }
-
-  return  *regChunk ? regChunk : 0;
-}
-
-static int 
-computeKeyValueDataSize (PCHAR  regChunk, PCHAR  dataFormat)
-{
-  int  dataSize = 0;
-
-  if (strcmp (dataFormat, "string") == 0)
-  {
-    regChunk++;
-    while (*regChunk != 0 && *regChunk != '\"')
-    {
-      dataSize++;
-      dataSize++;
-      regChunk++;
-    }
-    dataSize++;
-    dataSize++;
-  }
-  else if (strcmp (dataFormat, "hex") == 0)
-  {
-    while (*regChunk != 0 && isxdigit(*regChunk))
-    {
-      regChunk++;
-      regChunk++;
-      dataSize++;
-      if (*regChunk == ',')
-      {
-        regChunk++;
-        if (*regChunk == '\\')
-        {
-          regChunk++;
-          regChunk = skipWhitespaceInChunk (regChunk);
-        }
-      }
-    }
-  }
-  else if (strcmp (dataFormat, "dword") == 0)
-  {
-    dataSize = sizeof(DWORD);
-    while (*regChunk != 0 && isxdigit(*regChunk))
-    {
-      regChunk++;
-    }
-  }
-  else if (strcmp (dataFormat, "multi") == 0)
-  {
-    while (*regChunk == '\"')
-    {
-      regChunk++;
-      while (*regChunk != 0 && *regChunk != '\"')
-      {
-        dataSize++;
-        dataSize++;
-        regChunk++;
-      }
-      regChunk++;
-      dataSize++;
-      dataSize++;
-      if (*regChunk == ',')
-      {
-        regChunk++;
-        regChunk = skipWhitespaceInChunk (regChunk);
-        if (*regChunk == '\\')
-        {
-          regChunk++;
-          regChunk = skipWhitespaceInChunk (regChunk);
-        }
-      }
-      else
-        break;
-    }
-    dataSize++;
-    dataSize++;
-  }
-  else if (strcmp (dataFormat, "expand") == 0)
-  {
-    regChunk++;
-    while (*regChunk != 0 && *regChunk != '\"')
-    {
-      dataSize++;
-      dataSize++;
-      regChunk++;
-    }
-    dataSize++;
-    dataSize++;
-  }
-  else
-  {
-    UNIMPLEMENTED;
-  }
-
-  return  dataSize;
-}
-
-static BOOLEAN
-allocateDataBuffer (PVOID * data, int * dataBufferSize, int dataSize)
-{
-  if (*dataBufferSize < dataSize)
-  {
-    if (*dataBufferSize > 0)
-      ExFreePool (*data);
-    *data = ExAllocatePool (NonPagedPool, dataSize);
-    *dataBufferSize = dataSize;
-  }
-
-  return  TRUE;
-}
-
-static PCHAR
-getKeyValueDataFromChunk (PCHAR  regChunk, PCHAR  dataFormat, PCHAR data)
-{
-  char  dataValue;
-  ULONG ulValue;
-  PWCHAR ptr;
-  
-  if (strcmp (dataFormat, "string") == 0)
-  {
-    /* convert quoted string to zero-terminated Unicode string */
-    ptr = (PWCHAR)data;
-    regChunk++;
-    while (*regChunk != 0 && *regChunk != '\"')
-    {
-      *ptr++ = (WCHAR)*regChunk++;
-    }
-    *ptr = 0;
-    regChunk++;
-  }
-  else if (strcmp (dataFormat, "hex") == 0)
-  {
-    while (*regChunk != 0 && isxdigit (*regChunk))
-    {
-      dataValue = (isdigit (*regChunk) ? *regChunk - '0' : 
-        tolower(*regChunk) - 'a' + 10) << 4;
-      regChunk++;
-      dataValue += (isdigit (*regChunk) ? *regChunk - '0' : 
-        tolower(*regChunk) - 'a' + 10);
-      regChunk++;
-      *data++ = dataValue;
-      if (*regChunk == ',')
-      {
-        regChunk++;
-        if (*regChunk == '\\')
-        {
-          regChunk++;
-          regChunk = skipWhitespaceInChunk (regChunk);
-        }
-      }
-    }
-  }
-  else if (strcmp (dataFormat, "dword") == 0)
-  {
-    ulValue = 0;
-    while (*regChunk != 0 && isxdigit(*regChunk))
-    {
-      dataValue = (isdigit (*regChunk) ? *regChunk - '0' : 
-        tolower(*regChunk) - 'a' + 10);
-      ulValue = (ulValue << 4) + dataValue;
-      regChunk++;
-    }
-    memcpy(data, &ulValue, sizeof(ULONG));
-  }
-  else if (strcmp (dataFormat, "multi") == 0)
-  {
-    ptr = (PWCHAR)data;
-    while (*regChunk == '\"')
-    {
-      regChunk++;
-      while (*regChunk != 0 && *regChunk != '\"')
-      {
-        *ptr++ = (WCHAR)*regChunk++;
-      }
-      regChunk++;
-      *ptr++ = 0;
-      if (*regChunk == ',')
-      {
-        regChunk++;
-        regChunk = skipWhitespaceInChunk (regChunk);
-        if (*regChunk == '\\')
-        {
-          regChunk++;
-          regChunk = skipWhitespaceInChunk (regChunk);
-        }
-      }
-      else
-        break;
-    }
-    *ptr = 0;
-  }
-  else if (strcmp (dataFormat, "expand") == 0)
-  {
-    /* convert quoted string to zero-terminated Unicode string */
-    ptr = (PWCHAR)data;
-    regChunk++;
-    while (*regChunk != 0 && *regChunk != '\"')
-    {
-      *ptr++ = (WCHAR)*regChunk++;
-    }
-    *ptr = 0;
-    regChunk++;
-  }
-  else
-  {
-    UNIMPLEMENTED;
-  }
-
-  return  *regChunk ? regChunk : 0;
-}
-
-static BOOLEAN
-setKeyValue (HANDLE  currentKey,
-             PUNICODE_STRING  newValueName,
-             ULONG  keyValueType,
-             PVOID  data,
-             ULONG  dataSize)
-{
-  NTSTATUS  status;
-
-  DPRINT ("Adding value (%wZ) to current key, with data type %d size %d\n",
-          newValueName,
-          keyValueType,
-          dataSize);
-  status = NtSetValueKey (currentKey,
-                          newValueName,
-                          0,
-                          keyValueType,
-                          data,
-                          dataSize);
-  if (!NT_SUCCESS(status))
-  {
-    CPRINT ("could not set key value, rc:%08x\n", status);
-    return  FALSE;
-  }
-
-  return  TRUE;
-}
-
-VOID
-CmImportTextHive(PCHAR  ChunkBase,
-		 ULONG  ChunkSize)
-{
-  HANDLE  currentKey = INVALID_HANDLE_VALUE;
-  int  newKeySize;
-  UNICODE_STRING  newKeyName = {0, 0, 0};
-  char  dataFormat [10];
-  int  keyValueType;
-  int  dataSize = 0;
-  int  dataBufferSize = 0;
-  PVOID  data = 0;
-  PCHAR regChunk;
-
-  DPRINT("ChunkBase %p  ChunkSize %lx\n", ChunkBase, ChunkSize);
-
-  regChunk = checkAndSkipMagic (ChunkBase);
-  if (regChunk == 0)
-    return;
-
-  while (regChunk != 0 && *regChunk != 0 && (((ULONG)regChunk-(ULONG)ChunkBase) < ChunkSize))
-  {
-    regChunk = skipWhitespaceInChunk (regChunk);
-    if (regChunk == 0)
-      continue;
-
-    if (*regChunk == '[')
-    {
-      if (currentKey != INVALID_HANDLE_VALUE)
-      {
-        DPRINT("Closing current key: 0x%lx\n", currentKey);
-        NtClose (currentKey);
-        currentKey = INVALID_HANDLE_VALUE;
-      }
-
-      regChunk++;
-
-      newKeySize = computeKeyNameSize (regChunk);
-      if (!allocateKeyName (&newKeyName, newKeySize))
-      {
-        regChunk = 0;
-        continue;
-      }
-
-      regChunk = getKeyNameFromChunk (regChunk, &newKeyName);
-      if (regChunk == 0)
-        continue;
-
-      currentKey = createNewKey (&newKeyName);
-      if (currentKey == INVALID_HANDLE_VALUE)
-      {
-        regChunk = skipToNextKeyInChunk (regChunk);
-        continue;
-      }
-
-      regChunk++;
-    }
-    else
-    {
-      if (currentKey == INVALID_HANDLE_VALUE)
-      {
-        regChunk = skipToNextKeyInChunk (regChunk);
-        continue;
-      }
-
-      newKeySize = computeKeyValueNameSize (regChunk);
-      if (!allocateKeyName (&newKeyName, newKeySize))
-      {
-        regChunk = 0;
-        continue;
-      }
-
-      regChunk = getKeyValueNameFromChunk (regChunk, &newKeyName);
-      if (regChunk == 0)
-        continue;
-
-      if (*regChunk != '=')
-      {
-        regChunk = skipToNextKeyValueInChunk (regChunk);
-        continue;
-      }
-      regChunk++;
-
-      regChunk = getKeyValueTypeFromChunk (regChunk, dataFormat, &keyValueType);
-      if (regChunk == 0)
-        continue;
-
-      dataSize = computeKeyValueDataSize (regChunk, dataFormat);
-      if (!allocateDataBuffer (&data, &dataBufferSize, dataSize))
-      {
-        regChunk = 0;
-        continue;
-      }
-      
-      regChunk = getKeyValueDataFromChunk (regChunk, dataFormat, data);
-      if (regChunk == 0)
-        continue;
-
-      if (!setKeyValue (currentKey, &newKeyName, keyValueType, data, dataSize))
-      {
-        regChunk = 0;
-        continue;
-      }
-    }
-  }
-
-  if (currentKey != INVALID_HANDLE_VALUE)
-  {
-    NtClose (currentKey);
-  }
-  if (newKeyName.Buffer != 0)
-  {
-    ExFreePool (newKeyName.Buffer);
-  }
-  if (data != 0)
-  {
-    ExFreePool (data);
-  }
-
-  return;
-}
 
+/* FUNCTIONS ****************************************************************/
 
 static BOOLEAN
 CmImportBinaryHive (PCHAR ChunkBase,
@@ -622,17 +39,11 @@ CmImportBinaryHive (PCHAR ChunkBase,
 		    PREGISTRY_HIVE *RegistryHive)
 {
   PREGISTRY_HIVE Hive;
-  PCELL_HEADER FreeBlock;
-  BLOCK_OFFSET BlockOffset;
-  PHBIN Bin;
-  ULONG i, j;
-  ULONG FreeOffset;
   NTSTATUS Status;
-  ULONG BitmapSize;
 
   *RegistryHive = NULL;
 
-  if (strncmp (ChunkBase, "regf", 4) != 0)
+  if (strncmp (ChunkBase, "regf", 4))
     {
       DPRINT1 ("Found invalid '%*s' magic\n", 4, ChunkBase);
       return FALSE;
@@ -677,9 +88,9 @@ CmImportBinaryHive (PCHAR ChunkBase,
 
   /* Allocate block list */
   DPRINT("Space needed for block list describing hive: 0x%x\n",
-	 sizeof(PHBIN *) * Hive->BlockListSize);
+	 Hive->BlockListSize * sizeof(PHBIN *));
   Hive->BlockList = ExAllocatePool (NonPagedPool,
-				    sizeof(PHBIN *) * Hive->BlockListSize);
+				    Hive->BlockListSize * sizeof(PHBIN *));
   if (Hive->BlockList == NULL)
     {
       DPRINT1 ("Allocating block list failed\n");
@@ -687,106 +98,50 @@ CmImportBinaryHive (PCHAR ChunkBase,
       ExFreePool (Hive);
       return FALSE;
     }
+  RtlZeroMemory (Hive->BlockList,
+		 Hive->BlockListSize * sizeof(PHBIN *));
 
-  /* Allocate the hive block */
-  Hive->BlockList[0] = ExAllocatePool (PagedPool,
-				       Hive->FileSize - 4096);
-  if (Hive->BlockList[0] == NULL)
+  /* Import the bins */
+  Status = CmiImportHiveBins(Hive,
+			     (PUCHAR)((ULONG_PTR)ChunkBase + 4096));
+  if (!NT_SUCCESS(Status))
     {
-      DPRINT1 ("Allocating the first hive block failed\n");
+      DPRINT1 ("CmiImportHiveBins() failed (Status %lx)\n", Status);
+      CmiFreeHiveBins (Hive);
       ExFreePool (Hive->BlockList);
       ExFreePool (Hive->HiveHeader);
       ExFreePool (Hive);
-      return FALSE;
+      return Status;
     }
 
-  /* Import the hive block */
-  RtlCopyMemory (Hive->BlockList[0],
-		 ChunkBase + 4096,
-		 Hive->FileSize - 4096);
-
-  /* Initialize the free block list */
-  Hive->FreeListSize = 0;
-  Hive->FreeListMax = 0;
-  Hive->FreeList = NULL;
-
-  BlockOffset = 0;
-  for (i = 0; i < Hive->BlockListSize; i++)
+  /* Initialize the free cell list */
+  Status = CmiCreateHiveFreeCellList (Hive);
+  if (!NT_SUCCESS(Status))
     {
-      Hive->BlockList[i] = (PHBIN) (((ULONG_PTR)Hive->BlockList[0]) + BlockOffset);
-      Bin = (PHBIN) (((ULONG_PTR)Hive->BlockList[i]));
-      if (Bin->BlockId != REG_BIN_ID)
-	{
-	  DPRINT1 ("Bad BlockId %x, offset %x\n", Bin->BlockId, BlockOffset);
-	  /* FIXME: */
-	  assert(FALSE);
-//	  return STATUS_INSUFFICIENT_RESOURCES;
-	}
-
-      assertmsg((Bin->BlockSize % 4096) == 0, ("BlockSize (0x%.08x) must be multiplum of 4K\n", Bin->BlockSize));
-
-      if (Bin->BlockSize > 4096)
-	{
-	  for (j = 1; j < Bin->BlockSize / 4096; j++)
-	    {
-	      Hive->BlockList[i + j] = Hive->BlockList[i];
-	    }
-	  i = i + j - 1;
-	}
+      DPRINT1 ("CmiCreateHiveFreeCellList() failed (Status %lx)\n", Status);
+      CmiFreeHiveBins (Hive);
+      ExFreePool (Hive->BlockList);
+      ExFreePool (Hive->HiveHeader);
+      ExFreePool (Hive);
 
-      /* Search free blocks and add to list */
-      FreeOffset = REG_HBIN_DATA_OFFSET;
-      while (FreeOffset < Bin->BlockSize)
-	{
-	  FreeBlock = (PCELL_HEADER) ((ULONG_PTR)Hive->BlockList[i] + FreeOffset);
-	  if (FreeBlock->CellSize > 0)
-	    {
-	      Status = CmiAddFree(Hive,
-				  FreeBlock,
-				  Hive->BlockList[i]->BlockOffset + FreeOffset,
-				  FALSE);
-	      if (!NT_SUCCESS(Status))
-		{
-		  /* FIXME: */
-		  assert(FALSE);
-		}
-
-	      FreeOffset += FreeBlock->CellSize;
-	    }
-	  else
-	    {
-	      FreeOffset -= FreeBlock->CellSize;
-	    }
-	}
-      BlockOffset += Bin->BlockSize;
+      return Status;
     }
 
-  if (!(Hive->Flags & HIVE_VOLATILE))
+  if (!(Hive->Flags & HIVE_NO_FILE))
     {
-      /* Calculate bitmap size in bytes (always a multiple of 32 bits) */
-      BitmapSize = ROUND_UP (Hive->BlockListSize, sizeof(ULONG) * 8) / 8;
-      DPRINT ("Hive->BlockListSize: %lu\n", Hive->BlockListSize);
-      DPRINT ("BitmapSize:  %lu Bytes  %lu Bits\n", BitmapSize, BitmapSize * 8);
-
-      /* Allocate bitmap */
-      Hive->BitmapBuffer = (PULONG)ExAllocatePool (PagedPool,
-						   BitmapSize);
-      if (Hive->BitmapBuffer == NULL)
+      /* Create the block bitmap */
+      Status = CmiCreateHiveBitmap (Hive);
+      if (!NT_SUCCESS(Status))
 	{
-	  DPRINT1 ("Allocating the hive bitmap failed\n");
-	  ExFreePool (Hive->BlockList[0]);
+	  DPRINT1 ("CmiCreateHiveBitmap() failed (Status %lx)\n", Status);
+	  CmiFreeHiveFreeCellList (Hive);
+	  CmiFreeHiveBins (Hive);
 	  ExFreePool (Hive->BlockList);
 	  ExFreePool (Hive->HiveHeader);
 	  ExFreePool (Hive);
-	  return FALSE;
-	}
 
-      /* Initialize bitmap */
-      RtlInitializeBitMap (&Hive->DirtyBitMap,
-			   Hive->BitmapBuffer,
-			   BitmapSize * 8);
-      RtlClearAllBits (&Hive->DirtyBitMap);
-      Hive->HiveDirty = FALSE;
+	  return Status;
+	}
     }
 
   /* Initialize the hive's executive resource */
@@ -811,19 +166,14 @@ BOOLEAN
 CmImportSystemHive(PCHAR ChunkBase,
 		   ULONG ChunkSize)
 {
+  OBJECT_ATTRIBUTES ObjectAttributes;
   PREGISTRY_HIVE RegistryHive;
   UNICODE_STRING KeyName;
   NTSTATUS Status;
 
   DPRINT ("CmImportSystemHive() called\n");
 
-  if (strncmp (ChunkBase, "REGEDIT4", 8) == 0)
-    {
-      DPRINT ("Found 'REGEDIT4' magic\n");
-      CmImportTextHive (ChunkBase, ChunkSize);
-      return TRUE;
-    }
-  else if (strncmp (ChunkBase, "regf", 4) != 0)
+  if (strncmp (ChunkBase, "regf", 4))
     {
       DPRINT1 ("Found invalid '%.*s' magic\n", 4, ChunkBase);
       return FALSE;
@@ -841,8 +191,13 @@ CmImportSystemHive(PCHAR ChunkBase,
   /* Attach it to the machine key */
   RtlInitUnicodeString (&KeyName,
 			L"\\Registry\\Machine\\System");
-  Status = CmiConnectHive (RegistryHive,
-			   &KeyName);
+  InitializeObjectAttributes (&ObjectAttributes,
+			      &KeyName,
+			      OBJ_CASE_INSENSITIVE,
+			      NULL,
+			      NULL);
+  Status = CmiConnectHive (&ObjectAttributes,
+			   RegistryHive);
   if (!NT_SUCCESS(Status))
     {
       DPRINT1 ("CmiConnectHive() failed (Status %lx)\n", Status);
@@ -866,8 +221,8 @@ BOOLEAN
 CmImportHardwareHive(PCHAR ChunkBase,
 		     ULONG ChunkSize)
 {
-  PREGISTRY_HIVE RegistryHive;
   OBJECT_ATTRIBUTES ObjectAttributes;
+  PREGISTRY_HIVE RegistryHive;
   UNICODE_STRING KeyName;
   HANDLE HardwareKey;
   ULONG Disposition;
@@ -882,11 +237,11 @@ CmImportHardwareHive(PCHAR ChunkBase,
       ChunkSize == 0)
     {
       /* Create '\Registry\Machine\HARDWARE' key. */
-      RtlInitUnicodeString(&KeyName,
-			   L"\\Registry\\Machine\\HARDWARE");
+      RtlInitUnicodeString (&KeyName,
+			    L"\\Registry\\Machine\\HARDWARE");
       InitializeObjectAttributes (&ObjectAttributes,
 				  &KeyName,
-				  0,
+				  OBJ_CASE_INSENSITIVE,
 				  NULL,
 				  NULL);
       Status = NtCreateKey (&HardwareKey,
@@ -907,7 +262,7 @@ CmImportHardwareHive(PCHAR ChunkBase,
 			   L"\\Registry\\Machine\\HARDWARE\\DESCRIPTION");
       InitializeObjectAttributes (&ObjectAttributes,
 				  &KeyName,
-				  0,
+				  OBJ_CASE_INSENSITIVE,
 				  NULL,
 				  NULL);
       Status = NtCreateKey (&HardwareKey,
@@ -924,11 +279,11 @@ CmImportHardwareHive(PCHAR ChunkBase,
       NtClose (HardwareKey);
 
       /* Create '\Registry\Machine\HARDWARE\DEVICEMAP' key. */
-      RtlInitUnicodeString(&KeyName,
-			   L"\\Registry\\Machine\\HARDWARE\\DEVICEMAP");
+      RtlInitUnicodeString (&KeyName,
+			    L"\\Registry\\Machine\\HARDWARE\\DEVICEMAP");
       InitializeObjectAttributes (&ObjectAttributes,
 				  &KeyName,
-				  0,
+				  OBJ_CASE_INSENSITIVE,
 				  NULL,
 				  NULL);
       Status = NtCreateKey (&HardwareKey,
@@ -949,7 +304,7 @@ CmImportHardwareHive(PCHAR ChunkBase,
 			   L"\\Registry\\Machine\\HARDWARE\\RESOURCEMAP");
       InitializeObjectAttributes (&ObjectAttributes,
 				  &KeyName,
-				  0,
+				  OBJ_CASE_INSENSITIVE,
 				  NULL,
 				  NULL);
       Status = NtCreateKey (&HardwareKey,
@@ -968,7 +323,8 @@ CmImportHardwareHive(PCHAR ChunkBase,
       return TRUE;
     }
 
-  if (strncmp (ChunkBase, "regf", 4) != 0)
+  /* Check the hive magic */
+  if (strncmp (ChunkBase, "regf", 4))
     {
       DPRINT1 ("Found invalid '%.*s' magic\n", 4, ChunkBase);
       return FALSE;
@@ -978,7 +334,7 @@ CmImportHardwareHive(PCHAR ChunkBase,
   DPRINT ("ChunkBase %lx  ChunkSize %lu\n", ChunkBase, ChunkSize);
 
   /* Import the binary system hive (volatile, offset-based, permanent) */
-  if (!CmImportBinaryHive (ChunkBase, ChunkSize, HIVE_VOLATILE, &RegistryHive))
+  if (!CmImportBinaryHive (ChunkBase, ChunkSize, HIVE_NO_FILE, &RegistryHive))
     {
       DPRINT1 ("CmiImportBinaryHive() failed\n", Status);
       return FALSE;
@@ -987,8 +343,13 @@ CmImportHardwareHive(PCHAR ChunkBase,
   /* Attach it to the machine key */
   RtlInitUnicodeString (&KeyName,
 			L"\\Registry\\Machine\\HARDWARE");
-  Status = CmiConnectHive (RegistryHive,
-			   &KeyName);
+  InitializeObjectAttributes (&ObjectAttributes,
+			      &KeyName,
+			      OBJ_CASE_INSENSITIVE,
+			      NULL,
+			      NULL);
+  Status = CmiConnectHive (&ObjectAttributes,
+			   RegistryHive);
   if (!NT_SUCCESS(Status))
     {
       DPRINT1 ("CmiConnectHive() failed (Status %lx)\n", Status);