Ros-diffs February 2022

ros-diffs@reactos.org

17 participants
108 discussions

[reactos] 01/01: [RUNAS] Pass the current directory to CreateProcessWithLogonW and handle errors

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d4b947aa9b33239f17a23… commit d4b947aa9b33239f17a235b5c5debd159da146ec Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Mon Feb 21 11:12:50 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Mon Feb 21 11:12:50 2022 +0100 [RUNAS] Pass the current directory to CreateProcessWithLogonW and handle errors --- base/applications/runas/lang/de-DE.rc | 8 ++- base/applications/runas/lang/en-US.rc | 8 ++- base/applications/runas/resource.h | 6 +- base/applications/runas/runas.c | 117 +++++++++++++++++++++++++++------- 4 files changed, 110 insertions(+), 29 deletions(-) diff --git a/base/applications/runas/lang/de-DE.rc b/base/applications/runas/lang/de-DE.rc index c9e3e159030..7bba0d9ea01 100644 --- a/base/applications/runas/lang/de-DE.rc +++ b/base/applications/runas/lang/de-DE.rc @@ -13,11 +13,15 @@ BEGIN IDS_USAGE09 " /profile Legt fest, dass das Benutzerprofil geladen werden soll.\n" IDS_USAGE10 " Dies ist die Standardeinstellung.\n" IDS_USAGE11 " /env Verwendet die aktuelle Umgebung statt der des Benutzers.\n" - IDS_USAGE12 " /user <Benutzername> muss in der Form Benutzer@Domäne oder\n Domäne\\Benutzer angegeben werden\n" - IDS_USAGE13 " Programm Befehlszeile einer ausführbaren Datei. Siehe unten\n aufgeführte Beispiele.\n\n" + IDS_USAGE12 " /netonly Noch nicht implementiert.\n" + IDS_USAGE13 " /savecred Noch nicht implementiert.\n" + IDS_USAGE14 " /smartcard Noch nicht implementiert.\n" + IDS_USAGE15 " /user <Benutzername> muss in der Form Benutzer@Domäne oder\n Domäne\\Benutzer angegeben werden\n" + IDS_USAGE16 " Programm Befehlszeile einer ausführbaren Datei. Siehe unten\n aufgeführte Beispiele.\n\n" IDS_START "Es wird versucht, %s als Benutzer ""%s\\%s"" zu starten...\n" IDS_RUN_ERROR "RUNAS-FEHLER: %s kann nicht ausgeführt werden\n" + IDS_INTERNAL_ERROR "RUNAS-FEHLER: Interner Fehler %ld\n" IDS_PASSWORD "Geben Sie das Kennwort für ""%s\\%s"" ein: " END diff --git a/base/applications/runas/lang/en-US.rc b/base/applications/runas/lang/en-US.rc index f3f478b67f6..b06713718cc 100644 --- a/base/applications/runas/lang/en-US.rc +++ b/base/applications/runas/lang/en-US.rc @@ -13,11 +13,15 @@ BEGIN IDS_USAGE09 " /profile specifies that the user's profile should be loaded.\n" IDS_USAGE10 " This is the default.\n" IDS_USAGE11 " /env to use current environment instead of user's.\n" - IDS_USAGE12 " /user <UserName> should be in form USER@DOMAIN or DOMAIN\\USER\n" - IDS_USAGE13 " program command line for EXE. See below for examples\n\n" + IDS_USAGE12 " /netonly Not implemented yet.\n" + IDS_USAGE13 " /savecred Not implemented yet.\n" + IDS_USAGE14 " /smartcard Not implemented yet.\n" + IDS_USAGE15 " /user <UserName> should be in form USER@DOMAIN or DOMAIN\\USER\n" + IDS_USAGE16 " program command line for EXE. See below for examples\n\n" IDS_START "Attempting to start %s as user ""%s\\%s""...\n" IDS_RUN_ERROR "RUNAS ERROR: Unable to run %s\n" + IDS_INTERNAL_ERROR "RUNAS ERROR: Internal error %ld\n" IDS_PASSWORD "Enter the password for ""%s\\%s"": " END diff --git a/base/applications/runas/resource.h b/base/applications/runas/resource.h index a2288467f14..e0f920557ba 100644 --- a/base/applications/runas/resource.h +++ b/base/applications/runas/resource.h @@ -11,8 +11,12 @@ #define IDS_USAGE11 7010 #define IDS_USAGE12 7011 #define IDS_USAGE13 7012 -#define IDS_USAGE_MAX IDS_USAGE13 +#define IDS_USAGE14 7013 +#define IDS_USAGE15 7014 +#define IDS_USAGE16 7015 +#define IDS_USAGE_MAX IDS_USAGE16 #define IDS_START 7100 #define IDS_RUN_ERROR 7101 +#define IDS_INTERNAL_ERROR 7102 #define IDS_PASSWORD 7500 diff --git a/base/applications/runas/runas.c b/base/applications/runas/runas.c index 8adbe8d2894..316b547a0e5 100644 --- a/base/applications/runas/runas.c +++ b/base/applications/runas/runas.c @@ -85,10 +85,13 @@ wmain( PWSTR pszDomain = NULL; PWSTR pszCommandLine = NULL; PWSTR pszPassword = NULL; + PWSTR pszCurrentDirectory = NULL; + PWSTR pszEnvironment = NULL; PWSTR ptr; STARTUPINFOW StartupInfo; PROCESS_INFORMATION ProcessInfo; DWORD dwLogonFlags = 0; + DWORD dwCreateFlags = 0; BOOL rc; /* Initialize the Console Standard Streams */ @@ -112,6 +115,8 @@ wmain( if (wcscmp(pszArg, L"?") == 0) { Usage(); + result = 0; + goto done; } else if (wcsicmp(pszArg, L"profile") == 0) { @@ -133,13 +138,25 @@ wmain( { /* User@Domain */ pszUserName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ((ptr - pszArg) + 1) * sizeof(WCHAR)); - if (pszUserName) - wcsncpy(pszUserName, pszArg, (ptr - pszArg)); + if (pszUserName == NULL) + { + ConResPrintf(StdOut, IDS_INTERNAL_ERROR, ERROR_OUTOFMEMORY); + result = -1; + goto done; + } + + wcsncpy(pszUserName, pszArg, (ptr - pszArg)); ptr++; pszDomain = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(ptr) + 1) * sizeof(WCHAR)); - if (pszDomain) - wcscpy(pszDomain, ptr); + if (pszDomain == NULL) + { + ConResPrintf(StdOut, IDS_INTERNAL_ERROR, ERROR_OUTOFMEMORY); + result = -1; + goto done; + } + + wcscpy(pszDomain, ptr); } else { @@ -148,19 +165,37 @@ wmain( { /* Domain\User */ pszUserName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(ptr + 1) + 1)* sizeof(WCHAR)); - if (pszUserName) - wcscpy(pszUserName, (ptr + 1)); + if (pszUserName == NULL) + { + ConResPrintf(StdOut, IDS_INTERNAL_ERROR, ERROR_OUTOFMEMORY); + result = -1; + goto done; + } + + wcscpy(pszUserName, (ptr + 1)); pszDomain = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, ((ptr - pszArg) + 1) * sizeof(WCHAR)); - if (pszDomain) - wcsncpy(pszDomain, pszArg, (ptr - pszArg)); + if (pszDomain == NULL) + { + ConResPrintf(StdOut, IDS_INTERNAL_ERROR, ERROR_OUTOFMEMORY); + result = -1; + goto done; + } + + wcsncpy(pszDomain, pszArg, (ptr - pszArg)); } else { /* User */ pszUserName = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(pszArg) + 1) * sizeof(WCHAR)); - if (pszUserName) - wcscpy(pszUserName, pszArg); + if (pszUserName == NULL) + { + ConResPrintf(StdOut, IDS_INTERNAL_ERROR, ERROR_OUTOFMEMORY); + result = -1; + goto done; + } + + wcscpy(pszUserName, pszArg); } } } @@ -168,6 +203,7 @@ wmain( { Usage(); result = -1; + goto done; } } else @@ -175,8 +211,14 @@ wmain( if (pszCommandLine == NULL) { pszCommandLine = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (wcslen(pszArg) + 1) * sizeof(WCHAR)); - if (pszCommandLine != NULL) - wcscpy(pszCommandLine, pszArg); + if (pszCommandLine == NULL) + { + ConResPrintf(StdOut, IDS_INTERNAL_ERROR, ERROR_OUTOFMEMORY); + result = -1; + goto done; + } + + wcscpy(pszCommandLine, pszArg); break; } } @@ -195,11 +237,6 @@ wmain( if (bNoProfile) dwLogonFlags &= ~LOGON_WITH_PROFILE; - if (bEnv) - { - DPRINT("env\n"); - } - DPRINT("User: %S\n", pszUserName); DPRINT("Domain: %S\n", pszDomain); DPRINT("CommandLine: %S\n", pszCommandLine); @@ -208,11 +245,38 @@ wmain( { DWORD dwLength = MAX_COMPUTERNAME_LENGTH + 1; pszDomain = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength * sizeof(WCHAR)); - if (pszDomain) - GetComputerNameW(pszDomain, &dwLength); + if (pszDomain == NULL) + { + ConResPrintf(StdOut, IDS_INTERNAL_ERROR, ERROR_OUTOFMEMORY); + result = -1; + goto done; + } + + GetComputerNameW(pszDomain, &dwLength); + } + + if (bEnv) + { + pszEnvironment = GetEnvironmentStringsW(); + pszCurrentDirectory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (MAX_PATH + 1) * sizeof(WCHAR)); + if (pszCurrentDirectory == NULL) + { + ConResPrintf(StdOut, IDS_INTERNAL_ERROR, ERROR_OUTOFMEMORY); + result = -1; + goto done; + } + + GetCurrentDirectory(MAX_PATH + 1, pszCurrentDirectory); + dwCreateFlags |= CREATE_UNICODE_ENVIRONMENT; } pszPassword = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (MAX_PASSWORD_LENGTH + 1) * sizeof(WCHAR)); + if (pszPassword == NULL) + { + ConResPrintf(StdOut, IDS_INTERNAL_ERROR, ERROR_OUTOFMEMORY); + result = -1; + goto done; + } /* Query the password */ ConResPrintf(StdOut, IDS_PASSWORD, pszDomain, pszUserName); @@ -225,17 +289,17 @@ wmain( pszDomain, pszPassword, dwLogonFlags, - NULL, //[in, optional] LPCWSTR lpApplicationName, + NULL, pszCommandLine, - 0, //[in] DWORD dwCreationFlags, - bEnv ? GetEnvironmentStringsW() : NULL, - NULL, //[in, optional] LPCWSTR lpCurrentDirectory, + dwCreateFlags, + pszEnvironment, + pszCurrentDirectory, &StartupInfo, &ProcessInfo); if (rc == FALSE) { ConResPrintf(StdOut, IDS_RUN_ERROR, pszCommandLine); - ConPrintf(StdOut, L"Error: %lu\n", GetLastError()); + ConPrintf(StdOut, L"%lu\n", GetLastError()); } done: @@ -248,6 +312,11 @@ done: if (pszPassword) HeapFree(GetProcessHeap(), 0, pszPassword); + /* NOTE: Do NOT free pszEnvironment */ + + if (pszCurrentDirectory) + HeapFree(GetProcessHeap(), 0, pszCurrentDirectory); + if (pszCommandLine) HeapFree(GetProcessHeap(), 0, pszCommandLine);

