Ros-diffs February 2022

ros-diffs@reactos.org

17 participants
108 discussions

[reactos] 05/07: [FREELDR:UI] Cleanup for the ProgressBar functions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d749b45e2a9bef3eae437… commit d749b45e2a9bef3eae437f960690e31b63ec0e49 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jan 7 22:48:51 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 6 17:52:43 2022 +0100 [FREELDR:UI] Cleanup for the ProgressBar functions. - Remove duplicated code from directui.c and use the one from TUI instead, with the latter properly #ifdef'ed for _M_ARM. - Fix their title color. - Add SAL annotations. --- boot/freeldr/freeldr/include/ui.h | 20 ++++++++++-- boot/freeldr/freeldr/include/ui/minitui.h | 20 ++++++++++-- boot/freeldr/freeldr/include/ui/noui.h | 21 ++++++++++-- boot/freeldr/freeldr/include/ui/tui.h | 21 ++++++++++-- boot/freeldr/freeldr/ui/directui.c | 54 ++++++++----------------------- boot/freeldr/freeldr/ui/minitui.c | 35 ++++++++++++++++---- boot/freeldr/freeldr/ui/noui.c | 16 +++++++-- boot/freeldr/freeldr/ui/tui.c | 27 +++++++++++++--- boot/freeldr/freeldr/ui/ui.c | 16 +++++++-- 9 files changed, 168 insertions(+), 62 deletions(-) diff --git a/boot/freeldr/freeldr/include/ui.h b/boot/freeldr/freeldr/include/ui.h index 8ee46293eed..4308b95c0f4 100644 --- a/boot/freeldr/freeldr/include/ui.h +++ b/boot/freeldr/freeldr/include/ui.h @@ -94,8 +94,24 @@ VOID UiUpdateDateTime(VOID); // Updates th VOID UiInfoBox(PCSTR MessageText); // Displays a info box on the screen 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 -VOID UiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled -VOID UiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled + +/* Draws the progress bar showing nPos percent filled */ +VOID +UiDrawProgressBarCenter( + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText); + +/* Draws the progress bar showing nPos percent filled */ +VOID +UiDrawProgressBar( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText); // Displays all the message boxes in a given section. VOID diff --git a/boot/freeldr/freeldr/include/ui/minitui.h b/boot/freeldr/freeldr/include/ui/minitui.h index 1a64c5569ba..eba12bc1ec6 100644 --- a/boot/freeldr/freeldr/include/ui/minitui.h +++ b/boot/freeldr/freeldr/include/ui/minitui.h @@ -16,8 +16,24 @@ VOID MiniTuiDrawBackdrop(VOID); VOID MiniTuiDrawStatusText(PCSTR StatusText); -VOID MiniTuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); -VOID MiniTuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); + +/* Draws the progress bar showing nPos percent filled */ +VOID +MiniTuiDrawProgressBarCenter( + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText); + +/* Draws the progress bar showing nPos percent filled */ +VOID +MiniTuiDrawProgressBar( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText); /////////////////////////////////////////////////////////////////////////////////////// // diff --git a/boot/freeldr/freeldr/include/ui/noui.h b/boot/freeldr/freeldr/include/ui/noui.h index 99b8bfa4ec5..1bd560ad25d 100644 --- a/boot/freeldr/freeldr/include/ui/noui.h +++ b/boot/freeldr/freeldr/include/ui/noui.h @@ -53,8 +53,25 @@ VOID NoUiDrawStatusText(PCSTR StatusText); VOID NoUiUpdateDateTime(VOID); VOID NoUiMessageBox(PCSTR MessageText); VOID NoUiMessageBoxCritical(PCSTR MessageText); -VOID NoUiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); -VOID NoUiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); + +/* Draws the progress bar showing nPos percent filled */ +VOID +NoUiDrawProgressBarCenter( + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText); + +/* Draws the progress bar showing nPos percent filled */ +VOID +NoUiDrawProgressBar( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText); + BOOLEAN NoUiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length); UCHAR NoUiTextToColor(PCSTR ColorText); UCHAR NoUiTextToFillStyle(PCSTR FillStyleText); diff --git a/boot/freeldr/freeldr/include/ui/tui.h b/boot/freeldr/freeldr/include/ui/tui.h index 729db425572..a486ef5cdec 100644 --- a/boot/freeldr/freeldr/include/ui/tui.h +++ b/boot/freeldr/freeldr/include/ui/tui.h @@ -75,8 +75,25 @@ VOID TuiSaveScreen(PUCHAR Buffer); // Saves the sc VOID TuiRestoreScreen(PUCHAR Buffer); // Restores the screen from a previous save 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 -VOID TuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled -VOID TuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled + +/* 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/ui/directui.c b/boot/freeldr/freeldr/ui/directui.c index 8a132842041..cd4b07dcf94 100644 --- a/boot/freeldr/freeldr/ui/directui.c +++ b/boot/freeldr/freeldr/ui/directui.c @@ -109,51 +109,25 @@ UiMessageBoxCritical(IN PCSTR MessageText) } VOID -UiDrawProgressBarCenter(IN ULONG Position, - IN ULONG Range, - IN PCHAR ProgressText) +UiDrawProgressBarCenter( + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText) { - ULONG Left, Top, Right, Bottom, Width, Height; - - /* Build the coordinates and sizes */ - Height = 2; - Width = UiScreenWidth; - Left = 0; - Right = (Left + Width) - 1; - Top = UiScreenHeight - Height - 4; - Bottom = Top + Height + 1; - - /* Draw the progress bar */ - UiDrawProgressBar(Left, Top, Right, Bottom, Position, Range, 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, - IN PCHAR ProgressText) +UiDrawProgressBar( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText) { - ULONG i, ProgressBarWidth; - - /* Calculate the width of the bar proper */ - ProgressBarWidth = (Right - Left) - 3; - - /* First make sure the progress bar text fits */ - UiTruncateStringEllipsis(ProgressText, ProgressBarWidth - 4); - if (Position > Range) Position = Range; - - /* Draw the "Loading..." text */ - UiDrawCenteredText(Left + 2, Top + 1, Right - 2, Top + 1, ProgressText, ATTR(7, 0)); - - /* Draw the percent complete */ - for (i = 0; i < (Position * ProgressBarWidth) / Range; i++) - { - /* Use the fill character */ - UiDrawText(Left + 2 + i, Top + 2, "\xDB", ATTR(UiTextColor, UiMenuBgColor)); - } + MiniTuiDrawProgressBar(Left, Top, Right, Bottom, Position, Range, ProgressText); } VOID diff --git a/boot/freeldr/freeldr/ui/minitui.c b/boot/freeldr/freeldr/ui/minitui.c index 8a164602cba..cc967f9b753 100644 --- a/boot/freeldr/freeldr/ui/minitui.c +++ b/boot/freeldr/freeldr/ui/minitui.c @@ -7,9 +7,10 @@ * Hervé Poussineau */ -#ifndef _M_ARM #include <freeldr.h> +#ifndef _M_ARM + VOID MiniTuiDrawBackdrop(VOID) { /* Fill in a black background */ @@ -24,7 +25,13 @@ VOID MiniTuiDrawStatusText(PCSTR StatusText) /* Minimal UI doesn't have a status bar */ } -VOID MiniTuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText) +#endif // _M_ARM + +VOID +MiniTuiDrawProgressBarCenter( + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText) { ULONG Left, Top, Right, Bottom, Width, Height; @@ -40,18 +47,30 @@ VOID MiniTuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressTex MiniTuiDrawProgressBar(Left, Top, Right, Bottom, Position, Range, ProgressText); } -VOID MiniTuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText) +VOID +MiniTuiDrawProgressBar( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText) { - ULONG i; - ULONG ProgressBarWidth = (Right - Left) - 3; + ULONG ProgressBarWidth, i; + + /* Calculate the width of the bar proper */ + ProgressBarWidth = (Right - Left) - 3; /* First make sure the progress bar text fits */ UiTruncateStringEllipsis(ProgressText, ProgressBarWidth - 4); + + /* Clip the position */ if (Position > Range) Position = Range; /* Draw the "Loading..." text */ - TuiDrawCenteredText(Left + 2, Top + 1, Right - 2, Top + 1, ProgressText, ATTR(COLOR_GRAY, COLOR_BLACK)); + TuiDrawCenteredText(Left + 2, Top + 1, Right - 2, Top + 1, ProgressText, ATTR(UiTextColor, UiMenuBgColor)); /* Draw the percent complete */ for (i = 0; i < (Position * ProgressBarWidth) / Range; i++) @@ -60,10 +79,14 @@ VOID MiniTuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UL TuiDrawText(Left + 2 + i, Top + 2, "\xDB", ATTR(UiTextColor, UiMenuBgColor)); } +#ifndef _M_ARM TuiUpdateDateTime(); VideoCopyOffScreenBufferToVRAM(); +#endif } +#ifndef _M_ARM + VOID MiniTuiDrawMenu(PUI_MENU_INFO MenuInfo) { diff --git a/boot/freeldr/freeldr/ui/noui.c b/boot/freeldr/freeldr/ui/noui.c index 1cbb42d40e9..e0e1b4b97e4 100644 --- a/boot/freeldr/freeldr/ui/noui.c +++ b/boot/freeldr/freeldr/ui/noui.c @@ -100,11 +100,23 @@ VOID NoUiMessageBoxCritical(PCSTR MessageText) MachConsGetCh(); } -VOID NoUiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText) +VOID +NoUiDrawProgressBarCenter( + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText) { } -VOID NoUiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText) +VOID +NoUiDrawProgressBar( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText) { } diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index 310c872172d..9da79931b94 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -683,29 +683,46 @@ VOID TuiMessageBoxCritical(PCSTR MessageText) } } -VOID TuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText) +VOID +TuiDrawProgressBarCenter( + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText) { ULONG Left, Top, Right, Bottom; ULONG Width = 50; // Allow for 50 "bars" ULONG Height = 2; + /* Build the coordinates and sizes */ Left = (UiScreenWidth - Width - 4) / 2; Right = Left + Width + 3; Top = (UiScreenHeight - Height - 2) / 2; Top += 2; Bottom = Top + Height + 1; + /* Draw the progress bar */ TuiDrawProgressBar(Left, Top, Right, Bottom, Position, Range, ProgressText); } -VOID TuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText) +VOID +TuiDrawProgressBar( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText) { - ULONG i; - ULONG ProgressBarWidth = (Right - Left) - 3; + ULONG ProgressBarWidth, i; + + /* Calculate the width of the bar proper */ + ProgressBarWidth = (Right - Left) - 3; /* First make sure the progress bar text fits */ UiTruncateStringEllipsis(ProgressText, ProgressBarWidth - 4); + /* Clip the position */ if (Position > Range) Position = Range; @@ -728,8 +745,10 @@ VOID TuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG TuiDrawText(Left + 2 + i, Top + 2, "\xB2", ATTR(UiTextColor, UiMenuBgColor)); } +#ifndef _M_ARM TuiUpdateDateTime(); VideoCopyOffScreenBufferToVRAM(); +#endif } UCHAR TuiTextToColor(PCSTR ColorText) diff --git a/boot/freeldr/freeldr/ui/ui.c b/boot/freeldr/freeldr/ui/ui.c index de1d959d05a..b2a08f27c9f 100644 --- a/boot/freeldr/freeldr/ui/ui.c +++ b/boot/freeldr/freeldr/ui/ui.c @@ -369,12 +369,24 @@ UCHAR UiTextToFillStyle(PCSTR FillStyleText) return UiVtbl.TextToFillStyle(FillStyleText); } -VOID UiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText) +VOID +UiDrawProgressBarCenter( + _In_ ULONG Position, + _In_ ULONG Range, + _Inout_z_ PSTR ProgressText) { UiVtbl.DrawProgressBarCenter(Position, Range, ProgressText); } -VOID UiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR 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) { UiVtbl.DrawProgressBar(Left, Top, Right, Bottom, Position, Range, ProgressText); }

2 years, 10 months

