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

Jacek Caban : mshtml: Added IHTMLWindow6:: onmessage property implementation.
by Alexandre Julliard 05 Apr '16

05 Apr '16

Module: wine Branch: master Commit: feed9d47504a11bd4b29286a12da21d0496a566d URL: http://source.winehq.org/git/wine.git/?a=commit;h=feed9d47504a11bd4b29286a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 18:01:46 2016 +0200 mshtml: Added IHTMLWindow6::onmessage property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 5 +++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/htmlwindow.c | 12 ++++++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index afacf71..2226278 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -102,6 +102,9 @@ static const WCHAR onkeyupW[] = {'o','n','k','e','y','u','p',0}; static const WCHAR loadW[] = {'l','o','a','d',0}; static const WCHAR onloadW[] = {'o','n','l','o','a','d',0}; +static const WCHAR messageW[] = {'m','e','s','s','a','g','e',0}; +static const WCHAR onmessageW[] = {'o','n','m','e','s','s','a','g','e',0}; + static const WCHAR mousedownW[] = {'m','o','u','s','e','d','o','w','n',0}; static const WCHAR onmousedownW[] = {'o','n','m','o','u','s','e','d','o','w','n',0}; @@ -210,6 +213,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER|EVENT_BUBBLE}, {loadW, onloadW, EVENTT_HTML, DISPID_EVMETH_ONLOAD, EVENT_BIND_TO_BODY}, + {messageW, onmessageW, EVENTT_NONE, DISPID_EVMETH_ONMESSAGE, + EVENT_FORWARDBODY /* FIXME: remove when we get the target right */ }, {mousedownW, onmousedownW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEDOWN, EVENT_DEFAULTLISTENER|EVENT_BUBBLE|EVENT_CANCELABLE}, {mousemoveW, onmousemoveW, EVENTT_MOUSE, DISPID_EVMETH_ONMOUSEMOVE, diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 05c2b84..f723ef6 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -36,6 +36,7 @@ typedef enum { EVENTID_KEYPRESS, EVENTID_KEYUP, EVENTID_LOAD, + EVENTID_MESSAGE, EVENTID_MOUSEDOWN, EVENTID_MOUSEMOVE, EVENTID_MOUSEOUT, diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index f203405..ec333bc 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -2148,15 +2148,19 @@ static HRESULT WINAPI HTMLWindow6_toStaticHTML(IHTMLWindow6 *iface, BSTR bstrHTM static HRESULT WINAPI HTMLWindow6_put_onmessage(IHTMLWindow6 *iface, VARIANT v) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_window_event(This, EVENTID_MESSAGE, &v); } static HRESULT WINAPI HTMLWindow6_get_onmessage(IHTMLWindow6 *iface, VARIANT *p) { HTMLWindow *This = impl_from_IHTMLWindow6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_window_event(This, EVENTID_MESSAGE, p); } static HRESULT WINAPI HTMLWindow6_msWriteProfilerMark(IHTMLWindow6 *iface, BSTR bstrProfilerMark)

1 0

