Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-25 23:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Remove two unnecessary boot types (Windows2000 and WindowsXP), and add ReactOSSetup2 type for WinLdr-style setup loader.

Browse source 
- Add a stub for LoadReactOSSetup2().

svn path=/trunk/; revision=39983
This commit is contained in:
Aleksey Bragin 2009-03-12 14:42:02 +00:00
parent b2f937d0fe
commit edb32a04eb
4 changed files with 45 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
reactos/boot/freeldr/freeldr/bootmgr.c
View file

@ -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);

1
reactos/boot/freeldr/freeldr/include/freeldr.h
View file

@ -123,5 +123,6 @@ VOID RunLoader(VOID);
/* Special hack for ReactOS setup OS type */
VOID LoadReactOSSetup(VOID);
VOID LoadReactOSSetup2(VOID);
#endif // defined __FREELDR_H

5
reactos/boot/freeldr/freeldr/setupldr_main.rbuild
View file

@ -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>

29
reactos/boot/freeldr/freeldr/windows/setupldr2.c Normal file
View file

@ -0,0 +1,29 @@
/*
* FreeLoader
*
* Copyright (C) 2009 Aleksey Bragin <aleksey@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)
{
}