April 2015 - Wine-Commits - list.winehq.org

Marcus Meissner : ntdll: Potential buffer overwrite (Coverity).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 33d4125a8f471ab52455051479609cbb6da9ca0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d4125a8f471ab5245505147… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 19 11:59:22 2015 +0200 ntdll: Potential buffer overwrite (Coverity). --- dlls/ntdll/cdrom.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index 34910e7..25a3fde 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -3090,8 +3090,11 @@ NTSTATUS CDROM_DeviceIoControl(HANDLE hDevice, sz = sizeof(DVD_REGION); if (lpInBuffer != NULL || nInBufferSize != 0) status = STATUS_INVALID_PARAMETER; else if (nOutBufferSize < sz) status = STATUS_BUFFER_TOO_SMALL; - TRACE("doing DVD_Get_REGION\n"); - status = DVD_GetRegion(fd, lpOutBuffer); + else + { + TRACE("doing DVD_Get_REGION\n"); + status = DVD_GetRegion(fd, lpOutBuffer); + } break; case IOCTL_DVD_READ_STRUCTURE: sz = sizeof(DVD_LAYER_DESCRIPTOR);

1 0

Huw Davies : comctl32: Invalidate the toolbar if the button size is changed.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 60e305d983be66f923ffd793e7635d460e5d87fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e305d983be66f923ffd793e… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 13:24:18 2015 +0100 comctl32: Invalidate the toolbar if the button size is changed. --- dlls/comctl32/toolbar.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index 7727ee2..83cb674 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -4364,6 +4364,7 @@ static LRESULT TOOLBAR_SetButtonSize (TOOLBAR_INFO *infoPtr, LPARAM lParam) { INT cx = (short)LOWORD(lParam), cy = (short)HIWORD(lParam); + int top = default_top_margin(infoPtr); if ((cx < 0) || (cy < 0)) { @@ -4386,15 +4387,20 @@ TOOLBAR_SetButtonSize (TOOLBAR_INFO *infoPtr, LPARAM lParam) */ if (cx == 0) cx = 24; if (cy == 0) cy = 22; - + cx = max(cx, infoPtr->szPadding.cx + infoPtr->nBitmapWidth); cy = max(cy, infoPtr->szPadding.cy + infoPtr->nBitmapHeight); - infoPtr->nButtonWidth = cx; - infoPtr->nButtonHeight = cy; - - infoPtr->iTopMargin = default_top_margin(infoPtr); - TOOLBAR_LayoutToolbar(infoPtr); + if (cx != infoPtr->nButtonWidth || cy != infoPtr->nButtonHeight || + top != infoPtr->iTopMargin) + { + infoPtr->nButtonWidth = cx; + infoPtr->nButtonHeight = cy; + infoPtr->iTopMargin = top; + + TOOLBAR_LayoutToolbar( infoPtr ); + InvalidateRect( infoPtr->hwndSelf, NULL, TRUE ); + } return TRUE; }

1 0

Huw Davies : comctl32: TBSTYLE_EX_MIXEDBUTTONS doesn' t mean buttons should be auto-sized.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 5b7b911f0691a866e8639e54a3646b826d9197bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b7b911f0691a866e8639e54a… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 13:24:17 2015 +0100 comctl32: TBSTYLE_EX_MIXEDBUTTONS doesn't mean buttons should be auto-sized. --- dlls/comctl32/tests/toolbar.c | 52 ++++++++++++++++++++++++++++++++++++++++++- dlls/comctl32/toolbar.c | 3 +-- 2 files changed, 52 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index cdfe7dd..d3088f9 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -748,7 +748,7 @@ static void tbsize_addbutton(tbsize_result_t *tbsr, int left, int top, int right static tbsize_result_t *tbsize_results; -#define tbsize_results_num 24 +#define tbsize_results_num 28 static void init_tbsize_results(void) { int fontheight = system_font_height(); @@ -991,6 +991,18 @@ static void init_tbsize_results(void) { tbsize_results[23] = init_tbsize_result(2, 0, 0, 672, 42, 67, 41); tbsize_addbutton(&tbsize_results[23], 0, 2, 672, 25 + fontheight); tbsize_addbutton(&tbsize_results[23], 0, 25 + fontheight, 672, 48 + 2*fontheight); + + tbsize_results[24] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[24], 0, 2, 11 + string_width(STRING2), 24); + + tbsize_results[25] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[25], 0, 2, 40, 24); + + tbsize_results[26] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[26], 0, 2, 40, 24); + + tbsize_results[27] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[27], 0, 2, 40, 24); } static void free_tbsize_results(void) { @@ -1062,6 +1074,11 @@ static TBBUTTON buttons3[] = { {0, 32, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, 1}, {0, 33, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, (UINT_PTR)STRING2} }; +static TBBUTTON buttons4[] = { + {0, 40, TBSTATE_ENABLED, BTNS_AUTOSIZE, {0, }, 0, (UINT_PTR)STRING2}, + {0, 41, TBSTATE_ENABLED, 0, {0, }, 0, (UINT_PTR)STRING2}, + {0, 41, TBSTATE_ENABLED, BTNS_SHOWTEXT, {0, }, 0, (UINT_PTR)STRING2} +}; static void test_sizes(void) { @@ -1300,8 +1317,41 @@ static void test_sizes(void) { tbinfo.dwMask = TBIF_SIZE; ok(SendMessageA(hToolbar, TB_SETBUTTONINFOA, 33, (LPARAM)&tbinfo) != 0, "TB_SETBUTTONINFOA failed\n"); + tbsize_numtests++; } + /* Single BTNS_AUTOSIZE button with string. */ + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[0]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE button with string. */ + rebuild_toolbar(&hToolbar); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[1]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE button with string with TBSTYLE_EX_MIXEDBUTTONS set. */ + rebuild_toolbar(&hToolbar); + SendMessageA(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[1]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + + /* Single non-BTNS_AUTOSIZE, BTNS_SHOWTEXT button with string with TBSTYLE_EX_MIXEDBUTTONS set. */ + rebuild_toolbar(&hToolbar); + SendMessageA(hToolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS); + style = SendMessageA(hToolbar, TB_GETSTYLE, 0, 0); + ok(SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)&buttons4[2]) == 1, "TB_ADDBUTTONSA failed\n"); + ok(SendMessageA(hToolbar, TB_SETBUTTONSIZE, 0, MAKELPARAM(40, 20)) == 1, "TB_SETBUTTONSIZE failed\n"); + SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); + check_sizes(); + free_tbsize_results(); DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index a329c26..7727ee2 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -1689,8 +1689,7 @@ TOOLBAR_LayoutToolbar(TOOLBAR_INFO *infoPtr) { if (btnPtr->cx) cx = btnPtr->cx; - else if ((infoPtr->dwExStyle & TBSTYLE_EX_MIXEDBUTTONS) || - (btnPtr->fsStyle & BTNS_AUTOSIZE)) + else if (btnPtr->fsStyle & BTNS_AUTOSIZE) { SIZE sz; HDC hdc;

1 0

Nikolay Sivov : dxdiagn/tests: Fix a couple of leaks (Valgrind).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 2c59f6fe464f416b617d8b6c48f03285e9b45740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c59f6fe464f416b617d8b6c4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Apr 20 14:58:07 2015 +0300 dxdiagn/tests: Fix a couple of leaks (Valgrind). --- dlls/dxdiagn/tests/container.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/dxdiagn/tests/container.c b/dlls/dxdiagn/tests/container.c index ce0fb77..5bc5161 100644 --- a/dlls/dxdiagn/tests/container.c +++ b/dlls/dxdiagn/tests/container.c @@ -701,6 +701,7 @@ static void test_GetProp(void) IDxDiagContainer_AddRef(child); ref = IDxDiagContainer_Release(child); ok(ref == 2, "Expected reference count to be 2, got %u\n", ref); + IDxDiagContainer_Release(child); IDxDiagContainer_Release(child); cleanup: @@ -1010,6 +1011,7 @@ static void test_DxDiag_DisplayDevices(void) trace("Testing container %s\n", wine_dbgstr_w(child_container)); test_container_properties(child, property_tests, sizeof(property_tests)/sizeof(property_tests[0])); } + IDxDiagContainer_Release(child); } cleanup:

1 0

Dmitry Timoshkov : user32/tests: Add a test for sending inter-thread messages.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 4ae80d15d957d627529a912e9cd9b7dd1ea1daea URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ae80d15d957d627529a912e9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Apr 20 18:54:06 2015 +0800 user32/tests: Add a test for sending inter-thread messages. --- dlls/user32/tests/msg.c | 150 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 150 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 5f10a89..b014dd9 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -14598,6 +14598,153 @@ static void test_TrackPopupMenuEmpty(void) DestroyWindow(hwnd); } +static const struct message send_message_1[] = { + { WM_USER+2, sent|wparam|lparam, 0, 0 }, + { WM_USER, sent|wparam|lparam, 0, 0 }, + { 0 } +}; +static const struct message send_message_2[] = { + { WM_USER+4, sent|wparam|lparam, 0, 0 }, + { 0 } +}; +static const struct message send_message_3[] = { + { WM_USER+3, sent|wparam|lparam, 0, 0 }, + { WM_USER+1, sent|wparam|lparam, 0, 0 }, + { 0 } +}; + +static DWORD WINAPI SendMessage_thread_1(void *param) +{ + struct wnd_event *wnd_event = param; + + trace("thread: starting\n"); + WaitForSingleObject(wnd_event->start_event, INFINITE); + + trace("thread: call PostMessage\n"); + PostMessageA(wnd_event->hwnd, WM_USER, 0, 0); + + trace("thread: call PostMessage\n"); + PostMessageA(wnd_event->hwnd, WM_USER+1, 0, 0); + + trace("thread: call SendMessage\n"); + SendMessageA(wnd_event->hwnd, WM_USER+2, 0, 0); + + trace("thread: call SendMessage\n"); + SendMessageA(wnd_event->hwnd, WM_USER+3, 0, 0); + + return 0; +} + +static DWORD WINAPI SendMessage_thread_2(void *param) +{ + struct wnd_event *wnd_event = param; + + trace("thread: starting\n"); + WaitForSingleObject(wnd_event->start_event, INFINITE); + + trace("thread: call PostMessage\n"); + PostMessageA(wnd_event->hwnd, WM_USER, 0, 0); + + trace("thread: call PostMessage\n"); + PostMessageA(wnd_event->hwnd, WM_USER+1, 0, 0); + + /* this leads to sending an internal message under Wine */ + trace("thread: call EnableWindow\n"); + EnableWindow(wnd_event->hwnd, TRUE); + + trace("thread: call SendMessage\n"); + SendMessageA(wnd_event->hwnd, WM_USER+2, 0, 0); + + trace("thread: call SendMessage\n"); + SendMessageA(wnd_event->hwnd, WM_USER+3, 0, 0); + + return 0; +} + +static void test_SendMessage_other_thread(int thread_n) +{ + DWORD qs_all_input = QS_ALLINPUT & ~QS_RAWINPUT; + HANDLE hthread; + struct wnd_event wnd_event; + DWORD tid, ret; + MSG msg; + + wnd_event.start_event = CreateEventA(NULL, 0, 0, NULL); + + wnd_event.hwnd = CreateWindowExA(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(wnd_event.hwnd != 0, "CreateWindowEx failed\n"); + + hthread = CreateThread(NULL, 0, thread_n == 1 ? SendMessage_thread_1 : SendMessage_thread_2, &wnd_event, 0, &tid); + ok(hthread != NULL, "CreateThread failed, error %d\n", GetLastError()); + CloseHandle(hthread); + + flush_events(); + flush_sequence(); + + ret = GetQueueStatus(QS_SENDMESSAGE); + ok(ret == 0, "wrong status %08x\n", ret); + + SetEvent(wnd_event.start_event); + + /* wait for other thread's SendMessage */ + for (;;) + { + ret = GetQueueStatus(QS_SENDMESSAGE); + if (ret == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE)) break; + Sleep(50); + } + + ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); +todo_wine + ok(ret == MAKELONG(QS_POSTMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); + + trace("main: call GetMessage\n"); + GetMessageA(&msg, 0, 0, 0); + ok(msg.message == WM_USER, "expected WM_USER, got %04x\n", msg.message); + DispatchMessageA(&msg); + ok_sequence(send_message_1, "SendMessage from other thread 1", thread_n == 2); + + /* intentionally yield */ + MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); + + trace("main: call SendMessage\n"); + SendMessageA(wnd_event.hwnd, WM_USER+4, 0, 0); + ok_sequence(send_message_2, "SendMessage from other thread 2", FALSE); + + ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); + ok(ret == MAKELONG(QS_SENDMESSAGE, QS_SENDMESSAGE|QS_POSTMESSAGE), "wrong status %08x\n", ret); + + trace("main: call PeekMessage\n"); + ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should not fail\n"); + ok(msg.message == WM_USER+1, "expected WM_USER+1, got %04x\n", msg.message); + DispatchMessageA(&msg); + ok_sequence(send_message_3, "SendMessage from other thread 3", thread_n == 2); + + /* intentionally yield */ + MsgWaitForMultipleObjects(0, NULL, FALSE, 100, qs_all_input); + + ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); + /* FIXME: remove once Wine is fixed */ +if (thread_n == 2) todo_wine + ok(ret == 0, "wrong status %08x\n", ret); +else + ok(ret == 0, "wrong status %08x\n", ret); + + trace("main: call PeekMessage\n"); + ok(!PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "PeekMessage should fail\n"); + ok_sequence(WmEmptySeq, "SendMessage from other thread 4", thread_n == 2); + + ret = GetQueueStatus(QS_SENDMESSAGE|QS_POSTMESSAGE); + ok(ret == 0, "wrong status %08x\n", ret); + + trace("main: call DestroyWindow\n"); + DestroyWindow(msg.hwnd); + + flush_events(); + flush_sequence(); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -14675,6 +14822,9 @@ START_TEST(msg) pUnhookWinEvent = 0; } hEvent_hook = 0; + + test_SendMessage_other_thread(1); + test_SendMessage_other_thread(2); test_SetFocus(); test_SetParent(); test_PostMessage();

