[ros-diffs] [hbelusca] 57933: [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 t...

Author: hbelusca
Date: Sun Dec 16 21:32:41 2012
New Revision: 57933

URL: http://svn.reactos.org/svn/reactos?rev=57933&view=rev
Log:
[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.

Modified:
    trunk/reactos/boot/bootdata/bootcd.ini
    trunk/reactos/boot/freeldr/freeldr/include/ui.h
    trunk/reactos/boot/freeldr/freeldr/ui/directui.c
    trunk/reactos/boot/freeldr/freeldr/ui/ui.c
    trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c

Modified: trunk/reactos/boot/bootdata/bootcd.ini
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/bootcd.ini?r…
==============================================================================
--- trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] (original)
+++ trunk/reactos/boot/bootdata/bootcd.ini [iso-8859-1] Sun Dec 16 21:32:41 2012
@@ -13,11 +13,16 @@
 TitleBoxColor=Red
 MessageBoxTextColor=White
 MessageBoxColor=Blue
-MenuTextColor=White
-MenuColor=Blue
-TextColor=Yellow
+MenuTextColor=Gray
+MenuColor=Black
+TextColor=Gray
 SelectedTextColor=Black
 SelectedColor=Gray
+ShowTime=No
+MenuBox=No
+CenterMenu=No
+MinimalUI=Yes
+TimeText=Seconds until highlighted choice will be started automatically:   
 
 [Operating Systems]
 Setup="Setup"

Modified: trunk/reactos/boot/freeldr/freeldr/include/ui.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/include/ui.h [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/include/ui.h [iso-8859-1] Sun Dec 16 21:32:41 2012
@@ -55,7 +55,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////////////
 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

Modified: trunk/reactos/boot/freeldr/freeldr/ui/directui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/di…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/ui/directui.c [iso-8859-1] Sun Dec 16 21:32:41
2012
@@ -575,13 +575,4 @@
     return TRUE;
 }
 
-
-/* SETUP MODE *****************************************************************/
-
-BOOLEAN SetupUiInitialize(VOID)
-{
-    /* Nothing to do */
-    return TRUE;
-}
-
 #endif

Modified: trunk/reactos/boot/freeldr/freeldr/ui/ui.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/ui/ui…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/ui/ui.c [iso-8859-1] Sun Dec 16 21:32:41 2012
@@ -20,11 +20,8 @@
 
 #include <freeldr.h>
 #include <debug.h>
-#include <reactos/buildno.h>
 
 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
@@ -84,6 +81,7 @@
 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];
@@ -464,72 +462,4 @@
 	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

Modified: trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo…
==============================================================================
--- trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] (original)
+++ trunk/reactos/boot/freeldr/freeldr/windows/setupldr.c [iso-8859-1] Sun Dec 16 21:32:41
2012
@@ -212,7 +212,6 @@
 
     TRACE("BootOptions: '%s'\n", BootOptions);
 
-    SetupUiInitialize();
     UiDrawStatusText("Setup is loading...");
 
     /* Allocate and minimalistic-initialize LPB */