[FREELDR] Add Windows 7 Boot Support

Author: iLauncherDev

boot/freeldr/freeldr/arch/archwsup.c

@@ -87,6 +87,7 @@ AddReactOSArcDiskInfo(
     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;
+    reactos_arc_disk_info[reactos_disk_count].DiskSignature.Unknown = NULL;
 
     strcpy(reactos_arc_disk_info[reactos_disk_count].ArcName, ArcName);
     reactos_arc_disk_info[reactos_disk_count].DiskSignature.ArcName =

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

@@ -104,22 +104,44 @@ AllocateAndInitLPB(
 
     LoaderBlock = &WinLdrSystemBlock->u1.LoaderBlockVista;
 
-    PLOADER_PARAMETER_EXTENSION_VISTA Extension;
+    if (VersionToBoot >= _WIN32_WINNT_WIN7)
+    {
+        PLOADER_PARAMETER_EXTENSION_WIN7 Extension;
 
-    LoaderBlock = &WinLdrSystemBlock->u1.LoaderBlockVista;
-    LoaderBlock1 = &WinLdrSystemBlock->u1.LoaderBlockVista.Block1;
-    LoaderBlock2 = &WinLdrSystemBlock->u1.LoaderBlockVista.Block2;
-    *SetupBlockPtr = &WinLdrSystemBlock->u1.LoaderBlockVista.SetupLdrBlock;
+        LoaderBlock1 = &WinLdrSystemBlock->u1.LoaderBlockWin7.Block1;
+        LoaderBlock2 = &WinLdrSystemBlock->u1.LoaderBlockWin7.Block2;
+        *SetupBlockPtr = NULL;
+
+        /* Initialize the Loader Block Extension */
+        Extension = &WinLdrSystemBlock->u2.ExtensionWin7;
+        Extension->Extension1.Size = sizeof(LOADER_PARAMETER_EXTENSION_WIN7);
+        LoaderBlock2->Extension = Extension;
+
+        WinLdrSystemBlock->u1.LoaderBlockWin7.OsMajorVersion = (VersionToBoot & 0xFF00) >> 8;
+        WinLdrSystemBlock->u1.LoaderBlockWin7.OsMinorVersion = (VersionToBoot & 0xFF);
+        WinLdrSystemBlock->u1.LoaderBlockWin7.Size = sizeof(LOADER_PARAMETER_BLOCK_WIN7);
+
+        Extension1 = &Extension->Extension1;
+        Extension2 = &Extension->Extension2;
+    }
+    else
+    {
+        PLOADER_PARAMETER_EXTENSION_VISTA Extension;
+
+        LoaderBlock1 = &WinLdrSystemBlock->u1.LoaderBlockVista.Block1;
+        LoaderBlock2 = &WinLdrSystemBlock->u1.LoaderBlockVista.Block2;
+        *SetupBlockPtr = &WinLdrSystemBlock->u1.LoaderBlockVista.SetupLdrBlock;
 
-    /* Initialize the Loader Block Extension */
-    Extension = &WinLdrSystemBlock->u2.ExtensionVista;
-    Extension->Extension1.Size = sizeof(LOADER_PARAMETER_EXTENSION_VISTA);
-    LoaderBlock2->Extension = Extension;
-    Extension->MajorVersion = (VersionToBoot & 0xFF00) >> 8;
-    Extension->MinorVersion = (VersionToBoot & 0xFF);
+        /* Initialize the Loader Block Extension */
+        Extension = &WinLdrSystemBlock->u2.ExtensionVista;
+        Extension->Extension1.Size = sizeof(LOADER_PARAMETER_EXTENSION_VISTA);
+        LoaderBlock2->Extension = Extension;
+        Extension->MajorVersion = (VersionToBoot & 0xFF00) >> 8;
+        Extension->MinorVersion = (VersionToBoot & 0xFF);
 
-    Extension1 = &Extension->Extension1;
-    Extension2 = &Extension->Extension2;
+        Extension1 = &Extension->Extension1;
+        Extension2 = &Extension->Extension2;
+    }
 
     LoaderBlock1->NlsData = &WinLdrSystemBlock->NlsDataBlock;
 
@@ -293,6 +315,12 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK1 LoaderBlock1,
 
         InitializeListHead(&Extension2->BootApplicationPersistentData);
         List_PaToVa(&Extension2->BootApplicationPersistentData);
+
+        InitializeListHead(&Extension2->AttachedHives);
+        List_PaToVa(&Extension2->AttachedHives);
+
+        Extension2->TpmBootEntropyResult.ResultCode = TpmBootEntropyNoTpmFound;
+        Extension2->TpmBootEntropyResult.ResultStatus = STATUS_NOT_IMPLEMENTED;
     }
 
 #ifdef _M_IX86
@@ -1065,6 +1093,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);

boot/freeldr/freeldr/ntldr/winldr.h