1 0

Marcus Meissner : inetcomm: Avoid overlapping memcpy (Coverity).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: a57b06c5acac1bed5a4aa632ab939ca5a1cd028d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a57b06c5acac1bed5a4aa632a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Sun Apr 19 11:50:42 2015 +0200 inetcomm: Avoid overlapping memcpy (Coverity). --- dlls/inetcomm/mimeole.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/inetcomm/mimeole.c b/dlls/inetcomm/mimeole.c index 6a6cbd8..94fb558 100644 --- a/dlls/inetcomm/mimeole.c +++ b/dlls/inetcomm/mimeole.c @@ -1613,13 +1613,13 @@ static HRESULT create_body_offset_list(IStream *stm, const char *boundary, struc if(overlap == buf) /* 1st iteration */ { - memcpy(buf, buf + PARSER_BUF_SIZE - overlap_no, overlap_no); + memmove(buf, buf + PARSER_BUF_SIZE - overlap_no, overlap_no); overlap = buf + overlap_no; start += read - overlap_no; } else { - memcpy(buf, buf + PARSER_BUF_SIZE, overlap_no); + memmove(buf, buf + PARSER_BUF_SIZE, overlap_no); start += read; } } while(1);

1 0

Sebastian Lackner : msxml3: Add a missing break (Coverity).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 45e00e55161fb4bb33222592523878c399b833d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=45e00e55161fb4bb332225925… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Apr 18 23:31:02 2015 +0200 msxml3: Add a missing break (Coverity). --- dlls/msxml3/node.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/msxml3/node.c b/dlls/msxml3/node.c index 7119a43..1ddc9bf 100644 --- a/dlls/msxml3/node.c +++ b/dlls/msxml3/node.c @@ -2055,6 +2055,7 @@ IXMLDOMNode *create_node( xmlNodePtr node ) new_node->ref = 1; init_xmlnode(&new_node->node, node, &new_node->IXMLDOMNode_iface, NULL); pUnk = (IUnknown*)&new_node->IXMLDOMNode_iface; + break; } default: ERR("Called for unsupported node type %d\n", node->type);

