From 2c5756347bc4e9abcb656a7d1e001f60415b78b2 Mon Sep 17 00:00:00 2001 From: Hugh McMaster Date: Wed, 27 Jan 2016 14:55:16 +1100 Subject: [PATCH] kernel32: Implement the TRUE pathway of GetCurrentConsoleFont. Signed-off-by: Hugh McMaster Signed-off-by: Alexandre Julliard --- dlls/kernel32/console.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4767fb22b39..b86cd8e718b 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3267,20 +3267,21 @@ BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FON memset(fontinfo, 0, sizeof(CONSOLE_FONT_INFO)); - if (maxwindow) - { - FIXME(": (%p, %d, %p) stub!\n", hConsole, maxwindow, fontinfo); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } - SERVER_START_REQ(get_console_output_info) { req->handle = console_handle_unmap(hConsole); if ((ret = !wine_server_call_err(req))) { - fontinfo->dwFontSize.X = reply->win_right - reply->win_left + 1; - fontinfo->dwFontSize.Y = reply->win_bottom - reply->win_top + 1; + if (maxwindow) + { + fontinfo->dwFontSize.X = min(reply->width, reply->max_width); + fontinfo->dwFontSize.Y = min(reply->height, reply->max_height); + } + else + { + fontinfo->dwFontSize.X = reply->win_right - reply->win_left + 1; + fontinfo->dwFontSize.Y = reply->win_bottom - reply->win_top + 1; + } } } SERVER_END_REQ;