lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-08 08:52:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

[USETUP] Minor improvements when initializing the console.

Browse Source 
- Use NT values for uninitialized handle values.
- Cache the STD_INPUT_HANDLE.
- Free the console if GetConsoleScreenBufferInfo() fails in CONSOLE_Init().
This commit is contained in:
Hermès Bélusca-Maïto
2021-01-03 00:10:03 +01:00
parent 8b94515bd3
commit 0abff65a55
1 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
base/setup/usetup/consup.c
View File

@@ -33,8 +33,8 @@
/* GLOBALS ******************************************************************/
HANDLE StdInput = INVALID_HANDLE_VALUE;
HANDLE StdOutput = INVALID_HANDLE_VALUE;
HANDLE StdInput = NULL;
HANDLE StdOutput = NULL;
SHORT xScreen = 0;
SHORT yScreen = 0;
@@ -45,15 +45,24 @@ BOOLEAN
CONSOLE_Init(VOID)
{
CONSOLE_SCREEN_BUFFER_INFO csbi;
/* Allocate a new console */
if (!AllocConsole())
return FALSE;
StdInput = GetStdHandle(STD_INPUT_HANDLE);
/* Get the standard handles */
StdInput = GetStdHandle(STD_INPUT_HANDLE);
StdOutput = GetStdHandle(STD_OUTPUT_HANDLE);
/* Retrieve the size of the console */
if (!GetConsoleScreenBufferInfo(StdOutput, &csbi))
{
FreeConsole();
return FALSE;
}
xScreen = csbi.dwSize.X;
yScreen = csbi.dwSize.Y;
return TRUE;
}
@@ -175,7 +184,7 @@ CONSOLE_GetCursorXY(
{
CONSOLE_SCREEN_BUFFER_INFO csbi;
GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi);
GetConsoleScreenBufferInfo(StdOutput, &csbi);
*x = csbi.dwCursorPosition.X;
*y = csbi.dwCursorPosition.Y;