mshtml: Expose IEventTarget on HTMLDocumentObj and forward it to the doc node.

Signed-off-by: Gabriel Ivăncescu <gabrielopcode@gmail.com>

mshtml: Expose IEventTarget on HTMLDocumentObj and forward it to the doc node.
cab7ce59 · Gabriel Ivăncescu · Alexandre Julliard · 7359226a · cab7ce59 · cab7ce59
Commit cab7ce59 authored Nov 14, 2022 by Gabriel Ivăncescu Committed by Alexandre Julliard Nov 14, 2022
6 changed files
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -677,6 +677,7 @@ struct HTMLDocumentObj {
    IObjectSafety IObjectSafety_iface;
    IServiceProvider IServiceProvider_iface;
    ITargetContainer ITargetContainer_iface;
+    IEventTarget IEventTarget_iface;

    IWindowForBindingUI IWindowForBindingUI_iface;


--- a/dlls/mshtml/oleobj.c
+++ b/dlls/mshtml/oleobj.c
@@ -3238,6 +3238,52 @@ static const IDocumentRangeVtbl DocObjDocumentRangeVtbl = {
    DocObjDocumentRange_createRange
 };

+/**********************************************************
+ * IEventTarget implementation
+ */
+static inline HTMLDocumentObj *impl_from_IEventTarget(IEventTarget *iface)
+{
+    return CONTAINING_RECORD(iface, HTMLDocumentObj, IEventTarget_iface);
+}
+
+HTMLDOCUMENTOBJ_IDISPATCH_METHODS(EventTarget)
+
+static HRESULT WINAPI DocObjEventTarget_addEventListener(IEventTarget *iface, BSTR type, IDispatch *listener,
+        VARIANT_BOOL capture)
+{
+    HTMLDocumentObj *This = impl_from_IEventTarget(iface);
+
+    return IEventTarget_addEventListener(&This->doc_node->node.event_target.IEventTarget_iface, type, listener, capture);
+}
+
+static HRESULT WINAPI DocObjEventTarget_removeEventListener(IEventTarget *iface, BSTR type, IDispatch *listener,
+        VARIANT_BOOL capture)
+{
+    HTMLDocumentObj *This = impl_from_IEventTarget(iface);
+
+    return IEventTarget_removeEventListener(&This->doc_node->node.event_target.IEventTarget_iface, type, listener, capture);
+}
+
+static HRESULT WINAPI DocObjEventTarget_dispatchEvent(IEventTarget *iface, IDOMEvent *event_iface, VARIANT_BOOL *result)
+{
+    HTMLDocumentObj *This = impl_from_IEventTarget(iface);
+
+    return IEventTarget_dispatchEvent(&This->doc_node->node.event_target.IEventTarget_iface, event_iface, result);
+}
+
+static const IEventTargetVtbl DocObjEventTargetVtbl = {
+    DocObjEventTarget_QueryInterface,
+    DocObjEventTarget_AddRef,
+    DocObjEventTarget_Release,
+    DocObjEventTarget_GetTypeInfoCount,
+    DocObjEventTarget_GetTypeInfo,
+    DocObjEventTarget_GetIDsOfNames,
+    DocObjEventTarget_Invoke,
+    DocObjEventTarget_addEventListener,
+    DocObjEventTarget_removeEventListener,
+    DocObjEventTarget_dispatchEvent
+};
+
 static inline HTMLDocumentObj *impl_from_IUnknown(IUnknown *iface)
 {
    return CONTAINING_RECORD(iface, HTMLDocumentObj, IUnknown_inner);
@@ -3339,6 +3385,14 @@ static HRESULT WINAPI HTMLDocumentObj_QueryInterface(IUnknown *iface, REFIID rii
        *ppv = &This->ITargetContainer_iface;
    }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) {
        *ppv = &This->cp_container.IConnectionPointContainer_iface;
+    }else if(IsEqualGUID(&IID_IEventTarget, riid)) {
+        /* IEventTarget is conditionally exposed. This breaks COM rules when
+           it changes its compat mode, but it is how native works (see tests). */
+        if(!This->doc_node || dispex_compat_mode(&This->doc_node->node.event_target.dispex) < COMPAT_MODE_IE9) {
+            *ppv = NULL;
+            return E_NOINTERFACE;
+        }
+        *ppv = &This->IEventTarget_iface;
    }else if(IsEqualGUID(&CLSID_CMarkup, riid)) {
        FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv);
        *ppv = NULL;
@@ -3734,6 +3788,7 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii
    doc->IMarkupContainer_iface.lpVtbl = &DocObjMarkupContainerVtbl;
    doc->IDisplayServices_iface.lpVtbl = &DocObjDisplayServicesVtbl;
    doc->IDocumentRange_iface.lpVtbl = &DocObjDocumentRangeVtbl;
+    doc->IEventTarget_iface.lpVtbl = &DocObjEventTargetVtbl;

    doc->outer_unk = outer ? outer : &doc->IUnknown_inner;


--- a/dlls/mshtml/tests/doc_with_prop.html
+++ b/dlls/mshtml/tests/doc_with_prop.html
+<html>
+<script type="text/javascript">document.prop = 137;</script>
+</html>
--- a/dlls/mshtml/tests/doc_with_prop_ie9.html
+++ b/dlls/mshtml/tests/doc_with_prop_ie9.html
+<html><head>
+<meta http-equiv="x-ua-compatible" content="IE=9" />
+<script type="text/javascript">document.prop = 137;</script>
+</head></html>
--- a/dlls/mshtml/tests/events.c
+++ b/dlls/mshtml/tests/events.c
--- a/dlls/mshtml/tests/rsrc.rc
+++ b/dlls/mshtml/tests/rsrc.rc
@@ -73,6 +73,12 @@ blank2.html HTML "blank.html"
 /* @makedep: blank.html */
 123 HTML "blank.html"

+/* @makedep: doc_with_prop.html */
+doc_with_prop.html HTML "doc_with_prop.html"
+
+/* @makedep: doc_with_prop_ie9.html */
+doc_with_prop_ie9.html HTML "doc_with_prop_ie9.html"
+
 /* For res: protocol test: */

 /* @makedep: jstest.html */