[FREELDR]

Completely remove the special blue "setup-ui" appearing when starting the bootcd, in this way revert a part of r57842 and r57843.
Requested by some people. Now we keep the NTLDR-like boot ui.

svn path=/trunk/; revision=57933

diff --git a/reactos/boot/bootdata/bootcd.ini b/reactos/boot/bootdata/bootcd.ini
index 2c04ff2..cf8062e 100644 (file)
--- a/reactos/boot/bootdata/bootcd.ini
+++ b/reactos/boot/bootdata/bootcd.ini
@@ -13,11 +13,16 @@ TitleBoxTextColor=White
 TitleBoxColor=Red\r
 MessageBoxTextColor=White\r
 MessageBoxColor=Blue\r
 TitleBoxColor=Red\r
 MessageBoxTextColor=White\r
 MessageBoxColor=Blue\r

-MenuTextColor=White\r
-MenuColor=Blue\r
-TextColor=Yellow\r
+MenuTextColor=Gray\r
+MenuColor=Black\r
+TextColor=Gray\r

 SelectedTextColor=Black\r
 SelectedColor=Gray\r
 SelectedTextColor=Black\r
 SelectedColor=Gray\r

+ShowTime=No\r
+MenuBox=No\r
+CenterMenu=No\r
+MinimalUI=Yes\r
+TimeText=Seconds until highlighted choice will be started automatically:   \r

 \r
 [Operating Systems]\r
 Setup="Setup"\r
 \r
 [Operating Systems]\r
 Setup="Setup"\r

diff --git a/reactos/boot/freeldr/freeldr/include/ui.h b/reactos/boot/freeldr/freeldr/include/ui.h
index 9a87e21..3bd9460 100644 (file)
--- a/reactos/boot/freeldr/freeldr/include/ui.h
+++ b/reactos/boot/freeldr/freeldr/include/ui.h
@@ -55,7 +55,6 @@ extern        const CHAR      UiMonthNames[12][15];
 //
 ///////////////////////////////////////////////////////////////////////////////////////
 BOOLEAN        UiInitialize(BOOLEAN ShowGui);                                                          // Initialize User-Interface
 //
 ///////////////////////////////////////////////////////////////////////////////////////
 BOOLEAN        UiInitialize(BOOLEAN ShowGui);                                                          // Initialize User-Interface

-BOOLEAN        SetupUiInitialize(VOID);                                                // Initialize Setup User-Interface

 VOID   UiUnInitialize(PCSTR BootText);                                         // Un-initialize User-Interface
 VOID   UiDrawBackdrop(VOID);                                                                   // Fills the entire screen with a backdrop
 VOID   UiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */); // Fills the area specified with FillChar and Attr
 VOID   UiUnInitialize(PCSTR BootText);                                         // Un-initialize User-Interface
 VOID   UiDrawBackdrop(VOID);                                                                   // Fills the entire screen with a backdrop
 VOID   UiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */); // Fills the area specified with FillChar and Attr

diff --git a/reactos/boot/freeldr/freeldr/ui/directui.c b/reactos/boot/freeldr/freeldr/ui/directui.c
index 18e2a82..5bc90bb 100644 (file)
--- a/reactos/boot/freeldr/freeldr/ui/directui.c
+++ b/reactos/boot/freeldr/freeldr/ui/directui.c
@@ -575,13 +575,4 @@ UiDisplayMenu(IN PCSTR MenuTitle,
     return TRUE;
 }
 
     return TRUE;
 }
 

-
-/* SETUP MODE *****************************************************************/
-
-BOOLEAN SetupUiInitialize(VOID)
-{
-    /* Nothing to do */
-    return TRUE;
-}
-

 #endif
 #endif

diff --git a/reactos/boot/freeldr/freeldr/ui/ui.c b/reactos/boot/freeldr/freeldr/ui/ui.c
index cc1bf36..b43091a 100644 (file)
--- a/reactos/boot/freeldr/freeldr/ui/ui.c
+++ b/reactos/boot/freeldr/freeldr/ui/ui.c
@@ -20,12 +20,9 @@
 
 #include <freeldr.h>
 #include <debug.h>
 
 #include <freeldr.h>
 #include <debug.h>

-#include <reactos/buildno.h>

 
 DBG_DEFAULT_CHANNEL(UI);
 
 
 DBG_DEFAULT_CHANNEL(UI);
 

-BOOLEAN        UiMinimal                                       = FALSE;                                // Tells us if we are using a minimal console-like UI
-

 ULONG  UiScreenWidth;                                                                          // Screen Width
 ULONG  UiScreenHeight;                                                                         // Screen Height
 
 ULONG  UiScreenWidth;                                                                          // Screen Width
 ULONG  UiScreenHeight;                                                                         // Screen Height
 


