[FREELDR]: Use PaToVa to set the Hive and NLS data pointers, instead of assuming...

svn path=/trunk/; revision=49754

diff --git a/reactos/boot/freeldr/freeldr/windows/wlregistry.c b/reactos/boot/freeldr/freeldr/windows/wlregistry.c
index 1080ee2..b6c1fc9 100644 (file)
--- a/reactos/boot/freeldr/freeldr/windows/wlregistry.c
+++ b/reactos/boot/freeldr/freeldr/windows/wlregistry.c
@@ -88,7 +88,7 @@ WinLdrLoadSystemHive(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
        }
 
        /* Convert address to virtual */
-       HiveDataVirtual = (PVOID)(KSEG0_BASE | HiveDataPhysical);
+    HiveDataVirtual = PaToVa((PVOID)HiveDataPhysical);
 
        /* Fill LoaderBlock's entries */
        LoaderBlock->RegistryLength = HiveFileSize;
@@ -379,7 +379,7 @@ WinLdrLoadNLSData(IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock,
        if (NlsDataBase == 0)
                goto Failure;
 
-       NlsVirtual = (PVOID)(KSEG0_BASE | NlsDataBase);
+       NlsVirtual = PaToVa((PVOID)NlsDataBase);
        LoaderBlock->NlsData->AnsiCodePageData = NlsVirtual;
        LoaderBlock->NlsData->OemCodePageData = (PVOID)((PUCHAR)NlsVirtual +
                (MM_SIZE_TO_PAGES(AnsiFileSize) << MM_PAGE_SHIFT));