kernel32: Use NtDeviceIoControlFile directly for IOCTL_CONDRV_READ_CONSOLE and…

kernel32: Use NtDeviceIoControlFile directly for IOCTL_CONDRV_READ_CONSOLE and IOCTL_CONDRV_WRITE_CONSOLE. Avoids messing last error for non-conhost consoles. Signed-off-by: Jacek Caban <jacek@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernel32: Use NtDeviceIoControlFile directly for IOCTL_CONDRV_READ_CONSOLE and…
2fd27f0a · Jacek Caban · Alexandre Julliard · af0ae9df · 2fd27f0a
Commit 2fd27f0a authored Sep 15, 2020 by Jacek Caban Committed by Alexandre Julliard Sep 15, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 5 deletions

console.c dlls/kernel32/console.c +7 -5

No files found.
--- a/dlls/kernel32/console.c
+++ b/dlls/kernel32/console.c
@@ -526,6 +526,7 @@ BOOL WINAPI ReadConsoleA( HANDLE handle, LPVOID buffer, DWORD length, DWORD *ret
 BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer,
 			 DWORD nNumberOfCharsToRead, LPDWORD lpNumberOfCharsRead, LPVOID lpReserved)
 {
+    IO_STATUS_BLOCK io;
    DWORD	charsread;
    LPWSTR	xbuf = lpBuffer;
    DWORD	mode;
@@ -541,10 +542,10 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer,
        return FALSE;
    }
-    if (DeviceIoControl(hConsoleInput, IOCTL_CONDRV_READ_CONSOLE, NULL, 0, lpBuffer,
+    if (!NtDeviceIoControlFile(hConsoleInput, NULL, NULL, NULL, &io, IOCTL_CONDRV_READ_CONSOLE, NULL, 0, lpBuffer,
-                        nNumberOfCharsToRead * sizeof(WCHAR), lpNumberOfCharsRead, NULL))
+                               nNumberOfCharsToRead * sizeof(WCHAR)))
    {
-        *lpNumberOfCharsRead /= sizeof(WCHAR);
+        if (lpNumberOfCharsRead) *lpNumberOfCharsRead = io.Information / sizeof(WCHAR);
        return TRUE;
    }
@@ -794,6 +795,7 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber
    const WCHAR*		psz = lpBuffer;
    CONSOLE_SCREEN_BUFFER_INFO	csbi;
    int				k, first = 0, fd;
+    IO_STATUS_BLOCK io;
    TRACE("%p %s %d %p %p\n",
 	  hConsoleOutput, debugstr_wn(lpBuffer, nNumberOfCharsToWrite),
@@ -801,8 +803,8 @@ BOOL WINAPI WriteConsoleW(HANDLE hConsoleOutput, LPCVOID lpBuffer, DWORD nNumber
    if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = 0;
-    if (DeviceIoControl(hConsoleOutput, IOCTL_CONDRV_WRITE_CONSOLE, (void *)lpBuffer,
+    if (!NtDeviceIoControlFile(hConsoleOutput, NULL, NULL, NULL, &io, IOCTL_CONDRV_WRITE_CONSOLE, (void *)lpBuffer,
-                        nNumberOfCharsToWrite * sizeof(WCHAR), NULL, 0, NULL, NULL))
+                               nNumberOfCharsToWrite * sizeof(WCHAR), NULL, 0))
    {
        if (lpNumberOfCharsWritten) *lpNumberOfCharsWritten = nNumberOfCharsToWrite;
        return TRUE;