diff --git a/reactos/boot/freeldr/freeldr/bootmgr.c b/reactos/boot/freeldr/freeldr/bootmgr.c
index ed77ef68dda..5bbfca862a0 100644
--- a/reactos/boot/freeldr/freeldr/bootmgr.c
+++ b/reactos/boot/freeldr/freeldr/bootmgr.c
@@ -116,26 +116,23 @@ VOID RunLoader(VOID)
LoadAndBootReactOS(OperatingSystemSectionNames[SelectedOperatingSystem]);
}
#ifdef FREELDR_REACTOS_SETUP
- else if (_stricmp(SettingValue, "ReactOSSetup") == 0)
- {
- // In future we could pass the selected OS details through this
- // to have different install methods, etc.
- LoadReactOSSetup();
- }
+ else if (_stricmp(SettingValue, "ReactOSSetup") == 0)
+ {
+ // In future we could pass the selected OS details through this
+ // to have different install methods, etc.
+ LoadReactOSSetup();
+ }
+ else if (_stricmp(SettingValue, "ReactOSSetup2") == 0)
+ {
+ // WinLdr-style boot
+ LoadReactOSSetup2();
+ }
#endif
#ifdef __i386__
else if (_stricmp(SettingValue, "WindowsNT40") == 0)
{
LoadAndBootWindows(OperatingSystemSectionNames[SelectedOperatingSystem], _WIN32_WINNT_NT4);
}
- else if (_stricmp(SettingValue, "Windows2000") == 0)
- {
- LoadAndBootWindows(OperatingSystemSectionNames[SelectedOperatingSystem], _WIN32_WINNT_WIN2K);
- }
- else if (_stricmp(SettingValue, "WindowsXP") == 0)
- {
- LoadAndBootWindows(OperatingSystemSectionNames[SelectedOperatingSystem], _WIN32_WINNT_WINXP);
- }
else if (_stricmp(SettingValue, "Windows2003") == 0)
{
LoadAndBootWindows(OperatingSystemSectionNames[SelectedOperatingSystem], _WIN32_WINNT_WS03);
diff --git a/reactos/boot/freeldr/freeldr/include/freeldr.h b/reactos/boot/freeldr/freeldr/include/freeldr.h
index 2fe98bbd993..a001b9b1e44 100644
--- a/reactos/boot/freeldr/freeldr/include/freeldr.h
+++ b/reactos/boot/freeldr/freeldr/include/freeldr.h
@@ -123,5 +123,6 @@ VOID RunLoader(VOID);
/* Special hack for ReactOS setup OS type */
VOID LoadReactOSSetup(VOID);
+VOID LoadReactOSSetup2(VOID);
#endif // defined __FREELDR_H
diff --git a/reactos/boot/freeldr/freeldr/setupldr_main.rbuild b/reactos/boot/freeldr/freeldr/setupldr_main.rbuild
index 178e6b97d8e..c23304ab53d 100644
--- a/reactos/boot/freeldr/freeldr/setupldr_main.rbuild
+++ b/reactos/boot/freeldr/freeldr/setupldr_main.rbuild
@@ -15,6 +15,9 @@
inffile.c
- setupldr.c
+ setupldr.c
+
+
+ setupldr2.c
diff --git a/reactos/boot/freeldr/freeldr/windows/setupldr2.c b/reactos/boot/freeldr/freeldr/windows/setupldr2.c
new file mode 100644
index 00000000000..a900f495c29
--- /dev/null
+++ b/reactos/boot/freeldr/freeldr/windows/setupldr2.c
@@ -0,0 +1,29 @@
+/*
+ * FreeLoader
+ *
+ * Copyright (C) 2009 Aleksey Bragin
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include
+
+#include
+#include
+
+VOID LoadReactOSSetup2(VOID)
+{
+}
+