Jacek Caban : kernelbase: Reimplement GetNumberOfConsoleInputEvents using IOCTL_CONDRV_GET_INPUT_INFO.

[Alexandre Julliard]

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

Author: Jacek Caban <jacek(a)codeweavers.com>
Date:   Mon Jul  6 19:27:08 2020 +0200

kernelbase: Reimplement GetNumberOfConsoleInputEvents using IOCTL_CONDRV_GET_INPUT_INFO.

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

---

 dlls/kernelbase/console.c | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c
index 2e90a905cb..f4af228436 100644
--- a/dlls/kernelbase/console.c
+++ b/dlls/kernelbase/console.c
@@ -36,6 +36,7 @@
 #include "winnls.h"
 #include "winerror.h"
 #include "wincon.h"
+#include "wine/condrv.h"
 #include "wine/server.h"
 #include "wine/exception.h"
 #include "wine/debug.h"
@@ -760,24 +761,11 @@ COORD WINAPI DECLSPEC_HOTPATCH GetLargestConsoleWindowSize( HANDLE handle )
  */
 BOOL WINAPI DECLSPEC_HOTPATCH GetNumberOfConsoleInputEvents( HANDLE handle, DWORD *count )
 {
-    BOOL ret;
-
-    SERVER_START_REQ( read_console_input )
-    {
-        req->handle = console_handle_unmap( handle );
-        req->flush  = FALSE;
-        if ((ret = !wine_server_call_err( req )))
-        {
-            if (count) *count = reply->read;
-            else
-            {
-                SetLastError( ERROR_INVALID_ACCESS );
-                ret = FALSE;
-            }
-        }
-    }
-    SERVER_END_REQ;
-    return ret;
+    struct condrv_input_info info;
+    if (!DeviceIoControl( handle, IOCTL_CONDRV_GET_INPUT_INFO, NULL, 0, &info, sizeof(info), NULL, NULL ))
+        return FALSE;
+    *count = info.input_count;
+    return TRUE;
 }