Ros-diffs

ros-diffs@reactos.org

81390 discussions

[reactos] 05/10: [FREELDR:UI] Improve menu timeout drawing.
by Hermès Bélusca-Maïto 21 Feb '22

21 Feb '22

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 " };

1 0

[reactos] 04/10: [FREELDR:UI] Isolate TuiDrawBox() top/bottom horizontal lines drawing into their own helpers.
by Hermès Bélusca-Maïto 21 Feb '22

21 Feb '22

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)

1 0

[reactos] 03/10: [FREELDR:UI] Fix the painting ordering of menu elements.
by Hermès Bélusca-Maïto 21 Feb '22

21 Feb '22

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) {

1 0

[reactos] 02/10: [FREELDR:UI] Improve how menu line separators are drawn.
by Hermès Bélusca-Maïto 21 Feb '22

21 Feb '22

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,

1 0

[reactos] 01/10: [FREELDR] Improve progress bar support, adapted from Inbv.
by Hermès Bélusca-Maïto 21 Feb '22

21 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c322610f6e1a407f3bf2c… commit c322610f6e1a407f3bf2c2a915ab2526b6b9f91d Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Mon Feb 14 02:28:53 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Mon Feb 21 02:53:54 2022 +0100 [FREELDR] Improve progress bar support, adapted from Inbv. - Improve accuracy/progression smoothness when loading drivers. - Allow changing text and percentage independently. --- boot/freeldr/freeldr/disk/ramdisk.c | 18 +-- boot/freeldr/freeldr/include/ui.h | 95 +++++++++++++-- boot/freeldr/freeldr/include/ui/minitui.h | 16 ++- boot/freeldr/freeldr/include/ui/noui.h | 19 ++- boot/freeldr/freeldr/include/ui/tui.h | 22 +--- boot/freeldr/freeldr/linuxboot.c | 6 +- boot/freeldr/freeldr/ntldr/setupldr.c | 4 +- boot/freeldr/freeldr/ntldr/winldr.c | 27 +++-- boot/freeldr/freeldr/ntldr/winldr.h | 2 + boot/freeldr/freeldr/ui/directui.c | 31 ----- boot/freeldr/freeldr/ui/minitui.c | 133 ++++++++++++-------- boot/freeldr/freeldr/ui/noui.c | 23 +++- boot/freeldr/freeldr/ui/tui.c | 135 +++++++++++++++------ boot/freeldr/freeldr/ui/ui.c | 195 ++++++++++++++++++++++++------ 14 files changed, 500 insertions(+), 226 deletions(-) diff --git a/boot/freeldr/freeldr/disk/ramdisk.c b/boot/freeldr/freeldr/disk/ramdisk.c index 58f8a37d528..6306cad88be 100644 --- a/boot/freeldr/freeldr/disk/ramdisk.c +++ b/boot/freeldr/freeldr/disk/ramdisk.c @@ -111,13 +111,12 @@ RamDiskLoadVirtualFile( ULONG RamFileId; ULONG ChunkSize, Count; ULONGLONG TotalRead; - PCHAR MsgBuffer = "Loading RamDisk..."; ULONG PercentPerChunk, Percent; FILEINFORMATION Information; LARGE_INTEGER Position; /* Display progress */ - UiDrawProgressBarCenter(1, 100, MsgBuffer); + UiDrawProgressBarCenter("Loading RamDisk..."); /* Try opening the Ramdisk file */ Status = FsOpenFile(FileName, DefaultPath, OpenReadOnly, &RamFileId); @@ -135,8 +134,8 @@ RamDiskLoadVirtualFile( /* FIXME: For now, limit RAM disks to 4GB */ if (Information.EndingAddress.HighPart != 0) { - UiMessageBox("RAM disk too big."); ArcClose(RamFileId); + UiMessageBox("RAM disk too big."); return ENOMEM; } RamDiskFileSize = Information.EndingAddress.QuadPart; @@ -145,20 +144,22 @@ RamDiskLoadVirtualFile( /* Allocate memory for it */ ChunkSize = 8 * 1024 * 1024; if (RamDiskFileSize < ChunkSize) - Percent = PercentPerChunk = 0; + PercentPerChunk = 0; else - Percent = PercentPerChunk = 100 / (RamDiskFileSize / ChunkSize); + PercentPerChunk = 100 * ChunkSize / RamDiskFileSize; RamDiskBase = MmAllocateMemoryWithType(RamDiskFileSize, LoaderXIPRom); if (!RamDiskBase) { - UiMessageBox("Failed to allocate memory for RAM disk."); + RamDiskFileSize = 0; ArcClose(RamFileId); + UiMessageBox("Failed to allocate memory for RAM disk."); return ENOMEM; } /* * Read it in chunks */ + Percent = 0; for (TotalRead = 0; TotalRead < RamDiskFileSize; TotalRead += ChunkSize) { /* Check if we're at the last chunk */ @@ -168,8 +169,8 @@ RamDiskLoadVirtualFile( ChunkSize = (ULONG)(RamDiskFileSize - TotalRead); } - /* Draw progress */ - UiDrawProgressBarCenter(Percent, 100, MsgBuffer); + /* Update progress */ + UiUpdateProgressBar(Percent, NULL); Percent += PercentPerChunk; /* Copy the contents */ @@ -194,6 +195,7 @@ RamDiskLoadVirtualFile( return ((Status != ESUCCESS) ? Status : EIO); } } + UiUpdateProgressBar(100, NULL); ArcClose(RamFileId); diff --git a/boot/freeldr/freeldr/include/ui.h b/boot/freeldr/freeldr/include/ui.h index 4308b95c0f4..938192e19b8 100644 --- a/boot/freeldr/freeldr/include/ui.h +++ b/boot/freeldr/freeldr/include/ui.h @@ -95,12 +95,74 @@ VOID UiInfoBox(PCSTR MessageText); // Displays a i VOID UiMessageBox(PCSTR Format, ...); // Displays a message box on the screen with an ok button VOID UiMessageBoxCritical(PCSTR MessageText); // Displays a message box on the screen with an ok button using no system resources + +/* Loading Progress-Bar Functions ********************************************/ + +/* + * Loading progress bar, based on the one from NTOS Inbv. + * Supports progress within sub-ranges, used when loading + * with an unknown number of steps. + */ +typedef struct _UI_PROGRESS_BAR +{ + // UI_PROGRESS_STATE + struct + { + ULONG Floor; + // ULONG Ceiling; + ULONG Bias; + } State; + + // BT_PROGRESS_INDICATOR + struct + { + ULONG Count; + ULONG Expected; + ULONG Percentage; + } Indicator; + + ULONG Left; + ULONG Top; + ULONG Right; + ULONG Bottom; + // ULONG Width; // == Right - Left + 1; + BOOLEAN Show; +} UI_PROGRESS_BAR, *PUI_PROGRESS_BAR; + +extern UI_PROGRESS_BAR UiProgressBar; + +VOID +UiInitProgressBar( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ PCSTR ProgressText); + +/* Indicate loading progress without any specific number of steps */ +VOID +UiIndicateProgress(VOID); + +/* Set a progress loading percentage range */ +VOID +UiSetProgressBarSubset( + _In_ ULONG Floor, + _In_ ULONG Ceiling); + +/* Update the loading progress percentage within a selected range */ +VOID +UiUpdateProgressBar( + _In_ ULONG Percentage, + _In_opt_ PCSTR ProgressText); + +VOID +UiSetProgressBarText( + _In_ PCSTR ProgressText); + /* Draws the progress bar showing nPos percent filled */ VOID UiDrawProgressBarCenter( - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText); + _In_ PCSTR ProgressText); /* Draws the progress bar showing nPos percent filled */ VOID @@ -109,9 +171,8 @@ UiDrawProgressBar( _In_ ULONG Top, _In_ ULONG Right, _In_ ULONG Bottom, - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText); + _In_ PCSTR ProgressText); + // Displays all the message boxes in a given section. VOID @@ -123,14 +184,11 @@ UiShowMessageBoxesInArgv( IN ULONG Argc, IN PCHAR Argv[]); -VOID UiEscapeString(PCHAR String); // Processes a string and changes all occurrences of "\n" to '\n' BOOLEAN UiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length); UCHAR UiTextToColor(PCSTR ColorText); // Converts the text color into it's equivalent color value UCHAR UiTextToFillStyle(PCSTR FillStyleText); // Converts the text fill into it's equivalent fill value -VOID UiTruncateStringEllipsis(PCHAR StringText, ULONG MaxChars); // Truncates a string to MaxChars by adding an ellipsis on the end '...' - VOID UiFadeInBackdrop(VOID); // Draws the backdrop and fades the screen in VOID UiFadeOut(VOID); // Fades the screen out @@ -200,8 +258,23 @@ typedef struct tagUIVTBL VOID (*UpdateDateTime)(VOID); VOID (*MessageBox)(PCSTR MessageText); VOID (*MessageBoxCritical)(PCSTR MessageText); - VOID (*DrawProgressBarCenter)(ULONG Position, ULONG Range, PCHAR ProgressText); - VOID (*DrawProgressBar)(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); + + VOID (*DrawProgressBarCenter)( + _In_ PCSTR ProgressText); + + VOID (*DrawProgressBar)( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ PCSTR ProgressText); + + VOID (*SetProgressBarText)( + _In_ PCSTR ProgressText); + + VOID (*TickProgressBar)( + _In_ ULONG SubPercentTimes100); + BOOLEAN (*EditBox)(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length); UCHAR (*TextToColor)(PCSTR ColorText); UCHAR (*TextToFillStyle)(PCSTR FillStyleText); diff --git a/boot/freeldr/freeldr/include/ui/minitui.h b/boot/freeldr/freeldr/include/ui/minitui.h index 4a710cd8b6f..6db89b41cc0 100644 --- a/boot/freeldr/freeldr/include/ui/minitui.h +++ b/boot/freeldr/freeldr/include/ui/minitui.h @@ -13,12 +13,18 @@ VOID MiniTuiDrawBackdrop(VOID); VOID MiniTuiDrawStatusText(PCSTR StatusText); +VOID +MiniTuiSetProgressBarText( + _In_ PCSTR ProgressText); + +VOID +MiniTuiTickProgressBar( + _In_ ULONG SubPercentTimes100); + /* Draws the progress bar showing nPos percent filled */ VOID MiniTuiDrawProgressBarCenter( - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText); + _In_ PCSTR ProgressText); /* Draws the progress bar showing nPos percent filled */ VOID @@ -27,9 +33,7 @@ MiniTuiDrawProgressBar( _In_ ULONG Top, _In_ ULONG Right, _In_ ULONG Bottom, - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText); + _In_ PCSTR ProgressText); /* Menu Functions ************************************************************/ diff --git a/boot/freeldr/freeldr/include/ui/noui.h b/boot/freeldr/freeldr/include/ui/noui.h index dca5db172e0..72eca1a9298 100644 --- a/boot/freeldr/freeldr/include/ui/noui.h +++ b/boot/freeldr/freeldr/include/ui/noui.h @@ -50,12 +50,20 @@ VOID NoUiUpdateDateTime(VOID); VOID NoUiMessageBox(PCSTR MessageText); VOID NoUiMessageBoxCritical(PCSTR MessageText); +/* Loading Progress-Bar Functions ********************************************/ + +VOID +NoUiSetProgressBarText( + _In_ PCSTR ProgressText); + +VOID +NoUiTickProgressBar( + _In_ ULONG SubPercentTimes100); + /* Draws the progress bar showing nPos percent filled */ VOID NoUiDrawProgressBarCenter( - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText); + _In_ PCSTR ProgressText); /* Draws the progress bar showing nPos percent filled */ VOID @@ -64,9 +72,8 @@ NoUiDrawProgressBar( _In_ ULONG Top, _In_ ULONG Right, _In_ ULONG Bottom, - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText); + _In_ PCSTR ProgressText); + BOOLEAN NoUiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length); UCHAR NoUiTextToColor(PCSTR ColorText); diff --git a/boot/freeldr/freeldr/include/ui/tui.h b/boot/freeldr/freeldr/include/ui/tui.h index 27918f47bd7..b952a06822d 100644 --- a/boot/freeldr/freeldr/include/ui/tui.h +++ b/boot/freeldr/freeldr/include/ui/tui.h @@ -25,6 +25,10 @@ INT TuiPrintf( _In_ PCSTR Format, ...); +VOID +TuiTruncateStringEllipsis( + _Inout_z_ PSTR StringText, + _In_ ULONG MaxChars); #define TUI_TITLE_BOX_CHAR_HEIGHT 5 @@ -72,24 +76,6 @@ VOID TuiRestoreScreen(PUCHAR Buffer); // Restores the VOID TuiMessageBox(PCSTR MessageText); // Displays a message box on the screen with an ok button VOID TuiMessageBoxCritical(PCSTR MessageText); // Displays a message box on the screen with an ok button using no system resources -/* Draws the progress bar showing nPos percent filled */ -VOID -TuiDrawProgressBarCenter( - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText); - -/* Draws the progress bar showing nPos percent filled */ -VOID -TuiDrawProgressBar( - _In_ ULONG Left, - _In_ ULONG Top, - _In_ ULONG Right, - _In_ ULONG Bottom, - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText); - BOOLEAN TuiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length); UCHAR TuiTextToColor(PCSTR ColorText); // Converts the text color into it's equivalent color value UCHAR TuiTextToFillStyle(PCSTR FillStyleText); // Converts the text fill into it's equivalent fill value diff --git a/boot/freeldr/freeldr/linuxboot.c b/boot/freeldr/freeldr/linuxboot.c index fae1f8da6a2..5375aafe796 100644 --- a/boot/freeldr/freeldr/linuxboot.c +++ b/boot/freeldr/freeldr/linuxboot.c @@ -107,7 +107,7 @@ LoadAndBootLinux( UiDrawBackdrop(); UiDrawStatusText(LinuxBootDescription); - UiDrawProgressBarCenter(0, 100, LinuxBootDescription); + UiDrawProgressBarCenter(LinuxBootDescription); /* Find all the message box settings and run them */ UiShowMessageBoxesInArgv(Argc, Argv); @@ -445,7 +445,7 @@ static BOOLEAN LinuxReadKernel(ULONG LinuxKernelFile) BytesLoaded += LINUX_READ_CHUNK_SIZE; LoadAddress = (PVOID)((ULONG_PTR)LoadAddress + LINUX_READ_CHUNK_SIZE); - UiDrawProgressBarCenter(BytesLoaded, LinuxKernelSize + LinuxInitrdSize, LinuxBootDescription); + UiUpdateProgressBar(BytesLoaded * 100 / (LinuxKernelSize + LinuxInitrdSize), NULL); } return TRUE; @@ -540,7 +540,7 @@ static BOOLEAN LinuxReadInitrd(ULONG LinuxInitrdFile) BytesLoaded += LINUX_READ_CHUNK_SIZE; LinuxInitrdLoadAddress = (PVOID)((ULONG_PTR)LinuxInitrdLoadAddress + LINUX_READ_CHUNK_SIZE); - UiDrawProgressBarCenter(BytesLoaded + LinuxKernelSize, LinuxInitrdSize + LinuxKernelSize, LinuxBootDescription); + UiUpdateProgressBar((BytesLoaded + LinuxKernelSize) * 100 / (LinuxInitrdSize + LinuxKernelSize), NULL); } return TRUE; diff --git a/boot/freeldr/freeldr/ntldr/setupldr.c b/boot/freeldr/freeldr/ntldr/setupldr.c index 2deaf6ce5ba..f7a330be2fd 100644 --- a/boot/freeldr/freeldr/ntldr/setupldr.c +++ b/boot/freeldr/freeldr/ntldr/setupldr.c @@ -493,7 +493,7 @@ LoadReactOSSetup( /* Let the user know we started loading */ UiDrawBackdrop(); UiDrawStatusText("Setup is loading..."); - UiDrawProgressBarCenter(1, 100, "Loading ReactOS Setup..."); + UiDrawProgressBarCenter("Loading ReactOS Setup..."); /* Retrieve the system path */ *BootPath = ANSI_NULL; @@ -743,7 +743,7 @@ LoadReactOSSetup( SetupBlock->Flags = SETUPLDR_TEXT_MODE; /* Load the "setupreg.hiv" setup system hive */ - if (!SosEnabled) UiDrawProgressBarCenter(15, 100, "Loading setup system hive..."); + UiUpdateProgressBar(15, "Loading setup system hive..."); Success = WinLdrInitSystemHive(LoaderBlock, BootPath, TRUE); TRACE("Setup SYSTEM hive %s\n", (Success ? "loaded" : "not loaded")); /* Bail out if failure */ diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 317d59a35bd..5b06bef6e0f 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -66,7 +66,8 @@ NtLdrOutputLoadMsg( RtlStringCbPrintfA(ProgressString, sizeof(ProgressString), "Loading %s...", (Description ? Description : FileName)); - // UiDrawProgressBarCenter(1, 100, ProgressString); + // UiSetProgressBarText(ProgressString); + // UiIndicateProgress(); UiDrawStatusText(ProgressString); } } @@ -379,12 +380,12 @@ WinLdrLoadBootDrivers(PLOADER_PARAMETER_BLOCK LoaderBlock, // Paths are relative (FIXME: Are they always relative?) // Load it + UiIndicateProgress(); Success = WinLdrLoadDeviceDriver(&LoaderBlock->LoadOrderListHead, BootPath, &BootDriver->FilePath, 0, &BootDriver->LdrEntry); - if (Success) { // Convert the RegistryPath and DTE addresses to VA since we are not going to use it anymore @@ -503,7 +504,7 @@ LoadModule( PVOID BaseAddress; RtlStringCbPrintfA(ProgressString, sizeof(ProgressString), "Loading %s...", File); - if (!SosEnabled) UiDrawProgressBarCenter(Percentage, 100, ProgressString); + UiUpdateProgressBar(Percentage, ProgressString); RtlStringCbCopyA(FullFileName, sizeof(FullFileName), Path); RtlStringCbCatA(FullFileName, sizeof(FullFileName), File); @@ -609,7 +610,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, /* Load the HAL */ HalBase = LoadModule(LoaderBlock, DirPath, HalFileName, - "hal.dll", LoaderHalCode, &HalDTE, 45); + "hal.dll", LoaderHalCode, &HalDTE, 35); if (!HalBase) { ERR("LoadModule('%s') failed\n", HalFileName); @@ -684,7 +685,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, /* Load the KD DLL. Override its base DLL name to the default "KDCOM.DLL". */ KdDllBase = LoadModule(LoaderBlock, DirPath, KdDllName, - "kdcom.dll", LoaderSystemCode, &KdDllDTE, 60); + "kdcom.dll", LoaderSystemCode, &KdDllDTE, 40); if (!KdDllBase) { /* If we failed to load a custom KD DLL, fall back to the standard one */ @@ -697,7 +698,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, RtlStringCbCopyA(KdDllName, sizeof(KdDllName), "kdcom.dll"); KdDllBase = LoadModule(LoaderBlock, DirPath, KdDllName, - "kdcom.dll", LoaderSystemCode, &KdDllDTE, 60); + "kdcom.dll", LoaderSystemCode, &KdDllDTE, 40); } if (!KdDllBase) @@ -939,7 +940,7 @@ LoadAndBootWindows( /* Let the user know we started loading */ UiDrawBackdrop(); UiDrawStatusText("Loading..."); - UiDrawProgressBarCenter(1, 100, "Loading NT..."); + UiDrawProgressBarCenter("Loading NT..."); /* Retrieve the system path */ *BootPath = ANSI_NULL; @@ -1043,7 +1044,7 @@ LoadAndBootWindows( AllocateAndInitLPB(OperatingSystemVersion, &LoaderBlock); /* Load the system hive */ - if (!SosEnabled) UiDrawProgressBarCenter(15, 100, "Loading system hive..."); + UiUpdateProgressBar(15, "Loading system hive..."); Success = WinLdrInitSystemHive(LoaderBlock, BootPath, FALSE); TRACE("SYSTEM hive %s\n", (Success ? "loaded" : "not loaded")); /* Bail out if failure */ @@ -1101,7 +1102,7 @@ LoadAndBootWindowsCommon( SystemRoot = strstr(BootPath, "\\"); /* Detect hardware */ - if (!SosEnabled) UiDrawProgressBarCenter(20, 100, "Detecting hardware..."); + UiUpdateProgressBar(20, "Detecting hardware..."); LoaderBlock->ConfigurationRoot = MachHwDetect(); /* Initialize the PE loader import-DLL callback, so that we can obtain @@ -1130,11 +1131,15 @@ LoadAndBootWindowsCommon( **** WE HAVE NOW REACHED THE POINT OF NO RETURN !! ****/ + UiSetProgressBarSubset(40, 90); // NTOS goes from 25 to 75% + /* Load boot drivers */ - if (!SosEnabled) UiDrawProgressBarCenter(100, 100, "Loading boot drivers..."); + UiSetProgressBarText("Loading boot drivers..."); Success = WinLdrLoadBootDrivers(LoaderBlock, BootPath); TRACE("Boot drivers loading %s\n", Success ? "successful" : "failed"); + UiSetProgressBarSubset(0, 100); + /* Reset the PE loader import-DLL callback */ PeLdrImportDllLoadCallback = NULL; @@ -1145,6 +1150,8 @@ LoadAndBootWindowsCommon( BootPath, OperatingSystemVersion); + UiUpdateProgressBar(100, NULL); + /* Save entry-point pointer and Loader block VAs */ KiSystemStartup = (KERNEL_ENTRY_POINT)KernelDTE->EntryPoint; LoaderBlockVA = PaToVa(LoaderBlock); diff --git a/boot/freeldr/freeldr/ntldr/winldr.h b/boot/freeldr/freeldr/ntldr/winldr.h index 03cc68f88c7..38598e29f85 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.h +++ b/boot/freeldr/freeldr/ntldr/winldr.h @@ -88,6 +88,8 @@ UiResetForSOS(VOID) UiVtbl = MiniTuiVtbl; UiVtbl.Initialize(); #endif + /* Disable the progress bar */ + UiProgressBar.Show = FALSE; } VOID diff --git a/boot/freeldr/freeldr/ui/directui.c b/boot/freeldr/freeldr/ui/directui.c index dbd2ed41902..68d67777190 100644 --- a/boot/freeldr/freeldr/ui/directui.c +++ b/boot/freeldr/freeldr/ui/directui.c @@ -111,28 +111,6 @@ UiMessageBoxCritical(IN PCSTR MessageText) TuiPrintf(MessageText); } -VOID -UiDrawProgressBarCenter( - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText) -{ - MiniTuiDrawProgressBarCenter(Position, Range, ProgressText); -} - -VOID -UiDrawProgressBar( - _In_ ULONG Left, - _In_ ULONG Top, - _In_ ULONG Right, - _In_ ULONG Bottom, - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText) -{ - MiniTuiDrawProgressBar(Left, Top, Right, Bottom, Position, Range, ProgressText); -} - VOID UiShowMessageBoxesInSection( IN ULONG_PTR SectionId) @@ -148,15 +126,6 @@ UiShowMessageBoxesInArgv( return; } -VOID -UiTruncateStringEllipsis(IN PCHAR StringText, - IN ULONG MaxChars) -{ - /* If it's too large, just add some ellipsis past the maximum */ - if (strlen(StringText) > MaxChars) - strcpy(&StringText[MaxChars - 3], "..."); -} - VOID UiDrawMenu( _In_ PUI_MENU_INFO MenuInfo) diff --git a/boot/freeldr/freeldr/ui/minitui.c b/boot/freeldr/freeldr/ui/minitui.c index 373605a8b1b..ae2ae004fa3 100644 --- a/boot/freeldr/freeldr/ui/minitui.c +++ b/boot/freeldr/freeldr/ui/minitui.c @@ -31,11 +31,85 @@ VOID MiniTuiDrawStatusText(PCSTR StatusText) #endif // _M_ARM +/*static*/ VOID +MiniTuiSetProgressBarText( + _In_ PCSTR ProgressText) +{ + ULONG ProgressBarWidth; + CHAR ProgressString[256]; + + /* Make sure the progress bar is enabled */ + ASSERT(UiProgressBar.Show); + + /* Calculate the width of the bar proper */ + ProgressBarWidth = UiProgressBar.Right - UiProgressBar.Left + 1; + + /* First make sure the progress bar text fits */ + RtlStringCbCopyA(ProgressString, sizeof(ProgressString), ProgressText); + TuiTruncateStringEllipsis(ProgressString, ProgressBarWidth); + + /* Clear the text area */ + TuiFillArea(UiProgressBar.Left, UiProgressBar.Top, + UiProgressBar.Right, +#ifdef NTLDR_PROGRESSBAR + UiProgressBar.Bottom - 1, +#else // BTMGR_PROGRESSBAR + UiProgressBar.Bottom - 2, // One empty line between text and bar. +#endif + ' ', ATTR(UiTextColor, UiMenuBgColor)); + + /* Draw the "Loading..." text */ + TuiDrawCenteredText(UiProgressBar.Left, UiProgressBar.Top, + UiProgressBar.Right, +#ifdef NTLDR_PROGRESSBAR + UiProgressBar.Bottom - 1, +#else // BTMGR_PROGRESSBAR + UiProgressBar.Bottom - 2, // One empty line between text and bar. +#endif + ProgressString, ATTR(UiTextColor, UiMenuBgColor)); +} + +/*static*/ VOID +MiniTuiTickProgressBar( + _In_ ULONG SubPercentTimes100) +{ + ULONG ProgressBarWidth; + ULONG FillCount; + + /* Make sure the progress bar is enabled */ + ASSERT(UiProgressBar.Show); + + ASSERT(SubPercentTimes100 <= (100 * 100)); + + /* Calculate the width of the bar proper */ + ProgressBarWidth = UiProgressBar.Right - UiProgressBar.Left + 1; + + /* Compute fill count */ + // FillCount = (ProgressBarWidth * Position) / Range; + FillCount = ProgressBarWidth * SubPercentTimes100 / (100 * 100); + + /* Fill the progress bar */ + /* Draw the percent complete -- Use the fill character */ + if (FillCount > 0) + { + TuiFillArea(UiProgressBar.Left, UiProgressBar.Bottom, + UiProgressBar.Left + FillCount - 1, UiProgressBar.Bottom, + '\xDB', ATTR(UiTextColor, UiMenuBgColor)); + } + /* Fill the remaining with blanks */ + TuiFillArea(UiProgressBar.Left + FillCount, UiProgressBar.Bottom, + UiProgressBar.Right, UiProgressBar.Bottom, + ' ', ATTR(UiTextColor, UiMenuBgColor)); + +#ifndef _M_ARM + TuiUpdateDateTime(); + VideoCopyOffScreenBufferToVRAM(); +#endif +} + VOID MiniTuiDrawProgressBarCenter( - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText) + _In_ PCSTR ProgressText) { ULONG Left, Top, Right, Bottom, Width, Height; @@ -55,7 +129,7 @@ MiniTuiDrawProgressBarCenter( Bottom = Top + Height - 1; /* Draw the progress bar */ - MiniTuiDrawProgressBar(Left, Top, Right, Bottom, Position, Range, ProgressText); + MiniTuiDrawProgressBar(Left, Top, Right, Bottom, ProgressText); } VOID @@ -64,54 +138,9 @@ MiniTuiDrawProgressBar( _In_ ULONG Top, _In_ ULONG Right, _In_ ULONG Bottom, - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText) + _In_ PCSTR ProgressText) { - ULONG ProgressBarWidth, i; - - /* Calculate the width of the bar proper */ - ProgressBarWidth = Right - Left + 1; - - /* Clip the position */ - if (Position > Range) - Position = Range; - - /* First make sure the progress bar text fits */ - UiTruncateStringEllipsis(ProgressText, ProgressBarWidth); - - /* Clear the text area */ - TuiFillArea(Left, Top, Right, -#ifdef NTLDR_PROGRESSBAR - Bottom - 1, -#else // BTMGR_PROGRESSBAR - Bottom - 2, // One empty line between text and bar. -#endif - ' ', ATTR(UiTextColor, UiMenuBgColor)); - - /* Draw the "Loading..." text */ - TuiDrawCenteredText(Left, Top, Right, -#ifdef NTLDR_PROGRESSBAR - Bottom - 1, -#else // BTMGR_PROGRESSBAR - Bottom - 2, // One empty line between text and bar. -#endif - ProgressText, ATTR(UiTextColor, UiMenuBgColor)); - - /* Draw the percent complete -- Use the fill character */ - for (i = 0; i < (Position * ProgressBarWidth) / Range; i++) - { - TuiDrawText(Left + i, Bottom, - "\xDB", ATTR(UiTextColor, UiMenuBgColor)); - } - /* Fill the remaining with blanks */ - TuiFillArea(Left + i, Bottom, Right, Bottom, - ' ', ATTR(UiTextColor, UiMenuBgColor)); - -#ifndef _M_ARM - TuiUpdateDateTime(); - VideoCopyOffScreenBufferToVRAM(); -#endif + UiInitProgressBar(Left, Top, Right, Bottom, ProgressText); } VOID @@ -192,6 +221,8 @@ const UIVTBL MiniTuiVtbl = TuiMessageBoxCritical, MiniTuiDrawProgressBarCenter, MiniTuiDrawProgressBar, + MiniTuiSetProgressBarText, + MiniTuiTickProgressBar, TuiEditBox, TuiTextToColor, TuiTextToFillStyle, diff --git a/boot/freeldr/freeldr/ui/noui.c b/boot/freeldr/freeldr/ui/noui.c index 5e083dd8be0..5bc33d70e69 100644 --- a/boot/freeldr/freeldr/ui/noui.c +++ b/boot/freeldr/freeldr/ui/noui.c @@ -100,11 +100,23 @@ VOID NoUiMessageBoxCritical(PCSTR MessageText) MachConsGetCh(); } +/* Loading Progress-Bar Functions ********************************************/ + +VOID +NoUiSetProgressBarText( + _In_ PCSTR ProgressText) +{ +} + +VOID +NoUiTickProgressBar( + _In_ ULONG SubPercentTimes100) +{ +} + VOID NoUiDrawProgressBarCenter( - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText) + _In_ PCSTR ProgressText) { } @@ -114,12 +126,11 @@ NoUiDrawProgressBar( _In_ ULONG Top, _In_ ULONG Right, _In_ ULONG Bottom, - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText) + _In_ PCSTR ProgressText) { } + BOOLEAN NoUiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length) { return FALSE; diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index bcf510ed7c8..3950f93df2d 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -53,6 +53,16 @@ TuiPrintf( return Length; } +VOID +TuiTruncateStringEllipsis( + _Inout_z_ PSTR StringText, + _In_ ULONG MaxChars) +{ + /* If it's too large, just add some ellipsis past the maximum */ + if (strlen(StringText) > MaxChars) + strcpy(&StringText[MaxChars - 3], "..."); +} + /* * DrawText() * Displays a string on a single screen line. @@ -690,11 +700,83 @@ VOID TuiMessageBoxCritical(PCSTR MessageText) } } -VOID +static VOID +TuiSetProgressBarText( + _In_ PCSTR ProgressText) +{ + ULONG ProgressBarWidth; + CHAR ProgressString[256]; + + /* Make sure the progress bar is enabled */ + ASSERT(UiProgressBar.Show); + + /* Calculate the width of the bar proper */ + ProgressBarWidth = UiProgressBar.Right - UiProgressBar.Left + 1; + + /* First make sure the progress bar text fits */ + RtlStringCbCopyA(ProgressString, sizeof(ProgressString), ProgressText); + TuiTruncateStringEllipsis(ProgressString, ProgressBarWidth); + + /* Clear the text area */ + TuiFillArea(UiProgressBar.Left, UiProgressBar.Top, + UiProgressBar.Right, UiProgressBar.Bottom - 1, + ' ', ATTR(UiTextColor, UiMenuBgColor)); + + /* Draw the "Loading..." text */ + TuiDrawCenteredText(UiProgressBar.Left, UiProgressBar.Top, + UiProgressBar.Right, UiProgressBar.Bottom - 1, + ProgressString, ATTR(UiTextColor, UiMenuBgColor)); +} + +static VOID +TuiTickProgressBar( + _In_ ULONG SubPercentTimes100) +{ + ULONG ProgressBarWidth; + ULONG FillCount; + + /* Make sure the progress bar is enabled */ + ASSERT(UiProgressBar.Show); + + ASSERT(SubPercentTimes100 <= (100 * 100)); + + /* Calculate the width of the bar proper */ + ProgressBarWidth = UiProgressBar.Right - UiProgressBar.Left + 1; + + /* Compute fill count */ + // FillCount = (ProgressBarWidth * Position) / Range; + FillCount = ProgressBarWidth * SubPercentTimes100 / (100 * 100); + + /* Fill the progress bar */ + /* Draw the percent complete -- Use the fill character */ + if (FillCount > 0) + { + TuiFillArea(UiProgressBar.Left, UiProgressBar.Bottom, + UiProgressBar.Left + FillCount - 1, UiProgressBar.Bottom, + '\xDB', ATTR(UiTextColor, UiMenuBgColor)); + } + /* Fill the remaining with shadow blanks */ + TuiFillArea(UiProgressBar.Left + FillCount, UiProgressBar.Bottom, + UiProgressBar.Right, UiProgressBar.Bottom, + '\xB2', ATTR(UiTextColor, UiMenuBgColor)); + +#ifndef _M_ARM + TuiUpdateDateTime(); + VideoCopyOffScreenBufferToVRAM(); +#endif +} + +static VOID +TuiDrawProgressBar( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ PCSTR ProgressText); + +static VOID TuiDrawProgressBarCenter( - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText) + _In_ PCSTR ProgressText) { ULONG Left, Top, Right, Bottom, Width, Height; @@ -713,23 +795,21 @@ TuiDrawProgressBarCenter( Bottom += 1; /* Draw the progress bar */ - TuiDrawProgressBar(Left, Top, Right, Bottom, Position, Range, ProgressText); + TuiDrawProgressBar(Left, Top, Right, Bottom, ProgressText); } -VOID +static VOID TuiDrawProgressBar( _In_ ULONG Left, _In_ ULONG Top, _In_ ULONG Right, _In_ ULONG Bottom, - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText) + _In_ PCSTR ProgressText) { - ULONG ProgressBarWidth, i; - /* Draw the box */ - TuiDrawBox(Left, Top, Right, Bottom, VERT, HORZ, TRUE, TRUE, ATTR(UiMenuFgColor, UiMenuBgColor)); + TuiDrawBox(Left, Top, Right, Bottom, + VERT, HORZ, TRUE, TRUE, + ATTR(UiMenuFgColor, UiMenuBgColor)); /* Exclude the box margins */ Left += 2; @@ -737,34 +817,7 @@ TuiDrawProgressBar( Top += 1; Bottom -= 1; - /* Calculate the width of the bar proper */ - ProgressBarWidth = Right - Left + 1; - - /* Clip the position */ - if (Position > Range) - Position = Range; - - /* First make sure the progress bar text fits */ - UiTruncateStringEllipsis(ProgressText, ProgressBarWidth); - - /* Draw the "Loading..." text */ - TuiDrawCenteredText(Left, Top, Right, Bottom - 1, - ProgressText, ATTR(UiTextColor, UiMenuBgColor)); - - /* Draw the percent complete -- Use the fill character */ - for (i = 0; i < (Position * ProgressBarWidth) / Range; i++) - { - TuiDrawText(Left + i, Bottom, - "\xDB", ATTR(UiTextColor, UiMenuBgColor)); - } - /* Fill the remaining with shadow blanks */ - TuiFillArea(Left + i, Bottom, Right, Bottom, - '\xB2', ATTR(UiTextColor, UiMenuBgColor)); - -#ifndef _M_ARM - TuiUpdateDateTime(); - VideoCopyOffScreenBufferToVRAM(); -#endif + UiInitProgressBar(Left, Top, Right, Bottom, ProgressText); } UCHAR TuiTextToColor(PCSTR ColorText) @@ -1135,6 +1188,8 @@ const UIVTBL TuiVtbl = TuiMessageBoxCritical, TuiDrawProgressBarCenter, TuiDrawProgressBar, + TuiSetProgressBarText, + TuiTickProgressBar, TuiEditBox, TuiTextToColor, TuiTextToFillStyle, diff --git a/boot/freeldr/freeldr/ui/ui.c b/boot/freeldr/freeldr/ui/ui.c index b2a08f27c9f..7d13d81ef16 100644 --- a/boot/freeldr/freeldr/ui/ui.c +++ b/boot/freeldr/freeldr/ui/ui.c @@ -16,13 +16,14 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#ifndef _M_ARM #include <freeldr.h> #include <debug.h> DBG_DEFAULT_CHANNEL(UI); +#ifndef _M_ARM + #define TAG_UI_TEXT 'xTiU' ULONG UiScreenWidth; // Screen Width @@ -55,6 +56,17 @@ CHAR UiTimeText[260] = "[Time Remaining: ] "; const CHAR UiMonthNames[12][15] = { "January ", "February ", "March ", "April ", "May ", "June ", "July ", "August ", "September ", "October ", "November ", "December " }; +#endif // _M_ARM + +/* + * Loading progress bar, based on the NTOS Inbv one. + * Supports progress within sub-ranges, used when loading + * with an unknown number of steps. + */ +UI_PROGRESS_BAR UiProgressBar = {{0}}; + +#ifndef _M_ARM + UIVTBL UiVtbl = { NoUiInitialize, @@ -72,6 +84,8 @@ UIVTBL UiVtbl = NoUiMessageBoxCritical, NoUiDrawProgressBarCenter, NoUiDrawProgressBar, + NoUiSetProgressBarText, + NoUiTickProgressBar, NoUiEditBox, NoUiTextToColor, NoUiTextToFillStyle, @@ -369,13 +383,128 @@ UCHAR UiTextToFillStyle(PCSTR FillStyleText) return UiVtbl.TextToFillStyle(FillStyleText); } +#endif // _M_ARM + +VOID +UiInitProgressBar( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ PCSTR ProgressText) +{ + /* Progress bar area */ + UiProgressBar.Left = Left; + UiProgressBar.Top = Top; + UiProgressBar.Right = Right; + UiProgressBar.Bottom = Bottom; + // UiProgressBar.Width = Right - Left + 1; + + /* Set the progress bar ranges */ + UiSetProgressBarSubset(0, 100); + UiProgressBar.Indicator.Count = 0; + UiProgressBar.Indicator.Expected = 25; + UiProgressBar.Indicator.Percentage = 0; + + /* Enable the progress bar */ + UiProgressBar.Show = TRUE; + + /* Initial drawing: set the "Loading..." text and the original position */ +#ifndef _M_ARM + UiVtbl.SetProgressBarText(ProgressText); + UiVtbl.TickProgressBar(0); +#else + MiniTuiSetProgressBarText(ProgressText); + MiniTuiTickProgressBar(0); +#endif +} + +VOID +UiIndicateProgress(VOID) +{ + ULONG Percentage; + + /* Increase progress */ + UiProgressBar.Indicator.Count++; + + /* Compute the new percentage - Don't go over 100% */ + Percentage = 100 * UiProgressBar.Indicator.Count / + UiProgressBar.Indicator.Expected; + Percentage = min(Percentage, 99); + + if (Percentage != UiProgressBar.Indicator.Percentage) + { + /* Percentage has changed, update the progress bar */ + UiProgressBar.Indicator.Percentage = Percentage; + UiUpdateProgressBar(Percentage, NULL); + } +} + +VOID +UiSetProgressBarSubset( + _In_ ULONG Floor, + _In_ ULONG Ceiling) +{ + /* Sanity checks */ + ASSERT(Floor < Ceiling); + ASSERT(Ceiling <= 100); + + /* Update the progress bar state */ + UiProgressBar.State.Floor = Floor * 100; + // UiProgressBar.State.Ceiling = Ceiling * 100; + UiProgressBar.State.Bias = Ceiling - Floor; +} + +VOID +UiUpdateProgressBar( + _In_ ULONG Percentage, + _In_opt_ PCSTR ProgressText) +{ + ULONG TotalProgress; + + /* Make sure the progress bar is enabled */ + if (!UiProgressBar.Show) + return; + + /* Set the progress text if specified */ + if (ProgressText) + UiSetProgressBarText(ProgressText); + + /* Compute the total progress and tick the progress bar */ + TotalProgress = UiProgressBar.State.Floor + (Percentage * UiProgressBar.State.Bias); + // TotalProgress /= (100 * 100); + +#ifndef _M_ARM + UiVtbl.TickProgressBar(TotalProgress); +#else + MiniTuiTickProgressBar(TotalProgress); +#endif +} + +VOID +UiSetProgressBarText( + _In_ PCSTR ProgressText) +{ + /* Make sure the progress bar is enabled */ + if (!UiProgressBar.Show) + return; + +#ifndef _M_ARM + UiVtbl.SetProgressBarText(ProgressText); +#else + MiniTuiSetProgressBarText(ProgressText); +#endif +} + VOID UiDrawProgressBarCenter( - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText) + _In_ PCSTR ProgressText) { - UiVtbl.DrawProgressBarCenter(Position, Range, ProgressText); +#ifndef _M_ARM + UiVtbl.DrawProgressBarCenter(ProgressText); +#else + MiniTuiDrawProgressBarCenter(ProgressText); +#endif } VOID @@ -384,11 +513,34 @@ UiDrawProgressBar( _In_ ULONG Top, _In_ ULONG Right, _In_ ULONG Bottom, - _In_ ULONG Position, - _In_ ULONG Range, - _Inout_z_ PSTR ProgressText) + _In_ PCSTR ProgressText) { - UiVtbl.DrawProgressBar(Left, Top, Right, Bottom, Position, Range, ProgressText); +#ifndef _M_ARM + UiVtbl.DrawProgressBar(Left, Top, Right, Bottom, ProgressText); +#else + MiniTuiDrawProgressBar(Left, Top, Right, Bottom, ProgressText); +#endif +} + +#ifndef _M_ARM + +static VOID +UiEscapeString(PCHAR String) +{ + ULONG Idx; + + for (Idx=0; Idx<strlen(String); Idx++) + { + // Escape the new line characters + if (String[Idx] == '\\' && String[Idx+1] == 'n') + { + // Escape the character + String[Idx] = '\n'; + + // Move the rest of the string up + strcpy(&String[Idx+1], &String[Idx+2]); + } + } } VOID @@ -472,31 +624,6 @@ UiShowMessageBoxesInArgv( } } -VOID UiEscapeString(PCHAR String) -{ - ULONG Idx; - - for (Idx=0; Idx<strlen(String); Idx++) - { - // Escape the new line characters - if (String[Idx] == '\\' && String[Idx+1] == 'n') - { - // Escape the character - String[Idx] = '\n'; - - // Move the rest of the string up - strcpy(&String[Idx+1], &String[Idx+2]); - } - } -} - -VOID UiTruncateStringEllipsis(PCHAR StringText, ULONG MaxChars) -{ - /* If it's too large, just add some ellipsis past the maximum */ - if (strlen(StringText) > MaxChars) - strcpy(&StringText[MaxChars - 3], "..."); -} - BOOLEAN UiDisplayMenu( IN PCSTR MenuHeader,

1 0

[reactos] 01/01: [RUNAS] Add password input and improve help text
by Eric Kohl 19 Feb '22

19 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c14440ee5789445f38e0c… commit c14440ee5789445f38e0c7cf327b0200947c8965 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Feb 19 19:50:46 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Feb 19 19:50:46 2022 +0100 [RUNAS] Add password input and improve help text Now it works on windows xp and 10. --- base/applications/runas/lang/de-DE.rc | 15 ++++++- base/applications/runas/lang/en-US.rc | 15 ++++++- base/applications/runas/resource.h | 25 ++++++++---- base/applications/runas/runas.c | 73 +++++++++++++++++++++++++++++------ 4 files changed, 106 insertions(+), 22 deletions(-) diff --git a/base/applications/runas/lang/de-DE.rc b/base/applications/runas/lang/de-DE.rc index 53f50974495..c9e3e159030 100644 --- a/base/applications/runas/lang/de-DE.rc +++ b/base/applications/runas/lang/de-DE.rc @@ -7,6 +7,17 @@ BEGIN IDS_USAGE03 " /user:<Benutzername> Programm\n\n" IDS_USAGE04 "RUNAS [ [/noprofile | /profile] [/env] [/savecred | /netonly] ]\n" IDS_USAGE05 " /smartcard [/user:<Benutzername>] Programm\n\n" - IDS_USAGE06 "/noprofile" - IDS_USAGE07 "/profile" + IDS_USAGE06 " /noprofile Legt fest, dass das Benutzerprofil nicht geladen werden\n" + IDS_USAGE07 " soll. Führt dazu, dass die Anwendung schneller geladen\n" + IDS_USAGE08 " wird. Dies kann bei einigen Anwendungen zu Fehlern führen.\n" + 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_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_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 815319ea936..f3f478b67f6 100644 --- a/base/applications/runas/lang/en-US.rc +++ b/base/applications/runas/lang/en-US.rc @@ -7,6 +7,17 @@ BEGIN IDS_USAGE03 " /user:<UserName> program\n\n" IDS_USAGE04 "RUNAS [ [/noprofile | /profile] [/env] [/savecred | /netonly] ]\n" IDS_USAGE05 " /smartcard [/user:<UserName>] program\n\n" - IDS_USAGE06 "/noprofile" - IDS_USAGE07 "/profile" + IDS_USAGE06 " /noprofile specifies that the user's profile should not be loaded.\n" + IDS_USAGE07 " This causes the application to load more quickly, but\n" + IDS_USAGE08 " can cause some applications to malfunction.\n" + 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_START "Attempting to start %s as user ""%s\\%s""...\n" + IDS_RUN_ERROR "RUNAS ERROR: Unable to run %s\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 11ad5ad8fa3..a2288467f14 100644 --- a/base/applications/runas/resource.h +++ b/base/applications/runas/resource.h @@ -1,7 +1,18 @@ -#define IDS_USAGE01 7000 -#define IDS_USAGE02 7001 -#define IDS_USAGE03 7002 -#define IDS_USAGE04 7003 -#define IDS_USAGE05 7004 -#define IDS_USAGE06 7005 -#define IDS_USAGE07 7006 +#define IDS_USAGE01 7000 +#define IDS_USAGE02 7001 +#define IDS_USAGE03 7002 +#define IDS_USAGE04 7003 +#define IDS_USAGE05 7004 +#define IDS_USAGE06 7005 +#define IDS_USAGE07 7006 +#define IDS_USAGE08 7007 +#define IDS_USAGE09 7008 +#define IDS_USAGE10 7009 +#define IDS_USAGE11 7010 +#define IDS_USAGE12 7011 +#define IDS_USAGE13 7012 +#define IDS_USAGE_MAX IDS_USAGE13 + +#define IDS_START 7100 +#define IDS_RUN_ERROR 7101 +#define IDS_PASSWORD 7500 diff --git a/base/applications/runas/runas.c b/base/applications/runas/runas.c index 581f24e2d00..8adbe8d2894 100644 --- a/base/applications/runas/runas.c +++ b/base/applications/runas/runas.c @@ -23,17 +23,52 @@ #define NDEBUG #include <debug.h> +#define MAX_PASSWORD_LENGTH 64 + static -void -Usage(void) +VOID +Usage(VOID) { - ConResPuts(StdOut, IDS_USAGE01); - ConResPuts(StdOut, IDS_USAGE02); - ConResPuts(StdOut, IDS_USAGE03); - ConResPuts(StdOut, IDS_USAGE04); - ConResPuts(StdOut, IDS_USAGE05); - ConResPuts(StdOut, IDS_USAGE06); - ConResPuts(StdOut, IDS_USAGE07); + int i; + for (i = IDS_USAGE01; i <= IDS_USAGE_MAX; i++) + ConResPuts(StdOut, i); +} + + +static +VOID +ConInString( + _In_ PWSTR pInput, + _In_ DWORD dwLength) +{ + DWORD dwOldMode; + DWORD dwRead = 0; + HANDLE hFile; + PWSTR p; + PCHAR pBuf; + + pBuf = (PCHAR)HeapAlloc(GetProcessHeap(), 0, dwLength - 1); + ZeroMemory(pInput, dwLength * sizeof(WCHAR)); + hFile = GetStdHandle(STD_INPUT_HANDLE); + GetConsoleMode(hFile, &dwOldMode); + + SetConsoleMode(hFile, ENABLE_LINE_INPUT /*| ENABLE_ECHO_INPUT*/); + + ReadFile(hFile, (PVOID)pBuf, dwLength - 1, &dwRead, NULL); + + MultiByteToWideChar(GetConsoleCP(), 0, pBuf, dwRead, pInput, dwLength - 1); + HeapFree(GetProcessHeap(), 0, pBuf); + + for (p = pInput; *p; p++) + { + if (*p == L'\x0d') + { + *p = UNICODE_NULL; + break; + } + } + + SetConsoleMode(hFile, dwOldMode); } @@ -169,7 +204,22 @@ wmain( DPRINT("Domain: %S\n", pszDomain); DPRINT("CommandLine: %S\n", pszCommandLine); - /* FIXME: Query the password: */ + if (pszDomain == NULL) + { + DWORD dwLength = MAX_COMPUTERNAME_LENGTH + 1; + pszDomain = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength * sizeof(WCHAR)); + if (pszDomain) + GetComputerNameW(pszDomain, &dwLength); + } + + pszPassword = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (MAX_PASSWORD_LENGTH + 1) * sizeof(WCHAR)); + + /* Query the password */ + ConResPrintf(StdOut, IDS_PASSWORD, pszDomain, pszUserName); + ConInString(pszPassword, MAX_PASSWORD_LENGTH + 1); + ConPuts(StdOut, L"\n"); + + ConResPrintf(StdOut, IDS_START, pszCommandLine, pszDomain, pszUserName); rc = CreateProcessWithLogonW(pszUserName, pszDomain, @@ -184,7 +234,8 @@ wmain( &ProcessInfo); if (rc == FALSE) { - DPRINT("Error: %lu\n", GetLastError()); + ConResPrintf(StdOut, IDS_RUN_ERROR, pszCommandLine); + ConPrintf(StdOut, L"Error: %lu\n", GetLastError()); } done:

1 0

[reactos] 01/01: [WIN32SS][NTGDI] Remove useless assert (#4370) CORE-17561
by Oleg Dubinskiy 18 Feb '22

18 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ab5d3afb2007337b0a29… commit 9ab5d3afb2007337b0a298635729ccd82b3efe18 Author: Oleg Dubinskiy <oleg.dubinskij2013(a)yandex.ua> AuthorDate: Fri Feb 18 23:00:57 2022 +0200 Commit: GitHub <noreply(a)github.com> CommitDate: Fri Feb 18 22:00:57 2022 +0100 [WIN32SS][NTGDI] Remove useless assert (#4370) CORE-17561 Remove useless ASSERT(FALSE); in IntGdiCreateDisplayDC, because it actually does not check anything useful. It only asserts each time when the function is called from DxEngCreateMemoryDC by MS DirectDraw stack (ddraw.dll & dxg.sys). UNIMPLEMENTED debug print is enough a lot to see that this function is not implemented properly. CORE-17561 --- win32ss/gdi/ntgdi/dclife.c | 1 - 1 file changed, 1 deletion(-) diff --git a/win32ss/gdi/ntgdi/dclife.c b/win32ss/gdi/ntgdi/dclife.c index 4671c16d4a7..d94f69b9661 100644 --- a/win32ss/gdi/ntgdi/dclife.c +++ b/win32ss/gdi/ntgdi/dclife.c @@ -1064,7 +1064,6 @@ IntGdiCreateDisplayDC(HDEV hDev, ULONG DcType, BOOL EmptyDC) { HDC hDC; UNIMPLEMENTED; - ASSERT(FALSE); if (DcType == DC_TYPE_MEMORY) hDC = NtGdiCreateCompatibleDC(NULL); // OH~ Yuck! I think I taste vomit in my mouth!

1 0

[reactos] 04/04: [FREELDR:NTLDR] Slightly rework how KD transport DLLs are loaded.
by Hermès Bélusca-Maïto 18 Feb '22

18 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=81943afb7b3603de981fa… commit 81943afb7b3603de981fae80e994c8d8f29041df Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Feb 18 04:38:52 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Feb 18 20:24:51 2022 +0100 [FREELDR:NTLDR] Slightly rework how KD transport DLLs are loaded. A Kernel Debugger Transport DLL is always loaded for Windows XP+ : either the standard KDCOM.DLL (by default), or an alternative user-provided one via the /DEBUGPORT= option. If this alternative does not exist or fails to be loaded, fall back to the standard KDCOM.DLL. If no KD dll is loaded, kernel loading would fail because of the resulting unsatisfied KDCOM dll import (tested on Windows and ReactOS). + Normalize kernel, HAL and KD dll file names to lowercase (needed for case-sensitive installations). --- boot/freeldr/freeldr/ntldr/winldr.c | 78 +++++++++++++++++++++++++------------ 1 file changed, 53 insertions(+), 25 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 3e7abaa51f4..317d59a35bd 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -575,7 +575,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, /* Retrieve the HAL file name */ Option += 4; OptionLength -= 4; RtlStringCbCopyNA(HalFileName, sizeof(HalFileName), Option, OptionLength); - _strupr(HalFileName); + _strlwr(HalFileName); } Option = NtLdrGetOptionEx(BootOptions, "KERNEL=", &OptionLength); @@ -584,7 +584,7 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, /* Retrieve the KERNEL file name */ Option += 7; OptionLength -= 7; RtlStringCbCopyNA(KernelFileName, sizeof(KernelFileName), Option, OptionLength); - _strupr(KernelFileName); + _strlwr(KernelFileName); } TRACE("HAL file = '%s' ; Kernel file = '%s'\n", HalFileName, KernelFileName); @@ -633,50 +633,78 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, * the name "kdcom.dll". [...]" */ + /* + * A Kernel Debugger Transport DLL is always loaded for Windows XP+ : + * either the standard KDCOM.DLL (by default): IsCustomKdDll == FALSE + * or an alternative user-provided one via the /DEBUGPORT= option: + * IsCustomKdDll == TRUE if it does not specify the default KDCOM. + */ + BOOLEAN IsCustomKdDll = FALSE; + /* Check whether there is a DEBUGPORT option */ Option = NtLdrGetOptionEx(BootOptions, "DEBUGPORT=", &OptionLength); if (Option && (OptionLength > 10)) { /* Move to the debug port name */ Option += 10; OptionLength -= 10; - ASSERT(OptionLength > 0); /* * Parse the port name. - * Format: /DEBUGPORT=COM[1-9] + * Format: /DEBUGPORT=COM[0-9] * or: /DEBUGPORT=FILE:\Device\HarddiskX\PartitionY\debug.log * or: /DEBUGPORT=FOO * If we only have /DEBUGPORT= (i.e. without any port name), - * defaults it to "COM". + * default to "COM". */ - RtlStringCbCopyA(KdDllName, sizeof(KdDllName), "KD"); - if (_strnicmp(Option, "COM", 3) == 0 && '0' <= Option[3] && Option[3] <= '9') + + /* Get the actual length of the debug port + * until the next whitespace or colon. */ + OptionLength = (ULONG)strcspn(Option, " \t:"); + + if ((OptionLength == 0) || + ( (OptionLength >= 3) && (_strnicmp(Option, "COM", 3) == 0) && + ((OptionLength == 3) || ('0' <= Option[3] && Option[3] <= '9')) )) { - RtlStringCbCatNA(KdDllName, sizeof(KdDllName), Option, 3); + /* The standard KDCOM.DLL is used */ } else { - /* Get the actual length of the debug port - * until the next whitespace or colon. */ - OptionLength = (ULONG)strcspn(Option, " \t:"); - if (OptionLength == 0) - RtlStringCbCatA(KdDllName, sizeof(KdDllName), "COM"); - else - RtlStringCbCatNA(KdDllName, sizeof(KdDllName), Option, OptionLength); + /* A custom KD DLL is used */ + IsCustomKdDll = TRUE; } - RtlStringCbCatA(KdDllName, sizeof(KdDllName), ".DLL"); - _strupr(KdDllName); + } + if (!IsCustomKdDll) + { + Option = "COM"; OptionLength = 3; + } - /* - * Load the transport DLL. Override the base DLL name of the - * loaded transport DLL to the default "KDCOM.DLL" name. - */ - KdDllBase = LoadModule(LoaderBlock, DirPath, KdDllName, - "kdcom.dll", LoaderSystemCode, &KdDllDTE, 60); - if (!KdDllBase) + RtlStringCbPrintfA(KdDllName, sizeof(KdDllName), "kd%.*s.dll", + OptionLength, Option); + _strlwr(KdDllName); + + /* Load the KD DLL. Override its base DLL name to the default "KDCOM.DLL". */ + KdDllBase = LoadModule(LoaderBlock, DirPath, KdDllName, + "kdcom.dll", LoaderSystemCode, &KdDllDTE, 60); + if (!KdDllBase) + { + /* If we failed to load a custom KD DLL, fall back to the standard one */ + if (IsCustomKdDll) { - /* The transport DLL being optional, just ignore the failure */ + /* The custom KD DLL being optional, just ignore the failure */ WARN("LoadModule('%s') failed\n", KdDllName); + + IsCustomKdDll = FALSE; + RtlStringCbCopyA(KdDllName, sizeof(KdDllName), "kdcom.dll"); + + KdDllBase = LoadModule(LoaderBlock, DirPath, KdDllName, + "kdcom.dll", LoaderSystemCode, &KdDllDTE, 60); + } + + if (!KdDllBase) + { + /* Ignore the failure; we will fail later when scanning the + * kernel import tables, if it really needs the KD DLL. */ + ERR("LoadModule('%s') failed\n", KdDllName); } } }

1 0

[reactos] 03/04: [FREELDR] Add cleanup in PE-image-handling-related failure code paths.
by Hermès Bélusca-Maïto 18 Feb '22

18 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=2221df213f40ec1b6d62a… commit 2221df213f40ec1b6d62a0747863c9e0c891a97c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Feb 18 03:20:24 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Feb 18 20:24:49 2022 +0100 [FREELDR] Add cleanup in PE-image-handling-related failure code paths. --- boot/freeldr/freeldr/disk/scsiport.c | 25 ++++++--- boot/freeldr/freeldr/include/peloader.h | 5 ++ boot/freeldr/freeldr/lib/peloader.c | 82 ++++++++++++++++++----------- boot/freeldr/freeldr/ntldr/winldr.c | 93 ++++++++++++++++++++++++++------- 4 files changed, 148 insertions(+), 57 deletions(-) diff --git a/boot/freeldr/freeldr/disk/scsiport.c b/boot/freeldr/freeldr/disk/scsiport.c index d23fe58a76e..0699f69f6a6 100644 --- a/boot/freeldr/freeldr/disk/scsiport.c +++ b/boot/freeldr/freeldr/disk/scsiport.c @@ -1653,7 +1653,7 @@ LoadBootDeviceDriver(VOID) Success = PeLdrLoadImage(NtBootDdPath, LoaderBootDriver, &ImageBase); if (!Success) { - /* That's OK. File simply doesn't exist */ + /* That's OK, file simply doesn't exist */ return ESUCCESS; } @@ -1661,7 +1661,11 @@ LoadBootDeviceDriver(VOID) Success = PeLdrAllocateDataTableEntry(&ModuleListHead, "ntbootdd.sys", "NTBOOTDD.SYS", ImageBase, &BootDdDTE); if (!Success) + { + /* Cleanup and bail out */ + MmFreeMemory(ImageBase); return EIO; + } /* Add the PE part of freeldr.sys to the list of loaded executables, it contains ScsiPort* exports, imported by ntbootdd.sys */ @@ -1669,20 +1673,27 @@ LoadBootDeviceDriver(VOID) "FREELDR.SYS", &__ImageBase, &FreeldrDTE); if (!Success) { - RemoveEntryList(&BootDdDTE->InLoadOrderLinks); + /* Cleanup and bail out */ + PeLdrFreeDataTableEntry(BootDdDTE); + MmFreeMemory(ImageBase); return EIO; } /* Fix imports */ Success = PeLdrScanImportDescriptorTable(&ModuleListHead, "", BootDdDTE); + if (!Success) + { + /* Cleanup and bail out */ + PeLdrFreeDataTableEntry(FreeldrDTE); + PeLdrFreeDataTableEntry(BootDdDTE); + MmFreeMemory(ImageBase); + return EIO; + } - /* Now unlinkt the DTEs, they won't be valid later */ + /* Now unlink the DTEs, they won't be valid later */ RemoveEntryList(&BootDdDTE->InLoadOrderLinks); RemoveEntryList(&FreeldrDTE->InLoadOrderLinks); - if (!Success) - return EIO; - /* Change imports to PA */ ImportTable = (PIMAGE_IMPORT_DESCRIPTOR)RtlImageDirectoryEntryToData(VaToPa(BootDdDTE->DllBase), TRUE, IMAGE_DIRECTORY_ENTRY_IMPORT, &ImportTableSize); @@ -1705,7 +1716,7 @@ LoadBootDeviceDriver(VOID) NtHeaders->OptionalHeader.ImageBase - (ULONG_PTR)BootDdDTE->DllBase, "FreeLdr", TRUE, - TRUE, /* in case of conflict still return success */ + TRUE, /* In case of conflict still return success */ FALSE); if (!Success) return EIO; diff --git a/boot/freeldr/freeldr/include/peloader.h b/boot/freeldr/freeldr/include/peloader.h index 63ffa80471a..1f67ed3bbac 100644 --- a/boot/freeldr/freeldr/include/peloader.h +++ b/boot/freeldr/freeldr/include/peloader.h @@ -40,6 +40,11 @@ PeLdrAllocateDataTableEntry( IN PVOID BasePA, OUT PLDR_DATA_TABLE_ENTRY *NewEntry); +VOID +PeLdrFreeDataTableEntry( + // _In_ PLIST_ENTRY ModuleListHead, + _In_ PLDR_DATA_TABLE_ENTRY Entry); + BOOLEAN PeLdrScanImportDescriptorTable( IN OUT PLIST_ENTRY ModuleListHead, diff --git a/boot/freeldr/freeldr/lib/peloader.c b/boot/freeldr/freeldr/lib/peloader.c index b768aa9dea8..f97639e4cec 100644 --- a/boot/freeldr/freeldr/lib/peloader.c +++ b/boot/freeldr/freeldr/lib/peloader.c @@ -115,7 +115,7 @@ PeLdrpBindImportName( // DllBase, ImageBase, ThunkData, ExportDirectory, ExportSize, ProcessForwards); /* Check passed DllBase param */ - if(DllBase == NULL) + if (DllBase == NULL) { WARN("DllBase == NULL!\n"); return FALSE; @@ -368,7 +368,7 @@ PeLdrpLoadAndScanReferencedDll( Success = PeLdrLoadImage(FullDllName, LoaderBootDriver, &BasePA); if (!Success) { - ERR("PeLdrLoadImage() failed\n"); + ERR("PeLdrLoadImage('%s') failed\n", FullDllName); return Success; } @@ -380,7 +380,9 @@ PeLdrpLoadAndScanReferencedDll( DataTableEntry); if (!Success) { - ERR("PeLdrAllocateDataTableEntry() failed\n"); + /* Cleanup and bail out */ + ERR("PeLdrAllocateDataTableEntry('%s') failed\n", FullDllName); + MmFreeMemory(BasePA); return Success; } @@ -392,7 +394,10 @@ PeLdrpLoadAndScanReferencedDll( Success = PeLdrScanImportDescriptorTable(ModuleListHead, DirectoryPath, *DataTableEntry); if (!Success) { + /* Cleanup and bail out */ ERR("PeLdrScanImportDescriptorTable() failed\n"); + PeLdrFreeDataTableEntry(*DataTableEntry); + MmFreeMemory(BasePA); return Success; } @@ -603,7 +608,7 @@ PeLdrAllocateDataTableEntry( PIMAGE_NT_HEADERS NtHeaders; USHORT Length; - TRACE("PeLdrAllocateDataTableEntry(, '%s', '%s', %p)\n", + TRACE("PeLdrAllocateDataTableEntry('%s', '%s', %p)\n", BaseDllName, FullDllName, BasePA); /* Allocate memory for a data table entry, zero-initialize it */ @@ -706,6 +711,20 @@ PeLdrAllocateDataTableEntry( return TRUE; } +VOID +PeLdrFreeDataTableEntry( + // _In_ PLIST_ENTRY ModuleListHead, + _In_ PLDR_DATA_TABLE_ENTRY Entry) +{ + // ASSERT(ModuleListHead); + ASSERT(Entry); + + RemoveEntryList(&Entry->InLoadOrderLinks); + FrLdrHeapFree(VaToPa(Entry->FullDllName.Buffer), TAG_WLDR_NAME); + FrLdrHeapFree(VaToPa(Entry->BaseDllName.Buffer), TAG_WLDR_NAME); + FrLdrHeapFree(Entry, TAG_WLDR_DTE); +} + /* * PeLdrLoadImage loads the specified image from the file (it doesn't * perform any additional operations on the filename, just directly @@ -730,13 +749,13 @@ PeLdrLoadImage( LARGE_INTEGER Position; ULONG i, BytesRead; - TRACE("PeLdrLoadImage(%s, %ld)\n", FileName, MemoryType); + TRACE("PeLdrLoadImage('%s', %ld)\n", FileName, MemoryType); /* Open the image file */ Status = ArcOpen((PSTR)FileName, OpenReadOnly, &FileId); if (Status != ESUCCESS) { - WARN("ArcOpen(FileName: '%s') failed. Status: %u\n", FileName, Status); + WARN("ArcOpen('%s') failed. Status: %u\n", FileName, Status); return FALSE; } @@ -744,8 +763,7 @@ PeLdrLoadImage( Status = ArcRead(FileId, HeadersBuffer, SECTOR_SIZE * 2, &BytesRead); if (Status != ESUCCESS) { - ERR("ArcRead(File: '%s') failed. Status: %u\n", FileName, Status); - UiMessageBox("Error reading from file."); + ERR("ArcRead('%s') failed. Status: %u\n", FileName, Status); ArcClose(FileId); return FALSE; } @@ -755,7 +773,6 @@ PeLdrLoadImage( if (!NtHeaders) { ERR("No NT header found in \"%s\"\n", FileName); - UiMessageBox("Error: No NT header found."); ArcClose(FileId); return FALSE; } @@ -764,7 +781,6 @@ PeLdrLoadImage( if (((NtHeaders->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE) == 0)) { ERR("Not an executable image \"%s\"\n", FileName); - UiMessageBox("Not an executable image."); ArcClose(FileId); return FALSE; } @@ -773,26 +789,25 @@ PeLdrLoadImage( NumberOfSections = NtHeaders->FileHeader.NumberOfSections; SectionHeader = IMAGE_FIRST_SECTION(NtHeaders); - /* Try to allocate this memory, if fails - allocate somewhere else */ + /* Try to allocate this memory; if it fails, allocate somewhere else */ PhysicalBase = MmAllocateMemoryAtAddress(NtHeaders->OptionalHeader.SizeOfImage, (PVOID)((ULONG)NtHeaders->OptionalHeader.ImageBase & (KSEG0_BASE - 1)), MemoryType); if (PhysicalBase == NULL) { - /* It's ok, we don't panic - let's allocate again at any other "low" place */ + /* Don't fail, allocate again at any other "low" place */ PhysicalBase = MmAllocateMemoryWithType(NtHeaders->OptionalHeader.SizeOfImage, MemoryType); if (PhysicalBase == NULL) { ERR("Failed to alloc %lu bytes for image %s\n", NtHeaders->OptionalHeader.SizeOfImage, FileName); - UiMessageBox("Failed to alloc pages for image."); ArcClose(FileId); return FALSE; } } - /* This is the real image base - in form of a virtual address */ + /* This is the real image base, in form of a virtual address */ VirtualBase = PaToVa(PhysicalBase); TRACE("Base PA: 0x%X, VA: 0x%X\n", PhysicalBase, VirtualBase); @@ -805,10 +820,10 @@ PeLdrLoadImage( Status = ArcRead(FileId, (PUCHAR)PhysicalBase + sizeof(HeadersBuffer), NtHeaders->OptionalHeader.SizeOfHeaders - sizeof(HeadersBuffer), &BytesRead); if (Status != ESUCCESS) { - ERR("ArcRead(File: '%s') failed. Status: %u\n", FileName, Status); - UiMessageBox("Error reading headers."); + ERR("ArcRead('%s') failed. Status: %u\n", FileName, Status); + // UiMessageBox("Error reading headers."); ArcClose(FileId); - return FALSE; + goto Failure; } } @@ -824,9 +839,6 @@ PeLdrLoadImage( /* Load the first section */ SectionHeader = IMAGE_FIRST_SECTION(NtHeaders); - /* Fill output parameters */ - *ImageBasePA = PhysicalBase; - /* Walk through each section and read it (check/fix any possible bad situations, if they arise) */ for (i = 0; i < NumberOfSections; i++) @@ -868,7 +880,7 @@ PeLdrLoadImage( } } - /* Size of data is less than the virtual size - fill up the remainder with zeroes */ + /* Size of data is less than the virtual size: fill up the remainder with zeroes */ if (SizeOfRawData < VirtualSize) { TRACE("PeLdrLoadImage(): SORD %d < VS %d\n", SizeOfRawData, VirtualSize); @@ -878,25 +890,35 @@ PeLdrLoadImage( SectionHeader++; } - /* We are done with the file - close it */ + /* We are done with the file, close it */ ArcClose(FileId); - /* If loading failed - return right now */ + /* If loading failed, return right now */ if (Status != ESUCCESS) - return FALSE; + goto Failure; /* Relocate the image, if it needs it */ if (NtHeaders->OptionalHeader.ImageBase != (ULONG_PTR)VirtualBase) { WARN("Relocating %p -> %p\n", NtHeaders->OptionalHeader.ImageBase, VirtualBase); - return (BOOLEAN)LdrRelocateImageWithBias(PhysicalBase, - (ULONG_PTR)VirtualBase - (ULONG_PTR)PhysicalBase, - "FreeLdr", - TRUE, - TRUE, /* in case of conflict still return success */ - FALSE); + Status = LdrRelocateImageWithBias(PhysicalBase, + (ULONG_PTR)VirtualBase - (ULONG_PTR)PhysicalBase, + "FreeLdr", + ESUCCESS, + ESUCCESS, /* In case of conflict still return success */ + ENOEXEC); + if (Status != ESUCCESS) + goto Failure; } + /* Fill output parameters */ + *ImageBasePA = PhysicalBase; + TRACE("PeLdrLoadImage() done, PA = %p\n", *ImageBasePA); return TRUE; + +Failure: + /* Cleanup and bail out */ + MmFreeMemory(PhysicalBase); + return FALSE; } diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 2721ce4f0ed..3e7abaa51f4 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -333,7 +333,9 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, Success = PeLdrAllocateDataTableEntry(LoadOrderListHead, DllName, DllName, DriverBase, DriverDTE); if (!Success) { + /* Cleanup and bail out */ ERR("PeLdrAllocateDataTableEntry('%s') failed\n", DllName); + MmFreeMemory(DriverBase); return FALSE; } @@ -345,7 +347,10 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, Success = PeLdrScanImportDescriptorTable(LoadOrderListHead, FullPath, *DriverDTE); if (!Success) { + /* Cleanup and bail out */ ERR("PeLdrScanImportDescriptorTable('%s') failed\n", FullPath); + PeLdrFreeDataTableEntry(*DriverDTE); + MmFreeMemory(DriverBase); return FALSE; } @@ -482,7 +487,7 @@ WinLdrDetectVersion(VOID) } static -BOOLEAN +PVOID LoadModule( IN OUT PLOADER_PARAMETER_BLOCK LoaderBlock, IN PCCH Path, @@ -495,7 +500,7 @@ LoadModule( BOOLEAN Success; CHAR FullFileName[MAX_PATH]; CHAR ProgressString[256]; - PVOID BaseAddress = NULL; + PVOID BaseAddress; RtlStringCbPrintfA(ProgressString, sizeof(ProgressString), "Loading %s...", File); if (!SosEnabled) UiDrawProgressBarCenter(Percentage, 100, ProgressString); @@ -508,15 +513,10 @@ LoadModule( if (!Success) { ERR("PeLdrLoadImage('%s') failed\n", File); - return FALSE; + return NULL; } TRACE("%s loaded successfully at %p\n", File, BaseAddress); - /* - * Cheat about the base DLL name if we are loading - * the Kernel Debugger Transport DLL, to make the - * PE loader happy. - */ Success = PeLdrAllocateDataTableEntry(&LoaderBlock->LoadOrderListHead, ImportName, FullFileName, @@ -524,10 +524,13 @@ LoadModule( Dte); if (!Success) { + /* Cleanup and bail out */ ERR("PeLdrAllocateDataTableEntry('%s') failed\n", FullFileName); + MmFreeMemory(BaseAddress); + BaseAddress = NULL; } - return Success; + return BaseAddress; } static @@ -541,7 +544,8 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, BOOLEAN Success; PCSTR Option; ULONG OptionLength; - PLDR_DATA_TABLE_ENTRY HalDTE, KdComDTE = NULL; + PVOID KernelBase, HalBase, KdDllBase = NULL; + PLDR_DATA_TABLE_ENTRY HalDTE, KdDllDTE = NULL; CHAR DirPath[MAX_PATH]; CHAR HalFileName[MAX_PATH]; CHAR KernelFileName[MAX_PATH]; @@ -585,17 +589,33 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, TRACE("HAL file = '%s' ; Kernel file = '%s'\n", HalFileName, KernelFileName); + /* + * Load the core NT files: Kernel, HAL and KD transport DLL. + * Cheat about their base DLL name so as to satisfy the imports/exports, + * even if the corresponding underlying files do not have the same names + * -- this happens e.g. with UP vs. MP kernel, standard vs. ACPI hal, or + * different KD transport DLLs. + */ + /* Load the Kernel */ - if (!LoadModule(LoaderBlock, DirPath, KernelFileName, "ntoskrnl.exe", LoaderSystemCode, KernelDTE, 30)) + KernelBase = LoadModule(LoaderBlock, DirPath, KernelFileName, + "ntoskrnl.exe", LoaderSystemCode, KernelDTE, 30); + if (!KernelBase) { - ERR("LoadModule() failed for %s\n", KernelFileName); + ERR("LoadModule('%s') failed\n", KernelFileName); + UiMessageBox("Could not load %s", KernelFileName); return FALSE; } /* Load the HAL */ - if (!LoadModule(LoaderBlock, DirPath, HalFileName, "hal.dll", LoaderHalCode, &HalDTE, 45)) + HalBase = LoadModule(LoaderBlock, DirPath, HalFileName, + "hal.dll", LoaderHalCode, &HalDTE, 45); + if (!HalBase) { - ERR("LoadModule() failed for %s\n", HalFileName); + ERR("LoadModule('%s') failed\n", HalFileName); + UiMessageBox("Could not load %s", HalFileName); + PeLdrFreeDataTableEntry(*KernelDTE); + MmFreeMemory(KernelBase); return FALSE; } @@ -651,10 +671,12 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, * Load the transport DLL. Override the base DLL name of the * loaded transport DLL to the default "KDCOM.DLL" name. */ - if (!LoadModule(LoaderBlock, DirPath, KdDllName, "kdcom.dll", LoaderSystemCode, &KdComDTE, 60)) + KdDllBase = LoadModule(LoaderBlock, DirPath, KdDllName, + "kdcom.dll", LoaderSystemCode, &KdDllDTE, 60); + if (!KdDllBase) { /* The transport DLL being optional, just ignore the failure */ - WARN("LoadModule() failed for %s\n", KdDllName); + WARN("LoadModule('%s') failed\n", KdDllName); } } } @@ -730,11 +752,42 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, } /* Load all referenced DLLs for Kernel, HAL and Kernel Debugger Transport DLL */ - Success = PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, *KernelDTE); - Success &= PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, HalDTE); - if (KdComDTE) + Success = PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, *KernelDTE); + if (!Success) + { + UiMessageBox("Could not load %s", KernelFileName); + goto Quit; + } + Success = PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, HalDTE); + if (!Success) + { + UiMessageBox("Could not load %s", HalFileName); + goto Quit; + } + if (KdDllDTE) + { + Success = PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, KdDllDTE); + if (!Success) + { + UiMessageBox("Could not load %s", KdDllName); + goto Quit; + } + } + +Quit: + if (!Success) { - Success &= PeLdrScanImportDescriptorTable(&LoaderBlock->LoadOrderListHead, DirPath, KdComDTE); + /* Cleanup and bail out */ + if (KdDllDTE) + PeLdrFreeDataTableEntry(KdDllDTE); + if (KdDllBase) // Optional + MmFreeMemory(KdDllBase); + + PeLdrFreeDataTableEntry(HalDTE); + MmFreeMemory(HalBase); + + PeLdrFreeDataTableEntry(*KernelDTE); + MmFreeMemory(KernelBase); } return Success;

1 0

[reactos] 02/04: [FREELDR:NTLDR] Add some error handling for LoadModule(). Based on PR #4294 by Serge Gautherie.
by Hermès Bélusca-Maïto 18 Feb '22

18 Feb '22

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=15e1489c7f4986d93d72b… commit 15e1489c7f4986d93d72b61a4a3da7e61f219f24 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Feb 11 02:55:13 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Feb 18 20:24:48 2022 +0100 [FREELDR:NTLDR] Add some error handling for LoadModule(). Based on PR #4294 by Serge Gautherie. Co-authored-by: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> --- boot/freeldr/freeldr/ntldr/winldr.c | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/boot/freeldr/freeldr/ntldr/winldr.c b/boot/freeldr/freeldr/ntldr/winldr.c index 66954e27d5e..2721ce4f0ed 100644 --- a/boot/freeldr/freeldr/ntldr/winldr.c +++ b/boot/freeldr/freeldr/ntldr/winldr.c @@ -324,13 +324,16 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, NtLdrOutputLoadMsg(FullPath, NULL); Success = PeLdrLoadImage(FullPath, LoaderBootDriver, &DriverBase); if (!Success) + { + ERR("PeLdrLoadImage('%s') failed\n", DllName); return FALSE; + } // Allocate a DTE for it Success = PeLdrAllocateDataTableEntry(LoadOrderListHead, DllName, DllName, DriverBase, DriverDTE); if (!Success) { - ERR("PeLdrAllocateDataTableEntry() failed\n"); + ERR("PeLdrAllocateDataTableEntry('%s') failed\n", DllName); return FALSE; } @@ -342,7 +345,7 @@ WinLdrLoadDeviceDriver(PLIST_ENTRY LoadOrderListHead, Success = PeLdrScanImportDescriptorTable(LoadOrderListHead, FullPath, *DriverDTE); if (!Success) { - ERR("PeLdrScanImportDescriptorTable() failed for %s\n", FullPath); + ERR("PeLdrScanImportDescriptorTable('%s') failed\n", FullPath); return FALSE; } @@ -504,7 +507,7 @@ LoadModule( Success = PeLdrLoadImage(FullFileName, MemoryType, &BaseAddress); if (!Success) { - TRACE("Loading %s failed\n", File); + ERR("PeLdrLoadImage('%s') failed\n", File); return FALSE; } TRACE("%s loaded successfully at %p\n", File, BaseAddress); @@ -519,6 +522,10 @@ LoadModule( FullFileName, BaseAddress, Dte); + if (!Success) + { + ERR("PeLdrAllocateDataTableEntry('%s') failed\n", FullFileName); + } return Success; } @@ -579,10 +586,18 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, TRACE("HAL file = '%s' ; Kernel file = '%s'\n", HalFileName, KernelFileName); /* Load the Kernel */ - LoadModule(LoaderBlock, DirPath, KernelFileName, "ntoskrnl.exe", LoaderSystemCode, KernelDTE, 30); + if (!LoadModule(LoaderBlock, DirPath, KernelFileName, "ntoskrnl.exe", LoaderSystemCode, KernelDTE, 30)) + { + ERR("LoadModule() failed for %s\n", KernelFileName); + return FALSE; + } /* Load the HAL */ - LoadModule(LoaderBlock, DirPath, HalFileName, "hal.dll", LoaderHalCode, &HalDTE, 45); + if (!LoadModule(LoaderBlock, DirPath, HalFileName, "hal.dll", LoaderHalCode, &HalDTE, 45)) + { + ERR("LoadModule() failed for %s\n", HalFileName); + return FALSE; + } /* Load the Kernel Debugger Transport DLL */ if (OperatingSystemVersion > _WIN32_WINNT_WIN2K) @@ -636,7 +651,11 @@ LoadWindowsCore(IN USHORT OperatingSystemVersion, * Load the transport DLL. Override the base DLL name of the * loaded transport DLL to the default "KDCOM.DLL" name. */ - LoadModule(LoaderBlock, DirPath, KdDllName, "kdcom.dll", LoaderSystemCode, &KdComDTE, 60); + if (!LoadModule(LoaderBlock, DirPath, KdDllName, "kdcom.dll", LoaderSystemCode, &KdComDTE, 60)) + { + /* The transport DLL being optional, just ignore the failure */ + WARN("LoadModule() failed for %s\n", KdDllName); + } } }

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs