May 2016 - Wine-commits - list.winehq.org

Olivier F. R. Dierick : shell32: Set last error explicitly in SHFileOperation().
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 9f202b78046adbb30cb9b936e72ce3ca0c4fa1fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f202b78046adbb30cb9b936e… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Sat Apr 23 16:03:39 2016 +0200 shell32: Set last error explicitly in SHFileOperation(). Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlfileop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c index 234a141..6f20181 100644 --- a/dlls/shell32/shlfileop.c +++ b/dlls/shell32/shlfileop.c @@ -894,7 +894,6 @@ int WINAPI SHFileOperationA(LPSHFILEOPSTRUCTA lpFileOp) if (ForFree) continue; retCode = ERROR_OUTOFMEMORY; nFileOp.fAnyOperationsAborted = TRUE; - SetLastError(retCode); return retCode; } } @@ -1564,6 +1563,7 @@ int WINAPI SHFileOperationW(LPSHFILEOPSTRUCTW lpFileOp) if (ret == ERROR_CANCELLED) lpFileOp->fAnyOperationsAborted = TRUE; + SetLastError(ERROR_SUCCESS); return ret; }

1 0

Olivier F. R. Dierick : shell32/tests: Tests for broken apps that check GetLastError() after SHFileOperation().
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 07156ad007dead9b8eb535c8c76969fe6a427ea4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07156ad007dead9b8eb535c8c… Author: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Date: Sat Apr 23 16:04:01 2016 +0200 shell32/tests: Tests for broken apps that check GetLastError() after SHFileOperation(). Signed-off-by: Olivier F. R. Dierick <o.dierick(a)piezo-forte.be> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfileop.c | 55 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index d33ad5b..0e502fc 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -1819,6 +1819,30 @@ static void test_copy(void) ok(DeleteFileA("abcdefgh.abc"), "Expected file to exist\n"); ok(DeleteFileA("dir\\abcdefgh.abc"), "Expected file to exist\n"); ok(RemoveDirectoryA("dir"), "Expected dir to exist\n"); + + /* Check last error after a successful file operation. */ + clean_after_shfo_tests(); + init_shfo_tests(); + shfo.pFrom = "test1.txt\0"; + shfo.pTo = "testdir2\0"; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + SetLastError(0xdeadbeef); + retval = SHFileOperationA(&shfo); + ok(retval == ERROR_SUCCESS, "File copy failed with %d\n", retval); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + + /* Check last error after a failed file operation. */ + clean_after_shfo_tests(); + init_shfo_tests(); + shfo.pFrom = "nonexistent\0"; + shfo.pTo = "testdir2\0"; + shfo.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + SetLastError(0xdeadbeef); + retval = SHFileOperationA(&shfo); + ok(retval != ERROR_SUCCESS, "Unexpected ERROR_SUCCESS\n"); + ok(!shfo.fAnyOperationsAborted, "Didn't expect aborted operations\n"); + ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); } /* tests the FO_MOVE action */ @@ -2464,6 +2488,7 @@ static void test_unicode(void) SHFILEOPSTRUCTW shfoW; int ret; HANDLE file; + static const WCHAR UNICODE_PATH_TO[] = {'c',':','\\',0x00ae,0x00ae,'\0'}; if (!pSHFileOperationW) { @@ -2530,6 +2555,36 @@ static void test_unicode(void) ret = pSHFileOperationW(&shfoW); ok(!ret, "Directory is not removed, ErrorCode: %d\n", ret); ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n"); + + shfoW.hwnd = NULL; + shfoW.wFunc = FO_COPY; + shfoW.pFrom = UNICODE_PATH; + shfoW.pTo = UNICODE_PATH_TO; + shfoW.fFlags = FOF_NOCONFIRMATION | FOF_SILENT | FOF_NOERRORUI; + shfoW.hNameMappings = NULL; + shfoW.lpszProgressTitle = NULL; + + /* Check last error after a successful file operation. */ + createTestFileW(UNICODE_PATH); + ok(file_existsW(UNICODE_PATH), "The file does not exist\n"); + SetLastError(0xdeadbeef); + ret = SHFileOperationW(&shfoW); + ok(ret == ERROR_SUCCESS, "File copy failed with %d\n", ret); + ok(!shfoW.fAnyOperationsAborted, "Didn't expect aborted operations\n"); + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == ERROR_INVALID_HANDLE), /* WinXp, win2k3 */ + "Expected ERROR_SUCCESS, got %d\n", GetLastError()); + + /* Check last error after a failed file operation. */ + DeleteFileW(UNICODE_PATH); + ok(!file_existsW(UNICODE_PATH), "The file should have been removed\n"); + SetLastError(0xdeadbeef); + ret = SHFileOperationW(&shfoW); + ok(ret != ERROR_SUCCESS, "Unexpected ERROR_SUCCESS\n"); + ok(!shfoW.fAnyOperationsAborted, "Didn't expect aborted operations\n"); + ok(GetLastError() == ERROR_SUCCESS || + broken(GetLastError() == ERROR_INVALID_HANDLE), /* WinXp, win2k3 */ + "Expected ERROR_SUCCESS, got %d\n", GetLastError()); } static void

1 0

Jacek Caban : mshtml: Ensure that bind_event is not called multiple times for the same event.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 60538b4cd96a14eb25e78fdf6230dcc9734fbd38 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60538b4cd96a14eb25e78fdf6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 14:05:08 2016 +0200 mshtml: Ensure that bind_event is not called multiple times for the same event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 2226278..27b6c39 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1386,6 +1386,7 @@ void detach_events(HTMLDocumentNode *doc) release_nsevents(doc); } +/* Caller should ensure that it's called only once for given event in the target. */ static void bind_event(EventTarget *event_target, eventid_t eid) { if(event_target->dispex.data->vtbl->bind_event) @@ -1423,13 +1424,17 @@ static HRESULT set_event_handler_disp(EventTarget *event_target, eventid_t eid, if(!data) return E_OUTOFMEMORY; - if(!alloc_handler_vector(data, eid, 0)) - return E_OUTOFMEMORY; + if(!data->event_table[eid]) { + if(!alloc_handler_vector(data, eid, 0)) + return E_OUTOFMEMORY; + + bind_event(event_target, eid); + }else if(data->event_table[eid]->handler_prop) { + IDispatch_Release(data->event_table[eid]->handler_prop); + } data->event_table[eid]->handler_prop = disp; IDispatch_AddRef(disp); - - bind_event(event_target, eid); return S_OK; } @@ -1522,15 +1527,15 @@ HRESULT attach_event(EventTarget *event_target, BSTR name, IDispatch *disp, VARI i++; if(i == data->event_table[eid]->handler_cnt && !alloc_handler_vector(data, eid, i+1)) return E_OUTOFMEMORY; - }else if(!alloc_handler_vector(data, eid, i+1)) { + }else if(alloc_handler_vector(data, eid, i+1)) { + bind_event(event_target, eid); + }else { return E_OUTOFMEMORY; } IDispatch_AddRef(disp); data->event_table[eid]->handlers[i] = disp; - bind_event(event_target, eid); - *res = VARIANT_TRUE; return S_OK; }

