From a6674ee61b8308ae40a4feef821a6bf6e442ac6c Mon Sep 17 00:00:00 2001
From: Danny Smith <dannysmith@users.sourceforge.net>
Date: Sat, 12 Jul 2003 09:26:43 +0000
Subject: [PATCH] * include/winnt.h (PVOID): Move to before HANDLE
typedef.
* include/winuser.h (mouse_event): Correct type of fifth param,
Thanks to: Andrew Jones <guln at users dot sourceforge dot net>
---
winsup/w32api/ChangeLog | 7 +++++++
winsup/w32api/include/winnt.h | 2 +-
winsup/w32api/include/winuser.h | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 7b3c6be9e..ac6ff4caf 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2003-07-12 Danny Smith <dannysmith@users.sourceforge.net>
+
+ * include/winnt.h (PVOID): Move to before HANDLE typedef.
+
+ * include/winuser.h (mouse_event): Correct type of fifth param,
+ Thanks to: Andrew Jones <guln at users dot sourceforge dot net>
+
2003-07-11 Earnie Boyd <earnie@users.sf.net>
* include/winnt.h (HANDLE): Define based on STRICT filter.
diff --git a/winsup/w32api/include/winnt.h b/winsup/w32api/include/winnt.h
index 93a476487..1b3262afe 100644
--- a/winsup/w32api/include/winnt.h
+++ b/winsup/w32api/include/winnt.h
@@ -116,7 +116,6 @@ typedef const TCHAR *LPCTSTR;
#define TEXT(q) __TEXT(q)
typedef SHORT *PSHORT;
typedef LONG *PLONG;
-typedef HANDLE *PHANDLE,*LPHANDLE;
#ifdef STRICT
typedef void *HANDLE;
#define DECLARE_HANDLE(n) typedef struct n##__{int i;}*n
@@ -124,6 +123,7 @@ typedef void *HANDLE;
typedef PVOID HANDLE;
#define DECLARE_HANDLE(n) typedef HANDLE n
#endif
+typedef HANDLE *PHANDLE,*LPHANDLE;
typedef DWORD LCID;
typedef PDWORD PLCID;
typedef WORD LANGID;
diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 8a9b27dfa..fc49831ae 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -3186,7 +3186,7 @@ int WINAPI MessageBoxIndirectA(CONST MSGBOXPARAMSA*);
int WINAPI MessageBoxIndirectW(CONST MSGBOXPARAMSW*);
BOOL WINAPI ModifyMenuA(HMENU,UINT,UINT,UINT,LPCSTR);
BOOL WINAPI ModifyMenuW(HMENU,UINT,UINT,UINT,LPCWSTR);
-void WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,DWORD);
+void WINAPI mouse_event(DWORD,DWORD,DWORD,DWORD,ULONG_PTR);
BOOL WINAPI MoveWindow(HWND,int,int,int,int,BOOL);
DWORD WINAPI MsgWaitForMultipleObjects(DWORD,CONST HANDLE*,BOOL,DWORD,DWORD);
DWORD WINAPI MsgWaitForMultipleObjectsEx(DWORD,CONST HANDLE*,DWORD,DWORD,DWORD);