[ros-diffs] [reactos] 02/06: [FREELDR] Remove the 'Setup' parameter of the LoadAndBootWindowsCommon() function.

[Hermès Bélusca-Maïto]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=58866a112a14e727a6475…

commit 58866a112a14e727a6475a8b76239a0a645b851a
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Tue Nov 3 00:13:05 2020 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Tue Nov 3 01:51:48 2020 +0100

    [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.
---
 boot/freeldr/freeldr/ntldr/setupldr.c |  5 ++---
 boot/freeldr/freeldr/ntldr/winldr.c   | 12 +++++-------
 boot/freeldr/freeldr/ntldr/winldr.h   |  9 ++++-----
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c
b/boot/freeldr/freeldr/ntldr/setupldr.c
index 2010a2718db..b6da7c7a95c 100644
--- a/boot/freeldr/freeldr/ntldr/setupldr.c
+++ b/boot/freeldr/freeldr/ntldr/setupldr.c
@@ -389,10 +389,9 @@ LoadReactOSSetup(
 
     UiDrawStatusText("The Setup program is starting...");
 
-    /* Load ReactOS Setup */
+    /* Finish loading */
     return LoadAndBootWindowsCommon(_WIN32_WINNT_WS03,
                                     LoaderBlock,
                                     BootOptions,
-                                    BootPath,
-                                    TRUE);
+                                    BootPath);
 }
diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c
index d672dd2af4f..f76165f1640 100644
--- a/boot/freeldr/freeldr/ntldr/winldr.c
+++ b/boot/freeldr/freeldr/ntldr/winldr.c
@@ -998,17 +998,15 @@ LoadAndBootWindows(
     return LoadAndBootWindowsCommon(OperatingSystemVersion,
                                     LoaderBlock,
                                     BootOptions,
-                                    BootPath,
-                                    FALSE);
+                                    BootPath);
 }
 
 ARC_STATUS
 LoadAndBootWindowsCommon(
-    USHORT OperatingSystemVersion,
-    PLOADER_PARAMETER_BLOCK LoaderBlock,
-    PCSTR BootOptions,
-    PCSTR BootPath,
-    BOOLEAN Setup)
+    IN USHORT OperatingSystemVersion,
+    IN PLOADER_PARAMETER_BLOCK LoaderBlock,
+    IN PCSTR BootOptions,
+    IN PCSTR BootPath)
 {
     PLOADER_PARAMETER_BLOCK LoaderBlockVA;
     BOOLEAN Success;
diff --git a/boot/freeldr/freeldr/ntldr/winldr.h b/boot/freeldr/freeldr/ntldr/winldr.h
index a2af29ff5a3..c89010e3e1a 100644
--- a/boot/freeldr/freeldr/ntldr/winldr.h
+++ b/boot/freeldr/freeldr/ntldr/winldr.h
@@ -120,11 +120,10 @@ WinLdrpDumpArcDisks(PLOADER_PARAMETER_BLOCK LoaderBlock);
 
 ARC_STATUS
 LoadAndBootWindowsCommon(
-    USHORT OperatingSystemVersion,
-    PLOADER_PARAMETER_BLOCK LoaderBlock,
-    PCSTR BootOptions,
-    PCSTR BootPath,
-    BOOLEAN Setup);
+    IN USHORT OperatingSystemVersion,
+    IN PLOADER_PARAMETER_BLOCK LoaderBlock,
+    IN PCSTR BootOptions,
+    IN PCSTR BootPath);
 
 VOID
 WinLdrSetupMachineDependent(PLOADER_PARAMETER_BLOCK LoaderBlock);