2004-03-16 Martin Fuchs <martin-fuchs@gmx.net>

	* include/shellapi.h (NIM_* NIS_*): Define constants for
	notification icons with _WIN32_IE >= 0x0500.
	(NOTIFYICONDATA): Add new structure members for notification
	icons with _WIN32_IE >= 0x0500.

1 files changed, 43 insertions, 0 deletions

diff --git a/winsup/w32api/include/shellapi.h b/winsup/w32api/include/shellapi.h
index 0a583077c..dba3874bb 100644
--- a/winsup/w32api/include/shellapi.h
+++ b/winsup/w32api/include/shellapi.h
@@ -46,9 +46,17 @@ extern "C" {
 #define NIM_ADD	0
 #define NIM_MODIFY	1
 #define NIM_DELETE	2
+#if _WIN32_IE >= 0x0500
+#define NOTIFYICON_VERSION 3
+#define NIM_SETFOCUS	3
+#define NIM_SETVERSION	4
+#endif
 #define NIF_MESSAGE	1
 #define NIF_ICON	2
 #define NIF_TIP	4
+#define NIF_STATE	8
+#define NIS_HIDDEN	1
+#define NIS_SHAREDICON	2
 #define SE_ERR_FNF	2
 #define SE_ERR_PNF	3
 #define SE_ERR_ACCESSDENIED	5
@@ -112,6 +120,7 @@ typedef struct _AppBarData {
 	LPARAM lParam;
 } APPBARDATA,*PAPPBARDATA;
 DECLARE_HANDLE(HDROP);
+
 typedef struct _NOTIFYICONDATAA {
 	DWORD cbSize;
 	HWND hWnd;
@@ -119,8 +128,25 @@ typedef struct _NOTIFYICONDATAA {
 	UINT uFlags;
 	UINT uCallbackMessage;
 	HICON hIcon;
+#if _WIN32_IE >= 0x0500
+	CHAR szTip[128];
+	DWORD dwState;
+	DWORD dwStateMask;
+	CHAR szInfo[256];
+	_ANONYMOUS_UNION union {
+		UINT uTimeout;
+		UINT uVersion;
+	} DUMMYUNIONNAME;
+	CHAR szInfoTitle[64];
+	DWORD dwInfoFlags;
+#else
 	CHAR szTip[64];
+#endif
+#if _WIN32_IE >= 0x600
+	GUID guidItem;
+#endif
 } NOTIFYICONDATAA,*PNOTIFYICONDATAA;
+
 typedef struct _NOTIFYICONDATAW {
 	DWORD cbSize;
 	HWND hWnd;
@@ -128,8 +154,25 @@ typedef struct _NOTIFYICONDATAW {
 	UINT uFlags;
 	UINT uCallbackMessage;
 	HICON hIcon;
+#if _WIN32_IE >= 0x0500
+	WCHAR szTip[128];
+	DWORD dwState;
+	DWORD dwStateMask;
+	WCHAR szInfo[256];
+	_ANONYMOUS_UNION union {
+		UINT uTimeout;
+		UINT uVersion;
+	} DUMMYUNIONNAME;
+	WCHAR szInfoTitle[64];
+	DWORD dwInfoFlags;
+#else
 	WCHAR szTip[64];
+#endif
+#if _WIN32_IE >= 0x600
+	GUID guidItem;
+#endif
 } NOTIFYICONDATAW,*PNOTIFYICONDATAW;
+
 typedef struct _SHELLEXECUTEINFOA {
 	DWORD cbSize;
 	ULONG fMask;