Menu
▾
▴
[MinGW-cvs] [git push mingw-org-wsl]Repository: mingw-org-wsl branch 5.0-active updated. e8d3e5c3fe205e7a9e8ce5fa5b80e6b8160ee5cd
|
From: Keith M. <no...@so...> - 2017-06-12 19:33:49
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Repository: mingw-org-wsl".
The branch, 5.0-active has been updated
via e8d3e5c3fe205e7a9e8ce5fa5b80e6b8160ee5cd (commit)
via fbe762913d496a42c1a798d4b8e0628b4e3738a4 (commit)
from 16ab58171b55e2959b97866b6fc8e913615c8e03 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://sf.net/p/mingw/mingw-org-wsl/ci/e8d3e5c3fe205e7a9e8ce5fa5b80e6b8160ee5cd/
commit e8d3e5c3fe205e7a9e8ce5fa5b80e6b8160ee5cd
Author: Keith Marshall <kei...@us...>
Date: Mon Jun 12 20:20:10 2017 +0100
Consolidate <winuser.h> version specific conditionals.
diff --git a/w32api/ChangeLog b/w32api/ChangeLog
index b682fc6..235e3ec 100644
--- a/w32api/ChangeLog
+++ b/w32api/ChangeLog
@@ -1,3 +1,14 @@
+2017-06-12 Keith Marshall <kei...@us...>
+
+ Consolidate <winuser.h> version specific conditionals.
+
+ * include/winuser.h: Reorganize file content; group manifest constant
+ definitions into one nested collection of conditional blocks, with one
+ block per Windows version evolution; do likewise for type definitions
+ and function prototypes which are always exposed, and separately...
+ [! defined NOGDI]: ...for those which may be suppressed, when GDI
+ support is not required.
+
2017-06-06 Keith Marshall <kei...@us...>
Make <winuser.h> header effectively self-contained.
diff --git a/w32api/include/winuser.h b/w32api/include/winuser.h
index bfb1f9d..6a18beb 100644
--- a/w32api/include/winuser.h
+++ b/w32api/include/winuser.h
@@ -60,6 +60,9 @@ _BEGIN_C_DECLS
#endif
#endif
+#define ATF_ONOFFFEEDBACK 2
+#define ATF_TIMEOUTON 1
+
#define MNGO_NOINTERFACE 0x00
#define MNGO_NOERROR 0x01
#define MNGOF_TOPGAP 0x01
@@ -128,13 +131,6 @@ _BEGIN_C_DECLS
#define CF_HDROP 15
#define CF_LOCALE 16
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define CF_DIBV5 17
-#define CF_MAX 18
-#else
-#define CF_MAX 17
-#endif
-
#define CF_OWNERDISPLAY 128
#define CF_DSPTEXT 129
#define CF_DSPBITMAP 130
@@ -455,14 +451,6 @@ _BEGIN_C_DECLS
#define DC_TEXT 0x00000008
#define DC_INBUTTON 0x00000010
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
-#define DC_GRADIENT 0x00000020
-#endif
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#define DC_BUTTONS 0x00001000
-#endif
-
/* Where are these documented? */
#define DC_CAPTION (DC_ICON | DC_TEXT | DC_BUTTONS)
#define DC_NC (DC_CAPTION | DC_FRAME)
@@ -498,15 +486,12 @@ _BEGIN_C_DECLS
#define BF_ADJUST 0x2000
#define BF_FLAT 0x4000
#define BF_MONO 0x8000
+
#define DFC_CAPTION 1
#define DFC_MENU 2
#define DFC_SCROLL 3
#define DFC_BUTTON 4
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define DFC_POPUPMENU 5
-#endif /* >= _WIN32_WINNT_WIN2K */
-
#define DFCS_CAPTIONCLOSE 0
#define DFCS_CAPTIONMIN 1
#define DFCS_CAPTIONMAX 2
@@ -533,11 +518,6 @@ _BEGIN_C_DECLS
#define DFCS_PUSHED 512
#define DFCS_CHECKED 1024
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define DFCS_TRANSPARENT 0x800
-#define DFCS_HOT 0x1000
-#endif
-
#define DFCS_ADJUSTRECT 0x2000
#define DFCS_FLAT 0x4000
#define DFCS_MONO 0x8000
@@ -650,10 +630,6 @@ _BEGIN_C_DECLS
#define EWX_REBOOT 2
#define EWX_SHUTDOWN 1
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define EWX_FORCEIFHUNG 16
-#endif
-
#define CS_BYTEALIGNCLIENT 4096
#define CS_BYTEALIGNWINDOW 8192
#define CS_KEYCVTWINDOW 4
@@ -669,10 +645,6 @@ _BEGIN_C_DECLS
#define CS_VREDRAW 1
#define CS_IME 0x10000
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#define CS_DROPSHADOW 0x20000
-#endif
-
#define GCW_ATOM (-32)
#define GCL_CBCLSEXTRA (-20)
#define GCL_CBWNDEXTRA (-18)
@@ -748,21 +720,6 @@ _BEGIN_C_DECLS
#define MIIM_BITMAP 128
#define MIIM_FTYPE 256
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define MIM_MAXHEIGHT 1
-#define MIM_BACKGROUND 2
-#define MIM_HELPID 4
-#define MIM_MENUDATA 8
-#define MIM_STYLE 16
-#define MIM_APPLYTOSUBMENUS 0x80000000L
-#define MNS_NOCHECK 0x80000000
-#define MNS_MODELESS 0x40000000
-#define MNS_DRAGDROP 0x20000000
-#define MNS_AUTODISMISS 0x10000000
-#define MNS_NOTIFYBYPOS 0x08000000
-#define MNS_CHECKORBMP 0x04000000
-#endif
-
#define MFT_BITMAP 4
#define MFT_MENUBARBREAK 32
#define MFT_MENUBREAK 64
@@ -825,17 +782,6 @@ _BEGIN_C_DECLS
#define MB_OKCANCEL 1
#define MB_RETRYCANCEL 5
-#ifdef _WIN32_WINNT
-#if _WIN32_WINNT >= _WIN32_WINNT_NT4
-#define MB_SERVICE_NOTIFICATION 0x00200000
-
-#else
-#define MB_SERVICE_NOTIFICATION 0x00040000
-#endif
-
-#define MB_SERVICE_NOTIFICATION_NT3X 0x00040000
-#endif
-
#define MB_SETFOREGROUND 0x10000
#define MB_SYSTEMMODAL 4096
#define MB_TASKMODAL 0x2000
@@ -849,10 +795,6 @@ _BEGIN_C_DECLS
#define MB_TYPEMASK 15
#define MB_TOPMOST 0x40000
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define MB_CANCELTRYCONTINUE 6
-#endif
-
#define IDOK 1
#define IDCANCEL 2
#define IDABORT 3
@@ -861,16 +803,6 @@ _BEGIN_C_DECLS
#define IDYES 6
#define IDNO 7
-#if WINVER >= _WIN32_WINNT_NT4 /* || _WIN32_WINDOWS_95 */
-#define IDCLOSE 8
-#define IDHELP 9
-#endif
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define IDTRYAGAIN 10
-#define IDCONTINUE 11
-#endif
-
#define GWL_EXSTYLE (-20)
#define GWL_STYLE (-16)
#define GWL_WNDPROC (-4)
@@ -890,34 +822,15 @@ _BEGIN_C_DECLS
#define DWL_USER 8
#define DWLP_USER 8
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#define QS_ALLEVENTS 1215
-#define QS_ALLINPUT 1279
-#else
-#define QS_ALLEVENTS 191
-#define QS_ALLINPUT 255
-#endif
-
#define QS_ALLPOSTMESSAGE 256
#define QS_HOTKEY 128
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#define QS_INPUT 1031
-#else
-#define QS_INPUT 7
-#endif
-
#define QS_KEY 1
#define QS_MOUSE 6
#define QS_MOUSEBUTTON 4
#define QS_MOUSEMOVE 2
#define QS_PAINT 32
#define QS_POSTMESSAGE 8
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#define QS_RAWINPUT 1024
-#endif
-
#define QS_SENDMESSAGE 64
#define QS_TIMER 16
#define MWMO_WAITALL 1
@@ -1056,12 +969,6 @@ _BEGIN_C_DECLS
#define SM_STARTER 88
#define SM_SERVERR2 89
-#if _WIN32_WINNT < _WIN32_WINNT_NT4
-#define SM_CMETRICS 76
-#else
-#define SM_CMETRICS 88
-#endif
-
#define SM_REMOTESESSION 0x1000
#define ARW_BOTTOMLEFT 0
#define ARW_BOTTOMRIGHT 1
@@ -1093,11 +1000,6 @@ _BEGIN_C_DECLS
#define KEYEVENTF_EXTENDEDKEY 0x00000001
#define KEYEVENTF_KEYUP 0x00000002
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define KEYEVENTF_UNICODE 0x00000004
-#define KEYEVENTF_SCANCODE 0x00000008
-#endif
-
#define OBM_BTNCORNERS 32758
#define OBM_BTSIZE 32761
#define OBM_CHECK 32760
@@ -1175,51 +1077,10 @@ _BEGIN_C_DECLS
#define MOUSEEVENTF_MIDDLEUP 0x00000040
#define MOUSEEVENTF_ABSOLUTE 0x00008000
-#if _WIN32_WINNT >= _WIN32_WINNT_NT4
-#define MOUSEEVENTF_WHEEL 0x00000800
-#endif
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define MOUSEEVENTF_XDOWN 0x00000080
-#define MOUSEEVENTF_XUP 0x00000100
-#endif
-
-#if _WIN32_WINNT >= _WIN32_WINNT_NT4
-/* The following group of definitions were formerly duplicated from
- * header <pbt.h>, which is now declared obsolete.
- */
-#define PBT_APMQUERYSUSPEND 0
-#define PBT_APMQUERYSTANDBY 1
-#define PBT_APMQUERYSUSPENDFAILED 2
-#define PBT_APMQUERYSTANDBYFAILED 3
-#define PBT_APMSUSPEND 4
-#define PBT_APMSTANDBY 5
-#define PBT_APMRESUMECRITICAL 6
-#define PBT_APMRESUMESUSPEND 7
-#define PBT_APMRESUMESTANDBY 8
-#define PBT_APMBATTERYLOW 9
-#define PBT_APMPOWERSTATUSCHANGE 10
-#define PBT_APMOEMEVENT 11
-#define PBT_APMRESUMEAUTOMATIC 18
-#define PBTF_APMRESUMEFROMFAILURE 1
-#endif
-
-#if _WIN32_WINNT >= _WIN32_WINNT_VISTA
-#define PBT_POWERSETTINGCHANGE 32787
-#endif
-/* end pbt.h */
-
#define PM_NOREMOVE 0
#define PM_REMOVE 1
#define PM_NOYIELD 2
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-# 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_BOTTOM ((HWND)(1))
#define HWND_NOTOPMOST ((HWND)(-2))
@@ -1227,10 +1088,6 @@ _BEGIN_C_DECLS
#define HWND_TOPMOST ((HWND)(-1))
#define HWND_DESKTOP ((HWND)(0))
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define HWND_MESSAGE ((HWND)(-3))
-#endif
-
#define RDW_ERASE 4
#define RDW_FRAME 1024
#define RDW_INTERNALPAINT 2
@@ -1247,10 +1104,6 @@ _BEGIN_C_DECLS
#define SMTO_BLOCK 0x0001
#define SMTO_NORMAL 0x0000
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define SMTO_NOTIMEOUTIFNOTHUNG 0x0008
-#endif
-
#define SIF_DISABLENOSCROLL 0x0008
#define SIF_PAGE 0x0002
#define SIF_POS 0x0004
@@ -1282,18 +1135,6 @@ _BEGIN_C_DECLS
#define HSHELL_WINDOWCREATED 1
#define HSHELL_WINDOWDESTROYED 2
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define HSHELL_ACCESSIBILITYSTATE 11
-#define HSHELL_APPCOMMAND 12
-#define HSHELL_RUDEAPPACTIVATED 32772
-#define HSHELL_FLASH 32774
-#endif
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#define HSHELL_WINDOWREPLACED 13
-#define HSHELL_WINDOWREPLACING 14
-#endif
-
#define SPI_GETACCESSTIMEOUT 0x003C
#define SPI_GETACTIVEWINDOWTRACKING 0x1000
#define SPI_GETACTIVEWNDTRKTIMEOUT 8194
@@ -1443,34 +1284,10 @@ _BEGIN_C_DECLS
#define SPI_SETWHEELSCROLLLINES 0x0069
#define SPI_SETWORKAREA 0x002F
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#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_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_SETMOUSEVANISH 0x1021
-#endif
-
#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
#define WM_ACTIVATE 6
#define WM_ACTIVATEAPP 28
@@ -1545,10 +1362,6 @@ _BEGIN_C_DECLS
#define WM_INITMENU 278
#define WM_INITMENUPOPUP 279
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#define WM_INPUT 0x00FF
-#endif
-
#define WM_INPUTLANGCHANGE 81
#define WM_INPUTLANGCHANGEREQUEST 80
#define WM_KEYDOWN 256
@@ -1568,19 +1381,6 @@ _BEGIN_C_DECLS
#define WM_MDITILE 550
#define WM_MEASUREITEM 44
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define WM_GETOBJECT 0x003D
-#define WM_CHANGEUISTATE 0x0127
-#define WM_UPDATEUISTATE 0x0128
-#define WM_QUERYUISTATE 0x0129
-#define WM_UNINITMENUPOPUP 0x0125
-#define WM_MENURBUTTONUP 290
-#define WM_MENUCOMMAND 0x0126
-#define WM_MENUGETOBJECT 0x0124
-#define WM_MENUDRAG 0x0123
-#define WM_APPCOMMAND 0x0319
-#endif
-
#define WM_MENUCHAR 288
#define WM_MENUSELECT 287
#define WM_NEXTMENU 531
@@ -1598,14 +1398,6 @@ _BEGIN_C_DECLS
#define WM_NCMBUTTONDOWN 167
#define WM_NCMBUTTONUP 168
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define WM_NCXBUTTONDOWN 171
-#define WM_NCXBUTTONUP 172
-#define WM_NCXBUTTONDBLCLK 173
-#define WM_NCMOUSEHOVER 0x02A0
-#define WM_NCMOUSELEAVE 0x02A2
-#endif
-
#define WM_NCMOUSEMOVE 160
#define WM_NCPAINT 133
#define WM_NCRBUTTONDBLCLK 166
@@ -1673,15 +1465,6 @@ _BEGIN_C_DECLS
#define WM_WININICHANGE 26
#define WM_KEYFIRST 256
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#define WM_KEYLAST 265
-#define WM_UNICHAR 265
-#define UNICODE_NOCHAR 0xFFFF
-
-#else
-#define WM_KEYLAST 264
-#endif
-
#define WM_SYNCPAINT 136
#define WM_MOUSEACTIVATE 33
#define WM_MOUSEMOVE 512
@@ -1697,31 +1480,9 @@ _BEGIN_C_DECLS
#define WM_MOUSEWHEEL 522
#define WM_MOUSEFIRST 512
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define WM_XBUTTONDOWN 523
-#define WM_XBUTTONUP 524
-#define WM_XBUTTONDBLCLK 525
-#define WM_MOUSELAST 525
-
-#else
-#define WM_MOUSELAST 522
-#endif
-
#define WM_MOUSEHOVER 0x2A1
#define WM_MOUSELEAVE 0x2A3
-#if _WIN32_WINNT >= _WIN32_WINNT_NT4
-#define WHEEL_DELTA 120
-#define GET_WHEEL_DELTA_WPARAM(wparam) ((short)(HIWORD(wparam)))
-#define WHEEL_PAGESCROLL UINT_MAX
-#endif
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN7
-#define WM_TOUCHMOVE 576
-#define WM_TOUCHDOWN 577
-#define WM_TOUCHUP 578
-#endif
-
#define BM_CLICK 245
#define BM_GETCHECK 240
#define BM_GETIMAGE 246
@@ -1776,11 +1537,6 @@ _BEGIN_C_DECLS
#define CB_SETTOPINDEX 348
#define CB_SHOWDROPDOWN 335
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#define CB_SETMINVISIBLE 0x1701
-#define CB_GETMINVISIBLE 0x1702
-#endif
-
#define CBN_CLOSEUP 8
#define CBN_DBLCLK 2
#define CBN_DROPDOWN 7
@@ -1830,11 +1586,6 @@ _BEGIN_C_DECLS
#define EM_SETWORDBREAKPROC 208
#define EM_UNDO 199
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define EM_GETIMESTATUS 217
-#define EM_SETIMESTATUS 216
-#endif
-
#define EN_CHANGE 768
#define EN_ERRSPACE 1280
#define EN_HSCROLL 1537
@@ -1994,11 +1745,6 @@ _BEGIN_C_DECLS
#define VK_CANCEL 3
#define VK_MBUTTON 4
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define VK_XBUTTON1 5
-#define VK_XBUTTON2 6
-#endif
-
#define VK_BACK 8
#define VK_TAB 9
#define VK_CLEAR 12
@@ -2089,36 +1835,7 @@ _BEGIN_C_DECLS
#define VK_LMENU 0xA4
#define VK_RMENU 0xA5
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define VK_BROWSER_BACK 0xA6
-#define VK_BROWSER_FORWARD 0xA7
-#define VK_BROWSER_REFRESH 0xA8
-#define VK_BROWSER_STOP 0xA9
-#define VK_BROWSER_SEARCH 0xAA
-#define VK_BROWSER_FAVORITES 0xAB
-#define VK_BROWSER_HOME 0xAC
-#define VK_VOLUME_MUTE 0xAD
-#define VK_VOLUME_DOWN 0xAE
-#define VK_VOLUME_UP 0xAF
-#define VK_MEDIA_NEXT_TRACK 0xB0
-#define VK_MEDIA_PREV_TRACK 0xB1
-#define VK_MEDIA_STOP 0xB2
-#define VK_MEDIA_PLAY_PAUSE 0xB3
-#define VK_LAUNCH_MAIL 0xB4
-#define VK_LAUNCH_MEDIA_SELECT 0xB5
-#define VK_LAUNCH_APP1 0xB6
-#define VK_LAUNCH_APP2 0xB7
-#endif
-
#define VK_OEM_1 0xBA
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define VK_OEM_PLUS 0xBB
-#define VK_OEM_COMMA 0xBC
-#define VK_OEM_MINUS 0xBD
-#define VK_OEM_PERIOD 0xBE
-#endif
-
#define VK_OEM_2 0xBF
#define VK_OEM_3 0xC0
#define VK_OEM_4 0xDB
@@ -2127,16 +1844,8 @@ _BEGIN_C_DECLS
#define VK_OEM_7 0xDE
#define VK_OEM_8 0xDF
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define VK_OEM_102 0xE2
-#endif
-
#define VK_PROCESSKEY 0xE5
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define VK_PACKET 0xE7
-#endif
-
#define VK_ATTN 0xF6
#define VK_CRSEL 0xF7
#define VK_EXSEL 0xF8
@@ -2157,11 +1866,6 @@ _BEGIN_C_DECLS
#define MK_CONTROL 8
#define MK_MBUTTON 16
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define MK_XBUTTON1 32
-#define MK_XBUTTON2 64
-#endif
-
#define TPM_CENTERALIGN 4
#define TPM_LEFTALIGN 0
#define TPM_RIGHTALIGN 8
@@ -2175,10 +1879,6 @@ _BEGIN_C_DECLS
#define TPM_NONOTIFY 128
#define TPM_RETURNCMD 256
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
-#define TPM_RECURSE 1
-#endif
-
#define HELP_COMMAND 0x102
#define HELP_CONTENTS 3
#define HELP_CONTEXT 1
@@ -2344,10 +2044,6 @@ _BEGIN_C_DECLS
#define SW_INVALIDATE 2
#define SW_ERASE 4
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
-#define SW_SMOOTHSCROLL 0x0010
-#endif /* >= _WIN32_WINDOWS_98 || >= _WIN32_WINNT_WIN2K */
-
#define SC_SIZE 0xF000
#define SC_MOVE 0xF010
#define SC_MINIMIZE 0xF020
@@ -2392,10 +2088,6 @@ _BEGIN_C_DECLS
#define ICON_SMALL 0
#define ICON_BIG 1
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#define ICON_SMALL2 2
-#endif
-
#define HBMMENU_CALLBACK ((HBITMAP)(-1))
#define HBMMENU_SYSTEM ((HBITMAP)(1))
#define HBMMENU_MBAR_RESTORE ((HBITMAP)(2))
@@ -2420,56 +2112,138 @@ _BEGIN_C_DECLS
#define LLKHF_ALTDOWN (KF_ALTDOWN >> 8)
#define LLKHF_UP (KF_UP >> 8)
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define FLASHW_STOP 0
-#define FLASHW_CAPTION 1
-#define FLASHW_TRAY 2
-#define FLASHW_ALL (FLASHW_CAPTION | FLASHW_TRAY)
-#define FLASHW_TIMER 4
-#define FLASHW_TIMERNOFG 12
-#endif /* >= _WIN32_WINNT_WIN2K */
-
#define CURSOR_SHOWING 0x00000001
#define WS_ACTIVECAPTION 0x00000001
-#if _WIN32_WINNT >= _WIN32_WINNT_NT4SP3
-#define INPUT_MOUSE 0x00000000
-#define INPUT_KEYBOARD 0x00000001
-#define INPUT_HARDWARE 0x00000002
-#endif /* >= _WIN32_WINNT_NT4SP3 */
+#define GA_PARENT 1
+#define GA_ROOT 2
+#define GA_ROOTOWNER 3
+
+#define MAPVK_VK_TO_VSC 0
+#define MAPVK_VSC_TO_VK 1
+#define MAPVK_VK_TO_CHAR 2
+#define MAPVK_VSC_TO_VK_EX 3
+#define MAPVK_VK_TO_VSC_EX 4
+
#if WINVER >= _WIN32_WINNT_NT4 /* || _WIN32_WINDOWS_95 */
#define ENDSESSION_LOGOFF 0x80000000
+
+#define IDCLOSE 8
+#define IDHELP 9
+#endif /* Win9x || WINNT >= WinNT4 */
+
+
+#if _WIN32_WINNT >= _WIN32_WINNT_NT4
+#define GET_WHEEL_DELTA_WPARAM(wparam) ((short)(HIWORD(wparam)))
+
+#define MB_SERVICE_NOTIFICATION 0x00200000
+#define MOUSEEVENTF_WHEEL 0x00000800
+
+/* The following group of definitions were formerly duplicated from
+ * header <pbt.h>, which is now declared obsolete.
+ */
+#define PBT_APMQUERYSUSPEND 0
+#define PBT_APMQUERYSTANDBY 1
+#define PBT_APMQUERYSUSPENDFAILED 2
+#define PBT_APMQUERYSTANDBYFAILED 3
+#define PBT_APMSUSPEND 4
+#define PBT_APMSTANDBY 5
+#define PBT_APMRESUMECRITICAL 6
+#define PBT_APMRESUMESUSPEND 7
+#define PBT_APMRESUMESTANDBY 8
+#define PBT_APMBATTERYLOW 9
+#define PBT_APMPOWERSTATUSCHANGE 10
+#define PBT_APMOEMEVENT 11
+#define PBT_APMRESUMEAUTOMATIC 18
+#define PBTF_APMRESUMEFROMFAILURE 1
+/* end pbt.h */
+
+#define SM_CMETRICS 88
+
+#define WHEEL_DELTA 120
+#define WHEEL_PAGESCROLL UINT_MAX
+
+
+#ifdef _WIN32_WINNT
+#if _WIN32_WINNT < _WIN32_WINNT_NT4
+/* The following are defined for the WinNT platforms only, but this
+ * generic representation acquired a new value from WinNT4 onwards...
+ */
+#define MB_SERVICE_NOTIFICATION 0x00040000
+#endif
+/* ...whereas this alternative always represents the value which is
+ * specific to the older WinNT3x platforms.
+ */
+#define MB_SERVICE_NOTIFICATION_NT3X 0x00040000
#endif
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define CHILDID_SELF 0
-#define OBJID_WINDOW 0x00000000
-#define OBJID_SYSMENU 0xFFFFFFFF
-#define OBJID_TITLEBAR 0xFFFFFFFE
-#define OBJID_MENU 0xFFFFFFFD
-#define OBJID_CLIENT 0xFFFFFFFC
-#define OBJID_VSCROLL 0xFFFFFFFB
-#define OBJID_HSCROLL 0xFFFFFFFA
-#define OBJID_SIZEGRIP 0xFFFFFFF9
-#define OBJID_CARET 0xFFFFFFF8
-#define OBJID_CURSOR 0xFFFFFFF7
-#define OBJID_ALERT 0xFFFFFFF6
-#define OBJID_SOUND 0xFFFFFFF5
-#define GUI_CARETBLINKING 0x00000001
-#define GUI_INMOVESIZE 0x00000002
-#define GUI_INMENUMODE 0x00000004
-#define GUI_SYSTEMMENUMODE 0x00000008
-#define GUI_POPUPMENUMODE 0x00000010
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#define GUI_16BITTASK 0x00000020
+#if _WIN32_WINNT < _WIN32_WINNT_NT4
+/* This is defined for all Win32 platforms, but a different value
+ * applies for WinNT, from WinNT4 onwards.
+ */
+#define SM_CMETRICS 76
+#endif
+#if _WIN32_WINNT < _WIN32_WINNT_WIN2K
+/* Similarly, these are defined with different values, for all WinNT
+ * derivatives, from Win2K onwards...
+ */
+#define CF_MAX 17
+#define WM_MOUSELAST 522
#endif
+#if _WIN32_WINNT < _WIN32_WINNT_WINXP
+/* ...and these, with the change in value becoming applicable for
+ * all WinNT derivatives from WinXP onwards.
+ */
+#define QS_INPUT 7
+#define QS_ALLEVENTS 191
+#define QS_ALLINPUT 255
-#define WINEVENT_OUTOFCONTEXT 0x0000
-#define WINEVENT_SKIPOWNTHREAD 0x0001
-#define WINEVENT_SKIPOWNPROCESS 0x0002
-#define WINEVENT_INCONTEXT 0x0004
+#define WM_KEYLAST 264
+#endif
+
+
+#if _WIN32_WINNT >= _WIN32_WINNT_NT4SP3
+#define INPUT_MOUSE 0x00000000
+#define INPUT_KEYBOARD 0x00000001
+#define INPUT_HARDWARE 0x00000002
+
+#endif /* WINNT >= WinNT4-SP3 */
+#endif /* WINNT >= WinNT4 */
+
+
+#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
+#define DC_GRADIENT 0x00000020
+
+#define EDS_RAWMODE 0x00000002
+
+#define ISMEX_NOSEND 0x00000000
+#define ISMEX_CALLBACK 0x00000004
+#define ISMEX_NOTIFY 0x00000002
+#define ISMEX_REPLIED 0x00000008
+#define ISMEX_SEND 0x00000001
+
+#define MONITOR_DEFAULTTONULL 0
+#define MONITOR_DEFAULTTOPRIMARY 1
+#define MONITOR_DEFAULTTONEAREST 2
+#define MONITORINFOF_PRIMARY 1
+
+#define SW_SMOOTHSCROLL 0x0010
+#define TPM_RECURSE 1
+
+
+#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_ME
+#define ASFW_ANY ((DWORD)(-1))
+
+#define GMMP_USE_DISPLAY_POINTS 1
+#define GMMP_USE_HIGH_RESOLUTION_POINTS 2
+
+#define LSFW_LOCK 1
+#define LSFW_UNLOCK 2
+
+
+#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
#define AW_HOR_POSITIVE 0x00000001
#define AW_HOR_NEGATIVE 0x00000002
#define AW_VER_POSITIVE 0x00000004
@@ -2479,12 +2253,24 @@ _BEGIN_C_DECLS
#define AW_ACTIVATE 0x00020000
#define AW_SLIDE 0x00040000
#define AW_BLEND 0x00080000
+
+#define CF_DIBV5 17
+#define CF_MAX 18
+
+#define CHILDID_SELF 0
+
+#define DC_BUTTONS 0x00001000
+
#define DEVICE_NOTIFY_WINDOW_HANDLE 0x00000000
#define DEVICE_NOTIFY_SERVICE_HANDLE 0x00000001
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#define DEVICE_NOTIFY_ALL_INTERFACE_CLASSES 0x00000004
-#endif
+#define DFC_POPUPMENU 5
+
+#define DFCS_TRANSPARENT 0x800
+#define DFCS_HOT 0x1000
+
+#define EM_GETIMESTATUS 217
+#define EM_SETIMESTATUS 216
#define EVENT_MIN 0x00000001
#define EVENT_SYSTEM_SOUND 0x00000001
@@ -2529,82 +2315,194 @@ _BEGIN_C_DECLS
#define EVENT_OBJECT_HELPCHANGE 0x00008010
#define EVENT_OBJECT_DEFACTIONCHANGE 0x00008011
#define EVENT_OBJECT_ACCELERATORCHANGE 0x00008012
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#define EVENT_CONSOLE_CARET 0x00004001
-#define CONSOLE_CARET_SELECTION 0x00000001
-#define CONSOLE_CARET_VISIBLE 0x00000002
-#define EVENT_CONSOLE_UPDATE_REGION 0x00004002
-#define EVENT_CONSOLE_UPDATE_SIMPLE 0x00004003
-#define EVENT_CONSOLE_UPDATE_SCROLL 0x00004004
-#define EVENT_CONSOLE_LAYOUT 0x00004005
-#define EVENT_CONSOLE_START_APPLICATION 0x00004006
-#define CONSOLE_APPLICATION_16BIT 0x00000001
-#define EVENT_CONSOLE_END_APPLICATION 0x00004007
-#endif /* >= _WIN32_WINNT_WINXP */
-
#define EVENT_MAX 0x7FFFFFFF
-#endif /* >= _WIN32_WINNT_WIN2K */
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_ME
-#define ASFW_ANY ((DWORD)(-1))
-#define LSFW_LOCK 1
-#define LSFW_UNLOCK 2
-#endif
+#define EWX_FORCEIFHUNG 16
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define LWA_COLORKEY 0x01
-#define LWA_ALPHA 0x02
-#define ULW_COLORKEY 0x01
-#define ULW_ALPHA 0x02
-#define ULW_OPAQUE 0x04
-#endif
+#define FLASHW_STOP 0
+#define FLASHW_CAPTION 1
+#define FLASHW_TRAY 2
+#define FLASHW_ALL (FLASHW_CAPTION | FLASHW_TRAY)
+#define FLASHW_TIMER 4
+#define FLASHW_TIMERNOFG 12
-#define GA_PARENT 1
-#define GA_ROOT 2
-#define GA_ROOTOWNER 3
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
-#define MONITOR_DEFAULTTONULL 0
-#define MONITOR_DEFAULTTOPRIMARY 1
-#define MONITOR_DEFAULTTONEAREST 2
-#define MONITORINFOF_PRIMARY 1
-#define EDS_RAWMODE 0x00000002
-#define ISMEX_NOSEND 0x00000000
-#define ISMEX_CALLBACK 0x00000004
-#define ISMEX_NOTIFY 0x00000002
-#define ISMEX_REPLIED 0x00000008
-#define ISMEX_SEND 0x00000001
-#endif
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
#define GR_GDIOBJECTS 0
#define GR_USEROBJECTS 1
-#endif
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_ME
-#define GMMP_USE_DISPLAY_POINTS 1
-#define GMMP_USE_HIGH_RESOLUTION_POINTS 2
-#endif
+#define GUI_CARETBLINKING 0x00000001
+#define GUI_INMOVESIZE 0x00000002
+#define GUI_INMENUMODE 0x00000004
+#define GUI_SYSTEMMENUMODE 0x00000008
+#define GUI_POPUPMENUMODE 0x00000010
+
+#define HSHELL_ACCESSIBILITYSTATE 11
+#define HSHELL_APPCOMMAND 12
+#define HSHELL_RUDEAPPACTIVATED 32772
+#define HSHELL_FLASH 32774
+
+#define HWND_MESSAGE ((HWND)(-3))
+
+#define IDTRYAGAIN 10
+#define IDCONTINUE 11
+
+#define KEYEVENTF_UNICODE 0x00000004
+#define KEYEVENTF_SCANCODE 0x00000008
+
+#define LWA_COLORKEY 0x01
+#define LWA_ALPHA 0x02
+
+#define MB_CANCELTRYCONTINUE 6
+
+#define MIM_MAXHEIGHT 1
+#define MIM_BACKGROUND 2
+#define MIM_HELPID 4
+#define MIM_MENUDATA 8
+#define MIM_STYLE 16
+#define MIM_APPLYTOSUBMENUS 0x80000000L
+
+#define MNS_NOCHECK 0x80000000
+#define MNS_MODELESS 0x40000000
+#define MNS_DRAGDROP 0x20000000
+#define MNS_AUTODISMISS 0x10000000
+#define MNS_NOTIFYBYPOS 0x08000000
+#define MNS_CHECKORBMP 0x04000000
+
+#define MK_XBUTTON1 32
+#define MK_XBUTTON2 64
+
+#define MOUSEEVENTF_XDOWN 0x00000080
+#define MOUSEEVENTF_XUP 0x00000100
+
+#define OBJID_WINDOW 0x00000000
+#define OBJID_SYSMENU 0xFFFFFFFF
+#define OBJID_TITLEBAR 0xFFFFFFFE
+#define OBJID_MENU 0xFFFFFFFD
+#define OBJID_CLIENT 0xFFFFFFFC
+#define OBJID_VSCROLL 0xFFFFFFFB
+#define OBJID_HSCROLL 0xFFFFFFFA
+#define OBJID_SIZEGRIP 0xFFFFFFF9
+#define OBJID_CARET 0xFFFFFFF8
+#define OBJID_CURSOR 0xFFFFFFF7
+#define OBJID_ALERT 0xFFFFFFF6
+#define OBJID_SOUND 0xFFFFFFF5
+
+# 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)
+
+#define SMTO_NOTIMEOUTIFNOTHUNG 0x0008
+
+#define ULW_COLORKEY 0x01
+#define ULW_ALPHA 0x02
+#define ULW_OPAQUE 0x04
+
+#define VK_XBUTTON1 5
+#define VK_XBUTTON2 6
+#define VK_BROWSER_BACK 0xA6
+#define VK_BROWSER_FORWARD 0xA7
+#define VK_BROWSER_REFRESH 0xA8
+#define VK_BROWSER_STOP 0xA9
+#define VK_BROWSER_SEARCH 0xAA
+#define VK_BROWSER_FAVORITES 0xAB
+#define VK_BROWSER_HOME 0xAC
+#define VK_VOLUME_MUTE 0xAD
+#define VK_VOLUME_DOWN 0xAE
+#define VK_VOLUME_UP 0xAF
+#define VK_MEDIA_NEXT_TRACK 0xB0
+#define VK_MEDIA_PREV_TRACK 0xB1
+#define VK_MEDIA_STOP 0xB2
+#define VK_MEDIA_PLAY_PAUSE 0xB3
+#define VK_LAUNCH_MAIL 0xB4
+#define VK_LAUNCH_MEDIA_SELECT 0xB5
+#define VK_LAUNCH_APP1 0xB6
+#define VK_LAUNCH_APP2 0xB7
+#define VK_OEM_PLUS 0xBB
+#define VK_OEM_COMMA 0xBC
+#define VK_OEM_MINUS 0xBD
+#define VK_OEM_PERIOD 0xBE
+#define VK_OEM_102 0xE2
+#define VK_PACKET 0xE7
+
+#define WINEVENT_OUTOFCONTEXT 0x0000
+#define WINEVENT_SKIPOWNTHREAD 0x0001
+#define WINEVENT_SKIPOWNPROCESS 0x0002
+#define WINEVENT_INCONTEXT 0x0004
+
+#define WM_GETOBJECT 0x003D
+#define WM_CHANGEUISTATE 0x0127
+#define WM_UPDATEUISTATE 0x0128
+#define WM_QUERYUISTATE 0x0129
+#define WM_UNINITMENUPOPUP 0x0125
+#define WM_MENURBUTTONUP 290
+#define WM_MENUCOMMAND 0x0126
+#define WM_MENUGETOBJECT 0x0124
+#define WM_MENUDRAG 0x0123
+#define WM_APPCOMMAND 0x0319
+#define WM_NCXBUTTONDOWN 171
+#define WM_NCXBUTTONUP 172
+#define WM_NCXBUTTONDBLCLK 173
+#define WM_NCMOUSEHOVER 0x02A0
+#define WM_NCMOUSELEAVE 0x02A2
+
+#define WM_XBUTTONDOWN 523
+#define WM_XBUTTONUP 524
+#define WM_XBUTTONDBLCLK 525
+#define WM_MOUSELAST 525
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
#define XBUTTON1 0x0001
#define XBUTTON2 0x0002
-#endif
+
#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
+#define CB_SETMINVISIBLE 0x1701
+#define CB_GETMINVISIBLE 0x1702
+
+#define CONSOLE_APPLICATION_16BIT 0x00000001
+#define CONSOLE_CARET_SELECTION 0x00000001
+#define CONSOLE_CARET_VISIBLE 0x00000002
+
+#define CS_DROPSHADOW 0x20000
+
+#define DEVICE_NOTIFY_ALL_INTERFACE_CLASSES 0x00000004
+
+#define EVENT_CONSOLE_CARET 0x00004001
+#define EVENT_CONSOLE_UPDATE_REGION 0x00004002
+#define EVENT_CONSOLE_UPDATE_SIMPLE 0x00004003
+#define EVENT_CONSOLE_UPDATE_SCROLL 0x00004004
+#define EVENT_CONSOLE_LAYOUT 0x00004005
+#define EVENT_CONSOLE_START_APPLICATION 0x00004006
+#define EVENT_CONSOLE_END_APPLICATION 0x00004007
+
#define FE_FONTSMOOTHINGSTANDARD 0x0001
#define FE_FONTSMOOTHINGCLEARTYPE 0x0002
+
+#define GUI_16BITTASK 0x00000020
+
+#define HSHELL_WINDOWREPLACED 13
+#define HSHELL_WINDOWREPLACING 14
+
+#define ICON_SMALL2 2
+
+#define KEYBOARD_OVERRUN_MAKE_CODE 0x00FF
+
+#define MOUSE_MOVE_RELATIVE 0x00000000
+#define MOUSE_MOVE_ABSOLUTE 0x00000001
+#define MOUSE_VIRTUAL_DESKTOP 0x00000002
+#define MOUSE_ATTRIBUTES_CHANGED 0x00000004
+
#define PW_CLIENTONLY 0x00000001
+
+#define QS_INPUT 1031
+#define QS_RAWINPUT 1024
+#define QS_ALLEVENTS 1215
+#define QS_ALLINPUT 1279
+
#define RIM_INPUT 0x00000000
#define RIM_INPUTSINK 0x00000001
#define RIM_TYPEMOUSE 0x00000000
#define RIM_TYPEKEYBOARD 0x00000001
#define RIM_TYPEHID 0x00000002
-#define MOUSE_MOVE_RELATIVE 0x00000000
-#define MOUSE_MOVE_ABSOLUTE 0x00000001
-#define MOUSE_VIRTUAL_DESKTOP 0x00000002
-#define MOUSE_ATTRIBUTES_CHANGED 0x00000004
#define RI_MOUSE_LEFT_BUTTON_DOWN 0x0001
#define RI_MOUSE_LEFT_BUTTON_UP 0x0002
#define RI_MOUSE_RIGHT_BUTTON_DOWN 0x0004
@@ -2622,7 +2520,6 @@ _BEGIN_C_DECLS
#define RI_MOUSE_BUTTON_5_DOWN 0x0100
#define RI_MOUSE_BUTTON_5_UP 0x0200
#define RI_MOUSE_WHEEL 0x0400
-#define KEYBOARD_OVERRUN_MAKE_CODE 0x00ff
#define RI_KEY_MAKE 0x0000
#define RI_KEY_BREAK 0x0001
#define RI_KEY_E0 0x0002
@@ -2642,7 +2539,38 @@ _BEGIN_C_DECLS
#define RIDEV_CAPTUREMOUSE 0x00000200
#define RIDEV_NOHOTKEYS 0x00000200
#define RIDEV_APPKEYS 0x00000400
-#endif
+
+#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_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_SETMOUSEVANISH 0x1021
+
+#define UNICODE_NOCHAR 0xFFFF
+
+#define WM_INPUT 0x00FF
+#define WM_KEYLAST 265
+#define WM_UNICHAR 265
+
+
+#if _WIN32_WINNT >= _WIN32_WINNT_VISTA
+#define PBT_POWERSETTINGCHANGE 32787
+
#if _WIN32_WINNT >= _WIN32_WINNT_WIN7
#define TOUCHEVENTF_DOWN 0x0001
@@ -2657,13 +2585,18 @@ _BEGIN_C_DECLS
#define TOUCHEVENTMASKF_CONTACTAREA 0x0004
#define TOUCHEVENTMASKF_EXTRAINFO 0x0002
#define TOUCHEVENTMASKF_TIMEFROMSYSTEM 0x0001
-#endif
-#define MAPVK_VK_TO_VSC 0
-#define MAPVK_VSC_TO_VK 1
-#define MAPVK_VK_TO_CHAR 2
-#define MAPVK_VSC_TO_VK_EX 3
-#define MAPVK_VK_TO_VSC_EX 4
+#define WM_TOUCHMOVE 576
+#define WM_TOUCHDOWN 577
+#define WM_TOUCHUP 578
+
+#endif /* WINNT >= Win7 */
+#endif /* WINNT >= Vista */
+#endif /* WINNT >= WinXP */
+#endif /* WINNT >= Win2K */
+#endif /* WINNT >= Win2K || Win9x >= WinME */
+#endif /* WINNT >= Win2K || Win9x >= Win98 */
+
#ifndef RC_INVOKED
#define DEKSTOPENUMPROC __AW_SUFFIXED__(DEKSTOPENUMPROC)
@@ -3122,26 +3055,6 @@ typedef struct tagHIGHCONTRASTW
typedef __AW_SUFFIXED__(HIGHCONTRAST) HIGHCONTRAST, *LPHIGHCONTRAST;
-#ifndef NOGDI
-typedef struct tagICONMETRICSA
-{ UINT cbSize;
- int iHorzSpacing;
- int iVertSpacing;
- int iTitleWrap;
- LOGFONTA lfFont;
-} ICONMETRICSA, *LPICONMETRICSA;
-
-typedef struct tagICONMETRICSW
-{ UINT cbSize;
- int iHorzSpacing;
- int iVertSpacing;
- int iTitleWrap;
- LOGFONTW lfFont;
-} ICONMETRICSW, *LPICONMETRICSW;
-
-typedef __AW_SUFFIXED__(ICONMETRICS) ICONMETRICS, *LPICONMETRICS;
-#endif /* ! NOGDI */
-
typedef struct tagMINIMIZEDMETRICS
{ UINT cbSize;
int iWidth;
@@ -3160,47 +3073,7 @@ typedef struct tagMOUSEKEYS
DWORD dwReserved2;
} MOUSEKEYS, *LPMOUSEKEYS;
-#ifndef NOGDI
-typedef struct tagNONCLIENTMETRICSA
-{ UINT cbSize;
- int iBorderWidth;
- int iScrollWidth;
- int iScrollHeight;
- int iCaptionWidth;
- int iCaptionHeight;
- LOGFONTA lfCaptionFont;
- int iSmCaptionWidth;
- int iSmCaptionHeight;
- LOGFONTA lfSmCaptionFont;
- int iMenuWidth;
- int iMenuHeight;
- LOGFONTA lfMenuFont;
- LOGFONTA lfStatusFont;
- LOGFONTA lfMessageFont;
-} NONCLIENTMETRICSA, *LPNONCLIENTMETRICSA;
-
-typedef struct tagNONCLIENTMETRICSW
-{ UINT cbSize;
- int iBorderWidth;
- int iScrollWidth;
- int iScrollHeight;
- int iCaptionWidth;
- int iCaptionHeight;
- LOGFONTW lfCaptionFont;
- int iSmCaptionWidth;
- int iSmCaptionHeight;
- LOGFONTW lfSmCaptionFont;
- int iMenuWidth;
- int iMenuHeight;
- LOGFONTW lfMenuFont;
- LOGFONTW lfStatusFont;
- LOGFONTW lfMessageFont;
-} NONCLIENTMETRICSW, *LPNONCLIENTMETRICSW;
-
-typedef __AW_SUFFIXED__(NONCLIENTMETRICS) NONCLIENTMETRICS, *LPNONCLIENTMETRICS;
-#endif /* ! NOGDI */
-
-typedef struct tagSERIALKEYSA
+typedef struct tagSERIALKEYSA
{ UINT cbSize;
DWORD dwFlags;
LPSTR lpszActivePort;
@@ -3467,15 +3340,6 @@ typedef struct tagSCROLLBARINFO
DWORD rgstate[CCHILDREN_SCROLLBAR+1];
} SCROLLBARINFO, *PSCROLLBARINFO, *LPSCROLLBARINFO;
-#if _WIN32_WINDOWS >= _WIN32_WINDOWS_98
-#define CCHILDREN_TITLEBAR 5
-typedef struct tagTITLEBARINFO
-{ DWORD cbSize;
- RECT rcTitleBar;
- DWORD rgstate[CCHILDREN_TITLEBAR+1];
-} TITLEBARINFO, *PTITLEBARINFO, *LPTITLEBARINFO;
-#endif
-
typedef struct tagWINDOWINFO
{ DWORD cbSize;
RECT rcWindow;
@@ -3540,195 +3404,6 @@ typedef struct tagKBDLLHOOKSTRUCT
DWORD dwExtraInfo;
} KBDLLHOOKSTRUCT, *LPKBDLLHOOKSTRUCT, *PKBDLLHOOKSTRUCT;
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
-typedef struct
-{ UINT cbSize;
- HWND hwnd;
- DWORD dwFlags;
- UINT uCount;
- DWORD dwTimeout;
-} FLASHWINFO, *PFLASHWINFO;
-#endif /* >= _WIN32_WINNT_WIN2K || >= _WIN32_WINDOWS_98 */
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_ME
-typedef struct tagMOUSEMOVEPOINT
-{ int x;
- int y;
- DWORD time;
- ULONG_PTR dwExtraInfo;
-} MOUSEMOVEPOINT, *PMOUSEMOVEPOINT, *LPMOUSEMOVEPOINT;
-#endif
-
-#if _WIN32_WINNT >= _WIN32_WINNT_NT4SP3
-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;
-#endif /* >= _WIN32_WINNT_NT4SP3 */
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN7
-typedef struct _TOUCHINPUT
-{ LONG x;
- LONG y;
- HANDLE hSource;
- DWORD dwID;
- DWORD dwFlags;
- DWORD dwMask;
- DWORD dwTime;
- ULONG_PTR dwExtraInfo;
- DWORD cxContact;
- DWORD cyContact;
-} TOUCHINPUT, *PTOUCHINPUT;
-#endif /* >= _WIN32_WINNT_WIN7 */
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-typedef struct tagGUITHREADINFO
-{ DWORD cbSize;
- DWORD flags;
- HWND hwndActive;
- HWND hwndFocus;
- HWND hwndCapture;
- HWND hwndMenuOwner;
- HWND hwndMoveSize;
- HWND hwndCaret;
- RECT rcCaret;
-} GUITHREADINFO, *PGUITHREADINFO, *LPGUITHREADINFO;
-
-typedef VOID (CALLBACK *WINEVENTPROC) (HWINEVENTHOOK, DWORD, HWND, LONG, LONG, DWORD, DWORD);
-#endif /* >= _WIN32_WINNT_WIN2K */
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-typedef struct
-{ UINT cbSize;
- HDESK hdesk;
- HWND hwnd;
- LUID luid;
-} BSMINFO, *PBSMINFO;
-
-DECLARE_HANDLE(HRAWINPUT);
-
-typedef struct tagRAWINPUTHEADER
-{ DWORD dwType;
- DWORD dwSize;
- HANDLE hDevice;
- WPARAM wParam;
-} RAWINPUTHEADER, *PRAWINPUTHEADER;
-
-typedef struct tagRAWMOUSE
-{ USHORT usFlags;
- _ANONYMOUS_UNION union
- { ULONG ulButtons;
- _ANONYMOUS_STRUCT struct
- { USHORT usButtonFlags;
- USHORT usButtonData;
- };
- };
- ULONG ulRawButtons;
- LONG lLastX;
- LONG lLastY;
- ULONG ulExtraInformation;
-} RAWMOUSE, *PRAWMOUSE, *LPRAWMOUSE;
-
-typedef struct tagRAWKEYBOARD
-{ USHORT MakeCode;
- USHORT Flags;
- USHORT Reserved;
- USHORT VKey;
- UINT Message;
- ULONG ExtraInformation;
-} RAWKEYBOARD, *PRAWKEYBOARD, *LPRAWKEYBOARD;
-
-typedef struct tagRAWHID
-{ DWORD dwSizeHid;
- DWORD dwCount;
- BYTE bRawData;
-} RAWHID, *PRAWHID, *LPRAWHID;
-
-typedef struct tagRAWINPUT
-{ RAWINPUTHEADER header;
- union
- { RAWMOUSE mouse;
- RAWKEYBOARD keyboard;
- RAWHID hid;
- } data;
-} RAWINPUT, *PRAWINPUT, *LPRAWINPUT;
-
-typedef struct tagRAWINPUTDEVICE
-{ USHORT usUsagePage;
- USHORT usUsage;
- DWORD dwFlags;
- HWND hwndTarget;
-} RAWINPUTDEVICE, *PRAWINPUTDEVICE, *LPRAWINPUTDEVICE;
-
-typedef const RAWINPUTDEVICE *PCRAWINPUTDEVICE;
-
-typedef struct tagRAWINPUTDEVICELIST
-{ HANDLE hDevice;
- DWORD dwType;
-} RAWINPUTDEVICELIST, *PRAWINPUTDEVICELIST;
-
-typedef struct tagRID_DEVICE_INFO_MOUSE
-{ DWORD dwId;
- DWORD dwNumberOfButtons;
- DWORD dwSampleRate;
- BOOL fHasHorizontalWheel;
-} RID_DEVICE_INFO_MOUSE, *PRID_DEVICE_INFO_MOUSE;
-
-typedef struct tagRID_DEVICE_INFO_KEYBOARD
-{ DWORD dwType;
- DWORD dwSubType;
- DWORD dwKeyboardMode;
- DWORD dwNumberOfFunctionKeys;
- DWORD dwNumberOfIndicators;
- DWORD dwNumberOfKeysTotal;
-} RID_DEVICE_INFO_KEYBOARD, *PRID_DEVICE_INFO_KEYBOARD;
-
-typedef struct tagRID_DEVICE_INFO_HID
-{ DWORD dwVendorId;
- DWORD dwProductId;
- DWORD dwVersionNumber;
- USHORT usUsagePage;
- USHORT usUsage;
-} RID_DEVICE_INFO_HID, *PRID_DEVICE_INFO_HID;
-
-typedef struct tagRID_DEVICE_INFO
-{ DWORD cbSize;
- DWORD dwType;
- _ANONYMOUS_UNION union
- { RID_DEVICE_INFO_MOUSE mouse;
- RID_DEVICE_INFO_KEYBOARD keyboard;
- RID_DEVICE_INFO_HID hid;
- } DUMMYUNIONNAME;
-} RID_DEVICE_INFO, *PRID_DEVICE_INFO, *LPRID_DEVICE_INFO;
-#endif /* >= _WIN32_WINNT_WINXP */
-
typedef struct
{ POINT pt;
DWORD mouseData;
@@ -3762,34 +3437,10 @@ typedef struct
typedef const GUID *LPCGUID;
#endif
-#if _WIN32_WINNT >= _WIN32_WINNT_VISTA
-typedef HANDLE HPOWERNOTIFY;
-
-typedef struct
-{ GUID PowerSetting;
- DWORD DataLength;
- UCHAR Data[1];
-} POWERBROADCAST_SETTING, *PPOWERBROADCAST_SETTING;
-
-extern const GUID GUID_POWERSCHEME_PERSONALITY;
-extern const GUID GUID_MIN_POWER_SAVINGS;
-extern const GUID GUID_MAX_POWER_SAVINGS;
-extern const GUID GUID_TYPICAL_POWER_SAVINGS;
-extern const GUID GUID_ACDC_POWER_SOURCE;
-extern const GUID GUID_BATTERY_PERCENTAGE_REMAINING;
-extern const GUID GUID_IDLE_BACKGROUND_TASK;
-extern const GUID GUID_SYSTEM_AWAYMODE;
-extern const GUID GUID_MONITOR_POWER_ON;
-#endif
-
WINUSERAPI HKL WINAPI ActivateKeyboardLayout (HKL, UINT);
WINUSERAPI BOOL WINAPI AdjustWindowRect (LPRECT, DWORD, BOOL);
WINUSERAPI BOOL WINAPI AdjustWindowRectEx (LPRECT, DWORD, BOOL, DWORD);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-WINUSERAPI BOOL WINAPI AnimateWindow (HWND, DWORD, DWORD);
-#endif /* >= _WIN32_WINNT_WIN2K */
-
WINUSERAPI BOOL WINAPI AnyPopup (void);
#define AppendMenu __AW_SUFFIXED__(AppendMenu)
@@ -3801,21 +3452,8 @@ WINUSERAPI BOOL WINAPI AttachThreadInput (DWORD, DWORD, BOOL);
WINUSERAPI HDWP WINAPI BeginDeferWindowPos (int);
WINUSERAPI HDC WINAPI BeginPaint (HWND, LPPAINTSTRUCT);
WINUSERAPI BOOL WINAPI BringWindowToTop (HWND);
-
WINUSERAPI long WINAPI BroadcastSystemMessage (DWORD, LPDWORD, UINT, WPARAM, LPARAM);
-#if _WIN32_WINNT >= _WIN32_WINNT_NT4
-#define BroadcastSystemMessage __AW_SUFFIXED__(BroadcastSystemMessage)
-WINUSERAPI long WINAPI BroadcastSystemMessageA (DWORD, LPDWORD, UINT, WPARAM, LPARAM);
-WINUSERAPI long WINAPI BroadcastSystemMessageW (DWORD, LPDWORD, UINT, WPARAM, LPARAM);
-#endif /* >= _WIN32_WINNT_NT4 */
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-#define BroadcastSystemMessageEx __AW_SUFFIXED__(BroadcastSystemMessageEx)
-WINUSERAPI long WINAPI BroadcastSystemMessageExA (DWORD, LPDWORD, UINT, WPARAM, LPARAM, PBSMINFO);
-WINUSERAPI long WINAPI BroadcastSystemMessageExW (DWORD, LPDWORD, UINT, WPARAM, LPARAM, PBSMINFO);
-#endif /* >= _WIN32_WINNT_WINXP */
-
#define CallMsgFilter __AW_SUFFIXED__(CallMsgFilter)
WINUSERAPI BOOL WINAPI CallMsgFilterA (LPMSG, INT);
WINUSERAPI BOOL WINAPI CallMsgFilterW (LPMSG, INT);
@@ -3830,16 +3468,6 @@ WINUSERAPI BOOL WINAPI ChangeClipboardChain (HWND, HWND);
#define DefHookProc(c, p, lp, h) CallNextHookEx ((HHOOK)(*(h)), c, p, lp)
WINUSERAPI LRESULT WINAPI CallNextHookEx (HHOOK, int, WPARAM, LPARAM);
-#ifndef NOGDI
-#define ChangeDisplaySettings __AW_SUFFIXED__(ChangeDisplaySettings)
-WINUSERAPI LONG WINAPI ChangeDisplaySettingsA (PDEVMODEA, DWORD);
-WINUSERAPI LONG WINAPI ChangeDisplaySettingsW (PDEVMODEW, DWORD);
-
-#define ChangeDisplaySettingsEx __AW_SUFFIXED__(ChangeDisplaySettingsEx)
-WINUSERAPI LONG WINAPI ChangeDisplaySettingsExA (LPCSTR, LPDEVMODEA, HWND, DWORD, LPVOID);
-WINUSERAPI LONG WINAPI ChangeDisplaySettingsExW (LPCWSTR, LPDEVMODEW, HWND, DWORD, LPVOID);
-#endif /* ! NOGDI */
-
#define ChangeMenu __AW_SUFFIXED__(ChangeMenu)
WINUSERAPI BOOL WINAPI ChangeMenuA (HMENU, UINT, LPCSTR, UINT, UINT);
WINUSERAPI BOOL WINAPI ChangeMenuW (HMENU, UINT, LPCWSTR, UINT, UINT);
@@ -3908,14 +3536,6 @@ WINUSERAPI HACCEL WINAPI CreateAcceleratorTableW (LPACCEL, int);
WINUSERAPI BOOL WINAPI CreateCaret (HWND, HBITMAP, int, int);
WINUSERAPI HCURSOR WINAPI CreateCursor (HINSTANCE, int, int, int, int, PCVOID, PCVOID);
-#ifndef NOGDI
-#define CreateDesktop __AW_SUFFIXED__(CreateDesktop)
-WINUSERAPI HDESK WINAPI CreateDesktopA
-(LPCSTR, LPCSTR, LPDEVMODEA, DWORD, ACCESS_MASK, LPSECURITY_ATTRIBUTES);
-WINUSERAPI HDESK WINAPI CreateDesktopW
-(LPCWSTR, LPCWSTR, LPDEVMODEW, DWORD, ACCESS_MASK, LPSECURITY_ATTRIBUTES);
-#endif /* ! NOGDI */
-
#define CreateDialog __AW_SUFFIXED__(CreateDialog)
#define CreateDialogA(h,n,w,f) CreateDialogParamA (h, n, w, f, 0)
#define CreateDialogW(h,n,w,f) CreateDialogParamW (h, n, w, f, 0)
@@ -3975,10 +3595,6 @@ WINUSERAPI LRESULT WINAPI DefFrameProcW (HWND, HWND, UINT, WPARAM, LPARAM);
WINUSERAPI LRESULT WINAPI DefMDIChildProcA (HWND, UINT, WPARAM, LPARAM);
WINUSERAPI LRESULT WINAPI DefMDIChildProcW (HWND, UINT, WPARAM, LPARAM);
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-WINUSERAPI LRESULT WINAPI DefRawInputProc (PRAWINPUT *, INT, UINT);
-#endif
-
#define DefWindowProc __AW_SUFFIXED__(DefWindowProc)
WINUSERAPI LRESULT WINAPI DefWindowProcA (HWND, UINT, WPARAM, LPARAM);
WINUSERAPI LRESULT WINAPI DefWindowProcW (HWND, UINT, WPARAM, LPARAM);
@@ -4068,10 +3684,6 @@ WINUSERAPI BOOL WINAPI EndDialog (HWND, int);
WINUSERAPI BOOL WINAPI EndMenu (void);
WINUSERAPI BOOL WINAPI EndPaint (HWND, const PAINTSTRUCT *);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-WINUSERAPI BOOL WINAPI EndTask (HWND, BOOL, BOOL);
-#endif
-
WINUSERAPI BOOL WINAPI EnumChildWindows (HWND, ENUMWINDOWSPROC, LPARAM);
WINUSERAPI UINT WINAPI EnumClipboardFormats (UINT);
@@ -4082,22 +3694,6 @@ WINUSERAPI BOOL WINAPI EnumDesktopsW (HWINSTA, DESKTOPENUMPROCW, LPARAM);
WINUSERAPI BOOL WINAPI EnumDesktopWindows (HDESK, ENUMWINDOWSPROC, LPARAM);
WINUSERAPI BOOL WINAPI EnumDisplayMonitors (HDC, LPCRECT, MONITORENUMPROC, LPARAM);
-#ifndef NOGDI
-#define EnumDisplaySettings __AW_SUFFIXED__(EnumDisplaySettings)
-WINUSERAPI BOOL WINAPI EnumDisplaySettingsA (LPCSTR, DWORD, PDEVMODEA);
-WINUSERAPI BOOL WINAPI EnumDisplaySettingsW (LPCWSTR, DWORD, PDEVMODEW);
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
-WINUSERAPI BOOL WINAPI EnumDisplaySettingsExA (LPCSTR, DWORD, LPDEVMODEA, DWORD);
-WINUSERAPI BOOL WINAPI EnumDisplaySettingsExW (LPCWSTR, DWORD, LPDEVMODEW, DWORD);
-#define EnumDisplaySettingsEx __AW_SUFFIXED__(EnumDisplaySettingsEx)
-#endif
-
-#define EnumDisplayDevices __AW_SUFFIXED__(EnumDisplayDevices)
-WINUSERAPI BOOL WINAPI EnumDisplayDevicesA (LPCSTR, DWORD, PDISPLAY_DEVICEA, DWORD);
-WINUSERAPI BOOL WINAPI EnumDisplayDevicesW (LPCWSTR, DWORD, PDISPLAY_DEVICEW, DWORD);
-#endif /* ! NOGDI */
-
#define EnumProps __AW_SUFFIXED__(EnumProps)
WINUSERAPI int WINAPI EnumPropsA (HWND, PROPENUMPROCA);
WINUSERAPI int WINAPI EnumPropsW (HWND, PROPENUMPROCW);
@@ -4128,9 +3724,6 @@ WINUSERAPI HWND WINAPI FindWindowExA (HWND, HWND, LPCSTR, LPCSTR);
WINUSERAPI HWND WINAPI FindWindowExW (HWND, HWND, LPCWSTR, LPCWSTR);
WINUSERAPI BOOL WINAPI FlashWindow (HWND, BOOL);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
-WINUSERAPI BOOL WINAPI FlashWindowEx (PFLASHWINFO);
-#endif
int WINAPI FrameRect (HDC, LPCRECT, HBRUSH);
WINUSERAPI BOOL WINAPI FrameRgn (HDC, HRGN, HBRUSH, int, int);
@@ -4177,10 +3770,6 @@ WINUSERAPI int WINAPI GetClipboardFormatNameW (UINT, LPWSTR, int);
WINUSERAPI HANDLE WINAPI GetClipboardData (UINT);
WINUSERAPI HWND WINAPI GetClipboardOwner (void);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
-WINUSERAPI DWORD WINAPI GetClipboardSequenceNumber (void);
-#endif
-
HWND WINAPI GetClipboardViewer (void);
WINUSERAPI BOOL WINAPI GetClipCursor (LPRECT);
WINUSERAPI BOOL WINAPI GetCursorPos (LPPOINT);
@@ -4199,11 +3788,6 @@ WINUSERAPI UINT WINAPI GetDlgItemTextW (HWND, int, LPWSTR, int);
WINUSERAPI UINT WINAPI GetDoubleClickTime (void);
WINUSERAPI HWND WINAPI GetFocus (void);
WINUSERAPI HWND WINAPI GetForegroundWindow (void);
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-WINUSERAPI DWORD WINAPI GetGuiResources (HANDLE, DWORD);
-#endif
-
WINUSERAPI BOOL WINAPI GetIconInfo (HICON, PICONINFO);
WINUSERAPI BOOL WINAPI GetInputState (void);
WINUSERAPI UINT WINAPI GetKBCodePage (void);
@@ -4249,10 +3833,6 @@ WINUSERAPI LONG WINAPI GetMessageExtraInfo (void);
WINUSERAPI DWORD WINAPI GetMessagePos (void);
WINUSERAPI LONG WINAPI GetMessageTime (void);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_ME
-WINUSERAPI int WINAPI GetMouseMovePointsEx (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD);
-#endif
-
WINUSERAPI HWND WINAPI GetNextDlgGroupItem (HWND, HWND, BOOL);
WINUSERAPI HWND WINAPI GetNextDlgTabItem (HWND, HWND, BOOL);
WINUSERAPI HWND WINAPI GetOpenClipboardWindow (void);
@@ -4263,27 +3843,10 @@ WINUSERAPI int WINAPI GetPriorityClipboardFormat (UINT *, int);
WINUSERAPI HANDLE WINAPI GetPropA (HWND, LPCSTR);
WINUSERAPI HANDLE WINAPI GetPropW (HWND, LPCWSTR);
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-WINUSERAPI UINT WINAPI GetRawInputBuffer (PRAWINPUT, PUINT, UINT);
-WINUSERAPI UINT WINAPI GetRawInputData (HRAWINPUT, UINT, LPVOID, PUINT, UINT);
-
-#define GetRawInputDeviceInfo __AW_SUFFIXED__(GetRawInputDeviceInfo)
-WINUSERAPI UINT WINAPI GetRawInputDeviceInfoA (HANDLE, UINT, LPVOID, PUINT);
-WINUSERAPI UINT WINAPI GetRawInputDeviceInfoW (HANDLE, UINT, LPVOID, PUINT);
-
-WINUSERAPI UINT WINAPI GetRawInputDeviceList (PRAWINPUTDEVICELIST, PUINT, UINT);
-WINUSERAPI UINT WINAPI GetRegisteredRawInputDevices (PRAWINPUTDEVICE, PUINT, UINT);
-#endif
-
WINUSERAPI DWORD WINAPI GetQueueStatus (UINT);
WINUSERAPI BOOL WINAPI GetScrollInfo (HWND, int, LPSCROLLINFO);
WINUSERAPI int WINAPI GetScrollPos (HWND, int);
WINUSERAPI BOOL WINAPI GetScrollRange (HWND, int, LPINT, LPINT);
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-WINUSERAPI HWND WINAPI GetShellWindow (void);
-#endif
-
WINUSERAPI HMENU WINAPI GetSubMenu (HMENU, int);
WINUSERAPI DWORD WINAPI GetSysColor (int);
WINUSERAPI HBRUSH WINAPI GetSysColorBrush (int);
@@ -4348,19 +3911,11 @@ WINUSERAPI BOOL WINAPI GetAltTabInfoW (HWND, int, PALTTABINFO, LPWSTR, UINT);
WINUSERAPI BOOL WINAPI GetComboBoxInfo (HWND, PCOMBOBOXINFO);
WINUSERAPI BOOL WINAPI GetCursorInfo (PCURSORINFO);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-WINUSERAPI BOOL WINAPI GetGUIThreadInfo (DWORD, LPGUITHREADINFO);
-#endif
-
WINUSERAPI BOOL WINAPI GetLastInputInfo (PLASTINPUTINFO);
WINUSERAPI DWORD WINAPI GetListBoxInfo (HWND);
WINUSERAPI BOOL WINAPI GetMenuBarInfo (HWND, LONG, LONG, PMENUBARINFO);
WINUSERAPI BOOL WINAPI GetMenuInfo (HMENU, LPMENUINFO);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-WINUSERAPI BOOL WINAPI GetProcessDefaultLayout (DWORD *);
-#endif
-
#if _WIN32_WINDOWS >= _WIN32_WINDOWS_98
WINUSERAPI BOOL WINAPI GetTitleBarInfo (HWND, PTITLEBARINFO);
#endif
@@ -4385,10 +3940,6 @@ WINUSERAPI BOOL WINAPI HiliteMenuItem (HWND, HMENU, UINT, UINT);
WINUSERAPI BOOL WINAPI InflateRect (LPRECT, int, int);
WINUSERAPI BOOL WINAPI InSendMessage (void);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
-WINUSERAPI DWORD WINAPI InSendMessageEx (LPVOID);
-#endif
-
#define InsertMenu __AW_SUFFIXED__(InsertMenu)
WINUSERAPI BOOL WINAPI InsertMenuA (HMENU, UINT, UINT, UINT, LPCSTR);
WINUSERAPI BOOL WINAPI InsertMenuW (HMENU, UINT, UINT, UINT, LPCWSTR);
@@ -4427,14 +3978,6 @@ WINUSERAPI UINT WINAPI IsDlgButtonChecked (HWND, int);
WINUSERAPI BOOL WINAPI IsDialogMessageA (HWND, LPMSG);
WINUSERAPI BOOL WINAPI IsDialogMessageW (HWND, LPMSG);
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-WINUSERAPI BOOL WINAPI IsGUIThread (BOOL);
-#endif
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-WINUSERAPI BOOL WINAPI IsHungAppWindow (HWND);
-#endif
-
WINUSERAPI BOOL WINAPI IsIconic (HWND);
WINUSERAPI BOOL WINAPI IsMenu (HMENU);
WINUSERAPI BOOL WINAPI IsRectEmpty (LPCRECT);
@@ -4443,10 +3986,6 @@ WINUSERAPI BOOL WINAPI IsWindowEnabled (HWND);
WINUSERAPI BOOL WINAPI IsWindowUnicode (HWND);
WINUSERAPI BOOL WINAPI IsWindowVisible (HWND);
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-WINUSERAPI BOOL WINAPI IsWinEventHookInstalled (DWORD);
-#endif
-
WINUSERAPI BOOL WINAPI IsZoomed (HWND);
WINUSERAPI VOID WINAPI keybd_event (BYTE, BYTE, DWORD, DWORD);
WINUSERAPI BOOL WINAPI KillTimer (HWND, UINT_PTR);
@@ -4493,10 +4032,6 @@ WINUSERAPI int WINAPI LoadStringW (HINSTANCE, UINT, LPWSTR, int);
WINUSERAPI BOOL WINAPI LockWindowUpdate (HWND);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-WINUSERAPI BOOL WINAPI LockWorkStation (void);
-#endif
-
WINUSERAPI int WINAPI LookupIconIdFromDirectory (PBYTE, BOOL);
WINUSERAPI int WINAPI LookupIconIdFromDirectoryEx (PBYTE, BOOL, int, int, UINT);
WINUSERAPI BOOL WINAPI MapDialogRect (HWND, LPRECT);
@@ -4529,21 +4064,11 @@ WINUSERAPI int WINAPI MessageBoxIndirectW (CONST MSGBOXPARAMSW *);
WINUSERAPI BOOL WINAPI ModifyMenuA (HMENU, UINT, UINT, UINT, LPCSTR);
WINUSERAPI BOOL WINAPI ModifyMenuW (HMENU, UINT, UINT, UINT, LPCWSTR);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
-WINUSERAPI HMONITOR WINAPI MonitorFromPoint (POINT, DWORD);
-WINUSERAPI HMONITOR WINAPI MonitorFromRect (LPCRECT, DWORD);
-WINUSERAPI HMONITOR WINAPI MonitorFromWindow (HWND, DWORD);
-#endif
-
WINUSERAPI void WINAPI mouse_event (DWORD, DWORD, DWORD, DWORD, ULONG_PTR);
WINUSERAPI BOOL WINAPI MoveWindow (HWND, int, int, int, int, BOOL);
WINUSERAPI DWORD WINAPI MsgWaitForMultipleObjects (DWORD, CONST HANDLE *, BOOL, DWORD, DWORD);
WINUSERAPI DWORD WINAPI MsgWaitForMultipleObjectsEx (DWORD, CONST HANDLE *, DWORD, DWORD, DWORD);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-WINUSERAPI void WINAPI NotifyWinEvent (DWORD, HWND, LONG, LONG);
-#endif
-
WINUSERAPI DWORD WINAPI OemKeyScan (WORD);
#define OemToChar __AW_SUFFIXED__(OemToChar)
@@ -4588,10 +4113,6 @@ WINUSERAPI BOOL WINAPI PostThreadMessageW (DWORD, UINT, WPARAM, LPARAM);
WINUSERAPI void WINAPI PostQuitMessage (int);
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-WINUSERAPI BOOL WINAPI PrintWindow (HWND, HDC, UINT);
-#endif
-
WINUSERAPI BOOL WINAPI PtInRect (LPCRECT, POINT);
WINUSERAPI BOOL WINAPI RedrawWindow (HWND, LPCRECT, HRGN, UINT);
WINUSERAPI HWND WINAPI RealChildWindowFromPoint (HWND, POINT);
@@ -4612,22 +4133,8 @@ WINUSERAPI ATOM WINAPI RegisterClassExW (CONST WNDCLASSEXW *);
WINUSERAPI UINT WINAPI RegisterClipboardFormatA (LPCSTR);
WINUSERAPI UINT WINAPI RegisterClipboardFormatW (LPCWSTR);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-#define RegisterDeviceNotification __AW_SUFFIXED__(RegisterDeviceNotification)
-WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationA (HANDLE, LPVOID, DWORD);
-WINUSERAPI HDEVNOTIFY WINAPI RegisterDeviceNotificationW (HANDLE, LPVOID, DWORD);
-#endif
-
-#if _WIN32_WINNT >= _WIN32_WINNT_VISTA
-WINUSERAPI HPOWERNOTIFY WINAPI RegisterPowerSettingNotification (HANDLE, LPCGUID, DWORD);
-#endif
-
WINUSERAPI BOOL WINAPI RegisterHotKey (HWND, int, UINT, UINT);
-#if _WIN32_WINNT >= _WIN32_WINNT_WINXP
-WINUSERAPI BOOL WINAPI RegisterRawInputDevices (PCRAWINPUTDEVICE, UINT, UINT);
-#endif
-
#define RegisterWindowMessage __AW_SUFFIXED__(RegisterWindowMessage)
WINUSERAPI UINT WINAPI RegisterWindowMessageA (LPCSTR);
WINUSERAPI UINT WINAPI RegisterWindowMessageW (LPCWSTR);
@@ -4650,14 +4157,6 @@ WINUSERAPI int WINAPI ScrollWindowEx (HWND, int, int, LPCRECT, LPCRECT, HRGN, LP
WINUSERAPI LONG WINAPI SendDlgItemMessageA (HWND, int, UINT, WPARAM, LPARAM);
WINUSERAPI LONG WINAPI SendDlgItemMessageW (HWND, int, UINT, WPARAM, LPARAM);
-#if _WIN32_WINNT >= _WIN32_WINNT_NT4SP3
-WINUSERAPI UINT WINAPI SendInput (UINT, LPINPUT, int);
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
-BOOL WINAPI BlockInput(BOOL);
-#endif
-#endif
-
#define SendMessage __AW_SUFFIXED__(SendMessage)
WINUSERAPI LRESULT WINAPI SendMessageA (HWND, UINT, WPARAM, LPARAM);
WINUSERAPI LRESULT WINAPI SendMessageW (HWND, UINT, WPARAM, LPARAM);
@@ -4722,11 +4221,6 @@ WINUSERAPI BOOL WINAPI SetMenuItemInfoW ( HMENU, UINT, BOOL, LPCMENUITEMINFOW);
WINUSERAPI LPARAM WINAPI SetMessageExtraInfo (LPARAM);
WINUSERAPI BOOL WINAPI SetMessageQueue (int);
WINUSERAPI HWND WINAPI SetParent (HWND, HWND);
-
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-WINUSERAPI BOOL WINAPI SetProcessDefaultLayout (DWORD);
-#endif /* >= _WIN32_WINNT_WIN2K */
-
WINUSERAPI BOOL WINAPI SetProcessWindowStation (HWINSTA);
#define SetProp __AW_SUFFIXED__(SetProp)
@@ -4753,11 +4247,6 @@ WINUSERAPI BOOL WINAPI SetUserObjectInformationW (HANDLE, int, PVOID, DWORD);
WINUSERAPI BOOL WINAPI SetUserObjectSecurity
(HANDLE, PSECURITY_INFORMATION, PSECURITY_DESCRIPTOR);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-WINUSERAPI HWINEVENTHOOK WINAPI SetWinEventHook
-(UINT, UINT, HMODULE, WINEVENTPROC, DWORD, DWORD, UINT);
-#endif
-
WINUSERAPI BOOL WINAPI SetWindowContextHelpId (HWND, DWORD);
#define SetWindowLong __AW_SUFFIXED__(SetWindowLong)
@@ -4801,10 +4290,6 @@ WINUSERAPI BOOL WINAPI SubtractRect (LPRECT, LPCRECT, LPCRECT);
WINUSERAPI BOOL WINAPI SwapMouseButton (BOOL);
WINUSERAPI BOOL WINAPI SwitchDesktop (HDESK);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-WINUSERAPI VOID WINAPI SwitchToThisWindow (HWND, BOOL);
-#endif /* >= _WIN32_WINNT_WIN2K */
-
#define SystemParametersInfo __AW_SUFFIXED__(SystemParametersInfo)
WINUSERAPI BOOL WINAPI SystemParametersInfoA (UINT, UINT, PVOID, UINT);
WINUSERAPI BOOL WINAPI SystemParametersInfoW (UINT, UINT, PVOID, UINT);
@@ -4831,10 +4316,6 @@ WINUSERAPI BOOL WINAPI TranslateMessage (const MSG *);
WINUSERAPI BOOL WINAPI UnhookWindowsHook (int, HOOKPROC);
WINUSERAPI BOOL WINAPI UnhookWindowsHookEx (HHOOK);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K
-WINUSERAPI BOOL WINAPI UnhookWinEvent (HWINEVENTHOOK);
-#endif /* >= _WIN32_WINNT_WIN2K */
-
WINUSERAPI BOOL WINAPI UnionRect (LPRECT, LPCRECT, LPCRECT);
WINUSERAPI BOOL WINAPI UnloadKeyboardLayout (HKL);
@@ -4842,21 +4323,9 @@ WINUSERAPI BOOL WINAPI UnloadKeyboardLayout (HKL);
WINUSERAPI BOOL WINAPI UnregisterClassA (LPCSTR, HINSTANCE);
WINUSERAPI BOOL WINAPI UnregisterClassW (LPCWSTR, HINSTANCE);
-#if _WIN32_WINNT >= _WIN32_WINNT_WIN2K || _WIN32_WINDOWS >= _WIN32_WINDOWS_98
-WINUSERAPI BOOL WINAPI UnregisterDeviceNotification (HANDLE);
-#endif
-
-#if _WIN32_WINNT >= _WIN32_WINNT_VISTA
-WINUSERAPI BOOL WINAPI UnregisterPowerSettingNotification (HPOWERNOTIFY);
-#endif
-
WINUSERAPI BOOL WINAPI Unregister...
[truncated message content] |
