* include/shellapi.h [_WIN32_IE >= 0x0600]

	(SEE_MASK_NOZONECHECKS,SEE_MASK_FLAG_LOG_USAGE): Define on
	Windows XP SP1 and Windows XP respectively.

diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 1e97ba93ec920134b3370b7e2c13f53de8d3a9ac..4edcd0ce8915bb03d042fcbee61611d9380ee886 100644 (file)
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-07  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
+       * include/shellapi.h  [_WIN32_IE >= 0x0600]
+       (SEE_MASK_NOZONECHECKS,SEE_MASK_FLAG_LOG_USAGE): Define on
+       Windows XP SP1 and Windows XP respectively.
+
 2006-03-07  Dimitri Papadopoulos  <papadopo@users.sourceforge.net>
        * include/shellapi.h (NOTIFYICONDATA_V*_SIZE): Define.
        Thanks to:  Daniel Atallah <datallah at users dot sf dot net>

diff --git a/winsup/w32api/include/shellapi.h b/winsup/w32api/include/shellapi.h
index 6eb98df5ce0c4259335c999e54db60e9902e59c6..b7d524581007f168f9fde29dcbfa55cd7f01c52a 100644 (file)
--- a/winsup/w32api/include/shellapi.h
+++ b/winsup/w32api/include/shellapi.h
@@ -14,21 +14,25 @@ extern "C" {
 #define ABE_BOTTOM     3
 #define ABS_AUTOHIDE   1
 #define ABS_ALWAYSONTOP        2
-#define SEE_MASK_CLASSNAME     1
-#define SEE_MASK_CLASSKEY      3
-#define SEE_MASK_IDLIST        4
-#define SEE_MASK_INVOKEIDLIST   12
-#define SEE_MASK_ICON  0x10
-#define SEE_MASK_HOTKEY        0x20
-#define SEE_MASK_NOCLOSEPROCESS        0x40
-#define SEE_MASK_CONNECTNETDRV 0x80
-#define SEE_MASK_FLAG_DDEWAIT  0x100
-#define SEE_MASK_DOENVSUBST    0x200
-#define SEE_MASK_FLAG_NO_UI    0x400
-#define SEE_MASK_NO_CONSOLE    0x8000
-#define SEE_MASK_UNICODE       0x10000
-#define SEE_MASK_ASYNCOK       0x100000
-#define SEE_MASK_HMONITOR      0x200000
+#define SEE_MASK_CLASSNAME         0x1
+#define SEE_MASK_CLASSKEY          0x3
+#define SEE_MASK_IDLIST            0x4
+#define SEE_MASK_INVOKEIDLIST      0xc
+#define SEE_MASK_ICON              0x10
+#define SEE_MASK_HOTKEY            0x20
+#define SEE_MASK_NOCLOSEPROCESS    0x40
+#define SEE_MASK_CONNECTNETDRV     0x80
+#define SEE_MASK_FLAG_DDEWAIT      0x100
+#define SEE_MASK_DOENVSUBST        0x200
+#define SEE_MASK_FLAG_NO_UI        0x400
+#define SEE_MASK_NO_CONSOLE        0x8000
+#define SEE_MASK_UNICODE           0x10000
+#define SEE_MASK_ASYNCOK           0x100000
+#define SEE_MASK_HMONITOR          0x200000
+#if (_WIN32_IE >= 0x0600)
+#define SEE_MASK_NOZONECHECKS      0x800000
+#define SEE_MASK_FLAG_LOG_USAGE    0x4000000
+#endif
 #define ABM_NEW        0
 #define ABM_REMOVE     1
 #define ABM_QUERYPOS   2