Jacek Caban : kernelbase: Use IOCTL_CONDRV_GET_MODE in GetConsoleMode.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 48a23dbd432d8dbeaa884fe656105d902729f8de
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=48a23dbd432d8dbeaa884fe656105d902729f8de

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Mon Jul 13 13:26:40 2020 +0200

kernelbase: Use IOCTL_CONDRV_GET_MODE in GetConsoleMode.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/kernel32/tests/console.c |  2 +-
 dlls/kernelbase/console.c     | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c
index b923348015..49869948e9 100644
--- a/dlls/kernel32/tests/console.c
+++ b/dlls/kernel32/tests/console.c
@@ -822,7 +822,7 @@ static void testScreenBuffer(HANDLE hConOut)
     ret = WriteConsoleA(hFileOutWT, test_str1, lstrlenA(test_str1), &len, NULL);
     error = GetLastError();
     ok(!ret, "Shouldn't succeed\n");
-    todo_wine ok(error == ERROR_INVALID_HANDLE || error == ERROR_INVALID_FUNCTION,
+    ok(error == ERROR_INVALID_HANDLE || error == ERROR_INVALID_FUNCTION,
        "GetLastError: got %u\n", error);
 
     CloseHandle(hFileOutRW);
diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c
index cc30a11d68..52fd5bb39c 100644
--- a/dlls/kernelbase/console.c
+++ b/dlls/kernelbase/console.c
@@ -610,18 +610,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleInputExeNameW( DWORD len, LPWSTR buffer
  */
 BOOL WINAPI DECLSPEC_HOTPATCH GetConsoleMode( HANDLE handle, DWORD *mode )
 {
-    BOOL ret;
-
-    SERVER_START_REQ( get_console_mode )
-    {
-        req->handle = console_handle_unmap( handle );
-        if ((ret = !wine_server_call_err( req )))
-        {
-            if (mode) *mode = reply->mode;
-        }
-    }
-    SERVER_END_REQ;
-    return ret;
+    return console_ioctl( handle, IOCTL_CONDRV_GET_MODE, NULL, 0, mode, sizeof(*mode), NULL );
 }