February 2018 - Wine-commits

Francois Gouget : testbot: Show which VM is blocking the revert in _DumpHostVMs().
by Alexandre Julliard 23 Feb '18

23 Feb '18

Module: tools Branch: master Commit: 25622c8c206af400dddae8614049e215ead470ef URL: https://source.winehq.org/git/tools.git/?a=commit;h=25622c8c206af400dddae86… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 23 04:39:46 2018 +0100 testbot: Show which VM is blocking the revert in _DumpHostVMs(). Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/WineTestBot/Jobs.pm | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Jobs.pm b/testbot/lib/WineTestBot/Jobs.pm index ae1e4ec..3eba27b 100644 --- a/testbot/lib/WineTestBot/Jobs.pm +++ b/testbot/lib/WineTestBot/Jobs.pm @@ -1069,7 +1069,22 @@ sub _DumpHostVMs($$$$) $VM = $Sched->{VMs}->GetItem($VMKey); next if ($VM->GetHost() ne $HostKey); - push @VMInfo, join(":", "$VMKey(". $VM->Status .")", $NeededVMs->{$VMKey}->[0], $NeededVMs->{$VMKey}->[1], $NeededVMs->{$VMKey}->[2]); + my $NeededVM = $NeededVMs->{$VMKey}; + my $Dep = ""; + if ($NeededVM->[3]) + { + foreach my $DepVM (@{$NeededVM->[3]}) + { + if ($DepVM->Status !~ /^(?:reverting|sleeping|running)$/) + { + $Dep = ":". $DepVM->Name; + last; + } + } + $Dep .= "/". scalar(@{$NeededVM->[3]}); + } + push @VMInfo, join(":", "$VMKey(". $VM->Status ."$Dep)", + $NeededVM->[0], $NeededVM->[1], $NeededVM->[2]); } my $PrettyHost = ($PrettyHostNames ? $PrettyHostNames->{$HostKey} : "") || $HostKey;

1 0

Francois Gouget : testbot: A small fix and optimization for Collection:: IsEmpty().
by Alexandre Julliard 23 Feb '18

23 Feb '18

Module: tools Branch: master Commit: 57efe43967ef5b82f3587682077bffe6eccafbaa URL: https://source.winehq.org/git/tools.git/?a=commit;h=57efe43967ef5b82f358768… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri Feb 23 04:40:18 2018 +0100 testbot: A small fix and optimization for Collection::IsEmpty(). Even after loading the collection $self->{Items} could be undefined if no row matched the filters. There is no need to extract the list of keys in order to determine whether the collection is empty. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/Collection.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/ObjectModel/Collection.pm b/testbot/lib/ObjectModel/Collection.pm index 86dee05..7fa977c 100644 --- a/testbot/lib/ObjectModel/Collection.pm +++ b/testbot/lib/ObjectModel/Collection.pm @@ -420,7 +420,9 @@ sub IsEmpty($) $self->Load(); } - return scalar(keys %{$self->{Items}}) == 0; + # Even though scalar(hash) does not return the number of items in Perl 5.20 + # it returns 0 for an empty hash. + return !$self->{Items} || scalar(%{$self->{Items}}) == 0; } sub CombineKey($@)

1 0

Jacek Caban : mshtml: Register load, error and abort events directly in event target.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: d7c94cc7d8d9fcba996eab4747ade2cdb023fef9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d7c94cc7d8d9fcba996eab47… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 19:47:26 2018 +0100 mshtml: Register load, error and abort events directly in event target. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 2 +- dlls/mshtml/htmlelem.c | 11 +--------- dlls/mshtml/htmlevent.c | 53 +++++++++++++++++++++++++++++---------------- dlls/mshtml/htmlevent.h | 2 +- dlls/mshtml/htmlwindow.c | 2 +- dlls/mshtml/tests/events.js | 40 ++++++++++++++++++++++++++++++++++ 6 files changed, 78 insertions(+), 32 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 4473b49..1f458fc 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5048,7 +5048,7 @@ static nsISupports *HTMLDocumentNode_get_gecko_target(DispatchEx *dispex) static void HTMLDocumentNode_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLDocumentNode *This = impl_from_DispatchEx(dispex); - ensure_doc_nsevent_handler(This, eid); + ensure_doc_nsevent_handler(This, This->node.nsnode, eid); } static EventTarget *HTMLDocumentNode_get_parent_event_target(DispatchEx *dispex) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 6379101..8a4e164 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5439,16 +5439,7 @@ static nsISupports *HTMLElement_get_gecko_target(DispatchEx *dispex) static void HTMLElement_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLElement *This = impl_from_DispatchEx(dispex); - - 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: - ensure_doc_nsevent_handler(This->node.doc, eid); - } + ensure_doc_nsevent_handler(This->node.doc, This->node.nsnode, eid); } static HRESULT HTMLElement_handle_event_default(DispatchEx *dispex, eventid_t eid, nsIDOMEvent *nsevent, BOOL *prevent_default) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 6773a53..3e0dfa5 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -131,11 +131,17 @@ typedef struct { DWORD flags; } event_info_t; +/* Use Gecko default listener (it's registered on window object for DOM nodes). */ #define EVENT_DEFAULTLISTENER 0x0001 -#define EVENT_BUBBLES 0x0002 -#define EVENT_BIND_TO_BODY 0x0008 -#define EVENT_CANCELABLE 0x0010 +/* Register Gecko listener on target itself (unlike EVENT_DEFAULTLISTENER). */ +#define EVENT_BIND_TO_TARGET 0x0002 +/* Event bubbles by default (unless explicitly specified otherwise). */ +#define EVENT_BUBBLES 0x0004 +/* Event is cancelable by default (unless explicitly specified otherwise). */ +#define EVENT_CANCELABLE 0x0008 +/* Event may have default handler (so we always have to register Gecko listener). */ #define EVENT_HASDEFAULTHANDLERS 0x0020 +/* Ecent is not supported properly, print FIXME message when it's used. */ #define EVENT_FIXME 0x0040 /* mouse event flags for fromElement and toElement implementation */ @@ -144,7 +150,7 @@ typedef struct { static const event_info_t event_info[] = { {abortW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONABORT, - EVENT_BIND_TO_BODY}, + EVENT_BIND_TO_TARGET}, {beforeactivateW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONBEFOREACTIVATE, EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE}, {beforeunloadW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONBEFOREUNLOAD, @@ -168,7 +174,7 @@ static const event_info_t event_info[] = { {dragstartW, EVENT_TYPE_DRAG, DISPID_EVMETH_ONDRAGSTART, EVENT_FIXME | EVENT_BUBBLES | EVENT_CANCELABLE}, {errorW, EVENT_TYPE_EVENT, DISPID_EVMETH_ONERROR, - EVENT_BIND_TO_BODY}, + EVENT_BIND_TO_TARGET}, {focusW, EVENT_TYPE_FOCUS, DISPID_EVMETH_ONFOCUS, EVENT_DEFAULTLISTENER}, {focusinW, EVENT_TYPE_FOCUS, DISPID_EVMETH_ONFOCUSIN, @@ -184,7 +190,7 @@ static const event_info_t event_info[] = { {keyupW, EVENT_TYPE_KEYBOARD, DISPID_EVMETH_ONKEYUP, EVENT_DEFAULTLISTENER | EVENT_BUBBLES | EVENT_CANCELABLE}, {loadW, EVENT_TYPE_UIEVENT, DISPID_EVMETH_ONLOAD, - EVENT_BIND_TO_BODY}, + EVENT_BIND_TO_TARGET}, {messageW, EVENT_TYPE_MESSAGE, DISPID_EVMETH_ONMESSAGE, 0}, {mousedownW, EVENT_TYPE_MOUSE, DISPID_EVMETH_ONMOUSEDOWN, @@ -2618,6 +2624,14 @@ static HRESULT dispatch_event_object(EventTarget *event_target, DOMEvent *event, void dispatch_event(EventTarget *event_target, DOMEvent *event) { dispatch_event_object(event_target, event, DISPATCH_BOTH, NULL); + + /* + * We may have registered multiple Gecko listeners for the same event type, + * but we already dispatched event to all relevant targets. Stop event + * propagation here to avoid events being dispatched multiple times. + */ + if(event->event_id != EVENTID_LAST && (event_info[event->event_id].flags & EVENT_BIND_TO_TARGET)) + nsIDOMEvent_StopPropagation(event->nsevent); } HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_var, VARIANT_BOOL *cancelled) @@ -2679,10 +2693,8 @@ HRESULT fire_event(HTMLDOMNode *node, const WCHAR *event_name, VARIANT *event_va return S_OK; } -HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) +HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, nsIDOMNode *nsnode, eventid_t eid) { - nsIDOMNode *nsnode = NULL; - TRACE("%s\n", debugstr_w(event_info[eid].name)); if(!doc->nsdoc) @@ -2701,19 +2713,22 @@ HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode *doc, eventid_t eid) break; } - if(doc->event_vector[eid] || !(event_info[eid].flags & (EVENT_DEFAULTLISTENER|EVENT_BIND_TO_BODY))) + if(event_info[eid].flags & EVENT_DEFAULTLISTENER) { + nsnode = NULL; + }else if(event_info[eid].flags & EVENT_BIND_TO_TARGET) { + if(!nsnode) + nsnode = doc->node.nsnode; + }else { return S_OK; + } - if(event_info[eid].flags & EVENT_BIND_TO_BODY) { - nsnode = doc->node.nsnode; - nsIDOMNode_AddRef(nsnode); + if(!nsnode || nsnode == doc->node.nsnode) { + if(doc->event_vector[eid]) + return S_OK; + doc->event_vector[eid] = TRUE; } - doc->event_vector[eid] = TRUE; add_nsevent_listener(doc, nsnode, event_info[eid].name); - - if(nsnode) - nsIDOMNode_Release(nsnode); return S_OK; } @@ -2949,7 +2964,7 @@ void update_doc_cp_events(HTMLDocumentNode *doc, cp_static_data_t *cp) for(i=0; i < EVENTID_LAST; i++) { if((event_info[i].flags & EVENT_DEFAULTLISTENER) && is_cp_event(cp, event_info[i].dispid)) - ensure_doc_nsevent_handler(doc, i); + ensure_doc_nsevent_handler(doc, NULL, i); } } @@ -3046,7 +3061,7 @@ HRESULT doc_init_events(HTMLDocumentNode *doc) for(i=0; i < EVENTID_LAST; i++) { if(event_info[i].flags & EVENT_HASDEFAULTHANDLERS) { - hres = ensure_doc_nsevent_handler(doc, i); + hres = ensure_doc_nsevent_handler(doc, NULL, i); if(FAILED(hres)) return hres; } diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h index 39bcf01..4d1267e 100644 --- a/dlls/mshtml/htmlevent.h +++ b/dlls/mshtml/htmlevent.h @@ -98,7 +98,7 @@ HRESULT doc_init_events(HTMLDocumentNode*) DECLSPEC_HIDDEN; void detach_events(HTMLDocumentNode *doc) DECLSPEC_HIDDEN; HRESULT create_event_obj(IHTMLEventObj**) DECLSPEC_HIDDEN; void bind_target_event(HTMLDocumentNode*,EventTarget*,const WCHAR*,IDispatch*) DECLSPEC_HIDDEN; -HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,eventid_t) DECLSPEC_HIDDEN; +HRESULT ensure_doc_nsevent_handler(HTMLDocumentNode*,nsIDOMNode*,eventid_t) DECLSPEC_HIDDEN; void dispatch_event(EventTarget*,DOMEvent*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 2ef62cc..80cc7ec 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3033,7 +3033,7 @@ static nsISupports *HTMLWindow_get_gecko_target(DispatchEx *dispex) static void HTMLWindow_bind_event(DispatchEx *dispex, eventid_t eid) { HTMLInnerWindow *This = impl_from_DispatchEx(dispex); - ensure_doc_nsevent_handler(This->doc, eid); + ensure_doc_nsevent_handler(This->doc, NULL, eid); } static void HTMLWindow_init_dispex_info(dispex_data_t *info, compat_mode_t compat_mode) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 7db440a..108afe2 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -743,6 +743,44 @@ function test_keyboard_event() { next_test(); } +function test_error_event() { + document.body.innerHTML = '<div><img></img></div>'; + var div = document.body.firstChild; + var img = div.firstChild; + var calls = ""; + + function record_call(msg) { + return function() { calls += msg + "," }; + } + var win_onerror = record_call("window.onerror"); + var doc_onerror = record_call("doc.onerror"); + var body_onerror = record_call("body.onerror"); + + window.addEventListener("error", win_onerror, true); + document.addEventListener("error", doc_onerror, true); + document.body.addEventListener("error", body_onerror, true); + div.addEventListener("error", record_call("div.onerror"), true); + + div.addEventListener("error", function() { + ok(calls === "window.onerror,doc.onerror,body.onerror,div.onerror,", "calls = " + calls); + + window.removeEventListener("error", win_onerror, true); + document.removeEventListener("error", doc_onerror, true); + document.body.removeEventListener("error", body_onerror, true); + next_test(); + }, true); + + img.src = "about:blank"; +} + +function test_detached_img_error_event() { + var img = new Image(); + img.onerror = function() { + next_test(); + } + img.src = "about:blank"; +} + var tests = [ test_content_loaded, test_add_remove_listener, @@ -758,6 +796,8 @@ var tests = [ test_ui_event, test_mouse_event, test_keyboard_event, + test_error_event, + test_detached_img_error_event, test_time_stamp, test_listener_order ];

1 0

Jacek Caban : mshtml: Properly support custom event listeners in XMLHttpRequest object.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 74d6c6d2fb40f96128699397246a880c37213054 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74d6c6d2fb40f96128699397… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 19:47:35 2018 +0100 mshtml: Properly support custom event listeners in XMLHttpRequest object. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/events.js | 12 ++++++++++++ dlls/mshtml/xmlhttprequest.c | 4 +--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 108afe2..3836e13 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -538,6 +538,18 @@ function test_dispatch_event() { ok(calls === "parent.testing(capture),child.testing(capture)," + "child.testing(bubble),parent.testing(bubble),", "calls = " + calls); + var xhr = new XMLHttpRequest(); + xhr.addEventListener("testing", function(event) { + ok(event === e, "event != e"); + ok(event.target === xhr, "target != child"); + ok(event.srcElement === null, "srcElement != child"); + calls += "xhr.testing"; + }, true); + + calls = ""; + xhr.dispatchEvent(e); + ok(calls === "xhr.testing", "calls = " + calls); + next_test(); } diff --git a/dlls/mshtml/xmlhttprequest.c b/dlls/mshtml/xmlhttprequest.c index ebe2561..5164570 100644 --- a/dlls/mshtml/xmlhttprequest.c +++ b/dlls/mshtml/xmlhttprequest.c @@ -755,9 +755,7 @@ static void HTMLXMLHttpRequest_bind_event(DispatchEx *dispex, eventid_t eid) TRACE("(%p)\n", This); - assert(eid == EVENTID_READYSTATECHANGE); - - if(This->event_listener) + if(eid != EVENTID_READYSTATECHANGE || This->event_listener) return; This->event_listener = heap_alloc(sizeof(*This->event_listener));

1 0

Jacek Caban : mshtml: Properly handle conditional comments in IE9+ modes.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 67de587f60a6baf643a001c030739043a5ec2fb0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67de587f60a6baf643a001c0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 19:48:03 2018 +0100 mshtml: Properly handle conditional comments in IE9+ modes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 22 ++++++++-------------- dlls/mshtml/tests/documentmode.js | 8 ++------ 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 189bf84..95a0694 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -138,14 +138,6 @@ static PRUnichar *handle_insert_comment(HTMLDocumentNode *doc, const PRUnichar * return NULL; compat_version = compat_mode_info[doc->document_mode].ie_version; - if(compat_version > 8) { - /* - * Ideally we should handle higher versions, but right now it would cause more problems than it's worth. - * We should revisit that once more IE9 features are implemented, most notably new events APIs. - */ - WARN("Using compat version 8\n"); - compat_version = 8; - } switch(cmpt) { case CMP_EQ: @@ -748,13 +740,15 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, TRACE("(%p)->(%p %p)\n", This, aDocument, aContent); - nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMComment, (void**)&nscomment); - if(NS_SUCCEEDED(nsres)) { - TRACE("comment node\n"); + if(This->document_mode < COMPAT_MODE_IE10) { + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMComment, (void**)&nscomment); + if(NS_SUCCEEDED(nsres)) { + TRACE("comment node\n"); - add_script_runner(This, run_insert_comment, (nsISupports*)nscomment, NULL); - nsIDOMComment_Release(nscomment); - return; + add_script_runner(This, run_insert_comment, (nsISupports*)nscomment, NULL); + nsIDOMComment_Release(nscomment); + return; + } } if(This->document_mode == COMPAT_MODE_QUIRKS) { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 498dfed..1a16c56 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -165,10 +165,6 @@ function test_conditional_comments() { function test_version(v) { var version = compat_version ? compat_version : 7; - /* Uncomment and fix tests below once we support that. */ - if(version >= 9) - return; - div.innerHTML = ""; ok(div.innerText === (version <= v ? "true" : ""), "div.innerText = " + div.innerText + " for version (<=) " + v); @@ -178,11 +174,11 @@ function test_conditional_comments() { "div.innerText = " + div.innerText + " for version (<) " + v); div.innerHTML = ""; - ok(div.innerText === (version >= v ? "true" : ""), + ok(div.innerText === (version >= v && version < 10 ? "true" : ""), "div.innerText = " + div.innerText + " for version (>=) " + v); div.innerHTML = ""; - ok(div.innerText === (version > v ? "true" : ""), + ok(div.innerText === (version > v && version < 10 ? "true" : ""), "div.innerText = " + div.innerText + " for version (>) " + v); }

1 0

Jacek Caban : mshtml: Set SCRIPTPROP_INVOKEVERSIONING based on document mode value.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: dd78fd09663fa4183989fdf29dca53732bd07386 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dd78fd09663fa4183989fdf2… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 22 19:48:18 2018 +0100 mshtml: Set SCRIPTPROP_INVOKEVERSIONING based on document mode value. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 5 ++--- dlls/mshtml/htmlwindow.c | 4 +--- dlls/mshtml/mshtml_private.h | 2 ++ dlls/mshtml/mutation.c | 19 +++++++++++++++---- dlls/mshtml/script.c | 22 +--------------------- 5 files changed, 21 insertions(+), 31 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1f458fc..7c8455c 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5035,8 +5035,7 @@ static compat_mode_t HTMLDocumentNode_get_compat_mode(DispatchEx *dispex) TRACE("(%p) returning %u\n", This, This->document_mode); - This->document_mode_locked = TRUE; - return This->document_mode; + return lock_document_mode(This); } static nsISupports *HTMLDocumentNode_get_gecko_target(DispatchEx *dispex) @@ -5173,8 +5172,8 @@ HRESULT create_doc_from_nsdoc(nsIDOMHTMLDocument *nsdoc, HTMLDocumentObj *doc_ob compat_mode_t parent_mode = window->base.outer_window->parent->base.inner_window->doc->document_mode; TRACE("parent mode %u\n", parent_mode); if(parent_mode >= COMPAT_MODE_IE9) { - doc->document_mode_locked = TRUE; doc->document_mode = parent_mode; + lock_document_mode(doc); } } diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 80cc7ec..93df314 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -3019,9 +3019,7 @@ static HRESULT HTMLWindow_invoke(DispatchEx *dispex, DISPID id, LCID lcid, WORD 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; + return lock_document_mode(This->doc); } static nsISupports *HTMLWindow_get_gecko_target(DispatchEx *dispex) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 551ee12..1c9e26a 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -898,6 +898,8 @@ void ConnectionPointContainer_Destroy(ConnectionPointContainer*) DECLSPEC_HIDDEN HRESULT create_nscontainer(HTMLDocumentObj*,NSContainer**) DECLSPEC_HIDDEN; void NSContainer_Release(NSContainer*) DECLSPEC_HIDDEN; +compat_mode_t lock_document_mode(HTMLDocumentNode*) DECLSPEC_HIDDEN; + void init_mutation(nsIComponentManager*) DECLSPEC_HIDDEN; void init_document_mutation(HTMLDocumentNode*) DECLSPEC_HIDDEN; void release_document_mutation(HTMLDocumentNode*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index 95a0694..4e1e053 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -362,6 +362,18 @@ static nsresult run_insert_script(HTMLDocumentNode *doc, nsISupports *script_ifa return NS_OK; } +/* + * We may change document mode only in early stage of document lifetime. + * Later attempts will not have an effect. + */ +compat_mode_t lock_document_mode(HTMLDocumentNode *doc) +{ + TRACE("%p: %d\n", doc, doc->document_mode); + + doc->document_mode_locked = TRUE; + return doc->document_mode; +} + static void set_document_mode(HTMLDocumentNode *doc, compat_mode_t document_mode, BOOL lock) { if(doc->document_mode_locked) { @@ -371,9 +383,9 @@ static void set_document_mode(HTMLDocumentNode *doc, compat_mode_t document_mode TRACE("%p: %d\n", doc, document_mode); - if(lock) - doc->document_mode_locked = TRUE; doc->document_mode = document_mode; + if(lock) + lock_document_mode(doc); } static BOOL parse_ua_compatible(const WCHAR *p, compat_mode_t *r) @@ -816,8 +828,7 @@ static void NSAPI nsDocumentObserver_AttemptToExecuteScript(nsIDocumentObserver if(NS_SUCCEEDED(nsres)) { TRACE("script node\n"); - This->document_mode_locked = TRUE; - + lock_document_mode(This); add_script_runner(This, run_insert_script, (nsISupports*)nsscript, (nsISupports*)aParser); nsIDOMHTMLScriptElement_Release(nsscript); } diff --git a/dlls/mshtml/script.c b/dlls/mshtml/script.c index acc1b39..d4bf123 100644 --- a/dlls/mshtml/script.c +++ b/dlls/mshtml/script.c @@ -112,26 +112,6 @@ static void set_script_prop(ScriptHost *script_host, DWORD property, VARIANT *va WARN("SetProperty(%x) failed: %08x\n", property, hres); } -static BOOL is_quirks_mode(HTMLDocumentNode *doc) -{ - const WCHAR *compat_mode; - nsAString nsstr; - nsresult nsres; - BOOL ret = FALSE; - - static const WCHAR BackCompatW[] = {'B','a','c','k','C','o','m','p','a','t',0}; - - nsAString_Init(&nsstr, NULL); - nsres = nsIDOMHTMLDocument_GetCompatMode(doc->nsdoc, &nsstr); - if(NS_SUCCEEDED(nsres)) { - nsAString_GetData(&nsstr, &compat_mode); - if(!strcmpW(compat_mode, BackCompatW)) - ret = TRUE; - } - nsAString_Finish(&nsstr); - return ret; -} - static BOOL init_script_engine(ScriptHost *script_host) { IObjectSafety *safety; @@ -170,7 +150,7 @@ static BOOL init_script_engine(ScriptHost *script_host) return FALSE; V_VT(&var) = VT_I4; - V_I4(&var) = is_quirks_mode(script_host->window->doc) ? 1 : 2; + V_I4(&var) = lock_document_mode(script_host->window->doc) == COMPAT_MODE_QUIRKS ? 1 : 2; set_script_prop(script_host, SCRIPTPROP_INVOKEVERSIONING, &var); V_VT(&var) = VT_BOOL;

1 0

Alex Henrie : msxml3: Remove CRs in domtext_put_data and add them in domtext_get_xml.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: f9e1dbb83d850a2f7cb17079e02de139e2f8b920 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f9e1dbb83d850a2f7cb17079… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 20 00:10:44 2018 -0700 msxml3: Remove CRs in domtext_put_data and add them in domtext_get_xml. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/domdoc.c | 153 +++++++++++++++++++++++++++++++++++++++------ dlls/msxml3/text.c | 34 +++++++--- 2 files changed, 161 insertions(+), 26 deletions(-) diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 7aeafa5..23c17ea 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -12143,34 +12143,148 @@ static void test_put_data(void) type++; } - /* \r\n sequence is never escaped */ + IXMLDOMDocument_Release(doc); + free_bstrs(); +} + +static void test_newline_normalization(void) +{ + const struct msxmlsupported_data_t *table = domdoc_support_data; + IXMLDOMDocument *doc; + IXMLDOMText *text; + IXMLDOMNode *node; + VARIANT v; + VARIANT_BOOL b; + BSTR s; + HRESULT hr; + LONG length; + V_VT(&v) = VT_I2; V_I2(&v) = NODE_TEXT; - hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); - ok(hr == S_OK, "got 0x%08x\n", hr); + while (table->clsid) + { + if (!is_clsid_supported(table->clsid, &IID_IXMLDOMDocument)) + { + table++; + continue; + } - IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); + hr = CoCreateInstance(table->clsid, NULL, CLSCTX_INPROC_SERVER, &IID_IXMLDOMDocument, (void**)&doc); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); - ok(hr == S_OK, "got 0x%08x\n", hr); + hr = IXMLDOMDocument_createNode(doc, v, _bstr_("name"), NULL, &node); + ok(hr == S_OK, "got 0x%08x\n", hr); - hr = IXMLDOMText_get_data(text, &get_data); - ok(hr == S_OK, "got 0x%08x\n", hr); -todo_wine - ok(!lstrcmpW(get_data, _bstr_("\n")), "got %s\n", wine_dbgstr_w(get_data)); - SysFreeString(get_data); + IXMLDOMNode_QueryInterface(node, &IID_IXMLDOMText, (void**)&text); - hr = IXMLDOMText_get_xml(text, &get_data); - ok(hr == S_OK, "got 0x%08x\n", hr); - ok(!lstrcmpW(get_data, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(get_data)); - SysFreeString(get_data); + /* \r\n is normalized to \n and back to \r\n */ - IXMLDOMText_Release(text); - IXMLDOMNode_Release(node); + hr = IXMLDOMText_put_data(text, _bstr_("\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); - IXMLDOMDocument_Release(doc); - free_bstrs(); + hr = IXMLDOMText_get_data(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 1, "got %d, expected 1\n", length); + + hr = IXMLDOMText_get_xml(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\r\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* \r\r\n is normalized to \n\n and back to \r\n\r\n */ + + hr = IXMLDOMText_put_data(text, _bstr_("\r\r\n")); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMText_get_data(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\n\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMText_get_length(text, &length); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(length == 2, "got %d, expected 2\n", length); + + hr = IXMLDOMText_get_xml(text, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("\r\n\r\n")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* the same normalizations are applied when loading a document as a whole */ + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?><root>foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* even if xml:space="preserve" */ + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?>" + "<root xml:space=\"preserve\">foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n" + "<root xml:space=\"preserve\">foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + /* or preserveWhiteSpace is set */ + + hr = IXMLDOMDocument_put_preserveWhiteSpace(doc, VARIANT_TRUE); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_loadXML(doc, _bstr_("<?xml version=\"1.0\"?><root>foo\n\r\n\r\r\nbar</root>"), &b); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = IXMLDOMDocument_get_text(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(!lstrcmpW(s, _bstr_("foo\n\n\n\nbar")), "got %s\n", wine_dbgstr_w(s)); + SysFreeString(s); + + hr = IXMLDOMDocument_get_xml(doc, &s); + ok(hr == S_OK, "got 0x%08x\n", hr); + if (IsEqualGUID(table->clsid, &CLSID_DOMDocument60)) + { + /* DOMDocument60 does the newline normalization but does not insert line breaks around the root node */ +todo_wine + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?><root>foo\r\n\r\n\r\n\r\nbar</root>")), + "got %s\n", wine_dbgstr_w(s)); + } + else + { + ok(!lstrcmpW(s, _bstr_("<?xml version=\"1.0\"?>\r\n<root>foo\r\n\r\n\r\n\r\nbar</root>\r\n")), + "got %s\n", wine_dbgstr_w(s)); + } + SysFreeString(s); + + IXMLDOMText_Release(text); + IXMLDOMNode_Release(node); + IXMLDOMDocument_Release(doc); + free_bstrs(); + table++; + } } static void test_putref_schemas(void) @@ -12754,6 +12868,7 @@ START_TEST(domdoc) test_nodeValue(); test_get_namespaces(); test_put_data(); + test_newline_normalization(); test_putref_schemas(); test_namedmap_newenum(); test_xmlns_attribute(); diff --git a/dlls/msxml3/text.c b/dlls/msxml3/text.c index 3a12d4b..abd89db 100644 --- a/dlls/msxml3/text.c +++ b/dlls/msxml3/text.c @@ -522,7 +522,7 @@ static HRESULT WINAPI domtext_get_xml( TRACE("(%p)->(%p)\n", This, p); - return node_get_xml(&This->node, FALSE, p); + return node_get_xml(&This->node, TRUE, p); } static HRESULT WINAPI domtext_transformNode( @@ -616,15 +616,35 @@ static HRESULT WINAPI domtext_put_data( BSTR data) { domtext *This = impl_from_IXMLDOMText( iface ); - static const WCHAR rnW[] = {'\r','\n',0}; + BSTR normalized_data = NULL; + HRESULT hr; + size_t i, j; TRACE("(%p)->(%s)\n", This, debugstr_w(data)); - if (data && !strcmpW(rnW, data)) - This->node.node->name = xmlStringTextNoenc; - else - domtext_reset_noenc(This); - return node_set_content(&This->node, data); + if (data) + { + /* normalize line endings */ + normalized_data = SysAllocStringLen(NULL, SysStringLen(data)); + if (!normalized_data) return E_OUTOFMEMORY; + for (i = 0, j = 0; data[i]; i++) + { + if (data[i] == '\r') + { + if (data[i + 1] == '\n') i++; /* change \r\n to just \n */ + normalized_data[j++] = '\n'; /* change \r by itself to \n */ + } + else + normalized_data[j++] = data[i]; + } + normalized_data[j] = 0; + } + + domtext_reset_noenc(This); + hr = node_set_content(&This->node, normalized_data); + + SysFreeString(normalized_data); + return hr; } static HRESULT WINAPI domtext_get_length(

1 0

Nikolay Sivov : shell32: Use global memory allocation helpers.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: e3b200bd8a439a9e4b4d4313bb1551de8ef35dfc URL: https://source.winehq.org/git/wine.git/?a=commit;h=e3b200bd8a439a9e4b4d4313… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 22 10:43:28 2018 +0300 shell32: Use global memory allocation helpers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/assoc.c | 36 +++++----- dlls/shell32/autocomplete.c | 33 +++++---- dlls/shell32/brsfolder.c | 12 ++-- dlls/shell32/control.c | 24 +++---- dlls/shell32/dataobject.c | 9 ++- dlls/shell32/dde.c | 58 +++++++-------- dlls/shell32/dialogs.c | 32 ++++----- dlls/shell32/ebrowser.c | 15 ++-- dlls/shell32/enumidlist.c | 4 +- dlls/shell32/folders.c | 13 ++-- dlls/shell32/iconcache.c | 26 +++---- dlls/shell32/pidl.c | 4 +- dlls/shell32/shell32_main.c | 24 +++---- dlls/shell32/shell32_main.h | 7 +- dlls/shell32/shelldispatch.c | 40 +++++------ dlls/shell32/shellitem.c | 38 +++++----- dlls/shell32/shelllink.c | 151 +++++++++++++++++++--------------------- dlls/shell32/shellole.c | 16 ++--- dlls/shell32/shellord.c | 16 ++--- dlls/shell32/shellpath.c | 64 ++++++++--------- dlls/shell32/shfldr_fs.c | 7 +- dlls/shell32/shfldr_netplaces.c | 4 +- dlls/shell32/shfldr_unixfs.c | 34 ++++----- dlls/shell32/shlexec.c | 90 ++++++++++++------------ dlls/shell32/shlfileop.c | 50 ++++++------- dlls/shell32/shlfsbind.c | 6 +- dlls/shell32/shlmenu.c | 31 +++++---- dlls/shell32/shlview.c | 8 +-- dlls/shell32/shlview_cmenu.c | 6 +- dlls/shell32/systray.c | 5 +- dlls/shell32/trash.c | 33 +++++---- dlls/shell32/xdg.c | 19 ++--- 32 files changed, 451 insertions(+), 464 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e3b200bd8a439a9e4b4d…

1 0

Owen Rudge : include: Define ipv6_mreq structure.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 3211de48397ea9f1f02865175c1826a7f7866a19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3211de48397ea9f1f0286517… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Feb 19 22:46:48 2018 +0000 include: Define ipv6_mreq structure. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/ws2ipdef.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/include/ws2ipdef.h b/include/ws2ipdef.h index e13cf6e..e4cbce1 100644 --- a/include/ws2ipdef.h +++ b/include/ws2ipdef.h @@ -152,6 +152,12 @@ typedef struct WS(ip_mreq) struct WS(in_addr) imr_interface; } WS(IP_MREQ), *WS(PIP_MREQ); +typedef struct WS(ipv6_mreq) +{ + struct WS(in6_addr) ipv6mr_multiaddr; + unsigned int ipv6mr_interface; +} WS(IPV6_MREQ), *WS(PIPV6_MREQ); + typedef struct WS(ip_mreq_source) { struct WS(in_addr) imr_multiaddr; struct WS(in_addr) imr_sourceaddr;

1 0

Owen Rudge : wsdapi/tests: Add test for Publish.
by Alexandre Julliard 22 Feb '18

22 Feb '18

Module: wine Branch: master Commit: 233d8244aebc7b23082b386004aaf27733c6dc6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=233d8244aebc7b23082b3860… Author: Owen Rudge <orudge(a)codeweavers.com> Date: Mon Feb 19 22:47:04 2018 +0000 wsdapi/tests: Add test for Publish. Signed-off-by: Owen Rudge <orudge(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wsdapi/tests/Makefile.in | 2 +- dlls/wsdapi/tests/discovery.c | 359 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 357 insertions(+), 4 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=233d8244aebc7b23082b…

1 0