[FREELDR] Add Windows 7 boot support

Author: iLauncherDev

boot/freeldr/freeldr/arch/archwsup.c

@@ -66,7 +66,7 @@ PCONFIGURATION_COMPONENT_DATA FldrArcHwTreeRoot;
 
 // ARC Disk Information
 ULONG reactos_disk_count = 0;
-ARC_DISK_SIGNATURE_EX reactos_arc_disk_info[32];
+ARC_DISK_SIGNATURE_EX reactos_arc_disk_info[32] = {0};
 
 /* FUNCTIONS ******************************************************************/
 

boot/freeldr/freeldr/bootmgr.c

@@ -68,6 +68,7 @@ OSLoadingMethods[] =
     {"Windows"     , EditCustomBootNTOS, LoadAndBootWindows},
     {"Windows2003" , EditCustomBootNTOS, LoadAndBootWindows},
     {"WindowsVista", EditCustomBootNTOS, LoadAndBootWindows},
+    {"Windows7",     EditCustomBootNTOS, LoadAndBootWindows},
 };
 
 /* FUNCTIONS ******************************************************************/

boot/freeldr/freeldr/ntldr/winldr.c

@@ -92,6 +92,17 @@ AllocateAndInitLPB(
 
     RtlZeroMemory(WinLdrSystemBlock, sizeof(LOADER_SYSTEM_BLOCK));
 
+    WinLdrSystemBlock->LoaderVersions = MmAllocateMemoryWithType(sizeof(*WinLdrSystemBlock->LoaderVersions),
+                                                                 LoaderSystemBlock);
+    if (WinLdrSystemBlock->LoaderVersions == NULL)
+    {
+        UiMessageBox("Failed to allocate memory for system block versions!");
+        MmFreeMemory(WinLdrSystemBlock->LoaderVersions);
+        return;
+    }
+
+    RtlZeroMemory(WinLdrSystemBlock->LoaderVersions, sizeof(*WinLdrSystemBlock->LoaderVersions));
+
     LoaderBlock = &WinLdrSystemBlock->LoaderBlock;
     LoaderBlock->NlsData = &WinLdrSystemBlock->NlsDataBlock;
 
@@ -110,6 +121,17 @@ AllocateAndInitLPB(
     *OutLoaderBlock = LoaderBlock;
 }
 
+VOID RelocateList(PLIST_ENTRY Destination, PLIST_ENTRY Source)
+{
+    PLIST_ENTRY First = Source->Flink;
+    PLIST_ENTRY Last = Source->Blink;
+
+    First->Blink = Destination;
+    Last->Flink = Destination;
+
+    *Destination = *Source;
+}
+
 // Init "phase 1"
 VOID
 WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
@@ -263,6 +285,24 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
         List_PaToVa(&Extension->BootApplicationPersistentData);
     }
 
+    if (VersionToBoot == _WIN32_WINNT_WIN7)
+    {
+        InitializeListHead(&WinLdrSystemBlock->LoaderVersions->ExtensionWin7.AttachedHives);
+        List_PaToVa(&WinLdrSystemBlock->LoaderVersions->ExtensionWin7.AttachedHives);
+
+        WinLdrSystemBlock->LoaderVersions->ExtensionWin7.TpmBootEntropyResult.ResultCode = TpmBootEntropyNoTpmFound;
+        WinLdrSystemBlock->LoaderVersions->ExtensionWin7.TpmBootEntropyResult.ResultStatus = STATUS_NOT_IMPLEMENTED;
+
+        WinLdrSystemBlock->LoaderVersions->LoaderBlockWin7.Extension =
+            PaToVa(&WinLdrSystemBlock->LoaderVersions->ExtensionWin7);
+
+        WinLdrSystemBlock->LoaderVersions->LoaderBlockWin7.OsMajorVersion = (VersionToBoot & 0xFF00) >> 8;
+        WinLdrSystemBlock->LoaderVersions->LoaderBlockWin7.OsMinorVersion = VersionToBoot & 0xFF;
+
+        WinLdrSystemBlock->LoaderVersions->LoaderBlockWin7.Size = sizeof(LOADER_PARAMETER_BLOCK_WIN7);
+        WinLdrSystemBlock->LoaderVersions->ExtensionWin7.Size = sizeof(LOADER_PARAMETER_EXTENSION_WIN7);
+    }
+
 #ifdef _M_IX86
     /* Set headless block pointer */
     if (WinLdrTerminalConnected)
