[PATCH v6 4/5] mshtml: Always use the event target dispex.

[Brendan McGrath]

From: Brendan McGrath

The event target may be from a different document to the document associated with the
event handler.
---
 dlls/mshtml/nsevents.c  | 2 +-
 dlls/mshtml/tests/dom.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/dlls/mshtml/nsevents.c b/dlls/mshtml/nsevents.c
index ec4d1f6694a..daac94dd368 100644
--- a/dlls/mshtml/nsevents.c
+++ b/dlls/mshtml/nsevents.c
@@ -444,7 +444,7 @@ static nsresult handle_htmlevent(HTMLDocumentNode *doc, nsIDOMEvent *nsevent)
         target = &node->event_target;
     }

-    hres = create_event_from_nsevent(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), &event);
+    hres = create_event_from_nsevent(nsevent, dispex_compat_mode(&target->dispex), &event);
     if(FAILED(hres)) {
         IEventTarget_Release(&target->IEventTarget_iface);
         return NS_OK;
diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c
index 0b0d826aaa1..8383f167cdd 100644
--- a/dlls/mshtml/tests/dom.c
+++ b/dlls/mshtml/tests/dom.c
@@ -12084,18 +12084,14 @@ static void test_document_mode_after_initnew(void)
     }

hres = IHTMLDocument2_QueryInterface(doc, &IID_IEventTarget, (void**)&event_target);
-    todo_wine
     ok(hres == S_OK, "QueryInterface(IID_IEventTarget) returned %08lx.\n", hres);
-    todo_wine
     ok(event_target != NULL, "event_target == NULL\n");
-    if (event_target != NULL)
-        IEventTarget_Release(event_target);
+    IEventTarget_Release(event_target);

V_VT(&var) = VT_EMPTY;
     hres = IHTMLDocument6_get_documentMode(doc6, &var);
     ok(hres == S_OK, "get_documentMode failed: %08lx\n", hres);
     ok(V_VT(&var) == VT_R4, "V_VT(documentMode) = %u\n", V_VT(&var));
-    todo_wine
     ok(V_R4(&var) == 9, "documentMode = %f, expected 9\n", V_R4(&var));
     IHTMLDocument6_Release(doc6);
     VariantClear(&var);