2 years, 6 months

[reactos] 10/10: [FREELDR] Update documentation following timeout and UI style work.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38cbe5acc36dfdebab03f… commit 38cbe5acc36dfdebab03f8a9b70a20a0c180c56c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 20 20:59:53 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 21 02:54:06 2022 +0100 [FREELDR] Update documentation following timeout and UI style work. --- boot/freeldr/FREELDR.INI | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/FREELDR.INI b/boot/freeldr/FREELDR.INI index ddb9a88277d..1887ac78017 100644 --- a/boot/freeldr/FREELDR.INI +++ b/boot/freeldr/FREELDR.INI @@ -12,8 +12,9 @@ ; Debug - FreeLoader debugging port parameters, e.g. ; /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 ; MessageBox - Displays the specified text in a message box upon startup. +; The text can be escaped for newlines (\n). ; DefaultOS - Specifies which OS listed is the default choice. -; TimeOut - Sets the timeout (in seconds) before the first OS listed +; TimeOut - Sets the countdown (in seconds) before the first OS listed ; gets booted automatically. ; [Display] Section Commands: @@ -28,12 +29,17 @@ ; 0x502B for 80x43 ; 0x503C for 80x60 ; -; TitleText - Text that is displayed in the title box. +; TitleText - Text being displayed in the title box. +; TimeText - Text being displayed for the timeout countdown. +; It can be escaped (with a single %d) for the countdown +; to be inserted at a specific place, instead of being +; appended at the end. ; StatusBarColor - Color of status bar's background. ; StatusBarTextColor - Color of status bar's text. ; BackdropTextColor - Color of the backdrop's fill. ; BackdropColor - Color of the backdrop's background. -; BackdropFillStyle - Backdrop fill style - can be: Light, Medium, Dark. +; BackdropFillStyle - Backdrop fill style, can be one of the following: +; None, Light, Medium, Dark. ; TitleBoxTextColor - Title box text color. ; TitleBoxColor - Title box background color. ; MessageBoxTextColor - Message box text color. @@ -43,6 +49,12 @@ ; TextColor - Normal text color. ; SelectedTextColor - Selected text color. ; SelectedColor - Selected text background color. +; +; ShowTime - Shows the current time ("Yes") or not ("No"). +; MenuBox - Draws a box around the menu ("Yes") or not ("No"). +; CenterMenu - Uses a centered ("Yes") or left-aligned ("No") menu. +; MinimalUI - Uses a minimal NTLDR-like ("Yes") or a full-fledged +; ("No") Text User Interface. ; SpecialEffects - Turns on ("Yes") or off ("No") video special effects. ; ; Background colors can be any one of the following: @@ -175,6 +187,10 @@ MenuColor=Blue TextColor=Yellow SelectedTextColor=Black SelectedColor=Gray +ShowTime=Yes +MenuBox=Yes +CenterMenu=Yes +MinimalUI=No SpecialEffects=Yes [Operating Systems]

2 years, 6 months

[reactos] 09/10: [FREELDR] Update existing FREELDR.INI documentation.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=63833c769f4844f300b5b… commit 63833c769f4844f300b5be69fa8e28b406eec7c3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 20 20:56:33 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 21 02:54:05 2022 +0100 [FREELDR] Update existing FREELDR.INI documentation. --- boot/freeldr/FREELDR.INI | 88 ++++++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/boot/freeldr/FREELDR.INI b/boot/freeldr/FREELDR.INI index 48561fc4475..ddb9a88277d 100644 --- a/boot/freeldr/FREELDR.INI +++ b/boot/freeldr/FREELDR.INI @@ -11,14 +11,14 @@ ; ; Debug - FreeLoader debugging port parameters, e.g. ; /DEBUG /DEBUGPORT=COM1 /BAUDRATE=115200 -; MessageBox - displays the specified text in a message box upon bootup. -; DefaultOS - specifies which OS listed is the default choice. -; TimeOut - sets the timeout (in seconds) before the first OS listed +; MessageBox - Displays the specified text in a message box upon startup. +; DefaultOS - Specifies which OS listed is the default choice. +; TimeOut - Sets the timeout (in seconds) before the first OS listed ; gets booted automatically. ; [Display] Section Commands: ; -; DisplayMode - sets the video mode to be used by FreeLoader. +; DisplayMode - Sets the video mode to be used by FreeLoader. ; The following values are supported: ; NORMAL_VGA for 80x25 ; EXTENDED_VGA for 80x50 on VGA 80x43 on EGA @@ -28,22 +28,22 @@ ; 0x502B for 80x43 ; 0x503C for 80x60 ; -; TitleText - text that is displayed in the title box. -; StatusBarColor - color of status bar's background. -; StatusBarTextColor - color of status bar's text. -; BackdropTextColor - color of the backdrop's fill. -; BackdropColor - color of the backdrop's background. -; BackdropFillStyle - backdrop fill style - can be: Light, Medium, Dark. -; TitleBoxTextColor - title box text color. -; TitleBoxColor - title box background color. -; MessageBoxTextColor - message box text color. -; MessageBoxColor - message box background color. -; MenuTextColor - menu text color. -; MenuColor - menu color. -; TextColor - normal text color. -; SelectedTextColor - selected text color. -; SelectedColor - selected text background color. -; SpecialEffects - turns on ("Yes") or off ("No") video special effects. +; TitleText - Text that is displayed in the title box. +; StatusBarColor - Color of status bar's background. +; StatusBarTextColor - Color of status bar's text. +; BackdropTextColor - Color of the backdrop's fill. +; BackdropColor - Color of the backdrop's background. +; BackdropFillStyle - Backdrop fill style - can be: Light, Medium, Dark. +; TitleBoxTextColor - Title box text color. +; TitleBoxColor - Title box background color. +; MessageBoxTextColor - Message box text color. +; MessageBoxColor - Message box background color. +; MenuTextColor - Menu text color. +; MenuColor - Menu color. +; TextColor - Normal text color. +; SelectedTextColor - Selected text color. +; SelectedColor - Selected text background color. +; SpecialEffects - Turns on ("Yes") or off ("No") video special effects. ; ; Background colors can be any one of the following: ; Black, Blue, Green, Cyan, Red, Magenta, Brown, Gray. @@ -57,31 +57,31 @@ ; [OS-General] Section Commands: ; -; BootType - specifies the boot type: Windows, WindowsNT40, Windows2003, +; BootType - Specifies the boot type: Windows, WindowsNT40, Windows2003, ; ReactOSSetup, Linux, BootSector, Partition, Drive ; BootPath - ARC path, e.g. multi(0)disk(0)rdisk(x)partition(y) -; DriveMap - maps a BIOS drive number to another (i.e. DriveMap=hd1,hd0 -; maps harddisk1 to harddisk0 or DriveMap=fd1,fd0). +; DriveMap - Maps a BIOS drive number to another (i.e. DriveMap=hd1,hd0 +; maps harddisk1 to harddisk0; or DriveMap=fd1,fd0). ; ["Drive" OSType] Section Commands: ; -; BootDrive - specifies the BIOS drive number to be used. +; BootDrive - BIOS drive number to be used. ; ; REMARK: If a "BootPath" ARC path is specified, its value takes precedence ; over the "BootDrive" value. ; ["Partition" OSType] Section Commands: ; -; BootDrive - specifies the BIOS drive number to be used. -; BootPartition - specifies the partition number to be used (default: 0). +; BootDrive - BIOS drive number to be used. +; BootPartition - Partition number to be used (default: 0). ; ; REMARK: If a "BootPath" ARC path is specified, its value takes precedence ; over both the "BootDrive" and "BootPartition" values. ; ["BootSector" OSType] Section Commands: ; -; BootDrive - specifies the BIOS drive number to be used. -; BootPartition - specifies the partition number to be used (cannot be 0). +; BootDrive - BIOS drive number to be used. +; BootPartition - Partition number to be used (cannot be 0). ; ; REMARK: If a "BootPath" ARC path is specified, its value takes precedence ; over both the "BootDrive" and "BootPartition" values. @@ -90,7 +90,7 @@ ; If none of them are given and a relative file path is specified by the ; "BootSectorFile" value, the default boot partition will be used instead. ; -; BootSectorFile - specifies the file name of the bootsector to be loaded. +; BootSectorFile - File name of the bootsector to be loaded. ; It can be either relative to "BootDrive" and "BootPartition" ; (or to "BootPath"), or be an absolute ARC path, in which case ; the "BootDrive" and "BootPartition" (or "BootPath") values @@ -98,8 +98,8 @@ ; ["Linux" OSType] Section Commands: ; -; BootDrive - specifies the BIOS drive number to be used. -; BootPartition - specifies the partition number to be used (cannot be 0). +; BootDrive - BIOS drive number to be used. +; BootPartition - Partition number to be used (cannot be 0). ; ; REMARK: If a "BootPath" ARC path is specified, its value takes precedence ; over both the "BootDrive" and "BootPartition" values. @@ -108,37 +108,37 @@ ; If none of them are given and a relative file path is specified by the ; "Kernel" or "Initrd" values, the default boot partition will be used instead. ; -; Kernel - specifies the kernel file name to be used. +; Kernel - Kernel file name to be used. ; It can be either relative to "BootDrive" and "BootPartition" ; (or to "BootPath"), or be an absolute ARC path, in which case ; the "BootDrive" and "BootPartition" (or "BootPath") values ; will only be used to set the boot partition. -; Initrd - specifies the optional init ramdisk file name to be used. -; The same remarks about the path as for "Kernel" remain valid. -; CommandLine - specifies the boot load options for the kernel. +; Initrd - Optional init ramdisk file name to be used. +; The same remarks about the path for "Kernel" also apply here. +; CommandLine - Boot load options for the kernel. ; ["Windows(NT40|2003)" OSType] Section Commands: ; -; SystemPath - specifies the system root path (must be a valid ARC path): +; SystemPath - System root path (must be a valid ARC path), e.g. ; multi(0)disk(0)rdisk(0)partition(1)\reactos ; multi(0)disk(0)fdisk(0) -; Options - specifies the boot load options for the kernel. -; Kernel - specifies the kernel file name (default: ntoskrnl.exe) -; Hal - specifies the HAL file name (default: hal.dll) +; Options - Boot load options for the kernel. +; Kernel - Kernel file name (default: ntoskrnl.exe) +; Hal - HAL file name (default: hal.dll) ; ; REMARK: The "Kernel" and "Hal" values can be either relative to "SystemPath", -; or be an absolute ARC path. Also they can alternatively be specified using the -; NT-compatible "/HAL=filename" and "/KERNEL=filename" option switches to the -; "Options" value, in which case the latter ones take precedence. +; or be an absolute ARC path. Also they can alternatively be specified using +; the NT-compatible "/HAL=filename" and "/KERNEL=filename" option switches to +; the "Options" value, in which case the latter ones take precedence. ; ["ReactOSSetup" OSType] Section Commands: ; ; This OS type is used to start the SETUP portion of NT / ReactOS. ; -; SystemPath - specifies the system root path (must be a valid ARC path): +; SystemPath - System root path (must be a valid ARC path), e.g. ; multi(0)disk(0)rdisk(0)partition(1)\reactos ; multi(0)disk(0)fdisk(0) -; Options - specifies extra boot load options for the kernel and the +; Options - Extra boot load options for the kernel and the ; setup environment (see REMARK 2 below). ; ; REMARK: Contrary to the "Windows" type, this OS type does not support separate

2 years, 6 months

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

by 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"

2 years, 6 months

[reactos] 07/10: [FREELDR:UI] Improve setting UI colors/strings ("theme") defaults.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d215039216a37b51c7e17… commit d215039216a37b51c7e1701c1d623c0043dca773 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 20 20:17:02 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 21 02:54:03 2022 +0100 [FREELDR:UI] Improve setting UI colors/strings ("theme") defaults. Now, default UI colors/strings (e.g. titles/timeout text) that are dependent of the UI "theme" (mini vs. full TUI) are set first when calling their corresponding Initialize() function. Then, the user UI settings are read from the user's freeldr.ini file and override the UI theme defaults. These settings get effectively applied at the first drawing operation (usually the UiFadeInBackdrop() call done by the main UiInitialize() function). For "directui" we don't care about the settings -- they are hardcoded. This allows not having to specify the default settings in the freeldr.ini files anymore. + Add support for "None" UiBackdropFillStyle: fill with whitespace, instead of the specific patterns. --- boot/freeldr/freeldr/include/ui.h | 54 ++++++++--------- boot/freeldr/freeldr/ui/minitui.c | 46 +++++++++++++- boot/freeldr/freeldr/ui/tui.c | 123 ++++++++++++++++++++++---------------- boot/freeldr/freeldr/ui/ui.c | 117 ++++++++++++++++++------------------ 4 files changed, 202 insertions(+), 138 deletions(-) diff --git a/boot/freeldr/freeldr/include/ui.h b/boot/freeldr/freeldr/include/ui.h index d27815599fd..7a7e5cfc6e3 100644 --- a/boot/freeldr/freeldr/include/ui.h +++ b/boot/freeldr/freeldr/include/ui.h @@ -19,33 +19,33 @@ #pragma once -extern ULONG UiScreenWidth; // Screen Width -extern ULONG UiScreenHeight; // Screen Height - -extern UCHAR UiStatusBarFgColor; // Status bar foreground color -extern UCHAR UiStatusBarBgColor; // Status bar background color -extern UCHAR UiBackdropFgColor; // Backdrop foreground color -extern UCHAR UiBackdropBgColor; // Backdrop background color -extern UCHAR UiBackdropFillStyle; // Backdrop fill style -extern UCHAR UiTitleBoxFgColor; // Title box foreground color -extern UCHAR UiTitleBoxBgColor; // Title box background color -extern UCHAR UiMessageBoxFgColor; // Message box foreground color -extern UCHAR UiMessageBoxBgColor; // Message box background color -extern UCHAR UiMenuFgColor; // Menu foreground color -extern UCHAR UiMenuBgColor; // Menu background color -extern UCHAR UiTextColor; // Normal text color -extern UCHAR UiSelectedTextColor; // Selected text color -extern UCHAR UiSelectedTextBgColor; // Selected text background color -extern UCHAR UiEditBoxTextColor; // Edit box text color -extern UCHAR UiEditBoxBgColor; // Edit box text background color - -extern CHAR UiTitleBoxTitleText[260]; // Title box's title text - -extern BOOLEAN UiUseSpecialEffects; // Tells us if we should use fade effects -extern BOOLEAN UiCenterMenu; -extern BOOLEAN UiMenuBox; -extern CHAR UiTimeText[]; -extern BOOLEAN UiDrawTime; +extern ULONG UiScreenWidth; // Screen Width +extern ULONG UiScreenHeight; // Screen Height + +extern UCHAR UiStatusBarFgColor; // Status bar foreground color +extern UCHAR UiStatusBarBgColor; // Status bar background color +extern UCHAR UiBackdropFgColor; // Backdrop foreground color +extern UCHAR UiBackdropBgColor; // Backdrop background color +extern UCHAR UiBackdropFillStyle; // Backdrop fill style +extern UCHAR UiTitleBoxFgColor; // Title box foreground color +extern UCHAR UiTitleBoxBgColor; // Title box background color +extern UCHAR UiMessageBoxFgColor; // Message box foreground color +extern UCHAR UiMessageBoxBgColor; // Message box background color +extern UCHAR UiMenuFgColor; // Menu foreground color +extern UCHAR UiMenuBgColor; // Menu background color +extern UCHAR UiTextColor; // Normal text color +extern UCHAR UiSelectedTextColor; // Selected text color +extern UCHAR UiSelectedTextBgColor; // Selected text background color +extern UCHAR UiEditBoxTextColor; // Edit box text color +extern UCHAR UiEditBoxBgColor; // Edit box text background color + +extern BOOLEAN UiShowTime; // Whether to draw the time +extern BOOLEAN UiMenuBox; // Whether to draw a box around the menu +extern BOOLEAN UiCenterMenu; // Whether to use a centered or left-aligned menu +extern BOOLEAN UiUseSpecialEffects; // Whether to use fade effects + +extern CHAR UiTitleBoxTitleText[260]; // Title box's title text +extern CHAR UiTimeText[260]; extern const PCSTR UiMonthNames[12]; diff --git a/boot/freeldr/freeldr/ui/minitui.c b/boot/freeldr/freeldr/ui/minitui.c index 694072fe65a..872b9aac6ed 100644 --- a/boot/freeldr/freeldr/ui/minitui.c +++ b/boot/freeldr/freeldr/ui/minitui.c @@ -15,10 +15,52 @@ #ifndef _M_ARM +BOOLEAN MiniTuiInitialize(VOID) +{ + /* Initialize main TUI */ + if (!TuiInitialize()) + return FALSE; + + /* Override default settings with "Mini" TUI Theme */ + + UiTextColor = TuiTextToColor("Default"); + + UiStatusBarFgColor = UiTextColor; + UiStatusBarBgColor = COLOR_BLACK; + UiBackdropFgColor = UiTextColor; + UiBackdropBgColor = COLOR_BLACK; + UiBackdropFillStyle = ' '; // TuiTextToFillStyle("None"); + UiTitleBoxFgColor = COLOR_WHITE; + UiTitleBoxBgColor = COLOR_BLACK; + // UiMessageBoxFgColor = COLOR_WHITE; + // UiMessageBoxBgColor = COLOR_BLUE; + UiMenuFgColor = UiTextColor; + UiMenuBgColor = COLOR_BLACK; + UiSelectedTextColor = COLOR_BLACK; + UiSelectedTextBgColor = UiTextColor; + // UiEditBoxTextColor = COLOR_WHITE; + // UiEditBoxBgColor = COLOR_BLACK; + + UiShowTime = FALSE; + UiMenuBox = FALSE; + UiCenterMenu = FALSE; + UiUseSpecialEffects = FALSE; + + // TODO: Have a boolean to show/hide title box? + UiTitleBoxTitleText[0] = ANSI_NULL; + + RtlStringCbCopyA(UiTimeText, sizeof(UiTimeText), + "Seconds until highlighted choice will be started automatically:"); + + return TRUE; +} + VOID MiniTuiDrawBackdrop(VOID) { /* Fill in a black background */ - TuiFillArea(0, 0, UiScreenWidth - 1, UiScreenHeight - 1, 0, 0); + TuiFillArea(0, 0, UiScreenWidth - 1, UiScreenHeight - 1, + UiBackdropFillStyle, + ATTR(UiBackdropFgColor, UiBackdropBgColor)); /* Update the screen buffer */ VideoCopyOffScreenBufferToVRAM(); @@ -206,7 +248,7 @@ MiniTuiDrawMenu( const UIVTBL MiniTuiVtbl = { - TuiInitialize, + MiniTuiInitialize, TuiUnInitialize, MiniTuiDrawBackdrop, TuiFillArea, diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index 4c3a1eeb058..be9cb22567d 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -215,6 +215,37 @@ BOOLEAN TuiInitialize(VOID) return FALSE; } + /* Load default settings with "Full" TUI Theme */ + + UiStatusBarFgColor = COLOR_BLACK; + UiStatusBarBgColor = COLOR_CYAN; + 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; + + UiShowTime = TRUE; + UiMenuBox = TRUE; + UiCenterMenu = TRUE; + UiUseSpecialEffects = FALSE; + + // TODO: Have a boolean to show/hide title box? + RtlStringCbCopyA(UiTitleBoxTitleText, sizeof(UiTitleBoxTitleText), + "Boot Menu"); + + RtlStringCbCopyA(UiTimeText, sizeof(UiTimeText), + "[Time Remaining: %d]"); + return TRUE; } @@ -243,67 +274,54 @@ VOID TuiUnInitialize(VOID) VOID TuiDrawBackdrop(VOID) { - // - // Fill in the background (excluding title box & status bar) - // + /* Fill in the background (excluding title box & status bar) */ TuiFillArea(0, - TUI_TITLE_BOX_CHAR_HEIGHT, - UiScreenWidth - 1, - UiScreenHeight - 2, - UiBackdropFillStyle, - ATTR(UiBackdropFgColor, UiBackdropBgColor)); + TUI_TITLE_BOX_CHAR_HEIGHT, + UiScreenWidth - 1, + UiScreenHeight - 2, + UiBackdropFillStyle, + ATTR(UiBackdropFgColor, UiBackdropBgColor)); - // - // Draw the title box - // + /* Draw the title box */ TuiDrawBox(0, - 0, - UiScreenWidth - 1, - TUI_TITLE_BOX_CHAR_HEIGHT - 1, - D_VERT, - D_HORZ, - TRUE, - FALSE, - ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); - - // - // Draw version text - // + 0, + UiScreenWidth - 1, + TUI_TITLE_BOX_CHAR_HEIGHT - 1, + D_VERT, + D_HORZ, + TRUE, + FALSE, + ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); + + /* Draw version text */ TuiDrawText(2, - 1, - FrLdrVersionString, - ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); + 1, + FrLdrVersionString, + ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); - // - // Draw copyright - // + /* Draw copyright */ TuiDrawText(2, - 2, - BY_AUTHOR, - ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); + 2, + BY_AUTHOR, + ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); TuiDrawText(2, - 3, - AUTHOR_EMAIL, - ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); + 3, + AUTHOR_EMAIL, + ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); - // - // Draw help text - // - TuiDrawText(UiScreenWidth - 16, 3, /*"F1 for Help"*/"F8 for Options", ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); + /* Draw help text */ + TuiDrawText(UiScreenWidth - 16, 3, + /*"F1 for Help"*/ "F8 for Options", + ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); - // - // Draw title text - // + /* Draw title text */ TuiDrawText((UiScreenWidth - (ULONG)strlen(UiTitleBoxTitleText)) / 2, - 2, - UiTitleBoxTitleText, - ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); + 2, + UiTitleBoxTitleText, + ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); - // - // Update the date & time - // + /* Update the date & time */ TuiUpdateDateTime(); - VideoCopyOffScreenBufferToVRAM(); } @@ -539,7 +557,7 @@ VOID TuiUpdateDateTime(VOID) CHAR Buffer[40]; /* Don't draw the time if this has been disabled */ - if (!UiDrawTime) return; + if (!UiShowTime) return; TimeInfo = ArcGetTime(); if (TimeInfo->Year < 1 || 9999 < TimeInfo->Year || @@ -874,7 +892,7 @@ UCHAR TuiTextToColor(PCSTR ColorText) if (_stricmp(ColorText, "Default") == 0) return MachDefaultTextColor; - for (i = 0; i < sizeof(Colors)/sizeof(Colors[0]); ++i) + for (i = 0; i < RTL_NUMBER_OF(Colors); ++i) { if (_stricmp(ColorText, Colors[i].ColorName) == 0) return Colors[i].ColorValue; @@ -891,13 +909,14 @@ UCHAR TuiTextToFillStyle(PCSTR FillStyleText) UCHAR FillStyleValue; } FillStyles[] = { + {"None" , ' '}, {"Light" , LIGHT_FILL }, {"Medium", MEDIUM_FILL}, {"Dark" , DARK_FILL }, }; ULONG i; - for (i = 0; i < sizeof(FillStyles)/sizeof(FillStyles[0]); ++i) + for (i = 0; i < RTL_NUMBER_OF(FillStyles); ++i) { if (_stricmp(FillStyleText, FillStyles[i].FillStyleName) == 0) return FillStyles[i].FillStyleValue; diff --git a/boot/freeldr/freeldr/ui/ui.c b/boot/freeldr/freeldr/ui/ui.c index 49636eab5e5..78ea2f16dd1 100644 --- a/boot/freeldr/freeldr/ui/ui.c +++ b/boot/freeldr/freeldr/ui/ui.c @@ -24,38 +24,38 @@ DBG_DEFAULT_CHANNEL(UI); #ifndef _M_ARM -#define TAG_UI_TEXT 'xTiU' - -ULONG UiScreenWidth; // Screen Width -ULONG UiScreenHeight; // Screen Height - -UCHAR UiStatusBarFgColor = COLOR_BLACK; // Status bar foreground color -UCHAR UiStatusBarBgColor = COLOR_CYAN; // Status bar background color -UCHAR UiBackdropFgColor = COLOR_WHITE; // Backdrop foreground color -UCHAR UiBackdropBgColor = COLOR_BLUE; // Backdrop background color -UCHAR UiBackdropFillStyle = MEDIUM_FILL; // Backdrop fill style -UCHAR UiTitleBoxFgColor = COLOR_WHITE; // Title box foreground color -UCHAR UiTitleBoxBgColor = COLOR_RED; // Title box background color -UCHAR UiMessageBoxFgColor = COLOR_WHITE; // Message box foreground color -UCHAR UiMessageBoxBgColor = COLOR_BLUE; // Message box background color -UCHAR UiMenuFgColor = COLOR_WHITE; // Menu foreground color -UCHAR UiMenuBgColor = COLOR_BLUE; // Menu background color -UCHAR UiTextColor = COLOR_YELLOW; // Normal text color -UCHAR UiSelectedTextColor = COLOR_BLACK; // Selected text color -UCHAR UiSelectedTextBgColor = COLOR_GRAY; // Selected text background color -UCHAR UiEditBoxTextColor = COLOR_WHITE; // Edit box text color -UCHAR UiEditBoxBgColor = COLOR_BLACK; // Edit box text background color +UCHAR UiStatusBarFgColor; // Status bar foreground color +UCHAR UiStatusBarBgColor; // Status bar background color +UCHAR UiBackdropFgColor; // Backdrop foreground color +UCHAR UiBackdropBgColor; // Backdrop background color +UCHAR UiBackdropFillStyle; // Backdrop fill style +UCHAR UiTitleBoxFgColor; // Title box foreground color +UCHAR UiTitleBoxBgColor; // Title box background color +UCHAR UiMessageBoxFgColor; // Message box foreground color +UCHAR UiMessageBoxBgColor; // Message box background color +UCHAR UiMenuFgColor; // Menu foreground color +UCHAR UiMenuBgColor; // Menu background color +UCHAR UiTextColor; // Normal text color +UCHAR UiSelectedTextColor; // Selected text color +UCHAR UiSelectedTextBgColor; // Selected text background color +UCHAR UiEditBoxTextColor; // Edit box text color +UCHAR UiEditBoxBgColor; // Edit box text background color + +BOOLEAN UiShowTime; // Whether to draw the time +BOOLEAN UiMenuBox; // Whether to draw a box around the menu +BOOLEAN UiCenterMenu; // Whether to use a centered or left-aligned menu +BOOLEAN UiUseSpecialEffects; // Whether to use fade effects CHAR UiTitleBoxTitleText[260] = "Boot Menu"; // Title box's title text - -BOOLEAN UiUseSpecialEffects = FALSE; // Tells us if we should use fade effects -BOOLEAN UiDrawTime = TRUE; // Tells us if we should draw the time -BOOLEAN UiCenterMenu = TRUE; // Tells us if we should use a centered or left-aligned menu -BOOLEAN UiMenuBox = TRUE; // Tells us if we should draw a box around the menu -CHAR UiTimeText[260] = "[Time Remaining: %d]"; +CHAR UiTimeText[260] = "[Time Remaining: %d]"; const PCSTR UiMonthNames[12] = { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }; +#define TAG_UI_TEXT 'xTiU' + +ULONG UiScreenWidth; // Screen Width +ULONG UiScreenHeight; // Screen Height + #endif // _M_ARM /* @@ -132,7 +132,7 @@ BOOLEAN UiInitialize(BOOLEAN ShowUi) /* Select the UI */ if ((SectionId != 0) && IniReadSettingByName(SectionId, "MinimalUI", SettingText, sizeof(SettingText))) { - UiMinimal = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); + UiMinimal = (_stricmp(SettingText, "Yes") == 0); } if (UiDisplayMode == VideoGraphicsMode) @@ -148,51 +148,53 @@ BOOLEAN UiInitialize(BOOLEAN ShowUi) else // if (UiDisplayMode == VideoTextMode) UiVtbl = (UiMinimal ? MiniTuiVtbl : TuiVtbl); + /* Load the UI and initialize its default settings */ if (!UiVtbl.Initialize()) { MachVideoSetDisplayMode(NULL, FALSE); return FALSE; } - /* Load the settings */ + /* Load the user UI settings */ if (SectionId != 0) { static const struct { PCSTR SettingName; PVOID SettingVar; + SIZE_T SettingSize OPTIONAL; // Must be non-zero only for text buffers. UCHAR SettingType; // 0: Text, 1: Yes/No, 2: Color, 3: Fill style } Settings[] = { - {"TitleText", &UiTitleBoxTitleText, 0}, - {"TimeText" , &UiTimeText , 0}, - - {"SpecialEffects", &UiUseSpecialEffects, 1}, - {"ShowTime" , &UiDrawTime , 1}, - {"MenuBox" , &UiMenuBox , 1}, - {"CenterMenu" , &UiCenterMenu , 1}, - - {"BackdropColor" , &UiBackdropBgColor , 2}, - {"BackdropTextColor" , &UiBackdropFgColor , 2}, - {"StatusBarColor" , &UiStatusBarBgColor , 2}, - {"StatusBarTextColor" , &UiStatusBarFgColor , 2}, - {"TitleBoxColor" , &UiTitleBoxBgColor , 2}, - {"TitleBoxTextColor" , &UiTitleBoxFgColor , 2}, - {"MessageBoxColor" , &UiMessageBoxBgColor , 2}, - {"MessageBoxTextColor", &UiMessageBoxFgColor , 2}, - {"MenuColor" , &UiMenuBgColor , 2}, - {"MenuTextColor" , &UiMenuFgColor , 2}, - {"TextColor" , &UiTextColor , 2}, - {"SelectedColor" , &UiSelectedTextBgColor, 2}, - {"SelectedTextColor" , &UiSelectedTextColor , 2}, - {"EditBoxColor" , &UiEditBoxBgColor , 2}, - {"EditBoxTextColor" , &UiEditBoxTextColor , 2}, - - {"BackdropFillStyle", &UiBackdropFillStyle, 3}, + {"TitleText", &UiTitleBoxTitleText, sizeof(UiTitleBoxTitleText), 0}, + {"TimeText" , &UiTimeText, sizeof(UiTimeText), 0}, + + {"ShowTime" , &UiShowTime , 0, 1}, + {"MenuBox" , &UiMenuBox , 0, 1}, + {"CenterMenu" , &UiCenterMenu , 0, 1}, + {"SpecialEffects", &UiUseSpecialEffects, 0, 1}, + + {"BackdropColor" , &UiBackdropBgColor , 0, 2}, + {"BackdropTextColor" , &UiBackdropFgColor , 0, 2}, + {"StatusBarColor" , &UiStatusBarBgColor , 0, 2}, + {"StatusBarTextColor" , &UiStatusBarFgColor , 0, 2}, + {"TitleBoxColor" , &UiTitleBoxBgColor , 0, 2}, + {"TitleBoxTextColor" , &UiTitleBoxFgColor , 0, 2}, + {"MessageBoxColor" , &UiMessageBoxBgColor , 0, 2}, + {"MessageBoxTextColor", &UiMessageBoxFgColor , 0, 2}, + {"MenuColor" , &UiMenuBgColor , 0, 2}, + {"MenuTextColor" , &UiMenuFgColor , 0, 2}, + {"TextColor" , &UiTextColor , 0, 2}, + {"SelectedColor" , &UiSelectedTextBgColor, 0, 2}, + {"SelectedTextColor" , &UiSelectedTextColor , 0, 2}, + {"EditBoxColor" , &UiEditBoxBgColor , 0, 2}, + {"EditBoxTextColor" , &UiEditBoxTextColor , 0, 2}, + + {"BackdropFillStyle", &UiBackdropFillStyle, 0, 3}, }; ULONG i; - for (i = 0; i < sizeof(Settings)/sizeof(Settings[0]); ++i) + for (i = 0; i < RTL_NUMBER_OF(Settings); ++i) { if (!IniReadSettingByName(SectionId, Settings[i].SettingName, SettingText, sizeof(SettingText))) continue; @@ -200,10 +202,11 @@ BOOLEAN UiInitialize(BOOLEAN ShowUi) switch (Settings[i].SettingType) { case 0: // Text - strcpy((PCHAR)Settings[i].SettingVar, SettingText); + RtlStringCbCopyA((PCHAR)Settings[i].SettingVar, + Settings[i].SettingSize, SettingText); break; case 1: // Yes/No - *(PBOOLEAN)Settings[i].SettingVar = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); + *(PBOOLEAN)Settings[i].SettingVar = (_stricmp(SettingText, "Yes") == 0); break; case 2: // Color *(PUCHAR)Settings[i].SettingVar = UiTextToColor(SettingText);

