fix NOTIFYICONDATA definition

svn path=/trunk/; revision=66438
This commit is contained in:
Christoph von Wittich 2015-02-24 10:21:10 +00:00
parent e596272631
commit 9f260fcfef

View file

@ -203,7 +203,10 @@ typedef struct _NOTIFYICONDATAA {
UINT uFlags; UINT uFlags;
UINT uCallbackMessage; UINT uCallbackMessage;
HICON hIcon; HICON hIcon;
#if _WIN32_IE >= 0x0500 #if (NTDDI_VERSION < NTDDI_WIN2K)
CHAR szTip[64];
#endif
#if (NTDDI_VERSION >= NTDDI_WIN2K)
CHAR szTip[128]; CHAR szTip[128];
DWORD dwState; DWORD dwState;
DWORD dwStateMask; DWORD dwStateMask;
@ -217,9 +220,12 @@ typedef struct _NOTIFYICONDATAA {
#else #else
CHAR szTip[64]; CHAR szTip[64];
#endif #endif
#if _WIN32_IE >= 0x600 #if (NTDDI_VERSION >= NTDDI_WINXP)
GUID guidItem; GUID guidItem;
#endif #endif
#if (NTDDI_VERSION >= NTDDI_VISTA)
HICON hBalloonIcon;
#endif
} NOTIFYICONDATAA,*PNOTIFYICONDATAA; } NOTIFYICONDATAA,*PNOTIFYICONDATAA;
typedef struct _NOTIFYICONDATAW { typedef struct _NOTIFYICONDATAW {
@ -229,7 +235,10 @@ typedef struct _NOTIFYICONDATAW {
UINT uFlags; UINT uFlags;
UINT uCallbackMessage; UINT uCallbackMessage;
HICON hIcon; HICON hIcon;
#if _WIN32_IE >= 0x0500 #if (NTDDI_VERSION < NTDDI_WIN2K)
CHAR szTip[64];
#endif
#if (NTDDI_VERSION >= NTDDI_WIN2K)
WCHAR szTip[128]; WCHAR szTip[128];
DWORD dwState; DWORD dwState;
DWORD dwStateMask; DWORD dwStateMask;
@ -243,9 +252,12 @@ typedef struct _NOTIFYICONDATAW {
#else #else
WCHAR szTip[64]; WCHAR szTip[64];
#endif #endif
#if _WIN32_IE >= 0x600 #if (NTDDI_VERSION >= NTDDI_WINXP)
GUID guidItem; GUID guidItem;
#endif #endif
#if (NTDDI_VERSION >= NTDDI_VISTA)
HICON hBalloonIcon;
#endif
} NOTIFYICONDATAW,*PNOTIFYICONDATAW; } NOTIFYICONDATAW,*PNOTIFYICONDATAW;
#define NOTIFYICONDATAA_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAA, szTip[64]) #define NOTIFYICONDATAA_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAA, szTip[64])