[reactos] 04/07: [FREELDR:UI] Couple of fixes for some TUI Draw*Text functions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a9994eab45eae66ab4d16… commit a9994eab45eae66ab4d16dbf4532b1056d40f304 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jan 6 02:03:09 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 6 17:52:42 2022 +0100 [FREELDR:UI] Couple of fixes for some TUI Draw*Text functions. - TuiDrawCenteredText: Partly fix centering calculations (susceptible to give negative coordinates). - TuiDrawText2: Don't display anything if X or Y are out of the screen. --- boot/freeldr/freeldr/ui/tui.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index b985989e699..310c872172d 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -88,6 +88,10 @@ TuiDrawText2( #endif ULONG i, j; + /* Don't display anything if we are out of the screen */ + if ((X >= UiScreenWidth) || (Y >= UiScreenHeight)) + return; + /* Draw the text, not exceeding the width */ for (i = X, j = 0; Text[j] && i < UiScreenWidth && (MaxNumChars > 0 ? j < MaxNumChars : TRUE); i++, j++) { @@ -148,9 +152,13 @@ TuiDrawCenteredText( /* Base the box height on the number of lines */ BoxHeight = LineBreakCount + 1; - /* Create the centered coordinates */ - RealLeft = (((Right - Left) - BoxWidth) / 2) + Left; - RealTop = (((Bottom - Top) - BoxHeight) / 2) + Top; + /* + * Create the centered coordinates. + * Here, the Left/Top/Right/Bottom rectangle is a hint, around + * which we center the "real" text rectangle RealLeft/RealTop. + */ + RealLeft = (Left + Right - BoxWidth + 1) / 2; + RealTop = (Top + Bottom - BoxHeight + 1) / 2; /* Now go for a second scan */ LastIndex = 0;

2 years, 10 months

[reactos] 03/07: [FREELDR:UI] Cleanup for the DrawText* functions.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f6a2438c1fa92714b94bf… commit f6a2438c1fa92714b94bfa394fce70526a663417 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Fri Jan 7 22:47:58 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 6 17:52:40 2022 +0100 [FREELDR:UI] Cleanup for the DrawText* functions. - Remove duplicated code from directui.c and use the one from TUI instead, with the latter properly #ifdef'ed for _M_ARM. - Provide the minimal implementations for NoUiDrawText*(). - TuiDrawText() is just a particular case of TuiDrawText2(). - Isolate the TuiPrintf() and TuiDraw*Text*() functions as separate "Generic TUI utils". - Fix "TAG_TAG" typo in TAG_TAG_TUI_PALETTE. - Add SAL annotations. --- boot/freeldr/freeldr/include/ui.h | 31 +++- boot/freeldr/freeldr/include/ui/noui.h | 31 +++- boot/freeldr/freeldr/include/ui/tui.h | 40 ++++- boot/freeldr/freeldr/ui/directui.c | 142 +++--------------- boot/freeldr/freeldr/ui/noui.c | 33 ++++- boot/freeldr/freeldr/ui/tui.c | 263 +++++++++++++++++++-------------- boot/freeldr/freeldr/ui/ui.c | 24 ++- 7 files changed, 317 insertions(+), 247 deletions(-) diff --git a/boot/freeldr/freeldr/include/ui.h b/boot/freeldr/freeldr/include/ui.h index a42622f7d13..8ee46293eed 100644 --- a/boot/freeldr/freeldr/include/ui.h +++ b/boot/freeldr/freeldr/include/ui.h @@ -61,9 +61,34 @@ VOID UiDrawBackdrop(VOID); // Fills the en VOID UiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */); // Fills the area specified with FillChar and Attr VOID UiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom); // Draws a shadow on the bottom and right sides of the area specified VOID UiDrawBox(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 -VOID UiDrawText(ULONG X, ULONG Y, PCSTR Text, UCHAR Attr); // Draws text at coordinates specified -VOID UiDrawText2(ULONG X, ULONG Y, ULONG MaxNumChars, PCSTR Text, UCHAR Attr); // Draws text at coordinates specified -VOID UiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCSTR TextString, UCHAR Attr); // Draws centered text at the coordinates specified and clips the edges + +/* Draws text at coordinates specified */ +VOID +UiDrawText( + _In_ ULONG X, + _In_ ULONG Y, + _In_ PCSTR Text, + _In_ UCHAR Attr); + +/* Draws text at coordinates specified */ +VOID +UiDrawText2( + _In_ ULONG X, + _In_ ULONG Y, + _In_opt_ ULONG MaxNumChars, + _In_reads_or_z_(MaxNumChars) PCSTR Text, + _In_ UCHAR Attr); + +/* Draws centered text at the coordinates specified and clips the edges */ +VOID +UiDrawCenteredText( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ PCSTR TextString, + _In_ UCHAR Attr); + VOID UiDrawStatusText(PCSTR StatusText); // Draws text at the very bottom line on the screen VOID UiUpdateDateTime(VOID); // Updates the date and time VOID UiInfoBox(PCSTR MessageText); // Displays a info box on the screen diff --git a/boot/freeldr/freeldr/include/ui/noui.h b/boot/freeldr/freeldr/include/ui/noui.h index 5772c3e3a5d..99b8bfa4ec5 100644 --- a/boot/freeldr/freeldr/include/ui/noui.h +++ b/boot/freeldr/freeldr/include/ui/noui.h @@ -21,9 +21,34 @@ VOID NoUiDrawBackdrop(VOID); VOID NoUiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr); VOID NoUiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom); VOID NoUiDrawBox(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertStyle, UCHAR HorzStyle, BOOLEAN Fill, BOOLEAN Shadow, UCHAR Attr); -VOID NoUiDrawText(ULONG X, ULONG Y, PCSTR Text, UCHAR Attr); -VOID NoUiDrawText2(ULONG X, ULONG Y, ULONG MaxNumChars, PCSTR Text, UCHAR Attr); -VOID NoUiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCSTR TextString, UCHAR Attr); + +/* Draws text at coordinates specified */ +VOID +NoUiDrawText( + _In_ ULONG X, + _In_ ULONG Y, + _In_ PCSTR Text, + _In_ UCHAR Attr); + +/* Draws text at coordinates specified */ +VOID +NoUiDrawText2( + _In_ ULONG X, + _In_ ULONG Y, + _In_opt_ ULONG MaxNumChars, + _In_reads_or_z_(MaxNumChars) PCSTR Text, + _In_ UCHAR Attr); + +/* Draws centered text at the coordinates specified and clips the edges */ +VOID +NoUiDrawCenteredText( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ PCSTR TextString, + _In_ UCHAR Attr); + VOID NoUiDrawStatusText(PCSTR StatusText); VOID NoUiUpdateDateTime(VOID); VOID NoUiMessageBox(PCSTR MessageText); diff --git a/boot/freeldr/freeldr/include/ui/tui.h b/boot/freeldr/freeldr/include/ui/tui.h index ccad1e19ca3..729db425572 100644 --- a/boot/freeldr/freeldr/include/ui/tui.h +++ b/boot/freeldr/freeldr/include/ui/tui.h @@ -19,6 +19,13 @@ #pragma once +/* GENERIC TUI UTILS *********************************************************/ + +INT +TuiPrintf( + _In_ PCSTR Format, ...); + + #define TUI_TITLE_BOX_CHAR_HEIGHT 5 /////////////////////////////////////////////////////////////////////////////////////// @@ -26,6 +33,7 @@ // Textual User Interface Functions // /////////////////////////////////////////////////////////////////////////////////////// + BOOLEAN TuiInitialize(VOID); // Initialize User-Interface VOID TuiUnInitialize(VOID); // Un-initialize User-Interface @@ -33,9 +41,34 @@ VOID TuiDrawBackdrop(VOID); // Fills the e 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 -VOID TuiDrawText(ULONG X, ULONG Y, PCSTR Text, UCHAR Attr); // Draws text at coordinates specified -VOID TuiDrawText2(ULONG X, ULONG Y, ULONG MaxNumChars, PCSTR Text, UCHAR Attr); // Draws text at coordinates specified -VOID TuiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCSTR TextString, UCHAR Attr); // Draws centered text at the coordinates specified and clips the edges + +/* Draws text at coordinates specified */ +VOID +TuiDrawText( + _In_ ULONG X, + _In_ ULONG Y, + _In_ PCSTR Text, + _In_ UCHAR Attr); + +/* Draws text at coordinates specified */ +VOID +TuiDrawText2( + _In_ ULONG X, + _In_ ULONG Y, + _In_opt_ ULONG MaxNumChars, + _In_reads_or_z_(MaxNumChars) PCSTR Text, + _In_ UCHAR Attr); + +/* Draws centered text at the coordinates specified and clips the edges */ +VOID +TuiDrawCenteredText( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ PCSTR TextString, + _In_ UCHAR Attr); + VOID TuiDrawStatusText(PCSTR StatusText); // Draws text at the very bottom line on the screen VOID TuiUpdateDateTime(VOID); // Updates the date and time VOID TuiSaveScreen(PUCHAR Buffer); // Saves the screen so that it can be restored later @@ -45,7 +78,6 @@ VOID TuiMessageBoxCritical(PCSTR MessageText); // Displays a m VOID TuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled VOID TuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText); // Draws the progress bar showing nPos percent filled BOOLEAN TuiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length); -int TuiPrintf(const char *format, ... ); 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/ui/directui.c b/boot/freeldr/freeldr/ui/directui.c index 6771bd498f9..8a132842041 100644 --- a/boot/freeldr/freeldr/ui/directui.c +++ b/boot/freeldr/freeldr/ui/directui.c @@ -5,16 +5,13 @@ * PURPOSE: FreeLDR UI Routines * PROGRAMMERS: ReactOS Portable Systems Group */ -#ifdef _M_ARM -/* INCLUDES *******************************************************************/ +#ifdef _M_ARM #include <freeldr.h> /* GLOBALS ********************************************************************/ -/* FUNCTIONS ******************************************************************/ - ULONG UiScreenWidth; ULONG UiScreenHeight; UCHAR UiMenuFgColor = COLOR_GRAY; @@ -24,28 +21,7 @@ UCHAR UiSelectedTextColor = COLOR_BLACK; UCHAR UiSelectedTextBgColor = COLOR_GRAY; CHAR UiTimeText[260] = "Seconds until highlighted choice will be started automatically: "; -INT -TuiPrintf(const char *Format, - ...) -{ - int i; - int Length; - va_list ap; - CHAR Buffer[512]; - - va_start(ap, Format); - Length = _vsnprintf(Buffer, sizeof(Buffer), Format, ap); - va_end(ap); - - if (Length == -1) Length = sizeof(Buffer); - - for (i = 0; i < Length; i++) - { - MachConsPutChar(Buffer[i]); - } - - return Length; -} +/* FUNCTIONS ******************************************************************/ BOOLEAN UiInitialize(IN BOOLEAN ShowUi) @@ -76,106 +52,36 @@ UiDrawBackdrop(VOID) } VOID -UiDrawText(IN ULONG X, - IN ULONG Y, - IN PCSTR Text, - IN UCHAR Attr) +UiDrawText( + _In_ ULONG X, + _In_ ULONG Y, + _In_ PCSTR Text, + _In_ UCHAR Attr) { - ULONG i, j; - - /* Draw the text character by character, but don't exceed the width */ - for (i = X, j = 0; Text[j] && i < UiScreenWidth; i++, j++) - { - /* Write the character */ - MachVideoPutChar(Text[j], Attr, i, Y); - } + TuiDrawText2(X, Y, 0 /*(ULONG)strlen(Text)*/, Text, Attr); } VOID -UiDrawText2(IN ULONG X, - IN ULONG Y, - IN ULONG MaxNumChars, - IN PCSTR Text, - IN UCHAR Attr) +UiDrawText2( + _In_ ULONG X, + _In_ ULONG Y, + _In_opt_ ULONG MaxNumChars, + _In_reads_or_z_(MaxNumChars) PCSTR Text, + _In_ UCHAR Attr) { - ULONG i, j; - - /* Draw the text character by character, but don't exceed the width */ - for (i = X, j = 0; Text[j] && i < UiScreenWidth && (MaxNumChars > 0 ? j < MaxNumChars : TRUE); i++, j++) - { - /* Write the character */ - MachVideoPutChar(Text[j], Attr, i, Y); - } + TuiDrawText2(X, Y, MaxNumChars, Text, Attr); } VOID -UiDrawCenteredText(IN ULONG Left, - IN ULONG Top, - IN ULONG Right, - IN ULONG Bottom, - IN PCSTR TextString, - IN UCHAR Attr) +UiDrawCenteredText( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ PCSTR TextString, + _In_ UCHAR Attr) { - ULONG TextLength, BoxWidth, BoxHeight, LineBreakCount, Index, LastIndex; - ULONG RealLeft, RealTop, X, Y; - CHAR Temp[2]; - - /* Query text length */ - TextLength = strlen(TextString); - - /* Count the new lines and the box width */ - LineBreakCount = 0; - BoxWidth = 0; - LastIndex = 0; - for (Index=0; Index < TextLength; Index++) - { - /* Scan for new lines */ - if (TextString[Index] == '\n') - { - /* Remember the new line */ - LastIndex = Index; - LineBreakCount++; - } - else - { - /* Check for new larger box width */ - if ((Index - LastIndex) > BoxWidth) - { - /* Update it */ - BoxWidth = (Index - LastIndex); - } - } - } - - /* Base the box height on the number of lines */ - BoxHeight = LineBreakCount + 1; - - /* Create the centered coordinates */ - RealLeft = (((Right - Left) - BoxWidth) / 2) + Left; - RealTop = (((Bottom - Top) - BoxHeight) / 2) + Top; - - /* Now go for a second scan */ - LastIndex = 0; - for (Index=0; Index < TextLength; Index++) - { - /* Look for new lines again */ - if (TextString[Index] == '\n') - { - /* Update where the text should start */ - RealTop++; - LastIndex = 0; - } - else - { - /* We've got a line of text to print, do it */ - X = RealLeft + LastIndex; - Y = RealTop; - LastIndex++; - Temp[0] = TextString[Index]; - Temp[1] = 0; - UiDrawText(X, Y, Temp, Attr); - } - } + TuiDrawCenteredText(Left, Top, Right, Bottom, TextString, Attr); } VOID @@ -659,4 +565,4 @@ UiDisplayMenu( return TRUE; } -#endif +#endif // _M_ARM diff --git a/boot/freeldr/freeldr/ui/noui.c b/boot/freeldr/freeldr/ui/noui.c index da5d482f750..1cbb42d40e9 100644 --- a/boot/freeldr/freeldr/ui/noui.c +++ b/boot/freeldr/freeldr/ui/noui.c @@ -5,6 +5,7 @@ * PURPOSE: No Text UI interface * PROGRAMMERS: Hervé Poussineau */ + #ifndef _M_ARM #include <freeldr.h> @@ -33,16 +34,39 @@ VOID NoUiDrawBox(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertSty { } -VOID NoUiDrawText(ULONG X, ULONG Y, PCSTR Text, UCHAR Attr) +VOID +NoUiDrawText( + _In_ ULONG X, + _In_ ULONG Y, + _In_ PCSTR Text, + _In_ UCHAR Attr) { + printf("%s\n", Text); } -VOID NoUiDrawText2(ULONG X, ULONG Y, ULONG MaxNumChars, PCSTR Text, UCHAR Attr) +VOID +NoUiDrawText2( + _In_ ULONG X, + _In_ ULONG Y, + _In_opt_ ULONG MaxNumChars, + _In_reads_or_z_(MaxNumChars) PCSTR Text, + _In_ UCHAR Attr) { + if (MaxNumChars == 0) + MaxNumChars = (ULONG)strlen(Text); + printf("%*s\n", MaxNumChars, Text); } -VOID NoUiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCSTR TextString, UCHAR Attr) +VOID +NoUiDrawCenteredText( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ PCSTR TextString, + _In_ UCHAR Attr) { + printf("%s\n", TextString); } VOID NoUiDrawStatusText(PCSTR StatusText) @@ -134,4 +158,5 @@ NoUiDisplayMenu( VOID NoUiDrawMenu(PUI_MENU_INFO MenuInfo) { } -#endif + +#endif // _M_ARM diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index f7a8e76a11f..b985989e699 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -16,23 +16,25 @@ * 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> -#define TAG_TUI_SCREENBUFFER 'SiuT' -#define TAG_TAG_TUI_PALETTE 'PiuT' +#include <freeldr.h> +#ifndef _M_ARM PVOID TextVideoBuffer = NULL; -extern UCHAR MachDefaultTextColor; +#endif + +/* GENERIC TUI UTILS *********************************************************/ /* * TuiPrintf() - * Prints formatted text to the screen + * Prints formatted text to the screen. */ -int TuiPrintf(const char *Format, ...) +INT +TuiPrintf( + _In_ PCSTR Format, ...) { - int i; - int Length; + INT i; + INT Length; va_list ap; CHAR Buffer[512]; @@ -40,7 +42,8 @@ int TuiPrintf(const char *Format, ...) Length = _vsnprintf(Buffer, sizeof(Buffer), Format, ap); va_end(ap); - if (Length == -1) Length = sizeof(Buffer); + if (Length == -1) + Length = (INT)sizeof(Buffer); for (i = 0; i < Length; i++) { @@ -50,6 +53,138 @@ int TuiPrintf(const char *Format, ...) return Length; } +/* + * DrawText() + * Displays a string on a single screen line. + * This function assumes coordinates are zero-based. + */ +VOID +TuiDrawText( + _In_ ULONG X, + _In_ ULONG Y, + _In_ PCSTR Text, + _In_ UCHAR Attr) +{ + TuiDrawText2(X, Y, 0 /*(ULONG)strlen(Text)*/, Text, Attr); +} + +/* + * DrawText2() + * Displays a string on a single screen line. + * This function assumes coordinates are zero-based. + * MaxNumChars is the maximum number of characters to display. + * If MaxNumChars == 0, then display the whole string. + */ +VOID +TuiDrawText2( + _In_ ULONG X, + _In_ ULONG Y, + _In_opt_ ULONG MaxNumChars, + _In_reads_or_z_(MaxNumChars) PCSTR Text, + _In_ UCHAR Attr) +{ +#ifndef _M_ARM + PUCHAR ScreenMemory = (PUCHAR)TextVideoBuffer; +#endif + ULONG i, j; + + /* Draw the text, not exceeding the width */ + for (i = X, j = 0; Text[j] && i < UiScreenWidth && (MaxNumChars > 0 ? j < MaxNumChars : TRUE); i++, j++) + { +#ifndef _M_ARM + ScreenMemory[((Y*2)*UiScreenWidth)+(i*2)] = (UCHAR)Text[j]; + ScreenMemory[((Y*2)*UiScreenWidth)+(i*2)+1] = Attr; +#else + /* Write the character */ + MachVideoPutChar(Text[j], Attr, i, Y); +#endif + } +} + +VOID +TuiDrawCenteredText( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ PCSTR TextString, + _In_ UCHAR Attr) +{ + SIZE_T TextLength; + SIZE_T Index, LastIndex; + ULONG LineBreakCount; + ULONG BoxWidth, BoxHeight; + ULONG RealLeft, RealTop; + ULONG X, Y; + CHAR Temp[2]; + + /* Query text length */ + TextLength = strlen(TextString); + + /* Count the new lines and the box width */ + LineBreakCount = 0; + BoxWidth = 0; + LastIndex = 0; + for (Index = 0; Index < TextLength; Index++) + { + /* Scan for new lines */ + if (TextString[Index] == '\n') + { + /* Remember the new line */ + LastIndex = Index; + LineBreakCount++; + } + else + { + /* Check for new larger box width */ + if ((Index - LastIndex) > BoxWidth) + { + /* Update it */ + BoxWidth = (ULONG)(Index - LastIndex); + } + } + } + + /* Base the box height on the number of lines */ + BoxHeight = LineBreakCount + 1; + + /* Create the centered coordinates */ + RealLeft = (((Right - Left) - BoxWidth) / 2) + Left; + RealTop = (((Bottom - Top) - BoxHeight) / 2) + Top; + + /* Now go for a second scan */ + LastIndex = 0; + for (Index = 0; Index < TextLength; Index++) + { + /* Look for new lines again */ + if (TextString[Index] == '\n') + { + /* Update where the text should start */ + RealTop++; + LastIndex = 0; + } + else + { + /* We've got a line of text to print, do it */ + X = (ULONG)(RealLeft + LastIndex); + Y = RealTop; + LastIndex++; + Temp[0] = TextString[Index]; + Temp[1] = 0; + TuiDrawText(X, Y, Temp, Attr); + } + } +} + +/* FULL TUI THEME ************************************************************/ + +#ifndef _M_ARM + +#define TAG_TUI_SCREENBUFFER 'SiuT' +#define TAG_TUI_PALETTE 'PiuT' + +extern UCHAR MachDefaultTextColor; + BOOLEAN TuiInitialize(VOID) { MachVideoHideShowTextCursor(FALSE); @@ -305,103 +440,6 @@ VOID TuiDrawBox(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertStyl } } -/* - * DrawText() - * This function assumes coordinates are zero-based - */ -VOID TuiDrawText(ULONG X, ULONG Y, PCSTR Text, UCHAR Attr) -{ - PUCHAR ScreenMemory = (PUCHAR)TextVideoBuffer; - ULONG i, j; - - // Draw the text - for (i = X, j = 0; Text[j] && i < UiScreenWidth; i++, j++) - { - ScreenMemory[((Y*2)*UiScreenWidth)+(i*2)] = (UCHAR)Text[j]; - ScreenMemory[((Y*2)*UiScreenWidth)+(i*2)+1] = Attr; - } -} - -/* - * DrawText2() - * This function assumes coordinates are zero-based. - * MaxNumChars is the maximum number of characters to display. - * If MaxNumChars == 0, then display the whole string. - */ -VOID TuiDrawText2(ULONG X, ULONG Y, ULONG MaxNumChars, PCSTR Text, UCHAR Attr) -{ - PUCHAR ScreenMemory = (PUCHAR)TextVideoBuffer; - ULONG i, j; - - // Draw the text - for (i = X, j = 0; Text[j] && i < UiScreenWidth && (MaxNumChars > 0 ? j < MaxNumChars : TRUE); i++, j++) - { - ScreenMemory[((Y*2)*UiScreenWidth)+(i*2)] = (UCHAR)Text[j]; - ScreenMemory[((Y*2)*UiScreenWidth)+(i*2)+1] = Attr; - } -} - -VOID TuiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCSTR TextString, UCHAR Attr) -{ - SIZE_T TextLength; - ULONG BoxWidth; - ULONG BoxHeight; - ULONG LineBreakCount; - SIZE_T Index; - SIZE_T LastIndex; - ULONG RealLeft; - ULONG RealTop; - ULONG X; - ULONG Y; - CHAR Temp[2]; - - TextLength = strlen(TextString); - - // Count the new lines and the box width - LineBreakCount = 0; - BoxWidth = 0; - LastIndex = 0; - for (Index=0; Index<TextLength; Index++) - { - if (TextString[Index] == '\n') - { - LastIndex = Index; - LineBreakCount++; - } - else - { - if ((Index - LastIndex) > BoxWidth) - { - BoxWidth = (ULONG)(Index - LastIndex); - } - } - } - - BoxHeight = LineBreakCount + 1; - - RealLeft = (((Right - Left) - BoxWidth) / 2) + Left; - RealTop = (((Bottom - Top) - BoxHeight) / 2) + Top; - - LastIndex = 0; - for (Index=0; Index<TextLength; Index++) - { - if (TextString[Index] == '\n') - { - RealTop++; - LastIndex = 0; - } - else - { - X = (ULONG)(RealLeft + LastIndex); - Y = RealTop; - LastIndex++; - Temp[0] = TextString[Index]; - Temp[1] = 0; - TuiDrawText(X, Y, Temp, Attr); - } - } -} - VOID TuiDrawStatusText(PCSTR StatusText) { SIZE_T i; @@ -755,7 +793,7 @@ VOID TuiFadeInBackdrop(VOID) if (UiUseSpecialEffects && ! MachVideoIsPaletteFixed()) { TuiFadePalette = (PPALETTE_ENTRY)FrLdrTempAlloc(sizeof(PALETTE_ENTRY) * 64, - TAG_TAG_TUI_PALETTE); + TAG_TUI_PALETTE); if (TuiFadePalette != NULL) { @@ -770,7 +808,7 @@ VOID TuiFadeInBackdrop(VOID) if (UiUseSpecialEffects && ! MachVideoIsPaletteFixed() && TuiFadePalette != NULL) { VideoFadeIn(TuiFadePalette, 64); - FrLdrTempFree(TuiFadePalette, TAG_TAG_TUI_PALETTE); + FrLdrTempFree(TuiFadePalette, TAG_TUI_PALETTE); } } @@ -781,7 +819,7 @@ VOID TuiFadeOut(VOID) if (UiUseSpecialEffects && ! MachVideoIsPaletteFixed()) { TuiFadePalette = (PPALETTE_ENTRY)FrLdrTempAlloc(sizeof(PALETTE_ENTRY) * 64, - TAG_TAG_TUI_PALETTE); + TAG_TUI_PALETTE); if (TuiFadePalette != NULL) { @@ -799,7 +837,7 @@ VOID TuiFadeOut(VOID) if (UiUseSpecialEffects && ! MachVideoIsPaletteFixed() && TuiFadePalette != NULL) { VideoRestorePaletteState(TuiFadePalette, 64); - FrLdrTempFree(TuiFadePalette, TAG_TAG_TUI_PALETTE); + FrLdrTempFree(TuiFadePalette, TAG_TUI_PALETTE); } } @@ -1062,4 +1100,5 @@ const UIVTBL TuiVtbl = TuiDisplayMenu, TuiDrawMenu, }; -#endif + +#endif // _M_ARM diff --git a/boot/freeldr/freeldr/ui/ui.c b/boot/freeldr/freeldr/ui/ui.c index 481f0983e54..de1d959d05a 100644 --- a/boot/freeldr/freeldr/ui/ui.c +++ b/boot/freeldr/freeldr/ui/ui.c @@ -239,17 +239,35 @@ VOID UiDrawBox(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, UCHAR VertStyle UiVtbl.DrawBox(Left, Top, Right, Bottom, VertStyle, HorzStyle, Fill, Shadow, Attr); } -VOID UiDrawText(ULONG X, ULONG Y, PCSTR Text, UCHAR Attr) +VOID +UiDrawText( + _In_ ULONG X, + _In_ ULONG Y, + _In_ PCSTR Text, + _In_ UCHAR Attr) { UiVtbl.DrawText(X, Y, Text, Attr); } -VOID UiDrawText2(ULONG X, ULONG Y, ULONG MaxNumChars, PCSTR Text, UCHAR Attr) +VOID +UiDrawText2( + _In_ ULONG X, + _In_ ULONG Y, + _In_opt_ ULONG MaxNumChars, + _In_reads_or_z_(MaxNumChars) PCSTR Text, + _In_ UCHAR Attr) { UiVtbl.DrawText2(X, Y, MaxNumChars, Text, Attr); } -VOID UiDrawCenteredText(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, PCSTR TextString, UCHAR Attr) +VOID +UiDrawCenteredText( + _In_ ULONG Left, + _In_ ULONG Top, + _In_ ULONG Right, + _In_ ULONG Bottom, + _In_ PCSTR TextString, + _In_ UCHAR Attr) { UiVtbl.DrawCenteredText(Left, Top, Right, Bottom, TextString, Attr); }

2 years, 10 months

[reactos] 02/07: [FREELDR:UI] Disable GUI code from compilation as it is currently stubbed.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=06fc2e72a6d0bb20ec183… commit 06fc2e72a6d0bb20ec183211bd3efb4f0e1d782c Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Wed Jan 5 04:15:41 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 6 17:52:39 2022 +0100 [FREELDR:UI] Disable GUI code from compilation as it is currently stubbed. Rename "ShowGui" -> "ShowUi" as this variable was actually unrelated to *graphical* aspects of the UI. --- boot/freeldr/freeldr/CMakeLists.txt | 2 +- boot/freeldr/freeldr/include/freeldr.h | 8 ++------ boot/freeldr/freeldr/include/ui.h | 11 ++++++++++- boot/freeldr/freeldr/ui/directui.c | 4 ++-- boot/freeldr/freeldr/ui/ui.c | 18 +++++++++++++----- 5 files changed, 28 insertions(+), 15 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 1746b7b8028..0827186d090 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -73,7 +73,7 @@ list(APPEND FREELDR_BOOTMGR_SOURCE options.c oslist.c ui/directui.c - ui/gui.c + # ui/gui.c ui/minitui.c ui/noui.c ui/tui.c diff --git a/boot/freeldr/freeldr/include/freeldr.h b/boot/freeldr/freeldr/include/freeldr.h index ac2a5e8b13f..91b196f5600 100644 --- a/boot/freeldr/freeldr/include/freeldr.h +++ b/boot/freeldr/freeldr/include/freeldr.h @@ -32,7 +32,6 @@ /* Public headers */ #ifdef __REACTOS__ #define NTOSAPI -#define printf TuiPrintf #include <ntddk.h> #include <ntifs.h> #include <ioaccess.h> @@ -76,7 +75,6 @@ #include <options.h> #include <oslist.h> #include <ramdisk.h> -#include <ui.h> #include <ver.h> /* NTOS loader */ @@ -93,10 +91,8 @@ #include <fs/btrfs.h> /* UI support */ -#include <ui/gui.h> -#include <ui/minitui.h> -#include <ui/noui.h> -#include <ui/tui.h> +#define printf TuiPrintf +#include <ui.h> #include <ui/video.h> /* Arch specific includes */ diff --git a/boot/freeldr/freeldr/include/ui.h b/boot/freeldr/freeldr/include/ui.h index cb8ca437c77..a42622f7d13 100644 --- a/boot/freeldr/freeldr/include/ui.h +++ b/boot/freeldr/freeldr/include/ui.h @@ -54,7 +54,8 @@ extern const CHAR UiMonthNames[12][15]; // User Interface Functions // /////////////////////////////////////////////////////////////////////////////////////// -BOOLEAN UiInitialize(BOOLEAN ShowGui); // Initialize User-Interface + +BOOLEAN UiInitialize(BOOLEAN ShowUi); // Initialize User-Interface VOID UiUnInitialize(PCSTR BootText); // Un-initialize User-Interface VOID UiDrawBackdrop(VOID); // Fills the entire screen with a backdrop VOID UiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */); // Fills the area specified with FillChar and Attr @@ -229,3 +230,11 @@ extern UIVTBL UiVtbl; #define D_HORZ 0xCD // Double horizontal line #define VERT 0xB3 // Single vertical line #define D_VERT 0xBA // Double vertical line + + +/* THEME HEADERS *************************************************************/ + +// #include <ui/gui.h> +#include <ui/minitui.h> +#include <ui/noui.h> +#include <ui/tui.h> diff --git a/boot/freeldr/freeldr/ui/directui.c b/boot/freeldr/freeldr/ui/directui.c index eccb2fbff66..6771bd498f9 100644 --- a/boot/freeldr/freeldr/ui/directui.c +++ b/boot/freeldr/freeldr/ui/directui.c @@ -48,12 +48,12 @@ TuiPrintf(const char *Format, } BOOLEAN -UiInitialize(IN BOOLEAN ShowGui) +UiInitialize(IN BOOLEAN ShowUi) { ULONG Depth; /* Nothing to do */ - if (!ShowGui) return TRUE; + if (!ShowUi) return TRUE; /* Set mode and query size */ MachVideoSetDisplayMode(NULL, TRUE); diff --git a/boot/freeldr/freeldr/ui/ui.c b/boot/freeldr/freeldr/ui/ui.c index fa06f73ae85..481f0983e54 100644 --- a/boot/freeldr/freeldr/ui/ui.c +++ b/boot/freeldr/freeldr/ui/ui.c @@ -81,7 +81,7 @@ UIVTBL UiVtbl = NoUiDrawMenu, }; -BOOLEAN UiInitialize(BOOLEAN ShowGui) +BOOLEAN UiInitialize(BOOLEAN ShowUi) { VIDEODISPLAYMODE UiDisplayMode; // Tells us if we are in text or graphics mode BOOLEAN UiMinimal = FALSE; // Tells us if we are using a minimal console-like UI @@ -89,7 +89,7 @@ BOOLEAN UiInitialize(BOOLEAN ShowGui) ULONG Depth; CHAR SettingText[260]; - if (!ShowGui) + if (!ShowUi) { if (!UiVtbl.Initialize()) { @@ -121,10 +121,18 @@ BOOLEAN UiInitialize(BOOLEAN ShowGui) UiMinimal = (_stricmp(SettingText, "Yes") == 0 && strlen(SettingText) == 3); } - if (UiDisplayMode == VideoTextMode) - UiVtbl = (UiMinimal ? MiniTuiVtbl : TuiVtbl); - else + if (UiDisplayMode == VideoGraphicsMode) +#if 0 // We don't support a GUI mode yet. UiVtbl = GuiVtbl; +#else + { + // Switch back to text mode. + MachVideoSetDisplayMode(NULL, TRUE); + UiDisplayMode = VideoTextMode; + } +#endif + else // if (UiDisplayMode == VideoTextMode) + UiVtbl = (UiMinimal ? MiniTuiVtbl : TuiVtbl); if (!UiVtbl.Initialize()) {

2 years, 10 months

[reactos] 01/07: [FREELDR:UI] Code formatting only.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=844c9dce6cbba91eedba4… commit 844c9dce6cbba91eedba483d55cd42541261bbfc Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Tue Jan 4 00:24:42 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Sun Feb 6 17:52:38 2022 +0100 [FREELDR:UI] Code formatting only. --- boot/freeldr/freeldr/include/ui.h | 110 +++++----- boot/freeldr/freeldr/include/ui/minitui.h | 2 +- boot/freeldr/freeldr/include/ui/noui.h | 2 +- boot/freeldr/freeldr/include/ui/tui.h | 36 ++-- boot/freeldr/freeldr/ui/minitui.c | 66 ++---- boot/freeldr/freeldr/ui/noui.c | 2 +- boot/freeldr/freeldr/ui/tui.c | 70 +++---- boot/freeldr/freeldr/ui/tuimenu.c | 326 +++++++++--------------------- 8 files changed, 227 insertions(+), 387 deletions(-) diff --git a/boot/freeldr/freeldr/include/ui.h b/boot/freeldr/freeldr/include/ui.h index f5abbe69906..cb8ca437c77 100644 --- a/boot/freeldr/freeldr/include/ui.h +++ b/boot/freeldr/freeldr/include/ui.h @@ -19,35 +19,35 @@ #pragma once -extern ULONG UiScreenWidth; // Screen Width -extern ULONG UiScreenHeight; // Screen Height - -extern UCHAR UiStatusBarFgColor; // Status bar foreground color -extern UCHAR UiStatusBarBgColor; // Status bar background color -extern UCHAR UiBackdropFgColor; // Backdrop foreground color -extern UCHAR UiBackdropBgColor; // Backdrop background color -extern UCHAR UiBackdropFillStyle; // Backdrop fill style -extern UCHAR UiTitleBoxFgColor; // Title box foreground color -extern UCHAR UiTitleBoxBgColor; // Title box background color -extern UCHAR UiMessageBoxFgColor; // Message box foreground color -extern UCHAR UiMessageBoxBgColor; // Message box background color -extern UCHAR UiMenuFgColor; // Menu foreground color -extern UCHAR UiMenuBgColor; // Menu background color -extern UCHAR UiTextColor; // Normal text color -extern UCHAR UiSelectedTextColor; // Selected text color -extern UCHAR UiSelectedTextBgColor; // Selected text background color -extern UCHAR UiEditBoxTextColor; // Edit box text color -extern UCHAR UiEditBoxBgColor; // Edit box text background color - -extern CHAR UiTitleBoxTitleText[260]; // Title box's title text - -extern BOOLEAN UiUseSpecialEffects; // Tells us if we should use fade effects -extern BOOLEAN UiCenterMenu; -extern BOOLEAN UiMenuBox; -extern CHAR UiTimeText[]; -extern BOOLEAN UiDrawTime; - -extern const CHAR UiMonthNames[12][15]; +extern ULONG UiScreenWidth; // Screen Width +extern ULONG UiScreenHeight; // Screen Height + +extern UCHAR UiStatusBarFgColor; // Status bar foreground color +extern UCHAR UiStatusBarBgColor; // Status bar background color +extern UCHAR UiBackdropFgColor; // Backdrop foreground color +extern UCHAR UiBackdropBgColor; // Backdrop background color +extern UCHAR UiBackdropFillStyle; // Backdrop fill style +extern UCHAR UiTitleBoxFgColor; // Title box foreground color +extern UCHAR UiTitleBoxBgColor; // Title box background color +extern UCHAR UiMessageBoxFgColor; // Message box foreground color +extern UCHAR UiMessageBoxBgColor; // Message box background color +extern UCHAR UiMenuFgColor; // Menu foreground color +extern UCHAR UiMenuBgColor; // Menu background color +extern UCHAR UiTextColor; // Normal text color +extern UCHAR UiSelectedTextColor; // Selected text color +extern UCHAR UiSelectedTextBgColor; // Selected text background color +extern UCHAR UiEditBoxTextColor; // Edit box text color +extern UCHAR UiEditBoxBgColor; // Edit box text background color + +extern CHAR UiTitleBoxTitleText[260]; // Title box's title text + +extern BOOLEAN UiUseSpecialEffects; // Tells us if we should use fade effects +extern BOOLEAN UiCenterMenu; +extern BOOLEAN UiMenuBox; +extern CHAR UiTimeText[]; +extern BOOLEAN UiDrawTime; + +extern const CHAR UiMonthNames[12][15]; /////////////////////////////////////////////////////////////////////////////////////// // @@ -187,45 +187,45 @@ VOID UiInit(const char *CmdLine); extern UIVTBL UiVtbl; /* - * Combines the foreground and background colors into a single attribute byte + * Fill styles for DrawBackdrop() */ -#define ATTR(cFore, cBack) ((cBack << 4)|cFore) +#define LIGHT_FILL 0xB0 +#define MEDIUM_FILL 0xB1 +#define DARK_FILL 0xB2 /* - * Fill styles for DrawBackdrop() + * Combines the foreground and background colors into a single attribute byte */ -#define LIGHT_FILL 0xB0 -#define MEDIUM_FILL 0xB1 -#define DARK_FILL 0xB2 +#define ATTR(cFore, cBack) ((cBack << 4) | cFore) /* * Screen colors */ -#define COLOR_BLACK 0 -#define COLOR_BLUE 1 -#define COLOR_GREEN 2 -#define COLOR_CYAN 3 -#define COLOR_RED 4 -#define COLOR_MAGENTA 5 -#define COLOR_BROWN 6 -#define COLOR_GRAY 7 - -#define COLOR_DARKGRAY 8 -#define COLOR_LIGHTBLUE 9 +#define COLOR_BLACK 0 +#define COLOR_BLUE 1 +#define COLOR_GREEN 2 +#define COLOR_CYAN 3 +#define COLOR_RED 4 +#define COLOR_MAGENTA 5 +#define COLOR_BROWN 6 +#define COLOR_GRAY 7 + +#define COLOR_DARKGRAY 8 +#define COLOR_LIGHTBLUE 9 #define COLOR_LIGHTGREEN 10 -#define COLOR_LIGHTCYAN 11 -#define COLOR_LIGHTRED 12 -#define COLOR_LIGHTMAGENTA 13 +#define COLOR_LIGHTCYAN 11 +#define COLOR_LIGHTRED 12 +#define COLOR_LIGHTMAGENTA 13 #define COLOR_YELLOW 14 -#define COLOR_WHITE 15 +#define COLOR_WHITE 15 /* Add COLOR_BLINK to a background to cause blinking */ -//#define COLOR_BLINK 8 +// #define COLOR_BLINK 8 /* * Defines for IBM box drawing characters */ -#define HORZ (0xc4) /* Single horizontal line */ -#define D_HORZ (0xcd) /* Double horizontal line.*/ -#define VERT (0xb3) /* Single vertical line */ -#define D_VERT (0xba) /* Double vertical line. */ +#define HORZ 0xC4 // Single horizontal line +#define D_HORZ 0xCD // Double horizontal line +#define VERT 0xB3 // Single vertical line +#define D_VERT 0xBA // Double vertical line diff --git a/boot/freeldr/freeldr/include/ui/minitui.h b/boot/freeldr/freeldr/include/ui/minitui.h index 0e568526f70..1a64c5569ba 100644 --- a/boot/freeldr/freeldr/include/ui/minitui.h +++ b/boot/freeldr/freeldr/include/ui/minitui.h @@ -3,7 +3,7 @@ * PROJECT: FreeLoader * FILE: boot/freeldr/freeldr/include/ui/minitui.h * PURPOSE: Mini Text UI interface header - * PROGRAMMERS: Herv� Poussineau + * PROGRAMMERS: Hervé Poussineau */ #pragma once diff --git a/boot/freeldr/freeldr/include/ui/noui.h b/boot/freeldr/freeldr/include/ui/noui.h index 4d26bc64a6d..5772c3e3a5d 100644 --- a/boot/freeldr/freeldr/include/ui/noui.h +++ b/boot/freeldr/freeldr/include/ui/noui.h @@ -3,7 +3,7 @@ * PROJECT: FreeLoader * FILE: boot/freeldr/freeldr/include/ui/noui.h * PURPOSE: No UI interface header - * PROGRAMMERS: Herv� Poussineau + * PROGRAMMERS: Hervé Poussineau */ #pragma once diff --git a/boot/freeldr/freeldr/include/ui/tui.h b/boot/freeldr/freeldr/include/ui/tui.h index 8959276bf61..ccad1e19ca3 100644 --- a/boot/freeldr/freeldr/include/ui/tui.h +++ b/boot/freeldr/freeldr/include/ui/tui.h @@ -78,25 +78,27 @@ TuiDisplayMenu( IN UiMenuKeyPressFilterCallback KeyPressFilter OPTIONAL, IN PVOID Context OPTIONAL); -/* Definitions for corners, depending on HORIZ and VERT */ -#define UL (0xda) -#define UR (0xbf) /* HORZ and VERT */ -#define LL (0xc0) -#define LR (0xd9) +/* + * Definitions for corners, depending on HORZ and VERT + */ +#define UL 0xDA /* HORZ and VERT */ +#define UR 0xBF +#define LL 0xC0 +#define LR 0xD9 -#define D_UL (0xc9) -#define D_UR (0xbb) /* D_HORZ and D_VERT */ -#define D_LL (0xc8) -#define D_LR (0xbc) +#define D_UL 0xC9 /* D_HORZ and D_VERT */ +#define D_UR 0xBB +#define D_LL 0xC8 +#define D_LR 0xBC -#define HD_UL (0xd5) -#define HD_UR (0xb8) /* D_HORZ and VERT */ -#define HD_LL (0xd4) -#define HD_LR (0xbe) +#define HD_UL 0xD5 /* D_HORZ and VERT */ +#define HD_UR 0xB8 +#define HD_LL 0xD4 +#define HD_LR 0xBE -#define VD_UL (0xd6) -#define VD_UR (0xb7) /* HORZ and D_VERT */ -#define VD_LL (0xd3) -#define VD_LR (0xbd) +#define VD_UL 0xD6 /* HORZ and D_VERT */ +#define VD_UR 0xB7 +#define VD_LL 0xD3 +#define VD_LR 0xBD extern const UIVTBL TuiVtbl; diff --git a/boot/freeldr/freeldr/ui/minitui.c b/boot/freeldr/freeldr/ui/minitui.c index 1cd5aff7163..8a164602cba 100644 --- a/boot/freeldr/freeldr/ui/minitui.c +++ b/boot/freeldr/freeldr/ui/minitui.c @@ -6,27 +6,22 @@ * PROGRAMMERS: Brian Palmer <brianp(a)sginet.com> * Hervé Poussineau */ + #ifndef _M_ARM #include <freeldr.h> VOID MiniTuiDrawBackdrop(VOID) { - // - // Fill in a black background - // + /* Fill in a black background */ TuiFillArea(0, 0, UiScreenWidth - 1, UiScreenHeight - 1, 0, 0); - // - // Update the screen buffer - // + /* Update the screen buffer */ VideoCopyOffScreenBufferToVRAM(); } VOID MiniTuiDrawStatusText(PCSTR StatusText) { - // - // Minimal UI doesn't have a status bar - // + /* Minimal UI doesn't have a status bar */ } VOID MiniTuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText) @@ -47,26 +42,22 @@ VOID MiniTuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressTex VOID MiniTuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText) { - ULONG i; - ULONG ProgressBarWidth = (Right - Left) - 3; + ULONG i; + ULONG ProgressBarWidth = (Right - Left) - 3; - // First make sure the progress bar text fits + /* First make sure the progress bar text fits */ UiTruncateStringEllipsis(ProgressText, ProgressBarWidth - 4); - if (Position > Range) - { Position = Range; - } - // - // Draw the "Loading..." text - // - TuiDrawCenteredText(Left + 2, Top + 1, Right - 2, Top + 1, ProgressText, ATTR(7, 0)); + /* Draw the "Loading..." text */ + TuiDrawCenteredText(Left + 2, Top + 1, Right - 2, Top + 1, ProgressText, ATTR(COLOR_GRAY, COLOR_BLACK)); - // Draw the percent complete - for (i=0; i<(Position*ProgressBarWidth)/Range; i++) + /* Draw the percent complete */ + for (i = 0; i < (Position * ProgressBarWidth) / Range; i++) { - TuiDrawText(Left+2+i, Top+2, "\xDB", ATTR(UiTextColor, UiMenuBgColor)); + /* Use the fill character */ + TuiDrawText(Left + 2 + i, Top + 2, "\xDB", ATTR(UiTextColor, UiMenuBgColor)); } TuiUpdateDateTime(); @@ -78,14 +69,10 @@ MiniTuiDrawMenu(PUI_MENU_INFO MenuInfo) { ULONG i; - // - // Draw the backdrop - // + /* Draw the backdrop */ UiDrawBackdrop(); - // - // No GUI status bar text, just minimal text. Show the menu header. - // + /* No GUI status bar text, just minimal text. Show the menu header. */ if (MenuInfo->MenuHeader) { UiVtbl.DrawText(0, @@ -94,9 +81,7 @@ MiniTuiDrawMenu(PUI_MENU_INFO MenuInfo) ATTR(UiMenuFgColor, UiMenuBgColor)); } - // - // Now tell the user how to choose - // + /* Now tell the user how to choose */ UiVtbl.DrawText(0, MenuInfo->Bottom + 1, "Use \x18 and \x19 to move the highlight to your choice.", @@ -106,9 +91,7 @@ MiniTuiDrawMenu(PUI_MENU_INFO MenuInfo) "Press ENTER to choose.", ATTR(UiMenuFgColor, UiMenuBgColor)); - // - // And show the menu footer - // + /* And show the menu footer */ if (MenuInfo->MenuFooter) { UiVtbl.DrawText(0, @@ -117,22 +100,16 @@ MiniTuiDrawMenu(PUI_MENU_INFO MenuInfo) ATTR(UiMenuFgColor, UiMenuBgColor)); } - // - // Draw the menu box - // + /* Draw the menu box */ TuiDrawMenuBox(MenuInfo); - // - // Draw each line of the menu - // + /* Draw each line of the menu */ for (i = 0; i < MenuInfo->MenuItemCount; i++) { TuiDrawMenuItem(MenuInfo, i); } - // - // Display the boot options if needed - // + /* Display the boot options if needed */ if (MenuInfo->ShowBootOptions) { DisplayBootTimeOptions(); @@ -166,4 +143,5 @@ const UIVTBL MiniTuiVtbl = TuiDisplayMenu, MiniTuiDrawMenu, }; -#endif + +#endif // _M_ARM diff --git a/boot/freeldr/freeldr/ui/noui.c b/boot/freeldr/freeldr/ui/noui.c index 6f77cc4f4d6..da5d482f750 100644 --- a/boot/freeldr/freeldr/ui/noui.c +++ b/boot/freeldr/freeldr/ui/noui.c @@ -3,7 +3,7 @@ * PROJECT: FreeLoader * FILE: boot/freeldr/freeldr/ui/noui.c * PURPOSE: No Text UI interface - * PROGRAMMERS: Herv� Poussineau + * PROGRAMMERS: Hervé Poussineau */ #ifndef _M_ARM #include <freeldr.h> diff --git a/boot/freeldr/freeldr/ui/tui.c b/boot/freeldr/freeldr/ui/tui.c index b9327950f4c..f7a8e76a11f 100644 --- a/boot/freeldr/freeldr/ui/tui.c +++ b/boot/freeldr/freeldr/ui/tui.c @@ -153,28 +153,23 @@ VOID TuiDrawBackdrop(VOID) */ VOID TuiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar, UCHAR Attr /* Color Attributes */) { - PUCHAR ScreenMemory = (PUCHAR)TextVideoBuffer; - ULONG i, j; + PUCHAR ScreenMemory = (PUCHAR)TextVideoBuffer; + ULONG i, j; - // Clip the area to the screen + /* Clip the area to the screen */ if ((Left >= UiScreenWidth) || (Top >= UiScreenHeight)) { return; } if (Right >= UiScreenWidth) - { Right = UiScreenWidth - 1; - } if (Bottom >= UiScreenHeight) - { Bottom = UiScreenHeight - 1; - } - // Loop through each line and fill it in - for (i=Top; i<=Bottom; i++) + /* Loop through each line and column and fill it in */ + for (i = Top; i <= Bottom; ++i) { - // Loop through each character (column) in the line and fill it in - for (j=Left; j<=Right; j++) + for (j = Left; j <= Right; ++j) { ScreenMemory[((i*2)*UiScreenWidth)+(j*2)] = (UCHAR)FillChar; ScreenMemory[((i*2)*UiScreenWidth)+(j*2)+1] = Attr; @@ -188,28 +183,24 @@ VOID TuiFillArea(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, CHAR FillChar */ VOID TuiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom) { - PUCHAR ScreenMemory = (PUCHAR)TextVideoBuffer; - ULONG Idx; + PUCHAR ScreenMemory = (PUCHAR)TextVideoBuffer; + ULONG Idx; - // Shade the bottom of the area + /* Shade the bottom of the area */ if (Bottom < (UiScreenHeight - 1)) { if (UiScreenHeight < 34) - { - Idx=Left + 2; - } + Idx = Left + 2; else - { - Idx=Left + 1; - } + Idx = Left + 1; - for (; Idx<=Right; Idx++) + for (; Idx <= Right; ++Idx) { ScreenMemory[(((Bottom+1)*2)*UiScreenWidth)+(Idx*2)+1] = ATTR(COLOR_GRAY, COLOR_BLACK); } } - // Shade the right of the area + /* Shade the right of the area */ if (Right < (UiScreenWidth - 1)) { for (Idx=Top+1; Idx<=Bottom; Idx++) @@ -228,7 +219,7 @@ VOID TuiDrawShadow(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom) } } - // Shade the bottom right corner + /* Shade the bottom right corner */ if ((Right < (UiScreenWidth - 1)) && (Bottom < (UiScreenHeight - 1))) { ScreenMemory[(((Bottom+1)*2)*UiScreenWidth)+((Right+1)*2)+1] = ATTR(COLOR_GRAY, COLOR_BLACK); @@ -648,9 +639,9 @@ VOID TuiMessageBoxCritical(PCSTR MessageText) VOID TuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText) { - ULONG Left, Top, Right, Bottom; - ULONG Width = 50; // Allow for 50 "bars" - ULONG Height = 2; + ULONG Left, Top, Right, Bottom; + ULONG Width = 50; // Allow for 50 "bars" + ULONG Height = 2; Left = (UiScreenWidth - Width - 4) / 2; Right = Left + Width + 3; @@ -663,35 +654,32 @@ VOID TuiDrawProgressBarCenter(ULONG Position, ULONG Range, PCHAR ProgressText) VOID TuiDrawProgressBar(ULONG Left, ULONG Top, ULONG Right, ULONG Bottom, ULONG Position, ULONG Range, PCHAR ProgressText) { - ULONG i; - ULONG ProgressBarWidth = (Right - Left) - 3; + ULONG i; + ULONG ProgressBarWidth = (Right - Left) - 3; - // First make sure the progress bar text fits + /* First make sure the progress bar text fits */ UiTruncateStringEllipsis(ProgressText, ProgressBarWidth - 4); if (Position > Range) - { Position = Range; - } - // Draw the box + /* Draw the box */ TuiDrawBox(Left, Top, Right, Bottom, VERT, HORZ, TRUE, TRUE, ATTR(UiMenuFgColor, UiMenuBgColor)); - // - // Draw the "Loading..." text - // + /* Draw the "Loading..." text */ TuiDrawCenteredText(Left + 2, Top + 2, Right - 2, Top + 2, ProgressText, ATTR(UiTextColor, UiMenuBgColor)); - // Draw the percent complete - for (i=0; i<(Position*ProgressBarWidth)/Range; i++) + /* Draw the percent complete */ + for (i = 0; i < (Position * ProgressBarWidth) / Range; i++) { - TuiDrawText(Left+2+i, Top+2, "\xDB", ATTR(UiTextColor, UiMenuBgColor)); + /* Use the fill character */ + TuiDrawText(Left + 2 + i, Top + 2, "\xDB", ATTR(UiTextColor, UiMenuBgColor)); } - // Draw the shadow - for (; i<ProgressBarWidth; i++) + /* Draw the shadow */ + for (; i < ProgressBarWidth; i++) { - TuiDrawText(Left+2+i, Top+2, "\xB2", ATTR(UiTextColor, UiMenuBgColor)); + TuiDrawText(Left + 2 + i, Top + 2, "\xB2", ATTR(UiTextColor, UiMenuBgColor)); } TuiUpdateDateTime(); diff --git a/boot/freeldr/freeldr/ui/tuimenu.c b/boot/freeldr/freeldr/ui/tuimenu.c index 58b509f2a38..f1c229e947b 100644 --- a/boot/freeldr/freeldr/ui/tuimenu.c +++ b/boot/freeldr/freeldr/ui/tuimenu.c @@ -8,6 +8,7 @@ */ /* INCLUDES ******************************************************************/ + #ifndef _M_ARM #include <freeldr.h> @@ -32,49 +33,39 @@ TuiDisplayMenu( ULONG CurrentClockSecond; ULONG KeyPress; - // - // Before taking any default action if there is no timeout, - // check whether the supplied key filter callback function - // may handle a specific user keypress. If it does, the - // timeout is cancelled. - // + /* + * Before taking any default action if there is no timeout, + * check whether the supplied key filter callback function + * may handle a specific user keypress. If it does, the + * timeout is cancelled. + */ if (!MenuTimeOut && KeyPressFilter && MachConsKbHit()) { - // - // Get the key (get the extended key if needed) - // + /* Get the key (get the extended key if needed) */ KeyPress = MachConsGetCh(); if (KeyPress == KEY_EXTENDED) KeyPress = MachConsGetCh(); - // - // Call the supplied key filter callback function to see - // if it is going to handle this keypress. - // + /* + * Call the supplied key filter callback function to see + * if it is going to handle this keypress. + */ if (KeyPressFilter(KeyPress, DefaultMenuItem, Context)) { - // - // It processed the key character, cancel the timeout - // + /* It processed the key character, cancel the timeout */ MenuTimeOut = -1; } } - // - // Check if there's no timeout - // + /* Check if there is no timeout */ if (!MenuTimeOut) { - // - // Return the default selected item - // + /* Return the default selected item */ if (SelectedMenuItem) *SelectedMenuItem = DefaultMenuItem; return TRUE; } - // - // Setup the MENU_INFO structure - // + /* Setup the MENU_INFO structure */ MenuInformation.MenuHeader = MenuHeader; MenuInformation.MenuFooter = MenuFooter; MenuInformation.ShowBootOptions = ShowBootOptions; @@ -84,85 +75,57 @@ TuiDisplayMenu( MenuInformation.SelectedMenuItem = DefaultMenuItem; MenuInformation.Context = Context; - // - // Calculate the size of the menu box - // + /* Calculate the size of the menu box */ TuiCalcMenuBoxSize(&MenuInformation); - // - // Draw the menu - // + /* Draw the menu */ UiVtbl.DrawMenu(&MenuInformation); - // - // Get the current second of time - // + /* Get the current second of time */ LastClockSecond = ArcGetTime()->Second; - // - // Process keys - // + /* Process keys */ while (TRUE) { - // - // Process key presses - // + /* Process key presses */ KeyPress = TuiProcessMenuKeyboardEvent(&MenuInformation, KeyPressFilter); - // - // Check for ENTER or ESC - // + /* Check for ENTER or ESC */ if (KeyPress == KEY_ENTER) break; if (CanEscape && KeyPress == KEY_ESC) return FALSE; - // - // Update the date & time - // + /* Update the date & time */ TuiUpdateDateTime(); VideoCopyOffScreenBufferToVRAM(); - // - // Check if there is a countdown - // + /* Check if there is a countdown */ if (MenuInformation.MenuTimeRemaining > 0) { - // - // Get the updated time, seconds only - // + /* Get the updated time, seconds only */ CurrentClockSecond = ArcGetTime()->Second; - // - // Check if more then a second has now elapsed - // + /* Check if more than a second has now elapsed */ if (CurrentClockSecond != LastClockSecond) { - // - // Update the time information - // + /* Update the time information */ LastClockSecond = CurrentClockSecond; MenuInformation.MenuTimeRemaining--; - // - // Update the menu - // + /* Update the menu */ TuiDrawMenuBox(&MenuInformation); VideoCopyOffScreenBufferToVRAM(); } } else if (MenuInformation.MenuTimeRemaining == 0) { - // - // A time out occurred, exit this loop and return default OS - // + /* A time out occurred, exit this loop and return default OS */ break; } MachHwIdle(); } - // - // Return the selected item - // + /* Return the selected item */ if (SelectedMenuItem) *SelectedMenuItem = MenuInformation.SelectedMenuItem; return TRUE; } @@ -175,20 +138,14 @@ TuiCalcMenuBoxSize(PUI_MENU_INFO MenuInfo) ULONG Height; ULONG Length; - // - // Height is the menu item count plus 2 (top border & bottom border) - // + /* Height is the menu item count plus 2 (top border & bottom border) */ Height = MenuInfo->MenuItemCount + 2; Height -= 1; // Height is zero-based - // - // Loop every item - // - for(i = 0; i < MenuInfo->MenuItemCount; i++) + /* Loop every item */ + for (i = 0; i < MenuInfo->MenuItemCount; i++) { - // - // Get the string length and make it become the new width if necessary - // + /* Get the string length and make it become the new width if necessary */ if (MenuInfo->MenuItemList[i]) { Length = (ULONG)strlen(MenuInfo->MenuItemList[i]); @@ -196,35 +153,25 @@ TuiCalcMenuBoxSize(PUI_MENU_INFO MenuInfo) } } - // - // Allow room for left & right borders, plus 8 spaces on each side - // + /* Allow room for left & right borders, plus 8 spaces on each side */ Width += 18; - // - // Check if we're drawing a centered menu - // + /* Check if we're drawing a centered menu */ if (UiCenterMenu) { - // - // Calculate the menu box area for a centered menu - // + /* Calculate the menu box area for a centered menu */ MenuInfo->Left = (UiScreenWidth - Width) / 2; MenuInfo->Top = (((UiScreenHeight - TUI_TITLE_BOX_CHAR_HEIGHT) - Height) / 2) + TUI_TITLE_BOX_CHAR_HEIGHT; } else { - // - // Put the menu in the default left-corner position - // + /* Put the menu in the default left-corner position */ MenuInfo->Left = -1; MenuInfo->Top = 4; } - // - // The other margins are the same - // + /* The other margins are the same */ MenuInfo->Right = (MenuInfo->Left) + Width; MenuInfo->Bottom = (MenuInfo->Top) + Height; } @@ -234,24 +181,16 @@ TuiDrawMenu(PUI_MENU_INFO MenuInfo) { ULONG i; - // - // Draw the backdrop - // + /* Draw the backdrop */ UiDrawBackdrop(); - // - // Update the status bar - // + /* Update the status bar */ UiVtbl.DrawStatusText("Use \x18 and \x19 to select, then press ENTER."); - // - // Draw the menu box - // + /* Draw the menu box */ TuiDrawMenuBox(MenuInfo); - // - // Draw each line of the menu - // + /* Draw each line of the menu */ for (i = 0; i < MenuInfo->MenuItemCount; i++) { TuiDrawMenuItem(MenuInfo, i); @@ -272,9 +211,7 @@ TuiDrawMenuBox(PUI_MENU_INFO MenuInfo) CHAR MenuLineText[80], TempString[80]; ULONG i; - // - // Draw the menu box if requested - // + /* Draw the menu box if requested */ if (UiMenuBox) { UiDrawBox(MenuInfo->Left, @@ -283,43 +220,31 @@ TuiDrawMenuBox(PUI_MENU_INFO MenuInfo) MenuInfo->Bottom, D_VERT, D_HORZ, - FALSE, // Filled - TRUE, // Shadow + FALSE, // Filled + TRUE, // Shadow ATTR(UiMenuFgColor, UiMenuBgColor)); } - // - // 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 - // + /* 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 - // + /* 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 - // + /* Add the last 2 chars */ strcat(MenuLineText, &UiTimeText[i - 2]); - // - // Check if this is a centered menu - // + /* Check if this is a centered menu */ if (UiCenterMenu) { - // - // Display it in the center of the menu - // + /* Display it in the center of the menu */ UiDrawText(MenuInfo->Right - (ULONG)strlen(MenuLineText) - 1, MenuInfo->Bottom, MenuLineText, @@ -327,9 +252,7 @@ TuiDrawMenuBox(PUI_MENU_INFO MenuInfo) } else { - // - // Display under the menu directly - // + /* Display under the menu directly */ UiDrawText(0, MenuInfo->Bottom + 4, MenuLineText, @@ -338,18 +261,14 @@ TuiDrawMenuBox(PUI_MENU_INFO MenuInfo) } else { - // - // Erase the timeout string with spaces, and 0-terminate for sure - // - for (i=0; i<sizeof(MenuLineText)-1; i++) + /* Erase the timeout string with spaces, and 0-terminate for sure */ + for (i = 0; i < sizeof(MenuLineText)-1; i++) { MenuLineText[i] = ' '; } MenuLineText[sizeof(MenuLineText)-1] = 0; - // - // Draw this "empty" string to erase - // + /* Draw this "empty" string to erase */ if (UiCenterMenu) { UiDrawText(MenuInfo->Right - (ULONG)strlen(MenuLineText) - 1, @@ -366,19 +285,13 @@ TuiDrawMenuBox(PUI_MENU_INFO MenuInfo) } } - // - // Loop each item - // + /* Loop each item */ for (i = 0; i < MenuInfo->MenuItemCount; i++) { - // - // Check if it's a separator - // + /* Check if it's a separator */ if (MenuInfo->MenuItemList[i] == NULL) { - // - // Draw the separator line - // + /* Draw the separator line */ UiDrawText(MenuInfo->Left, MenuInfo->Top + i + 1, "\xC7", @@ -396,76 +309,62 @@ TuiDrawMenuItem(PUI_MENU_INFO MenuInfo, ULONG MenuItemNumber) { ULONG i; - CHAR MenuLineText[80]; + CHAR MenuLineText[80]; ULONG SpaceTotal; ULONG SpaceLeft; ULONG SpaceRight = 0; UCHAR Attribute = ATTR(UiTextColor, UiMenuBgColor); - // - // Check if using centered menu - // + /* Check if using centered menu */ if (UiCenterMenu) { - // - // We will want the string centered so calculate - // how many spaces will be to the left and right - // + /* + * 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; SpaceRight = (SpaceTotal - SpaceLeft) + 1; - // - // Insert the spaces on the left - // + /* Insert the spaces on the left */ for (i = 0; i < SpaceLeft; i++) MenuLineText[i] = ' '; MenuLineText[i] = '\0'; } else { - // - // Simply left-align it - // + /* Simply left-align it */ MenuLineText[0] = '\0'; strcat(MenuLineText, " "); } - // - // Now append the text string - // + /* Now append the text string */ if (MenuInfo->MenuItemList[MenuItemNumber]) strcat(MenuLineText, MenuInfo->MenuItemList[MenuItemNumber]); - // - // Check if using centered menu, and add spaces on the right if so - // - if (UiCenterMenu) for (i=0; i < SpaceRight; i++) strcat(MenuLineText, " "); + /* Check if using centered menu, and add spaces on the right if so */ + if (UiCenterMenu) + { + for (i = 0; i < SpaceRight; i++) + strcat(MenuLineText, " "); + } - // - // If it is a separator - // + /* If it is a separator */ if (MenuInfo->MenuItemList[MenuItemNumber] == NULL) { - // - // Make it a separator line and use menu colors - // + /* 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 this is the selected item, use the selected colors - // + /* If this is the selected item, use the selected colors */ Attribute = ATTR(UiSelectedTextColor, UiSelectedTextBgColor); } - // - // Draw the item - // + /* Draw the item */ UiDrawText(MenuInfo->Left + 1, MenuInfo->Top + 1 + MenuItemNumber, MenuLineText, @@ -479,70 +378,52 @@ TuiProcessMenuKeyboardEvent(PUI_MENU_INFO MenuInfo, ULONG KeyEvent = 0; ULONG Selected, Count; - // - // Check for a keypress - // + /* Check for a keypress */ if (!MachConsKbHit()) return 0; // None, bail out - // - // Check if the timeout is not already complete - // + /* Check if the timeout is not already complete */ if (MenuInfo->MenuTimeRemaining != -1) { - // - // Cancel it and remove it - // + /* Cancel it and remove it */ MenuInfo->MenuTimeRemaining = -1; TuiDrawMenuBox(MenuInfo); // FIXME: Remove for minimal UI too } - // - // Get the key (get the extended key if needed) - // + /* Get the key (get the extended key if needed) */ KeyEvent = MachConsGetCh(); if (KeyEvent == KEY_EXTENDED) KeyEvent = MachConsGetCh(); - // - // Call the supplied key filter callback function to see - // if it is going to handle this keypress. - // + /* + * Call the supplied key filter callback function to see + * if it is going to handle this keypress. + */ if (KeyPressFilter && KeyPressFilter(KeyEvent, MenuInfo->SelectedMenuItem, MenuInfo->Context)) { - // - // It processed the key character, so redraw and exit - // + /* It processed the key character, so redraw and exit */ UiVtbl.DrawMenu(MenuInfo); return 0; } - // - // Process the key - // + /* Process the key */ if ((KeyEvent == KEY_UP ) || (KeyEvent == KEY_DOWN) || (KeyEvent == KEY_HOME) || (KeyEvent == KEY_END )) { - // - // Get the current selected item and count - // + /* Get the current selected item and count */ Selected = MenuInfo->SelectedMenuItem; Count = MenuInfo->MenuItemCount - 1; - // - // Check the key and change the selected menu item - // + /* Check the key and change the selected menu item */ if ((KeyEvent == KEY_UP) && (Selected > 0)) { - // - // Deselect previous item and go up - // + /* Deselect previous item and go up */ MenuInfo->SelectedMenuItem--; TuiDrawMenuItem(MenuInfo, Selected); Selected--; - // Skip past any separators + /* Skip past any separators */ if ((Selected > 0) && (MenuInfo->MenuItemList[Selected] == NULL)) { @@ -552,22 +433,18 @@ TuiProcessMenuKeyboardEvent(PUI_MENU_INFO MenuInfo, else if ( ((KeyEvent == KEY_UP) && (Selected == 0)) || (KeyEvent == KEY_END) ) { - // - // Go to the end - // + /* Go to the end */ MenuInfo->SelectedMenuItem = Count; TuiDrawMenuItem(MenuInfo, Selected); } else if ((KeyEvent == KEY_DOWN) && (Selected < Count)) { - // - // Deselect previous item and go down - // + /* Deselect previous item and go down */ MenuInfo->SelectedMenuItem++; TuiDrawMenuItem(MenuInfo, Selected); Selected++; - // Skip past any separators + /* Skip past any separators */ if ((Selected < Count) && (MenuInfo->MenuItemList[Selected] == NULL)) { @@ -577,23 +454,18 @@ TuiProcessMenuKeyboardEvent(PUI_MENU_INFO MenuInfo, else if ( ((KeyEvent == KEY_DOWN) && (Selected == Count)) || (KeyEvent == KEY_HOME) ) { - // - // Go to the beginning - // + /* Go to the beginning */ MenuInfo->SelectedMenuItem = 0; TuiDrawMenuItem(MenuInfo, Selected); } - // - // Select new item and update video buffer - // + /* Select new item and update video buffer */ TuiDrawMenuItem(MenuInfo, MenuInfo->SelectedMenuItem); VideoCopyOffScreenBufferToVRAM(); } - // - // Return the pressed key - // + /* Return the pressed key */ return KeyEvent; } + #endif

2 years, 10 months

[reactos] 01/01: [SCHEDSVC] This is a shared process service too

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=942e79963aa807dc15a00… commit 942e79963aa807dc15a003280edd4a59b2b04ad9 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 6 16:56:43 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 6 16:56:43 2022 +0100 [SCHEDSVC] This is a shared process service too --- base/services/schedsvc/schedsvc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/services/schedsvc/schedsvc.c b/base/services/schedsvc/schedsvc.c index dea78455141..d0d950a591e 100644 --- a/base/services/schedsvc/schedsvc.c +++ b/base/services/schedsvc/schedsvc.c @@ -45,7 +45,7 @@ HANDLE Events[3] = {NULL, NULL, NULL}; // StopEvent, UpdateEvent, Timer static VOID UpdateServiceStatus(DWORD dwState) { - ServiceStatus.dwServiceType = SERVICE_WIN32_OWN_PROCESS; + ServiceStatus.dwServiceType = SERVICE_WIN32_SHARE_PROCESS; ServiceStatus.dwCurrentState = dwState; if (dwState == SERVICE_PAUSED || dwState == SERVICE_RUNNING)

2 years, 10 months

[reactos] 01/01: [SYSSETUP] Disable debug messages on the process page

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b76d49bcaadb9aea02220… commit b76d49bcaadb9aea0222054dd0d7d0a372b57041 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sun Feb 6 16:30:53 2022 +0100 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sun Feb 6 16:30:53 2022 +0100 [SYSSETUP] Disable debug messages on the process page --- dll/win32/syssetup/wizard.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/win32/syssetup/wizard.c b/dll/win32/syssetup/wizard.c index 0dcebc6d12e..5404e3c28a0 100644 --- a/dll/win32/syssetup/wizard.c +++ b/dll/win32/syssetup/wizard.c @@ -2371,14 +2371,14 @@ ProcessPageDlgProc(HWND hwndDlg, break; case PM_ITEM_START: - DPRINT1("PM_ITEM_START %lu\n", (ULONG)lParam); + DPRINT("PM_ITEM_START %lu\n", (ULONG)lParam); SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, (ULONG)lParam)); SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETPOS, 0, 0); SendDlgItemMessage(hwndDlg, IDC_TASKTEXT1 + wParam, WM_SETFONT, (WPARAM)SetupData->hBoldFont, (LPARAM)TRUE); break; case PM_ITEM_END: - DPRINT1("PM_ITEM_END\n"); + DPRINT("PM_ITEM_END\n"); if (lParam == ERROR_SUCCESS) { } @@ -2389,14 +2389,14 @@ ProcessPageDlgProc(HWND hwndDlg, break; case PM_STEP_START: - DPRINT1("PM_STEP_START\n"); + DPRINT("PM_STEP_START\n"); RegistrationNotify = (PREGISTRATIONNOTIFY)lParam; SendDlgItemMessage(hwndDlg, IDC_ITEM, WM_SETTEXT, 0, (LPARAM)((RegistrationNotify->CurrentItem != NULL)? RegistrationNotify->CurrentItem : L"")); break; case PM_STEP_END: - DPRINT1("PM_STEP_END\n"); + DPRINT("PM_STEP_END\n"); RegistrationNotify = (PREGISTRATIONNOTIFY)lParam; SendDlgItemMessage(hwndDlg, IDC_PROCESSPROGRESS, PBM_SETPOS, RegistrationNotify->Progress, 0); if (RegistrationNotify->LastError != ERROR_SUCCESS) @@ -2406,7 +2406,7 @@ ProcessPageDlgProc(HWND hwndDlg, break; case PM_ITEMS_DONE: - DPRINT1("PM_ITEMS_DONE\n"); + DPRINT("PM_ITEMS_DONE\n"); /* Enable the Back and Next buttons */ PropSheet_SetWizButtons(GetParent(hwndDlg), PSWIZB_NEXT); PropSheet_PressButton(GetParent(hwndDlg), PSBTN_NEXT);

2 years, 10 months

[reactos] 01/01: [NTUSER] Implement NtUserAssociateInputContext (#4334)

by Katayama Hirofumi MZ

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f2c3167db312c67c673b1… commit f2c3167db312c67c673b1093230f4eb6de25c131 Author: Katayama Hirofumi MZ <katayama.hirofumi.mz(a)gmail.com> AuthorDate: Sat Feb 5 20:23:57 2022 +0900 Commit: GitHub <noreply(a)github.com> CommitDate: Sat Feb 5 20:23:57 2022 +0900 [NTUSER] Implement NtUserAssociateInputContext (#4334) - Add IntReAllocatePoolWithTag function in window.c. - Define WINDOWLIST structure in "window.h". - Add IntBuildHwndList and IntFreeHwndList helper functions in window.c. - Add IntAssociateInputContext and IntAssociateInputContextEx helper functions in ime.c. - Implement NtUserAssociateInputContext function. CORE-11700 --- sdk/include/psdk/imm.h | 7 +- win32ss/user/ntuser/ime.c | 89 ++++++++++++++++++++++++- win32ss/user/ntuser/window.c | 150 ++++++++++++++++++++++++++++++++++++++++++- win32ss/user/ntuser/window.h | 20 ++++++ 4 files changed, 259 insertions(+), 7 deletions(-) diff --git a/sdk/include/psdk/imm.h b/sdk/include/psdk/imm.h index 83908c9c191..95ac099d2e3 100644 --- a/sdk/include/psdk/imm.h +++ b/sdk/include/psdk/imm.h @@ -577,11 +577,10 @@ DWORD WINAPI ImeGetImeMenuItems(HIMC, DWORD, DWORD, LPIMEMENUITEMINFOW, LPIMEMEN #define IME_REGWORD_STYLE_USER_FIRST 0x80000000 #define IME_REGWORD_STYLE_USER_LAST 0xFFFFFFFF - /* dwFlags for ImmAssociateContextEx */ -#define IACE_CHILDREN 0x0001 -#define IACE_DEFAULT 0x0010 -#define IACE_IGNORENOCONTEXT 0x0020 +#define IACE_CHILDREN 0x0001 +#define IACE_DEFAULT 0x0010 +#define IACE_IGNORENOCONTEXT 0x0020 /* dwFlags for ImmGetImeMenuItems */ #define IGIMIF_RIGHTMENU 0x0001 diff --git a/win32ss/user/ntuser/ime.c b/win32ss/user/ntuser/ime.c index 0e7d4cf66e6..06b7eabe5fe 100644 --- a/win32ss/user/ntuser/ime.c +++ b/win32ss/user/ntuser/ime.c @@ -695,12 +695,97 @@ Quit: return ret; } +HIMC FASTCALL IntAssociateInputContext(PWND pWnd, PIMC pImc) +{ + HIMC hOldImc = pWnd->hImc; + pWnd->hImc = (pImc ? UserHMGetHandle(pImc) : NULL); + return hOldImc; +} + +DWORD FASTCALL IntAssociateInputContextEx(PWND pWnd, PIMC pIMC, DWORD dwFlags) +{ + DWORD ret = 0; + PWINDOWLIST pwl; + BOOL bIgnoreNullImc = (dwFlags & IACE_IGNORENOCONTEXT); + PTHREADINFO pti = pWnd->head.pti; + PWND pwndTarget, pwndFocus = pti->MessageQueue->spwndFocus; + HWND *phwnd; + HIMC hIMC; + + if (dwFlags & IACE_DEFAULT) + { + pIMC = pti->spDefaultImc; + } + else + { + if (pIMC && pti != pIMC->head.pti) + return 2; + } + + if (pWnd->head.pti->ppi != GetW32ThreadInfo()->ppi || + (pIMC && pIMC->head.rpdesk != pWnd->head.rpdesk)) + { + return 2; + } + + if ((dwFlags & IACE_CHILDREN) && pWnd->spwndChild) + { + pwl = IntBuildHwndList(pWnd->spwndChild, IACE_CHILDREN | IACE_LIST, pti); + if (pwl) + { + for (phwnd = pwl->ahwnd; *phwnd != HWND_TERMINATOR; ++phwnd) + { + pwndTarget = ValidateHwndNoErr(*phwnd); + if (!pwndTarget) + continue; + + hIMC = (pIMC ? UserHMGetHandle(pIMC) : NULL); + if (pwndTarget->hImc == hIMC || (bIgnoreNullImc && !pwndTarget->hImc)) + continue; + + IntAssociateInputContext(pwndTarget, pIMC); + if (pwndTarget == pwndFocus) + ret = 1; + } + + IntFreeHwndList(pwl); + } + } + + if (!bIgnoreNullImc || pWnd->hImc) + { + hIMC = (pIMC ? UserHMGetHandle(pIMC) : NULL); + if (pWnd->hImc != hIMC) + { + IntAssociateInputContext(pWnd, pIMC); + if (pWnd == pwndFocus) + ret = 1; + } + } + + return ret; +} + DWORD APIENTRY NtUserAssociateInputContext(HWND hWnd, HIMC hIMC, DWORD dwFlags) { - STUB - return 0; + DWORD ret = 2; + PWND pWnd; + PIMC pIMC; + + UserEnterExclusive(); + + pWnd = ValidateHwndNoErr(hWnd); + if (!pWnd || !IS_IMM_MODE()) + goto Quit; + + pIMC = (hIMC ? UserGetObjectNoErr(gHandleTable, hIMC, TYPE_INPUTCONTEXT) : NULL); + ret = IntAssociateInputContextEx(pWnd, pIMC, dwFlags); + +Quit: + UserLeave(); + return ret; } BOOL FASTCALL UserUpdateInputContext(PIMC pIMC, DWORD dwType, DWORD_PTR dwValue) diff --git a/win32ss/user/ntuser/window.c b/win32ss/user/ntuser/window.c index d9cba3219d6..f3aeab5d344 100644 --- a/win32ss/user/ntuser/window.c +++ b/win32ss/user/ntuser/window.c @@ -3,7 +3,8 @@ * PROJECT: ReactOS Win32k subsystem * PURPOSE: Windows * FILE: win32ss/user/ntuser/window.c - * PROGRAMER: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * PROGRAMERS: Casper S. Hornstrup (chorns(a)users.sourceforge.net) + * Katayama Hirofumi MZ (katayama.hirofumi.mz(a)gmail.com) */ #include <win32k.h> @@ -11,8 +12,28 @@ DBG_DEFAULT_CHANNEL(UserWnd); INT gNestedWindowLimit = 50; +PWINDOWLIST gpwlList = NULL; +PWINDOWLIST gpwlCache = NULL; + /* HELPER FUNCTIONS ***********************************************************/ +PVOID FASTCALL +IntReAllocatePoolWithTag( + POOL_TYPE PoolType, + PVOID pOld, + SIZE_T cbOld, + SIZE_T cbNew, + ULONG Tag) +{ + PVOID pNew = ExAllocatePoolWithTag(PoolType, cbNew, Tag); + if (!pNew) + return NULL; + + RtlCopyMemory(pNew, pOld, min(cbOld, cbNew)); + ExFreePoolWithTag(pOld, Tag); + return pNew; +} + BOOL FASTCALL UserUpdateUiState(PWND Wnd, WPARAM wParam) { WORD Action = LOWORD(wParam); @@ -1320,6 +1341,133 @@ IntUnlinkWindow(PWND Wnd) Wnd->spwndPrev = Wnd->spwndNext = NULL; } +BOOL FASTCALL IntGrowHwndList(PWINDOWLIST *ppwl) +{ + PWINDOWLIST pwlOld, pwlNew; + SIZE_T ibOld, ibNew; + +#define GROW_COUNT 8 + pwlOld = *ppwl; + ibOld = (LPBYTE)pwlOld->phwndLast - (LPBYTE)pwlOld; + ibNew = ibOld + GROW_COUNT * sizeof(HWND); +#undef GROW_COUNT + pwlNew = IntReAllocatePoolWithTag(PagedPool, pwlOld, ibOld, ibNew, USERTAG_WINDOWLIST); + if (!pwlNew) + return FALSE; + + pwlNew->phwndLast = (HWND *)((LPBYTE)pwlNew + ibOld); + pwlNew->phwndEnd = (HWND *)((LPBYTE)pwlNew + ibNew); + *ppwl = pwlNew; + return TRUE; +} + +PWINDOWLIST FASTCALL IntPopulateHwndList(PWINDOWLIST pwl, PWND pwnd, DWORD dwFlags) +{ + ASSERT(!WL_IS_BAD(pwl)); + + for (; pwnd; pwnd = pwnd->spwndNext) + { + if (!pwl->pti || pwl->pti == pwnd->head.pti) + { + *(pwl->phwndLast) = UserHMGetHandle(pwnd); + ++(pwl->phwndLast); + + if (pwl->phwndLast == pwl->phwndEnd && !IntGrowHwndList(&pwl)) + break; + } + + if ((dwFlags & IACE_CHILDREN) && pwnd->spwndChild) + { + pwl = IntPopulateHwndList(pwl, pwnd->spwndChild, IACE_CHILDREN | IACE_LIST); + if (WL_IS_BAD(pwl)) + break; + } + + if (!(dwFlags & IACE_LIST)) + break; + } + + return pwl; +} + +PWINDOWLIST FASTCALL IntBuildHwndList(PWND pwnd, DWORD dwFlags, PTHREADINFO pti) +{ + PWINDOWLIST pwl; + DWORD cbWL; + + if (gpwlCache) + { + pwl = gpwlCache; + gpwlCache = NULL; + } + else + { +#define INITIAL_COUNT 32 + cbWL = sizeof(WINDOWLIST) + (INITIAL_COUNT - 1) * sizeof(HWND); + pwl = ExAllocatePoolWithTag(PagedPool, cbWL, USERTAG_WINDOWLIST); + if (!pwl) + return NULL; + + pwl->phwndEnd = &pwl->ahwnd[INITIAL_COUNT]; +#undef INITIAL_COUNT + } + + pwl->pti = pti; + pwl->phwndLast = pwl->ahwnd; + pwl = IntPopulateHwndList(pwl, pwnd, dwFlags); + if (WL_IS_BAD(pwl)) + { + ExFreePoolWithTag(pwl, USERTAG_WINDOWLIST); + return NULL; + } + + *(pwl->phwndLast) = HWND_TERMINATOR; + + if (dwFlags & 0x8) + { + // TODO: + } + + pwl->pti = GetW32ThreadInfo(); + pwl->pNextList = gpwlList; + gpwlList = pwl; + + return pwl; +} + +VOID FASTCALL IntFreeHwndList(PWINDOWLIST pwlTarget) +{ + PWINDOWLIST pwl, *ppwl; + + for (ppwl = &gpwlList; *ppwl; ppwl = &(*ppwl)->pNextList) + { + if (*ppwl != pwlTarget) + continue; + + *ppwl = pwlTarget->pNextList; + + if (gpwlCache) + { + if (WL_CAPACITY(pwlTarget) > WL_CAPACITY(gpwlCache)) + { + pwl = gpwlCache; + gpwlCache = pwlTarget; + ExFreePoolWithTag(pwl, USERTAG_WINDOWLIST); + } + else + { + ExFreePoolWithTag(pwlTarget, USERTAG_WINDOWLIST); + } + } + else + { + gpwlCache = pwlTarget; + } + + break; + } +} + /* FUNCTIONS *****************************************************************/ /* diff --git a/win32ss/user/ntuser/window.h b/win32ss/user/ntuser/window.h index f2cd877b289..fd63e1c920f 100644 --- a/win32ss/user/ntuser/window.h +++ b/win32ss/user/ntuser/window.h @@ -79,4 +79,24 @@ LONG_PTR FASTCALL co_UserSetWindowLongPtr(HWND, DWORD, LONG_PTR, BOOL); HWND FASTCALL IntGetWindow(HWND,UINT); LRESULT co_UserFreeWindow(PWND,PPROCESSINFO,PTHREADINFO,BOOLEAN); +#define HWND_TERMINATOR ((HWND)(ULONG_PTR)1) + +typedef struct tagWINDOWLIST +{ + struct tagWINDOWLIST *pNextList; + HWND *phwndLast; + HWND *phwndEnd; + PTHREADINFO pti; + HWND ahwnd[ANYSIZE_ARRAY]; /* Terminated by HWND_TERMINATOR */ +} WINDOWLIST, *PWINDOWLIST; + +#define WL_IS_BAD(pwl) ((pwl)->phwndEnd <= (pwl)->phwndLast) +#define WL_CAPACITY(pwl) ((pwl)->phwndEnd - &((pwl)->ahwnd[0])) + +PWINDOWLIST FASTCALL IntBuildHwndList(PWND pwnd, DWORD dwFlags, PTHREADINFO pti); +VOID FASTCALL IntFreeHwndList(PWINDOWLIST pwlTarget); + +/* Undocumented dwFlags for IntBuildHwndList */ +#define IACE_LIST 0x0002 + /* EOF */

2 years, 10 months

[reactos] 01/01: [WIN32SS] Remove an ambiguous assert entirely CORE-16738

by Joachim Henze

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bf164353035a2bc0f0d1d… commit bf164353035a2bc0f0d1d679d09f2e4076498fa1 Author: Joachim Henze <Joachim.Henze(a)reactos.org> AuthorDate: Sat Feb 5 01:06:15 2022 +0100 Commit: Joachim Henze <Joachim.Henze(a)reactos.org> CommitDate: Sat Feb 5 01:06:15 2022 +0100 [WIN32SS] Remove an ambiguous assert entirely CORE-16738 It popped up very reliably when performing git-clone of the ros sources while having the taskmgr open in the processes-tab. Or when building 'ninja bootcd -j1' while having the taskmgr open in the processes-tab. It is always possible to ignore it and then continue using ros for days without noticing any side effects. James Tabor judged the assert to have a "questionable logic". Giannis who once added it, was also ok with commenting it. His words: This assertion isn't something fatal, the worst thing that can happen from continuing on it would be to make the thread get awake more times than it should. It was commented out already on 2020-04-21 via 0.4.14-dev-1519-g 87f6c82d854583f71546841f4432f57e4a2d6c99 --- win32ss/user/ntuser/misc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/win32ss/user/ntuser/misc.c b/win32ss/user/ntuser/misc.c index 00393431603..8fa8b0edb4d 100644 --- a/win32ss/user/ntuser/misc.c +++ b/win32ss/user/ntuser/misc.c @@ -749,8 +749,6 @@ void UserDbgAssertThreadInfo(BOOL showCaller) ASSERT(pci->ulClientDelta == DesktopHeapGetUserDelta()); if (pti->pcti && pci->pDeskInfo) ASSERT(pci->pClientThreadInfo == (PVOID)((ULONG_PTR)pti->pcti - pci->ulClientDelta)); - //if (pti->pcti && IsListEmpty(&pti->SentMessagesListHead)) - // ASSERT((pti->pcti->fsChangeBits & QS_SENDMESSAGE) == 0); if (pti->KeyboardLayout) ASSERT(pci->hKL == pti->KeyboardLayout->hkl); if(pti->rpdesk != NULL)

2 years, 10 months

[reactos] 01/01: [CONSRV] Introduce a CON_SET_OUTPUT_CP() macro to simplify setting the console's output CP + associated changes. Simplify ConDrvSetConsoleCP() as well.

by Hermès Bélusca-Maïto

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f79c02bd8a9797ab18078… commit f79c02bd8a9797ab1807884862928ffb817d2d54 Author: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> AuthorDate: Thu Jan 27 21:36:16 2022 +0100 Commit: Hermès Bélusca-Maïto <hermes.belusca-maito(a)reactos.org> CommitDate: Fri Feb 4 21:35:15 2022 +0100 [CONSRV] Introduce a CON_SET_OUTPUT_CP() macro to simplify setting the console's output CP + associated changes. Simplify ConDrvSetConsoleCP() as well. --- win32ss/user/winsrv/consrv/condrv/console.c | 24 +++++++++++------------- win32ss/user/winsrv/consrv/include/conio.h | 6 ++++++ win32ss/user/winsrv/consrv/settings.c | 4 ++-- 3 files changed, 19 insertions(+), 15 deletions(-) diff --git a/win32ss/user/winsrv/consrv/condrv/console.c b/win32ss/user/winsrv/consrv/condrv/console.c index fae7beb7de3..74d2229b4db 100644 --- a/win32ss/user/winsrv/consrv/condrv/console.c +++ b/win32ss/user/winsrv/consrv/condrv/console.c @@ -116,9 +116,10 @@ ConDrvInitConsole( /* Set-up the code page */ if (IsValidCodePage(ConsoleInfo->CodePage)) - Console->InputCodePage = Console->OutputCodePage = ConsoleInfo->CodePage; - - Console->IsCJK = IsCJKCodePage(Console->OutputCodePage); + { + CON_SET_OUTPUT_CP(Console, ConsoleInfo->CodePage); + Console->InputCodePage = ConsoleInfo->CodePage; + } /* Initialize a new text-mode screen buffer with default settings */ ScreenBufferInfo.ScreenBufferSize = ConsoleInfo->ScreenBufferSize; @@ -424,27 +425,24 @@ ConDrvSetConsoleCP(IN PCONSOLE Console, IN UINT CodePage, IN BOOLEAN OutputCP) { - BOOL Success = TRUE; - if (Console == NULL || !IsValidCodePage(CodePage)) return STATUS_INVALID_PARAMETER; if (OutputCP) { /* Request the terminal to change its code page support */ - Success = TermSetCodePage(Console, CodePage); - if (Success) - { - Console->OutputCodePage = CodePage; - Console->IsCJK = IsCJKCodePage(CodePage); - } + if (!TermSetCodePage(Console, CodePage)) + return STATUS_UNSUCCESSFUL; + + /* All is fine, actually set the output code page */ + CON_SET_OUTPUT_CP(Console, CodePage); + return STATUS_SUCCESS; } else { Console->InputCodePage = CodePage; + return STATUS_SUCCESS; } - - return (Success ? STATUS_SUCCESS : STATUS_UNSUCCESSFUL); } /* EOF */ diff --git a/win32ss/user/winsrv/consrv/include/conio.h b/win32ss/user/winsrv/consrv/include/conio.h index ead041e51df..0c8ae92631c 100644 --- a/win32ss/user/winsrv/consrv/include/conio.h +++ b/win32ss/user/winsrv/consrv/include/conio.h @@ -320,6 +320,12 @@ ConDrvUnpause(PCONSOLE Console); #define GetConsoleInputBufferMode(Console) \ (Console)->InputBuffer.Mode +#define CON_SET_OUTPUT_CP(Console, CodePage)\ +do { \ + (Console)->OutputCodePage = (CodePage); \ + (Console)->IsCJK = IsCJKCodePage((Console)->OutputCodePage); \ +} while (0) + /* conoutput.c */ PCHAR_INFO ConioCoordToPointer(PTEXTMODE_SCREEN_BUFFER Buff, ULONG X, ULONG Y); diff --git a/win32ss/user/winsrv/consrv/settings.c b/win32ss/user/winsrv/consrv/settings.c index 22cccc2d81c..4594d6e8e6d 100644 --- a/win32ss/user/winsrv/consrv/settings.c +++ b/win32ss/user/winsrv/consrv/settings.c @@ -68,8 +68,8 @@ ConSrvApplyUserSettings( // ConDrvSetConsoleCP(Console, ConsoleInfo->CodePage, FALSE); // Input if (TermSetCodePage(Console, ConsoleInfo->CodePage)) { - Console->InputCodePage = Console->OutputCodePage = ConsoleInfo->CodePage; - Console->IsCJK = IsCJKCodePage(Console->OutputCodePage); + CON_SET_OUTPUT_CP(Console, ConsoleInfo->CodePage); + Console->InputCodePage = ConsoleInfo->CodePage; } }

2 years, 10 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2022