From ab92cfe0a005399b984907d3c5df75f93cf01361 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Wed, 5 May 2004 05:54:44 +0000 Subject: [PATCH] Replaced LPINPUT_RECORD by PINPUT_RECORD. --- dlls/kernel/console.c | 10 +++++----- include/wincon.h | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel/console.c b/dlls/kernel/console.c index a05776bf5de..946af83468e 100644 --- a/dlls/kernel/console.c +++ b/dlls/kernel/console.c @@ -782,7 +782,7 @@ BOOL WINAPI ReadConsoleOutputW( HANDLE hConsoleOutput, LPCHAR_INFO lpBuffer, COO * Success: TRUE * Failure: FALSE */ -BOOL WINAPI ReadConsoleInputA( HANDLE handle, LPINPUT_RECORD buffer, DWORD count, LPDWORD pRead ) +BOOL WINAPI ReadConsoleInputA( HANDLE handle, PINPUT_RECORD buffer, DWORD count, LPDWORD pRead ) { DWORD read; @@ -798,7 +798,7 @@ BOOL WINAPI ReadConsoleInputA( HANDLE handle, LPINPUT_RECORD buffer, DWORD count * * Gets 'count' first events (or less) from input queue. */ -BOOL WINAPI PeekConsoleInputA( HANDLE handle, LPINPUT_RECORD buffer, DWORD count, LPDWORD pRead ) +BOOL WINAPI PeekConsoleInputA( HANDLE handle, PINPUT_RECORD buffer, DWORD count, LPDWORD pRead ) { DWORD read; @@ -812,7 +812,7 @@ BOOL WINAPI PeekConsoleInputA( HANDLE handle, LPINPUT_RECORD buffer, DWORD count /*********************************************************************** * PeekConsoleInputW (KERNEL32.@) */ -BOOL WINAPI PeekConsoleInputW( HANDLE handle, LPINPUT_RECORD buffer, DWORD count, LPDWORD read ) +BOOL WINAPI PeekConsoleInputW( HANDLE handle, PINPUT_RECORD buffer, DWORD count, LPDWORD read ) { BOOL ret; SERVER_START_REQ( read_console_input ) @@ -859,7 +859,7 @@ BOOL WINAPI GetNumberOfConsoleInputEvents( HANDLE handle, LPDWORD nrofevents ) * 0 for error, 1 for no INPUT_RECORD ready, 2 with INPUT_RECORD ready */ enum read_console_input_return {rci_error = 0, rci_timeout = 1, rci_gotone = 2}; -static enum read_console_input_return read_console_input(HANDLE handle, LPINPUT_RECORD ir, DWORD timeout) +static enum read_console_input_return read_console_input(HANDLE handle, PINPUT_RECORD ir, DWORD timeout) { enum read_console_input_return ret; @@ -1257,7 +1257,7 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, /*********************************************************************** * ReadConsoleInputW (KERNEL32.@) */ -BOOL WINAPI ReadConsoleInputW(HANDLE hConsoleInput, LPINPUT_RECORD lpBuffer, +BOOL WINAPI ReadConsoleInputW(HANDLE hConsoleInput, PINPUT_RECORD lpBuffer, DWORD nLength, LPDWORD lpNumberOfEventsRead) { DWORD idx = 0; diff --git a/include/wincon.h b/include/wincon.h index b35bcca70fa..76072150585 100644 --- a/include/wincon.h +++ b/include/wincon.h @@ -160,7 +160,7 @@ typedef struct tagINPUT_RECORD MENU_EVENT_RECORD MenuEvent; FOCUS_EVENT_RECORD FocusEvent; } Event; -} INPUT_RECORD,*LPINPUT_RECORD; +} INPUT_RECORD,*PINPUT_RECORD; /* INPUT_RECORD.wEventType */ #define KEY_EVENT 0x01 @@ -214,17 +214,17 @@ DWORD WINAPI GetConsoleTitleW(LPWSTR title, DWORD size); #define GetConsoleTitle WINELIB_NAME_AW(GetConsoleTitle) BOOL WINAPI GetNumberOfConsoleInputEvents( HANDLE hcon,LPDWORD nrofevents); BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD nrofbuttons); -BOOL WINAPI PeekConsoleInputA( HANDLE handle, LPINPUT_RECORD buffer, DWORD count, LPDWORD read ); -BOOL WINAPI PeekConsoleInputW( HANDLE handle, LPINPUT_RECORD buffer, DWORD count, LPDWORD read ); +BOOL WINAPI PeekConsoleInputA( HANDLE handle, PINPUT_RECORD buffer, DWORD count, LPDWORD read ); +BOOL WINAPI PeekConsoleInputW( HANDLE handle, PINPUT_RECORD buffer, DWORD count, LPDWORD read ); #define PeekConsoleInput WINELIB_NAME_AW(PeekConsoleInput) BOOL WINAPI ReadConsoleA(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfCharsToRead, LPDWORD lpNumberOfCharsRead, LPVOID lpReserved); BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfCharsToRead, LPDWORD lpNumberOfCharsRead, LPVOID lpReserved); #define ReadConsole WINELIB_NAME_AW(ReadConsole) -BOOL WINAPI ReadConsoleInputA(HANDLE hConsoleInput, LPINPUT_RECORD lpBuffer, DWORD nLength, +BOOL WINAPI ReadConsoleInputA(HANDLE hConsoleInput, PINPUT_RECORD lpBuffer, DWORD nLength, LPDWORD lpNumberOfEventsRead); -BOOL WINAPI ReadConsoleInputW(HANDLE hConsoleInput, LPINPUT_RECORD lpBuffer, DWORD nLength, +BOOL WINAPI ReadConsoleInputW(HANDLE hConsoleInput, PINPUT_RECORD lpBuffer, DWORD nLength, LPDWORD lpNumberOfEventsRead); #define ReadConsoleInput WINELIB_NAME_AW(ReadConsoleInput) BOOL WINAPI ReadConsoleOutputA( HANDLE hConsoleOutput, LPCHAR_INFO lpBuffer, COORD dwBufferSize,