[FREELDR] Add Windows 7 Boot

Author: iLauncherDev

boot/freeldr/freeldr/arch/archwsup.c

@@ -84,6 +84,7 @@ AddReactOSArcDiskInfo(
 
     /* Fill out the ARC disk block */
 
+    reactos_arc_disk_info[reactos_disk_count].DiskSignature.Unknown = (PVOID)0;
     reactos_arc_disk_info[reactos_disk_count].DiskSignature.Signature = Signature;
     reactos_arc_disk_info[reactos_disk_count].DiskSignature.CheckSum = Checksum;
     reactos_arc_disk_info[reactos_disk_count].DiskSignature.ValidPartitionTable = ValidPartitionTable;

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

@@ -80,6 +80,8 @@ AllocateAndInitLPB(
 {
     PLOADER_PARAMETER_BLOCK LoaderBlock;
     PLOADER_PARAMETER_EXTENSION Extension;
+    PLOADER_PARAMETER_BLOCK_WIN7 LoaderBlock_WIN7;
+    PLOADER_PARAMETER_EXTENSION_WIN7 Extension_WIN7;
 
     /* Allocate and zero-init the Loader Parameter Block */
     WinLdrSystemBlock = MmAllocateMemoryWithType(sizeof(LOADER_SYSTEM_BLOCK),
@@ -107,6 +109,16 @@ AllocateAndInitLPB(
     InitializeListHead(&LoaderBlock->MemoryDescriptorListHead);
     InitializeListHead(&LoaderBlock->BootDriverListHead);
 
+    LoaderBlock_WIN7 = &WinLdrSystemBlock->LoaderBlock.NT6_1;
+    Extension_WIN7 = &WinLdrSystemBlock->Extension.NT6_1;
+
+    LoaderBlock_WIN7->Size = sizeof(LOADER_PARAMETER_BLOCK_WIN7);
+    LoaderBlock_WIN7->Extension = Extension_WIN7;
+
+    Extension_WIN7->Extension2.TpmBootEntropyResult.ResultStatus = STATUS_NOT_IMPLEMENTED;
+    Extension_WIN7->Extension2.TpmBootEntropyResult.ResultCode = TpmBootEntropyNoTpmFound;
+    Extension_WIN7->Extension1.Size = sizeof(LOADER_PARAMETER_EXTENSION_WIN7);
+
     *OutLoaderBlock = LoaderBlock;
 }
 
@@ -133,6 +145,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
     ULONG i;
     ULONG_PTR PathSeparator;
     PLOADER_PARAMETER_EXTENSION Extension;
+    PLOADER_PARAMETER_EXTENSION_WIN7 Extension_WIN7;
 
     /* Construct SystemRoot and ArcBoot from SystemPath */
     PathSeparator = strstr(BootPath, "\\") - BootPath;
@@ -242,6 +255,7 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
     List_PaToVa(&LoaderBlock->BootDriverListHead);
 
     Extension = LoaderBlock->Extension;
+    Extension_WIN7 = LoaderBlock->NT6_1.Extension;
 
     /* FIXME! HACK value for docking profile */
     Extension->Profile.Status = 2;
@@ -263,6 +277,9 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
         List_PaToVa(&Extension->BootApplicationPersistentData);
     }
 
+    InitializeListHead(&Extension_WIN7->Extension2.AttachedHives);
+    List_PaToVa(&Extension_WIN7->Extension2.AttachedHives);
+
 #ifdef _M_IX86
     /* Set headless block pointer */
     if (WinLdrTerminalConnected)
@@ -281,8 +298,12 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
                                                     &Extension->DrvDBSize,
                                                     LoaderRegistryData));
 
+    if (Extension_WIN7->Extension2.BgContext)
+        Extension_WIN7->Extension2.BgContext = PaToVa(Extension_WIN7->Extension2.BgContext);
+
     /* Convert the extension block pointer */
     LoaderBlock->Extension = PaToVa(LoaderBlock->Extension);
+    LoaderBlock->NT6_1.Extension = PaToVa(LoaderBlock->NT6_1.Extension);
 
     TRACE("WinLdrInitializePhase1() completed\n");
 }
