Replaced LPINPUT_RECORD by PINPUT_RECORD.

This commit is contained in:
Alexandre Julliard 2004-05-05 05:54:44 +00:00
parent 26fe914d89
commit ab92cfe0a0
2 changed files with 10 additions and 10 deletions

View file

@ -782,7 +782,7 @@ BOOL WINAPI ReadConsoleOutputW( HANDLE hConsoleOutput, LPCHAR_INFO lpBuffer, COO
* Success: TRUE * Success: TRUE
* Failure: FALSE * 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; 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. * 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; DWORD read;
@ -812,7 +812,7 @@ BOOL WINAPI PeekConsoleInputA( HANDLE handle, LPINPUT_RECORD buffer, DWORD count
/*********************************************************************** /***********************************************************************
* PeekConsoleInputW (KERNEL32.@) * 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; BOOL ret;
SERVER_START_REQ( read_console_input ) 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 * 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}; 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; enum read_console_input_return ret;
@ -1257,7 +1257,7 @@ BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer,
/*********************************************************************** /***********************************************************************
* ReadConsoleInputW (KERNEL32.@) * ReadConsoleInputW (KERNEL32.@)
*/ */
BOOL WINAPI ReadConsoleInputW(HANDLE hConsoleInput, LPINPUT_RECORD lpBuffer, BOOL WINAPI ReadConsoleInputW(HANDLE hConsoleInput, PINPUT_RECORD lpBuffer,
DWORD nLength, LPDWORD lpNumberOfEventsRead) DWORD nLength, LPDWORD lpNumberOfEventsRead)
{ {
DWORD idx = 0; DWORD idx = 0;

View file

@ -160,7 +160,7 @@ typedef struct tagINPUT_RECORD
MENU_EVENT_RECORD MenuEvent; MENU_EVENT_RECORD MenuEvent;
FOCUS_EVENT_RECORD FocusEvent; FOCUS_EVENT_RECORD FocusEvent;
} Event; } Event;
} INPUT_RECORD,*LPINPUT_RECORD; } INPUT_RECORD,*PINPUT_RECORD;
/* INPUT_RECORD.wEventType */ /* INPUT_RECORD.wEventType */
#define KEY_EVENT 0x01 #define KEY_EVENT 0x01
@ -214,17 +214,17 @@ DWORD WINAPI GetConsoleTitleW(LPWSTR title, DWORD size);
#define GetConsoleTitle WINELIB_NAME_AW(GetConsoleTitle) #define GetConsoleTitle WINELIB_NAME_AW(GetConsoleTitle)
BOOL WINAPI GetNumberOfConsoleInputEvents( HANDLE hcon,LPDWORD nrofevents); BOOL WINAPI GetNumberOfConsoleInputEvents( HANDLE hcon,LPDWORD nrofevents);
BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD nrofbuttons); BOOL WINAPI GetNumberOfConsoleMouseButtons(LPDWORD nrofbuttons);
BOOL WINAPI PeekConsoleInputA( 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, LPINPUT_RECORD buffer, DWORD count, LPDWORD read ); BOOL WINAPI PeekConsoleInputW( HANDLE handle, PINPUT_RECORD buffer, DWORD count, LPDWORD read );
#define PeekConsoleInput WINELIB_NAME_AW(PeekConsoleInput) #define PeekConsoleInput WINELIB_NAME_AW(PeekConsoleInput)
BOOL WINAPI ReadConsoleA(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfCharsToRead, BOOL WINAPI ReadConsoleA(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfCharsToRead,
LPDWORD lpNumberOfCharsRead, LPVOID lpReserved); LPDWORD lpNumberOfCharsRead, LPVOID lpReserved);
BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfCharsToRead, BOOL WINAPI ReadConsoleW(HANDLE hConsoleInput, LPVOID lpBuffer, DWORD nNumberOfCharsToRead,
LPDWORD lpNumberOfCharsRead, LPVOID lpReserved); LPDWORD lpNumberOfCharsRead, LPVOID lpReserved);
#define ReadConsole WINELIB_NAME_AW(ReadConsole) #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); LPDWORD lpNumberOfEventsRead);
BOOL WINAPI ReadConsoleInputW(HANDLE hConsoleInput, LPINPUT_RECORD lpBuffer, DWORD nLength, BOOL WINAPI ReadConsoleInputW(HANDLE hConsoleInput, PINPUT_RECORD lpBuffer, DWORD nLength,
LPDWORD lpNumberOfEventsRead); LPDWORD lpNumberOfEventsRead);
#define ReadConsoleInput WINELIB_NAME_AW(ReadConsoleInput) #define ReadConsoleInput WINELIB_NAME_AW(ReadConsoleInput)
BOOL WINAPI ReadConsoleOutputA( HANDLE hConsoleOutput, LPCHAR_INFO lpBuffer, COORD dwBufferSize, BOOL WINAPI ReadConsoleOutputA( HANDLE hConsoleOutput, LPCHAR_INFO lpBuffer, COORD dwBufferSize,