mirror of
https://github.com/reactos/reactos.git
synced 2025-07-06 09:31:26 +00:00
[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:
parent
64ca7f6427
commit
58866a112a
3 changed files with 11 additions and 15 deletions
|
@ -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);
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue