ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add new fields to the NOTIFYICONDATA structure so it matches the 

latest platform SDK.
Update shell32/tests/generated.c. It now works when compiled with the
Windows headers.
This commit is contained in:
Francois Gouget 2004-08-19 19:16:31 +00:00 committed by Alexandre Julliard
parent e516ce8469
commit 466f5e79a8
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/shell32/tests/generated.c
View File

@ -650,27 +650,31 @@ static void test_pack_LPSHNAMEMAPPINGW(void)
static void test_pack_NOTIFYICONDATAA(void) static void test_pack_NOTIFYICONDATAA(void)
{ {
/* NOTIFYICONDATAA (pack 1) */ /* NOTIFYICONDATAA (pack 1) */
TEST_TYPE(NOTIFYICONDATAA, 88, 1);
TEST_FIELD(NOTIFYICONDATAA, DWORD, cbSize, 0, 4, 1); TEST_FIELD(NOTIFYICONDATAA, DWORD, cbSize, 0, 4, 1);
TEST_FIELD(NOTIFYICONDATAA, HWND, hWnd, 4, 4, 1); TEST_FIELD(NOTIFYICONDATAA, HWND, hWnd, 4, 4, 1);
TEST_FIELD(NOTIFYICONDATAA, UINT, uID, 8, 4, 1); TEST_FIELD(NOTIFYICONDATAA, UINT, uID, 8, 4, 1);
TEST_FIELD(NOTIFYICONDATAA, UINT, uFlags, 12, 4, 1); TEST_FIELD(NOTIFYICONDATAA, UINT, uFlags, 12, 4, 1);
TEST_FIELD(NOTIFYICONDATAA, UINT, uCallbackMessage, 16, 4, 1); TEST_FIELD(NOTIFYICONDATAA, UINT, uCallbackMessage, 16, 4, 1);
TEST_FIELD(NOTIFYICONDATAA, HICON, hIcon, 20, 4, 1); TEST_FIELD(NOTIFYICONDATAA, HICON, hIcon, 20, 4, 1);
TEST_FIELD(NOTIFYICONDATAA, CHAR[64], szTip, 24, 64, 1); TEST_FIELD(NOTIFYICONDATAA, CHAR[128], szTip, 24, 128, 1);
TEST_FIELD(NOTIFYICONDATAA, DWORD, dwState, 152, 4, 1);
TEST_FIELD(NOTIFYICONDATAA, DWORD, dwStateMask, 156, 4, 1);
TEST_FIELD(NOTIFYICONDATAA, CHAR[256], szInfo, 160, 256, 1);
} }
static void test_pack_NOTIFYICONDATAW(void) static void test_pack_NOTIFYICONDATAW(void)
{ {
/* NOTIFYICONDATAW (pack 1) */ /* NOTIFYICONDATAW (pack 1) */
TEST_TYPE(NOTIFYICONDATAW, 152, 1);
TEST_FIELD(NOTIFYICONDATAW, DWORD, cbSize, 0, 4, 1); TEST_FIELD(NOTIFYICONDATAW, DWORD, cbSize, 0, 4, 1);
TEST_FIELD(NOTIFYICONDATAW, HWND, hWnd, 4, 4, 1); TEST_FIELD(NOTIFYICONDATAW, HWND, hWnd, 4, 4, 1);
TEST_FIELD(NOTIFYICONDATAW, UINT, uID, 8, 4, 1); TEST_FIELD(NOTIFYICONDATAW, UINT, uID, 8, 4, 1);
TEST_FIELD(NOTIFYICONDATAW, UINT, uFlags, 12, 4, 1); TEST_FIELD(NOTIFYICONDATAW, UINT, uFlags, 12, 4, 1);
TEST_FIELD(NOTIFYICONDATAW, UINT, uCallbackMessage, 16, 4, 1); TEST_FIELD(NOTIFYICONDATAW, UINT, uCallbackMessage, 16, 4, 1);
TEST_FIELD(NOTIFYICONDATAW, HICON, hIcon, 20, 4, 1); TEST_FIELD(NOTIFYICONDATAW, HICON, hIcon, 20, 4, 1);
TEST_FIELD(NOTIFYICONDATAW, WCHAR[64], szTip, 24, 128, 1); TEST_FIELD(NOTIFYICONDATAW, WCHAR[128], szTip, 24, 256, 1);
TEST_FIELD(NOTIFYICONDATAW, DWORD, dwState, 280, 4, 1);
TEST_FIELD(NOTIFYICONDATAW, DWORD, dwStateMask, 284, 4, 1);
TEST_FIELD(NOTIFYICONDATAW, WCHAR[256], szInfo, 288, 512, 1);
} }
static void test_pack_PAPPBARDATA(void) static void test_pack_PAPPBARDATA(void)
@ -684,14 +688,12 @@ static void test_pack_PNOTIFYICONDATAA(void)
{ {
/* PNOTIFYICONDATAA */ /* PNOTIFYICONDATAA */
TEST_TYPE(PNOTIFYICONDATAA, 4, 4); TEST_TYPE(PNOTIFYICONDATAA, 4, 4);
TEST_TYPE_POINTER(PNOTIFYICONDATAA, 88, 1);
} }
static void test_pack_PNOTIFYICONDATAW(void) static void test_pack_PNOTIFYICONDATAW(void)
{ {
/* PNOTIFYICONDATAW */ /* PNOTIFYICONDATAW */
TEST_TYPE(PNOTIFYICONDATAW, 4, 4); TEST_TYPE(PNOTIFYICONDATAW, 4, 4);
TEST_TYPE_POINTER(PNOTIFYICONDATAW, 152, 1);
} }
static void test_pack_PRINTEROP_FLAGS(void) static void test_pack_PRINTEROP_FLAGS(void)

22
include/shellapi.h
View File

@ -345,7 +345,16 @@ typedef struct _NOTIFYICONDATAA
UINT uFlags; UINT uFlags;
UINT uCallbackMessage; UINT uCallbackMessage;
HICON hIcon; HICON hIcon;
CHAR szTip[64]; CHAR szTip[128];
DWORD dwState;
DWORD dwStateMask;
CHAR szInfo[256];
union {
UINT uTimeout;
UINT uVersion;
} DUMMYUNIONNAME;
CHAR szInfoTitle[64];
DWORD dwInfoFlags;
} NOTIFYICONDATAA, *PNOTIFYICONDATAA; } NOTIFYICONDATAA, *PNOTIFYICONDATAA;
typedef struct _NOTIFYICONDATAW typedef struct _NOTIFYICONDATAW
@ -355,7 +364,16 @@ typedef struct _NOTIFYICONDATAW
UINT uFlags; UINT uFlags;
UINT uCallbackMessage; UINT uCallbackMessage;
HICON hIcon; HICON hIcon;
WCHAR szTip[64]; WCHAR szTip[128];
DWORD dwState;
DWORD dwStateMask;
WCHAR szInfo[256];
union {
UINT uTimeout;
UINT uVersion;
} DUMMYUNIONNAME;
WCHAR szInfoTitle[64];
DWORD dwInfoFlags;
} NOTIFYICONDATAW, *PNOTIFYICONDATAW; } NOTIFYICONDATAW, *PNOTIFYICONDATAW;
DECL_WINELIB_TYPE_AW(NOTIFYICONDATA) DECL_WINELIB_TYPE_AW(NOTIFYICONDATA)