wine-commits May 2016

wine-commits@winehq.org

4 participants
542 discussions

Alexandre Julliard : ntdll/tests: Convert directory filename tests to Unicode.
by Alexandre Julliard 03 May '16

03 May '16

Module: wine Branch: master Commit: ebf9c5cd174dd7e0bf873c7cbb965981262e9b60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf9c5cd174dd7e0bf873c7cb… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 3 13:01:29 2016 +0900 ntdll/tests: Convert directory filename tests to Unicode. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/directory.c | 126 +++++++++++++++++++++++-------------------- 1 file changed, 67 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ebf9c5cd174dd7e0bf873…

1 0

Sebastian Lackner : ntdll: Make sure buffer allocated in get_cached_dir_data is big enough for returned entry.
by Alexandre Julliard 03 May '16

03 May '16

Module: wine Branch: master Commit: f4f33686cb83757dd62353a256e5501ff01b034d URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f33686cb83757dd62353a25… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Tue May 3 02:16:54 2016 +0200 ntdll: Make sure buffer allocated in get_cached_dir_data is big enough for returned entry. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/directory.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/directory.c b/dlls/ntdll/directory.c index f7fa951..38cabaf 100644 --- a/dlls/ntdll/directory.c +++ b/dlls/ntdll/directory.c @@ -2302,7 +2302,7 @@ static NTSTATUS get_cached_dir_data( HANDLE handle, struct dir_data **data_ret, if (entry >= dir_data_cache_size) { - unsigned int size = max( dir_data_cache_initial_size, dir_data_cache_size * 2 ); + unsigned int size = max( dir_data_cache_initial_size, max( dir_data_cache_size * 2, entry + 1 ) ); struct dir_data **new_cache; if (dir_data_cache)

1 0

Andrey Gusev : msxml3: Fix a typo in comment.
by Alexandre Julliard 03 May '16

03 May '16

Module: wine Branch: master Commit: 78d9a8505477dfcffc7293816d8dfdc3e58b7ffa URL: http://source.winehq.org/git/wine.git/?a=commit;h=78d9a8505477dfcffc7293816… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Sun May 1 11:23:19 2016 +0300 msxml3: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/saxreader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msxml3/saxreader.c b/dlls/msxml3/saxreader.c index 2b087bc..0ce135b 100644 --- a/dlls/msxml3/saxreader.c +++ b/dlls/msxml3/saxreader.c @@ -2522,7 +2522,7 @@ static HRESULT internal_parseBuffer(saxreader *This, const char *buffer, int siz if (encoding == XML_CHAR_ENCODING_NONE) { const WCHAR *ptr = (WCHAR*)buffer; - /* xml declaration with possibly specfied encoding will be still handled by parser */ + /* xml declaration with possibly specified encoding will be still handled by parser */ if ((size >= 2) && *ptr == '<' && ptr[1] != '?') { enc_name = (xmlChar*)xmlGetCharEncodingName(XML_CHAR_ENCODING_UTF16LE);

1 0

Sebastian Lackner : mscoree: Avoid buffer overflow when mono print handler returns huge string at once.
by Alexandre Julliard 03 May '16

03 May '16

Module: wine Branch: master Commit: e5404d4bf621c1e8bbdfd47381ce3f609d10b20a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5404d4bf621c1e8bbdfd4738… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Apr 29 17:55:43 2016 +0200 mscoree: Avoid buffer overflow when mono print handler returns huge string at once. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/metahost.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mscoree/metahost.c b/dlls/mscoree/metahost.c index 252740d..30b9739 100644 --- a/dlls/mscoree/metahost.c +++ b/dlls/mscoree/metahost.c @@ -272,7 +272,13 @@ static void CDECL mono_shutdown_callback_fn(MonoProfiler *prof) static void CDECL mono_print_handler_fn(const char *string, INT is_stdout) { - wine_dbg_printf("%s", string); + const char *p; + for (; *string; string = p) + { + if ((p = strstr(string, "\n"))) p++; + else p = string + strlen(string); + wine_dbg_printf("%.*s", (int)(p - string), string); + } } static HRESULT CLRRuntimeInfo_GetRuntimeHost(CLRRuntimeInfo *This, RuntimeHost **result)

1 0

Nikolay Sivov : d3dx10: Implement D3DX10UnsetAllDeviceObjects().
by Alexandre Julliard 03 May '16

03 May '16

Module: wine Branch: master Commit: ce53cb4a00e395d492c9ef215dd04dd53b0b3c21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce53cb4a00e395d492c9ef215… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 2 01:26:48 2016 +0200 d3dx10: Implement D3DX10UnsetAllDeviceObjects(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_43/d3dx10_43_main.c | 48 +++- dlls/d3dx10_43/tests/Makefile.in | 5 + dlls/d3dx10_43/tests/d3dx10.c | 605 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 658 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ce53cb4a00e395d492c9e…

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

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

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

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: 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

← Newer
1
...
48
49
50
51
52
53
54
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2016