Francois Gouget : user32: Fix the HRAWINPUT definition and the GetRawInputData() prototype. Update win32.api to fix the winapi_check warnings.
Alexandre Julliard
julliard at winehq.org
Mon Oct 15 11:28:05 CDT 2007
Module: wine
Branch: master
Commit: 1a75b5d49c7879bf5678e4d900da000fb1f92072
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a75b5d49c7879bf5678e4d900da000fb1f92072
Author: Francois Gouget <fgouget at free.fr>
Date: Sun Oct 14 14:36:08 2007 +0200
user32: Fix the HRAWINPUT definition and the GetRawInputData() prototype. Update win32.api to fix the winapi_check warnings.
---
dlls/user32/input.c | 2 +-
include/winuser.h | 4 ++--
tools/winapi/win32.api | 6 ++++++
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dlls/user32/input.c b/dlls/user32/input.c
index 3e16dc3..b385ee4 100644
--- a/dlls/user32/input.c
+++ b/dlls/user32/input.c
@@ -368,7 +368,7 @@ BOOL WINAPI RegisterRawInputDevices(PRAWINPUTDEVICE pRawInputDevices, UINT uiNum
/******************************************************************
* GetRawInputData (USER32.@)
*/
-INT WINAPI GetRawInputData(HRAWINPUT hRawInput, UINT uiCommand, LPVOID pData, PUINT pcbSize, UINT cbSizeHeader)
+UINT WINAPI GetRawInputData(HRAWINPUT hRawInput, UINT uiCommand, LPVOID pData, PUINT pcbSize, UINT cbSizeHeader)
{
FIXME("(hRawInput=%p, uiCommand=%d, pData=%p, pcbSize=%p, cbSizeHeader=%d) stub!\n",
hRawInput, uiCommand, pData, pcbSize, cbSizeHeader);
diff --git a/include/winuser.h b/include/winuser.h
index ef17994..974cef8 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -443,7 +443,7 @@ typedef struct tagINPUT
} DUMMYUNIONNAME;
} INPUT, *PINPUT, *LPINPUT;
-typedef HANDLE HRAWINPUT;
+DECLARE_HANDLE(HRAWINPUT);
typedef struct tagRAWINPUTDEVICELIST
{
@@ -4670,7 +4670,7 @@ SHORT WINAPI GetKeyState(INT);
HWND WINAPI GetLastActivePopup(HWND);
BOOL WINAPI GetLastInputInfo(PLASTINPUTINFO);
UINT WINAPI GetRawInputBuffer(PRAWINPUT,PUINT,UINT);
-INT WINAPI GetRawInputData(HRAWINPUT,UINT,LPVOID,PUINT,UINT);
+UINT WINAPI GetRawInputData(HRAWINPUT,UINT,LPVOID,PUINT,UINT);
UINT WINAPI GetRawInputDeviceInfoA(HANDLE,UINT,LPVOID,PUINT);
UINT WINAPI GetRawInputDeviceInfoW(HANDLE,UINT,LPVOID,PUINT);
#define GetRawInputDeviceInfo WINELIB_NAME_AW(GetRawInputDeviceInfo)
diff --git a/tools/winapi/win32.api b/tools/winapi/win32.api
index d64e006..a591d7c 100644
--- a/tools/winapi/win32.api
+++ b/tools/winapi/win32.api
@@ -5117,6 +5117,7 @@ HMENU
HMODULE
HMODULE16
HMONITOR
+HRAWINPUT
HRESULT
HRGN
HSZ
@@ -5217,6 +5218,10 @@ PICONINFO
PLASTINPUTINFO
PMENUBARINFO
POINT *
+PRAWINPUT
+PRAWINPUT *
+PRAWINPUTDEVICE
+PRAWINPUTDEVICELIST
PROPENUMPROCA
PROPENUMPROCEXA
PROPENUMPROCEXW
@@ -5225,6 +5230,7 @@ PSECURITY_DESCRIPTOR
PSECURITY_INFORMATION
PSECURITY_QUALITY_OF_SERVICE
PTITLEBARINFO
+PUINT
PUINT_PTR
PVOID
PWINDOWINFO
More information about the wine-cvs
mailing list