Gabriel Ivăncescu : mshtml: Dispatch Gecko events to the window if there's no node.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 7d85bd5dde9d35511e41abfc32e743025618ae4c
URL:    https://gitlab.winehq.org/wine/wine/-/commit/7d85bd5dde9d35511e41abfc32e7430...

Author: Gabriel Ivăncescu 
Date:   Fri Nov 18 17:20:27 2022 +0200

mshtml: Dispatch Gecko events to the window if there's no node.

The window itself is not a DOM node, so this is perfectly normal to fail
here. In fact, we weren't dispatching any gecko events sent to the window.

Signed-off-by: Gabriel Ivăncescu

---

dlls/mshtml/nsevents.c | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c
index 65de8c8c2e3..305a017d978 100644
--- a/dlls/mshtml/nsevents.c
+++ b/dlls/mshtml/nsevents.c
@@ -287,8 +287,8 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *
     nsEventListener *This = impl_from_nsIDOMEventListener(iface);
     HTMLDocumentNode *doc = This->This->doc;
     nsIDOMEventTarget *event_target;
+    EventTarget *target;
     nsIDOMNode *nsnode;
-    HTMLDOMNode *node;
     DOMEvent *event;
     nsresult nsres;
     HRESULT hres;
@@ -309,18 +309,22 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *
     nsres = nsIDOMEventTarget_QueryInterface(event_target, &IID_nsIDOMNode, (void**)&nsnode);
     nsIDOMEventTarget_Release(event_target);
     if(NS_FAILED(nsres)) {
-        ERR("Could not get nsIDOMNode: %08lx\n", nsres);
-        return NS_OK;
+        if(!doc->window)
+            return S_OK;
+        target = &doc->window->event_target;
+        IHTMLWindow2_AddRef(&doc->window->base.IHTMLWindow2_iface);
+    }else {
+        HTMLDOMNode *node;
+        hres = get_node(nsnode, TRUE, &node);
+        nsIDOMNode_Release(nsnode);
+        if(FAILED(hres))
+            return NS_OK;
+        target = &node->event_target;
     }

-    hres = get_node(nsnode, TRUE, &node);
-    nsIDOMNode_Release(nsnode);
-    if(FAILED(hres))
-        return NS_OK;
-
     hres = create_event_from_nsevent(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), &event);
     if(FAILED(hres)) {
-        node_release(node);
+        IEventTarget_Release(&target->IEventTarget_iface);
         return NS_OK;
     }

@@ -330,15 +334,15 @@ static nsresult NSAPI handle_htmlevent(nsIDOMEventListener *iface, nsIDOMEvent *

hres = create_document_event(doc, event->event_id == EVENTID_FOCUS ? EVENTID_FOCUSIN : EVENTID_FOCUSOUT, &focus_event);
         if(SUCCEEDED(hres)) {
-            dispatch_event(&node->event_target, focus_event);
+            dispatch_event(target, focus_event);
             IDOMEvent_Release(&focus_event->IDOMEvent_iface);
         }
     }

-    dispatch_event(&node->event_target, event);
+    dispatch_event(target, event);

IDOMEvent_Release(&event->IDOMEvent_iface);
-    node_release(node);
+    IEventTarget_Release(&target->IEventTarget_iface);
     return NS_OK;
 }