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

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>

kernel32: Return font size, not screen buffer size, from GetCurrentConsoleFontEx.
4e351b47 · Hugh McMaster · Alexandre Julliard · e4f3d787 · 4e351b47 · 4e351b47
Commit 4e351b47 authored Nov 15, 2021 by Hugh McMaster Committed by Alexandre Julliard Nov 15, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

console.c dlls/kernel32/console.c +2 -2

console.c dlls/kernel32/tests/console.c +4 -4

No files found.
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -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 );

--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -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);