@@ -1015,6 +1036,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);
@@ -1175,6 +1200,7 @@ LoadAndBootWindowsCommon(
     IN PCSTR BootOptions,
     IN PCSTR BootPath)
 {
+    PLOADER_PARAMETER_EXTENSION Extension = LoaderBlock->Extension;
     PLOADER_PARAMETER_BLOCK LoaderBlockVA;
     BOOLEAN Success;
     PLDR_DATA_TABLE_ENTRY KernelDTE;
@@ -1260,15 +1286,99 @@ LoadAndBootWindowsCommon(
     /* Map pages and create memory descriptors */
     WinLdrSetupMemoryLayout(LoaderBlock);
 
+    if (OperatingSystemVersion >= _WIN32_WINNT_WIN7)
+    {
+        PLOADER_PARAMETER_BLOCK_WIN7 LoaderBlock_WIN7 = &LoaderBlock->NT6_1;
+        PLOADER_PARAMETER_EXTENSION_WIN7 Extension_WIN7 = &Extension->NT6_1;
+
+        LoaderBlock_WIN7->OsMajorVersion = Extension->MajorVersion;
+        LoaderBlock_WIN7->OsMinorVersion = Extension->MinorVersion;
+        LoaderBlock_WIN7->LoadOrderListHead = LoaderBlock->LoadOrderListHead;
+        LoaderBlock_WIN7->MemoryDescriptorListHead = LoaderBlock->MemoryDescriptorListHead;
+        LoaderBlock_WIN7->BootDriverListHead = LoaderBlock->BootDriverListHead;
+        LoaderBlock_WIN7->KernelStack = LoaderBlock->KernelStack;
+        LoaderBlock_WIN7->Prcb = LoaderBlock->Prcb;
+        LoaderBlock_WIN7->Process = LoaderBlock->Process;
+        LoaderBlock_WIN7->Thread = LoaderBlock->Thread;
+        LoaderBlock_WIN7->RegistryLength = LoaderBlock->RegistryLength;
+        LoaderBlock_WIN7->RegistryBase = LoaderBlock->RegistryBase;
+        LoaderBlock_WIN7->ConfigurationRoot = LoaderBlock->ConfigurationRoot;
+        LoaderBlock_WIN7->ArcBootDeviceName = LoaderBlock->ArcBootDeviceName;
+        LoaderBlock_WIN7->ArcHalDeviceName = LoaderBlock->ArcHalDeviceName;
+        LoaderBlock_WIN7->NtBootPathName = LoaderBlock->NtBootPathName;
+        LoaderBlock_WIN7->NtHalPathName = LoaderBlock->NtHalPathName;
+        LoaderBlock_WIN7->LoadOptions = LoaderBlock->LoadOptions;
+        LoaderBlock_WIN7->NlsData = LoaderBlock->NlsData;
+        LoaderBlock_WIN7->ArcDiskInformation = LoaderBlock->ArcDiskInformation;
+        LoaderBlock_WIN7->OemFontFile = LoaderBlock->OemFontFile;
+        RtlCopyMemory(&LoaderBlock_WIN7->u, &LoaderBlock->u, sizeof(LoaderBlock->u));
+        RtlCopyMemory(&LoaderBlock_WIN7->FirmwareInformation, &LoaderBlock->FirmwareInformation, sizeof(LoaderBlock->FirmwareInformation));
+
+        RtlCopyMemory(&Extension_WIN7->Extension1.Profile, &Extension->Profile, sizeof(Extension->Profile));
+        Extension_WIN7->Extension2.EmInfFileImage = Extension->EmInfFileImage;
+        Extension_WIN7->Extension2.EmInfFileSize = Extension->EmInfFileSize;
+        Extension_WIN7->Extension2.TriageDumpBlock = Extension->TriageDumpBlock;
+        Extension_WIN7->Extension2.LoaderPagesSpanned = Extension->LoaderPagesSpanned;
+        Extension_WIN7->Extension2.HeadlessLoaderBlock = Extension->HeadlessLoaderBlock;
+        Extension_WIN7->Extension2.SMBiosEPSHeader = Extension->SMBiosEPSHeader;
+        Extension_WIN7->Extension2.DrvDBImage = Extension->DrvDBImage;
+        Extension_WIN7->Extension2.DrvDBSize = Extension->DrvDBSize;
+        Extension_WIN7->Extension2.NetworkLoaderBlock = Extension->NetworkLoaderBlock;
+#ifdef _X86_
+        Extension_WIN7->Extension2.HalpIRQLToTPR = Extension->HalpIRQLToTPR;
+        Extension_WIN7->Extension2.HalpVectorToIRQL = Extension->HalpVectorToIRQL;
+#endif
+        Extension_WIN7->Extension2.FirmwareDescriptorListHead = Extension->FirmwareDescriptorListHead;
+        Extension_WIN7->Extension2.AcpiTable = Extension->AcpiTable;
+        Extension_WIN7->Extension2.AcpiTableSize = Extension->AcpiTableSize;
+        Extension_WIN7->Extension2.BootViaWinload = Extension->BootViaWinload;
+        Extension_WIN7->Extension2.BootViaEFI = Extension->BootViaEFI;
+        Extension_WIN7->Extension2.Reserved = Extension->Reserved;
+        Extension_WIN7->Extension2.LoaderPerformanceData = Extension->LoaderPerformanceData;
+        Extension_WIN7->Extension2.BootApplicationPersistentData = Extension->BootApplicationPersistentData;
+        Extension_WIN7->Extension2.WmdTestResult = Extension->WmdTestResult;
+        Extension_WIN7->Extension2.BootIdentifier = Extension->BootIdentifier;
+        Extension_WIN7->Extension2.ResumePages = Extension->ResumePages;
+        Extension_WIN7->Extension2.DumpHeader = Extension->DumpHeader;
+    }
+
     /* Set processor context */
     WinLdrSetProcessorContext(OperatingSystemVersion);
 
     /* Save final value of LoaderPagesSpanned */
-    LoaderBlock->Extension->LoaderPagesSpanned = MmGetLoaderPagesSpanned();
+    LoaderBlockVA->Extension->LoaderPagesSpanned = MmGetLoaderPagesSpanned();
+    LoaderBlockVA->NT6_1.Extension->Extension2.LoaderPagesSpanned = LoaderBlockVA->Extension->LoaderPagesSpanned;
 
     TRACE("Hello from paged mode, KiSystemStartup %p, LoaderBlockVA %p!\n",
           KiSystemStartup, LoaderBlockVA);
 
+    PCHAR LoaderBlockByte = (PCHAR)&LoaderBlockVA->NT6_1;
+    PCHAR ExtensionByte = (PCHAR)LoaderBlockVA->NT6_1.Extension;
+
+    if (sizeof(LOADER_PARAMETER_BLOCK_WIN7) != 0x88)
+    {
+        TRACE("Warning LOADER_PARAMETER_BLOCK_WIN7 is not 0x88\n");
+        while(TRUE);
+    }
+
+    if (sizeof(LOADER_PARAMETER_EXTENSION_WIN7) != 0xE8)
+    {
+        TRACE("Warning LOADER_PARAMETER_EXTENSION_WIN7 is not 0xE8\n");
+        while(TRUE);
+    }
+
+    TRACE("LOADER_PARAMETER_BLOCK_WIN7:\n");
+    for (ULONG i = 0; i < sizeof(LOADER_PARAMETER_BLOCK_WIN7); i++){
+        TRACE("0x%02X, ", (ULONG)LoaderBlockByte[i]);
+    }
+    TRACE("\n");
+
+    TRACE("LOADER_PARAMETER_EXTENSION_WIN7:\n");
+    for (ULONG i = 0; i < sizeof(LOADER_PARAMETER_EXTENSION_WIN7); i++){
+        TRACE("0x%02X, ", (ULONG)ExtensionByte[i]);
+    }
+    TRACE("\n");
+
     /* Zero KI_USER_SHARED_DATA page */
     RtlZeroMemory((PVOID)KI_USER_SHARED_DATA, MM_PAGE_SIZE);
 
@@ -1278,6 +1388,11 @@ LoadAndBootWindowsCommon(
     WinLdrpDumpArcDisks(LoaderBlockVA);
 #endif
 
+    if (OperatingSystemVersion >= _WIN32_WINNT_WIN7)
+        LoaderBlockVA = (PLOADER_PARAMETER_BLOCK)&LoaderBlockVA->NT6_1;
+
+    TRACE("Bye Freeldr!\n");
+
     /* Pass control */
     (*KiSystemStartup)(LoaderBlockVA);
 

boot/freeldr/freeldr/ntldr/wlregistry.c

@@ -760,6 +760,8 @@ WinLdrAddDriverToList(
         RtlInitEmptyUnicodeString(&GroupString, NULL, 0);
     }
 
+    DriverEntry->Status = STATUS_SUCCESS;
+
     /* Set or replace the driver node's file path */
     if (DriverEntry->FilePath.Buffer)
     {

ntoskrnl/include/internal/cmboot.h

@@ -17,6 +17,8 @@ typedef struct _BOOT_DRIVER_NODE
     UNICODE_STRING Name;
     ULONG Tag;
     ULONG ErrorControl;
+    PVOID Unknown1;
+    PVOID Unknown2;
 } BOOT_DRIVER_NODE, *PBOOT_DRIVER_NODE;