From f11de4fc3d7605e799bb0f1630cbbc404c351ab3 Mon Sep 17 00:00:00 2001 From: Peter Hunnisett Date: Fri, 22 Feb 2002 21:24:25 +0000 Subject: [PATCH] Fix return type of GetAsyncKeyState. --- include/wine/winuser16.h | 2 +- include/winuser.h | 2 +- windows/input.c | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wine/winuser16.h b/include/wine/winuser16.h index d1d9f061a0b..05ad22e003d 100644 --- a/include/wine/winuser16.h +++ b/include/wine/winuser16.h @@ -704,7 +704,7 @@ BOOL16 WINAPI FlashWindow16(HWND16,BOOL16); DWORD WINAPI FormatMessage16(DWORD,SEGPTR,WORD,WORD,LPSTR,WORD,LPDWORD); INT16 WINAPI FrameRect16(HDC16,const RECT16*,HBRUSH16); HWND16 WINAPI GetActiveWindow16(void); -WORD WINAPI GetAsyncKeyState16(INT16); +INT16 WINAPI GetAsyncKeyState16(INT16); HWND16 WINAPI GetCapture16(void); UINT16 WINAPI GetCaretBlinkTime16(void); VOID WINAPI GetCaretPos16(LPPOINT16); diff --git a/include/winuser.h b/include/winuser.h index ff8dbe92f68..c12879a6801 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3822,7 +3822,7 @@ INT WINAPI FrameRect(HDC,const RECT*,HBRUSH); HWND WINAPI GetActiveWindow(void); HWND WINAPI GetAncestor(HWND,UINT); DWORD WINAPI GetAppCompatFlags(HTASK); -WORD WINAPI GetAsyncKeyState(INT); +SHORT WINAPI GetAsyncKeyState(INT); HWND WINAPI GetCapture(void); UINT WINAPI GetCaretBlinkTime(void); BOOL WINAPI GetCaretPos(LPPOINT); diff --git a/windows/input.c b/windows/input.c index 991289263c5..3d6939227d7 100644 --- a/windows/input.c +++ b/windows/input.c @@ -596,10 +596,10 @@ HWND WINAPI GetCapture(void) * mouse or key had been depressed since the last call to * GetAsyncKeyState. */ -WORD WINAPI GetAsyncKeyState(INT nKey) +SHORT WINAPI GetAsyncKeyState(INT nKey) { - WORD retval = ((AsyncKeyStateTable[nKey] & 0x80) ? 0x0001 : 0) | - ((InputKeyStateTable[nKey] & 0x80) ? 0x8000 : 0); + SHORT retval = ((AsyncKeyStateTable[nKey] & 0x80) ? 0x0001 : 0) | + ((InputKeyStateTable[nKey] & 0x80) ? 0x8000 : 0); AsyncKeyStateTable[nKey] = 0; TRACE_(key)("(%x) -> %x\n", nKey, retval); return retval; @@ -608,7 +608,7 @@ WORD WINAPI GetAsyncKeyState(INT nKey) /********************************************************************** * GetAsyncKeyState (USER.249) */ -WORD WINAPI GetAsyncKeyState16(INT16 nKey) +INT16 WINAPI GetAsyncKeyState16(INT16 nKey) { return GetAsyncKeyState(nKey); }