Sort the SPI_* constants and remove some duplicates.

include/winuser.h

@@ -2662,7 +2662,6 @@ typedef struct tagCBTACTIVATESTRUCT
 #define MNC_SELECT 3
 
 /* SystemParametersInfo */
-/* defines below are for all win versions */
 #define SPI_GETBEEP               1
 #define SPI_SETBEEP               2
 #define SPI_GETMOUSE              3
@@ -2697,8 +2696,16 @@ typedef struct tagCBTACTIVATESTRUCT
 #define SPI_GETFASTTASKSWITCH     35
 #define SPI_SETFASTTASKSWITCH     36
 #define SPI_SETDRAGFULLWINDOWS    37
-#define SPI_GETDRAGFULLWINDOWS	  38
-
+#define SPI_GETDRAGFULLWINDOWS    38
+#define SPI_GETNONCLIENTMETRICS   41
+#define SPI_SETNONCLIENTMETRICS   42
+#define SPI_GETMINIMIZEDMETRICS   43
+#define SPI_SETMINIMIZEDMETRICS   44
+#define SPI_GETICONMETRICS        45
+#define SPI_SETICONMETRICS        46
+#define SPI_SETWORKAREA           47
+#define SPI_GETWORKAREA           48
+#define SPI_SETPENWINDOWS         49
 #define SPI_GETFILTERKEYS         50
 #define SPI_SETFILTERKEYS         51
 #define SPI_GETTOGGLEKEYS         52
@@ -2711,25 +2718,10 @@ typedef struct tagCBTACTIVATESTRUCT
 #define SPI_SETSTICKYKEYS         59
 #define SPI_GETACCESSTIMEOUT      60
 #define SPI_SETACCESSTIMEOUT      61
-
-#define SPI_GETSOUNDSENTRY        64
-#define SPI_SETSOUNDSENTRY        65
-
-/* defines below are for all win versions WINVER >= 0x0400 */
-#define SPI_SETDRAGFULLWINDOWS    37
-#define SPI_GETDRAGFULLWINDOWS    38
-#define SPI_GETNONCLIENTMETRICS   41
-#define SPI_SETNONCLIENTMETRICS   42
-#define SPI_GETMINIMIZEDMETRICS   43
-#define SPI_SETMINIMIZEDMETRICS   44
-#define SPI_GETICONMETRICS        45
-#define SPI_SETICONMETRICS        46
-#define SPI_SETWORKAREA           47
-#define SPI_GETWORKAREA           48
-#define SPI_SETPENWINDOWS         49
-
 #define SPI_GETSERIALKEYS         62
 #define SPI_SETSERIALKEYS         63
+#define SPI_GETSOUNDSENTRY        64
+#define SPI_SETSOUNDSENTRY        65
 #define SPI_GETHIGHCONTRAST       66
 #define SPI_SETHIGHCONTRAST       67
 #define SPI_GETKEYBOARDPREF       68
@@ -2759,13 +2751,10 @@ typedef struct tagCBTACTIVATESTRUCT
 #define SPI_GETWINDOWSEXTENSION   92
 #define SPI_SETMOUSETRAILS        93
 #define SPI_GETMOUSETRAILS        94
-#define SPI_SETSCREENSAVERRUNNING 97
-#define SPI_SCREENSAVERRUNNING    SPI_SETSCREENSAVERRUNNING
-
-/* defines below are for all win versions (_WIN32_WINNT >= 0x0400) ||
- *                                        (_WIN32_WINDOWS > 0x0400) */
 #define SPI_GETSNAPTODEFBUTTON    95
 #define SPI_SETSNAPTODEFBUTTON    96
+#define SPI_SETSCREENSAVERRUNNING 97
+#define SPI_SCREENSAVERRUNNING    SPI_SETSCREENSAVERRUNNING
 #define SPI_GETMOUSEHOVERWIDTH    98
 #define SPI_SETMOUSEHOVERWIDTH    99
 #define SPI_GETMOUSEHOVERHEIGHT   100
@@ -2776,11 +2765,8 @@ typedef struct tagCBTACTIVATESTRUCT
 #define SPI_SETWHEELSCROLLLINES   105
 #define SPI_GETMENUSHOWDELAY      106
 #define SPI_SETMENUSHOWDELAY      107
