[ros-diffs] [fireball] 39983: - Remove two unnecessary boot types (Windows2000 and WindowsXP), and add ReactOSSetup2 type for WinLdr-style setup loader. - Add a stub for LoadReactOSSetup2().

[fireball at svn.reactos.org]

Author: fireball
Date: Thu Mar 12 17:42:02 2009
New Revision: 39983

URL: http://svn.reactos.org/svn/reactos?rev=39983&view=rev
Log:
- Remove two unnecessary boot types (Windows2000 and WindowsXP), and add ReactOSSetup2 type for WinLdr-style setup loader.
- Add a stub for LoadReactOSSetup2().

Added:
    trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c   (with props)
Modified:
    trunk/reactos/boot/freeldr/freeldr/bootmgr.c
    trunk/reactos/boot/freeldr/freeldr/include/freeldr.h
    trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild

Modified: trunk/reactos/boot/freeldr/freeldr/bootmgr.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/bootmgr.c?rev=39983&r1=39982&r2=39983&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/bootmgr.c [iso-8859-1] Thu Mar 12 17:42:02 2009
@@ -116,25 +116,22 @@
 			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)
 		{

Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/include/freeldr.h?rev=39983&r1=39982&r2=39983&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Thu Mar 12 17:42:02 2009
@@ -123,5 +123,6 @@
 
 /* Special hack for ReactOS setup OS type */
 VOID LoadReactOSSetup(VOID);
+VOID LoadReactOSSetup2(VOID);
 
 #endif  // defined __FREELDR_H

Modified: trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild?rev=39983&r1=39982&r2=39983&view=diff
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/setupldr_main.rbuild [iso-8859-1] Thu Mar 12 17:42:02 2009
@@ -15,6 +15,9 @@
 		<file>inffile.c</file>
 	</directory>
 	<directory name="reactos">
-	  <file>setupldr.c</file>
+		<file>setupldr.c</file>
+	</directory>
+	<directory name="windows">
+		<file>setupldr2.c</file>
 	</directory>
 </module>

Added: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c?rev=39983&view=auto
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c (added)
+++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c [iso-8859-1] Thu Mar 12 17:42:02 2009
@@ -1,0 +1,29 @@
+/*
+ *  FreeLoader
+ *
+ *  Copyright (C) 2009       Aleksey Bragin  <aleksey at reactos.org>
+ *
+ *  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 <freeldr.h>
+
+#include <ndk/ldrtypes.h>
+#include <debug.h>
+
+VOID LoadReactOSSetup2(VOID)
+{
+}
+

Propchange: trunk/reactos/boot/freeldr/freeldr/windows/setupldr2.c
------------------------------------------------------------------------------
    svn:eol-style = native