2 years, 6 months

[reactos] 06/10: [FREELDR:UI] TuiUpdateDateTime(): Simplify building the date/time strings.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=44ed4fb001f091f75be16… commit 44ed4fb001f091f75be168f40c9096f38b15d647 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 20 04:09:47 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 21 02:54:02 2022 +0100 [FREELDR:UI] TuiUpdateDateTime(): Simplify building the date/time strings. --- boot/freeldr/freeldr/include/ui.h | 2 +- boot/freeldr/freeldr/ui/tui.c | 93 ++++++++++++++------------------------- boot/freeldr/freeldr/ui/ui.c | 2 +- 3 files changed, 35 insertions(+), 62 deletions(-) diff --git a/boot/freeldr/freeldr/include/ui.h b/boot/freeldr/freeldr/include/ui.h index 938192e19b8..d27815599fd 100644 --- a/boot/freeldr/freeldr/include/ui.h +++ b/boot/freeldr/freeldr/include/ui.h @@ -47,7 +47,7 @@ extern BOOLEAN UiMenuBox; extern CHAR UiTimeText[]; extern BOOLEAN UiDrawTime; -extern const CHAR UiMonthNames[12][15]; +extern const PCSTR UiMonthNames[12]; /////////////////////////////////////////////////////////////////////////////////////// // diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index c75afedc236..4c3a1eeb058 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -533,11 +533,10 @@ VOID TuiDrawStatusText(PCSTR StatusText) VOID TuiUpdateDateTime(VOID) { - TIMEINFO* TimeInfo; - char DateString[40]; - CHAR TimeString[40]; - CHAR TempString[20]; - BOOLEAN PMHour = FALSE; + TIMEINFO* TimeInfo; + PCSTR DayPostfix; + BOOLEAN PMHour = FALSE; + CHAR Buffer[40]; /* Don't draw the time if this has been disabled */ if (!UiDrawTime) return; @@ -550,43 +549,33 @@ VOID TuiUpdateDateTime(VOID) 59 < TimeInfo->Minute || 59 < TimeInfo->Second) { - /* This happens on QEmu sometimes. We just skip updating */ + /* This happens on QEmu sometimes. We just skip updating. */ return; } - // Get the month name - strcpy(DateString, UiMonthNames[TimeInfo->Month - 1]); - // Get the day - _itoa(TimeInfo->Day, TempString, 10); - // Get the day postfix + + /* Get the day postfix */ if (1 == TimeInfo->Day || 21 == TimeInfo->Day || 31 == TimeInfo->Day) - { - strcat(TempString, "st"); - } + DayPostfix = "st"; else if (2 == TimeInfo->Day || 22 == TimeInfo->Day) - { - strcat(TempString, "nd"); - } + DayPostfix = "nd"; else if (3 == TimeInfo->Day || 23 == TimeInfo->Day) - { - strcat(TempString, "rd"); - } + DayPostfix = "rd"; else - { - strcat(TempString, "th"); - } - - // Add the day to the date - strcat(DateString, TempString); - strcat(DateString, " "); + DayPostfix = "th"; - // Get the year and add it to the date - _itoa(TimeInfo->Year, TempString, 10); - strcat(DateString, TempString); + /* Build the date string in format: "MMMM dx yyyy" */ + RtlStringCbPrintfA(Buffer, sizeof(Buffer), + "%s %d%s %d", + UiMonthNames[TimeInfo->Month - 1], + TimeInfo->Day, + DayPostfix, + TimeInfo->Year); - // Draw the date - TuiDrawText(UiScreenWidth-(ULONG)strlen(DateString)-2, 1, DateString, ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); + /* Draw the date */ + TuiDrawText(UiScreenWidth - (ULONG)strlen(Buffer) - 2, 1, + Buffer, ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); - // Get the hour and change from 24-hour mode to 12-hour + /* Get the hour and change from 24-hour mode to 12-hour */ if (TimeInfo->Hour > 12) { TimeInfo->Hour -= 12; @@ -596,34 +585,18 @@ VOID TuiUpdateDateTime(VOID) { TimeInfo->Hour = 12; } - _itoa(TimeInfo->Hour, TempString, 10); - strcpy(TimeString, " "); - strcat(TimeString, TempString); - strcat(TimeString, ":"); - _itoa(TimeInfo->Minute, TempString, 10); - if (TimeInfo->Minute < 10) - { - strcat(TimeString, "0"); - } - strcat(TimeString, TempString); - strcat(TimeString, ":"); - _itoa(TimeInfo->Second, TempString, 10); - if (TimeInfo->Second < 10) - { - strcat(TimeString, "0"); - } - strcat(TimeString, TempString); - if (PMHour) - { - strcat(TimeString, " PM"); - } - else - { - strcat(TimeString, " AM"); - } - // Draw the time - TuiDrawText(UiScreenWidth-(ULONG)strlen(TimeString)-2, 2, TimeString, ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); + /* Build the time string in format: "h:mm:ss tt" */ + RtlStringCbPrintfA(Buffer, sizeof(Buffer), + " %d:%02d:%02d %s", + TimeInfo->Hour, + TimeInfo->Minute, + TimeInfo->Second, + PMHour ? "PM" : "AM"); + + /* Draw the time */ + TuiDrawText(UiScreenWidth - (ULONG)strlen(Buffer) - 2, 2, + Buffer, ATTR(UiTitleBoxFgColor, UiTitleBoxBgColor)); } VOID TuiSaveScreen(PUCHAR Buffer) diff --git a/boot/freeldr/freeldr/ui/ui.c b/boot/freeldr/freeldr/ui/ui.c index 513cabfc195..49636eab5e5 100644 --- a/boot/freeldr/freeldr/ui/ui.c +++ b/boot/freeldr/freeldr/ui/ui.c @@ -54,7 +54,7 @@ BOOLEAN UiCenterMenu = TRUE; // Tells us if we should use a centered BOOLEAN UiMenuBox = TRUE; // Tells us if we should draw a box around the menu CHAR UiTimeText[260] = "[Time Remaining: %d]"; -const CHAR UiMonthNames[12][15] = { "January ", "February ", "March ", "April ", "May ", "June ", "July ", "August ", "September ", "October ", "November ", "December " }; +const PCSTR UiMonthNames[12] = { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December" }; #endif // _M_ARM

