2007-04-22 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>

* include/shellapi.h (NOTIFYICONDATAA, NOTIFYICONDATAW): Updated to support
        Vista.
This commit is contained in:
Chris Sutcliffe 2007-04-22 11:25:07 +00:00
parent f1fc3a03b4
commit 862eba8666
2 changed files with 50 additions and 38 deletions

View File

@ -1,6 +1,12 @@
2007-04-22 Chris Sutcliffe <ir0nh34d@users.sourceforge.net>
* include/shellapi.h (NOTIFYICONDATAA, NOTIFYICONDATAW): Updated to support
Vista.
2007-04-20 Matthias Miller <matthiasmiller@users.sourceforge.net> 2007-04-20 Matthias Miller <matthiasmiller@users.sourceforge.net>
* 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 <piotr.wyderski@wp.pl> 2007-04-15 Piotr Wyderski <piotr.wyderski@wp.pl>

View File

@ -151,54 +151,60 @@ typedef struct _AppBarData {
DECLARE_HANDLE(HDROP); DECLARE_HANDLE(HDROP);
typedef struct _NOTIFYICONDATAA { typedef struct _NOTIFYICONDATAA {
DWORD cbSize; DWORD cbSize;
HWND hWnd; HWND hWnd;
UINT uID; UINT uID;
UINT uFlags; UINT uFlags;
UINT uCallbackMessage; UINT uCallbackMessage;
HICON hIcon; HICON hIcon;
#if _WIN32_IE >= 0x0500 #if _WIN32_IE >= 0x0500
CHAR szTip[128]; CHAR szTip[128];
DWORD dwState; DWORD dwState;
DWORD dwStateMask; DWORD dwStateMask;
CHAR szInfo[256]; CHAR szInfo[256];
_ANONYMOUS_UNION union { _ANONYMOUS_UNION union {
UINT uTimeout; UINT uTimeout;
UINT uVersion; UINT uVersion;
} DUMMYUNIONNAME; } DUMMYUNIONNAME;
CHAR szInfoTitle[64]; CHAR szInfoTitle[64];
DWORD dwInfoFlags; DWORD dwInfoFlags;
#else #else
CHAR szTip[64]; CHAR szTip[64];
#endif #endif
#if _WIN32_IE >= 0x600 #if _WIN32_IE >= 0x600
GUID guidItem; GUID guidItem;
#endif
#if _WIN32_WINNT >= 0x600
HICON hBalloonIcon;
#endif #endif
} NOTIFYICONDATAA,*PNOTIFYICONDATAA; } NOTIFYICONDATAA,*PNOTIFYICONDATAA;
typedef struct _NOTIFYICONDATAW { typedef struct _NOTIFYICONDATAW {
DWORD cbSize; DWORD cbSize;
HWND hWnd; HWND hWnd;
UINT uID; UINT uID;
UINT uFlags; UINT uFlags;
UINT uCallbackMessage; UINT uCallbackMessage;
HICON hIcon; HICON hIcon;
#if _WIN32_IE >= 0x0500 #if _WIN32_IE >= 0x0500
WCHAR szTip[128]; WCHAR szTip[128];
DWORD dwState; DWORD dwState;
DWORD dwStateMask; DWORD dwStateMask;
WCHAR szInfo[256]; WCHAR szInfo[256];
_ANONYMOUS_UNION union { _ANONYMOUS_UNION union {
UINT uTimeout; UINT uTimeout;
UINT uVersion; UINT uVersion;
} DUMMYUNIONNAME; } DUMMYUNIONNAME;
WCHAR szInfoTitle[64]; WCHAR szInfoTitle[64];
DWORD dwInfoFlags; DWORD dwInfoFlags;
#else #else
WCHAR szTip[64]; WCHAR szTip[64];
#endif #endif
#if _WIN32_IE >= 0x600 #if _WIN32_IE >= 0x600
GUID guidItem; GUID guidItem;
#endif
#if _WIN32_WINNT >= 0x600
HICON hBalloonIcon;
#endif #endif
} NOTIFYICONDATAW,*PNOTIFYICONDATAW; } NOTIFYICONDATAW,*PNOTIFYICONDATAW;