[PATCH v2] kernel32/tests: Add more tests for GetConsoleFontInfo
Hugh McMaster
hugh.mcmaster at outlook.com
Fri Apr 29 06:29:16 CDT 2016
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
dlls/kernel32/tests/console.c | 76 ++++++++++++++++++++++++++++++++++++++++---
1 file changed, 71 insertions(+), 5 deletions(-)
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index 3f627be..756eaba 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -2789,7 +2789,7 @@ static void test_GetConsoleFontInfo(HANDLE std_output)
CONSOLE_FONT_INFO *cfi;
BOOL ret;
CONSOLE_SCREEN_BUFFER_INFO csbi;
- COORD orig_font, tmp_font;
+ COORD orig_sb_size, tmp_sb_size, orig_font, tmp_font;
hmod = GetModuleHandleA("kernel32.dll");
pGetConsoleFontInfo = (void *)GetProcAddress(hmod, "GetConsoleFontInfo");
@@ -2811,20 +2811,35 @@ static void test_GetConsoleFontInfo(HANDLE std_output)
cfi = HeapAlloc(GetProcessHeap(), 0, memsize);
memset(cfi, 0, memsize);
+ GetConsoleScreenBufferInfo(std_output, &csbi);
+ orig_sb_size = csbi.dwSize;
+ tmp_sb_size.X = csbi.dwSize.X + 3;
+ tmp_sb_size.Y = csbi.dwSize.Y + 5;
+ SetConsoleScreenBufferSize(std_output, tmp_sb_size);
+
SetLastError(0xdeadbeef);
ret = pGetConsoleFontInfo(NULL, FALSE, 0, cfi);
ok(!ret, "got %d, expected zero\n", ret);
todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError());
+ ok(!cfi[0].nFont, "got %d, expected 0\n", cfi[0].nFont);
+ ok(!cfi[0].dwFontSize.X, "got %d, expected 0\n", cfi[0].dwFontSize.X);
+ ok(!cfi[0].dwFontSize.Y, "got %d, expected 0\n", cfi[0].dwFontSize.Y);
SetLastError(0xdeadbeef);
ret = pGetConsoleFontInfo(GetStdHandle(STD_INPUT_HANDLE), FALSE, 0, cfi);
ok(!ret, "got %d, expected zero\n", ret);
todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError());
+ ok(!cfi[0].nFont, "got %d, expected 0\n", cfi[0].nFont);
+ ok(!cfi[0].dwFontSize.X, "got %d, expected 0\n", cfi[0].dwFontSize.X);
+ ok(!cfi[0].dwFontSize.Y, "got %d, expected 0\n", cfi[0].dwFontSize.Y);
SetLastError(0xdeadbeef);
ret = pGetConsoleFontInfo(std_output, FALSE, 0, cfi);
ok(!ret, "got %d, expected zero\n", ret);
todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError());
+ ok(!cfi[0].nFont, "got %d, expected 0\n", cfi[0].nFont);
+ ok(!cfi[0].dwFontSize.X, "got %d, expected 0\n", cfi[0].dwFontSize.X);
+ ok(!cfi[0].dwFontSize.Y, "got %d, expected 0\n", cfi[0].dwFontSize.Y);
GetConsoleScreenBufferInfo(std_output, &csbi);
win_width = csbi.srWindow.Right - csbi.srWindow.Left + 1;
@@ -2834,22 +2849,73 @@ static void test_GetConsoleFontInfo(HANDLE std_output)
index = cfi[0].nFont;
orig_font = GetConsoleFontSize(std_output, index);
+ memset(cfi, 0, memsize);
SetLastError(0xdeadbeef);
ret = pGetConsoleFontInfo(std_output, FALSE, num_fonts, cfi);
todo_wine ok(ret, "got %d, expected non-zero\n", ret);
todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError());
- ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", cfi[index].dwFontSize.X, win_width);
- ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", cfi[index].dwFontSize.Y, win_height);
+ todo_wine ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n",
+ cfi[index].dwFontSize.X, win_width);
+ todo_wine ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n",
+ cfi[index].dwFontSize.Y, win_height);
for (i = 0; i < num_fonts; i++)
{
tmp_font = GetConsoleFontSize(std_output, cfi[i].nFont);
tmp_w = (double)orig_font.X / tmp_font.X * win_width;
tmp_h = (double)orig_font.Y / tmp_font.Y * win_height;
- ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w);
- ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h);
+ todo_wine ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w);
+ todo_wine ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h);
+ }
+
+ memset(cfi, 0, memsize);
+ SetLastError(0xdeadbeef);
+ ret = pGetConsoleFontInfo(NULL, TRUE, 0, cfi);
+ ok(!ret, "got %d, expected zero\n", ret);
+ todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError());
+ ok(!cfi[0].nFont, "got %d, expected 0\n", cfi[0].nFont);
+ ok(!cfi[0].dwFontSize.X, "got %d, expected 0\n", cfi[0].dwFontSize.X);
+ ok(!cfi[0].dwFontSize.Y, "got %d, expected 0\n", cfi[0].dwFontSize.Y);
+
+ SetLastError(0xdeadbeef);
+ ret = pGetConsoleFontInfo(GetStdHandle(STD_INPUT_HANDLE), TRUE, 0, cfi);
+ ok(!ret, "got %d, expected zero\n", ret);
+ todo_wine ok(GetLastError() == ERROR_INVALID_HANDLE, "got %u, expected 6\n", GetLastError());
+ ok(!cfi[0].nFont, "got %d, expected 0\n", cfi[0].nFont);
+ ok(!cfi[0].dwFontSize.X, "got %d, expected 0\n", cfi[0].dwFontSize.X);
+ ok(!cfi[0].dwFontSize.Y, "got %d, expected 0\n", cfi[0].dwFontSize.Y);
+
+ SetLastError(0xdeadbeef);
+ ret = pGetConsoleFontInfo(std_output, TRUE, 0, cfi);
+ ok(!ret, "got %d, expected zero\n", ret);
+ todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError());
+ ok(!cfi[0].nFont, "got %d, expected 0\n", cfi[0].nFont);
+ ok(!cfi[0].dwFontSize.X, "got %d, expected 0\n", cfi[0].dwFontSize.X);
+ ok(!cfi[0].dwFontSize.Y, "got %d, expected 0\n", cfi[0].dwFontSize.Y);
+
+ memset(cfi, 0, memsize);
+ SetLastError(0xdeadbeef);
+ ret = pGetConsoleFontInfo(std_output, TRUE, num_fonts, cfi);
+ todo_wine ok(ret, "got %d, expected non-zero\n", ret);
+ todo_wine ok(GetLastError() == 0xdeadbeef, "got %u, expected 0xdeadbeef\n", GetLastError());
+
+ todo_wine ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n",
+ cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X);
+ todo_wine ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n",
+ cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y);
+
+ for (i = 0; i < num_fonts; i++)
+ {
+ tmp_font = GetConsoleFontSize(std_output, cfi[i].nFont);
+ tmp_w = (double)orig_font.X / tmp_font.X * csbi.dwMaximumWindowSize.X;
+ tmp_h = (double)orig_font.Y / tmp_font.Y * csbi.dwMaximumWindowSize.Y;
+ todo_wine ok(cfi[i].dwFontSize.X == tmp_w, "got %d, expected %d\n", cfi[i].dwFontSize.X, tmp_w);
+ todo_wine ok(cfi[i].dwFontSize.Y == tmp_h, "got %d, expected %d\n", cfi[i].dwFontSize.Y, tmp_h);
}
+
+ HeapFree(GetProcessHeap(), 0, cfi);
+ SetConsoleScreenBufferSize(std_output, orig_sb_size);
}
START_TEST(console)
--
1.9.1
More information about the wine-patches
mailing list