* include/winuser.h (MOUSEEVENTF_*): Cleanup and new define.

	(HSHELL_*): Cleanup and new define.
	(SMTO_*): Cleanup and new define.
	(SPI_*): Cleanup and new define.
	(SPIF_*): Cleanup.
	(HWND_MESSAGE): Windows 2000 only.
	(SIF_*): Cleanup.
	(SWP_*): Cleanup.
	* include/wingdi.h (ETO_*): Cleanup and new define.

1 files changed, 203 insertions, 143 deletions

diff --git a/winsup/w32api/include/winuser.h b/winsup/w32api/include/winuser.h
index 77e2e6624..8824fb3d1 100644
--- a/winsup/w32api/include/winuser.h
+++ b/winsup/w32api/include/winuser.h
@@ -1068,31 +1068,39 @@ extern "C" {
 #define MSGF_NEXTWINDOW 6
 #define MSGF_MAINLOOP 8
 #define MSGF_USER 4096
-#define MOUSEEVENTF_MOVE 1
-#define MOUSEEVENTF_LEFTDOWN 2
-#define MOUSEEVENTF_LEFTUP 4
-#define MOUSEEVENTF_RIGHTDOWN 8
-#define MOUSEEVENTF_RIGHTUP 16
-#define MOUSEEVENTF_MIDDLEDOWN 32
-#define MOUSEEVENTF_MIDDLEUP 64
-#define MOUSEEVENTF_WHEEL 0x0800
-#define MOUSEEVENTF_ABSOLUTE 32768
+#define MOUSEEVENTF_MOVE 0x00000001
+#define MOUSEEVENTF_LEFTDOWN 0x00000002
+#define MOUSEEVENTF_LEFTUP 0x00000004
+#define MOUSEEVENTF_RIGHTDOWN 0x00000008
+#define MOUSEEVENTF_RIGHTUP 0x00000010
+#define MOUSEEVENTF_MIDDLEDOWN 0x00000020
+#define MOUSEEVENTF_MIDDLEUP 0x00000040
+#define MOUSEEVENTF_ABSOLUTE 0x00008000
+#if (_WIN32_WINNT >= 0x0400)
+#define MOUSEEVENTF_WHEEL 0x00000800
+#endif
+#if (_WIN32_WINNT >= 0x0500)
+#define MOUSEEVENTF_XDOWN 0x00000080
+#define MOUSEEVENTF_XUP 0x00000100
+#endif
 #define PM_NOREMOVE 0
 #define PM_REMOVE 1
 #define PM_NOYIELD 2
-#if (WINVER >= 0x0500)
+#if (_WIN32_WINNT >= 0x0500)
 # define PM_QS_INPUT (QS_INPUT << 16)
 # define PM_QS_POSTMESSAGE ((QS_POSTMESSAGE|QS_HOTKEY|QS_TIMER) << 16)
 # define PM_QS_PAINT (QS_PAINT << 16)
 # define PM_QS_SENDMESSAGE (QS_SENDMESSAGE << 16)
 #endif
-#define HWND_BROADCAST  ((HWND)0xffff)
+#define HWND_BROADCAST ((HWND)0xFFFF)
 #define HWND_BOTTOM ((HWND)1)
 #define HWND_NOTOPMOST ((HWND)(-2))
 #define HWND_TOP ((HWND)0)
 #define HWND_TOPMOST ((HWND)(-1))
 #define HWND_DESKTOP (HWND)0
-#define HWND_MESSAGE ((HWND)(-3)) /* w2k */
+#if (_WIN32_WINNT >= 0x0500)
+#define HWND_MESSAGE ((HWND)(-3))
+#endif
 #define RDW_ERASE 4
 #define RDW_FRAME 1024
 #define RDW_INTERNALPAINT 2
@@ -1105,31 +1113,35 @@ extern "C" {
 #define RDW_UPDATENOW 256
 #define RDW_ALLCHILDREN 128
 #define RDW_NOCHILDREN 64
-#define SMTO_ABORTIFHUNG 2
-#define SMTO_BLOCK 1
-#define SMTO_NORMAL 0
-#define SIF_ALL 23
-#define SIF_PAGE 2
-#define SIF_POS 4
-#define SIF_RANGE 1
-#define SIF_DISABLENOSCROLL 8
-#define SIF_TRACKPOS   16
-#define SWP_DRAWFRAME 32
-#define SWP_FRAMECHANGED 32
-#define SWP_HIDEWINDOW 128
-#define SWP_NOACTIVATE 16
-#define SWP_NOCOPYBITS 256
-#define SWP_NOMOVE 2
-#define SWP_NOSIZE 1
-#define SWP_NOREDRAW 8
-#define SWP_NOZORDER 4
-#define SWP_SHOWWINDOW 64
-#define SWP_NOOWNERZORDER 512
-#define SWP_NOREPOSITION 512
-#define SWP_NOSENDCHANGING 1024
-#define SWP_DEFERERASE 8192
-#define SWP_ASYNCWINDOWPOS  16384
+#define SMTO_ABORTIFHUNG 0x0002
+#define SMTO_BLOCK 0x0001
+#define SMTO_NORMAL 0x0000
+#if (_WIN32_WINNT >= 0x0500)
+#define SMTO_NOTIMEOUTIFNOTHUNG 0x0008
+#endif
+#define SIF_DISABLENOSCROLL 0x0008
+#define SIF_PAGE 0x0002
+#define SIF_POS 0x0004
+#define SIF_RANGE 0x0001
+#define SIF_TRACKPOS 0x0010
+#define SIF_ALL (SIF_PAGE|SIF_POS|SIF_RANGE|SIF_TRACKPOS)
+#define SWP_DRAWFRAME 0x0020
+#define SWP_FRAMECHANGED 0x0020
+#define SWP_HIDEWINDOW 0x0080
+#define SWP_NOACTIVATE 0x0010
+#define SWP_NOCOPYBITS 0x0100
+#define SWP_NOMOVE 0x0002
+#define SWP_NOSIZE 0x0001
+#define SWP_NOREDRAW 0x0008
+#define SWP_NOZORDER 0x0004
+#define SWP_SHOWWINDOW 0x0040
+#define SWP_NOOWNERZORDER 0x0200
+#define SWP_NOREPOSITION SWP_NOOWNERZORDER
+#define SWP_NOSENDCHANGING 0x0400
+#define SWP_DEFERERASE 0x2000
+#define SWP_ASYNCWINDOWPOS 0x4000
 #define HSHELL_ACTIVATESHELLWINDOW 3
+#define HSHELL_ENDTASK 10
 #define HSHELL_GETMINRECT 5
 #define HSHELL_LANGUAGE 8
 #define HSHELL_REDRAW 6
@@ -1137,143 +1149,191 @@ extern "C" {
 #define HSHELL_WINDOWACTIVATED 4
 #define HSHELL_WINDOWCREATED 1
 #define HSHELL_WINDOWDESTROYED 2
+#if (_WIN32_WINNT >= 0x0500)
+#define HSHELL_ACCESSIBILITYSTATE 11
+#define HSHELL_APPCOMMAND 12
 #define HSHELL_RUDEAPPACTIVATED 32772
 #define HSHELL_FLASH 32774
-#if (WINVER >= 0x0500)
-#define SPI_SETFOREGROUNDLOCKTIMEOUT 0x2001
-#define SPI_GETFOREGROUNDLOCKTIMEOUT 0x2000
 #endif
-#define SPI_GETACCESSTIMEOUT 60
-#define SPI_GETACTIVEWNDTRKTIMEOUT 8194
-#define SPI_GETANIMATION 72
-#define SPI_GETBEEP 1
-#define SPI_GETBORDER 5
-#define SPI_GETDEFAULTINPUTLANG 89
-#define SPI_GETDRAGFULLWINDOWS 38
-#define SPI_GETFASTTASKSWITCH 35
-#define SPI_GETFILTERKEYS 50
-#define SPI_GETFONTSMOOTHING 74
-#define SPI_GETGRIDGRANULARITY 18
-#define SPI_GETHIGHCONTRAST 66
-#define SPI_GETICONMETRICS 45
-#define SPI_GETICONTITLELOGFONT 31
-#define SPI_GETICONTITLEWRAP 25
-#define SPI_GETKEYBOARDDELAY 22
-#define SPI_GETKEYBOARDPREF 68
-#define SPI_GETKEYBOARDSPEED 10
-#define SPI_GETLOWPOWERACTIVE 83
-#define SPI_GETLOWPOWERTIMEOUT 79
-#define SPI_GETMENUDROPALIGNMENT 27
-#define SPI_GETMINIMIZEDMETRICS 43
-#define SPI_GETMOUSE 3
-#define SPI_GETMOUSEKEYS 54
-#define SPI_GETMOUSETRAILS 94
-#define SPI_GETNONCLIENTMETRICS 41
-#define SPI_GETPOWEROFFACTIVE 84
-#define SPI_GETPOWEROFFTIMEOUT 80
-#define SPI_GETSCREENREADER 70
-#define SPI_GETSCREENSAVEACTIVE 16
-#define SPI_GETSCREENSAVETIMEOUT 14
-#define SPI_GETSERIALKEYS 62
-#define SPI_GETSHOWSOUNDS 56
-#define SPI_GETSOUNDSENTRY 64
-#define SPI_GETSTICKYKEYS 58
-#define SPI_GETTOGGLEKEYS 52
-#define SPI_GETWHEELSCROLLLINES 104 
-#define SPI_GETWINDOWSEXTENSION 92
-#define SPI_GETWORKAREA 48
-#define SPI_ICONHORIZONTALSPACING 13
-#define SPI_ICONVERTICALSPACING 24
-#define SPI_LANGDRIVER 12
-#define SPI_SCREENSAVERRUNNING 97
-#define SPI_SETACCESSTIMEOUT 61
-#define SPI_SETACTIVEWNDTRKTIMEOUT 8195
-#define SPI_SETANIMATION 73
-#define SPI_SETBEEP 2
-#define SPI_SETBORDER 6
-#define SPI_SETDEFAULTINPUTLANG 90
-#define SPI_SETDESKPATTERN 21
-#define SPI_SETDESKWALLPAPER 20
-#define SPI_SETDOUBLECLICKTIME 32
-#define SPI_SETDOUBLECLKHEIGHT 30
-#define SPI_SETDOUBLECLKWIDTH 29
-#define SPI_SETDRAGFULLWINDOWS 37
-#define SPI_SETDRAGHEIGHT 77
-#define SPI_SETDRAGWIDTH 76
-#define SPI_SETFASTTASKSWITCH 36
-#define SPI_SETFILTERKEYS 51
-#define SPI_SETFONTSMOOTHING 75
-#define SPI_SETGRIDGRANULARITY 19
-#define SPI_SETHANDHELD 78
-#define SPI_SETHIGHCONTRAST 67
-#define SPI_SETICONMETRICS 46
-#define SPI_SETICONTITLELOGFONT 34
-#define SPI_SETICONTITLEWRAP 26
-#define SPI_SETKEYBOARDDELAY 23
-#define SPI_SETKEYBOARDPREF 69
-#define SPI_SETKEYBOARDSPEED 11
-#define SPI_SETLANGTOGGLE 91
-#define SPI_SETLOWPOWERACTIVE 85
-#define SPI_SETLOWPOWERTIMEOUT 81
-#define SPI_SETMENUDROPALIGNMENT 28
-#define SPI_SETMINIMIZEDMETRICS 44
-#define SPI_SETMOUSE 4
-#define SPI_SETMOUSEBUTTONSWAP 33
-#define SPI_SETMOUSEKEYS 55
-#define SPI_SETMOUSETRAILS 93
-#define SPI_SETNONCLIENTMETRICS 42
-#define SPI_SETPENWINDOWS 49
-#define SPI_SETPOWEROFFACTIVE 86
-#define SPI_SETPOWEROFFTIMEOUT 82
-#define SPI_SETSCREENREADER 71
-#define SPI_SETSCREENSAVEACTIVE 17
-#define SPI_SETSCREENSAVERRUNNING 97
-#define SPI_SETSCREENSAVETIMEOUT 15
-#define SPI_SETSERIALKEYS 63
-#define SPI_SETSHOWSOUNDS 57
-#define SPI_SETSOUNDSENTRY 65
-#define SPI_SETSTICKYKEYS 59
-#define SPI_SETTOGGLEKEYS 53
-#define SPI_SETWHEELSCROLLLINES 105
-#define SPI_SETWORKAREA 47
-#if (WINVER >= 0x0500)
-#define SPI_GETDESKWALLPAPER 115
-#define SPI_GETMOUSESPEED 112
-#define SPI_GETSCREENSAVERRUNNING 114
+#if (_WIN32_WINNT >= 0x0501)
+#define HSHELL_WINDOWREPLACED 13
+#define HSHELL_WINDOWREPLACING 14
+#endif
+#define SPI_GETACCESSTIMEOUT 0x003C
 #define SPI_GETACTIVEWINDOWTRACKING 0x1000
+#define SPI_GETACTIVEWNDTRKTIMEOUT 8194
 #define SPI_GETACTIVEWNDTRKZORDER 0x100C
+#define SPI_GETANIMATION 0x0048
+#define SPI_GETBEEP 0x0001
+#define SPI_GETBLOCKSENDINPUTRESETS 0x1026
+#define SPI_GETBORDER 0x0005
+#define SPI_GETCARETWIDTH 0x2006
 #define SPI_GETCOMBOBOXANIMATION 0x1004
 #define SPI_GETCURSORSHADOW 0x101A
+#define SPI_GETDEFAULTINPUTLANG 0x0059
+#define SPI_GETDESKWALLPAPER 0x0073
+#define SPI_GETDRAGFULLWINDOWS 0x0026
+#define SPI_GETFASTTASKSWITCH 0x0023
+#define SPI_GETFILTERKEYS 0x0032
+#define SPI_GETFONTSMOOTHING 0x004A
+#define SPI_GETFOREGROUNDFLASHCOUNT 0x2004
+#define SPI_GETFOREGROUNDLOCKTIMEOUT 0x2000
 #define SPI_GETGRADIENTCAPTIONS 0x1008
+#define SPI_GETGRIDGRANULARITY 0x0012
+#define SPI_GETHIGHCONTRAST 0x0042
 #define SPI_GETHOTTRACKING 0x100E
+#define SPI_GETICONMETRICS 0x002D
+#define SPI_GETICONTITLELOGFONT 0x001F
+#define SPI_GETICONTITLEWRAP 0x0019
 #define SPI_GETKEYBOARDCUES 0x100A
+#define SPI_GETKEYBOARDDELAY 0x0016
+#define SPI_GETKEYBOARDPREF 0x0044
+#define SPI_GETKEYBOARDSPEED 0x000A
 #define SPI_GETLISTBOXSMOOTHSCROLLING 0x1006
+#define SPI_GETLOWPOWERACTIVE 0x0053
+#define SPI_GETLOWPOWERTIMEOUT 0x004F
 #define SPI_GETMENUANIMATION 0x1002
+#define SPI_GETMENUDROPALIGNMENT 0x001B
 #define SPI_GETMENUFADE 0x1012
-#define SPI_GETMENUUNDERLINES 0x100A
+#define SPI_GETMENUSHOWDELAY 0x006A
+#define SPI_GETMENUUNDERLINES SPI_GETKEYBOARDCUES
+#define SPI_GETMINIMIZEDMETRICS 0x002B
+#define SPI_GETMOUSE 0x0003
+#define SPI_GETMOUSEHOVERHEIGHT 0x0064
+#define SPI_GETMOUSEHOVERTIME 0x0066
+#define SPI_GETMOUSEHOVERWIDTH 0x0062
+#define SPI_GETMOUSEKEYS 0x0036
+#define SPI_GETMOUSESPEED 0x0070
+#define SPI_GETMOUSETRAILS 0x005E
+#define SPI_GETNONCLIENTMETRICS 0x0029
+#define SPI_GETPOWEROFFACTIVE 0x0054
+#define SPI_GETPOWEROFFTIMEOUT 0x0050
+#define SPI_GETSCREENREADER 0x0046
+#define SPI_GETSCREENSAVEACTIVE 0x0010
+#define SPI_GETSCREENSAVERRUNNING 0x0072
+#define SPI_GETSCREENSAVETIMEOUT 0x000E
 #define SPI_GETSELECTIONFADE 0x1014
+#define SPI_GETSERIALKEYS 0x003E
+#define SPI_GETSHOWIMEUI 0x006E
+#define SPI_GETSHOWSOUNDS 0x0038
+#define SPI_GETSNAPTODEFBUTTON 0x005F
+#define SPI_GETSOUNDSENTRY 0x0040
+#define SPI_GETSTICKYKEYS 0x003A
+#define SPI_GETTOGGLEKEYS 0x0034
 #define SPI_GETTOOLTIPANIMATION 0x1016
 #define SPI_GETTOOLTIPFADE 0x1018
+#define SPI_GETUIEFFECTS 0x103E
+#define SPI_GETWHEELSCROLLLINES 0x0068 
+#define SPI_GETWINDOWSEXTENSION 0x005C
+#define SPI_GETWORKAREA 0x0030
+#define SPI_ICONHORIZONTALSPACING 0x000D
+#define SPI_ICONVERTICALSPACING 0x0018
+#define SPI_LANGDRIVER 0x000C
+#define SPI_SETACCESSTIMEOUT 0x003D
 #define SPI_SETACTIVEWINDOWTRACKING 0x1001
+#define SPI_SETACTIVEWNDTRKTIMEOUT 8195
 #define SPI_SETACTIVEWNDTRKZORDER 0x100D
+#define SPI_SETANIMATION 0x0049
+#define SPI_SETBEEP 0x0002
+#define SPI_SETBLOCKSENDINPUTRESETS 0x1027
+#define SPI_SETBORDER 0x0006
+#define SPI_SETCARETWIDTH 0x2007
 #define SPI_SETCOMBOBOXANIMATION 0x1005
+#define SPI_SETCURSORS 0x0057
 #define SPI_SETCURSORSHADOW 0x101B
+#define SPI_SETDEFAULTINPUTLANG 0x005A
+#define SPI_SETDESKPATTERN 0x0015
+#define SPI_SETDESKWALLPAPER 0x0014
+#define SPI_SETDOUBLECLICKTIME 0x0020
+#define SPI_SETDOUBLECLKHEIGHT 0x001E
+#define SPI_SETDOUBLECLKWIDTH 0x001D
+#define SPI_SETDRAGFULLWINDOWS 0x0025
+#define SPI_SETDRAGHEIGHT 0x004D
+#define SPI_SETDRAGWIDTH 0x004C
+#define SPI_SETFASTTASKSWITCH 0x0024
+#define SPI_SETFILTERKEYS 0x0033
+#define SPI_SETFONTSMOOTHING 0x004B
+#define SPI_SETFOREGROUNDFLASHCOUNT 0x2005
+#define SPI_SETFOREGROUNDLOCKTIMEOUT 0x2001
 #define SPI_SETGRADIENTCAPTIONS 0x1009
+#define SPI_SETGRIDGRANULARITY 0x0013
+#define SPI_SETHANDHELD 0x004E
+#define SPI_SETHIGHCONTRAST 0x0043
 #define SPI_SETHOTTRACKING 0x100F
+#define SPI_SETICONMETRICS 0x002E
+#define SPI_SETICONS 0x0058
+#define SPI_SETICONTITLELOGFONT 0x0022
+#define SPI_SETICONTITLEWRAP 0x001A
 #define SPI_SETKEYBOARDCUES 0x100B
+#define SPI_SETKEYBOARDDELAY 0x0017
+#define SPI_SETKEYBOARDPREF 0x0045
+#define SPI_SETKEYBOARDSPEED 0x000B
+#define SPI_SETLANGTOGGLE 0x005B
 #define SPI_SETLISTBOXSMOOTHSCROLLING 0x1007
+#define SPI_SETLOWPOWERACTIVE 0x0055
+#define SPI_SETLOWPOWERTIMEOUT 0x0051
 #define SPI_SETMENUANIMATION 0x1003
+#define SPI_SETMENUDROPALIGNMENT 0x001C
 #define SPI_SETMENUFADE 0x1013
-#define SPI_SETMENUUNDERLINES 0x100B
-#define SPI_SETMOUSESPEED 113
+#define SPI_SETMENUSHOWDELAY 0x006B
+#define SPI_SETMENUUNDERLINES SPI_SETKEYBOARDCUES
+#define SPI_SETMINIMIZEDMETRICS 0x002C
+#define SPI_SETMOUSE 0x0004
+#define SPI_SETMOUSEBUTTONSWAP 0x0021
+#define SPI_SETMOUSEHOVERHEIGHT 0x0065
+#define SPI_SETMOUSEHOVERTIME 0x0067
+#define SPI_SETMOUSEHOVERWIDTH 0x0063
+#define SPI_SETMOUSEKEYS 0x0037
+#define SPI_SETMOUSESPEED 0x0071
+#define SPI_SETMOUSETRAILS 0x005D
+#define SPI_SETNONCLIENTMETRICS 0x002A
+#define SPI_SETPENWINDOWS 0x0031
+#define SPI_SETPOWEROFFACTIVE 0x0056
+#define SPI_SETPOWEROFFTIMEOUT 0x0052
+#define SPI_SETSCREENREADER 0x0047
+#define SPI_SETSCREENSAVEACTIVE 0x0011
+#define SPI_SETSCREENSAVERRUNNING 0x0061
+#define SPI_SETSCREENSAVETIMEOUT 0x000F
 #define SPI_SETSELECTIONFADE 0x1015
+#define SPI_SETSERIALKEYS 0x003F
+#define SPI_SETSHOWIMEUI 0x006F
+#define SPI_SETSHOWSOUNDS 0x0039
+#define SPI_SETSNAPTODEFBUTTON 0x0060
+#define SPI_SETSOUNDSENTRY 0x0041
+#define SPI_SETSTICKYKEYS 0x003B
+#define SPI_SETTOGGLEKEYS 0x0035
 #define SPI_SETTOOLTIPANIMATION 0x1017
 #define SPI_SETTOOLTIPFADE 0x1019
+#define SPI_SETUIEFFECTS 0x103F
+#define SPI_SETWHEELSCROLLLINES 0x0069
+#define SPI_SETWORKAREA 0x002F
+#if (_WIN32_WINNT >= 0x0501)
+#define SPI_GETDROPSHADOW 0x1024
+#define SPI_GETFLATMENU 0x1022
+#define SPI_GETFOCUSBORDERHEIGHT 0x2010
+#define SPI_GETFOCUSBORDERWIDTH 0x200E
+#define SPI_GETFONTSMOOTHINGCONTRAST 0x200C
+#define SPI_GETFONTSMOOTHINGTYPE 0x200A
+#define SPI_GETMOUSECLICKLOCK 0x101E
+#define SPI_GETMOUSECLICKLOCKTIME 0x2008
+#define SPI_GETMOUSESONAR 0x101C
+#define SPI_GETMOUSETRAILS 0x005E
+#define SPI_GETMOUSEVANISH 0x1020
+#define SPI_SETDROPSHADOW 0x1025
+#define SPI_SETFLATMENU 0x1023
+#define SPI_SETFOCUSBORDERHEIGHT 0x2011
+#define SPI_SETFOCUSBORDERWIDTH 0x200F
+#define SPI_SETFONTSMOOTHINGCONTRAST 0x200D
+#define SPI_SETFONTSMOOTHINGTYPE 0x200B
+#define SPI_SETMOUSECLICKLOCK 0x101F
+#define SPI_SETMOUSECLICKLOCKTIME 0x2009
+#define SPI_SETMOUSESONAR 0x101D
+#define SPI_SETMOUSETRAILS 0x005D
+#define SPI_SETMOUSEVANISH 0x1021
 #endif
-
-#define SPIF_UPDATEINIFILE 1
-#define SPIF_SENDWININICHANGE 2
-#define SPIF_SENDCHANGE 2
+#define SPIF_UPDATEINIFILE 0x0001
+#define SPIF_SENDCHANGE 0x0002
+#define SPIF_SENDWININICHANGE SPIF_SENDCHANGE
 #define ATF_ONOFFFEEDBACK 2
 #define ATF_TIMEOUTON 1
 #define WM_APP 32768