From 9f260fcfef73580befe9ddc6df48b22d97baef36 Mon Sep 17 00:00:00 2001 From: Christoph von Wittich Date: Tue, 24 Feb 2015 10:21:10 +0000 Subject: [PATCH] [PSDK] fix NOTIFYICONDATA definition svn path=/trunk/; revision=66438 --- reactos/include/psdk/shellapi.h | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/reactos/include/psdk/shellapi.h b/reactos/include/psdk/shellapi.h index 13b5a236506..5845c2a9bb0 100644 --- 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])