Józef Kucia : wined3d: Implement SM4 ult instruction.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: e8e27b1a2558a9c765afbd1102d1ad21fbbf351c URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8e27b1a2558a9c765afbd110… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Apr 4 11:26:36 2016 +0200 wined3d: Implement SM4 ult instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 3 +++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 8 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 059b5a1..afb47e1 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5375,6 +5375,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_TEXREG2RGB */ pshader_hw_texreg2rgb, /* WINED3DSIH_UDIV */ NULL, /* WINED3DSIH_UGE */ NULL, + /* WINED3DSIH_ULT */ NULL, /* WINED3DSIH_USHR */ NULL, /* WINED3DSIH_UTOF */ NULL, /* WINED3DSIH_XOR */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f16b5e7..cea5e5a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3048,6 +3048,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_UGE: op = "greaterThanEqual"; break; case WINED3DSIH_LT: op = "lessThan"; break; case WINED3DSIH_ILT: op = "lessThan"; break; + case WINED3DSIH_ULT: op = "lessThan"; break; case WINED3DSIH_NE: op = "notEqual"; break; case WINED3DSIH_INE: op = "notEqual"; break; default: @@ -3070,6 +3071,7 @@ static void shader_glsl_relop(const struct wined3d_shader_instruction *ins) case WINED3DSIH_UGE: op = ">="; break; case WINED3DSIH_LT: op = "<"; break; case WINED3DSIH_ILT: op = "<"; break; + case WINED3DSIH_ULT: op = "<"; break; case WINED3DSIH_NE: op = "!="; break; case WINED3DSIH_INE: op = "!="; break; default: @@ -8293,6 +8295,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_TEXREG2RGB */ shader_glsl_texreg2rgb, /* WINED3DSIH_UDIV */ shader_glsl_udiv, /* WINED3DSIH_UGE */ shader_glsl_relop, + /* WINED3DSIH_ULT */ shader_glsl_relop, /* WINED3DSIH_USHR */ shader_glsl_binop, /* WINED3DSIH_UTOF */ shader_glsl_to_float, /* WINED3DSIH_XOR */ shader_glsl_binop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index d8c37f5..50cafab 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -199,6 +199,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_TEXREG2RGB */ "texreg2rgb", /* WINED3DSIH_UDIV */ "udiv", /* WINED3DSIH_UGE */ "uge", + /* WINED3DSIH_ULT */ "ult", /* WINED3DSIH_USHR */ "ushr", /* WINED3DSIH_UTOF */ "utof", /* WINED3DSIH_XOR */ "xor", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 0ce4d53..5933626 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -170,6 +170,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_SQRT = 0x4b, WINED3D_SM4_OP_SINCOS = 0x4d, WINED3D_SM4_OP_UDIV = 0x4e, + WINED3D_SM4_OP_ULT = 0x4f, WINED3D_SM4_OP_UGE = 0x50, WINED3D_SM4_OP_USHR = 0x55, WINED3D_SM4_OP_UTOF = 0x56, @@ -668,6 +669,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_SQRT, WINED3DSIH_SQRT, "f", "f"}, {WINED3D_SM4_OP_SINCOS, WINED3DSIH_SINCOS, "ff", "f"}, {WINED3D_SM4_OP_UDIV, WINED3DSIH_UDIV, "uu", "uu"}, + {WINED3D_SM4_OP_ULT, WINED3DSIH_ULT, "u", "uu"}, {WINED3D_SM4_OP_UGE, WINED3DSIH_UGE, "u", "uu"}, {WINED3D_SM4_OP_USHR, WINED3DSIH_USHR, "u", "uu"}, {WINED3D_SM4_OP_UTOF, WINED3DSIH_UTOF, "f", "u"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 36be9a6..c84a44d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -685,6 +685,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_TEXREG2RGB, WINED3DSIH_UDIV, WINED3DSIH_UGE, + WINED3DSIH_ULT, WINED3DSIH_USHR, WINED3DSIH_UTOF, WINED3DSIH_XOR,

1 0

Daniel Lehman : msvcr120: Add scalbn.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 9acfcb0eba8891f7ce0584d830e20db75c5275f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9acfcb0eba8891f7ce0584d83… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Mar 28 13:44:31 2016 -0700 msvcr120: Add scalbn. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-math-l1-1-0.spec | 12 +++--- dlls/msvcr120/msvcr120.spec | 12 +++--- dlls/msvcr120_app/msvcr120_app.spec | 12 +++--- dlls/msvcrt/math.c | 49 ++++++++++++++-------- dlls/ucrtbase/ucrtbase.spec | 12 +++--- 5 files changed, 55 insertions(+), 42 deletions(-) diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index fcfc8b4..2809b66 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -316,12 +316,12 @@ @ cdecl round(double) ucrtbase.round @ cdecl roundf(float) ucrtbase.roundf @ cdecl roundl(double) ucrtbase.roundl -@ stub scalbln -@ stub scalblnf -@ stub scalblnl -@ stub scalbn -@ stub scalbnf -@ stub scalbnl +@ cdecl scalbln(double long) ucrtbase.scalbln +@ cdecl scalblnf(float long) ucrtbase.scalblnf +@ cdecl scalblnl(double long) ucrtbase.scalblnl +@ cdecl scalbn(double long) ucrtbase.scalbn +@ cdecl scalbnf(float long) ucrtbase.scalbnf +@ cdecl scalbnl(double long) ucrtbase.scalbnl @ cdecl sin(double) ucrtbase.sin @ cdecl -arch=arm,x86_64 sinf(float) ucrtbase.sinf @ cdecl sinh(double) ucrtbase.sinh diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dc0c266..58d04e1 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2339,12 +2339,12 @@ @ cdecl round(double) MSVCR120_round @ cdecl roundf(float) MSVCR120_roundf @ cdecl roundl(double) MSVCR120_roundl -@ stub scalbln -@ stub scalblnf -@ stub scalblnl -@ stub scalbn -@ stub scalbnf -@ stub scalbnl +@ cdecl scalbln(double long) MSVCRT__scalb +@ cdecl scalblnf(float long) MSVCRT__scalbf +@ cdecl scalblnl(double long) MSVCR120_scalbnl +@ cdecl scalbn(double long) MSVCRT__scalb +@ cdecl scalbnf(float long) MSVCRT__scalbf +@ cdecl scalbnl(double long) MSVCR120_scalbnl @ varargs scanf(str) MSVCRT_scanf @ varargs scanf_s(str) MSVCRT_scanf_s @ cdecl setbuf(ptr ptr) MSVCRT_setbuf diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index c7810cd..7f195e4 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -2002,12 +2002,12 @@ @ cdecl round(double) msvcr120.round @ cdecl roundf(float) msvcr120.roundf @ cdecl roundl(double) msvcr120.roundl -@ stub scalbln -@ stub scalblnf -@ stub scalblnl -@ stub scalbn -@ stub scalbnf -@ stub scalbnl +@ cdecl scalbln(double long) msvcr120.scalbln +@ cdecl scalblnf(float long) msvcr120.scalblnf +@ cdecl scalblnl(double long) msvcr120.scalblnl +@ cdecl scalbn(double long) msvcr120.scalbn +@ cdecl scalbnf(float long) msvcr120.scalbnf +@ cdecl scalbnl(double long) msvcr120.scalbnl @ varargs scanf(str) msvcr120.scanf @ varargs scanf_s(str) msvcr120.scanf_s @ cdecl setbuf(ptr ptr) msvcr120.setbuf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 4150cfc..bd0b92b 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -331,15 +331,6 @@ float CDECL MSVCRT_frexpf( float x, int *exp ) } /********************************************************************* - * _scalbf (MSVCRT.@) - */ -float CDECL MSVCRT__scalbf(float num, MSVCRT_long power) -{ - if (!finitef(num)) *MSVCRT__errno() = MSVCRT_EDOM; - return ldexpf(num, power); -} - -/********************************************************************* * modff (MSVCRT.@) */ float CDECL MSVCRT_modff( float x, float *iptr ) @@ -818,15 +809,6 @@ double CDECL MSVCRT__logb(double num) } /********************************************************************* - * _scalb (MSVCRT.@) - */ -double CDECL MSVCRT__scalb(double num, MSVCRT_long power) -{ - if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; - return ldexp(num, power); -} - -/********************************************************************* * _hypot (MSVCRT.@) */ double CDECL _hypot(double x, double y) @@ -2777,3 +2759,34 @@ LDOUBLE CDECL MSVCR120_asinhl(LDOUBLE x) { return MSVCR120_asinh(x); } + +/********************************************************************* + * _scalb (MSVCRT.@) + * scalbn (MSVCR120.@) + * scalbln (MSVCR120.@) + */ +double CDECL MSVCRT__scalb(double num, MSVCRT_long power) +{ + if (!isfinite(num)) *MSVCRT__errno() = MSVCRT_EDOM; + return ldexp(num, power); +} + +/********************************************************************* + * _scalbf (MSVCRT.@) + * scalbnf (MSVCR120.@) + * scalblnf (MSVCR120.@) + */ +float CDECL MSVCRT__scalbf(float num, MSVCRT_long power) +{ + if (!finitef(num)) *MSVCRT__errno() = MSVCRT_EDOM; + return ldexpf(num, power); +} + +/********************************************************************* + * scalbnl (MSVCR120.@) + * scalblnl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_scalbnl(LDOUBLE num, MSVCRT_long power) +{ + return MSVCRT__scalb(num, power); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 16bc133..5c86de8 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2473,12 +2473,12 @@ @ cdecl round(double) MSVCR120_round @ cdecl roundf(float) MSVCR120_roundf @ cdecl roundl(double) MSVCR120_roundl -@ stub scalbln -@ stub scalblnf -@ stub scalblnl -@ stub scalbn -@ stub scalbnf -@ stub scalbnl +@ cdecl scalbln(double long) MSVCRT__scalb +@ cdecl scalblnf(float long) MSVCRT__scalbf +@ cdecl scalblnl(double long) MSVCR120_scalbnl +@ cdecl scalbn(double long) MSVCRT__scalb +@ cdecl scalbnf(float long) MSVCRT__scalbf +@ cdecl scalbnl(double long) MSVCR120_scalbnl @ stub set_terminate @ stub set_unexpected @ cdecl setbuf(ptr ptr) MSVCRT_setbuf

1 0

Jacek Caban : mshtml: Allow events without event object specified and EVENT_DEFAULTLISTENER flag in dispatch_event.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: b692aad3b6d1e59361bff5172121e3f71fbaa534 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b692aad3b6d1e59361bff5172… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 13:20:04 2016 +0200 mshtml: Allow events without event object specified and EVENT_DEFAULTLISTENER flag in dispatch_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index df2d9a4..8c60ee9 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1284,11 +1284,6 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even if(FAILED(hres)) return hres; }else { - if(!(event_info[eid].flags & EVENT_DEFAULTLISTENER)) { - FIXME("not EVENT_DEFAULTEVENTHANDLER\n"); - return E_NOTIMPL; - } - fire_event(node->doc, eid, TRUE, node->nsnode, NULL, NULL); }

1 0

Jacek Caban : mshtml: Pass node as an object to fire_event.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 1dc502c5b4453515e251f226fd0a7eee3788897f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1dc502c5b4453515e251f226f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 13:21:58 2016 +0200 mshtml: Pass node as an object to fire_event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 26 ++++++++++---------------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/nsembed.c | 15 ++++++--------- dlls/mshtml/nsevents.c | 20 +++++++++++++++++--- dlls/mshtml/persist.c | 4 ++-- dlls/mshtml/script.c | 4 ++-- 7 files changed, 39 insertions(+), 34 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ac077f7..4685fcc 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4112,7 +4112,7 @@ HRESULT HTMLElement_handle_event(HTMLDOMNode *iface, DWORD eid, nsIDOMEvent *eve switch(code) { case VK_F1: /* DOM_VK_F1 */ TRACE("F1 pressed\n"); - fire_event(This->node.doc, EVENTID_HELP, TRUE, This->node.nsnode, NULL, NULL); + fire_event(This->node.doc, EVENTID_HELP, TRUE, &This->node, NULL, NULL); *prevent_default = TRUE; } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 8c60ee9..c274de5 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1085,7 +1085,7 @@ void call_event_handlers(HTMLDocumentNode *doc, HTMLEventObj *event_obj, EventTa } static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *event_obj, - nsIDOMNode *target, IDispatch *script_this) + HTMLDOMNode *target, IDispatch *script_this) { IHTMLEventObj *prev_event; nsIDOMNode *parent, *nsnode; @@ -1109,8 +1109,8 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e prev_event = window->event; window->event = event_obj ? &event_obj->IHTMLEventObj_iface : NULL; - nsIDOMNode_GetNodeType(target, &node_type); - nsnode = target; + nsIDOMNode_GetNodeType(target->nsnode, &node_type); + nsnode = target->nsnode; nsIDOMNode_AddRef(nsnode); switch(node_type) { @@ -1173,8 +1173,8 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e window->event = prev_event; if(!prevent_default && (event_info[eid].flags & EVENT_HASDEFAULTHANDLERS)) { - nsIDOMNode_AddRef(target); - nsnode = target; + nsnode = target->nsnode; + nsIDOMNode_AddRef(nsnode); do { hres = get_node(doc, nsnode, TRUE, &node); @@ -1209,24 +1209,18 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e htmldoc_release(&doc->basedoc); } -void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, nsIDOMNode *target, nsIDOMEvent *nsevent, +void fire_event(HTMLDocumentNode *doc, eventid_t eid, BOOL set_event, HTMLDOMNode *target, nsIDOMEvent *nsevent, IDispatch *script_this) { HTMLEventObj *event_obj = NULL; - HTMLDOMNode *node; HRESULT hres; if(set_event) { - hres = get_node(doc, target, TRUE, &node); - if(FAILED(hres)) - return; - event_obj = create_event(); - node_release(node); if(!event_obj) return; - hres = set_event_info(event_obj, node, eid, nsevent); + hres = set_event_info(event_obj, target, eid, nsevent); if(FAILED(hres)) { IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); return; @@ -1278,13 +1272,13 @@ HRESULT dispatch_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *even if(event_obj) { hres = set_event_info(event_obj, node, eid, NULL); if(SUCCEEDED(hres)) - fire_event_obj(node->doc, eid, event_obj, node->nsnode, NULL); + fire_event_obj(node->doc, eid, event_obj, node, NULL); IHTMLEventObj_Release(&event_obj->IHTMLEventObj_iface); if(FAILED(hres)) return hres; }else { - fire_event(node->doc, eid, TRUE, node->nsnode, NULL, NULL); + fire_event(node->doc, eid, TRUE, node, NULL, NULL); } *cancelled = VARIANT_TRUE; /* FIXME */ @@ -1303,7 +1297,7 @@ HRESULT call_fire_event(HTMLDOMNode *node, eventid_t eid) return hres; } - fire_event(node->doc, eid, TRUE, node->nsnode, NULL, NULL); + fire_event(node->doc, eid, TRUE, node, NULL, NULL); return S_OK; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index fefc749..649037a 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -53,7 +53,7 @@ typedef enum { eventid_t str_to_eid(LPCWSTR) DECLSPEC_HIDDEN; void check_event_attr(HTMLDocumentNode*,nsIDOMHTMLElement*) DECLSPEC_HIDDEN; void release_event_target(event_target_t*) DECLSPEC_HIDDEN; -void fire_event(HTMLDocumentNode*,eventid_t,BOOL,nsIDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; +void fire_event(HTMLDocumentNode*,eventid_t,BOOL,HTMLDOMNode*,nsIDOMEvent*,IDispatch*) DECLSPEC_HIDDEN; HRESULT set_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT get_event_handler(EventTarget*,eventid_t,VARIANT*) DECLSPEC_HIDDEN; HRESULT attach_event(EventTarget*,BSTR,IDispatch*,VARIANT_BOOL*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c index 8d9345f..17851ce 100644 --- a/dlls/mshtml/nsembed.c +++ b/dlls/mshtml/nsembed.c @@ -1462,13 +1462,14 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList TRACE("(%p)->(%08x %p %p)\n", This, aContextFlags, aEvent, aNode); - fire_event(This->doc->basedoc.doc_node /* FIXME */, EVENTID_CONTEXTMENU, TRUE, aNode, aEvent, NULL); + hres = get_node(This->doc->basedoc.doc_node, aNode, TRUE, &node); + if(FAILED(hres)) + return NS_ERROR_FAILURE; + + fire_event(This->doc->basedoc.doc_node /* FIXME */, EVENTID_CONTEXTMENU, TRUE, node, aEvent, NULL); nsres = nsIDOMEvent_QueryInterface(aEvent, &IID_nsIDOMMouseEvent, (void**)&event); - if(NS_FAILED(nsres)) { - ERR("Could not get nsIDOMMouseEvent interface: %08x\n", nsres); - return nsres; - } + assert(NS_SUCCEEDED(nsres)); nsIDOMMouseEvent_GetScreenX(event, &pt.x); nsIDOMMouseEvent_GetScreenY(event, &pt.y); @@ -1506,10 +1507,6 @@ static nsresult NSAPI nsContextMenuListener_OnShowContextMenu(nsIContextMenuList FIXME("aContextFlags=%08x\n", aContextFlags); }; - hres = get_node(This->doc->basedoc.doc_node, aNode, TRUE, &node); - if(FAILED(hres)) - return NS_ERROR_FAILURE; - show_context_menu(This->doc, dwID, &pt, (IDispatch*)&node->IHTMLDOMNode_iface); node_release(node); return NS_OK; diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 1444b43..3947c1c 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -273,8 +273,16 @@ static nsresult NSAPI handle_load(nsIDOMEventListener *iface, nsIDOMEvent *event nsres = nsIDOMHTMLDocument_GetBody(doc->nsdoc, &nsbody); if(NS_SUCCEEDED(nsres) && nsbody) { - fire_event(doc, EVENTID_LOAD, TRUE, (nsIDOMNode*)nsbody, event, (IDispatch*)&doc->window->base.IDispatchEx_iface); + HTMLDOMNode *node; + HRESULT hres; + + hres = get_node(doc, (nsIDOMNode*)nsbody, TRUE, &node); nsIDOMHTMLElement_Release(nsbody); + if(SUCCEEDED(hres)) { + fire_event(doc, EVENTID_LOAD, TRUE, node, event, + (IDispatch*)&doc->window->base.IDispatchEx_iface); + node_release(node); + } } }else { ERR("NULL nsdoc\n"); @@ -293,8 +301,10 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * nsIDOMEventTarget *event_target; nsIDOMNode *nsnode; nsAString type_str; + HTMLDOMNode *node; eventid_t eid; nsresult nsres; + HRESULT hres; TRACE("%p\n", This->This); @@ -322,10 +332,14 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * return NS_OK; } - fire_event(doc, eid, TRUE, nsnode, event, NULL); - + hres = get_node(doc, nsnode, TRUE, &node); nsIDOMNode_Release(nsnode); + if(FAILED(hres)) + return NS_OK; + + fire_event(doc, eid, TRUE, node, event, NULL); + node_release(node); return NS_OK; } diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index 59ca5e2..5806e4d 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -448,11 +448,11 @@ static void notif_readystate(HTMLOuterWindow *window) call_property_onchanged(&window->doc_obj->basedoc.cp_container, DISPID_READYSTATE); fire_event(window->base.inner_window->doc, EVENTID_READYSTATECHANGE, FALSE, - window->base.inner_window->doc->node.nsnode, NULL, NULL); + &window->base.inner_window->doc->node, NULL, NULL); if(window->frame_element) fire_event(window->frame_element->element.node.doc, EVENTID_READYSTATECHANGE, - TRUE, window->frame_element->element.node.nsnode, NULL, NULL); + TRUE, &window->frame_element->element.node, NULL, NULL); } typedef struct { diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index 01e5d5b..255c37f 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -735,7 +735,7 @@ static void fire_readystatechange_proc(task_t *_task) return; task->elem->pending_readystatechange_event = FALSE; - fire_event(task->elem->element.node.doc, EVENTID_READYSTATECHANGE, FALSE, task->elem->element.node.nsnode, NULL, NULL); + fire_event(task->elem->element.node.doc, EVENTID_READYSTATECHANGE, FALSE, &task->elem->element.node, NULL, NULL); } static void fire_readystatechange_task_destr(task_t *_task) @@ -771,7 +771,7 @@ static void set_script_elem_readystate(HTMLScriptElement *script_elem, READYSTAT }else { script_elem->pending_readystatechange_event = FALSE; fire_event(script_elem->element.node.doc, EVENTID_READYSTATECHANGE, FALSE, - script_elem->element.node.nsnode, NULL, NULL); + &script_elem->element.node, NULL, NULL); } } }

