Hugh McMaster : kernel32: Implement the FALSE pathway of GetCurrentConsoleFont.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a9277a9c34fbf6287b151eb87004c2a896d62e06
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a9277a9c34fbf6287b151eb870...

Author: Hugh McMaster <hugh.mcmaster(a)outlook.com>
Date:   Mon Oct 26 17:42:13 2015 +1100

kernel32: Implement the FALSE pathway of GetCurrentConsoleFont.

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/kernel32/console.c | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c
index 14f1189..c32dc49 100644
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -3236,9 +3236,28 @@ BOOL WINAPI SetConsoleIcon(HICON icon)
 
 BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FONT_INFO fontinfo)
 {
-    FIXME(": (%p, %d, %p) stub!\n", hConsole, maxwindow, fontinfo);
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
+    BOOL ret;
+
+    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;
+        }
+    }
+    SERVER_END_REQ;
+    return ret;
 }
 
 #ifdef __i386__