From: Joe Souza jsouza@yahoo.com
--- dlls/kernelbase/console.c | 2 +- include/consoleapi.h | 2 +- programs/conhost/tests/tty.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/kernelbase/console.c b/dlls/kernelbase/console.c index 8c90eb321df..cc020204e65 100644 --- a/dlls/kernelbase/console.c +++ b/dlls/kernelbase/console.c @@ -2112,7 +2112,7 @@ BOOL WINAPI ReadConsoleW( HANDLE handle, void *buffer, DWORD length, DWORD *coun tmp, sizeof(DWORD) + length * sizeof(WCHAR), count ); if (ret) { - memcpy( &crc->dwConsoleKeyState, tmp, sizeof(DWORD) ); + memcpy( &crc->dwControlKeyState, tmp, sizeof(DWORD) ); *count -= sizeof(DWORD); memcpy( buffer, tmp + sizeof(DWORD), *count ); } diff --git a/include/consoleapi.h b/include/consoleapi.h index 82f8dec8969..e78b1a12880 100644 --- a/include/consoleapi.h +++ b/include/consoleapi.h @@ -55,7 +55,7 @@ typedef struct _CONSOLE_READCONSOLE_CONTROL ULONG nLength; ULONG nInitialChars; ULONG dwCtrlWakeupMask; - ULONG dwConsoleKeyState; + ULONG dwControlKeyState; } CONSOLE_READCONSOLE_CONTROL,*LPCONSOLE_READCONSOLE_CONTROL;
#ifdef __cplusplus diff --git a/programs/conhost/tests/tty.c b/programs/conhost/tests/tty.c index 441bc17f04d..224a7ccc5cb 100644 --- a/programs/conhost/tests/tty.c +++ b/programs/conhost/tests/tty.c @@ -1681,11 +1681,11 @@ static void child_process(HANDLE pipe) crc.nLength = sizeof(crc); crc.dwCtrlWakeupMask = req->u.control.mask; crc.nInitialChars = wcslen(req->u.control.initial); - crc.dwConsoleKeyState = 0xa5; + crc.dwControlKeyState = 0xa5; memcpy(ptr, req->u.control.initial, crc.nInitialChars * sizeof(WCHAR)); ret = ReadConsoleW(input, ptr, count, &count, &crc); ok(ret, "ReadConsoleW failed: %lu\n", GetLastError()); - *(DWORD *)result = crc.dwConsoleKeyState; + *(DWORD *)result = crc.dwControlKeyState; ret = WriteFile(pipe, result, sizeof(DWORD) + count * sizeof(WCHAR), NULL, NULL); ok(ret, "WriteFile failed: %lu\n", GetLastError()); }