From 60fe74854345e3238dd939ff74d6f665132dbede Mon Sep 17 00:00:00 2001 From: Piotr Caban Date: Mon, 2 May 2016 15:39:34 +0200 Subject: [PATCH] mshtml: Make it possible to clear timer and interval with any of clearTimeout and clearInterval functions. Signed-off-by: Piotr Caban Signed-off-by: Jacek Caban Signed-off-by: Alexandre Julliard --- 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 9092b471d5b..5f46c2a5570 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 8c522c253e3..71cb06f126d 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 2a520b72405..07f68753020 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 c9dedf32f98..79ec153d601 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) @@ -2236,6 +2264,17 @@ static void test_timeout(IHTMLDocument2 *doc) hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow3, (void**)&win3); 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;