1 0

Thomas Faber : comctl32: Avoid use-after-free in DPA_Merge (DPH).
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 13b65faf4e758439afc5139098b4231407c5bb0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=13b65faf4e758439afc513909… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Apr 18 12:08:29 2015 +0200 comctl32: Avoid use-after-free in DPA_Merge (DPH). --- dlls/comctl32/dpa.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/dpa.c b/dlls/comctl32/dpa.c index 148d3f1..b5b7ff8 100644 --- a/dlls/comctl32/dpa.c +++ b/dlls/comctl32/dpa.c @@ -303,16 +303,14 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, hdpa1->nItemCount, hdpa2->nItemCount); - /* working but untrusted implementation */ - - pWork1 = &(hdpa1->ptrs[hdpa1->nItemCount - 1]); - pWork2 = &(hdpa2->ptrs[hdpa2->nItemCount - 1]); - nIndex = hdpa1->nItemCount - 1; nCount = hdpa2->nItemCount - 1; do { + pWork1 = &hdpa1->ptrs[nIndex]; + pWork2 = &hdpa2->ptrs[nCount]; + if (nIndex < 0) { if ((nCount >= 0) && (dwFlags & DPAM_UNION)) { /* Now insert the remaining new items into DPA 1 */ @@ -343,10 +341,8 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, return FALSE; nCount--; - pWork2--; *pWork1 = ptr; nIndex--; - pWork1--; } else if (nResult > 0) { @@ -361,7 +357,6 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, (pfnMerge)(DPAMM_DELETE, ptr, NULL, lParam); } nIndex--; - pWork1--; } else { @@ -377,7 +372,6 @@ BOOL WINAPI DPA_Merge (HDPA hdpa1, HDPA hdpa2, DWORD dwFlags, DPA_InsertPtr (hdpa1, nIndex+1, ptr); } nCount--; - pWork2--; } }