2 years, 6 months

[reactos] 05/10: [FREELDR:UI] Improve menu timeout drawing.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3599c835f6f63ef977698… commit 3599c835f6f63ef977698ecc945b0f56e16c0bba Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 20 03:01:13 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 21 02:54:01 2022 +0100 [FREELDR:UI] Improve menu timeout drawing. Fixes CORE-13827, where the timer countdown would otherwise display incorrectly if there were no trailing spaces after the timer string. Now, the countdown is always appended with one space separator after the end of the string, **or**, it is inserted at a specific place delimited by a %d insertion point in the string. Also, don't repaint the date & time (in full-UI mode) many times per second -- instead of only once per second -- while displaying a menu. --- boot/freeldr/freeldr/ui/directui.c | 2 +- boot/freeldr/freeldr/ui/tuimenu.c | 225 ++++++++++++++++++++++++------------- boot/freeldr/freeldr/ui/ui.c | 2 +- 3 files changed, 148 insertions(+), 81 deletions(-) diff --git a/boot/freeldr/freeldr/ui/directui.c b/boot/freeldr/freeldr/ui/directui.c index 68d67777190..f34f1dc2158 100644 --- a/boot/freeldr/freeldr/ui/directui.c +++ b/boot/freeldr/freeldr/ui/directui.c @@ -19,7 +19,7 @@ UCHAR UiMenuBgColor = COLOR_BLACK; UCHAR UiTextColor = COLOR_GRAY; UCHAR UiSelectedTextColor = COLOR_BLACK; UCHAR UiSelectedTextBgColor = COLOR_GRAY; -CHAR UiTimeText[260] = "Seconds until highlighted choice will be started automatically: "; +CHAR UiTimeText[260] = "Seconds until highlighted choice will be started automatically:"; /* FUNCTIONS ******************************************************************/ diff --git a/boot/freeldr/freeldr/ui/tuimenu.c b/boot/freeldr/freeldr/ui/tuimenu.c index f20e7c2cbfa..548d209e42b 100644 --- a/boot/freeldr/freeldr/ui/tuimenu.c +++ b/boot/freeldr/freeldr/ui/tuimenu.c @@ -2,7 +2,7 @@ * COPYRIGHT: See COPYING in the top level directory * PROJECT: FreeLoader * FILE: boot/freeldr/freeldr/ui/tuimenu.c - * PURPOSE: UI Menu Functions + * PURPOSE: Text UI Menu Functions * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) * Brian Palmer (brianp(a)sginet.com) */ @@ -22,6 +22,10 @@ TuiProcessMenuKeyboardEvent( _In_ PUI_MENU_INFO MenuInfo, _In_ UiMenuKeyPressFilterCallback KeyPressFilter); +static VOID +TuiDrawMenuTimeout( + _In_ PUI_MENU_INFO MenuInfo); + BOOLEAN TuiDisplayMenu( IN PCSTR MenuHeader, @@ -106,36 +110,35 @@ TuiDisplayMenu( if (KeyPress == KEY_ENTER) break; if (CanEscape && KeyPress == KEY_ESC) return FALSE; + /* Get the updated time, and check if more than a second has elapsed */ + CurrentClockSecond = ArcGetTime()->Second; + if (CurrentClockSecond != LastClockSecond) + { + /* Update the time information */ + LastClockSecond = CurrentClockSecond; + #ifndef _M_ARM // FIXME: Theme-specific - /* Update the date & time */ - TuiUpdateDateTime(); - VideoCopyOffScreenBufferToVRAM(); + /* Update the date & time */ + TuiUpdateDateTime(); #endif - /* Check if there is a countdown */ - if (MenuInformation.MenuTimeRemaining > 0) - { - /* Get the updated time, seconds only */ - CurrentClockSecond = ArcGetTime()->Second; - - /* Check if more than a second has now elapsed */ - if (CurrentClockSecond != LastClockSecond) + /* If there is a countdown, update it */ + if (MenuInformation.MenuTimeRemaining > 0) { - /* Update the time information */ - LastClockSecond = CurrentClockSecond; MenuInformation.MenuTimeRemaining--; - - /* Update the menu */ - TuiDrawMenuBox(&MenuInformation); + TuiDrawMenuTimeout(&MenuInformation); + } + else if (MenuInformation.MenuTimeRemaining == 0) + { + /* A timeout occurred, exit this loop and return selection */ #ifndef _M_ARM VideoCopyOffScreenBufferToVRAM(); #endif + break; } - } - else if (MenuInformation.MenuTimeRemaining == 0) - { - /* A time out occurred, exit this loop and return default OS */ - break; +#ifndef _M_ARM + VideoCopyOffScreenBufferToVRAM(); +#endif } #ifndef _M_ARM @@ -267,94 +270,158 @@ TuiDrawMenu( #endif } -VOID -TuiDrawMenuBox( +static VOID +TuiDrawMenuTimeout( _In_ PUI_MENU_INFO MenuInfo) { - CHAR MenuLineText[80], TempString[80]; - ULONG i; - -#ifndef _M_ARM // FIXME: Theme-specific - /* Draw the menu box if requested */ - if (UiMenuBox) - { - UiDrawBox(MenuInfo->Left, - MenuInfo->Top, - MenuInfo->Right, - MenuInfo->Bottom, - D_VERT, - D_HORZ, - FALSE, // Filled - TRUE, // Shadow - ATTR(UiMenuFgColor, UiMenuBgColor)); - } -#endif + ULONG Length; + CHAR MenuLineText[80]; - /* If there is a timeout draw the time remaining */ + /* If there is a timeout, draw the time remaining */ if (MenuInfo->MenuTimeRemaining >= 0) { - /* Copy the integral time text string, and remove the last 2 chars */ - strcpy(TempString, UiTimeText); - i = (ULONG)strlen(TempString); - TempString[i - 2] = 0; - - /* Display the first part of the string and the remaining time */ - strcpy(MenuLineText, TempString); - _itoa(MenuInfo->MenuTimeRemaining, TempString, 10); - strcat(MenuLineText, TempString); - - /* Add the last 2 chars */ - strcat(MenuLineText, &UiTimeText[i - 2]); + /* Find whether the time text string is escaped + * with %d for specific countdown insertion. */ + PCHAR ptr = UiTimeText; + while ((ptr = strchr(ptr, '%')) && (ptr[1] != 'd')) + { + /* Ignore any following character (including a following + * '%' that would be escaped), thus skip two characters. + * If this is the last character, ignore it and stop. */ + if (*++ptr) + ++ptr; + } + ASSERT(!ptr || (ptr[0] == '%' && ptr[1] == 'd')); -#ifndef _M_ARM - /* Check if this is a centered menu */ - if (UiCenterMenu) + if (ptr) { - /* Display it in the center of the menu */ - UiDrawText(MenuInfo->Right - (ULONG)strlen(MenuLineText) - 1, - MenuInfo->Bottom, - MenuLineText, - ATTR(UiMenuFgColor, UiMenuBgColor)); + /* Copy the time text string up to the '%d' insertion point and + * skip it, add the remaining time and the rest of the string. */ + RtlStringCbPrintfA(MenuLineText, sizeof(MenuLineText), + "%.*s%d%s", + ptr - UiTimeText, UiTimeText, + MenuInfo->MenuTimeRemaining, + ptr + 2); } else -#endif { - /* Display under the menu directly */ - UiDrawText(0, - MenuInfo->Bottom + 4, - MenuLineText, - ATTR(UiMenuFgColor, UiMenuBgColor)); + /* Copy the time text string, append a separating blank, + * and add the remaining time. */ + RtlStringCbPrintfA(MenuLineText, sizeof(MenuLineText), + "%s %d", + UiTimeText, + MenuInfo->MenuTimeRemaining); } + + Length = (ULONG)strlen(MenuLineText); } else { - /* Erase the timeout string with spaces, and 0-terminate for sure */ - for (i = 0; i < sizeof(MenuLineText)-1; i++) + /* Erase the timeout with blanks */ + Length = 0; + } + + /** + * How to pad/fill: + * + * Center Box What to do: + * 0 0 or 1 Pad on the right with blanks. + * 1 0 Pad on the left with blanks. + * 1 1 Pad on the left with blanks + box bottom border. + **/ + +#ifndef _M_ARM + if (UiCenterMenu) + { + /* In boxed menu mode, pad on the left with blanks and box border, + * otherwise, pad over all the box length until its right edge. */ + TuiFillArea(0, + MenuInfo->Bottom, + UiMenuBox + ? MenuInfo->Left - 1 /* Left side of the box bottom */ + : MenuInfo->Right, /* Left side + all box length */ + MenuInfo->Bottom, + UiBackdropFillStyle, + ATTR(UiBackdropFgColor, UiBackdropBgColor)); + + if (UiMenuBox) { - MenuLineText[i] = ' '; + /* Fill with box bottom border */ + TuiDrawBoxBottomLine(MenuInfo->Left, + MenuInfo->Bottom, + MenuInfo->Right, + D_VERT, + D_HORZ, + ATTR(UiMenuFgColor, UiMenuBgColor)); + + /* In centered boxed menu mode, the timeout string + * does not go past the right border, in principle... */ } - MenuLineText[sizeof(MenuLineText)-1] = 0; - /* Draw this "empty" string to erase */ -#ifndef _M_ARM - if (UiCenterMenu) + if (Length > 0) { - UiDrawText(MenuInfo->Right - (ULONG)strlen(MenuLineText) - 1, + /* Display the timeout at the bottom-right part of the menu */ + UiDrawText(MenuInfo->Right - Length - 1, MenuInfo->Bottom, MenuLineText, ATTR(UiMenuFgColor, UiMenuBgColor)); } - else + } + else #endif + { + if (Length > 0) { + /* Display the timeout under the menu directly */ UiDrawText(0, MenuInfo->Bottom + 4, MenuLineText, ATTR(UiMenuFgColor, UiMenuBgColor)); } + + /* Pad on the right with blanks, to erase + * characters when the string length decreases. */ + TuiFillArea(Length, + MenuInfo->Bottom + 4, + Length ? (Length + 1) : (UiScreenWidth - 1), + MenuInfo->Bottom + 4, +#ifndef _M_ARM + UiBackdropFillStyle, + ATTR(UiBackdropFgColor, UiBackdropBgColor) +#else + 0, // ' ' + ATTR(UiTextColor, COLOR_BLACK) // UiMenuBgColor +#endif + ); } } +VOID +TuiDrawMenuBox( + _In_ PUI_MENU_INFO MenuInfo) +{ +#ifndef _M_ARM // FIXME: Theme-specific + /* Draw the menu box if requested */ + if (UiMenuBox) + { + UiDrawBox(MenuInfo->Left, + MenuInfo->Top, + MenuInfo->Right, + MenuInfo->Bottom, + D_VERT, + D_HORZ, + FALSE, // Filled + TRUE, // Shadow + ATTR(UiMenuFgColor, UiMenuBgColor)); + } + + /* Update the date & time */ + TuiUpdateDateTime(); +#endif + + TuiDrawMenuTimeout(MenuInfo); +} + VOID TuiDrawMenuItem( _In_ PUI_MENU_INFO MenuInfo, @@ -473,7 +540,7 @@ TuiProcessMenuKeyboardEvent( { /* Cancel it and remove it */ MenuInfo->MenuTimeRemaining = -1; - TuiDrawMenuBox(MenuInfo); // FIXME: Remove for minimal UI too + TuiDrawMenuTimeout(MenuInfo); } /* Get the key (get the extended key if needed) */ diff --git a/boot/freeldr/freeldr/ui/ui.c b/boot/freeldr/freeldr/ui/ui.c index 7d13d81ef16..513cabfc195 100644 --- a/boot/freeldr/freeldr/ui/ui.c +++ b/boot/freeldr/freeldr/ui/ui.c @@ -52,7 +52,7 @@ BOOLEAN UiUseSpecialEffects = FALSE; // Tells us if we should use fade effect BOOLEAN UiDrawTime = TRUE; // Tells us if we should draw the time BOOLEAN UiCenterMenu = TRUE; // Tells us if we should use a centered or left-aligned menu BOOLEAN UiMenuBox = TRUE; // Tells us if we should draw a box around the menu -CHAR UiTimeText[260] = "[Time Remaining: ] "; +CHAR UiTimeText[260] = "[Time Remaining: %d]"; const CHAR UiMonthNames[12][15] = { "January ", "February ", "March ", "April ", "May ", "June ", "July ", "August ", "September ", "October ", "November ", "December " };

