Try to load the correct font when booting with /CONSOLE switch

svn path=/trunk/; revision=40965
This commit is contained in:
Hervé Poussineau 2009-05-18 12:43:12 +00:00
parent 05a7fd23a3
commit e0c3b779fc

View file

@ -32,7 +32,7 @@ TuiConsoleWndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
}
static BOOL FASTCALL
TuiInit(VOID)
TuiInit(DWORD OemCP)
{
CONSOLE_SCREEN_BUFFER_INFO ScrInfo;
DWORD BytesReturned;
@ -46,6 +46,14 @@ TuiInit(VOID)
return FALSE;
}
if (!DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_LOADFONT,
&OemCP, sizeof(OemCP), NULL, 0,
&BytesReturned, NULL))
{
DPRINT("Failed to load the font for codepage %d\n", OemCP);
/* Let's suppose the font is good enough to continue */
}
ActiveConsole = NULL;
InitializeCriticalSection(&ActiveConsoleLock);
if (! DeviceIoControl(ConsoleDeviceHandle, IOCTL_CONSOLE_GET_SCREEN_BUFFER_INFO,
@ -304,7 +312,7 @@ TuiInitConsole(PCSRSS_CONSOLE Console)
if (! ConsInitialized)
{
ConsInitialized = TRUE;
if (! TuiInit())
if (! TuiInit(Console->CodePage))
{
ConsInitialized = FALSE;
return STATUS_UNSUCCESSFUL;