[FREELDR] Remove the 'Setup' parameter of the LoadAndBootWindowsCommon() function.

This parameter is not needed since it's possible to determine, from
within this function, whether or not we are in Setup mode, by just
looking for the presence of a non NULL LoaderBlock->SetupLdrBlock.
This commit is contained in:
Hermès Bélusca-Maïto 2020-11-03 00:13:05 +01:00
parent 64ca7f6427
commit 58866a112a
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
3 changed files with 11 additions and 15 deletions

View file

@ -389,10 +389,9 @@ LoadReactOSSetup(
UiDrawStatusText("The Setup program is starting..."); UiDrawStatusText("The Setup program is starting...");
/* Load ReactOS Setup */ /* Finish loading */
return LoadAndBootWindowsCommon(_WIN32_WINNT_WS03, return LoadAndBootWindowsCommon(_WIN32_WINNT_WS03,
LoaderBlock, LoaderBlock,
BootOptions, BootOptions,
BootPath, BootPath);
TRUE);
} }

View file

@ -998,17 +998,15 @@ LoadAndBootWindows(
return LoadAndBootWindowsCommon(OperatingSystemVersion, return LoadAndBootWindowsCommon(OperatingSystemVersion,
LoaderBlock, LoaderBlock,
BootOptions, BootOptions,
BootPath, BootPath);
FALSE);
} }
ARC_STATUS ARC_STATUS
LoadAndBootWindowsCommon( LoadAndBootWindowsCommon(
USHORT OperatingSystemVersion, IN USHORT OperatingSystemVersion,
PLOADER_PARAMETER_BLOCK LoaderBlock, IN PLOADER_PARAMETER_BLOCK LoaderBlock,
PCSTR BootOptions, IN PCSTR BootOptions,
PCSTR BootPath, IN PCSTR BootPath)
BOOLEAN Setup)
{ {
PLOADER_PARAMETER_BLOCK LoaderBlockVA; PLOADER_PARAMETER_BLOCK LoaderBlockVA;
BOOLEAN Success; BOOLEAN Success;

View file

@ -120,11 +120,10 @@ WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock);
ARC_STATUS ARC_STATUS
LoadAndBootWindowsCommon( LoadAndBootWindowsCommon(
USHORT OperatingSystemVersion, IN USHORT OperatingSystemVersion,
PLOADER_PARAMETER_BLOCK LoaderBlock, IN PLOADER_PARAMETER_BLOCK LoaderBlock,
PCSTR BootOptions, IN PCSTR BootOptions,
PCSTR BootPath, IN PCSTR BootPath);
BOOLEAN Setup);
VOID VOID
WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock); WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock);