November 2017 - Wine-commits

Jacek Caban : mshtml: Added DOMContentLoaded event implementation.
by Alexandre Julliard 01 Nov '17

01 Nov '17

Module: wine Branch: master Commit: 0c0dd3d5821ce57a68c987275d084891cf9f98f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0c0dd3d5821ce57a68c987275… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 1 16:43:53 2017 +0100 mshtml: Added DOMContentLoaded event implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 10 +++++++--- dlls/mshtml/htmlevent.h | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index f9d2460..ee85eca 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -89,6 +89,7 @@ static const WCHAR selectstartW[] = {'s','e','l','e','c','t','s','t','a','r','t' static const WCHAR selectionchangeW[] = {'s','e','l','e','c','t','i','o','n','c','h','a','n','g','e',0}; static const WCHAR submitW[] = {'s','u','b','m','i','t',0}; static const WCHAR unloadW[] = {'u','n','l','o','a','d',0}; +static const WCHAR DOMContentLoadedW[] = {'D','O','M','C','o','n','t','e','n','t','L','o','a','d','e','d',0}; static const WCHAR EventW[] = {'E','v','e','n','t',0}; static const WCHAR UIEventW[] = {'U','I','E','v','e','n','t',0}; @@ -150,6 +151,8 @@ static const event_info_t event_info[] = { EVENT_FIXME | EVENT_BUBBLES}, {dblclickW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONDBLCLICK, EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, + {DOMContentLoadedW, EVENT_TYPE_EVENT, 0, + EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {dragW, EVENT_TYPE_DRAG, DISPID_EVMETH_ONDRAG, EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE}, {dragstartW, EVENT_TYPE_DRAG, DISPID_EVMETH_ONDRAGSTART, @@ -227,7 +230,7 @@ static eventid_t attr_to_eid(const WCHAR *str) return EVENTID_LAST; for(i=0; i < sizeof(event_info)/sizeof(event_info[0]); i++) { - if(!strcmpW(event_info[i].name, str+2)) + if(!strcmpW(event_info[i].name, str+2) && event_info[i].dispid) return i; } @@ -1298,7 +1301,7 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) event_listener_t *listener, listeners_buf[8], *listeners = listeners_buf; unsigned listeners_cnt, listeners_size; ConnectionPointContainer *cp_container = NULL; - const event_target_vtbl_t *vtbl; + const event_target_vtbl_t *vtbl = NULL; VARIANT v; HRESULT hres; @@ -1446,7 +1449,8 @@ static void call_event_handlers(EventTarget *event_target, DOMEvent *event) if(event->phase == DEP_CAPTURING_PHASE) return; - if((vtbl = dispex_get_vtbl(&event_target->dispex)) && vtbl->get_cp_container) + if(event_info[eid].dispid && (vtbl = dispex_get_vtbl(&event_target->dispex)) + && vtbl->get_cp_container) cp_container = vtbl->get_cp_container(&event_target->dispex); if(cp_container) { if(cp_container->cps) { diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index eaf42eb..7dfc7ad 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -26,6 +26,7 @@ typedef enum { EVENTID_CONTEXTMENU, EVENTID_DATAAVAILABLE, EVENTID_DBLCLICK, + EVENTID_DOMCONTENTLOADED, EVENTID_DRAG, EVENTID_DRAGSTART, EVENTID_ERROR,

1 0

Jacek Caban : mshtml: Expose IEventTarget to scripts.
by Alexandre Julliard 01 Nov '17

01 Nov '17

Module: wine Branch: master Commit: 1366b33c81527b5d4762da6b3f7083058eb910a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1366b33c81527b5d4762da6b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 1 16:44:02 2017 +0100 mshtml: Expose IEventTarget to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 6 ++++++ dlls/mshtml/htmlnode.c | 2 ++ dlls/mshtml/htmlwindow.c | 11 +++++++++- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/tests/documentmode.js | 44 +++++++++++++++++++++++++++++++++++++++ dlls/mshtml/xmlhttprequest.c | 5 +++-- 6 files changed, 67 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ee85eca..d57ff19 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2205,6 +2205,12 @@ HRESULT EventTarget_QI(EventTarget *event_target, REFIID riid, void **ppv) return E_NOINTERFACE; } +void EventTarget_init_dispex_info(dispex_data_t *dispex_info, compat_mode_t compat_mode) +{ + if(compat_mode >= COMPAT_MODE_IE9) + dispex_info_add_interface(dispex_info, IEventTarget_tid, NULL); +} + static int event_id_cmp(const void *key, const struct wine_rb_entry *entry) { return (INT_PTR)key - WINE_RB_ENTRY_VALUE(entry, listener_container_t, entry)->event_id; diff --git a/dlls/mshtml/htmlnode.c b/dlls/mshtml/htmlnode.c index 8f03b4a..70b0d0d 100644 --- a/dlls/mshtml/htmlnode.c +++ b/dlls/mshtml/htmlnode.c @@ -1425,6 +1425,8 @@ void HTMLDOMNode_init_dispex_info(dispex_data_t *info, compat_mode_t mode) { if(mode >= COMPAT_MODE_IE9) dispex_info_add_interface(info, IHTMLDOMNode3_tid, NULL); + + EventTarget_init_dispex_info(info, mode); } static const cpc_entry_t HTMLDOMNode_cpc[] = {{NULL}}; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index b174de2..759f1b6 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3016,6 +3016,14 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD return hres; } +static compat_mode_t HTMLWindow_get_compat_mode(DispatchEx *dispex) +{ + HTMLInnerWindow *This = impl_from_DispatchEx(dispex); + + This->doc->document_mode_locked = TRUE; + return This->doc->document_mode; +} + static void HTMLWindow_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); @@ -3025,6 +3033,7 @@ static void HTMLWindow_bind_event(DispatchEx *dispex, eventid_t eid) static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) { dispex_info_add_interface(info, IHTMLWindow5_tid, NULL); + EventTarget_init_dispex_info(info, compat_mode); } static IHTMLEventObj *HTMLWindow_set_current_event(DispatchEx *dispex, IHTMLEventObj *event) @@ -3038,7 +3047,7 @@ static const event_target_vtbl_t HTMLWindow_event_target_vtbl = { NULL, NULL, HTMLWindow_invoke, - NULL, + HTMLWindow_get_compat_mode, NULL }, HTMLWindow_bind_event, diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 2098b78..98daa65 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -129,6 +129,7 @@ typedef struct EventTarget EventTarget; XIID(IDocumentSelector) \ XIID(IElementSelector) \ XIID(IElementTraversal) \ + XIID(IEventTarget) \ XIID(IHTMLAnchorElement) \ XIID(IHTMLAreaElement) \ XIID(IHTMLAttributeCollection) \ @@ -1041,6 +1042,7 @@ void HTMLFrameBase_Init(HTMLFrameBase*,HTMLDocumentNode*,nsIDOMHTMLElement*,disp void EventTarget_Init(EventTarget*,IUnknown*,dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; HRESULT EventTarget_QI(EventTarget*,REFIID,void**) DECLSPEC_HIDDEN; +void EventTarget_init_dispex_info(dispex_data_t*,compat_mode_t) DECLSPEC_HIDDEN; HRESULT HTMLDOMNode_QI(HTMLDOMNode*,REFIID,void**) DECLSPEC_HIDDEN; void HTMLDOMNode_destructor(HTMLDOMNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index aaf052b..beee493 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -38,6 +38,9 @@ function test_elem_props() { test_exposed("onsubmit", v >= 9); test_exposed("getElementsByClassName", v >= 9); test_exposed("removeAttributeNS", v >= 9); + test_exposed("addEventListener", v >= 9); + test_exposed("removeEventListener", v >= 9); + test_exposed("dispatchEvent", v >= 9); next_test(); } @@ -56,6 +59,9 @@ function test_doc_props() { test_exposed("prefix", v >= 9); test_exposed("defaultView", v >= 9); test_exposed("head", v >= 9); + test_exposed("addEventListener", v >= 9); + test_exposed("removeEventListener", v >= 9); + test_exposed("dispatchEvent", v >= 9); test_exposed("parentWindow", true); if(v >= 9) ok(document.defaultView === document.parentWindow, "defaultView != parentWindow"); @@ -63,6 +69,42 @@ function test_doc_props() { next_test(); } +function test_window_props() { + function test_exposed(prop, expect) { + if(expect) + ok(prop in window, prop + " not found in window."); + else + ok(!(prop in window), prop + " found in window."); + } + + var v = document.documentMode; + + test_exposed("addEventListener", v >= 9); + test_exposed("removeEventListener", v >= 9); + test_exposed("dispatchEvent", v >= 9); + + next_test(); +} + +function test_xhr_props() { + var xhr = new XMLHttpRequest(); + + function test_exposed(prop, expect) { + if(expect) + ok(prop in xhr, prop + " not found in XMLHttpRequest."); + else + ok(!(prop in xhr), prop + " found in XMLHttpRequest."); + } + + var v = document.documentMode; + + test_exposed("addEventListener", v >= 9); + test_exposed("removeEventListener", v >= 9); + test_exposed("dispatchEvent", v >= 9); + + next_test(); +} + function test_elem_by_id() { document.body.innerHTML = '<form id="testid" name="testname"></form>'; @@ -156,6 +198,8 @@ var tests = [ test_iframe_doc_mode, test_elem_props, test_doc_props, + test_window_props, + test_xhr_props, test_elem_by_id, test_conditional_comments ]; diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index bbe2833..393a569 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -785,7 +785,8 @@ static const tid_t HTMLXMLHttpRequest_iface_tids[] = { static dispex_static_data_t HTMLXMLHttpRequest_dispex = { &HTMLXMLHttpRequest_event_target_vtbl.dispex_vtbl, DispHTMLXMLHttpRequest_tid, - HTMLXMLHttpRequest_iface_tids + HTMLXMLHttpRequest_iface_tids, + EventTarget_init_dispex_info }; @@ -898,7 +899,7 @@ static HRESULT WINAPI HTMLXMLHttpRequestFactory_create(IHTMLXMLHttpRequestFactor ret->IHTMLXMLHttpRequest_iface.lpVtbl = &HTMLXMLHttpRequestVtbl; ret->IProvideClassInfo2_iface.lpVtbl = &ProvideClassInfo2Vtbl; EventTarget_Init(&ret->event_target, (IUnknown*)&ret->IHTMLXMLHttpRequest_iface, - &HTMLXMLHttpRequest_dispex, COMPAT_MODE_NONE); + &HTMLXMLHttpRequest_dispex, This->window->doc->document_mode); ret->ref = 1; *p = &ret->IHTMLXMLHttpRequest_iface;

1 0

Jacek Caban : mshtml/tests: Added script IE9+ event tests.
by Alexandre Julliard 01 Nov '17

01 Nov '17

Module: wine Branch: master Commit: 01dcb6584790ea3b37b3e69e2430eb64fe65979d URL: http://source.winehq.org/git/wine.git/?a=commit;h=01dcb6584790ea3b37b3e69e2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Nov 1 16:44:11 2017 +0100 mshtml/tests: Added script IE9+ event tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.js | 278 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 + dlls/mshtml/tests/script.c | 1 + 3 files changed, 282 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=01dcb6584790ea3b37b3e…

1 0

Aric Stewart : usp10/tests: Add fingerprint to help ensure proper font for testing.
by Alexandre Julliard 01 Nov '17

01 Nov '17

Module: wine Branch: master Commit: 265f5cad233963ed6cae188031e263ae3ff124d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=265f5cad233963ed6cae18803… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Nov 1 10:53:23 2017 -0500 usp10/tests: Add fingerprint to help ensure proper font for testing. Fixes problems where there is a linux font also named Estrangelo Edessa but does not have the font shaping properties we are testing. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/tests/usp10.c | 71 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 50 insertions(+), 21 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=265f5cad233963ed6cae1…

1 0

Austin English : readme: Clarify the wording a bit.
by Alexandre Julliard 01 Nov '17

01 Nov '17

Module: wine Branch: master Commit: 97dea5bd08af894463823fde64cbdf4619c5928c URL: http://source.winehq.org/git/wine.git/?a=commit;h=97dea5bd08af894463823fde6… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 1 13:24:51 2017 -0500 readme: Clarify the wording a bit. Pointed out by Jens Reyer. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- README | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index 4b76546..21dabed 100644 --- a/README +++ b/README @@ -19,11 +19,11 @@ run: ./configure make -Then either install wine: +Then either install Wine: make install -Or run it from the build directory: +Or run Wine directly from the build directory: ./wine notepad

1 0

Austin English : preloader: Fix a typo in error message.
by Alexandre Julliard 01 Nov '17

01 Nov '17

Module: wine Branch: master Commit: 039d267b0925273197a9edcf7664c4a42dca932d URL: http://source.winehq.org/git/wine.git/?a=commit;h=039d267b0925273197a9edcf7… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Nov 1 13:24:52 2017 -0500 preloader: Fix a typo in error message. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/preloader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/loader/preloader.c b/loader/preloader.c index 6cb8e15..5a4bb16 100644 --- a/loader/preloader.c +++ b/loader/preloader.c @@ -831,7 +831,7 @@ static void map_so_lib( const char *name, struct wld_link_map *l) fatal_error("%s: not an x86-64 ELF binary... don't know how to load it\n", name ); #elif defined(__aarch64__) if( header->e_machine != EM_AARCH64 ) - fatal_error("%s: not an aarchs64 ELF binary... don't know how to load it\n", name ); + fatal_error("%s: not an aarch64 ELF binary... don't know how to load it\n", name ); #endif if (header->e_phnum > sizeof(loadcmds)/sizeof(loadcmds[0]))

1 0