[FREELDR:NTLDR] Enable EMS support on all platforms

Set the `HeadlessLoaderBlock` for all platforms, since headless support
is platform-independent. Addendum to commit ea93b886df.
This commit is contained in:
Hermès Bélusca-Maïto
2026-04-09 21:11:34 +02:00
parent 7779fb4459
commit 7fc926974f
3 changed files with 4 additions and 7 deletions

View File

@@ -235,7 +235,7 @@ WinLdrSetupEms(
PCSTR Option;
/* Start fresh */
RtlZeroMemory(&LoaderRedirectionInformation, sizeof(HEADLESS_LOADER_BLOCK));
RtlZeroMemory(&LoaderRedirectionInformation, sizeof(LoaderRedirectionInformation));
LoaderRedirectionInformation.PciDeviceId = PCI_INVALID_VENDORID;
/* Use a direction port if one was given, or use ACPI to detect one instead */

View File

@@ -263,17 +263,16 @@ WinLdrInitializePhase1(PLOADER_PARAMETER_BLOCK LoaderBlock,
List_PaToVa(&Extension->BootApplicationPersistentData);
}
#ifdef _M_IX86
/* Set headless block pointer */
/* Set the headless block pointer */
if (WinLdrTerminalConnected)
{
Extension->HeadlessLoaderBlock = &WinLdrSystemBlock->HeadlessLoaderBlock;
RtlCopyMemory(Extension->HeadlessLoaderBlock,
&LoaderRedirectionInformation,
sizeof(HEADLESS_LOADER_BLOCK));
sizeof(LoaderRedirectionInformation));
Extension->HeadlessLoaderBlock = PaToVa(Extension->HeadlessLoaderBlock);
}
#endif
/* Load drivers database */
RtlStringCbCopyA(MiscFiles, sizeof(MiscFiles), BootPath);
RtlStringCbCatA(MiscFiles, sizeof(MiscFiles), "AppPatch\\drvmain.sdb");

View File

@@ -48,9 +48,7 @@ typedef struct _LOADER_SYSTEM_BLOCK
LOADER_PARAMETER_BLOCK LoaderBlock;
LOADER_PARAMETER_EXTENSION Extension;
SETUP_LOADER_BLOCK SetupBlock;
#ifdef _M_IX86
HEADLESS_LOADER_BLOCK HeadlessLoaderBlock;
#endif
NLS_DATA_BLOCK NlsDataBlock;
CHAR LoadOptions[MAX_OPTIONS_LENGTH+1];
CHAR ArcBootDeviceName[MAX_PATH+1];