[1/2] kernel32/tests: Add more tests for GetConsoleFontInfo. (v4)
Sebastian Lackner
sebastian at fds-team.de
Mon May 2 19:06:50 CDT 2016
From: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
---
Changes in v4:
* Fix wrong indentation in two lines.
* Remove test of GetLastError() when GetConsoleFontInfo is successful.
dlls/kernel32/tests/console.c | 59 +++++++++++++++++++++++++++++++++++++-----
1 file changed, 52 insertions(+), 7 deletions(-)
diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index 3f627be..3f72573 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,6 +2811,12 @@ 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);
@@ -2834,22 +2840,61 @@ static void test_GetConsoleFontInfo(HANDLE std_output)
index = cfi[0].nFont;
orig_font = GetConsoleFontSize(std_output, index);
- SetLastError(0xdeadbeef);
+ memset(cfi, 0, memsize);
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++)
{
+ ok(cfi[i].nFont == i, "element out of order, got nFont %d, expected %d\n", cfi[i].nFont, 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);
}
+
+ 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());
+
+ 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());
+
+ 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());
+
+ memset(cfi, 0, memsize);
+ ret = pGetConsoleFontInfo(std_output, TRUE, num_fonts, cfi);
+ todo_wine ok(ret, "got %d, expected non-zero\n", ret);
+
+ 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++)
+ {
+ ok(cfi[i].nFont == i, "element out of order, got nFont %d, expected %d\n", cfi[i].nFont, 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)
--
2.8.0
More information about the wine-patches
mailing list