@@ -86,6 +86,16 @@ typedef struct _LOADER_PARAMETER_BLOCK_VISTA
     LOADER_PARAMETER_BLOCK2 Block2;
 } LOADER_PARAMETER_BLOCK_VISTA, *PLOADER_PARAMETER_BLOCK_VISTA;
 
+typedef struct _LOADER_PARAMETER_BLOCK_WIN7
+{
+    ULONG OsMajorVersion;
+    ULONG OsMinorVersion;
+    ULONG Size;
+    ULONG Reserved;
+    LOADER_PARAMETER_BLOCK1 Block1;
+    LOADER_PARAMETER_BLOCK2 Block2;
+} LOADER_PARAMETER_BLOCK_WIN7, *PLOADER_PARAMETER_BLOCK_WIN7;
+
 typedef struct _LOADER_PARAMETER_EXTENSION1
 {
     ULONG Size;
@@ -136,6 +146,17 @@ typedef struct _LOADER_PARAMETER_EXTENSION2
     //
     ULONG ResumePages;
     PVOID DumpHeader;
+    //
+    // NT 6.1
+    //
+    PVOID BgContext;
+    PVOID NumaLocalityInfo;
+    PVOID NumaGroupAssignment;
+    LIST_ENTRY AttachedHives;
+    ULONG MemoryCachingRequirementsCount;
+    PVOID MemoryCachingRequirements;
+    TPM_BOOT_ENTROPY_LDR_RESULT TpmBootEntropyResult;
+    ULONGLONG ProcessorCounterFrequency;
 } LOADER_PARAMETER_EXTENSION2, *PLOADER_PARAMETER_EXTENSION2;
 
 typedef struct _LOADER_PARAMETER_EXTENSION_VISTA
@@ -146,16 +167,24 @@ typedef struct _LOADER_PARAMETER_EXTENSION_VISTA
     LOADER_PARAMETER_EXTENSION2 Extension2;
 } LOADER_PARAMETER_EXTENSION_VISTA, *PLOADER_PARAMETER_EXTENSION_VISTA;
 
+typedef struct _LOADER_PARAMETER_EXTENSION_WIN7
+{
+    LOADER_PARAMETER_EXTENSION1 Extension1;
+    LOADER_PARAMETER_EXTENSION2 Extension2;
+} LOADER_PARAMETER_EXTENSION_WIN7, *PLOADER_PARAMETER_EXTENSION_WIN7;
+
 #pragma pack(pop)
 
 typedef union _LOADER_SYSTEM_U1
 {
     LOADER_PARAMETER_BLOCK_VISTA LoaderBlockVista;
+    LOADER_PARAMETER_BLOCK_WIN7 LoaderBlockWin7;
 } LOADER_SYSTEM_U1, *PLOADER_SYSTEM_U1;
 
 typedef union _LOADER_SYSTEM_U2
 {
     LOADER_PARAMETER_EXTENSION_VISTA ExtensionVista;
+    LOADER_PARAMETER_EXTENSION_WIN7 ExtensionWin7;
 } LOADER_SYSTEM_U2, *PLOADER_SYSTEM_U2;
 
 typedef struct _LOADER_SYSTEM_BLOCK

sdk/include/reactos/arc/arc.h

@@ -261,6 +261,7 @@ typedef struct _ARC_DISK_SIGNATURE
     BOOLEAN IsGpt;
     BOOLEAN Reserved;
     CHAR GptSignature[16];
+    PVOID Unknown;
 } ARC_DISK_SIGNATURE, *PARC_DISK_SIGNATURE;
 
 typedef struct _ARC_DISK_INFORMATION
@@ -382,6 +383,25 @@ typedef struct _LOADER_PERFORMANCE_DATA
     ULONGLONG EndTime;
 } LOADER_PERFORMANCE_DATA, *PLOADER_PERFORMANCE_DATA;
 
+typedef enum _TPM_BOOT_ENTROPY_RESULT_CODE
+{
+    TpmBootEntropyStructureUninitialized = 0,
+    TpmBootEntropyDisabledByPolicy = 1,
+    TpmBootEntropyNoTpmFound = 2,
+    TpmBootEntropyTpmError = 3,
+    TpmBootEntropySuccess = 4
+} TPM_BOOT_ENTROPY_RESULT_CODE;
+
+typedef struct _TPM_BOOT_ENTROPY_LDR_RESULT
+{
+    ULONGLONG Policy;
+    TPM_BOOT_ENTROPY_RESULT_CODE ResultCode;
+    LONG ResultStatus;
+    ULONGLONG Time;
+    ULONG EntropyLength;
+    UCHAR EntropyData[40];
+} TPM_BOOT_ENTROPY_LDR_RESULT, *PTPM_BOOT_ENTROPY_LDR_RESULT;
+
 //
 // Extended Loader Parameter Block
 //