March 2007 - Wine-commits - list.winehq.org

Mikołaj Zalewski : user32: tests: Using DefWindowProcA with RegisterClassW works under Windows.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 4893b157e215000ff76f358abbc912c4f4970a98 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4893b157e215000ff76f358ab… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Mar 18 13:02:04 2007 +0100 user32: tests: Using DefWindowProcA with RegisterClassW works under Windows. --- dlls/user32/tests/class.c | 70 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 70 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index aa7ef5a..782f0ba 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -556,6 +556,75 @@ static void test_instances(void) check_thread_instance( "EDIT", (HINSTANCE)0x12345678, (HINSTANCE)0x12345678, (HINSTANCE)0xdeadbeef ); } +static void test_defwndproc() +{ + char classA[] = "deftest"; + WCHAR classW[] = {'d','e','f','t','e','s','t',0}; + int i; + + for (i = 0; i < 4; i++) + { + WNDCLASSEXA cls; /* the memory layout of WNDCLASSEXA and WNDCLASSEXW is the same */ + ATOM atom; + HWND hwnd; + ZeroMemory(&cls, sizeof(cls)); + cls.cbSize = sizeof(cls); + cls.hInstance = GetModuleHandle(NULL); + cls.hbrBackground = GetStockObject (WHITE_BRUSH); + if (i & 1) + cls.lpfnWndProc = DefWindowProcA; + else + cls.lpfnWndProc = DefWindowProcW; + + if (i & 2) + { + cls.lpszClassName = classA; + atom = RegisterClassExA(&cls); + } + else + { + cls.lpszClassName = (LPSTR)classW; + atom = RegisterClassExW((WNDCLASSEXW *)&cls); + } + ok(atom != 0, "Couldn't register class, i=%d, %d\n", i, GetLastError()); + + hwnd = CreateWindowA(classA, NULL, 0, 0, 0, 100, 100, NULL, NULL, GetModuleHandle(NULL), NULL); + ok(hwnd != NULL, "Couldn't create window i=%d\n", i); + if ((i & 1) && (i & 2)) + { + ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)DefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", + (void *)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), DefWindowProcA); + ok(GetClassLongPtrA(hwnd, GCLP_WNDPROC) == (LONG_PTR)DefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", + (void *)GetClassLongPtrA(hwnd, GCLP_WNDPROC), DefWindowProcA); + } + else + todo_wine { + ok(GetWindowLongPtrA(hwnd, GWLP_WNDPROC) == (LONG_PTR)DefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", + (void *)GetWindowLongPtrA(hwnd, GWLP_WNDPROC), DefWindowProcA); + ok(GetClassLongPtrA(hwnd, GCLP_WNDPROC) == (LONG_PTR)DefWindowProcA, "Wrong ANSI wndproc: %p vs %p\n", + (void *)GetClassLongPtrA(hwnd, GCLP_WNDPROC), DefWindowProcA); + } + + if (!(i & 1) && !(i & 2)) + { + ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)DefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", + (void *)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), DefWindowProcW); + ok(GetClassLongPtrW(hwnd, GCLP_WNDPROC) == (LONG_PTR)DefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", + (void *)GetClassLongPtrW(hwnd, GCLP_WNDPROC), DefWindowProcW); + } + else + todo_wine { + ok(GetWindowLongPtrW(hwnd, GWLP_WNDPROC) == (LONG_PTR)DefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", + (void *)GetWindowLongPtrW(hwnd, GWLP_WNDPROC), DefWindowProcW); + ok(GetClassLongPtrW(hwnd, GCLP_WNDPROC) == (LONG_PTR)DefWindowProcW, "Wrong Unicode wndproc: %p vs %p\n", + (void *)GetClassLongPtrW(hwnd, GCLP_WNDPROC), DefWindowProcW); + } + + DestroyWindow(hwnd); + UnregisterClass((LPSTR)(DWORD_PTR)atom, GetModuleHandle(NULL)); + } +} + static LRESULT WINAPI TestDlgProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam) { return DefWindowProc(hWnd, uMsg, wParam, lParam); @@ -619,4 +688,5 @@ START_TEST(class) CreateDialogParamTest(hInstance); test_styles(); test_instances(); + test_defwndproc(); }

1 0

Mikołaj Zalewski : comctl32: CreateToolbarEx should send TB_SETBITMAPSIZE twice.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: c9ca25aa1d64f8dbe2ec9c09039e81adc48608c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9ca25aa1d64f8dbe2ec9c090… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Mon Mar 19 10:40:53 2007 +0100 comctl32: CreateToolbarEx should send TB_SETBITMAPSIZE twice. --- dlls/comctl32/commctrl.c | 13 +++++++------ dlls/comctl32/tests/toolbar.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index c21cae3..7e44e03 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -693,12 +693,13 @@ CreateToolbarEx (HWND hwnd, DWORD style, UINT wID, INT nBitmaps, SendMessageW (hwndTB, TB_SETBITMAPSIZE, 0, MAKELPARAM((WORD)dxBitmap, (WORD)dyBitmap)); - if (dxButton <= 0) - dxButton = 24; - if (dyButton <= 0) - dyButton = 22; - SendMessageW (hwndTB, TB_SETBUTTONSIZE, 0, - MAKELPARAM((WORD)dxButton, (WORD)dyButton)); + if (dxButton < 0) + dxButton = dxBitmap; + if (dyButton < 0) + dyButton = dyBitmap; + /* TB_SETBUTTONSIZE -> TB_SETBITMAPSIZE bug introduced for Windows compatibility */ + if (dxButton != 0 && dyButton != 0) + SendMessageW(hwndTB, TB_SETBITMAPSIZE, 0, MAKELPARAM(dxButton, dyButton)); /* add bitmaps */ diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 164644e..b583295 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -869,6 +869,45 @@ static void test_sizes(void) DestroyWindow(hToolbar); } + +static void test_createtoolbarex() +{ + HWND hToolbar; + TBBUTTON btns[3]; + ZeroMemory(&btns, sizeof(btns)); + + hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandle(NULL), IDB_BITMAP_128x15, btns, + 3, 20, 20, 16, 16, sizeof(TBBUTTON)); + CHECK_IMAGELIST(16, 20, 20); + compare((int)SendMessage(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0x1a001b, "%x"); + DestroyWindow(hToolbar); + + hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandle(NULL), IDB_BITMAP_128x15, btns, + 3, 4, 4, 16, 16, sizeof(TBBUTTON)); + CHECK_IMAGELIST(32, 4, 4); + compare((int)SendMessage(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0xa000b, "%x"); + DestroyWindow(hToolbar); + + hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandle(NULL), IDB_BITMAP_128x15, btns, + 3, 0, 8, 12, 12, sizeof(TBBUTTON)); + CHECK_IMAGELIST(16, 12, 12); + compare((int)SendMessage(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0x120013, "%x"); + DestroyWindow(hToolbar); + + hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandle(NULL), IDB_BITMAP_128x15, btns, + 3, -1, 8, 12, 12, sizeof(TBBUTTON)); + CHECK_IMAGELIST(16, 12, 8); + compare((int)SendMessage(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0xe0013, "%x"); + DestroyWindow(hToolbar); + + hToolbar = CreateToolbarEx(hMainWnd, WS_VISIBLE, 1, 16, GetModuleHandle(NULL), IDB_BITMAP_128x15, btns, + 3, -1, 8, -1, 12, sizeof(TBBUTTON)); + CHECK_IMAGELIST(16, 16, 8); + compare((int)SendMessage(hToolbar, TB_GETBUTTONSIZE, 0, 0), 0xe0017, "%x"); + DestroyWindow(hToolbar); +} + + START_TEST(toolbar) { WNDCLASSA wc; @@ -899,6 +938,7 @@ START_TEST(toolbar) test_add_string(); test_hotitem(); test_sizes(); + test_createtoolbarex(); PostQuitMessage(0); while(GetMessageA(&msg,0,0,0)) {

1 0

Kanit Therdsteerasukdi : comctl32: datetime: Reject invalid flags in DTM_SETSYSTEMTIME.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 2a79d962787c01311faf6dfed7424057a9b20de0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2a79d962787c01311faf6dfed… Author: Kanit Therdsteerasukdi <therdste(a)ucla.edu> Date: Sun Mar 18 12:39:40 2007 -0700 comctl32: datetime: Reject invalid flags in DTM_SETSYSTEMTIME. Reject invalid flags in DTM_SETSYSTEMTIME i.e. when the flag is neither GDT_VALID nor GDT_NONE when the style is set to DTS_SHOWNONE. Corresponding setters and message sequence tests were also added. --- dlls/comctl32/datetime.c | 4 +++- dlls/comctl32/tests/datetime.c | 20 ++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/datetime.c b/dlls/comctl32/datetime.c index d092308..4f35b4f 100644 --- a/dlls/comctl32/datetime.c +++ b/dlls/comctl32/datetime.c @@ -176,10 +176,12 @@ DATETIME_SetSystemTime (DATETIME_INFO *infoPtr, DWORD flag, SYSTEMTIME *lprgSysT MONTHCAL_CopyTime (lprgSysTimeArray, &infoPtr->date); SendMessageW (infoPtr->hMonthCal, MCM_SETCURSEL, 0, (LPARAM)(&infoPtr->date)); SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, BST_CHECKED, 0); - } else if (flag == GDT_NONE) { + } else if ((infoPtr->dwStyle & DTS_SHOWNONE) && (flag == GDT_NONE)) { infoPtr->dateValid = FALSE; SendMessageW (infoPtr->hwndCheckbut, BM_SETCHECK, BST_UNCHECKED, 0); } + else + return 0; InvalidateRect(infoPtr->hwndSelf, NULL, TRUE); return TRUE; diff --git a/dlls/comctl32/tests/datetime.c b/dlls/comctl32/tests/datetime.c index a338e7f..cdeeed7 100644 --- a/dlls/comctl32/tests/datetime.c +++ b/dlls/comctl32/tests/datetime.c @@ -112,6 +112,9 @@ static const struct message test_dtm_set_range_swap_min_max_seq[] = { static const struct message test_dtm_set_and_get_system_time_seq[] = { { DTM_SETSYSTEMTIME, sent|wparam, 0x00000001 }, + { WM_DESTROY, sent|wparam|lparam, 0x00000000, 0x00000000 }, + { WM_NCDESTROY, sent|wparam|lparam, 0x00000000, 0x00000000 }, + { DTM_SETSYSTEMTIME, sent|wparam, 0x00000001 }, { DTM_GETSYSTEMTIME, sent|wparam, 0x00000000 }, { DTM_SETSYSTEMTIME, sent|wparam, 0x00000000 }, { DTM_SETSYSTEMTIME, sent|wparam, 0x00000000 }, @@ -477,6 +480,23 @@ static void test_dtm_set_and_get_system_time(HWND hWndDateTime) LRESULT r; SYSTEMTIME st; SYSTEMTIME getSt; + HWND hWndDateTime_test_gdt_none; + + hWndDateTime_test_gdt_none = create_datetime_control(0, 0); + + ok(hWndDateTime_test_gdt_none!=NULL, "Expected non NULL, got %p\n", hWndDateTime_test_gdt_none); + if(hWndDateTime_test_gdt_none) { + r = SendMessage(hWndDateTime_test_gdt_none, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st); + expect(0, r); + } + else { + skip("hWndDateTime_test_gdt_none is NULL\n"); + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + return; + } + + DestroyWindow(hWndDateTime_test_gdt_none); r = SendMessage(hWndDateTime, DTM_SETSYSTEMTIME, GDT_NONE, (LPARAM)&st); expect(1, r);

1 0

Kai Blin : netapi32: fix a comment.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: b3910387ece99fd944fdef89b7958c931582964b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b3910387ece99fd944fdef89b… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Mar 18 22:13:52 2007 +0100 netapi32: fix a comment. --- dlls/netapi32/access.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index a839012..49a6d26 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -424,7 +424,6 @@ static void ACCESS_QueryGuestDisplayInformation(PNET_DISPLAY_USER *buf, PDWORD p } /************************************************************ - * NetQueryDisplayInformation (NETAPI32.@) * Copies NET_DISPLAY_USER record. */ static void ACCESS_CopyDisplayUser(PNET_DISPLAY_USER dest, LPWSTR *dest_buf,

1 0

Kai Blin : netapi32: Get rid of an ugly macro definition only used once.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 5f8a14d5e2e38882a804d6c3634562be48e314ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f8a14d5e2e38882a804d6c36… Author: Kai Blin <kai.blin(a)gmail.com> Date: Sun Mar 18 22:13:28 2007 +0100 netapi32: Get rid of an ugly macro definition only used once. --- dlls/netapi32/access.c | 15 ++++++--------- 1 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/netapi32/access.c b/dlls/netapi32/access.c index 49a6d26..f63a35c 100644 --- a/dlls/netapi32/access.c +++ b/dlls/netapi32/access.c @@ -88,14 +88,6 @@ static BOOL NETAPI_IsKnownUser(LPCWSTR UserName) return Result; } -#define NETAPI_ForceKnownUser(UserName, FailureCode) \ - if (!NETAPI_IsKnownUser(UserName)) \ - { \ - TRACE("Can't find information for user %s\n", \ - debugstr_w(UserName)); \ - return FailureCode; \ - } - /************************************************************ * NetUserAdd (NETAPI32.@) */ @@ -152,7 +144,12 @@ NetUserGetInfo(LPCWSTR servername, LPCWSTR username, DWORD level, if (status != NERR_Success) return status; NETAPI_ForceLocalComputer(servername, NERR_InvalidComputer); - NETAPI_ForceKnownUser(username, NERR_UserNotFound); + + if(!NETAPI_IsKnownUser(username)) + { + TRACE("User %s is unknown.\n", debugstr_w(username)); + return NERR_UserNotFound; + } switch (level) {

1 0

Mikołaj Zalewski : shell32/explorer: Support different structure sizes in Shell_NotifyIcon.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: cdf06864e22ed45ecc8e6905bc187f6417603bc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdf06864e22ed45ecc8e6905b… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Mar 18 11:49:03 2007 +0100 shell32/explorer: Support different structure sizes in Shell_NotifyIcon. --- dlls/shell32/systray.c | 40 +++++++++++++++++++++++++--------------- include/shellapi.h | 17 +++++++++++++++++ programs/explorer/systray.c | 15 ++++++++++----- 3 files changed, 52 insertions(+), 20 deletions(-) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 119f17f..1020b3c 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -45,7 +45,8 @@ static const WCHAR classname[] = /* Shell_TrayWnd */ {'S','h','e','l','l','_','T BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid) { NOTIFYICONDATAW nidW; - + + ZeroMemory(&nidW, sizeof(nidW)); nidW.cbSize = sizeof(nidW); nidW.hWnd = pnid->hWnd; nidW.uID = pnid->uID; @@ -54,21 +55,30 @@ BOOL WINAPI Shell_NotifyIconA(DWORD dwMessage, PNOTIFYICONDATAA pnid) nidW.hIcon = pnid->hIcon; /* szTip */ - MultiByteToWideChar(CP_ACP, 0, pnid->szTip, -1, nidW.szTip, sizeof(nidW.szTip)/sizeof(WCHAR)); + if (pnid->uFlags & NIF_TIP) + MultiByteToWideChar(CP_ACP, 0, pnid->szTip, -1, nidW.szTip, sizeof(nidW.szTip)/sizeof(WCHAR)); - nidW.dwState = pnid->dwState; - nidW.dwStateMask = pnid->dwStateMask; - - /* szInfo */ - MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, -1, nidW.szInfo, sizeof(nidW.szInfo)/sizeof(WCHAR)); + if (pnid->cbSize >= NOTIFYICONDATAA_V2_SIZE) + { + nidW.dwState = pnid->dwState; + nidW.dwStateMask = pnid->dwStateMask; - nidW.u.uTimeout = pnid->u.uTimeout; + /* szInfo, szInfoTitle */ + if (pnid->uFlags & NIF_INFO) + { + MultiByteToWideChar(CP_ACP, 0, pnid->szInfo, -1, nidW.szInfo, sizeof(nidW.szInfo)/sizeof(WCHAR)); + MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, -1, nidW.szInfoTitle, sizeof(nidW.szInfoTitle)/sizeof(WCHAR)); + } - /* szInfoTitle */ - MultiByteToWideChar(CP_ACP, 0, pnid->szInfoTitle, -1, nidW.szInfoTitle, sizeof(nidW.szInfoTitle)/sizeof(WCHAR)); + nidW.u.uTimeout = pnid->u.uTimeout; + nidW.dwInfoFlags = pnid->dwInfoFlags; + } - nidW.dwInfoFlags = pnid->dwInfoFlags; + if (pnid->cbSize >= NOTIFYICONDATAA_V3_SIZE) + nidW.guidItem = pnid->guidItem; + if (pnid->cbSize >= sizeof(NOTIFYICONDATAA)) + nidW.hBalloonIcon = pnid->hBalloonIcon; return Shell_NotifyIconW(dwMessage, &nidW); } @@ -80,7 +90,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) HWND tray; COPYDATASTRUCT cds; - TRACE("dwMessage = %d\n", dwMessage); + TRACE("dwMessage = %d, nid->cbSize=%d\n", dwMessage, nid->cbSize); tray = FindWindowExW(0, NULL, classname, NULL); if (!tray) return FALSE; @@ -111,7 +121,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) cbMaskBits = (bmMask.bmPlanes * bmMask.bmWidth * bmMask.bmHeight * bmMask.bmBitsPixel) / 8; cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel) / 8; - cds.cbData = sizeof(*nid) + 2*sizeof(BITMAP) + cbMaskBits + cbColourBits; + cds.cbData = nid->cbSize + 2*sizeof(BITMAP) + cbMaskBits + cbColourBits; buffer = HeapAlloc(GetProcessHeap(), 0, cds.cbData); if (!buffer) { @@ -122,7 +132,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) cds.lpData = buffer; memcpy(buffer, nid, sizeof(*nid)); - buffer += sizeof(*nid); + buffer += nid->cbSize; memcpy(buffer, &bmMask, sizeof(bmMask)); buffer += sizeof(bmMask); memcpy(buffer, &bmColour, sizeof(bmColour)); @@ -138,7 +148,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) else { noicon: - cds.cbData = sizeof(*nid); + cds.cbData = nid->cbSize; cds.lpData = nid; } diff --git a/include/shellapi.h b/include/shellapi.h index ea7ec4b..bddf4d2 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -363,6 +363,8 @@ typedef struct _NOTIFYICONDATAA } DUMMYUNIONNAME; CHAR szInfoTitle[64]; DWORD dwInfoFlags; + GUID guidItem; + HICON hBalloonIcon; } NOTIFYICONDATAA, *PNOTIFYICONDATAA; typedef struct _NOTIFYICONDATAW @@ -382,6 +384,8 @@ typedef struct _NOTIFYICONDATAW } DUMMYUNIONNAME; WCHAR szInfoTitle[64]; DWORD dwInfoFlags; + GUID guidItem; + HICON hBalloonIcon; } NOTIFYICONDATAW, *PNOTIFYICONDATAW; DECL_WINELIB_TYPE_AW(NOTIFYICONDATA) @@ -392,6 +396,19 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW lpData); #define Shell_NotifyIcon WINELIB_NAME_AW(Shell_NotifyIcon) +/* pre IE 5.0 */ +#define NOTIFYICONDATAA_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAA, szTip[64]) +#define NOTIFYICONDATAW_V1_SIZE FIELD_OFFSET(NOTIFYICONDATAW, szTip[64]) + +/* pre Window XP */ +#define NOTIFYICONDATAA_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAA, guidItem) +#define NOTIFYICONDATAW_V2_SIZE FIELD_OFFSET(NOTIFYICONDATAW, guidItem) + +/* pre Window Vista */ +#define NOTIFYICONDATAA_V3_SIZE FIELD_OFFSET(NOTIFYICONDATAA, hBalloonIcon) +#define NOTIFYICONDATAW_V3_SIZE FIELD_OFFSET(NOTIFYICONDATAW, hBalloonIcon) + + /****************************************** * Links */ diff --git a/programs/explorer/systray.c b/programs/explorer/systray.c index ee2a1aa..b93d209 100644 --- a/programs/explorer/systray.c +++ b/programs/explorer/systray.c @@ -301,13 +301,18 @@ static void delete_icon(const NOTIFYICONDATAW *nid) static void handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) { NOTIFYICONDATAW nid; + DWORD cbSize; - if (cds->cbData < sizeof(nid)) return; - memcpy(&nid, cds->lpData, sizeof(nid)); + if (cds->cbData < NOTIFYICONDATAW_V1_SIZE) return; + cbSize = ((PNOTIFYICONDATA)cds->lpData)->cbSize; + if (cbSize < NOTIFYICONDATAW_V1_SIZE) return; + + ZeroMemory(&nid, sizeof(nid)); + memcpy(&nid, cds->lpData, min(sizeof(nid), cbSize)); /* FIXME: if statement only needed because we don't support interprocess * icon handles */ - if ((nid.uFlags & NIF_ICON) && (cds->cbData >= sizeof(nid) + 2 * sizeof(BITMAP))) + if ((nid.uFlags & NIF_ICON) && (cds->cbData >= nid.cbSize + 2 * sizeof(BITMAP))) { LONG cbMaskBits; LONG cbColourBits; @@ -315,7 +320,7 @@ static void handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) BITMAP bmColour; const char *buffer = cds->lpData; - buffer += sizeof(nid); + buffer += nid.cbSize; memcpy(&bmMask, buffer, sizeof(bmMask)); buffer += sizeof(bmMask); @@ -325,7 +330,7 @@ static void handle_incoming(HWND hwndSource, COPYDATASTRUCT *cds) cbMaskBits = (bmMask.bmPlanes * bmMask.bmWidth * bmMask.bmHeight * bmMask.bmBitsPixel) / 8; cbColourBits = (bmColour.bmPlanes * bmColour.bmWidth * bmColour.bmHeight * bmColour.bmBitsPixel) / 8; - if (cds->cbData < sizeof(nid) + 2 * sizeof(BITMAP) + cbMaskBits + cbColourBits) + if (cds->cbData < nid.cbSize + 2 * sizeof(BITMAP) + cbMaskBits + cbColourBits) { WINE_ERR("buffer underflow\n"); return;

1 0

Mikołaj Zalewski : shell32: Don' t free user supplied data in Shell_NotifyIcon if GetIconInfo failed.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 50275015f8b11d506d4a38c00651b84bc0feb42f URL: http://source.winehq.org/git/wine.git/?a=commit;h=50275015f8b11d506d4a38c00… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Mar 18 11:51:53 2007 +0100 shell32: Don't free user supplied data in Shell_NotifyIcon if GetIconInfo failed. We should free the nid and in such a case we were doing it. --- dlls/shell32/systray.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c index 1020b3c..824eeb9 100644 --- a/dlls/shell32/systray.c +++ b/dlls/shell32/systray.c @@ -89,6 +89,7 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) { HWND tray; COPYDATASTRUCT cds; + char *buffer = NULL; TRACE("dwMessage = %d, nid->cbSize=%d\n", dwMessage, nid->cbSize); @@ -102,7 +103,6 @@ BOOL WINAPI Shell_NotifyIconW(DWORD dwMessage, PNOTIFYICONDATAW nid) if (nid->uFlags & NIF_ICON) { ICONINFO iconinfo; - char *buffer; BITMAP bmMask; BITMAP bmColour; LONG cbMaskBits; @@ -156,8 +156,7 @@ noicon: /* FIXME: if statement only needed because we don't support interprocess * icon handles */ - if (nid->uFlags & NIF_ICON) - HeapFree(GetProcessHeap(), 0, cds.lpData); + HeapFree(GetProcessHeap(), 0, buffer); return TRUE; }

1 0

Mikołaj Zalewski : shell32: Add some more notify icon defines.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 92a375bb1c5782b008b58ee06c7c81e1356713be URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a375bb1c5782b008b58ee06… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Sun Mar 18 12:06:11 2007 +0100 shell32: Add some more notify icon defines. --- include/shellapi.h | 56 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 45 insertions(+), 11 deletions(-) diff --git a/include/shellapi.h b/include/shellapi.h index bddf4d2..46083e7 100644 --- a/include/shellapi.h +++ b/include/shellapi.h @@ -57,17 +57,6 @@ UINT WINAPI DragQueryFileW(HDROP hDrop, UINT lFile, LPWSTR lpszFile, UINT lLengt void WINAPI DragFinish(HDROP h); BOOL WINAPI DragQueryPoint(HDROP hDrop, POINT *p); -#define NIF_MESSAGE 0x00000001 -#define NIF_ICON 0x00000002 -#define NIF_TIP 0x00000004 -#define NIF_STATE 0x00000008 -#define NIF_INFO 0x00000010 -#define NIF_GUID 0x00000020 - -#define NIM_ADD 0x00000000 -#define NIM_MODIFY 0x00000001 -#define NIM_DELETE 0x00000002 - /****************************************** @@ -346,6 +335,51 @@ void WINAPI WinExecErrorW(HWND hwnd,INT error, LPCWSTR lpstrFileName, LPCWSTR lp /****************************************** * Tray Notification */ +/* notifyicondata.uFlags values*/ +#define NIF_MESSAGE 0x00000001 +#define NIF_ICON 0x00000002 +#define NIF_TIP 0x00000004 +#define NIF_STATE 0x00000008 +#define NIF_INFO 0x00000010 +#define NIF_GUID 0x00000020 +#define NIF_REALTIME 0x00000040 +#define NIF_SHOWTIP 0x00000080 + +/* notifyicondata.dwState values */ +#define NIS_HIDDEN 0x00000001 +#define NIS_SHAREDICON 0x00000002 + +/* notifyicondata.dwInfoFlags values */ +#define NIIF_NONE 0x00000000 +#define NIIF_INFO 0x00000001 +#define NIIF_WARNING 0x00000002 +#define NIIF_ERROR 0x00000003 +#define NIIF_USER 0x00000004 +#define NIIF_ICONMASK 0x0000000f +#define NIIF_NOSOUND 0x00000010 +#define NIIF_LARGEICON 0x00000020 + +/* dwMessage values */ +#define NIM_ADD 0x00000000 +#define NIM_MODIFY 0x00000001 +#define NIM_DELETE 0x00000002 +#define NIM_SETFOCUS 0x00000003 +#define NIM_SETVERSION 0x00000004 + +#define NOTIFY_VERSION 3 /* supported by Windows 2000 and later */ +#define NOTIFY_VERSION_4 4 /* supported by Windows Vista */ + +/* callback message lParam values */ +#define NIN_SELECT (WM_USER+0) +#define NINF_KEY 1 +#define NIN_KEYSELECT (NIN_SELECT|NINF_KEY) /* WM_USER+1 */ +#define NIN_BALOONSHOW (WM_USER+2) +#define NIN_BALOONHIDE (WM_USER+3) +#define NIN_BALOONTIMEOUT (WM_USER+4) +#define NIN_BALOONCLICK (WM_USER+5) +#define NIN_POPUPOPEN (WM_USER+6) +#define NIN_POPUPCLOSE (WM_USER+7) + typedef struct _NOTIFYICONDATAA { DWORD cbSize; HWND hWnd;

1 0

Mikołaj Zalewski : browseui: Remove a test with a wrong pointer.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 823c64ef991b1dd07c2a4a109745ce48f2a74cb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=823c64ef991b1dd07c2a4a109… Author: Mikołaj Zalewski <mikolaj(a)zalewski.pl> Date: Fri Mar 16 19:32:05 2007 +0100 browseui: Remove a test with a wrong pointer. --- dlls/browseui/tests/autocomplete.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/browseui/tests/autocomplete.c b/dlls/browseui/tests/autocomplete.c index 1051f4b..ba52b66 100644 --- a/dlls/browseui/tests/autocomplete.c +++ b/dlls/browseui/tests/autocomplete.c @@ -296,7 +296,6 @@ static void test_ACLMulti(void) acl2->expret = E_FAIL; ok(acl->lpVtbl->Expand(acl, exp) == E_FAIL, "Unexpected Expand return\n"); - ok(mgr->lpVtbl->Remove(mgr, (IUnknown *)0xdeadbeef) == E_FAIL, "Unexpected Remove return\n"); stop_on_error(mgr->lpVtbl->Remove(mgr, (IUnknown *)acl1)); ok(acl1->ref == 1, "acl1 not released\n"); expect_end(obj);

1 0

Chris Robinson : quartz: Release objects when they're no longer needed.
by Alexandre Julliard 19 Mar '07

19 Mar '07

Module: wine Branch: master Commit: 6eefb9d3ddc5cd47339667729f4894ef07acf10a URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eefb9d3ddc5cd47339667729… Author: Chris Robinson <chris.kcat(a)gmail.com> Date: Wed Mar 14 07:21:59 2007 -0700 quartz: Release objects when they're no longer needed. --- dlls/quartz/filtergraph.c | 36 ++++++++++++++++++++++++++---------- 1 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 044ff01..682f535 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -430,7 +430,7 @@ static HRESULT WINAPI GraphBuilder_RemoveFilter(IGraphBuilder *iface, hr = IBaseFilter_JoinFilterGraph(pFilter, NULL, This->pFilterNames[i]); if (SUCCEEDED(hr)) { - IPin_Release(pFilter); + IBaseFilter_Release(pFilter); CoTaskMemFree(This->pFilterNames[i]); memmove(This->ppFiltersInGraph+i, This->ppFiltersInGraph+i+1, sizeof(IBaseFilter*)*(This->nFilters - 1 - i)); memmove(This->pFilterNames+i, This->pFilterNames+i+1, sizeof(LPWSTR)*(This->nFilters - 1 - i)); @@ -650,12 +650,12 @@ static HRESULT GetInternalConnections(IBaseFilter* pfilter, IPin* pinputpin, IPi else IPin_Release(ppin); } + IEnumPins_Release(penumpins); nb = i; if (FAILED(hr)) { ERR("Next failed (%x)\n", hr); return hr; } - IEnumPins_Release(penumpins); } else if (FAILED(hr)) { ERR("Cannot get internal connection (%x)\n", hr); return hr; @@ -714,11 +714,10 @@ static HRESULT WINAPI GraphBuilder_Connect(IGraphBuilder *iface, return hr; hr = IBaseFilter_GetClassID(PinInfo.pFilter, &FilterCLSID); + IBaseFilter_Release(PinInfo.pFilter); if (FAILED(hr)) return hr; - IBaseFilter_Release(PinInfo.pFilter); - /* Find the appropriate transform filter than can transform the minor media type of output pin of the upstream * filter to the minor mediatype of input pin of the renderer */ hr = IPin_EnumMediaTypes(ppinOut, &penummt); @@ -830,6 +829,7 @@ static HRESULT WINAPI GraphBuilder_Connect(IGraphBuilder *iface, while (++i < nb) IPin_Release(ppins[i]); CoTaskMemFree(ppins); IPin_Release(ppinfilter); + IBaseFilter_Release(pfilter); break; } @@ -926,6 +926,7 @@ static HRESULT WINAPI GraphBuilder_Render(IGraphBuilder *iface, hr = IGraphBuilder_AddFilter(iface, pfilter, NULL); if (FAILED(hr)) { ERR("Unable to add filter (%x)\n", hr); + IBaseFilter_Release(pfilter); pfilter = NULL; goto error; } @@ -936,6 +937,7 @@ static HRESULT WINAPI GraphBuilder_Render(IGraphBuilder *iface, goto error; } hr = IEnumPins_Next(penumpins, 1, &ppinfilter, &pin); + IEnumPins_Release(penumpins); if (FAILED(hr)) { ERR("Next (%x)\n", hr); goto error; @@ -944,14 +946,17 @@ static HRESULT WINAPI GraphBuilder_Render(IGraphBuilder *iface, ERR("No Pin\n"); goto error; } - IEnumPins_Release(penumpins); /* Connect the pin to render to the renderer */ hr = IGraphBuilder_Connect(iface, ppinOut, ppinfilter); if (FAILED(hr)) { TRACE("Unable to connect to renderer (%x)\n", hr); + IPin_Release(ppinfilter); goto error; } + IPin_Release(ppinfilter); + IBaseFilter_Release(pfilter); + pfilter = NULL; break; error: @@ -977,7 +982,7 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, static const WCHAR string[] = {'R','e','a','d','e','r',0}; IBaseFilter* preader = NULL; IBaseFilter* psplitter = NULL; - IPin* ppinreader; + IPin* ppinreader = NULL; IPin* ppinsplitter; IEnumPins* penumpins; ULONG pin; @@ -1021,6 +1026,8 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, if (FAILED(hr)) { + if (ppinreader) + IPin_Release(ppinreader); if (pEnumMoniker) IEnumMoniker_Release(pEnumMoniker); if (preader) { @@ -1079,7 +1086,8 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, } } - IPin_Release(ppinsplitter); + if (ppinsplitter) + IPin_Release(ppinsplitter); ppinsplitter = NULL; if (SUCCEEDED(hr)) { @@ -1117,6 +1125,11 @@ static HRESULT WINAPI GraphBuilder_RenderFile(IGraphBuilder *iface, hr = (partial ? VFW_S_PARTIAL_RENDER : S_OK); } + IPin_Release(ppinreader); + IBaseFilter_Release(preader); + if (psplitter); + IBaseFilter_Release(psplitter); + return hr; } @@ -1171,6 +1184,7 @@ static HRESULT WINAPI GraphBuilder_AddSourceFilter(IGraphBuilder *iface, if (ppFilter) *ppFilter = preader; + IFileSourceFilter_Release(pfile); return S_OK; @@ -1326,10 +1340,12 @@ static HRESULT ExploreGraph(IFilterGraphImpl* pGraph, IPin* pOutputPin, fnFoundF hr = IPin_ConnectedTo(pOutputPin, &pInputPin); if (SUCCEEDED(hr)) + { hr = IPin_QueryPinInfo(pInputPin, &PinInfo); - - if (SUCCEEDED(hr)) - hr = GetInternalConnections(PinInfo.pFilter, pInputPin, &ppPins, &nb); + if (SUCCEEDED(hr)) + hr = GetInternalConnections(PinInfo.pFilter, pInputPin, &ppPins, &nb); + IPin_Release(pInputPin); + } if (SUCCEEDED(hr)) {

1 0