1 files changed, 34 insertions, 8 deletions

diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index ddcdae1d0..26986ccd2 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -920,6 +920,7 @@ extern "C" {
 #define MOUSEEVENTF_RIGHTUP 16
 #define MOUSEEVENTF_MIDDLEDOWN 32
 #define MOUSEEVENTF_MIDDLEUP 64
+#define MOUSEEVENTF_WHEEL 0x0800 
 #define MOUSEEVENTF_ABSOLUTE 32768
 #define PM_NOREMOVE 0
 #define PM_REMOVE 1
@@ -1887,7 +1888,7 @@ typedef struct tagANIMATIONINFO {
 	UINT cbSize;
 	int iMinAnimate;
 } ANIMATIONINFO,*LPANIMATIONINFO;
-typedef struct tagCREATESTRUCT {
+typedef struct tagCREATESTRUCTA {
 	LPVOID	lpCreateParams;
 	HINSTANCE	hInstance;
 	HMENU	hMenu;
@@ -1897,14 +1898,32 @@ typedef struct tagCREATESTRUCT {
 	int	y;
 	int	x;
 	LONG	style;
-	LPCTSTR	lpszName;
-	LPCTSTR	lpszClass;
+	LPCSTR	lpszName;
+	LPCSTR	lpszClass;
 	DWORD	dwExStyle;
-} CREATESTRUCT,*LPCREATESTRUCT;
-typedef struct tagCBT_CREATEWND {
-	LPCREATESTRUCT lpcs;
+} CREATESTRUCTA,*LPCREATESTRUCTA;
+typedef struct tagCREATESTRUCTW {
+	LPVOID	lpCreateParams;
+	HINSTANCE	hInstance;
+	HMENU	hMenu;
+	HWND	hwndParent;
+	int	cy;
+	int	cx;
+	int	y;
+	int	x;
+	LONG	style;
+	LPCWSTR	lpszName;
+	LPCWSTR	lpszClass;
+	DWORD	dwExStyle;
+} CREATESTRUCTW,*LPCREATESTRUCTW;
+typedef struct tagCBT_CREATEWNDA {
+	LPCREATESTRUCTA lpcs;
+	HWND	hwndInsertAfter;
+} CBT_CREATEWNDA, *LPCBT_CREATEWNDA;
+typedef struct tagCBT_CREATEWNDW {
+	LPCREATESTRUCTW lpcs;
 	HWND	hwndInsertAfter;
-} CBT_CREATEWND;
+} CBT_CREATEWNDW, *LPCBT_CREATEWNDW;
 typedef struct tagCBTACTIVATESTRUCT {
 	BOOL fMouse;
 	HWND hWndActive;
@@ -2442,7 +2461,10 @@ typedef struct tagSTYLESTRUCT {
 #define MAKELPARAM(l,h) ((LPARAM)MAKELONG(l,h))
 #define MAKEWPARAM(l,h) ((WPARAM)MAKELONG(l,h))
 #define MAKELRESULT(l,h) ((LRESULT)MAKELONG(l,h))
-#define POINTSTOPOINT(p,ps) {(p).x=LOWORD(pts);(ps).y=HIWORD(ps);}
+#define POINTSTOPOINT(p,ps) { \
+  (p).x=LOWORD(*(DWORD *)&ps); \
+  (p).y=HIWORD(*(DWORD *)&ps); \
+}
 #define POINTTOPOINTS(p) ((POINTS)MAKELONG((p).x,(p).y))
 
 HKL WINAPI ActivateKeyboardLayout(HKL,UINT);
@@ -2985,6 +3007,8 @@ typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
 typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
 typedef SERIALKEYSW SERIALKEYS,*LPSERIALKEYS;
 typedef SOUNDSENTRYW SOUNDSENTRY,*LPSOUNDSENTRY;
+typedef CREATESTRUCTW CREATESTRUCT, *LPCREATESTRUCT;
+typedef CBT_CREATEWNDW CBT_CREATEWND, *LPCBT_CREATEWND;
 typedef MDICREATESTRUCTW MDICREATESTRUCT,*LPMDICREATESTRUCT;
 typedef MULTIKEYHELPW MULTIKEYHELP,*PMULTIKEYHELP,*LPMULTIKEYHELP;
 #define AppendMenu AppendMenuW
@@ -3131,6 +3155,8 @@ typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
 typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
 typedef SERIALKEYSA SERIALKEYS,*LPSERIALKEYS;
 typedef SOUNDSENTRYA SOUNDSENTRY,*LPSOUNDSENTRY;
+typedef CREATESTRUCTA CREATESTRUCT, *LPCREATESTRUCT;
+typedef CBT_CREATEWNDA CBT_CREATEWND, *LPCBT_CREATEWND;
 typedef MDICREATESTRUCTA MDICREATESTRUCT,*LPMDICREATESTRUCT;
 typedef MULTIKEYHELPA MULTIKEYHELP,*PMULTIKEYHELP,*LPMULTIKEYHELP;
 #define AppendMenu AppendMenuA