Make the changes work.

[mingw/mingw-org-wsl.git] / include / winuser.h

diff --git a/include/winuser.h b/include/winuser.h
index 88d8506..40c96c1 100644 (file)
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -2115,6 +2115,10 @@ extern "C" {
 #define MAPVK_VSC_TO_VK_EX 3
 #define MAPVK_VK_TO_VSC_EX 4
 
+#define INPUT_MOUSE 0x00000000
+#define INPUT_KEYBOARD 0x00000001
+#define INPUT_HARDWARE 0x00000002
+
 #ifndef RC_INVOKED
 typedef BOOL(CALLBACK *DLGPROC)(HWND,UINT,WPARAM,LPARAM);
 typedef VOID(CALLBACK *TIMERPROC)(HWND,UINT,UINT,DWORD);
@@ -2860,6 +2864,35 @@ typedef struct {
        ULONG_PTR dwExtraInfo;
 } MSLLHOOKSTRUCT, *PMSLLHOOKSTRUCT;
 
+typedef struct tagMOUSEINPUT {
+  LONG dx;
+  LONG dy;
+  DWORD mouseData;
+  DWORD dwFlags;
+  DWORD time;
+  ULONG_PTR dwExtraInfo;
+} MOUSEINPUT,*PMOUSEINPUT;
+typedef struct tagKEYBDINPUT {
+  WORD wVk;
+  WORD wScan;
+  DWORD dwFlags;
+  DWORD time;
+  ULONG_PTR dwExtraInfo;
+} KEYBDINPUT,*PKEYBDINPUT;
+typedef struct tagHARDWAREINPUT {
+  DWORD uMsg;
+  WORD wParamL;
+  WORD wParamH;
+} HARDWAREINPUT,*PHARDWAREINPUT;
+typedef struct tagINPUT {
+  DWORD type;
+  _ANONYMOUS_UNION union {
+               MOUSEINPUT mi;
+               KEYBDINPUT ki;
+               HARDWAREINPUT hi;
+  } DUMMYUNIONNAME;
+} INPUT,*PINPUT,*LPINPUT;
+
 #define AnsiToOem CharToOemA
 #define OemToAnsi OemToCharA
 #define AnsiToOemBuff CharToOemBuffA
@@ -3375,7 +3408,7 @@ WINUSERAPI BOOL WINAPI ScrollWindow(HWND,int,int,LPCRECT,LPCRECT);
 WINUSERAPI int WINAPI ScrollWindowEx(HWND,int,int,LPCRECT,LPCRECT,HRGN,LPRECT,UINT);
 WINUSERAPI LONG WINAPI SendDlgItemMessageA(HWND,int,UINT,WPARAM,LPARAM);
 WINUSERAPI LONG WINAPI SendDlgItemMessageW(HWND,int,UINT,WPARAM,LPARAM);
-
+WINUSERAPI UINT WINAPI SendInput(UINT,LPINPUT,int);
 WINUSERAPI LRESULT WINAPI SendMessageA(HWND,UINT,WPARAM,LPARAM);
 WINUSERAPI BOOL WINAPI SendMessageCallbackA(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD);
 WINUSERAPI BOOL WINAPI SendMessageCallbackW(HWND,UINT,WPARAM,LPARAM,SENDASYNCPROC,DWORD);
@@ -3689,9 +3722,6 @@ typedef __AW(NONCLIENTMETRICS) NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
 #define DC_GRADIENT    0x00000020
 #define TPM_RECURSE 1
 #define SW_SMOOTHSCROLL        0x0010
-#define INPUT_MOUSE 0x00000000
-#define INPUT_KEYBOARD 0x00000001
-#define INPUT_HARDWARE 0x00000002
 #define MONITOR_DEFAULTTONULL 0 
 #define MONITOR_DEFAULTTOPRIMARY 1 
 #define MONITOR_DEFAULTTONEAREST 2 
@@ -3717,34 +3747,6 @@ typedef struct {
   UINT  uCount;
   DWORD dwTimeout;
 } FLASHWINFO,*PFLASHWINFO;
-typedef struct tagMOUSEINPUT {
-  LONG dx;
-  LONG dy;
-  DWORD mouseData;
-  DWORD dwFlags;
-  DWORD time;
-  ULONG_PTR dwExtraInfo;
-} MOUSEINPUT,*PMOUSEINPUT;
-typedef struct tagKEYBDINPUT {
-  WORD wVk;
-  WORD wScan;
-  DWORD dwFlags;
-  DWORD time;
-  ULONG_PTR dwExtraInfo;
-} KEYBDINPUT,*PKEYBDINPUT;
-typedef struct tagHARDWAREINPUT {
-  DWORD uMsg;
-  WORD wParamL;
-  WORD wParamH;
-} HARDWAREINPUT,*PHARDWAREINPUT;
-typedef struct tagINPUT {
-  DWORD type;
-  _ANONYMOUS_UNION union {
-               MOUSEINPUT mi;
-               KEYBDINPUT ki;
-               HARDWAREINPUT hi;
-  } DUMMYUNIONNAME;
-} INPUT,*PINPUT,*LPINPUT;
 WINUSERAPI BOOL WINAPI FlashWindowEx(PFLASHWINFO);
 WINUSERAPI DWORD WINAPI GetClipboardSequenceNumber(void);
 WINUSERAPI BOOL WINAPI GetTitleBarInfo(HWND,PTITLEBARINFO);
@@ -3752,7 +3754,6 @@ WINUSERAPI DWORD WINAPI InSendMessageEx(LPVOID);
 WINUSERAPI HMONITOR WINAPI MonitorFromPoint(POINT,DWORD);
 WINUSERAPI HMONITOR WINAPI MonitorFromRect(LPCRECT,DWORD);
 WINUSERAPI HMONITOR WINAPI MonitorFromWindow(HWND,DWORD);
-WINUSERAPI UINT WINAPI SendInput(UINT,LPINPUT,int);
 WINUSERAPI BOOL WINAPI UnregisterDeviceNotification(HANDLE);
 
 #ifndef NOGDI