allocate LogFileName and HiveFileName from paged pool

svn path=/trunk/; revision=16692

diff --git a/reactos/ntoskrnl/cm/import.c b/reactos/ntoskrnl/cm/import.c
index f0be6f8..6de8ecf 100644 (file)
--- a/reactos/ntoskrnl/cm/import.c
+++ b/reactos/ntoskrnl/cm/import.c
@@ -196,12 +196,12 @@ CmImportSystemHive(PCHAR ChunkBase,
     }
 
   /* Set the hive filename */
-  RtlpCreateUnicodeString (&RegistryHive->HiveFileName,
-           SYSTEM_REG_FILE, NonPagedPool);
+  RtlCreateUnicodeString (&RegistryHive->HiveFileName,
+                          SYSTEM_REG_FILE);
 
   /* Set the log filename */
-  RtlpCreateUnicodeString (&RegistryHive->LogFileName,
-           SYSTEM_LOG_FILE, NonPagedPool);
+  RtlCreateUnicodeString (&RegistryHive->LogFileName,
+                          SYSTEM_LOG_FILE);
 
   return TRUE;
 }

diff --git a/reactos/ntoskrnl/cm/regfile.c b/reactos/ntoskrnl/cm/regfile.c
index 6e37cdd..9ec1dd9 100644 (file)
--- a/reactos/ntoskrnl/cm/regfile.c
+++ b/reactos/ntoskrnl/cm/regfile.c
@@ -858,8 +858,8 @@ CmiInitNonVolatileRegistryHive (PREGISTRY_HIVE RegistryHive,
         RegistryHive, Filename);
 
   /* Duplicate Filename */
-  Status = RtlpCreateUnicodeString(&RegistryHive->HiveFileName,
-              Filename, NonPagedPool);
+  Status = RtlCreateUnicodeString(&RegistryHive->HiveFileName,
+                                  Filename);
   if (!NT_SUCCESS(Status))
     {
       DPRINT("RtlpCreateUnicodeString() failed (Status %lx)\n", Status);
@@ -869,8 +869,9 @@ CmiInitNonVolatileRegistryHive (PREGISTRY_HIVE RegistryHive,
   /* Create log file name */
   RegistryHive->LogFileName.Length = (wcslen(Filename) + 4) * sizeof(WCHAR);
   RegistryHive->LogFileName.MaximumLength = RegistryHive->LogFileName.Length + sizeof(WCHAR);
-  RegistryHive->LogFileName.Buffer = ExAllocatePool(NonPagedPool,
-                                                   RegistryHive->LogFileName.MaximumLength);
+  RegistryHive->LogFileName.Buffer = ExAllocatePoolWithTag(PagedPool,
+                                                          RegistryHive->LogFileName.MaximumLength,
+                                                           TAG('U', 'S', 'T', 'R'));
   if (RegistryHive->LogFileName.Buffer == NULL)
     {
       RtlFreeUnicodeString(&RegistryHive->HiveFileName);