1 0

Jacek Caban : mshtml: Bind load event directly to the target.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 67cb39b270b4a6d78c43aeebd5109b8aca597b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=67cb39b270b4a6d78c43aeebd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 14:05:38 2016 +0200 mshtml: Bind load event directly to the target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d5729b1..033800b 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4267,7 +4267,16 @@ static event_target_t **HTMLElement_get_event_target_ptr(DispatchEx *dispex) static void HTMLElement_bind_event(DispatchEx *dispex, int eid) { HTMLElement *This = impl_from_DispatchEx(dispex); - This->node.doc->node.event_target.dispex.data->vtbl->bind_event(&This->node.doc->node.event_target.dispex, eid); + + static const WCHAR loadW[] = {'l','o','a','d',0}; + + switch(eid) { + case EVENTID_LOAD: + add_nsevent_listener(This->node.doc, This->node.nsnode, loadW); + return; + default: + This->node.doc->node.event_target.dispex.data->vtbl->bind_event(&This->node.doc->node.event_target.dispex, eid); + } } static const tid_t HTMLElement_iface_tids[] = {

1 0

Piotr Caban : mshtml: Add more <img> onload tests.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 98006cf6e7b4365f53d96ea24aae17fe8de2ac7d URL: http://source.winehq.org/git/wine.git/?a=commit;h=98006cf6e7b4365f53d96ea24… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 2 14:06:30 2016 +0200 mshtml: Add more <img> onload tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 55 insertions(+) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index ad0547e..78fdb70 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -948,6 +948,24 @@ static HRESULT WINAPI img_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD EVENT_HANDLER_FUNC_OBJ(img_onload); +static HRESULT WINAPI unattached_img_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + IHTMLElement *event_src; + + CHECK_EXPECT(img_onload); + + test_event_args(&DIID_DispHTMLImg, id, wFlags, pdp, pvarRes, pei, pspCaller); + event_src = get_event_src(); + todo_wine + ok(!event_src, "event_src != NULL\n"); + if(event_src) + IHTMLElement_Release(event_src); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(unattached_img_onload); + static HRESULT WINAPI img_onerror(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1912,6 +1930,43 @@ static void test_imgload(IHTMLDocument2 *doc) CHECK_CALLED(img_onerror); IHTMLImgElement_Release(img); + + /* test onload on unattached image */ + hres = IHTMLDocument2_createElement(doc, (str = a2bstr("img")), &elem); + SysFreeString(str); + ok(hres == S_OK, "createElement(img) failed: %08x\n", hres); + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLImgElement, (void**)&img); + IHTMLElement_Release(elem); + ok(hres == S_OK, "Could not get IHTMLImgElement iface: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLImgElement_get_onload(img, &v); + ok(hres == S_OK, "get_onload failed: %08x\n", hres); + ok(V_VT(&v) == VT_NULL, "V_VT(onload) = %d\n", V_VT(&v)); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&unattached_img_onload_obj; + hres = IHTMLImgElement_put_onload(img, v); + ok(hres == S_OK, "put_onload failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLImgElement_get_onload(img, &v); + ok(hres == S_OK, "get_onload failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(onload) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&unattached_img_onload_obj, "incorrect V_DISPATCH(onload)\n"); + VariantClear(&v); + + str = a2bstr("http://test.winehq.org/tests/winehq_snapshot/index_files/winehq_logo_text.p…"); + hres = IHTMLImgElement_put_src(img, str); + ok(hres == S_OK, "put_src failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(img_onload); + pump_msgs(&called_img_onload); + CHECK_CALLED(img_onload); + + IHTMLImgElement_Release(img); } static void test_focus(IHTMLDocument2 *doc)

1 0

Jacek Caban : mshtml: Added IHTMLElement2:: oncontextmenu property implementation.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: c766386f360b56608c45e3b4c0b2a5ebbdffa80a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c766386f360b56608c45e3b4c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 2 14:17:40 2016 +0200 mshtml: Added IHTMLElement2::oncontextmenu property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 033800b..9456759 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -2925,15 +2925,19 @@ static HRESULT WINAPI HTMLElement2_mergeAttributes(IHTMLElement2 *iface, IHTMLEl static HRESULT WINAPI HTMLElement2_put_oncontextmenu(IHTMLElement2 *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->()\n", This); - return E_NOTIMPL; + + TRACE("(%p)->()\n", This); + + return set_node_event(&This->node, EVENTID_CONTEXTMENU, &v); } static HRESULT WINAPI HTMLElement2_get_oncontextmenu(IHTMLElement2 *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_CONTEXTMENU, p); } static HRESULT WINAPI HTMLElement2_insertAdjacentElement(IHTMLElement2 *iface, BSTR where,

1 0

Piotr Caban : mshtml: Fix HTMLWindow3_setInterval behavior on 0 msec intervals.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 4e77355f3a94e00a826fd91c564c1a524d0b7093 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e77355f3a94e00a826fd91c5… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 2 15:39:28 2016 +0200 mshtml: Fix HTMLWindow3_setInterval behavior on 0 msec intervals. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/task.c | 5 ++++- dlls/mshtml/tests/events.c | 19 +++++++++++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 9fe8a75..8c522c2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1096,7 +1096,7 @@ HRESULT push_task(task_t*,task_proc_t,task_proc_t,LONG) DECLSPEC_HIDDEN; void remove_target_tasks(LONG) DECLSPEC_HIDDEN; void flush_pending_tasks(LONG) DECLSPEC_HIDDEN; -HRESULT set_task_timer(HTMLInnerWindow*,DWORD,BOOL,IDispatch*,LONG*) DECLSPEC_HIDDEN; +HRESULT set_task_timer(HTMLInnerWindow*,LONG,BOOL,IDispatch*,LONG*) DECLSPEC_HIDDEN; HRESULT clear_task_timer(HTMLInnerWindow*,BOOL,DWORD) DECLSPEC_HIDDEN; const char *debugstr_mshtml_guid(const GUID*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index a821031..2a520b7 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -183,7 +183,7 @@ static BOOL queue_timer(thread_data_t *thread_data, task_timer_t *timer) return FALSE; } -HRESULT set_task_timer(HTMLInnerWindow *window, DWORD msec, BOOL interval, IDispatch *disp, LONG *id) +HRESULT set_task_timer(HTMLInnerWindow *window, LONG msec, BOOL interval, IDispatch *disp, LONG *id) { thread_data_t *thread_data; task_timer_t *timer; @@ -199,6 +199,9 @@ HRESULT set_task_timer(HTMLInnerWindow *window, DWORD msec, BOOL interval, IDisp if(!timer) return E_OUTOFMEMORY; + if(msec < 1) + msec = 1; + timer->id = id_cnt++; timer->window = window; timer->time = tc + msec; diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 78fdb70..c9dedf3 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -2259,6 +2259,25 @@ static void test_timeout(IHTMLDocument2 *doc) hres = IHTMLWindow2_clearTimeout(window, id); ok(hres == S_OK, "clearTimeout failed: %08x\n", hres); + V_VT(&expr) = VT_DISPATCH; + V_DISPATCH(&expr) = (IDispatch*)&timeoutFunc; + V_VT(&var) = VT_EMPTY; + id = 0; + hres = IHTMLWindow3_setInterval(win3, &expr, 1, &var, &id); + ok(hres == S_OK, "setInterval failed: %08x\n", hres); + ok(id, "id = 0\n"); + + SET_EXPECT(timeout); + pump_msgs(&called_timeout); + CHECK_CALLED(timeout); + + SET_EXPECT(timeout); + pump_msgs(&called_timeout); + CHECK_CALLED(timeout); + + hres = IHTMLWindow2_clearInterval(window, id); + ok(hres == S_OK, "clearTimeout failer: %08x\n", hres); + IHTMLWindow3_Release(win3); }

1 0

Piotr Caban : mshtml: Make it possible to clear timer and interval with any of clearTimeout and clearInterval functions.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 60fe74854345e3238dd939ff74d6f665132dbede URL: http://source.winehq.org/git/wine.git/?a=commit;h=60fe74854345e3238dd939ff7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon May 2 15:39:34 2016 +0200 mshtml: Make it possible to clear timer and interval with any of clearTimeout and clearInterval functions. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlwindow.c | 4 ++-- dlls/mshtml/mshtml_private.h | 2 +- dlls/mshtml/task.c | 4 ++-- dlls/mshtml/tests/events.c | 39 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 9092b47..5f46c2a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -584,7 +584,7 @@ static HRESULT WINAPI HTMLWindow2_clearTimeout(IHTMLWindow2 *iface, LONG timerID TRACE("(%p)->(%d)\n", This, timerID); - return clear_task_timer(This->inner_window, FALSE, timerID); + return clear_task_timer(This->inner_window, timerID); } #define MAX_MESSAGE_LEN 2000 @@ -1374,7 +1374,7 @@ static HRESULT WINAPI HTMLWindow2_clearInterval(IHTMLWindow2 *iface, LONG timerI TRACE("(%p)->(%d)\n", This, timerID); - return clear_task_timer(This->inner_window, TRUE, timerID); + return clear_task_timer(This->inner_window, timerID); } static HRESULT WINAPI HTMLWindow2_put_offscreenBuffering(IHTMLWindow2 *iface, VARIANT v) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8c522c2..71cb06f 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -1097,7 +1097,7 @@ void remove_target_tasks(LONG) DECLSPEC_HIDDEN; void flush_pending_tasks(LONG) DECLSPEC_HIDDEN; HRESULT set_task_timer(HTMLInnerWindow*,LONG,BOOL,IDispatch*,LONG*) DECLSPEC_HIDDEN; -HRESULT clear_task_timer(HTMLInnerWindow*,BOOL,DWORD) DECLSPEC_HIDDEN; +HRESULT clear_task_timer(HTMLInnerWindow*,DWORD) DECLSPEC_HIDDEN; const char *debugstr_mshtml_guid(const GUID*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/task.c b/dlls/mshtml/task.c index 2a520b7..07f6875 100644 --- a/dlls/mshtml/task.c +++ b/dlls/mshtml/task.c @@ -218,7 +218,7 @@ HRESULT set_task_timer(HTMLInnerWindow *window, LONG msec, BOOL interval, IDispa return S_OK; } -HRESULT clear_task_timer(HTMLInnerWindow *window, BOOL interval, DWORD id) +HRESULT clear_task_timer(HTMLInnerWindow *window, DWORD id) { thread_data_t *thread_data = get_thread_data(FALSE); task_timer_t *iter; @@ -227,7 +227,7 @@ HRESULT clear_task_timer(HTMLInnerWindow *window, BOOL interval, DWORD id) return S_OK; LIST_FOR_EACH_ENTRY(iter, &thread_data->timer_list, task_timer_t, entry) { - if(iter->id == id && iter->window == window && !iter->interval == !interval) { + if(iter->id == id && iter->window == window) { release_task_timer(thread_data->thread_hwnd, iter); return S_OK; } diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index c9dedf3..79ec153 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -1442,6 +1442,34 @@ static const IDispatchExVtbl timeoutFuncVtbl = { static IDispatchEx timeoutFunc = { &timeoutFuncVtbl }; +static HRESULT WINAPI timeoutFunc2_Invoke(IDispatchEx *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + ok(0, "unexpected call\n"); + return E_FAIL; +} + +static const IDispatchExVtbl timeoutFunc2Vtbl = { + DispatchEx_QueryInterface, + DispatchEx_AddRef, + DispatchEx_Release, + DispatchEx_GetTypeInfoCount, + DispatchEx_GetTypeInfo, + DispatchEx_GetIDsOfNames, + timeoutFunc2_Invoke, + DispatchEx_GetDispID, + DispatchEx_InvokeEx, + DispatchEx_DeleteMemberByName, + DispatchEx_DeleteMemberByDispID, + DispatchEx_GetMemberProperties, + DispatchEx_GetMemberName, + DispatchEx_GetNextDispID, + DispatchEx_GetNameSpaceParent +}; + +static IDispatchEx timeoutFunc2 = { &timeoutFunc2Vtbl }; + static HRESULT WINAPI div_onclick_disp_Invoke(IDispatchEx *iface, DISPID id, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, UINT *puArgErr) @@ -2237,6 +2265,17 @@ static void test_timeout(IHTMLDocument2 *doc) ok(hres == S_OK, "Could not get IHTMLWindow3 iface: %08x\n", hres); V_VT(&expr) = VT_DISPATCH; + V_DISPATCH(&expr) = (IDispatch*)&timeoutFunc2; + V_VT(&var) = VT_EMPTY; + id = 0; + hres = IHTMLWindow3_setInterval(win3, &expr, 1, &var, &id); + ok(hres == S_OK, "setInterval failed: %08x\n", hres); + ok(id, "id = 0\n"); + + hres = IHTMLWindow2_clearTimeout(window, id); + ok(hres == S_OK, "clearTimeout failer: %08x\n", hres); + + V_VT(&expr) = VT_DISPATCH; V_DISPATCH(&expr) = (IDispatch*)&timeoutFunc; V_VT(&var) = VT_EMPTY; id = 0;

1 0

Michael Müller : dwmapi: Return S_OK in DwmSetWindowAttribute stub.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: bd2999db92e63f3aa8b48945503c616c28726842 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd2999db92e63f3aa8b489455… Author: Michael Müller <michael(a)fds-team.de> Date: Mon May 2 15:06:46 2016 +0200 dwmapi: Return S_OK in DwmSetWindowAttribute stub. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwmapi/dwmapi_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dwmapi/dwmapi_main.c b/dlls/dwmapi/dwmapi_main.c index 155d7d3..8c3472a 100644 --- a/dlls/dwmapi/dwmapi_main.c +++ b/dlls/dwmapi/dwmapi_main.c @@ -126,7 +126,7 @@ HRESULT WINAPI DwmSetWindowAttribute(HWND hwnd, DWORD attributenum, LPCVOID attr if (!once++) FIXME("(%p, %x, %p, %x) stub\n", hwnd, attributenum, attribute, size); - return E_NOTIMPL; + return S_OK; } /**********************************************************************

1 0

Sebastian Lackner : ntdll: Initialize Reserved_0 bit in NtQueryInformationThread.
by Alexandre Julliard 02 May '16

02 May '16

Module: wine Branch: master Commit: 12a00ea3494649e440f60e02e6f2403abafcdb9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=12a00ea3494649e440f60e02e… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 29 17:18:43 2016 +0200 ntdll: Initialize Reserved_0 bit in NtQueryInformationThread. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/thread.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c index 40747d7..f6a5fbe 100644 --- a/dlls/ntdll/thread.c +++ b/dlls/ntdll/thread.c @@ -1045,6 +1045,7 @@ NTSTATUS WINAPI NtQueryInformationThread( HANDLE handle, THREADINFOCLASS class, tdi->Entry.HighWord.Bits.Granularity = 1; tdi->Entry.HighWord.Bits.Default_Big = 1; tdi->Entry.HighWord.Bits.Type = 0x12; + tdi->Entry.HighWord.Bits.Reserved_0 = 0; /* it has to be one of the system GDT selectors */ if (sel != (wine_get_ds() & ~3) && sel != (wine_get_ss() & ~3)) {

1 0