[ros-diffs] [ion] 24318: - Complete much more of KiRosFrldrLpbtoNtLpb. We now: - Create a LDR_DATA_TABLE entry for each module (driver, hal, kernel) and properly fill it out and insert it into the loader block. - Use the NLS data block to hold pointers to the NLS tables. - Use the ->RegistryBase/Length loader block members to hold pointers to the SYSTEM hive. - Create a MEMORY_ALLOCATION_DESCRIPTOR for each type of memory currently used (LoaderNlsData, LoaderRegistrydata, LoaderSystemCode, LoaderHalCode, Lo

Author: ion
Date: Sat Sep 30 20:04:23 2006
New Revision: 24318

URL: http://svn.reactos.org/svn/reactos?rev=24318&view=rev
Log:
- Complete much more of KiRosFrldrLpbtoNtLpb. We now:
  - Create a LDR_DATA_TABLE entry for each module (driver, hal, kernel) and properly fill
it out and insert it into the loader block.
  - Use the NLS data block to hold pointers to the NLS tables.
  - Use the ->RegistryBase/Length loader block members to hold pointers to the SYSTEM
hive.
  - Create a MEMORY_ALLOCATION_DESCRIPTOR for each type of memory currently used
(LoaderNlsData, LoaderRegistrydata, LoaderSystemCode, LoaderHalCode, LoaderBootDriver).
  - Changes are currently UNUSED!
- Revert LOADER_PARAMETER_BLOCK change, it actually really is PNLS_DATA_BLOCK.

Modified:
    trunk/reactos/include/reactos/arc/arc.h
    trunk/reactos/ntoskrnl/ke/freeldr.c

Modified: trunk/reactos/include/reactos/arc/arc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/arc/arc.h?…
==============================================================================
--- trunk/reactos/include/reactos/arc/arc.h (original)
+++ trunk/reactos/include/reactos/arc/arc.h Sat Sep 30 20:04:23 2006
@@ -37,6 +37,47 @@
     HwFileMax,
     HwFileDynUpdt = 31,
 } HwFileType;
