[ros-diffs] [reactos] 08/10: [BOOTDATA][SETUPLIB] Don't hardcode FreeLdr's UI defaults in the freeldr.ini files.

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

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

commit ea4cfcfa1288d6296545b97ea8fe14d5aae45f1f
Author:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
AuthorDate: Tue Feb 15 01:19:42 2022 +0100
Commit:     Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org>
CommitDate: Mon Feb 21 02:54:04 2022 +0100

    [BOOTDATA][SETUPLIB] Don't hardcode FreeLdr's UI defaults in the freeldr.ini
files.
    
    This includes:
    - the default TimeText;
    - the default colors.
    
    They can however be changed by the user at one's convenience, by
    explicitly specifying different values.
---
 base/setup/lib/utils/bldrsup.c | 93 +++++-------------------------------------
 boot/bootdata/bootcd.ini       | 18 --------
 boot/bootdata/floppy_pc98.ini  | 18 --------
 boot/bootdata/hybridcd.ini     | 18 --------
 boot/bootdata/livecd.ini       | 18 --------
 5 files changed, 10 insertions(+), 155 deletions(-)

diff --git a/base/setup/lib/utils/bldrsup.c b/base/setup/lib/utils/bldrsup.c
index ac1d2008ab8..53fdebfeb3f 100644
--- a/base/setup/lib/utils/bldrsup.c
+++ b/base/setup/lib/utils/bldrsup.c
@@ -228,94 +228,21 @@ CreateCommonFreeLdrSections(
 
     BootStore->OptionsIniSection = IniSection;
 
-    /* Timeout=0 */
+    /* TimeOut */
     IniCacheInsertKey(BootStore->OptionsIniSection, NULL, INSERT_LAST,
                       L"TimeOut", L"0");
 
     /* Create "Display" section */
     IniSection = IniCacheAppendSection(BootStore->IniCache, L"Display");
 
-    /* TitleText=ReactOS Boot Manager */
+    /* TitleText */
     IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
                       L"TitleText", L"ReactOS Boot Manager");
 
-    /* StatusBarColor=Cyan */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"StatusBarColor", L"Cyan");
-
-    /* StatusBarTextColor=Black */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"StatusBarTextColor", L"Black");
-
-    /* BackdropTextColor=White */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"BackdropTextColor", L"White");
-
-    /* BackdropColor=Blue */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"BackdropColor", L"Blue");
-
-    /* BackdropFillStyle=Medium */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"BackdropFillStyle", L"Medium");
-
-    /* TitleBoxTextColor=White */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"TitleBoxTextColor", L"White");
-
-    /* TitleBoxColor=Red */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"TitleBoxColor", L"Red");
-
-    /* MessageBoxTextColor=White */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"MessageBoxTextColor", L"White");
-
-    /* MessageBoxColor=Blue */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"MessageBoxColor", L"Blue");
-
-    /* MenuTextColor=White */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"MenuTextColor", L"Default");
-
-    /* MenuColor=Blue */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"MenuColor", L"Black");
-
-    /* TextColor=Yellow */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"TextColor", L"Default");
-
-    /* SelectedTextColor=Black */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"SelectedTextColor", L"Black");
-
-    /* SelectedColor=Default */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"SelectedColor", L"Default");
-
-    /* ShowTime=Yes */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"ShowTime", L"No");
-
-    /* MenuBox=Yes */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"MenuBox", L"No");
-
-    /* CenterMenu=Yes */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"CenterMenu", L"No");
-
-    /* MinimalUI=No */
+    /* MinimalUI */
     IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
                       L"MinimalUI", L"Yes");
 
-    /* TimeText=Your text goes here... */
-    IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
-                      L"TimeText",
-                      L"Seconds until highlighted choice will be started
automatically:   ");
-
     /*
      * Cache the "Operating Systems" section for our future usage.
      */
@@ -876,15 +803,15 @@ CreateNTOSEntry(
     {
         PNTOS_OPTIONS Options = (PNTOS_OPTIONS)&BootEntry->OsOptions;
 
-        /* BootType= */
+        /* BootType */
         IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
                           L"BootType", L"Windows2003");
 
-        /* SystemPath= */
+        /* SystemPath */
         IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
                           L"SystemPath", (PWSTR)Options->OsLoadPath);
 
-        /* Options= */
+        /* Options */
         IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
                           L"Options", (PWSTR)Options->OsLoadOptions);
     }
@@ -897,19 +824,19 @@ CreateNTOSEntry(
     {
         PBOOT_SECTOR_OPTIONS Options =
(PBOOT_SECTOR_OPTIONS)&BootEntry->OsOptions;
 
-        /* BootType= */
+        /* BootType */
         IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
                           L"BootType", L"BootSector");
 
-        /* BootDrive= */
+        /* BootDrive */
         IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
                           L"BootDrive", (PWSTR)Options->Drive);
 