@@ -84,6 +81,7 @@ UIVTBL UiVtbl =
 BOOLEAN UiInitialize(BOOLEAN ShowGui)
 {
        VIDEODISPLAYMODE        UiDisplayMode; // Tells us if we are in text or graphics mode
 BOOLEAN UiInitialize(BOOLEAN ShowGui)
 {
        VIDEODISPLAYMODE        UiDisplayMode; // Tells us if we are in text or graphics mode

+       BOOLEAN UiMinimal = FALSE; // Tells us if we are using a minimal console-like UI

        ULONG_PTR SectionId;
        CHAR    DisplayModeText[260];
        CHAR    SettingText[260];
        ULONG_PTR SectionId;
        CHAR    DisplayModeText[260];
        CHAR    SettingText[260];


@@ -464,72 +462,4 @@ BOOLEAN UiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length)
        return UiVtbl.EditBox(MessageText, EditTextBuffer, Length);
 }
 
        return UiVtbl.EditBox(MessageText, EditTextBuffer, Length);
 }
 

-
-/* SETUP MODE *****************************************************************/
-
-VOID SetupUiDrawBackdrop(VOID)
-{
-       CHAR    Underline[80];
-       SIZE_T  Length;
-
-       // Draw the backdrop and fade it in if special effects are enabled
-       UiVtbl.FillArea(0, 0, UiScreenWidth - 1, UiScreenHeight - 2, 0,
-                       ATTR(UiBackdropFgColor, UiBackdropBgColor));
-
-       Length = min( strlen("ReactOS " KERNEL_VERSION_STR " Setup"),
-                     sizeof(Underline) - 1 );
-       memset(Underline, 0xcd, Length); // Underline title
-       Underline[Length] = '\0';
-
-       UiVtbl.DrawText(4, 1, "ReactOS " KERNEL_VERSION_STR " Setup", ATTR(COLOR_GRAY, UiBackdropBgColor));
-       UiVtbl.DrawText(4, 2, Underline, ATTR(COLOR_GRAY, UiBackdropBgColor));
-
-       // Update the screen buffer
-       VideoCopyOffScreenBufferToVRAM();
-}
-
-BOOLEAN SetupUiInitialize(VOID)
-{
-       if (!UiMinimal)
-       {
-               ULONG Depth;
-
-               // Initialize the video
-               MachVideoSetDisplayMode(NULL, TRUE);
-               MachVideoGetDisplaySize(&UiScreenWidth, &UiScreenHeight, &Depth);
-
-               // Use Text UI with a modified backdrop and set display properties
-               UiVtbl = TuiVtbl;
-               UiVtbl.DrawBackdrop = SetupUiDrawBackdrop;
-
-               UiStatusBarFgColor              = COLOR_BLACK;
-               UiStatusBarBgColor              = COLOR_GRAY;
-               UiBackdropFgColor               = COLOR_WHITE;
-               UiBackdropBgColor               = COLOR_BLUE;
-               UiBackdropFillStyle             = MEDIUM_FILL;
-               UiTitleBoxFgColor               = COLOR_WHITE;
-               UiTitleBoxBgColor               = COLOR_RED;
-               UiMessageBoxFgColor             = COLOR_WHITE;
-               UiMessageBoxBgColor             = COLOR_BLUE;
-               UiMenuFgColor                   = COLOR_WHITE;
-               UiMenuBgColor                   = COLOR_BLUE;
-               UiTextColor                             = COLOR_YELLOW;
-               UiSelectedTextColor             = COLOR_BLACK;
-               UiSelectedTextBgColor   = COLOR_GRAY;
-               UiEditBoxTextColor              = COLOR_WHITE;
-               UiEditBoxBgColor                = COLOR_BLACK;
-               UiUseSpecialEffects             = FALSE;
-               UiDrawTime                              = FALSE;
-
-               UiVtbl.Initialize();
-
-               // Draw the backdrop
-               UiDrawBackdrop();
-       }
-
-       TRACE("SetupUiInitialize() returning TRUE.\n");
-
-       return TRUE;
-}
-

 #endif
 #endif

diff --git a/reactos/boot/freeldr/freeldr/windows/setupldr.c b/reactos/boot/freeldr/freeldr/windows/setupldr.c
index 16a93ed..2dd80f3 100644 (file)
--- a/reactos/boot/freeldr/freeldr/windows/setupldr.c
+++ b/reactos/boot/freeldr/freeldr/windows/setupldr.c
@@ -212,7 +212,6 @@ LoadReactOSSetup(IN OperatingSystemItem* OperatingSystem,
 
     TRACE("BootOptions: '%s'\n", BootOptions);
 
 
     TRACE("BootOptions: '%s'\n", BootOptions);
 

-    SetupUiInitialize();

     UiDrawStatusText("Setup is loading...");
 
     /* Allocate and minimalistic-initialize LPB */
     UiDrawStatusText("Setup is loading...");
 
     /* Allocate and minimalistic-initialize LPB */