@@ -1028,6 +1068,10 @@ LoadAndBootWindows(
     {
         OperatingSystemVersion = _WIN32_WINNT_VISTA;
     }
+    else if (_stricmp(ArgValue, "Windows7") == 0)
+    {
+        OperatingSystemVersion = _WIN32_WINNT_WIN7;
+    }
     else
     {
         ERR("Unknown 'BootType' value '%s', aborting!\n", ArgValue);
@@ -1188,6 +1232,7 @@ LoadAndBootWindowsCommon(
     IN PCSTR BootOptions,
     IN PCSTR BootPath)
 {
+    PVOID KernelLoaderBlock;
     PLOADER_PARAMETER_BLOCK LoaderBlockVA;
     BOOLEAN Success;
     PLDR_DATA_TABLE_ENTRY KernelDTE;
@@ -1259,7 +1304,7 @@ LoadAndBootWindowsCommon(
 
     /* Save entry-point pointer and Loader block VAs */
     KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint;
-    LoaderBlockVA = PaToVa(LoaderBlock);
+    KernelLoaderBlock = LoaderBlockVA = PaToVa(LoaderBlock);
 
     /* "Stop all motors", change videomode */
     MachPrepareForReactOS();
@@ -1306,8 +1351,65 @@ LoadAndBootWindowsCommon(
     /* Save final value of LoaderPagesSpanned */
     LoaderBlock->Extension->LoaderPagesSpanned = MmGetLoaderPagesSpanned();
 
-    TRACE("Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n",
-          KiSystemStartup, LoaderBlockVA);
+    if (OperatingSystemVersion == _WIN32_WINNT_WIN7)
+    {
+        PLOADER_PARAMETER_BLOCK_WIN7 LoaderBlockWin7 = PaToVa(&WinLdrSystemBlock->LoaderVersions->LoaderBlockWin7);
+        PLOADER_PARAMETER_EXTENSION_WIN7 ExtensionWin7 = PaToVa(&WinLdrSystemBlock->LoaderVersions->ExtensionWin7);
+
+        /* LoaderBlock */
+        RelocateList(&LoaderBlockWin7->LoadOrderListHead, &LoaderBlockVA->LoadOrderListHead);
+        RelocateList(&LoaderBlockWin7->MemoryDescriptorListHead, &LoaderBlockVA->MemoryDescriptorListHead);
+        RelocateList(&LoaderBlockWin7->BootDriverListHead, &LoaderBlockVA->BootDriverListHead);
+
+        LoaderBlockWin7->KernelStack = LoaderBlockVA->KernelStack;
+        LoaderBlockWin7->Prcb = LoaderBlockVA->Prcb;
+        LoaderBlockWin7->Process = LoaderBlockVA->Process;
+        LoaderBlockWin7->Thread = LoaderBlockVA->Thread;
+
+        LoaderBlockWin7->RegistryLength = LoaderBlockVA->RegistryLength;
+        LoaderBlockWin7->RegistryBase = LoaderBlockVA->RegistryBase;
+
+        LoaderBlockWin7->ConfigurationRoot = LoaderBlockVA->ConfigurationRoot;
+
+        LoaderBlockWin7->ArcBootDeviceName = LoaderBlockVA->ArcBootDeviceName;
+        LoaderBlockWin7->ArcHalDeviceName = LoaderBlockVA->ArcHalDeviceName;
+        LoaderBlockWin7->NtBootPathName = LoaderBlockVA->NtBootPathName;
+        LoaderBlockWin7->NtHalPathName = LoaderBlockVA->NtHalPathName;
+        LoaderBlockWin7->LoadOptions = LoaderBlockVA->LoadOptions;
+
+        LoaderBlockWin7->NlsData = LoaderBlockVA->NlsData;
+        LoaderBlockWin7->ArcDiskInformation = LoaderBlockVA->ArcDiskInformation;
+
+        LoaderBlockWin7->OemFontFile = LoaderBlockVA->OemFontFile;
+
+        LoaderBlockWin7->u = LoaderBlockVA->u;
+        LoaderBlockWin7->FirmwareInformation = LoaderBlockVA->FirmwareInformation;
+
+        /* LoaderExtension */
+        ExtensionWin7->Profile = LoaderBlockVA->Extension->Profile;
+
+        ExtensionWin7->EmInfFileImage = LoaderBlockVA->Extension->EmInfFileImage;
+        ExtensionWin7->EmInfFileSize = LoaderBlockVA->Extension->EmInfFileSize;
+
+        ExtensionWin7->LoaderPagesSpanned = LoaderBlockVA->Extension->LoaderPagesSpanned;
+
+        ExtensionWin7->HeadlessLoaderBlock = LoaderBlockVA->Extension->HeadlessLoaderBlock;
+
+        ExtensionWin7->DrvDBImage = LoaderBlockVA->Extension->DrvDBImage;
+        ExtensionWin7->DrvDBSize = LoaderBlockVA->Extension->DrvDBSize;
+
+        ExtensionWin7->AcpiTable = LoaderBlockVA->Extension->AcpiTable;
+        ExtensionWin7->AcpiTableSize = LoaderBlockVA->Extension->AcpiTableSize;
+
+        ExtensionWin7->LoaderPerformanceData = LoaderBlockVA->Extension->LoaderPerformanceData;
+
+        RelocateList(&ExtensionWin7->BootApplicationPersistentData, &LoaderBlockVA->Extension->BootApplicationPersistentData);
+
+        KernelLoaderBlock = LoaderBlockWin7;
+    }
+
+    TRACE("Hello from paged mode, KiSystemStartup %p, KernelLoaderBlock %p!\n",
+          KiSystemStartup, KernelLoaderBlock);
 
     /* Zero KI_USER_SHARED_DATA page */
     RtlZeroMemory((PVOID)KI_USER_SHARED_DATA, MM_PAGE_SIZE);
@@ -1319,20 +1421,21 @@ LoadAndBootWindowsCommon(
 #endif
 
     /* Pass control */
-    (*KiSystemStartup)(LoaderBlockVA);
+    (*KiSystemStartup)(KernelLoaderBlock);
 
     UNREACHABLE; // return ESUCCESS;
 }
 
 VOID
 WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
-    PLIST_ENTRY NextMd;
+    PLIST_ENTRY NextMd, EndList;
     PMEMORY_ALLOCATION_DESCRIPTOR MemoryDescriptor;
 
     NextMd = LoaderBlock->MemoryDescriptorListHead.Flink;
+    EndList = LoaderBlock->MemoryDescriptorListHead.Blink->Flink;
 
-    while (NextMd != &LoaderBlock->MemoryDescriptorListHead)
+    while (NextMd != EndList)
     {
         MemoryDescriptor = CONTAINING_RECORD(NextMd, MEMORY_ALLOCATION_DESCRIPTOR, ListEntry);
 
@@ -1346,12 +1449,13 @@ WinLdrpDumpMemoryDescriptors(PLOADER_PARAMETER_BLOCK LoaderBlock)
 VOID
 WinLdrpDumpBootDriver(PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
-    PLIST_ENTRY NextBd;
+    PLIST_ENTRY NextBd, EndList;
     PBOOT_DRIVER_LIST_ENTRY BootDriver;
 
     NextBd = LoaderBlock->BootDriverListHead.Flink;
+    EndList = LoaderBlock->BootDriverListHead.Blink->Flink;
 
-    while (NextBd != &LoaderBlock->BootDriverListHead)
+    while (NextBd != EndList)
     {
         BootDriver = CONTAINING_RECORD(NextBd, BOOT_DRIVER_LIST_ENTRY, Link);
 
@@ -1365,12 +1469,13 @@ WinLdrpDumpBootDriver(PLOADER_PARAMETER_BLOCK LoaderBlock)
 VOID
 WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
-    PLIST_ENTRY NextBd;
+    PLIST_ENTRY NextBd, EndList;
     PARC_DISK_SIGNATURE ArcDisk;
 
     NextBd = LoaderBlock->ArcDiskInformation->DiskSignatureListHead.Flink;
+    EndList = LoaderBlock->ArcDiskInformation->DiskSignatureListHead.Blink->Flink;
 
-    while (NextBd != &LoaderBlock->ArcDiskInformation->DiskSignatureListHead)
+    while (NextBd != EndList)
     {
         ArcDisk = CONTAINING_RECORD(NextBd, ARC_DISK_SIGNATURE, ListEntry);
 

boot/freeldr/freeldr/ntldr/winldr.h

@@ -59,6 +59,10 @@ typedef struct _LOADER_SYSTEM_BLOCK
     CHAR NtHalPathName[MAX_PATH+1];
     ARC_DISK_INFORMATION ArcDiskInformation;
     LOADER_PERFORMANCE_DATA LoaderPerformanceData;
+    struct {
+        LOADER_PARAMETER_BLOCK_WIN7 LoaderBlockWin7;
+        LOADER_PARAMETER_EXTENSION_WIN7 ExtensionWin7;
+    } *LoaderVersions;
 } LOADER_SYSTEM_BLOCK, *PLOADER_SYSTEM_BLOCK;
 
 extern PLOADER_SYSTEM_BLOCK WinLdrSystemBlock;