1 0

Jacek Caban : mshtml: Fixed binding event scripts to window objects.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: 7c85ed6aabf2ea5ca021d3cefce80541a12f2247 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c85ed6aabf2ea5ca021d3cef… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Apr 17 16:35:24 2015 +0200 mshtml: Fixed binding event scripts to window objects. --- dlls/mshtml/htmlevent.c | 7 ++++--- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/script.c | 32 ++++++++++++++++++-------------- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index a14ce72..30ce6b1 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1529,11 +1529,12 @@ HRESULT detach_event(event_target_t *event_target, HTMLDocument *doc, BSTR name, return S_OK; } -void bind_node_event(HTMLDocumentNode *doc, event_target_t **event_target, HTMLDOMNode *node, const WCHAR *event, IDispatch *disp) +void bind_target_event(HTMLDocumentNode *doc, event_target_t **event_target, DispatchEx *dispex, + const WCHAR *event, IDispatch *disp) { eventid_t eid; - TRACE("(%p %p %p %s %p)\n", doc, event_target, node, debugstr_w(event), disp); + TRACE("(%p %p %p %s %p)\n", doc, event_target, dispex, debugstr_w(event), disp); eid = attr_to_eid(event); if(eid == EVENTID_LAST) { @@ -1541,7 +1542,7 @@ void bind_node_event(HTMLDocumentNode *doc, event_target_t **event_target, HTMLD return; } - set_event_handler_disp(&node->dispex, event_target, doc, eid, disp); + set_event_handler_disp(dispex, event_target, doc, eid, disp); } void update_cp_events(HTMLInnerWindow *window, event_target_t **event_target_ptr, cp_static_data_t *cp) diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 0517834..86d5816 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -64,7 +64,7 @@ void update_cp_events(HTMLInnerWindow*,event_target_t**,cp_static_data_t*) DECLS HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; -void bind_node_event(HTMLDocumentNode*,event_target_t**,HTMLDOMNode*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; +void bind_target_event(HTMLDocumentNode*,event_target_t**,DispatchEx*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; void init_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_nsevents(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 4590854..e3c9498 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -1314,9 +1314,9 @@ IDispatch *get_script_disp(ScriptHost *script_host) return disp; } -static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptElement *script_elem, HTMLDOMNode **ret_target_node) +static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptElement *script_elem, DispatchEx **ret_target_dispex) { - HTMLDOMNode *target_node = NULL; + DispatchEx *target_dispex = NULL; event_target_t **target = NULL; const PRUnichar *target_id; nsAString target_id_str; @@ -1336,22 +1336,26 @@ static event_target_t **find_event_target(HTMLDocumentNode *doc, HTMLScriptEleme FIXME("Empty for attribute\n"); }else if(!strcmpW(target_id, documentW)) { target = &doc->node.event_target; - target_node = &doc->node; - IHTMLDOMNode_AddRef(&target_node->IHTMLDOMNode_iface); + target_dispex = &doc->node.dispex; + htmldoc_addref(&doc->basedoc); }else if(!strcmpW(target_id, windowW)) { - target = &doc->body_event_target; + if(doc->window) { + target_dispex = &doc->window->dispex; + IDispatchEx_AddRef(&target_dispex->IDispatchEx_iface); + target = &doc->body_event_target; + } }else { HTMLElement *target_elem; hres = get_doc_elem_by_id(doc, target_id, &target_elem); if(SUCCEEDED(hres) && target_elem) { - target_node = &target_elem->node; + target_dispex = &target_elem->node.dispex; target = &target_elem->node.event_target; } } nsAString_Finish(&target_id_str); - *ret_target_node = target_node; + *ret_target_dispex = target_dispex; return target; } @@ -1449,7 +1453,7 @@ void bind_event_scripts(HTMLDocumentNode *doc) HTMLScriptElement *script_elem; event_target_t **event_target; nsIDOMNodeList *node_list; - HTMLDOMNode *target_node; + DispatchEx *target_dispex; nsIDOMNode *script_node; nsAString selector_str; IDispatch *event_disp; @@ -1496,10 +1500,10 @@ void bind_event_scripts(HTMLDocumentNode *doc) event_disp = parse_event_elem(doc, script_elem, &event); if(event_disp) { - event_target = find_event_target(doc, script_elem, &target_node); + event_target = find_event_target(doc, script_elem, &target_dispex); if(event_target) { - if(target_node) - hres = IHTMLDOMNode_QueryInterface(&target_node->IHTMLDOMNode_iface, &IID_HTMLPluginContainer, + if(target_dispex) + hres = IDispatchEx_QueryInterface(&target_dispex->IDispatchEx_iface, &IID_HTMLPluginContainer, (void**)&plugin_container); else hres = E_NOINTERFACE; @@ -1507,10 +1511,10 @@ void bind_event_scripts(HTMLDocumentNode *doc) if(SUCCEEDED(hres)) bind_activex_event(doc, plugin_container, event, event_disp); else - bind_node_event(doc, event_target, target_node, event, event_disp); + bind_target_event(doc, event_target, target_dispex, event, event_disp); - if(target_node) { - IHTMLDOMNode_Release(&target_node->IHTMLDOMNode_iface); + if(target_dispex) { + IDispatchEx_Release(&target_dispex->IDispatchEx_iface); if(plugin_container) node_release(&plugin_container->element.node); }

1 0

Huw Davies : riched20/tests: Fix test on 64-bit win8.
by Alexandre Julliard April 20, 2015

April 20, 2015

Module: wine Branch: master Commit: ef072b1eb241238ea1be7fe850492ad60bf17ea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef072b1eb241238ea1be7fe85… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 14:18:36 2015 +0100 riched20/tests: Fix test on 64-bit win8. --- dlls/riched20/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 65752af..09437ef 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -3412,7 +3412,7 @@ static DWORD CALLBACK test_esCallback_written_1(DWORD_PTR dwCookie, LONG *pcb) { char** str = (char**)dwCookie; - ok(cb == *pcb, "cb %d, *pcb %d\n", cb, *pcb); + ok(*pcb == cb || *pcb == 0, "cb %d, *pcb %d\n", cb, *pcb); *pcb = 0; if (cb > 0) { memcpy(*str, pbBuff, cb);

1 0