From 07ab1cc82dcde6160166ebad2244dfeed7ebb142 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Tue, 13 May 2025 22:09:52 +0200 Subject: [PATCH] [SDK] winuser.h: Add missing Vista+ WinEvent defines (#8019) --- sdk/include/psdk/winuser.h | 93 ++++++++++++++++++++++++++++++-------- 1 file changed, 75 insertions(+), 18 deletions(-) diff --git a/sdk/include/psdk/winuser.h b/sdk/include/psdk/winuser.h index 8cc5959f525..e556fa9fa47 100644 --- a/sdk/include/psdk/winuser.h +++ b/sdk/include/psdk/winuser.h @@ -2686,6 +2686,7 @@ extern "C" { #define ENDSESSION_CRITICAL 0x40000000 #define ENDSESSION_CLOSEAPP 0x00000001 #endif + #if (WINVER >= 0x0500) #define CHILDID_SELF 0 #define OBJID_WINDOW 0x00000000 @@ -2731,6 +2732,12 @@ extern "C" { #define EVENT_MIN 0x00000001 #define EVENT_SYSTEM_SOUND 0x00000001 #define EVENT_SYSTEM_ALERT 0x00000002 +#define ALERT_SYSTEM_INFORMATIONAL 1 /* MB_INFORMATION */ +#define ALERT_SYSTEM_WARNING 2 /* MB_WARNING */ +#define ALERT_SYSTEM_ERROR 3 /* MB_ERROR */ +#define ALERT_SYSTEM_QUERY 4 /* MB_QUESTION */ +#define ALERT_SYSTEM_CRITICAL 5 /* HardSysErrBox */ +#define CALERT_SYSTEM 6 #define EVENT_SYSTEM_FOREGROUND 0x00000003 #define EVENT_SYSTEM_MENUSTART 0x00000004 #define EVENT_SYSTEM_MENUEND 0x00000005 @@ -2752,6 +2759,44 @@ extern "C" { #define EVENT_SYSTEM_SWITCHEND 0x00000015 #define EVENT_SYSTEM_MINIMIZESTART 0x00000016 #define EVENT_SYSTEM_MINIMIZEEND 0x00000017 +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) +#define EVENT_SYSTEM_DESKTOPSWITCH 0x00000020 +#endif /* _WIN32_WINNT >= _WIN32_WINNT_VISTA */ +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) +#define EVENT_SYSTEM_SWITCHER_APPGRABBED 0x00000024 +#define EVENT_SYSTEM_SWITCHER_APPOVERTARGET 0x00000025 +#define EVENT_SYSTEM_SWITCHER_APPDROPPED 0x00000026 +#define EVENT_SYSTEM_SWITCHER_CANCELLED 0x00000027 +#define EVENT_SYSTEM_IME_KEY_NOTIFICATION 0x00000029 +#endif /* _WIN32_WINNT >= _WIN32_WINNT_WIN8 */ +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) +#define EVENT_SYSTEM_END 0x000000ff +#define EVENT_OEM_DEFINED_START 0x00000101 +#define EVENT_OEM_DEFINED_END 0x000001ff +#define EVENT_UIA_EVENTID_START 0x00004e00 +#define EVENT_UIA_EVENTID_END 0x00004eff +#define EVENT_UIA_PROPID_START 0x00007500 +#define EVENT_UIA_PROPID_END 0x000075ff +#endif /* _WIN32_WINNT >= _WIN32_WINNT_WIN7 */ +#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 +#if defined(_WIN64) && !defined(__REACTOS__) +#define CONSOLE_APPLICATION_16BIT 0x00000000 +#else +#define CONSOLE_APPLICATION_16BIT 0x00000001 +#endif /* defined(_WIN64) */ +#define EVENT_CONSOLE_END_APPLICATION 0x00004007 +#endif /* _WIN32_WINNT >= _WIN32_WINNT_WINXP */ +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) +#define EVENT_CONSOLE_END 0x000040ff +#endif /* _WIN32_WINNT >= _WIN32_WINNT_WIN7 */ #define EVENT_OBJECT_CREATE 0x00008000 #define EVENT_OBJECT_DESTROY 0x00008001 #define EVENT_OBJECT_SHOW 0x00008002 @@ -2771,26 +2816,38 @@ extern "C" { #define EVENT_OBJECT_HELPCHANGE 0x00008010 #define EVENT_OBJECT_DEFACTIONCHANGE 0x00008011 #define EVENT_OBJECT_ACCELERATORCHANGE 0x00008012 -#define ALERT_SYSTEM_INFORMATIONAL 1 /* MB_INFORMATION */ -#define ALERT_SYSTEM_WARNING 2 /* MB_WARNING */ -#define ALERT_SYSTEM_ERROR 3 /* MB_ERROR */ -#define ALERT_SYSTEM_QUERY 4 /* MB_QUESTION */ -#define ALERT_SYSTEM_CRITICAL 5 /* HardSysErrBox */ -#define CALERT_SYSTEM 6 -#if (_WIN32_WINNT >= 0x0501) -#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 >= 0x0501) */ +#if (_WIN32_WINNT >= _WIN32_WINNT_VISTA) +#define EVENT_OBJECT_INVOKED 0x00008013 +#define EVENT_OBJECT_TEXTSELECTIONCHANGED 0x00008014 +#define EVENT_OBJECT_CONTENTSCROLLED 0x00008015 +#endif /* _WIN32_WINNT >= _WIN32_WINNT_VISTA */ +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) +#define EVENT_SYSTEM_ARRANGMENTPREVIEW 0x00008016 +#endif /* _WIN32_WINNT >= _WIN32_WINNT_WIN7 */ +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN8) +#define EVENT_OBJECT_CLOAKED 0x00008017 +#define EVENT_OBJECT_UNCLOAKED 0x00008018 +#define EVENT_OBJECT_LIVEREGIONCHANGED 0x00008019 +#define EVENT_OBJECT_HOSTEDOBJECTSINVALIDATED 0x00008020 +#define EVENT_OBJECT_DRAGSTART 0x00008021 +#define EVENT_OBJECT_DRAGCANCEL 0x00008022 +#define EVENT_OBJECT_DRAGCOMPLETE 0x00008023 +#define EVENT_OBJECT_DRAGENTER 0x00008024 +#define EVENT_OBJECT_DRAGLEAVE 0x00008025 +#define EVENT_OBJECT_DRAGDROPPED 0x00008026 +#define EVENT_OBJECT_IME_SHOW 0x00008027 +#define EVENT_OBJECT_IME_HIDE 0x00008028 +#define EVENT_OBJECT_IME_CHANGE 0x00008029 +#define EVENT_OBJECT_TEXTEDIT_CONVERSIONTARGETCHANGED 0x00008030 +#endif /* _WIN32_WINNT >= _WIN32_WINNT_WIN8 */ +#if (_WIN32_WINNT >= _WIN32_WINNT_WIN7) +#define EVENT_OBJECT_END 0x000080ff +#define EVENT_AIA_START 0x0000a000 +#define EVENT_AIA_END 0x0000afff +#endif /* _WIN32_WINNT >= _WIN32_WINNT_WIN7 */ #define EVENT_MAX 0x7fffffff #endif /* (WINVER >= 0x0500) */ + #if (_WIN32_WINNT >= 0x0500 || _WIN32_WINDOWS >= 0x0490) #define ASFW_ANY ((DWORD)-1) #define LSFW_LOCK 1