[PATCH 1/2] kernel32/tests: Add tests for the current console font size

Hugh McMaster hugh.mcmaster at outlook.com
Mon Nov 15 05:18:23 CST 2021


Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 dlls/kernel32/tests/console.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index 0bce88716d0..7c74ddf195a 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -3437,6 +3437,7 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output)
     BOOL ret;
     HANDLE std_input = GetStdHandle(STD_INPUT_HANDLE);
     HANDLE pipe1, pipe2;
+    COORD c;
 
     hmod = GetModuleHandleA("kernel32.dll");
     pGetCurrentConsoleFontEx = (void *)GetProcAddress(hmod, "GetCurrentConsoleFontEx");
@@ -3521,6 +3522,21 @@ static void test_GetCurrentConsoleFontEx(HANDLE std_output)
     ok(cfix.dwFontSize.X == cfi.dwFontSize.X, "expected values to match\n");
     ok(cfix.dwFontSize.Y == cfi.dwFontSize.Y, "expected values to match\n");
 
+    SetLastError(0xdeadbeef);
+    c = GetConsoleFontSize(std_output, cfix.nFont);
+    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",
+       cfix.dwFontSize.X, c.X);
+    todo_wine 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",
+       cfi.dwFontSize.X, c.X);
+    todo_wine ok(cfi.dwFontSize.Y == c.Y, "Font height doesn't match; got %u, expected %u\n",
+       cfi.dwFontSize.Y, c.Y);
+
     SetLastError(0xdeadbeef);
     ret = pGetCurrentConsoleFontEx(std_output, TRUE, &cfix);
     ok(ret, "got %d, expected non-zero\n", ret);
-- 
2.33.1




More information about the wine-devel mailing list