JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2004-03-16 Martin Fuchs <martin-fuchs@gmx.net>

Browse Source 
* include/shellapi.h (NIM_* NIS_*): Define constants for
	notification icons with _WIN32_IE >= 0x0500.
	(NOTIFYICONDATA): Add new structure members for notification
	icons with _WIN32_IE >= 0x0500.
This commit is contained in:
Danny Smith
2004-03-16 09:13:08 +00:00
parent fbdfd5f8a9
commit 6c6ae57202
2 changed files with 50 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
winsup/w32api/ChangeLog
View File

@ -1,3 +1,10 @@
2004-03-16 Martin Fuchs <martin-fuchs@gmx.net>
* include/shellapi.h (NIM_* NIS_*): Define constants for
notification icons with _WIN32_IE >= 0x0500.
(NOTIFYICONDATA): Add new structure members for notification
icons with _WIN32_IE >= 0x0500.
2004-03-13 Danny Smith <dannysmith@users.sourceforge.net> 2004-03-13 Danny Smith <dannysmith@users.sourceforge.net>
*include/wininet.h (CACHEGROUP_SEARCH_ALL, CACHEGROUP_SEARCH_BYURL): *include/wininet.h (CACHEGROUP_SEARCH_ALL, CACHEGROUP_SEARCH_BYURL):

43
winsup/w32api/include/shellapi.h
View File

@ -46,9 +46,17 @@ extern "C" {
#define NIM_ADD 0 #define NIM_ADD 0
#define NIM_MODIFY 1 #define NIM_MODIFY 1
#define NIM_DELETE 2 #define NIM_DELETE 2
#if _WIN32_IE >= 0x0500
#define NOTIFYICON_VERSION 3
#define NIM_SETFOCUS 3
#define NIM_SETVERSION 4
#endif
#define NIF_MESSAGE 1 #define NIF_MESSAGE 1
#define NIF_ICON 2 #define NIF_ICON 2
#define NIF_TIP 4 #define NIF_TIP 4
#define NIF_STATE 8
#define NIS_HIDDEN 1
#define NIS_SHAREDICON 2
#define SE_ERR_FNF 2 #define SE_ERR_FNF 2
#define SE_ERR_PNF 3 #define SE_ERR_PNF 3
#define SE_ERR_ACCESSDENIED 5 #define SE_ERR_ACCESSDENIED 5
@ -112,6 +120,7 @@ typedef struct _AppBarData {
LPARAM lParam; LPARAM lParam;
} APPBARDATA,*PAPPBARDATA; } APPBARDATA,*PAPPBARDATA;
DECLARE_HANDLE(HDROP); DECLARE_HANDLE(HDROP);
typedef struct _NOTIFYICONDATAA { typedef struct _NOTIFYICONDATAA {
DWORD cbSize; DWORD cbSize;
HWND hWnd; HWND hWnd;
@ -119,8 +128,25 @@ typedef struct _NOTIFYICONDATAA {
UINT uFlags; UINT uFlags;
UINT uCallbackMessage; UINT uCallbackMessage;
HICON hIcon; 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;
#else
CHAR szTip[64]; CHAR szTip[64];
#endif
#if _WIN32_IE >= 0x600
GUID guidItem;
#endif
} NOTIFYICONDATAA,*PNOTIFYICONDATAA; } NOTIFYICONDATAA,*PNOTIFYICONDATAA;
typedef struct _NOTIFYICONDATAW { typedef struct _NOTIFYICONDATAW {
DWORD cbSize; DWORD cbSize;
HWND hWnd; HWND hWnd;
@ -128,8 +154,25 @@ typedef struct _NOTIFYICONDATAW {
UINT uFlags; UINT uFlags;
UINT uCallbackMessage; UINT uCallbackMessage;
HICON hIcon; 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;
#else
WCHAR szTip[64]; WCHAR szTip[64];
#endif
#if _WIN32_IE >= 0x600
GUID guidItem;
#endif
} NOTIFYICONDATAW,*PNOTIFYICONDATAW; } NOTIFYICONDATAW,*PNOTIFYICONDATAW;
typedef struct _SHELLEXECUTEINFOA { typedef struct _SHELLEXECUTEINFOA {
DWORD cbSize; DWORD cbSize;
ULONG fMask; ULONG fMask;