[PSDK]

fix NOTIFYICONDATA definition

svn path=/trunk/; revision=66438

diff --git a/reactos/include/psdk/shellapi.h b/reactos/include/psdk/shellapi.h
index 13b5a23..5845c2a 100644 (file)
--- a/reactos/include/psdk/shellapi.h
+++ b/reactos/include/psdk/shellapi.h
@@ -203,7 +203,10 @@ typedef struct _NOTIFYICONDATAA {
        UINT uFlags;
        UINT uCallbackMessage;
        HICON hIcon;
-#if _WIN32_IE >= 0x0500
+#if (NTDDI_VERSION < NTDDI_WIN2K)
+       CHAR szTip[64];
+#endif
+#if (NTDDI_VERSION >= NTDDI_WIN2K)
        CHAR szTip[128];
        DWORD dwState;
        DWORD dwStateMask;
@@ -217,9 +220,12 @@ typedef struct _NOTIFYICONDATAA {
 #else
        CHAR szTip[64];
 #endif
-#if _WIN32_IE >= 0x600
+#if (NTDDI_VERSION >= NTDDI_WINXP)
        GUID guidItem;
 #endif
+#if (NTDDI_VERSION >= NTDDI_VISTA)
+       HICON hBalloonIcon;
+#endif
 } NOTIFYICONDATAA,*PNOTIFYICONDATAA;
 
 typedef struct _NOTIFYICONDATAW {
@@ -229,7 +235,10 @@ typedef struct _NOTIFYICONDATAW {
        UINT uFlags;
        UINT uCallbackMessage;
        HICON hIcon;
-#if _WIN32_IE >= 0x0500
+#if (NTDDI_VERSION < NTDDI_WIN2K)
+       CHAR szTip[64];
+#endif
+#if (NTDDI_VERSION >= NTDDI_WIN2K)
        WCHAR szTip[128];
        DWORD dwState;
        DWORD dwStateMask;
@@ -243,9 +252,12 @@ typedef struct _NOTIFYICONDATAW {
 #else
        WCHAR szTip[64];
 #endif
-#if _WIN32_IE >= 0x600
+#if (NTDDI_VERSION >= NTDDI_WINXP)
        GUID guidItem;
 #endif
+#if (NTDDI_VERSION >= NTDDI_VISTA)
+    HICON hBalloonIcon;
+#endif
 } NOTIFYICONDATAW,*PNOTIFYICONDATAW;
 
 #define NOTIFYICONDATAA_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAA, szTip[64])