2 years, 6 months

[reactos] 04/10: [FREELDR:UI] Isolate TuiDrawBox() top/bottom horizontal lines drawing into their own helpers.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee32f9b86e5490c6db222… commit ee32f9b86e5490c6db2227da2aff236f7f3c68b5 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 20 02:46:23 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 21 02:54:00 2022 +0100 [FREELDR:UI] Isolate TuiDrawBox() top/bottom horizontal lines drawing into their own helpers. --- boot/freeldr/freeldr/include/ui/tui.h | 32 ++++++++++- boot/freeldr/freeldr/ui/tui.c | 103 +++++++++++++++++++++++++--------- 2 files changed, 108 insertions(+), 27 deletions(-) diff --git a/boot/freeldr/freeldr/include/ui/tui.h b/boot/freeldr/freeldr/include/ui/tui.h index b952a06822d..cb90ae214a3 100644 --- a/boot/freeldr/freeldr/include/ui/tui.h +++ b/boot/freeldr/freeldr/include/ui/tui.h @@ -40,7 +40,37 @@ VOID TuiUnInitialize(VOID); // Un-initiali VOID TuiDrawBackdrop(VOID); // Fills the entire screen with a backdrop VOID TuiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */); // Fills the area specified with FillChar and Attr VOID TuiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom); // Draws a shadow on the bottom and right sides of the area specified -VOID TuiDrawBox(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertStyle, UCHAR HorzStyle, BOOLEAN Fill, BOOLEAN Shadow, UCHAR Attr); // Draws a box around the area specified + +/* Draws a box around the area specified */ +VOID +TuiDrawBox( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ UCHAR VertStyle, + _In_ UCHAR HorzStyle, + _In_ BOOLEAN Fill, + _In_ BOOLEAN Shadow, + _In_ UCHAR Attr); + +VOID +TuiDrawBoxTopLine( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ UCHAR VertStyle, + _In_ UCHAR HorzStyle, + _In_ UCHAR Attr); + +VOID +TuiDrawBoxBottomLine( + _In_ ULONG Left, + _In_ ULONG Bottom, + _In_ ULONG Right, + _In_ UCHAR VertStyle, + _In_ UCHAR HorzStyle, + _In_ UCHAR Attr); /* Draws text at coordinates specified */ VOID diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index 3950f93df2d..c75afedc236 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -397,26 +397,29 @@ VOID TuiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom) * DrawBox() * This function assumes coordinates are zero-based */ -VOID TuiDrawBox(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertStyle, UCHAR HorzStyle, BOOLEAN Fill, BOOLEAN Shadow, UCHAR Attr) +VOID +TuiDrawBoxTopLine( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ UCHAR VertStyle, + _In_ UCHAR HorzStyle, + _In_ UCHAR Attr) { - UCHAR ULCorner, URCorner, LLCorner, LRCorner; + UCHAR ULCorner, URCorner; - // Calculate the corner values + /* Calculate the corner values */ if (HorzStyle == HORZ) { if (VertStyle == VERT) { ULCorner = UL; URCorner = UR; - LLCorner = LL; - LRCorner = LR; } else // VertStyle == D_VERT { ULCorner = VD_UL; URCorner = VD_UR; - LLCorner = VD_LL; - LRCorner = VD_LR; } } else // HorzStyle == D_HORZ @@ -425,44 +428,92 @@ VOID TuiDrawBox(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertStyl { ULCorner = HD_UL; URCorner = HD_UR; - LLCorner = HD_LL; - LRCorner = HD_LR; } else // VertStyle == D_VERT { ULCorner = D_UL; URCorner = D_UR; - LLCorner = D_LL; - LRCorner = D_LR; } } - // Fill in box background - if (Fill) + TuiFillArea(Left, Top, Left, Top, ULCorner, Attr); + TuiFillArea(Left+1, Top, Right-1, Top, HorzStyle, Attr); + TuiFillArea(Right, Top, Right, Top, URCorner, Attr); +} + +VOID +TuiDrawBoxBottomLine( + _In_ ULONG Left, + _In_ ULONG Bottom, + _In_ ULONG Right, + _In_ UCHAR VertStyle, + _In_ UCHAR HorzStyle, + _In_ UCHAR Attr) +{ + UCHAR LLCorner, LRCorner; + + /* Calculate the corner values */ + if (HorzStyle == HORZ) { - TuiFillArea(Left, Top, Right, Bottom, ' ', Attr); + if (VertStyle == VERT) + { + LLCorner = LL; + LRCorner = LR; + } + else // VertStyle == D_VERT + { + LLCorner = VD_LL; + LRCorner = VD_LR; + } + } + else // HorzStyle == D_HORZ + { + if (VertStyle == VERT) + { + LLCorner = HD_LL; + LRCorner = HD_LR; + } + else // VertStyle == D_VERT + { + LLCorner = D_LL; + LRCorner = D_LR; + } } - // Fill in corners - TuiFillArea(Left, Top, Left, Top, ULCorner, Attr); - TuiFillArea(Right, Top, Right, Top, URCorner, Attr); TuiFillArea(Left, Bottom, Left, Bottom, LLCorner, Attr); + TuiFillArea(Left+1, Bottom, Right-1, Bottom, HorzStyle, Attr); TuiFillArea(Right, Bottom, Right, Bottom, LRCorner, Attr); +} - // Fill in left line +VOID +TuiDrawBox( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ UCHAR VertStyle, + _In_ UCHAR HorzStyle, + _In_ BOOLEAN Fill, + _In_ BOOLEAN Shadow, + _In_ UCHAR Attr) +{ + /* Fill in the box background */ + if (Fill) + TuiFillArea(Left, Top, Right, Bottom, ' ', Attr); + + /* Fill in the top horizontal line */ + TuiDrawBoxTopLine(Left, Top, Right, VertStyle, HorzStyle, Attr); + + /* Fill in the vertical left and right lines */ TuiFillArea(Left, Top+1, Left, Bottom-1, VertStyle, Attr); - // Fill in top line - TuiFillArea(Left+1, Top, Right-1, Top, HorzStyle, Attr); - // Fill in right line TuiFillArea(Right, Top+1, Right, Bottom-1, VertStyle, Attr); - // Fill in bottom line - TuiFillArea(Left+1, Bottom, Right-1, Bottom, HorzStyle, Attr); - // Draw the shadow + /* Fill in the bottom horizontal line */ + TuiDrawBoxBottomLine(Left, Bottom, Right, VertStyle, HorzStyle, Attr); + + /* Draw the shadow */ if (Shadow) - { TuiDrawShadow(Left, Top, Right, Bottom); - } } VOID TuiDrawStatusText(PCSTR StatusText)