+
+typedef enum _TYPE_OF_MEMORY
+{
+    LoaderExceptionBlock,
+    LoaderSystemBlock,
+    LoaderFree,
+    LoaderBad,
+    LoaderLoadedProgram,
+    LoaderFirmwareTemporary,
+    LoaderFirmwarePermanent,
+    LoaderOsloaderHeap,
+    LoaderOsloaderStack,
+    LoaderSystemCode,
+    LoaderHalCode,
+    LoaderBootDriver,
+    LoaderConsoleInDriver,
+    LoaderConsoleOutDriver,
+    LoaderStartupDpcStack,
+    LoaderStartupKernelStack,
+    LoaderStartupPanicStack,
+    LoaderStartupPcrPage,
+    LoaderStartupPdrPage,
+    LoaderRegistryData,
+    LoaderMemoryData,
+    LoaderNlsData,
+    LoaderSpecialMemory,
+    LoaderBBTMemory,
+    LoaderReserve,
+    LoaderXIPRom,
+    LoaderHALCachedMemory,
+    LoaderLargePageFiller,
+    LoaderMaximum
+} TYPE_OF_MEMORY;
+
+typedef struct _MEMORY_ALLOCATION_DESCRIPTOR
+{
+    LIST_ENTRY ListEntry;
+    TYPE_OF_MEMORY MemoryType;
+    ULONG BasePage;
+    ULONG PageCount;
+} MEMORY_ALLOCATION_DESCRIPTOR, *PMEMORY_ALLOCATION_DESCRIPTOR;
 
 typedef struct _CONFIGURATION_COMPONENT
 {
@@ -251,7 +292,7 @@
     LPSTR NtBootPathName;
     LPSTR NtHalPathName;
     LPSTR LoadOptions;
-    NLS_DATA_BLOCK NlsData;
+    PNLS_DATA_BLOCK NlsData;
     PARC_DISK_INFORMATION ArcDiskInformation;
     PVOID OemFontFile;
     struct _SETUP_LOADER_BLOCK *SetupLdrBlock;

Modified: trunk/reactos/ntoskrnl/ke/freeldr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=…
==============================================================================
--- trunk/reactos/ntoskrnl/ke/freeldr.c (original)
+++ trunk/reactos/ntoskrnl/ke/freeldr.c Sat Sep 30 20:04:23 2006
@@ -42,6 +42,10 @@
 /* NT Loader Data */
 LOADER_PARAMETER_BLOCK BldrLoaderBlock;
 CHAR BldrCommandLine[256];
+LDR_DATA_TABLE_ENTRY BldrModules[64];
+MEMORY_ALLOCATION_DESCRIPTOR BldrMemoryDescriptors[64];
+WCHAR BldrModuleStrings[64][260];
+NLS_DATA_BLOCK BldrNlsDataBlock;
 
 /* FUNCTIONS *****************************************************************/
 
@@ -51,6 +55,12 @@
                      IN PLOADER_PARAMETER_BLOCK *NtLoaderBlock)
 {
     PLOADER_PARAMETER_BLOCK LoaderBlock;
+    PLDR_DATA_TABLE_ENTRY LdrEntry;
+    PMEMORY_ALLOCATION_DESCRIPTOR MdEntry;
+    PLOADER_MODULE RosEntry;
+    ULONG i, j, ModSize;
+    PVOID ModStart;
+    PCHAR DriverName;
 
     /* First get some kernel-loader globals */
     AcpiTableDetected = (RosLoaderBlock->Flags & MB_FLAGS_ACPI_TABLE) ? TRUE :
FALSE;
@@ -64,10 +74,169 @@
     *NtLoaderBlock = LoaderBlock = &BldrLoaderBlock;
     RtlZeroMemory(LoaderBlock, sizeof(LOADER_PARAMETER_BLOCK));
 
+    /* Set the NLS Data block */
+    LoaderBlock->NlsData = &BldrNlsDataBlock;
+
+    /* Set an invalid pointer, but used as a flag (SetupBoot) */
+    LoaderBlock->SetupLdrBlock = (PVOID)1;
+
     /* Setup the list heads */
     InitializeListHead(&LoaderBlock->LoadOrderListHead);
     InitializeListHead(&LoaderBlock->MemoryDescriptorListHead);
     InitializeListHead(&LoaderBlock->BootDriverListHead);
+
+    /* Loop boot driver list */
+    for (i = 0; i < KeLoaderModuleCount; i++)
+    {
+        /* Get the ROS loader entry */
+        RosEntry = &KeLoaderModules[i];
+        DriverName = (PCHAR)RosEntry->String;
+        ModStart = (PVOID)RosEntry->ModStart;
+        ModSize = RosEntry->ModEnd - (ULONG_PTR)ModStart;
+
+        /* Check if this is any of the NLS files */
+        if (!_stricmp(DriverName, "ansi.nls"))
+        {
+            /* ANSI Code page */
+            LoaderBlock->NlsData->AnsiCodePageData = ModStart;
+
+            /* Create an MD for it */
+            MdEntry = &BldrMemoryDescriptors[i];
+            MdEntry->MemoryType = LoaderNlsData;
+            MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT;
+            MdEntry->PageCount = ModSize >> PAGE_SHIFT;
+            InsertTailList(&LoaderBlock->MemoryDescriptorListHead,
+                           &MdEntry->ListEntry);
+            continue;
+        }
+        else if (!_stricmp(DriverName, "oem.nls"))
+        {
+            /* OEM Code page */
+            LoaderBlock->NlsData->OemCodePageData = ModStart;
+
+            /* Create an MD for it */
+            MdEntry = &BldrMemoryDescriptors[i];
+            MdEntry->MemoryType = LoaderNlsData;
+            MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT;
+            MdEntry->PageCount = ModSize >> PAGE_SHIFT;
+            InsertTailList(&LoaderBlock->MemoryDescriptorListHead,
+                           &MdEntry->ListEntry);
+            continue;
+        }
+        else if (!_stricmp(DriverName, "casemap.nls"))
+        {
+            /* Unicode Code page */
+            LoaderBlock->NlsData->UnicodeCodePageData = ModStart;
+
+            /* Create an MD for it */
+            MdEntry = &BldrMemoryDescriptors[i];
+            MdEntry->MemoryType = LoaderNlsData;
+            MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT;
+            MdEntry->PageCount = ModSize >> PAGE_SHIFT;
+            InsertTailList(&LoaderBlock->MemoryDescriptorListHead,
+                           &MdEntry->ListEntry);
+            continue;
+        }
+
+        /* Check if this is the SYSTEM hive */
+        if (!(_stricmp(DriverName, "system")) ||
+            !(_stricmp(DriverName, "system.hiv")))
+        {
+            /* Save registry data */
+            LoaderBlock->RegistryBase = ModStart;
+            LoaderBlock->RegistryLength = ModSize;
+
+            /* Disable setup mode */
+            LoaderBlock->SetupLdrBlock = NULL;
+
+            /* Create an MD for it */
+            MdEntry = &BldrMemoryDescriptors[i];
+            MdEntry->MemoryType = LoaderRegistryData;
+            MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT;
+            MdEntry->PageCount = ModSize >> PAGE_SHIFT;
+            InsertTailList(&LoaderBlock->MemoryDescriptorListHead,
+                           &MdEntry->ListEntry);
+            continue;
+        }
+
+        /* Check if this is the HARDWARE hive */
+        if (!(_stricmp(DriverName, "hardware")) ||
+            !(_stricmp(DriverName, "hardware.hiv")))
+        {
+            /* Save registry data */
+            LoaderBlock->RegistryBase = ModStart;
+            LoaderBlock->RegistryLength = ModSize;
+
+            /* Create an MD for it */
+            MdEntry = &BldrMemoryDescriptors[i];
+            MdEntry->MemoryType = LoaderRegistryData;
+            MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT;
+            MdEntry->PageCount = ModSize >> PAGE_SHIFT;
+            InsertTailList(&LoaderBlock->MemoryDescriptorListHead,
+                           &MdEntry->ListEntry);
+            continue;
+        }
+
+        /* Setup the loader entry */
+        LdrEntry = &BldrModules[i];
+        RtlZeroMemory(LdrEntry, sizeof(LDR_DATA_TABLE_ENTRY));
+
+        /* Convert driver name from ANSI to Unicode */
+        for (j = 0; j < strlen(DriverName); j++)
+        {
+            BldrModuleStrings[i][j] = DriverName[j];
+        }
+
+        /* Setup driver name */
+        RtlInitUnicodeString(&LdrEntry->BaseDllName, BldrModuleStrings[i]);
+        RtlInitUnicodeString(&LdrEntry->FullDllName, BldrModuleStrings[i]);
+
+        /* Copy data from Freeldr Module Entry */
+        LdrEntry->DllBase = ModStart;
+        LdrEntry->SizeOfImage = ModSize;
+
+        /* Initialize other data */
+        LdrEntry->LoadCount = 1;
+        LdrEntry->Flags = LDRP_IMAGE_DLL |
+                          LDRP_ENTRY_PROCESSED;
+        if (RosEntry->Reserved) LdrEntry->Flags |= LDRP_ENTRY_INSERTED;
+
+        /* Insert it into the loader block */
+        InsertTailList(&LoaderBlock->LoadOrderListHead,
+                       &LdrEntry->InLoadOrderLinks);
+
+        /* Check if this is the kernel */
+        if (!(_stricmp(DriverName, "ntoskrnl.exe")))
+        {
+            /* Create an MD for it */
+            MdEntry = &BldrMemoryDescriptors[i];
+            MdEntry->MemoryType = LoaderSystemCode;
+            MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT;
+            MdEntry->PageCount = ModSize >> PAGE_SHIFT;
+            InsertTailList(&LoaderBlock->MemoryDescriptorListHead,
+                           &MdEntry->ListEntry);
+        }
+        else if (!(_stricmp(DriverName, "hal.dll")))
+        {
+            /* Create an MD for the HAL */
+            MdEntry = &BldrMemoryDescriptors[i];
+            MdEntry->MemoryType = LoaderHalCode;
+            MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT;
+            MdEntry->PageCount = ModSize >> PAGE_SHIFT;
+            InsertTailList(&LoaderBlock->MemoryDescriptorListHead,
+                           &MdEntry->ListEntry);
+        }
+        else
+        {
+            /* Create an MD for any driver */
+            MdEntry = &BldrMemoryDescriptors[i];
+            MdEntry->MemoryType = LoaderBootDriver;
+            MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT;
+            MdEntry->PageCount = ModSize >> PAGE_SHIFT;
+            InsertTailList(&LoaderBlock->MemoryDescriptorListHead,
+                           &MdEntry->ListEntry);
+        }
+    }
 
     /* Setup command line */
     LoaderBlock->LoadOptions = BldrCommandLine;