1 0

Jacek Caban : mshtml: Added support for focusin event.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: a86a4e655736696c205dee927c36d2b91573ae4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a86a4e655736696c205dee927… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 13:22:09 2016 +0200 mshtml: Added support for focusin event. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 +- dlls/mshtml/htmlevent.c | 14 +++++++++++++- dlls/mshtml/nsevents.c | 10 ++++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 4685fcc..cb4718d 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3858,7 +3858,7 @@ static HRESULT WINAPI HTMLElement4_put_onfocusin(IHTMLElement4 *iface, VARIANT v { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%s) semi-stub\n", This, debugstr_variant(&v)); + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); return set_node_event(&This->node, EVENTID_FOCUSIN, &v); } diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c274de5..c763462 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1328,7 +1328,19 @@ HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) TRACE("%s\n", debugstr_w(event_info[eid].name)); - if(!doc->nsdoc || doc->event_vector[eid] || !(event_info[eid].flags & (EVENT_DEFAULTLISTENER|EVENT_BIND_TO_BODY))) + if(!doc->nsdoc) + return S_OK; + + switch(eid) { + case EVENTID_FOCUSIN: + doc->event_vector[eid] = TRUE; + eid = EVENTID_FOCUS; + break; + default: + break; + } + + if(doc->event_vector[eid] || !(event_info[eid].flags & (EVENT_DEFAULTLISTENER|EVENT_BIND_TO_BODY))) return S_OK; if(event_info[eid].flags & EVENT_BIND_TO_BODY) { diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 3947c1c..923355c 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -337,6 +337,16 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * if(FAILED(hres)) return NS_OK; + /* If we fine need for more special cases here, we may consider handling it in a more generic way. */ + switch(eid) { + case EVENTID_FOCUS: + if(doc->event_vector[EVENTID_FOCUSIN]) + fire_event(doc, EVENTID_FOCUSIN, TRUE, node, NULL, NULL); + break; + default: + break; + } + fire_event(doc, eid, TRUE, node, event, NULL); node_release(node);

1 0

Jacek Caban : mshtml: Added support for focusout event and IHTMLElement4:: onfocusout property.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 86116b16bfd5924bf34296b45ccbe1c29804e320 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86116b16bfd5924bf34296b45… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 13:22:20 2016 +0200 mshtml: Added support for focusout event and IHTMLElement4::onfocusout property. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 12 ++++++++---- dlls/mshtml/htmlevent.c | 9 +++++++++ dlls/mshtml/htmlevent.h | 1 + dlls/mshtml/nsevents.c | 4 ++++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index cb4718d..d5729b1 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -3875,15 +3875,19 @@ static HRESULT WINAPI HTMLElement4_get_onfocusin(IHTMLElement4 *iface, VARIANT * static HRESULT WINAPI HTMLElement4_put_onfocusout(IHTMLElement4 *iface, VARIANT v) { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->node, EVENTID_FOCUSOUT, &v); } static HRESULT WINAPI HTMLElement4_get_onfocusout(IHTMLElement4 *iface, VARIANT *p) { HTMLElement *This = impl_from_IHTMLElement4(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->node, EVENTID_FOCUSOUT, p); } static const IHTMLElement4Vtbl HTMLElement4Vtbl = { diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index c763462..afacf71 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -84,6 +84,9 @@ static const WCHAR onfocusW[] = {'o','n','f','o','c','u','s',0}; static const WCHAR focusinW[] = {'f','o','c','u','s','i','n',0}; static const WCHAR onfocusinW[] = {'o','n','f','o','c','u','s','i','n',0}; +static const WCHAR focusoutW[] = {'f','o','c','u','s','o','u','t',0}; +static const WCHAR onfocusoutW[] = {'o','n','f','o','c','u','s','o','u','t',0}; + static const WCHAR helpW[] = {'h','e','l','p',0}; static const WCHAR onhelpW[] = {'o','n','h','e','l','p',0}; @@ -195,6 +198,8 @@ static const event_info_t event_info[] = { EVENT_DEFAULTLISTENER}, {focusinW, onfocusinW, EVENTT_HTML, DISPID_EVMETH_ONFOCUSIN, EVENT_BUBBLE}, + {focusoutW, onfocusoutW, EVENTT_HTML, DISPID_EVMETH_ONFOCUSOUT, + EVENT_BUBBLE}, {helpW, onhelpW, EVENTT_KEY, DISPID_EVMETH_ONHELP, EVENT_BUBBLE|EVENT_CANCELABLE}, {keydownW, onkeydownW, EVENTT_KEY, DISPID_EVMETH_ONKEYDOWN, @@ -1336,6 +1341,10 @@ HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) doc->event_vector[eid] = TRUE; eid = EVENTID_FOCUS; break; + case EVENTID_FOCUSOUT: + doc->event_vector[eid] = TRUE; + eid = EVENTID_BLUR; + break; default: break; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 649037a..05c2b84 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -30,6 +30,7 @@ typedef enum { EVENTID_ERROR, EVENTID_FOCUS, EVENTID_FOCUSIN, + EVENTID_FOCUSOUT, EVENTID_HELP, EVENTID_KEYDOWN, EVENTID_KEYPRESS, diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c index 923355c..d1d0512 100644 --- a/dlls/mshtml/nsevents.c +++ b/dlls/mshtml/nsevents.c @@ -343,6 +343,10 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent * if(doc->event_vector[EVENTID_FOCUSIN]) fire_event(doc, EVENTID_FOCUSIN, TRUE, node, NULL, NULL); break; + case EVENTID_BLUR: + if(doc->event_vector[EVENTID_FOCUSOUT]) + fire_event(doc, EVENTID_FOCUSOUT, TRUE, node, NULL, NULL); + break; default: break; }

1 0

Jacek Caban : mshtml: Added focusin and focusout event tests.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: 8c3d3c754dcd6de3c72c9c9189621e660a1f142a URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3d3c754dcd6de3c72c9c918… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 13:22:46 2016 +0200 mshtml: Added focusin and focusout event tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.c | 79 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 77 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 69f21df..c3aa352 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -75,6 +75,8 @@ DEFINE_EXPECT(img_onload); DEFINE_EXPECT(img_onerror); DEFINE_EXPECT(input_onfocus); DEFINE_EXPECT(input_onblur); +DEFINE_EXPECT(div_onfocusin); +DEFINE_EXPECT(div_onfocusout); DEFINE_EXPECT(form_onsubmit); DEFINE_EXPECT(form_onclick); DEFINE_EXPECT(submit_onclick); @@ -114,7 +116,7 @@ static const char img_doc_str[] = "<html><body><img id=\"imgid\"></img></body></html>"; static const char input_doc_str[] = - "<html><body><input id=\"inputid\"></input></body></html>"; + "<html><body><div id=\"divid\"><input id=\"inputid\"></input></div></body></html>"; static const char iframe_doc_str[] = "<html><body><iframe id=\"ifr\">Testing</iframe></body></html>"; @@ -243,6 +245,18 @@ static IHTMLElement3 *_get_elem3_iface(unsigned line, IUnknown *unk) return elem3; } +#define get_elem4_iface(u) _get_elem4_iface(__LINE__,u) +static IHTMLElement4 *_get_elem4_iface(unsigned line, IUnknown *unk) +{ + IHTMLElement4 *elem4; + HRESULT hres; + + hres = IUnknown_QueryInterface(unk, &IID_IHTMLElement4, (void**)&elem4); + ok_(__FILE__,line) (hres == S_OK, "Could not get IHTMLElement4 iface: %08x\n", hres); + + return elem4; +} + #define get_iframe_iface(u) _get_iframe_iface(__LINE__,u) static IHTMLIFrameElement *_get_iframe_iface(unsigned line, IUnknown *unk) { @@ -955,6 +969,28 @@ static HRESULT WINAPI input_onfocus(IDispatchEx *iface, DISPID id, LCID lcid, WO EVENT_HANDLER_FUNC_OBJ(input_onfocus); +static HRESULT WINAPI div_onfocusin(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(div_onfocusin); + test_event_args(NULL /* FIXME: &DIID_DispHTMLDivElement */, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("INPUT"); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(div_onfocusin); + +static HRESULT WINAPI div_onfocusout(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(div_onfocusout); + test_event_args(NULL /* FIXME: &DIID_DispHTMLDivElement */, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("INPUT"); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(div_onfocusout); + static HRESULT WINAPI input_onblur(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1880,6 +1916,7 @@ static void test_imgload(IHTMLDocument2 *doc) static void test_focus(IHTMLDocument2 *doc) { IHTMLElement2 *elem2; + IHTMLElement4 *div; IHTMLElement *elem; VARIANT v; HRESULT hres; @@ -1888,6 +1925,10 @@ static void test_focus(IHTMLDocument2 *doc) elem2 = get_elem2_iface((IUnknown*)elem); IHTMLElement_Release(elem); + elem = get_elem_id(doc, "divid"); + div = get_elem4_iface((IUnknown*)elem); + IHTMLElement_Release(elem); + V_VT(&v) = VT_EMPTY; hres = IHTMLElement2_get_onfocus(elem2, &v); ok(hres == S_OK, "get_onfocus failed: %08x\n", hres); @@ -1905,6 +1946,25 @@ static void test_focus(IHTMLDocument2 *doc) ok(V_DISPATCH(&v) == (IDispatch*)&input_onfocus_obj, "V_DISPATCH(onfocus) != onfocusFunc\n"); VariantClear(&v); + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&div_onfocusin_obj; + hres = IHTMLElement4_put_onfocusin(div, v); + ok(hres == S_OK, "put_onfocusin failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLElement4_get_onfocusin(div, &v); + ok(hres == S_OK, "get_onfocusin failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(onfocusin) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&div_onfocusin_obj, "V_DISPATCH(onfocus) != onfocusFunc\n"); + VariantClear(&v); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLElement2_get_onfocus(elem2, &v); + ok(hres == S_OK, "get_onfocus failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(onfocus) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&input_onfocus_obj, "V_DISPATCH(onfocus) != onfocusFunc\n"); + VariantClear(&v); + if(!winetest_interactive) ShowWindow(container_hwnd, SW_SHOW); @@ -1917,27 +1977,42 @@ static void test_focus(IHTMLDocument2 *doc) ok(IsChild(container_hwnd, GetFocus()), "focus does not belong to document window\n"); pump_msgs(NULL); + SET_EXPECT(div_onfocusin); SET_EXPECT(input_onfocus); hres = IHTMLElement2_focus(elem2); + ok(hres == S_OK, "focus failed: %08x\n", hres); pump_msgs(NULL); + CHECK_CALLED(div_onfocusin); CHECK_CALLED(input_onfocus); - ok(hres == S_OK, "focus failed: %08x\n", hres); + + SET_EXPECT(div_onfocusin); + V_VT(&v) = VT_EMPTY; + elem_fire_event((IUnknown*)elem2, "onfocusin", &v); + CHECK_CALLED(div_onfocusin); V_VT(&v) = VT_DISPATCH; V_DISPATCH(&v) = (IDispatch*)&input_onblur_obj; hres = IHTMLElement2_put_onblur(elem2, v); ok(hres == S_OK, "put_onblur failed: %08x\n", hres); + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&div_onfocusout_obj; + hres = IHTMLElement4_put_onfocusout(div, v); + ok(hres == S_OK, "put_onfocusout failed: %08x\n", hres); + + SET_EXPECT(div_onfocusout); SET_EXPECT(input_onblur); hres = IHTMLElement2_blur(elem2); pump_msgs(NULL); CHECK_CALLED(input_onblur); + CHECK_CALLED(div_onfocusout); ok(hres == S_OK, "blur failed: %08x\n", hres); if(!winetest_interactive) ShowWindow(container_hwnd, SW_HIDE); IHTMLElement2_Release(elem2); + IHTMLElement4_Release(div); } static void test_submit(IHTMLDocument2 *doc)

1 0

Jacek Caban : mshtml.idl: Added IDOMMessageEvent declaration.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: f6c10b8a75943dc3a49890c9c7a64c91752a4ee0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c10b8a75943dc3a49890c9c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 4 14:44:18 2016 +0200 mshtml.idl: Added IDOMMessageEvent declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++-- include/mshtml.idl | 30 +++++++++++++++++++++++- 2 files changed, 95 insertions(+), 3 deletions(-) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index a596477..341da28 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -804,6 +804,7 @@ #define DISPID_EVMETH_ONFOCUSOUT DISPID_ONFOCUSOUT #define DISPID_EVMETH_ONSTORAGE DISPID_ONSTORAGE #define DISPID_EVMETH_ONSTORAGECOMMIT DISPID_ONSTORAGECOMMIT +#define DISPID_EVMETH_ONMESSAGE DISPID_ONMESSAGE #define DISPID_ONABORT (DISPID_NORMAL_FIRST) #define DISPID_ONCHANGE (DISPID_NORMAL_FIRST+1) @@ -852,8 +853,65 @@ #define DISPID_ONBEFOREACTIVATE (DISPID_NORMAL_FIRST+47) #define DISPID_ONFOCUSIN (DISPID_NORMAL_FIRST+48) #define DISPID_ONFOCUSOUT (DISPID_NORMAL_FIRST+49) -#define DISPID_ONSTORAGE (DISPID_NORMAL_FIRST+50) -#define DISPID_ONSTORAGECOMMIT (DISPID_NORMAL_FIRST+51) +#define DISPID_ONVALUECHANGE (DISPID_NORMAL_FIRST+50) +#define DISPID_ONSELECTADD (DISPID_NORMAL_FIRST+51) +#define DISPID_ONSELECTREMOVE (DISPID_NORMAL_FIRST+52) +#define DISPID_ONSELECTWITHIN (DISPID_NORMAL_FIRST+53) +#define DISPID_ONSYSTEMSCROLLINGSTART (DISPID_NORMAL_FIRST+54) +#define DISPID_ONSYSTEMSCROLLINGEND (DISPID_NORMAL_FIRST+55) +#define DISPID_ONOBJECTCONTENTSCROLLED (DISPID_NORMAL_FIRST+56) +#define DISPID_ONSTORAGE (DISPID_NORMAL_FIRST+57) +#define DISPID_ONSTORAGECOMMIT (DISPID_NORMAL_FIRST+58) +#define DISPID_ONSHOW (DISPID_NORMAL_FIRST+59) +#define DISPID_ONHIDE (DISPID_NORMAL_FIRST+60) +#define DISPID_ONALERT (DISPID_NORMAL_FIRST+61) +#define DISPID_ONPOPUPMENUSTART (DISPID_NORMAL_FIRST+62) +#define DISPID_ONPOPUPMENUEND (DISPID_NORMAL_FIRST+63) +#define DISPID_ONONLINE (DISPID_NORMAL_FIRST+64) +#define DISPID_ONOFFLINE (DISPID_NORMAL_FIRST+65) +#define DISPID_ONHASHCHANGE (DISPID_NORMAL_FIRST+66) +#define DISPID_ONMESSAGE (DISPID_NORMAL_FIRST+67) +#define DISPID_ONDOMMUTATION (DISPID_NORMAL_FIRST+68) +#define DISPID_SVGLOAD (DISPID_NORMAL_FIRST+69) +#define DISPID_SVGUNLOAD (DISPID_NORMAL_FIRST+70) +#define DISPID_SVGABORT (DISPID_NORMAL_FIRST+71) +#define DISPID_SVGERROR (DISPID_NORMAL_FIRST+72) +#define DISPID_SVGRESIZE (DISPID_NORMAL_FIRST+73) +#define DISPID_SVGSCROLL (DISPID_NORMAL_FIRST+74) +#define DISPID_SVGZOOM (DISPID_NORMAL_FIRST+75) +#define DISPID_MSPOINTERDOWN (DISPID_NORMAL_FIRST+76) +#define DISPID_MSPOINTERMOVE (DISPID_NORMAL_FIRST+77) +#define DISPID_MSPOINTERUP (DISPID_NORMAL_FIRST+78) +#define DISPID_MSPOINTEROVER (DISPID_NORMAL_FIRST+79) +#define DISPID_MSPOINTEROUT (DISPID_NORMAL_FIRST+80) +#define DISPID_MSPOINTERCANCEL (DISPID_NORMAL_FIRST+81) +#define DISPID_MSPOINTERHOVER (DISPID_NORMAL_FIRST+82) +#define DISPID_MSGESTURESTART (DISPID_NORMAL_FIRST+83) +#define DISPID_MSGESTURECHANGE (DISPID_NORMAL_FIRST+84) +#define DISPID_MSGESTUREEND (DISPID_NORMAL_FIRST+85) +#define DISPID_MSGESTUREHOLD (DISPID_NORMAL_FIRST+86) +#define DISPID_MSGESTURETAP (DISPID_NORMAL_FIRST+87) +#define DISPID_MSGESTUREDOUBLETAP (DISPID_NORMAL_FIRST+88) +#define DISPID_MSINERTIASTART (DISPID_NORMAL_FIRST+89) +#define DISPID_MSLOSTPOINTERCAPTURE (DISPID_NORMAL_FIRST+90) +#define DISPID_MSGOTPOINTERCAPTURE (DISPID_NORMAL_FIRST+91) +#define DISPID_MSTRANSITIONSTART (DISPID_NORMAL_FIRST+92) +#define DISPID_MSTRANSITIONEND (DISPID_NORMAL_FIRST+93) +#define DISPID_MSANIMATIONSTART (DISPID_NORMAL_FIRST+94) +#define DISPID_MSANIMATIONEND (DISPID_NORMAL_FIRST+95) +#define DISPID_MSANIMATIONITERATION (DISPID_NORMAL_FIRST+96) +#define DISPID_MSGESTUREINIT (DISPID_NORMAL_FIRST+97) +#define DISPID_MSMANIPULATIONSTATECHANGED (DISPID_NORMAL_FIRST+98) +#define DISPID_ONOPEN (DISPID_NORMAL_FIRST+99) +#define DISPID_ONCLOSE (DISPID_NORMAL_FIRST+100) +#define DISPID_MSPOINTERENTER (DISPID_NORMAL_FIRST+101) +#define DISPID_MSPOINTERLEAVE (DISPID_NORMAL_FIRST+102) +#define DISPID_MSORIENTATIONCHANGE (DISPID_NORMAL_FIRST+103) +#define DISPID_ONDEVICEORIENTATION (DISPID_NORMAL_FIRST+104) +#define DISPID_ONDEVICEMOTION (DISPID_NORMAL_FIRST+105) +#define DISPID_ONPAGESHOW (DISPID_NORMAL_FIRST+106) +#define DISPID_ONPAGEHIDE (DISPID_NORMAL_FIRST+107) +#define DISPID_ONCOMPASSNEEDSCALIBRATION (DISPID_NORMAL_FIRST+108) /* HTMLDocumentEvents */ #define DISPID_HTMLDOCUMENTEVENTS_ONHELP DISPID_EVMETH_ONHELP @@ -3247,6 +3305,12 @@ #define DISPID_IDOMEVENT_CANCELBUBBLE DISPID_DOMEVENT+14 #define DISPID_IDOMEVENT_SRCELEMENT DISPID_DOMEVENT+15 +/* IDOMMessageEvent */ +#define DISPID_IDOMMESSAGEEVENT_DATA DISPID_DOMMESSAGEEVENT+1 +#define DISPID_IDOMMESSAGEEVENT_ORIGIN DISPID_DOMMESSAGEEVENT+2 +#define DISPID_IDOMMESSAGEEVENT_SOURCE DISPID_DOMMESSAGEEVENT+3 +#define DISPID_IDOMMESSAGEEVENT_INITMESSAGEEVENT DISPID_DOMMESSAGEEVENT+4 + /* IHTMLControlElement */ #define DISPID_IHTMLCONTROLELEMENT_TABINDEX STDPROPID_XOBJ_TABINDEX #define DISPID_IHTMLCONTROLELEMENT_FOCUS (DISPID_SITE+0) diff --git a/include/mshtml.idl b/include/mshtml.idl index 53dc4bc..1ea4b5b 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -9382,7 +9382,7 @@ methods: [propget, id(DISPID_IHTMLAREAELEMENT2_IE8_HREF)] BSTR ie8_href(); -}; +} /***************************************************************************** * IHTMLLabelElement interface @@ -18826,6 +18826,34 @@ interface IDOMEvent : IDispatch HRESULT srcElement([out, retval] IHTMLElement **p); } +[ + odl, + oleautomation, + dual, + uuid(30510720-98b5-11cf-bb82-00aa00bdce0b) +] +interface IDOMMessageEvent : IDispatch +{ + [propget, id(DISPID_IDOMMESSAGEEVENT_DATA)] + HRESULT data([out, retval] BSTR *p); + + [propget, id(DISPID_IDOMMESSAGEEVENT_ORIGIN)] + HRESULT origin([out, retval] BSTR *p); + + [propget, id(DISPID_IDOMMESSAGEEVENT_SOURCE)] + HRESULT source([out, retval] IHTMLWindow2 **p); + + [id(DISPID_IDOMMESSAGEEVENT_INITMESSAGEEVENT)] + HRESULT initMessageEvent( + [in] BSTR eventType, + [in] VARIANT_BOOL canBubble, + [in] VARIANT_BOOL cancelable, + [in] BSTR data, + [in] BSTR origin, + [in] BSTR lastEventId, + [in] IHTMLWindow2 *source); +} + /***************************************************************************** * IMarkupContainer interface */

1 0

Alexandre Julliard : makefiles: Use the msvcrt build flags also for cross tests.
by Alexandre Julliard 04 Apr '16

04 Apr '16

Module: wine Branch: master Commit: a1cc2b185dda238732a321052e91b91ec7e9de01 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a1cc2b185dda238732a321052… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 4 22:16:29 2016 +0900 makefiles: Use the msvcrt build flags also for cross tests. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/makedep.c b/tools/makedep.c index 334740e..6d0c0fc 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2639,6 +2639,7 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames( includes ); output_filenames( make->define_args ); output_filenames( extradefs ); + if (make->use_msvcrt) output_filenames( msvcrt_flags ); output_filename( "-DWINE_CROSSTEST" ); output_filenames( cpp_flags ); output_filename( "$(CFLAGS)" );

1 0