Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-07 11:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[USETUP] Minor formatting only.

Browse source
This commit is contained in:
Hermès Bélusca-Maïto 2020-10-02 00:04:11 +02:00
parent 0733d96d9d
commit 66302e477c
No known key found for this signature in database
GPG key ID: 3B2539C65E7B93D0
2 changed files with 155 additions and 174 deletions
Download patch file Download diff file Expand all files Collapse all files

304
base/setup/usetup/consup.c
View file

@ -42,8 +42,7 @@ SHORT yScreen = 0;
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
BOOLEAN BOOLEAN
CONSOLE_Init( CONSOLE_Init(VOID)
VOID)
{ {
CONSOLE_SCREEN_BUFFER_INFO csbi; CONSOLE_SCREEN_BUFFER_INFO csbi;
if (!AllocConsole()) if (!AllocConsole())
@ -108,12 +107,11 @@ CONSOLE_ConOutChar(
{ {
DWORD Written; DWORD Written;
WriteConsole( WriteConsole(StdOutput,
StdOutput, &c,
&c, 1,
1, &Written,
&Written, NULL);
NULL);
} }
VOID VOID
@ -122,18 +120,16 @@ CONSOLE_ConOutPuts(
{ {
DWORD Written; DWORD Written;
WriteConsole( WriteConsole(StdOutput,
StdOutput, szText,
szText, (ULONG)strlen(szText),
(ULONG)strlen(szText), &Written,
&Written, NULL);
NULL); WriteConsole(StdOutput,
WriteConsole( "\n",
StdOutput, 1,
"\n", &Written,
1, NULL);
&Written,
NULL);
} }
VOID VOID
@ -146,12 +142,11 @@ CONSOLE_ConOutPrintfV(
vsprintf(szOut, szFormat, args); vsprintf(szOut, szFormat, args);
WriteConsole( WriteConsole(StdOutput,
StdOutput, szOut,
szOut, (ULONG)strlen(szOut),
(ULONG)strlen(szOut), &dwWritten,
&dwWritten, NULL);
NULL);
} }
VOID VOID
@ -175,8 +170,8 @@ CONSOLE_Flush(VOID)
VOID VOID
CONSOLE_GetCursorXY( CONSOLE_GetCursorXY(
PSHORT x, OUT PSHORT x,
PSHORT y) OUT PSHORT y)
{ {
CONSOLE_SCREEN_BUFFER_INFO csbi; CONSOLE_SCREEN_BUFFER_INFO csbi;
@ -240,19 +235,17 @@ CONSOLE_ClearScreen(VOID)
coPos.X = 0; coPos.X = 0;
coPos.Y = 0; coPos.Y = 0;
FillConsoleOutputAttribute( FillConsoleOutputAttribute(StdOutput,
StdOutput, FOREGROUND_WHITE | BACKGROUND_BLUE,
FOREGROUND_WHITE | BACKGROUND_BLUE, xScreen * yScreen,
xScreen * yScreen, coPos,
coPos, &Written);
&Written);
FillConsoleOutputCharacterA( FillConsoleOutputCharacterA(StdOutput,
StdOutput, ' ',
' ', xScreen * yScreen,
xScreen * yScreen, coPos,
coPos, &Written);
&Written);
} }
VOID VOID
@ -269,12 +262,11 @@ CONSOLE_InvertTextXY(
{ {
coPos.X = x; coPos.X = x;
FillConsoleOutputAttribute( FillConsoleOutputAttribute(StdOutput,
StdOutput, FOREGROUND_BLUE | BACKGROUND_WHITE,
FOREGROUND_BLUE | BACKGROUND_WHITE, col,
col, coPos,
coPos, &Written);
&Written);
} }
} }
@ -292,12 +284,11 @@ CONSOLE_NormalTextXY(
{ {
coPos.X = x; coPos.X = x;
FillConsoleOutputAttribute( FillConsoleOutputAttribute(StdOutput,
StdOutput, FOREGROUND_WHITE | BACKGROUND_BLUE,
FOREGROUND_WHITE | BACKGROUND_BLUE, col,
col, coPos,
coPos, &Written);
&Written);
} }
} }
@ -313,12 +304,11 @@ CONSOLE_SetTextXY(
coPos.X = x; coPos.X = x;
coPos.Y = y; coPos.Y = y;
WriteConsoleOutputCharacterA( WriteConsoleOutputCharacterA(StdOutput,
StdOutput, Text,
Text, (ULONG)strlen(Text),
(ULONG)strlen(Text), coPos,
coPos, &Written);
&Written);
} }
VOID VOID
@ -357,29 +347,26 @@ CONSOLE_SetInputTextXY(
if (Length > len - 1) if (Length > len - 1)
Length = len - 1; Length = len - 1;
FillConsoleOutputAttribute( FillConsoleOutputAttribute(StdOutput,
StdOutput, BACKGROUND_WHITE,
BACKGROUND_WHITE, len,
len, coPos,
coPos, &Written);
&Written);
WriteConsoleOutputCharacterW( WriteConsoleOutputCharacterW(StdOutput,
StdOutput, Text,
Text, (ULONG)Length,
(ULONG)Length, coPos,
coPos, &Written);
&Written);
coPos.X += Length; coPos.X += Length;
if (len > Length) if (len > Length)
{ {
FillConsoleOutputCharacterA( FillConsoleOutputCharacterA(StdOutput,
StdOutput, ' ',
' ', len - Length,
len - Length, coPos,
coPos, &Written);
&Written);
} }
} }
@ -398,20 +385,18 @@ CONSOLE_SetUnderlinedTextXY(
Length = (ULONG)strlen(Text); Length = (ULONG)strlen(Text);
WriteConsoleOutputCharacterA( WriteConsoleOutputCharacterA(StdOutput,
StdOutput, Text,
Text, Length,
Length, coPos,
coPos, &Written);
&Written);
coPos.Y++; coPos.Y++;
FillConsoleOutputCharacterA( FillConsoleOutputCharacterA(StdOutput,
StdOutput, 0xCD,
0xCD, Length,
Length, coPos,
coPos, &Written);
&Written);
} }
VOID VOID
@ -429,28 +414,25 @@ CONSOLE_SetStatusTextXV(
coPos.X = 0; coPos.X = 0;
coPos.Y = yScreen - 1; coPos.Y = yScreen - 1;
FillConsoleOutputAttribute( FillConsoleOutputAttribute(StdOutput,
StdOutput, BACKGROUND_WHITE,
BACKGROUND_WHITE, xScreen,
xScreen, coPos,
coPos, &Written);
&Written);
FillConsoleOutputCharacterA( FillConsoleOutputCharacterA(StdOutput,
StdOutput, ' ',
' ', xScreen,
xScreen, coPos,
coPos, &Written);
&Written);
coPos.X = x; coPos.X = x;
WriteConsoleOutputCharacterA( WriteConsoleOutputCharacterA(StdOutput,
StdOutput, Buffer,
Buffer, (ULONG)strlen(Buffer),
(ULONG)strlen(Buffer), coPos,
coPos, &Written);
&Written);
} }
VOID VOID
@ -490,8 +472,9 @@ CONSOLE_SetStatusText(
static static
VOID VOID
CONSOLE_ClearStatusTextX(IN SHORT x, CONSOLE_ClearStatusTextX(
IN SHORT Length) IN SHORT x,
IN SHORT Length)
{ {
COORD coPos; COORD coPos;
DWORD Written; DWORD Written;
@ -506,12 +489,12 @@ CONSOLE_ClearStatusTextX(IN SHORT x,
&Written); &Written);
} }
VOID VOID
__cdecl __cdecl
CONSOLE_SetStatusTextAutoFitX( CONSOLE_SetStatusTextAutoFitX(
IN SHORT x, IN SHORT x,
IN LPCSTR fmt, ...) IN LPCSTR fmt,
...)
{ {
CHAR Buffer[128]; CHAR Buffer[128];
DWORD Length; DWORD Length;
@ -525,11 +508,11 @@ CONSOLE_SetStatusTextAutoFitX(
if (Length + x <= 79) if (Length + x <= 79)
{ {
CONSOLE_SetStatusTextX (x , Buffer); CONSOLE_SetStatusTextX(x , Buffer);
} }
else else
{ {
CONSOLE_SetStatusTextX (79 - Length , Buffer); CONSOLE_SetStatusTextX(79 - Length , Buffer);
} }
} }
@ -548,19 +531,17 @@ CONSOLE_SetInvertedTextXY(
Length = (ULONG)strlen(Text); Length = (ULONG)strlen(Text);
FillConsoleOutputAttribute( FillConsoleOutputAttribute(StdOutput,
StdOutput, FOREGROUND_BLUE | BACKGROUND_WHITE,
FOREGROUND_BLUE | BACKGROUND_WHITE, Length,
Length, coPos,
coPos, &Written);
&Written);
WriteConsoleOutputCharacterA( WriteConsoleOutputCharacterA(StdOutput,
StdOutput, Text,
Text, Length,
Length, coPos,
coPos, &Written);
&Written);
} }
VOID VOID
@ -578,19 +559,17 @@ CONSOLE_SetHighlightedTextXY(
Length = (ULONG)strlen(Text); Length = (ULONG)strlen(Text);
FillConsoleOutputAttribute( FillConsoleOutputAttribute(StdOutput,
StdOutput, FOREGROUND_WHITE | FOREGROUND_INTENSITY | BACKGROUND_BLUE,
FOREGROUND_WHITE | FOREGROUND_INTENSITY | BACKGROUND_BLUE, Length,
Length, coPos,
coPos, &Written);
&Written);
WriteConsoleOutputCharacterA( WriteConsoleOutputCharacterA(StdOutput,
StdOutput, Text,
Text, Length,
Length, coPos,
coPos, &Written);
&Written);
} }
VOID VOID
@ -598,7 +577,8 @@ __cdecl
CONSOLE_PrintTextXY( CONSOLE_PrintTextXY(
IN SHORT x, IN SHORT x,
IN SHORT y, IN SHORT y,
IN LPCSTR fmt, ...) IN LPCSTR fmt,
...)
{ {
CHAR buffer[512]; CHAR buffer[512];
va_list ap; va_list ap;
@ -612,12 +592,11 @@ CONSOLE_PrintTextXY(
coPos.X = x; coPos.X = x;
coPos.Y = y; coPos.Y = y;
WriteConsoleOutputCharacterA( WriteConsoleOutputCharacterA(StdOutput,
StdOutput, buffer,
buffer, (ULONG)strlen(buffer),
(ULONG)strlen(buffer), coPos,
coPos, &Written);
&Written);
} }
VOID VOID
@ -626,7 +605,8 @@ CONSOLE_PrintTextXYN(
IN SHORT x, IN SHORT x,
IN SHORT y, IN SHORT y,
IN SHORT len, IN SHORT len,
IN LPCSTR fmt, ...) IN LPCSTR fmt,
...)
{ {
CHAR buffer[512]; CHAR buffer[512];
va_list ap; va_list ap;
@ -645,23 +625,21 @@ CONSOLE_PrintTextXYN(
if (Length > len - 1) if (Length > len - 1)
Length = len - 1; Length = len - 1;
WriteConsoleOutputCharacterA( WriteConsoleOutputCharacterA(StdOutput,
StdOutput, buffer,
buffer, Length,
Length, coPos,
coPos, &Written);
&Written);
coPos.X += Length; coPos.X += Length;
if (len > Length) if (len > Length)
{ {
FillConsoleOutputCharacterA( FillConsoleOutputCharacterA(StdOutput,
StdOutput, ' ',
' ', len - Length,
len - Length, coPos,
coPos, &Written);
&Written);
} }
} }
@ -693,7 +671,7 @@ CONSOLE_SetStyledText(
if (Flags & TEXT_ALIGN_CENTER) if (Flags & TEXT_ALIGN_CENTER)
{ {
coPos.X = (xScreen - Length) /2; coPos.X = (xScreen - Length) / 2;
} }
else if(Flags & TEXT_ALIGN_RIGHT) else if(Flags & TEXT_ALIGN_RIGHT)
{ {
@ -749,12 +727,12 @@ CONSOLE_SetStyledText(
} }
} }
VOID VOID
CONSOLE_ClearStyledText(IN SHORT x, CONSOLE_ClearStyledText(
IN SHORT y, IN SHORT x,
IN INT Flags, IN SHORT y,
IN SHORT Length) IN INT Flags,
IN SHORT Length)
{ {
COORD coPos; COORD coPos;
@ -774,7 +752,7 @@ CONSOLE_ClearStyledText(IN SHORT x,
if (Flags & TEXT_ALIGN_CENTER) if (Flags & TEXT_ALIGN_CENTER)
{ {
coPos.X = (xScreen - Length) /2; coPos.X = (xScreen - Length) / 2;
} }
else if(Flags & TEXT_ALIGN_RIGHT) else if(Flags & TEXT_ALIGN_RIGHT)
{ {

25
base/setup/usetup/consup.h
View file

@ -54,8 +54,7 @@ extern HANDLE StdInput, StdOutput;
extern SHORT xScreen, yScreen; extern SHORT xScreen, yScreen;
BOOLEAN BOOLEAN
CONSOLE_Init( CONSOLE_Init(VOID);
VOID);
VOID VOID
CONSOLE_ClearScreen(VOID); CONSOLE_ClearScreen(VOID);
@ -92,8 +91,8 @@ CONSOLE_Flush(VOID);
VOID VOID
CONSOLE_GetCursorXY( CONSOLE_GetCursorXY(
PSHORT x, OUT PSHORT x,
PSHORT y); OUT PSHORT y);
SHORT SHORT
CONSOLE_GetCursorX(VOID); CONSOLE_GetCursorX(VOID);
@ -120,7 +119,8 @@ __cdecl
CONSOLE_PrintTextXY( CONSOLE_PrintTextXY(
IN SHORT x, IN SHORT x,
IN SHORT y, IN SHORT y,
IN LPCSTR fmt, ...); IN LPCSTR fmt,
...);
VOID VOID
__cdecl __cdecl
@ -128,7 +128,8 @@ CONSOLE_PrintTextXYN(
IN SHORT x, IN SHORT x,
IN SHORT y, IN SHORT y,
IN SHORT len, IN SHORT len,
IN LPCSTR fmt, ...); IN LPCSTR fmt,
...);
VOID VOID
CONSOLE_SetCursorType( CONSOLE_SetCursorType(
@ -192,7 +193,8 @@ VOID
__cdecl __cdecl
CONSOLE_SetStatusTextAutoFitX( CONSOLE_SetStatusTextAutoFitX(
IN SHORT x, IN SHORT x,
IN LPCSTR fmt, ...); IN LPCSTR fmt,
...);
VOID VOID
CONSOLE_SetTextXY( CONSOLE_SetTextXY(
@ -220,9 +222,10 @@ CONSOLE_SetStyledText(
IN LPCSTR Text); IN LPCSTR Text);
VOID VOID
CONSOLE_ClearStyledText(IN SHORT x, CONSOLE_ClearStyledText(
IN SHORT y, IN SHORT x,
IN INT Flags, IN SHORT y,
IN SHORT Length); IN INT Flags,
IN SHORT Length);
/* EOF */ /* EOF */