-        /* BootPartition= */
+        /* BootPartition */
         IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
                           L"BootPartition", (PWSTR)Options->Partition);
 
-        /* BootSector= */
+        /* BootSector */
         IniCacheInsertKey(IniSection, NULL, INSERT_LAST,
                           L"BootSectorFile",
(PWSTR)Options->BootSectorFileName);
     }
diff --git a/boot/bootdata/bootcd.ini b/boot/bootdata/bootcd.ini
index a2ea3d0564c..b079d85c0f2 100644
--- a/boot/bootdata/bootcd.ini
+++ b/boot/bootdata/bootcd.ini
@@ -4,25 +4,7 @@ TimeOut=0
 
 [Display]
 TitleText=ReactOS Setup
-StatusBarColor=Cyan
-StatusBarTextColor=Black
-BackdropTextColor=White
-BackdropColor=Blue
-BackdropFillStyle=Medium
-TitleBoxTextColor=White
-TitleBoxColor=Red
-MessageBoxTextColor=White
-MessageBoxColor=Blue
-MenuTextColor=Default
-MenuColor=Black
-TextColor=Default
-SelectedTextColor=Black
-SelectedColor=Default
-ShowTime=No
-MenuBox=No
-CenterMenu=No
 MinimalUI=Yes
-TimeText=Seconds until highlighted choice will be started automatically:   
 
 [Operating Systems]
 Setup="Setup"
diff --git a/boot/bootdata/floppy_pc98.ini b/boot/bootdata/floppy_pc98.ini
index 3a27e48b743..93b5830efda 100644
--- a/boot/bootdata/floppy_pc98.ini
+++ b/boot/bootdata/floppy_pc98.ini
@@ -4,25 +4,7 @@ TimeOut=5
 
 [Display]
 TitleText=ReactOS CD boot
-StatusBarColor=Cyan
-StatusBarTextColor=Black
-BackdropTextColor=White
-BackdropColor=Blue
-BackdropFillStyle=Medium
-TitleBoxTextColor=White
-TitleBoxColor=Red
-MessageBoxTextColor=White
-MessageBoxColor=Blue
-MenuTextColor=Default
-MenuColor=Black
-TextColor=Default
-SelectedTextColor=Black
-SelectedColor=Default
-ShowTime=No
-MenuBox=No
-CenterMenu=No
 MinimalUI=Yes
-TimeText=Seconds until highlighted choice will be started automatically:   
 
 [Operating Systems]
 Setup="Setup"
diff --git a/boot/bootdata/hybridcd.ini b/boot/bootdata/hybridcd.ini
index 2da010b70fb..04278b07488 100644
--- a/boot/bootdata/hybridcd.ini
+++ b/boot/bootdata/hybridcd.ini
@@ -4,25 +4,7 @@ TimeOut=5
 
 [Display]
 TitleText=ReactOS Hybrid-CD
-StatusBarColor=Cyan
-StatusBarTextColor=Black
-BackdropTextColor=White
-BackdropColor=Blue
-BackdropFillStyle=Medium
-TitleBoxTextColor=White
-TitleBoxColor=Red
-MessageBoxTextColor=White
-MessageBoxColor=Blue
-MenuTextColor=Default
-MenuColor=Black
-TextColor=Default
-SelectedTextColor=Black
-SelectedColor=Default
-ShowTime=No
-MenuBox=No
-CenterMenu=No
 MinimalUI=Yes
-TimeText=Seconds until highlighted choice will be started automatically:   
 
 [Operating Systems]
 Setup="Setup"
diff --git a/boot/bootdata/livecd.ini b/boot/bootdata/livecd.ini
index a69b22731fa..0b034df9b1a 100644
--- a/boot/bootdata/livecd.ini
+++ b/boot/bootdata/livecd.ini
@@ -4,25 +4,7 @@ TimeOut=5
 
 [Display]
 TitleText=ReactOS LiveCD
-StatusBarColor=Cyan
-StatusBarTextColor=Black
-BackdropTextColor=White
-BackdropColor=Blue
-BackdropFillStyle=Medium
-TitleBoxTextColor=White
-TitleBoxColor=Red
-MessageBoxTextColor=White
-MessageBoxColor=Blue
-MenuTextColor=Default
-MenuColor=Black
-TextColor=Default
-SelectedTextColor=Black
-SelectedColor=Default
-ShowTime=No
-MenuBox=No
-CenterMenu=No
 MinimalUI=Yes
-TimeText=Seconds until highlighted choice will be started automatically:   
 
 [Operating Systems]
 LiveCD="LiveCD"