WINLDR: Finally, set Windows boot style as default

Many thanks to Fireball and Alex for your hard work on Windows boot style

svn path=/trunk/; revision=43273

diff --git a/reactos/base/setup/usetup/bootsup.c b/reactos/base/setup/usetup/bootsup.c
index 669b249..1897cbc 100644 (file)
--- a/reactos/base/setup/usetup/bootsup.c
+++ b/reactos/base/setup/usetup/bootsup.c
@@ -415,13 +415,13 @@ CreateFreeLoaderIniForReactos(PWCHAR IniPath,
     /* ReactOS */
     CreateFreeLoaderEntry(IniCache, IniSection,
         L"ReactOS", L"\"ReactOS\"",
-        L"ReactOS", ArcPath,
+        L"Windows2003", ArcPath,
         L"");
 
     /* ReactOS_Debug */
     CreateFreeLoaderEntry(IniCache, IniSection,
         L"ReactOS_Debug", L"\"ReactOS (Debug)\"",
-        L"ReactOS", ArcPath,
+        L"Windows2003", ArcPath,
         L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS");
 
 #if DBG
@@ -431,12 +431,6 @@ CreateFreeLoaderIniForReactos(PWCHAR IniPath,
         L"ReactOS", ArcPath,
         L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /KDSERIAL");
 
-    /* ReactOS_WinLdr */
-    CreateFreeLoaderEntry(IniCache, IniSection,
-        L"ReactOS_WinLdr", L"\"ReactOS (WinLdr)\"",
-        L"Windows2003", ArcPath,
-        L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS");
-
     /* ReactOS_Ram */
     CreateFreeLoaderEntry(IniCache, IniSection,
         L"ReactOS_Ram", L"\"ReactOS (RAM Disk)\"",
@@ -444,6 +438,18 @@ CreateFreeLoaderIniForReactos(PWCHAR IniPath,
         L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS /RDIMAGEPATH=reactos.img /RDIMAGEOFFSET=32256");
 #endif
 
+    /* ReactOS_old */
+    CreateFreeLoaderEntry(IniCache, IniSection,
+        L"ReactOS_old", L"\"ReactOS (old boot method)\"",
+        L"ReactOS", ArcPath,
+        L"");
+
+    /* ReactOS_Debug_old */
+    CreateFreeLoaderEntry(IniCache, IniSection,
+        L"ReactOS_Debug_old", L"\"ReactOS (Debug, old boot method)\"",
+        L"ReactOS", ArcPath,
+        L"/DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 /SOS");
+
   /* Save the ini file */
   IniCacheSave(IniCache, IniPath);
   IniCacheDestroy(IniCache);

diff --git a/reactos/boot/bootdata/bootcd.ini b/reactos/boot/bootdata/bootcd.ini
index 309b16b..882fc18 100644 (file)
--- a/reactos/boot/bootdata/bootcd.ini
+++ b/reactos/boot/bootdata/bootcd.ini
@@ -1,6 +1,6 @@
 [FREELOADER]
 DefaultOS=Setup
-Timeout=0
+Timeout=1
 
 [Display]
 TitleText=ReactOS Setup
@@ -21,6 +21,10 @@ SelectedColor=Gray
 
 [Operating Systems]
 Setup="Setup"
+Setup_old="Setup (old boot method)"
 
 [Setup]
-BootType=ReactOSSetup
+BootType=ReactOSSetup2
+
+[Setup_old]
+BootType=ReactOSSetup
\ No newline at end of file

diff --git a/reactos/boot/bootdata/livecd.ini b/reactos/boot/bootdata/livecd.ini
index d34a5d0..e43dbf6 100644 (file)
--- a/reactos/boot/bootdata/livecd.ini
+++ b/reactos/boot/bootdata/livecd.ini
@@ -1,6 +1,6 @@
 [FREELOADER]
 DefaultOS=ReactOS
-Timeout=0
+Timeout=1
 
 [Display]
 TitleText=ReactOS Boot Manager
@@ -21,8 +21,14 @@ SelectedColor=Gray
 
 [Operating Systems]
 ReactOS="ReactOS"
+Reactos_old="ReactOS (old boot method)"
 
 [ReactOS]
+BootType=Windows2003
+SystemPath=LiveCD\reactos
+Options=/DEBUGPORT=COM1 /SOS /MININT
+
+[Reactos_old]
 BootType=ReactOS
 SystemPath=LiveCD\reactos
 Options=/DEBUGPORT=COM1 /SOS