Enable hardware hive import.

svn path=/trunk/; revision=4569
This commit is contained in:
Eric Kohl 2003-04-24 12:28:57 +00:00
parent a94c5d7e28
commit 33b0769d71

View file

@ -1,4 +1,4 @@
/* $Id: import.c,v 1.17 2003/04/17 11:07:21 ekohl Exp $ /* $Id: import.c,v 1.18 2003/04/24 12:28:57 ekohl Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -866,9 +866,7 @@ BOOLEAN
CmImportHardwareHive(PCHAR ChunkBase, CmImportHardwareHive(PCHAR ChunkBase,
ULONG ChunkSize) ULONG ChunkSize)
{ {
#if 0
PREGISTRY_HIVE RegistryHive; PREGISTRY_HIVE RegistryHive;
#endif
OBJECT_ATTRIBUTES ObjectAttributes; OBJECT_ATTRIBUTES ObjectAttributes;
UNICODE_STRING KeyName; UNICODE_STRING KeyName;
HANDLE HardwareKey; HANDLE HardwareKey;
@ -877,9 +875,11 @@ CmImportHardwareHive(PCHAR ChunkBase,
DPRINT ("CmImportHardwareHive() called\n"); DPRINT ("CmImportHardwareHive() called\n");
if (CmiHardwareHiveImported == TRUE)
return TRUE;
if (ChunkBase == NULL && if (ChunkBase == NULL &&
ChunkSize == 0 && ChunkSize == 0)
CmiHardwareHiveImported == FALSE)
{ {
/* Create '\Registry\Machine\HARDWARE' key. */ /* Create '\Registry\Machine\HARDWARE' key. */
RtlInitUnicodeString(&KeyName, RtlInitUnicodeString(&KeyName,
@ -968,7 +968,6 @@ CmImportHardwareHive(PCHAR ChunkBase,
return TRUE; return TRUE;
} }
#if 0
if (strncmp (ChunkBase, "regf", 4) != 0) if (strncmp (ChunkBase, "regf", 4) != 0)
{ {
DPRINT1 ("Found invalid '%.*s' magic\n", 4, ChunkBase); DPRINT1 ("Found invalid '%.*s' magic\n", 4, ChunkBase);
@ -976,6 +975,7 @@ CmImportHardwareHive(PCHAR ChunkBase,
} }
DPRINT ("Found '%.*s' magic\n", 4, ChunkBase); DPRINT ("Found '%.*s' magic\n", 4, ChunkBase);
DPRINT ("ChunkBase %lx ChunkSize %lu\n", ChunkBase, ChunkSize);
/* Import the binary system hive (volatile, offset-based, permanent) */ /* Import the binary system hive (volatile, offset-based, permanent) */
if (!CmImportBinaryHive (ChunkBase, ChunkSize, HIVE_VOLATILE, &RegistryHive)) if (!CmImportBinaryHive (ChunkBase, ChunkSize, HIVE_VOLATILE, &RegistryHive))
@ -997,13 +997,12 @@ CmImportHardwareHive(PCHAR ChunkBase,
} }
/* Set the hive filename */ /* Set the hive filename */
RtlCreateUnicodeString (&RegistryHive->HiveFileName, RtlInitUnicodeString (&RegistryHive->HiveFileName,
NULL); NULL);
/* Set the log filename */ /* Set the log filename */
RtlCreateUnicodeString (&RegistryHive->LogFileName, RtlInitUnicodeString (&RegistryHive->LogFileName,
NULL); NULL);
#endif
CmiHardwareHiveImported = TRUE; CmiHardwareHiveImported = TRUE;