system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-21 10:36:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

kernel32: Return font size, not screen buffer size, from GetCurrentConsoleFontEx.

Browse source 
GetCurrentConsoleFontEx currently returns the screen buffer size when
maxwindow is FALSE. It should return the current console font size.

Signed-off-by: Hugh McMaster <hugh.mcmaster@outlook.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Hugh McMaster 2021-11-15 22:18:24 +11:00 committed by Alexandre Julliard
parent e4f3d78776
commit 4e351b47bf
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dlls/kernel32/console.c
View file

@ -407,8 +407,8 @@ BOOL WINAPI GetCurrentConsoleFontEx(HANDLE hConsole, BOOL maxwindow, CONSOLE_FON
}
else
{
fontinfo->dwFontSize.X = data.info.win_right - data.info.win_left + 1;
fontinfo->dwFontSize.Y = data.info.win_bottom - data.info.win_top + 1;
fontinfo->dwFontSize.X = data.info.font_width;
fontinfo->dwFontSize.Y = data.info.font_height;
}
size -= sizeof(data.info);
if (size) memcpy( fontinfo->FaceName, data.face_name, size );

8
dlls/kernel32/tests/console.c
View file

@ -3527,14 +3527,14 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output)
ok(c.X && c.Y, "GetConsoleFontSize failed; err = %u\n", GetLastError());
ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError());
todo_wine ok(cfix.dwFontSize.X == c.X, "Font width doesn't match; got %u, expected %u\n",
ok(cfix.dwFontSize.X == c.X, "Font width doesn't match; got %u, expected %u\n",
cfix.dwFontSize.X, c.X);
todo_wine ok(cfix.dwFontSize.Y == c.Y, "Font height doesn't match; got %u, expected %u\n",
ok(cfix.dwFontSize.Y == c.Y, "Font height doesn't match; got %u, expected %u\n",
cfix.dwFontSize.Y, c.Y);
todo_wine ok(cfi.dwFontSize.X == c.X, "Font width doesn't match; got %u, expected %u\n",
ok(cfi.dwFontSize.X == c.X, "Font width doesn't match; got %u, expected %u\n",
cfi.dwFontSize.X, c.X);
todo_wine ok(cfi.dwFontSize.Y == c.Y, "Font height doesn't match; got %u, expected %u\n",
ok(cfi.dwFontSize.Y == c.Y, "Font height doesn't match; got %u, expected %u\n",
cfi.dwFontSize.Y, c.Y);
SetLastError(0xdeadbeef);