-
 #define SPI_GETSHOWIMEUI          110
 #define SPI_SETSHOWIMEUI          111
-
-/* defines below are for all win versions WINVER >= 0x0500 */
 #define SPI_GETMOUSESPEED         112
 #define SPI_SETMOUSESPEED         113
 #define SPI_GETSCREENSAVERRUNNING 114
@@ -2814,18 +2800,6 @@ typedef struct tagCBTACTIVATESTRUCT
 #define SPI_SETTOOLTIPFADE             0x1019
 #define SPI_GETCURSORSHADOW            0x101A
 #define SPI_SETCURSORSHADOW            0x101B
-#define SPI_GETDROPSHADOW              0x1024
-#define SPI_SETDROPSHADOW              0x1025
-#define SPI_GETFOREGROUNDLOCKTIMEOUT   0x2000
-#define SPI_SETFOREGROUNDLOCKTIMEOUT   0x2001
-#define SPI_GETACTIVEWNDTRKTIMEOUT     0x2002
-#define SPI_SETACTIVEWNDTRKTIMEOUT     0x2003
-#define SPI_GETFOREGROUNDFLASHCOUNT    0x2004
-#define SPI_SETFOREGROUNDFLASHCOUNT    0x2005
-#define SPI_GETCARETWIDTH              0x2006
-#define SPI_SETCARETWIDTH              0x2007
-
-/* defines below are for all win versions _WIN32_WINNT >= 0x0501 */
 #define SPI_GETMOUSESONAR              0x101C
 #define SPI_SETMOUSESONAR              0x101D
 #define SPI_GETMOUSECLICKLOCK          0x101E
@@ -2840,22 +2814,33 @@ typedef struct tagCBTACTIVATESTRUCT
 #define SPI_SETBLOCKSENDINPUTRESETS    0x1027
 #define SPI_GETUIEFFECTS               0x103E
 #define SPI_SETUIEFFECTS               0x103F
+#define SPI_GETFOREGROUNDLOCKTIMEOUT   0x2000
+#define SPI_SETFOREGROUNDLOCKTIMEOUT   0x2001
+#define SPI_GETACTIVEWNDTRKTIMEOUT     0x2002
+#define SPI_SETACTIVEWNDTRKTIMEOUT     0x2003
+#define SPI_GETFOREGROUNDFLASHCOUNT    0x2004
+#define SPI_SETFOREGROUNDFLASHCOUNT    0x2005
+#define SPI_GETCARETWIDTH              0x2006
+#define SPI_SETCARETWIDTH              0x2007
 #define SPI_GETMOUSECLICKLOCKTIME      0x2008
 #define SPI_SETMOUSECLICKLOCKTIME      0x2009
 #define SPI_GETFONTSMOOTHINGTYPE       0x200A
 #define SPI_SETFONTSMOOTHINGTYPE       0x200B
-
-/* Used by SPI_{GET,SET}FONTSMOOTHINGTYPE */
-#define FE_FONTSMOOTHINGSTANDARD       0x0001
-#define FE_FONTSMOOTHINGCLEARTYPE      0x0002
-#define FE_FONTSMOOTHINGDOCKING        0x8000
-
 #define SPI_GETFONTSMOOTHINGCONTRAST   0x200C
 #define SPI_SETFONTSMOOTHINGCONTRAST   0x200D
 #define SPI_GETFOCUSBORDERWIDTH        0x200E
 #define SPI_SETFOCUSBORDERWIDTH        0x200F
 #define SPI_GETFOCUSBORDERHEIGHT       0x2010
 #define SPI_SETFOCUSBORDERHEIGHT       0x2011
+#define SPI_GETFONTSMOOTHINGORIENTATION 0x2012
+#define SPI_SETFONTSMOOTHINGORIENTATION 0x2013
+
+#define FE_FONTSMOOTHINGSTANDARD       0x0001
+#define FE_FONTSMOOTHINGCLEARTYPE      0x0002
+#define FE_FONTSMOOTHINGDOCKING        0x8000
+
+#define FE_FONTSMOOTHINGORIENTATIONBGR 0x0000
+#define FE_FONTSMOOTHINGORIENTATIONRGB 0x0001
 
 /* SystemParametersInfo flags */