2 years, 6 months

[reactos] 03/10: [FREELDR:UI] Fix the painting ordering of menu elements.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=622a90522d80d37e9d946… commit 622a90522d80d37e9d946ac0d1e169b2ca92e3a3 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Sun Feb 20 02:52:40 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 21 02:53:59 2022 +0100 [FREELDR:UI] Fix the painting ordering of menu elements. --- boot/freeldr/freeldr/ui/minitui.c | 18 ++++++++--------- boot/freeldr/freeldr/ui/tuimenu.c | 42 +++++++++++++++++++++------------------ 2 files changed, 32 insertions(+), 28 deletions(-) diff --git a/boot/freeldr/freeldr/ui/minitui.c b/boot/freeldr/freeldr/ui/minitui.c index ae2ae004fa3..694072fe65a 100644 --- a/boot/freeldr/freeldr/ui/minitui.c +++ b/boot/freeldr/freeldr/ui/minitui.c @@ -163,6 +163,15 @@ MiniTuiDrawMenu( ATTR(UiMenuFgColor, UiMenuBgColor)); } + /* Draw the menu box */ + TuiDrawMenuBox(MenuInfo); + + /* Draw each line of the menu */ + for (i = 0; i < MenuInfo->MenuItemCount; ++i) + { + TuiDrawMenuItem(MenuInfo, i); + } + /* Now tell the user how to choose */ UiVtbl.DrawText(0, MenuInfo->Bottom + 1, @@ -182,15 +191,6 @@ MiniTuiDrawMenu( ATTR(UiMenuFgColor, UiMenuBgColor)); } - /* Draw the menu box */ - TuiDrawMenuBox(MenuInfo); - - /* Draw each line of the menu */ - for (i = 0; i < MenuInfo->MenuItemCount; i++) - { - TuiDrawMenuItem(MenuInfo, i); - } - /* Display the boot options if needed */ if (MenuInfo->ShowBootOptions) { diff --git a/boot/freeldr/freeldr/ui/tuimenu.c b/boot/freeldr/freeldr/ui/tuimenu.c index 500a8995467..f20e7c2cbfa 100644 --- a/boot/freeldr/freeldr/ui/tuimenu.c +++ b/boot/freeldr/freeldr/ui/tuimenu.c @@ -162,7 +162,7 @@ TuiCalcMenuBoxSize( Height -= 1; // Height is zero-based /* Loop every item */ - for (i = 0; i < MenuInfo->MenuItemCount; i++) + for (i = 0; i < MenuInfo->MenuItemCount; ++i) { /* Get the string length and make it become the new width if necessary */ if (MenuInfo->MenuItemList[i]) @@ -203,7 +203,10 @@ TuiDrawMenu( { ULONG i; -#ifdef _M_ARM // FIXME: Theme-specific +#ifndef _M_ARM // FIXME: Theme-specific + /* Draw the backdrop */ + UiDrawBackdrop(); +#else /* No GUI status bar text, just minimal text. Show the menu header. */ if (MenuInfo->MenuHeader) @@ -214,6 +217,24 @@ TuiDrawMenu( ATTR(UiMenuFgColor, UiMenuBgColor)); } +#endif + + /* Draw the menu box */ + TuiDrawMenuBox(MenuInfo); + + /* Draw each line of the menu */ + for (i = 0; i < MenuInfo->MenuItemCount; ++i) + { + TuiDrawMenuItem(MenuInfo, i); + } + +#ifndef _M_ARM // FIXME: Theme-specific + + /* Update the status bar */ + UiVtbl.DrawStatusText("Use \x18 and \x19 to select, then press ENTER."); + +#else + /* Now tell the user how to choose */ UiDrawText(0, MenuInfo->Bottom + 1, @@ -233,25 +254,8 @@ TuiDrawMenu( ATTR(UiMenuFgColor, UiMenuBgColor)); } -#else - - /* Draw the backdrop */ - UiDrawBackdrop(); - - /* Update the status bar */ - UiVtbl.DrawStatusText("Use \x18 and \x19 to select, then press ENTER."); - #endif - /* Draw the menu box */ - TuiDrawMenuBox(MenuInfo); - - /* Draw each line of the menu */ - for (i = 0; i < MenuInfo->MenuItemCount; i++) - { - TuiDrawMenuItem(MenuInfo, i); - } - /* Display the boot options if needed */ if (MenuInfo->ShowBootOptions) {

2 years, 6 months

[reactos] 02/10: [FREELDR:UI] Improve how menu line separators are drawn.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5239a0ca4d37cebfbe302… commit 5239a0ca4d37cebfbe3029323b6e006e71b39137 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Feb 14 16:58:06 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 21 02:53:58 2022 +0100 [FREELDR:UI] Improve how menu line separators are drawn. When the menu is not boxed, do not draw the specific "T"-shaped box corners for the separators. --- boot/freeldr/freeldr/ui/tuimenu.c | 114 ++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 53 deletions(-) diff --git a/boot/freeldr/freeldr/ui/tuimenu.c b/boot/freeldr/freeldr/ui/tuimenu.c index 1e4a2c64d18..500a8995467 100644 --- a/boot/freeldr/freeldr/ui/tuimenu.c +++ b/boot/freeldr/freeldr/ui/tuimenu.c @@ -349,39 +349,61 @@ TuiDrawMenuBox( ATTR(UiMenuFgColor, UiMenuBgColor)); } } +} - /* Loop each item */ - for (i = 0; i < MenuInfo->MenuItemCount; i++) +VOID +TuiDrawMenuItem( + _In_ PUI_MENU_INFO MenuInfo, + _In_ ULONG MenuItemNumber) +{ + ULONG SpaceLeft; + ULONG SpaceRight; + UCHAR Attribute; + CHAR MenuLineText[80]; + + /* If this is a separator */ + if (MenuInfo->MenuItemList[MenuItemNumber] == NULL) { - /* Check if it's a separator */ - if (MenuInfo->MenuItemList[i] == NULL) +#ifndef _M_ARM // FIXME: Theme-specific + /* Draw its left box corner */ + if (UiMenuBox) { - /* Draw the separator line */ UiDrawText(MenuInfo->Left, - MenuInfo->Top + i + 1, + MenuInfo->Top + 1 + MenuItemNumber, "\xC7", ATTR(UiMenuFgColor, UiMenuBgColor)); + } +#endif + + /* Make it a separator line and use menu colors */ + RtlZeroMemory(MenuLineText, sizeof(MenuLineText)); + RtlFillMemory(MenuLineText, + min(sizeof(MenuLineText), (MenuInfo->Right - MenuInfo->Left - 1)), + 0xC4); + + /* Draw the item */ + UiDrawText(MenuInfo->Left + 1, + MenuInfo->Top + 1 + MenuItemNumber, + MenuLineText, + ATTR(UiMenuFgColor, UiMenuBgColor)); + +#ifndef _M_ARM // FIXME: Theme-specific + /* Draw its right box corner */ + if (UiMenuBox) + { UiDrawText(MenuInfo->Right, - MenuInfo->Top + i + 1, + MenuInfo->Top + 1 + MenuItemNumber, "\xB6", ATTR(UiMenuFgColor, UiMenuBgColor)); } +#endif + + /* We are done */ + return; } -} -VOID -TuiDrawMenuItem( - _In_ PUI_MENU_INFO MenuInfo, - _In_ ULONG MenuItemNumber) -{ -#ifndef _M_ARM - ULONG i; - ULONG SpaceTotal; - ULONG SpaceLeft; - ULONG SpaceRight = 0; -#endif - UCHAR Attribute = ATTR(UiTextColor, UiMenuBgColor); - CHAR MenuLineText[80]; + /* This is not a separator */ + ASSERT(MenuInfo->MenuItemList[MenuItemNumber]); #ifndef _M_ARM /* Check if using centered menu */ @@ -391,51 +413,37 @@ TuiDrawMenuItem( * We will want the string centered so calculate * how many spaces will be to the left and right. */ - SpaceTotal = (MenuInfo->Right - MenuInfo->Left - 2) - - (ULONG)(MenuInfo->MenuItemList[MenuItemNumber] ? - strlen(MenuInfo->MenuItemList[MenuItemNumber]) : 0); - SpaceLeft = (SpaceTotal / 2) + 1; + ULONG SpaceTotal = + (MenuInfo->Right - MenuInfo->Left - 2) - + (ULONG)strlen(MenuInfo->MenuItemList[MenuItemNumber]); + SpaceLeft = (SpaceTotal / 2) + 1; SpaceRight = (SpaceTotal - SpaceLeft) + 1; - - /* Insert the spaces on the left */ - for (i = 0; i < SpaceLeft; i++) - MenuLineText[i] = ' '; - MenuLineText[i] = '\0'; } else #endif { /* Simply left-align it */ - MenuLineText[0] = '\0'; - strcat(MenuLineText, " "); + SpaceLeft = 4; + SpaceRight = 0; } - /* Now append the text string */ - if (MenuInfo->MenuItemList[MenuItemNumber]) - strcat(MenuLineText, MenuInfo->MenuItemList[MenuItemNumber]); - -#ifndef _M_ARM - /* Check if using centered menu, and add spaces on the right if so */ - if (UiCenterMenu) - { - for (i = 0; i < SpaceRight; i++) - strcat(MenuLineText, " "); - } -#endif + /* Format the item text string */ + RtlStringCbPrintfA(MenuLineText, sizeof(MenuLineText), + "%*s%s%*s", + SpaceLeft, "", // Left padding + MenuInfo->MenuItemList[MenuItemNumber], + SpaceRight, ""); // Right padding - /* If it is a separator */ - if (MenuInfo->MenuItemList[MenuItemNumber] == NULL) - { - /* Make it a separator line and use menu colors */ - memset(MenuLineText, 0, sizeof(MenuLineText)); - memset(MenuLineText, 0xC4, (MenuInfo->Right - MenuInfo->Left - 1)); - Attribute = ATTR(UiMenuFgColor, UiMenuBgColor); - } - else if (MenuItemNumber == MenuInfo->SelectedMenuItem) + if (MenuItemNumber == MenuInfo->SelectedMenuItem) { /* If this is the selected item, use the selected colors */ Attribute = ATTR(UiSelectedTextColor, UiSelectedTextBgColor); } + else + { + /* Normal item colors */ + Attribute = ATTR(UiTextColor, UiMenuBgColor); + } /* Draw the item */ UiDrawText(MenuInfo->Left + 1,

2 years, 6 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2022