From ad23bb049c3ed0ea1a9ddeb7465f8353cd1b84c2 Mon Sep 17 00:00:00 2001 From: ironhead Date: Sun, 22 Apr 2007 11:25:07 +0000 Subject: [PATCH] 2007-04-22 Chris Sutcliffe * include/shellapi.h (NOTIFYICONDATAA, NOTIFYICONDATAW): Updated to support Vista. --- winsup/w32api/ChangeLog | 10 ++++-- winsup/w32api/include/shellapi.h | 78 +++++++++++++++++++++------------------- 2 files changed, 50 insertions(+), 38 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 725ea52e99..687e1efb1b 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,6 +1,12 @@ +2007-04-22 Chris Sutcliffe + + * include/shellapi.h (NOTIFYICONDATAA, NOTIFYICONDATAW): Updated to support + Vista. + 2007-04-20 Matthias Miller - * include/wincrypt.h (CRYPTPROTECT_PROMPTSTRUCT, CRYPTPROTECT_UI_FORBIDDEN, - CRYPTPROTECT_LOCAL_MACHINE): Define. + + * include/wincrypt.h (CRYPTPROTECT_PROMPTSTRUCT, CRYPTPROTECT_UI_FORBIDDEN, + CRYPTPROTECT_LOCAL_MACHINE): Define. 2007-04-15 Piotr Wyderski diff --git a/winsup/w32api/include/shellapi.h b/winsup/w32api/include/shellapi.h index b7d5245810..282f61d110 100644 --- a/winsup/w32api/include/shellapi.h +++ b/winsup/w32api/include/shellapi.h @@ -151,54 +151,60 @@ typedef struct _AppBarData { DECLARE_HANDLE(HDROP); typedef struct _NOTIFYICONDATAA { - DWORD cbSize; - HWND hWnd; - UINT uID; - UINT uFlags; - UINT uCallbackMessage; - HICON hIcon; + DWORD cbSize; + HWND hWnd; + UINT uID; + 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; + 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]; + CHAR szTip[64]; #endif #if _WIN32_IE >= 0x600 - GUID guidItem; + GUID guidItem; +#endif +#if _WIN32_WINNT >= 0x600 + HICON hBalloonIcon; #endif } NOTIFYICONDATAA,*PNOTIFYICONDATAA; typedef struct _NOTIFYICONDATAW { - DWORD cbSize; - HWND hWnd; - UINT uID; - UINT uFlags; - UINT uCallbackMessage; - HICON hIcon; + DWORD cbSize; + HWND hWnd; + UINT uID; + 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; + 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]; + WCHAR szTip[64]; #endif #if _WIN32_IE >= 0x600 - GUID guidItem; + GUID guidItem; +#endif +#if _WIN32_WINNT >= 0x600 + HICON hBalloonIcon; #endif } NOTIFYICONDATAW,*PNOTIFYICONDATAW; -- 2.11.0