[PATCH 7/7] mshtml: Move the IHTMLDocument7 interface out of basedoc.

[Gabriel Ivăncescu]

From: Gabriel Ivăncescu

Signed-off-by: Gabriel Ivăncescu 
---
 dlls/mshtml/htmldoc.c        | 1070 +++++++++++++++++++++-------------
 dlls/mshtml/htmlevent.h      |    8 +-
 dlls/mshtml/mshtml_private.h |    3 +-
 dlls/mshtml/omnavigator.c    |    2 +-
 4 files changed, 667 insertions(+), 416 deletions(-)

diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index 4a55bb38180..ec62c378ff7 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -554,7 +554,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_Script(IHTMLDocument2 *iface, IDi

TRACE("(%p)->(%p)\n", This, p);

-    hres = IHTMLDocument7_get_parentWindow(&This->basedoc.IHTMLDocument7_iface, (IHTMLWindow2**)p);
+    hres = IHTMLDocument7_get_parentWindow(&This->IHTMLDocument7_iface, (IHTMLWindow2**)p);
     return hres == S_OK && !*p ? E_PENDING : hres;
 }

@@ -1298,7 +1298,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_charset(IHTMLDocument2 *iface, BS

TRACE("(%p)->(%p)\n", This, p);

-    return IHTMLDocument7_get_characterSet(&This->basedoc.IHTMLDocument7_iface, p);
+    return IHTMLDocument7_get_characterSet(&This->IHTMLDocument7_iface, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_put_defaultCharset(IHTMLDocument2 *iface, BSTR v)
@@ -1683,7 +1683,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_put_onclick(IHTMLDocument2 *iface, VA

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_CLICK, &v);
+    return set_doc_event(This, EVENTID_CLICK, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_get_onclick(IHTMLDocument2 *iface, VARIANT *p)
@@ -1692,7 +1692,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_onclick(IHTMLDocument2 *iface, VA

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_CLICK, p);
+    return get_doc_event(This, EVENTID_CLICK, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_put_ondblclick(IHTMLDocument2 *iface, VARIANT v)
@@ -1701,7 +1701,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_put_ondblclick(IHTMLDocument2 *iface,

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_DBLCLICK, &v);
+    return set_doc_event(This, EVENTID_DBLCLICK, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_get_ondblclick(IHTMLDocument2 *iface, VARIANT *p)
@@ -1710,7 +1710,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_ondblclick(IHTMLDocument2 *iface,

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_DBLCLICK, p);
+    return get_doc_event(This, EVENTID_DBLCLICK, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_put_onkeyup(IHTMLDocument2 *iface, VARIANT v)
@@ -1719,7 +1719,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_put_onkeyup(IHTMLDocument2 *iface, VA

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_KEYUP, &v);
+    return set_doc_event(This, EVENTID_KEYUP, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_get_onkeyup(IHTMLDocument2 *iface, VARIANT *p)
@@ -1728,7 +1728,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_onkeyup(IHTMLDocument2 *iface, VA

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_KEYUP, p);
+    return get_doc_event(This, EVENTID_KEYUP, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_put_onkeydown(IHTMLDocument2 *iface, VARIANT v)
@@ -1737,7 +1737,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_put_onkeydown(IHTMLDocument2 *iface,

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_KEYDOWN, &v);
+    return set_doc_event(This, EVENTID_KEYDOWN, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_get_onkeydown(IHTMLDocument2 *iface, VARIANT *p)
@@ -1746,7 +1746,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_onkeydown(IHTMLDocument2 *iface,

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_KEYDOWN, p);
+    return get_doc_event(This, EVENTID_KEYDOWN, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_put_onkeypress(IHTMLDocument2 *iface, VARIANT v)
@@ -1755,7 +1755,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_put_onkeypress(IHTMLDocument2 *iface,

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_KEYPRESS, &v);
+    return set_doc_event(This, EVENTID_KEYPRESS, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_get_onkeypress(IHTMLDocument2 *iface, VARIANT *p)
@@ -1764,7 +1764,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_onkeypress(IHTMLDocument2 *iface,

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_KEYPRESS, p);
+    return get_doc_event(This, EVENTID_KEYPRESS, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_put_onmouseup(IHTMLDocument2 *iface, VARIANT v)
@@ -1773,7 +1773,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_put_onmouseup(IHTMLDocument2 *iface,

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_MOUSEUP, &v);
+    return set_doc_event(This, EVENTID_MOUSEUP, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_get_onmouseup(IHTMLDocument2 *iface, VARIANT *p)
@@ -1782,7 +1782,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_onmouseup(IHTMLDocument2 *iface,

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_MOUSEUP, p);
+    return get_doc_event(This, EVENTID_MOUSEUP, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_put_onmousedown(IHTMLDocument2 *iface, VARIANT v)
@@ -1791,7 +1791,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_put_onmousedown(IHTMLDocument2 *iface

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_MOUSEDOWN, &v);
+    return set_doc_event(This, EVENTID_MOUSEDOWN, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_get_onmousedown(IHTMLDocument2 *iface, VARIANT *p)
@@ -1800,7 +1800,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_onmousedown(IHTMLDocument2 *iface

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_MOUSEDOWN, p);
+    return get_doc_event(This, EVENTID_MOUSEDOWN, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_put_onmousemove(IHTMLDocument2 *iface, VARIANT v)
@@ -1809,7 +1809,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_put_onmousemove(IHTMLDocument2 *iface

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_MOUSEMOVE, &v);
+    return set_doc_event(This, EVENTID_MOUSEMOVE, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_get_onmousemove(IHTMLDocument2 *iface, VARIANT *p)
@@ -1818,7 +1818,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_onmousemove(IHTMLDocument2 *iface

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_MOUSEMOVE, p);
+    return get_doc_event(This, EVENTID_MOUSEMOVE, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_put_onmouseout(IHTMLDocument2 *iface, VARIANT v)
@@ -1827,7 +1827,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_put_onmouseout(IHTMLDocument2 *iface,

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_MOUSEOUT, &v);
+    return set_doc_event(This, EVENTID_MOUSEOUT, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_get_onmouseout(IHTMLDocument2 *iface, VARIANT *p)
@@ -1836,7 +1836,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_onmouseout(IHTMLDocument2 *iface,

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_MOUSEOUT, p);
+    return get_doc_event(This, EVENTID_MOUSEOUT, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_put_onmouseover(IHTMLDocument2 *iface, VARIANT v)
@@ -1845,7 +1845,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_put_onmouseover(IHTMLDocument2 *iface

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_MOUSEOVER, &v);
+    return set_doc_event(This, EVENTID_MOUSEOVER, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_get_onmouseover(IHTMLDocument2 *iface, VARIANT *p)
@@ -1854,7 +1854,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_onmouseover(IHTMLDocument2 *iface

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_MOUSEOVER, p);
+    return get_doc_event(This, EVENTID_MOUSEOVER, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_put_onreadystatechange(IHTMLDocument2 *iface, VARIANT v)
@@ -1863,7 +1863,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_put_onreadystatechange(IHTMLDocument2

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_READYSTATECHANGE, &v);
+    return set_doc_event(This, EVENTID_READYSTATECHANGE, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_get_onreadystatechange(IHTMLDocument2 *iface, VARIANT *p)
@@ -1872,7 +1872,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_onreadystatechange(IHTMLDocument2

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_READYSTATECHANGE, p);
+    return get_doc_event(This, EVENTID_READYSTATECHANGE, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_put_onafterupdate(IHTMLDocument2 *iface, VARIANT v)
@@ -1923,7 +1923,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_put_ondragstart(IHTMLDocument2 *iface

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_DRAGSTART, &v);
+    return set_doc_event(This, EVENTID_DRAGSTART, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_get_ondragstart(IHTMLDocument2 *iface, VARIANT *p)
@@ -1932,7 +1932,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_ondragstart(IHTMLDocument2 *iface

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_DRAGSTART, p);
+    return get_doc_event(This, EVENTID_DRAGSTART, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_put_onselectstart(IHTMLDocument2 *iface, VARIANT v)
@@ -1941,7 +1941,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_put_onselectstart(IHTMLDocument2 *ifa

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_SELECTSTART, &v);
+    return set_doc_event(This, EVENTID_SELECTSTART, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_get_onselectstart(IHTMLDocument2 *iface, VARIANT *p)
@@ -1950,7 +1950,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_onselectstart(IHTMLDocument2 *ifa

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_SELECTSTART, p);
+    return get_doc_event(This, EVENTID_SELECTSTART, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument2_elementFromPoint(IHTMLDocument2 *iface, LONG x, LONG y,
@@ -1991,7 +1991,7 @@ static HRESULT WINAPI DocNodeHTMLDocument2_get_parentWindow(IHTMLDocument2 *ifac

TRACE("(%p)->(%p)\n", This, p);

-    hres = IHTMLDocument7_get_defaultView(&This->basedoc.IHTMLDocument7_iface, p);
+    hres = IHTMLDocument7_get_defaultView(&This->IHTMLDocument7_iface, p);
     return hres == S_OK && !*p ? E_FAIL : hres;
 }

@@ -2251,7 +2251,7 @@ static HRESULT WINAPI DocObjHTMLDocument2_get_Script(IHTMLDocument2 *iface, IDis

TRACE("(%p)->(%p)\n", This, p);

-    hres = IHTMLDocument7_get_parentWindow(&This->basedoc.IHTMLDocument7_iface, (IHTMLWindow2**)p);
+    hres = IHTMLDocument7_get_parentWindow(&This->IHTMLDocument7_iface, (IHTMLWindow2**)p);
     return hres == S_OK && !*p ? E_PENDING : hres;
 }

@@ -2626,7 +2626,7 @@ static HRESULT WINAPI DocObjHTMLDocument2_get_parentWindow(IHTMLDocument2 *iface

TRACE("(%p)->(%p)\n", This, p);

-    hres = IHTMLDocument7_get_defaultView(&This->basedoc.IHTMLDocument7_iface, p);
+    hres = IHTMLDocument7_get_defaultView(&This->IHTMLDocument7_iface, p);
     return hres == S_OK && !*p ? E_FAIL : hres;
 }

@@ -3081,7 +3081,7 @@ static HRESULT WINAPI DocNodeHTMLDocument3_put_oncontextmenu(IHTMLDocument3 *ifa

TRACE("(%p)->()\n", This);

-    return set_doc_event(&This->basedoc, EVENTID_CONTEXTMENU, &v);
+    return set_doc_event(This, EVENTID_CONTEXTMENU, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument3_get_oncontextmenu(IHTMLDocument3 *iface, VARIANT *p)
@@ -3090,7 +3090,7 @@ static HRESULT WINAPI DocNodeHTMLDocument3_get_oncontextmenu(IHTMLDocument3 *ifa

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_CONTEXTMENU, p);
+    return get_doc_event(This, EVENTID_CONTEXTMENU, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument3_put_onstop(IHTMLDocument3 *iface, VARIANT v)
@@ -3637,7 +3637,7 @@ static HRESULT WINAPI DocNodeHTMLDocument4_put_onselectionchange(IHTMLDocument4

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_SELECTIONCHANGE, &v);
+    return set_doc_event(This, EVENTID_SELECTIONCHANGE, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument4_get_onselectionchange(IHTMLDocument4 *iface, VARIANT *p)
@@ -3646,7 +3646,7 @@ static HRESULT WINAPI DocNodeHTMLDocument4_get_onselectionchange(IHTMLDocument4

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_SELECTIONCHANGE, p);
+    return get_doc_event(This, EVENTID_SELECTIONCHANGE, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument4_get_namespaces(IHTMLDocument4 *iface, IDispatch **p)
@@ -3920,7 +3920,7 @@ static HRESULT WINAPI DocNodeHTMLDocument5_put_onmousewheel(IHTMLDocument5 *ifac

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_MOUSEWHEEL, &v);
+    return set_doc_event(This, EVENTID_MOUSEWHEEL, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument5_get_onmousewheel(IHTMLDocument5 *iface, VARIANT *p)
@@ -3929,7 +3929,7 @@ static HRESULT WINAPI DocNodeHTMLDocument5_get_onmousewheel(IHTMLDocument5 *ifac

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_MOUSEWHEEL, p);
+    return get_doc_event(This, EVENTID_MOUSEWHEEL, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument5_get_doctype(IHTMLDocument5 *iface, IHTMLDOMNode **p)
@@ -4039,7 +4039,7 @@ static HRESULT WINAPI DocNodeHTMLDocument5_put_onfocusin(IHTMLDocument5 *iface,

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_FOCUSIN, &v);
+    return set_doc_event(This, EVENTID_FOCUSIN, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument5_get_onfocusin(IHTMLDocument5 *iface, VARIANT *p)
@@ -4048,7 +4048,7 @@ static HRESULT WINAPI DocNodeHTMLDocument5_get_onfocusin(IHTMLDocument5 *iface,

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_FOCUSIN, p);
+    return get_doc_event(This, EVENTID_FOCUSIN, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument5_put_onfocusout(IHTMLDocument5 *iface, VARIANT v)
@@ -4057,7 +4057,7 @@ static HRESULT WINAPI DocNodeHTMLDocument5_put_onfocusout(IHTMLDocument5 *iface,

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_FOCUSOUT, &v);
+    return set_doc_event(This, EVENTID_FOCUSOUT, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument5_get_onfocusout(IHTMLDocument5 *iface, VARIANT *p)
@@ -4066,7 +4066,7 @@ static HRESULT WINAPI DocNodeHTMLDocument5_get_onfocusout(IHTMLDocument5 *iface,

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_FOCUSOUT, p);
+    return get_doc_event(This, EVENTID_FOCUSOUT, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument5_put_onactivate(IHTMLDocument5 *iface, VARIANT v)
@@ -4308,7 +4308,7 @@ static HRESULT WINAPI DocNodeHTMLDocument6_get_onstorage(IHTMLDocument6 *iface,

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_STORAGE, p);
+    return get_doc_event(This, EVENTID_STORAGE, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument6_put_onstorage(IHTMLDocument6 *iface, VARIANT v)
@@ -4317,7 +4317,7 @@ static HRESULT WINAPI DocNodeHTMLDocument6_put_onstorage(IHTMLDocument6 *iface,

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_STORAGE, &v);
+    return set_doc_event(This, EVENTID_STORAGE, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument6_get_onstoragecommit(IHTMLDocument6 *iface,
@@ -4327,7 +4327,7 @@ static HRESULT WINAPI DocNodeHTMLDocument6_get_onstoragecommit(IHTMLDocument6 *i

TRACE("(%p)->(%p)\n", This, p);

-    return get_doc_event(&This->basedoc, EVENTID_STORAGECOMMIT, p);
+    return get_doc_event(This, EVENTID_STORAGECOMMIT, p);
 }

static HRESULT WINAPI DocNodeHTMLDocument6_put_onstoragecommit(IHTMLDocument6 *iface, VARIANT v)
@@ -4336,7 +4336,7 @@ static HRESULT WINAPI DocNodeHTMLDocument6_put_onstoragecommit(IHTMLDocument6 *i

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

-    return set_doc_event(&This->basedoc, EVENTID_STORAGECOMMIT, &v);
+    return set_doc_event(This, EVENTID_STORAGECOMMIT, &v);
 }

static HRESULT WINAPI DocNodeHTMLDocument6_getElementById(IHTMLDocument6 *iface,
@@ -4448,62 +4448,60 @@ static const IHTMLDocument6Vtbl DocObjHTMLDocument6Vtbl = {
     DocObjHTMLDocument6_updateSettings
 };

-static inline HTMLDocument *impl_from_IHTMLDocument7(IHTMLDocument7 *iface)
+static inline HTMLDocumentNode *HTMLDocumentNode_from_IHTMLDocument7(IHTMLDocument7 *iface)
 {
-    return CONTAINING_RECORD(iface, HTMLDocument, IHTMLDocument7_iface);
+    return CONTAINING_RECORD(iface, HTMLDocumentNode, IHTMLDocument7_iface);
 }

-static HRESULT WINAPI HTMLDocument7_QueryInterface(IHTMLDocument7 *iface, REFIID riid, void **ppv)
+static HRESULT WINAPI DocNodeHTMLDocument7_QueryInterface(IHTMLDocument7 *iface, REFIID riid, void **ppv)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
-    return htmldoc_query_interface(This, riid, ppv);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
+    return htmldoc_query_interface(&This->basedoc, riid, ppv);
 }

-static ULONG WINAPI HTMLDocument7_AddRef(IHTMLDocument7 *iface)
+static ULONG WINAPI DocNodeHTMLDocument7_AddRef(IHTMLDocument7 *iface)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
-    return htmldoc_addref(This);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
+    return htmldoc_addref(&This->basedoc);
 }

-static ULONG WINAPI HTMLDocument7_Release(IHTMLDocument7 *iface)
+static ULONG WINAPI DocNodeHTMLDocument7_Release(IHTMLDocument7 *iface)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
-    return htmldoc_release(This);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
+    return htmldoc_release(&This->basedoc);
 }

-static HRESULT WINAPI HTMLDocument7_GetTypeInfoCount(IHTMLDocument7 *iface, UINT *pctinfo)
+static HRESULT WINAPI DocNodeHTMLDocument7_GetTypeInfoCount(IHTMLDocument7 *iface, UINT *pctinfo)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
-    return IDispatchEx_GetTypeInfoCount(&This->IDispatchEx_iface, pctinfo);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
+    return IDispatchEx_GetTypeInfoCount(&This->basedoc.IDispatchEx_iface, pctinfo);
 }

-static HRESULT WINAPI HTMLDocument7_GetTypeInfo(IHTMLDocument7 *iface, UINT iTInfo,
-        LCID lcid, ITypeInfo **ppTInfo)
+static HRESULT WINAPI DocNodeHTMLDocument7_GetTypeInfo(IHTMLDocument7 *iface, UINT iTInfo, LCID lcid,
+        ITypeInfo **ppTInfo)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
-    return IDispatchEx_GetTypeInfo(&This->IDispatchEx_iface, iTInfo, lcid, ppTInfo);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
+    return IDispatchEx_GetTypeInfo(&This->basedoc.IDispatchEx_iface, iTInfo, lcid, ppTInfo);
 }

-static HRESULT WINAPI HTMLDocument7_GetIDsOfNames(IHTMLDocument7 *iface, REFIID riid,
-        LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId)
+static HRESULT WINAPI DocNodeHTMLDocument7_GetIDsOfNames(IHTMLDocument7 *iface, REFIID riid, LPOLESTR *rgszNames,
+        UINT cNames, LCID lcid, DISPID *rgDispId)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
-    return IDispatchEx_GetIDsOfNames(&This->IDispatchEx_iface, riid, rgszNames, cNames, lcid,
-            rgDispId);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
+    return IDispatchEx_GetIDsOfNames(&This->basedoc.IDispatchEx_iface, riid, rgszNames, cNames, lcid, rgDispId);
 }

-static HRESULT WINAPI HTMLDocument7_Invoke(IHTMLDocument7 *iface, DISPID dispIdMember,
-                            REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams,
-                            VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
+static HRESULT WINAPI DocNodeHTMLDocument7_Invoke(IHTMLDocument7 *iface, DISPID dispIdMember, REFIID riid, LCID lcid,
+        WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
-    return IDispatchEx_Invoke(&This->IDispatchEx_iface, dispIdMember, riid, lcid, wFlags,
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
+    return IDispatchEx_Invoke(&This->basedoc.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags,
             pDispParams, pVarResult, pExcepInfo, puArgErr);
 }

-static HRESULT WINAPI HTMLDocument7_get_defaultView(IHTMLDocument7 *iface, IHTMLWindow2 **p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_defaultView(IHTMLDocument7 *iface, IHTMLWindow2 **p)
 {
-    HTMLDocumentNode *This = impl_from_IHTMLDocument7(iface)->doc_node;
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

@@ -4516,31 +4514,31 @@ static HRESULT WINAPI HTMLDocument7_get_defaultView(IHTMLDocument7 *iface, IHTML
     return S_OK;
 }

-static HRESULT WINAPI HTMLDocument7_createCDATASection(IHTMLDocument7 *iface, BSTR text, IHTMLDOMNode **newCDATASectionNode)
+static HRESULT WINAPI DocNodeHTMLDocument7_createCDATASection(IHTMLDocument7 *iface, BSTR text, IHTMLDOMNode **newCDATASectionNode)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, newCDATASectionNode);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_getSelection(IHTMLDocument7 *iface, IHTMLSelection **ppIHTMLSelection)
+static HRESULT WINAPI DocNodeHTMLDocument7_getSelection(IHTMLDocument7 *iface, IHTMLSelection **ppIHTMLSelection)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, ppIHTMLSelection);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_getElementsByTagNameNS(IHTMLDocument7 *iface, VARIANT *pvarNS,
+static HRESULT WINAPI DocNodeHTMLDocument7_getElementsByTagNameNS(IHTMLDocument7 *iface, VARIANT *pvarNS,
         BSTR bstrLocalName, IHTMLElementCollection **pelColl)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s %s %p)\n", This, debugstr_variant(pvarNS), debugstr_w(bstrLocalName), pelColl);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_createElementNS(IHTMLDocument7 *iface, VARIANT *pvarNS, BSTR bstrTag, IHTMLElement **newElem)
+static HRESULT WINAPI DocNodeHTMLDocument7_createElementNS(IHTMLDocument7 *iface, VARIANT *pvarNS, BSTR bstrTag, IHTMLElement **newElem)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     nsIDOMElement *dom_element;
     HTMLElement *element;
     nsAString ns, tag;
@@ -4549,7 +4547,7 @@ static HRESULT WINAPI HTMLDocument7_createElementNS(IHTMLDocument7 *iface, VARIA

TRACE("(%p)->(%s %s %p)\n", This, debugstr_variant(pvarNS), debugstr_w(bstrTag), newElem);

-    if(!This->doc_node->nsdoc) {
+    if(!This->nsdoc) {
         FIXME("NULL nsdoc\n");
         return E_FAIL;
     }
@@ -4559,7 +4557,7 @@ static HRESULT WINAPI HTMLDocument7_createElementNS(IHTMLDocument7 *iface, VARIA

nsAString_InitDepend(&ns, pvarNS && V_VT(pvarNS) == VT_BSTR ? V_BSTR(pvarNS) : NULL);
     nsAString_InitDepend(&tag, bstrTag);
-    nsres = nsIDOMHTMLDocument_CreateElementNS(This->doc_node->nsdoc, &ns, &tag, &dom_element);
+    nsres = nsIDOMHTMLDocument_CreateElementNS(This->nsdoc, &ns, &tag, &dom_element);
     nsAString_Finish(&ns);
     nsAString_Finish(&tag);
     if(NS_FAILED(nsres)) {
@@ -4567,7 +4565,7 @@ static HRESULT WINAPI HTMLDocument7_createElementNS(IHTMLDocument7 *iface, VARIA
         return map_nsresult(nsres);
     }

-    hres = HTMLElement_Create(This->doc_node, (nsIDOMNode*)dom_element, FALSE, &element);
+    hres = HTMLElement_Create(This, (nsIDOMNode*)dom_element, FALSE, &element);
     nsIDOMElement_Release(dom_element);
     if(FAILED(hres))
         return hres;
@@ -4576,82 +4574,82 @@ static HRESULT WINAPI HTMLDocument7_createElementNS(IHTMLDocument7 *iface, VARIA
     return S_OK;
 }

-static HRESULT WINAPI HTMLDocument7_createAttributeNS(IHTMLDocument7 *iface, VARIANT *pvarNS,
+static HRESULT WINAPI DocNodeHTMLDocument7_createAttributeNS(IHTMLDocument7 *iface, VARIANT *pvarNS,
         BSTR bstrAttrName, IHTMLDOMAttribute **ppAttribute)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s %s %p)\n", This, debugstr_variant(pvarNS), debugstr_w(bstrAttrName), ppAttribute);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onmsthumbnailclick(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onmsthumbnailclick(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onmsthumbnailclick(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onmsthumbnailclick(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

return get_doc_event(This, EVENTID_MSTHUMBNAILCLICK, p);
 }

-static HRESULT WINAPI HTMLDocument7_get_characterSet(IHTMLDocument7 *iface, BSTR *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_characterSet(IHTMLDocument7 *iface, BSTR *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     nsAString charset_str;
     nsresult nsres;

TRACE("(%p)->(%p)\n", This, p);

-    if(!This->doc_node->nsdoc) {
+    if(!This->nsdoc) {
         FIXME("NULL nsdoc\n");
         return E_FAIL;
     }

nsAString_Init(&charset_str, NULL);
-    nsres = nsIDOMHTMLDocument_GetCharacterSet(This->doc_node->nsdoc, &charset_str);
+    nsres = nsIDOMHTMLDocument_GetCharacterSet(This->nsdoc, &charset_str);
     return return_nsstr(nsres, &charset_str, p);
 }

-static HRESULT WINAPI HTMLDocument7_createElement(IHTMLDocument7 *iface, BSTR bstrTag, IHTMLElement **newElem)
+static HRESULT WINAPI DocNodeHTMLDocument7_createElement(IHTMLDocument7 *iface, BSTR bstrTag, IHTMLElement **newElem)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrTag), newElem);

-    return IHTMLDocument2_createElement(&This->doc_node->IHTMLDocument2_iface, bstrTag, newElem);
+    return IHTMLDocument2_createElement(&This->IHTMLDocument2_iface, bstrTag, newElem);
 }

-static HRESULT WINAPI HTMLDocument7_createAttribute(IHTMLDocument7 *iface, BSTR bstrAttrName, IHTMLDOMAttribute **ppAttribute)
+static HRESULT WINAPI DocNodeHTMLDocument7_createAttribute(IHTMLDocument7 *iface, BSTR bstrAttrName, IHTMLDOMAttribute **ppAttribute)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrAttrName), ppAttribute);

-    return IHTMLDocument5_createAttribute(&This->doc_node->IHTMLDocument5_iface, bstrAttrName, ppAttribute);
+    return IHTMLDocument5_createAttribute(&This->IHTMLDocument5_iface, bstrAttrName, ppAttribute);
 }

-static HRESULT WINAPI HTMLDocument7_getElementsByClassName(IHTMLDocument7 *iface, BSTR v, IHTMLElementCollection **pel)
+static HRESULT WINAPI DocNodeHTMLDocument7_getElementsByClassName(IHTMLDocument7 *iface, BSTR v, IHTMLElementCollection **pel)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     nsIDOMNodeList *nslist;
     nsAString nsstr;
     nsresult nsres;

TRACE("(%p)->(%s %p)\n", This, debugstr_w(v), pel);

-    if(!This->doc_node->nsdoc) {
+    if(!This->nsdoc) {
         FIXME("NULL nsdoc not supported\n");
         return E_NOTIMPL;
     }

nsAString_InitDepend(&nsstr, v);
-    nsres = nsIDOMHTMLDocument_GetElementsByClassName(This->doc_node->nsdoc, &nsstr, &nslist);
+    nsres = nsIDOMHTMLDocument_GetElementsByClassName(This->nsdoc, &nsstr, &nslist);
     nsAString_Finish(&nsstr);
     if(FAILED(nsres)) {
         ERR("GetElementByClassName failed: %08lx\n", nsres);
@@ -4659,699 +4657,699 @@ static HRESULT WINAPI HTMLDocument7_getElementsByClassName(IHTMLDocument7 *iface
     }

-    *pel = create_collection_from_nodelist(nslist, This->doc_node->document_mode);
+    *pel = create_collection_from_nodelist(nslist, This->document_mode);
     nsIDOMNodeList_Release(nslist);
     return S_OK;
 }

-static HRESULT WINAPI HTMLDocument7_createProcessingInstruction(IHTMLDocument7 *iface, BSTR target,
+static HRESULT WINAPI DocNodeHTMLDocument7_createProcessingInstruction(IHTMLDocument7 *iface, BSTR target,
         BSTR data, IDOMProcessingInstruction **newProcessingInstruction)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s %s %p)\n", This, debugstr_w(target), debugstr_w(data), newProcessingInstruction);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_adoptNode(IHTMLDocument7 *iface, IHTMLDOMNode *pNodeSource, IHTMLDOMNode3 **ppNodeDest)
+static HRESULT WINAPI DocNodeHTMLDocument7_adoptNode(IHTMLDocument7 *iface, IHTMLDOMNode *pNodeSource, IHTMLDOMNode3 **ppNodeDest)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p %p)\n", This, pNodeSource, ppNodeDest);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onmssitemodejumplistitemremoved(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onmssitemodejumplistitemremoved(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onmssitemodejumplistitemremoved(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onmssitemodejumplistitemremoved(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_all(IHTMLDocument7 *iface, IHTMLElementCollection **p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_all(IHTMLDocument7 *iface, IHTMLElementCollection **p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

-    return IHTMLDocument2_get_all(&This->doc_node->IHTMLDocument2_iface, p);
+    return IHTMLDocument2_get_all(&This->IHTMLDocument2_iface, p);
 }

-static HRESULT WINAPI HTMLDocument7_get_inputEncoding(IHTMLDocument7 *iface, BSTR *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_inputEncoding(IHTMLDocument7 *iface, BSTR *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_xmlEncoding(IHTMLDocument7 *iface, BSTR *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_xmlEncoding(IHTMLDocument7 *iface, BSTR *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_xmlStandalone(IHTMLDocument7 *iface, VARIANT_BOOL v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_xmlStandalone(IHTMLDocument7 *iface, VARIANT_BOOL v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%x)\n", This, v);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_xmlStandalone(IHTMLDocument7 *iface, VARIANT_BOOL *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_xmlStandalone(IHTMLDocument7 *iface, VARIANT_BOOL *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_xmlVersion(IHTMLDocument7 *iface, BSTR v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_xmlVersion(IHTMLDocument7 *iface, BSTR v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_w(v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_xmlVersion(IHTMLDocument7 *iface, BSTR *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_xmlVersion(IHTMLDocument7 *iface, BSTR *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_hasAttributes(IHTMLDocument7 *iface, VARIANT_BOOL *pfHasAttributes)
+static HRESULT WINAPI DocNodeHTMLDocument7_hasAttributes(IHTMLDocument7 *iface, VARIANT_BOOL *pfHasAttributes)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, pfHasAttributes);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onabort(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onabort(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

return set_doc_event(This, EVENTID_ABORT, &v);
 }

-static HRESULT WINAPI HTMLDocument7_get_onabort(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onabort(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

return get_doc_event(This, EVENTID_ABORT, p);
 }

-static HRESULT WINAPI HTMLDocument7_put_onblur(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onblur(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

return set_doc_event(This, EVENTID_BLUR, &v);
 }

-static HRESULT WINAPI HTMLDocument7_get_onblur(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onblur(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

return get_doc_event(This, EVENTID_BLUR, p);
 }

-static HRESULT WINAPI HTMLDocument7_put_oncanplay(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_oncanplay(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_oncanplay(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_oncanplay(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_oncanplaythrough(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_oncanplaythrough(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_oncanplaythrough(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_oncanplaythrough(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onchange(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onchange(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

return set_doc_event(This, EVENTID_CHANGE, &v);
 }

-static HRESULT WINAPI HTMLDocument7_get_onchange(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onchange(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

return get_doc_event(This, EVENTID_CHANGE, p);
 }

-static HRESULT WINAPI HTMLDocument7_put_ondrag(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_ondrag(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

return set_doc_event(This, EVENTID_DRAG, &v);
 }

-static HRESULT WINAPI HTMLDocument7_get_ondrag(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_ondrag(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

return get_doc_event(This, EVENTID_DRAG, p);
 }

-static HRESULT WINAPI HTMLDocument7_put_ondragend(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_ondragend(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_ondragend(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_ondragend(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_ondragenter(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_ondragenter(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_ondragenter(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_ondragenter(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_ondragleave(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_ondragleave(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_ondragleave(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_ondragleave(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_ondragover(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_ondragover(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_ondragover(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_ondragover(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_ondrop(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_ondrop(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_ondrop(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_ondrop(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_ondurationchange(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_ondurationchange(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_ondurationchange(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_ondurationchange(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onemptied(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onemptied(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onemptied(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onemptied(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onended(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onended(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onended(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onended(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onerror(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onerror(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

return set_doc_event(This, EVENTID_ERROR, &v);
 }

-static HRESULT WINAPI HTMLDocument7_get_onerror(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onerror(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

return get_doc_event(This, EVENTID_ERROR, p);
 }

-static HRESULT WINAPI HTMLDocument7_put_onfocus(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onfocus(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

return set_doc_event(This, EVENTID_FOCUS, &v);
 }

-static HRESULT WINAPI HTMLDocument7_get_onfocus(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onfocus(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

return get_doc_event(This, EVENTID_FOCUS, p);
 }

-static HRESULT WINAPI HTMLDocument7_put_oninput(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_oninput(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

return set_doc_event(This, EVENTID_INPUT, &v);
 }

-static HRESULT WINAPI HTMLDocument7_get_oninput(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_oninput(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

return get_doc_event(This, EVENTID_INPUT, p);
 }

-static HRESULT WINAPI HTMLDocument7_put_onload(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onload(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

return set_doc_event(This, EVENTID_LOAD, &v);
 }

-static HRESULT WINAPI HTMLDocument7_get_onload(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onload(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

return get_doc_event(This, EVENTID_LOAD, p);
 }

-static HRESULT WINAPI HTMLDocument7_put_onloadeddata(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onloadeddata(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onloadeddata(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onloadeddata(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onloadedmetadata(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onloadedmetadata(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onloadedmetadata(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onloadedmetadata(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onloadstart(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onloadstart(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onloadstart(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onloadstart(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onpause(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onpause(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onpause(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onpause(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onplay(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onplay(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onplay(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onplay(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onplaying(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onplaying(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onplaying(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onplaying(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onprogress(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onprogress(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onprogress(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onprogress(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onratechange(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onratechange(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onratechange(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onratechange(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onreset(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onreset(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onreset(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onreset(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onscroll(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onscroll(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

return set_doc_event(This, EVENTID_SCROLL, &v);
 }

-static HRESULT WINAPI HTMLDocument7_get_onscroll(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onscroll(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

return get_doc_event(This, EVENTID_SCROLL, p);
 }

-static HRESULT WINAPI HTMLDocument7_put_onseekend(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onseeked(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onseekend(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onseeked(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onseeking(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onseeking(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onseeking(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onseeking(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onselect(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onselect(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onselect(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onselect(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onstalled(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onstalled(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onstalled(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onstalled(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onsubmit(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onsubmit(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%s)\n", This, debugstr_variant(&v));

return set_doc_event(This, EVENTID_SUBMIT, &v);
 }

-static HRESULT WINAPI HTMLDocument7_get_onsubmit(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onsubmit(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

return get_doc_event(This, EVENTID_SUBMIT, p);
 }

-static HRESULT WINAPI HTMLDocument7_put_onsuspend(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onsuspend(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onsuspend(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onsuspend(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_ontimeupdate(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_ontimeupdate(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_ontimeupdate(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_ontimeupdate(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onvolumechange(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onvolumechange(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onvolumechange(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onvolumechange(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_put_onwaiting(IHTMLDocument7 *iface, VARIANT v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_onwaiting(IHTMLDocument7 *iface, VARIANT v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%s)\n", This, debugstr_variant(&v));
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_onwaiting(IHTMLDocument7 *iface, VARIANT *p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_onwaiting(IHTMLDocument7 *iface, VARIANT *p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, p);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_normalize(IHTMLDocument7 *iface)
+static HRESULT WINAPI DocNodeHTMLDocument7_normalize(IHTMLDocument7 *iface)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)\n", This);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_importNode(IHTMLDocument7 *iface, IHTMLDOMNode *pNodeSource,
+static HRESULT WINAPI DocNodeHTMLDocument7_importNode(IHTMLDocument7 *iface, IHTMLDOMNode *pNodeSource,
         VARIANT_BOOL fDeep, IHTMLDOMNode3 **ppNodeDest)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p %x %p)\n", This, pNodeSource, fDeep, ppNodeDest);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_parentWindow(IHTMLDocument7 *iface, IHTMLWindow2 **p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_parentWindow(IHTMLDocument7 *iface, IHTMLWindow2 **p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

return IHTMLDocument7_get_defaultView(&This->IHTMLDocument7_iface, p);
 }

-static HRESULT WINAPI HTMLDocument7_put_body(IHTMLDocument7 *iface, IHTMLElement *v)
+static HRESULT WINAPI DocNodeHTMLDocument7_put_body(IHTMLDocument7 *iface, IHTMLElement *v)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     FIXME("(%p)->(%p)\n", This, v);
     return E_NOTIMPL;
 }

-static HRESULT WINAPI HTMLDocument7_get_body(IHTMLDocument7 *iface, IHTMLElement **p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_body(IHTMLDocument7 *iface, IHTMLElement **p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);

TRACE("(%p)->(%p)\n", This, p);

-    return IHTMLDocument2_get_body(&This->doc_node->IHTMLDocument2_iface, p);
+    return IHTMLDocument2_get_body(&This->IHTMLDocument2_iface, p);
 }

-static HRESULT WINAPI HTMLDocument7_get_head(IHTMLDocument7 *iface, IHTMLElement **p)
+static HRESULT WINAPI DocNodeHTMLDocument7_get_head(IHTMLDocument7 *iface, IHTMLElement **p)
 {
-    HTMLDocument *This = impl_from_IHTMLDocument7(iface);
+    HTMLDocumentNode *This = HTMLDocumentNode_from_IHTMLDocument7(iface);
     nsIDOMHTMLHeadElement *nshead;
     nsIDOMElement *nselem;
     HTMLElement *elem;
@@ -5360,12 +5358,12 @@ static HRESULT WINAPI HTMLDocument7_get_head(IHTMLDocument7 *iface, IHTMLElement

TRACE("(%p)->(%p)\n", This, p);

-    if(!This->doc_node->nsdoc) {
+    if(!This->nsdoc) {
         FIXME("No document\n");
         return E_FAIL;
     }

-    nsres = nsIDOMHTMLDocument_GetHead(This->doc_node->nsdoc, &nshead);
+    nsres = nsIDOMHTMLDocument_GetHead(This->nsdoc, &nshead);
     assert(nsres == NS_OK);

if(!nshead) {
@@ -5386,118 +5384,367 @@ static HRESULT WINAPI HTMLDocument7_get_head(IHTMLDocument7 *iface, IHTMLElement
     return S_OK;
 }

-static const IHTMLDocument7Vtbl HTMLDocument7Vtbl = {
-    HTMLDocument7_QueryInterface,
-    HTMLDocument7_AddRef,
-    HTMLDocument7_Release,
-    HTMLDocument7_GetTypeInfoCount,
-    HTMLDocument7_GetTypeInfo,
-    HTMLDocument7_GetIDsOfNames,
-    HTMLDocument7_Invoke,
-    HTMLDocument7_get_defaultView,
-    HTMLDocument7_createCDATASection,
-    HTMLDocument7_getSelection,
-    HTMLDocument7_getElementsByTagNameNS,
-    HTMLDocument7_createElementNS,
-    HTMLDocument7_createAttributeNS,
-    HTMLDocument7_put_onmsthumbnailclick,
-    HTMLDocument7_get_onmsthumbnailclick,
-    HTMLDocument7_get_characterSet,
-    HTMLDocument7_createElement,
-    HTMLDocument7_createAttribute,
-    HTMLDocument7_getElementsByClassName,
-    HTMLDocument7_createProcessingInstruction,
-    HTMLDocument7_adoptNode,
-    HTMLDocument7_put_onmssitemodejumplistitemremoved,
-    HTMLDocument7_get_onmssitemodejumplistitemremoved,
-    HTMLDocument7_get_all,
-    HTMLDocument7_get_inputEncoding,
-    HTMLDocument7_get_xmlEncoding,
-    HTMLDocument7_put_xmlStandalone,
-    HTMLDocument7_get_xmlStandalone,
-    HTMLDocument7_put_xmlVersion,
-    HTMLDocument7_get_xmlVersion,
-    HTMLDocument7_hasAttributes,
-    HTMLDocument7_put_onabort,
-    HTMLDocument7_get_onabort,
-    HTMLDocument7_put_onblur,
-    HTMLDocument7_get_onblur,
-    HTMLDocument7_put_oncanplay,
-    HTMLDocument7_get_oncanplay,
-    HTMLDocument7_put_oncanplaythrough,
-    HTMLDocument7_get_oncanplaythrough,
-    HTMLDocument7_put_onchange,
-    HTMLDocument7_get_onchange,
-    HTMLDocument7_put_ondrag,
-    HTMLDocument7_get_ondrag,
-    HTMLDocument7_put_ondragend,
-    HTMLDocument7_get_ondragend,
-    HTMLDocument7_put_ondragenter,
-    HTMLDocument7_get_ondragenter,
-    HTMLDocument7_put_ondragleave,
-    HTMLDocument7_get_ondragleave,
-    HTMLDocument7_put_ondragover,
-    HTMLDocument7_get_ondragover,
-    HTMLDocument7_put_ondrop,
-    HTMLDocument7_get_ondrop,
-    HTMLDocument7_put_ondurationchange,
-    HTMLDocument7_get_ondurationchange,
-    HTMLDocument7_put_onemptied,
-    HTMLDocument7_get_onemptied,
-    HTMLDocument7_put_onended,
-    HTMLDocument7_get_onended,
-    HTMLDocument7_put_onerror,
-    HTMLDocument7_get_onerror,
-    HTMLDocument7_put_onfocus,
-    HTMLDocument7_get_onfocus,
-    HTMLDocument7_put_oninput,
-    HTMLDocument7_get_oninput,
-    HTMLDocument7_put_onload,
-    HTMLDocument7_get_onload,
-    HTMLDocument7_put_onloadeddata,
-    HTMLDocument7_get_onloadeddata,
-    HTMLDocument7_put_onloadedmetadata,
-    HTMLDocument7_get_onloadedmetadata,
-    HTMLDocument7_put_onloadstart,
-    HTMLDocument7_get_onloadstart,
-    HTMLDocument7_put_onpause,
-    HTMLDocument7_get_onpause,
-    HTMLDocument7_put_onplay,
-    HTMLDocument7_get_onplay,
-    HTMLDocument7_put_onplaying,
-    HTMLDocument7_get_onplaying,
-    HTMLDocument7_put_onprogress,
-    HTMLDocument7_get_onprogress,
-    HTMLDocument7_put_onratechange,
-    HTMLDocument7_get_onratechange,
-    HTMLDocument7_put_onreset,
-    HTMLDocument7_get_onreset,
-    HTMLDocument7_put_onscroll,
-    HTMLDocument7_get_onscroll,
-    HTMLDocument7_put_onseekend,
-    HTMLDocument7_get_onseekend,
-    HTMLDocument7_put_onseeking,
-    HTMLDocument7_get_onseeking,
-    HTMLDocument7_put_onselect,
-    HTMLDocument7_get_onselect,
-    HTMLDocument7_put_onstalled,
-    HTMLDocument7_get_onstalled,
-    HTMLDocument7_put_onsubmit,
-    HTMLDocument7_get_onsubmit,
-    HTMLDocument7_put_onsuspend,
-    HTMLDocument7_get_onsuspend,
-    HTMLDocument7_put_ontimeupdate,
-    HTMLDocument7_get_ontimeupdate,
-    HTMLDocument7_put_onvolumechange,
-    HTMLDocument7_get_onvolumechange,
-    HTMLDocument7_put_onwaiting,
-    HTMLDocument7_get_onwaiting,
-    HTMLDocument7_normalize,
-    HTMLDocument7_importNode,
-    HTMLDocument7_get_parentWindow,
-    HTMLDocument7_put_body,
-    HTMLDocument7_get_body,
-    HTMLDocument7_get_head
+static const IHTMLDocument7Vtbl DocNodeHTMLDocument7Vtbl = {
+    DocNodeHTMLDocument7_QueryInterface,
+    DocNodeHTMLDocument7_AddRef,
+    DocNodeHTMLDocument7_Release,
+    DocNodeHTMLDocument7_GetTypeInfoCount,
+    DocNodeHTMLDocument7_GetTypeInfo,
+    DocNodeHTMLDocument7_GetIDsOfNames,
+    DocNodeHTMLDocument7_Invoke,
+    DocNodeHTMLDocument7_get_defaultView,
+    DocNodeHTMLDocument7_createCDATASection,
+    DocNodeHTMLDocument7_getSelection,
+    DocNodeHTMLDocument7_getElementsByTagNameNS,
+    DocNodeHTMLDocument7_createElementNS,
+    DocNodeHTMLDocument7_createAttributeNS,
+    DocNodeHTMLDocument7_put_onmsthumbnailclick,
+    DocNodeHTMLDocument7_get_onmsthumbnailclick,
+    DocNodeHTMLDocument7_get_characterSet,
+    DocNodeHTMLDocument7_createElement,
+    DocNodeHTMLDocument7_createAttribute,
+    DocNodeHTMLDocument7_getElementsByClassName,
+    DocNodeHTMLDocument7_createProcessingInstruction,
+    DocNodeHTMLDocument7_adoptNode,
+    DocNodeHTMLDocument7_put_onmssitemodejumplistitemremoved,
+    DocNodeHTMLDocument7_get_onmssitemodejumplistitemremoved,
+    DocNodeHTMLDocument7_get_all,
+    DocNodeHTMLDocument7_get_inputEncoding,
+    DocNodeHTMLDocument7_get_xmlEncoding,
+    DocNodeHTMLDocument7_put_xmlStandalone,
+    DocNodeHTMLDocument7_get_xmlStandalone,
+    DocNodeHTMLDocument7_put_xmlVersion,
+    DocNodeHTMLDocument7_get_xmlVersion,
+    DocNodeHTMLDocument7_hasAttributes,
+    DocNodeHTMLDocument7_put_onabort,
+    DocNodeHTMLDocument7_get_onabort,
+    DocNodeHTMLDocument7_put_onblur,
+    DocNodeHTMLDocument7_get_onblur,
+    DocNodeHTMLDocument7_put_oncanplay,
+    DocNodeHTMLDocument7_get_oncanplay,
+    DocNodeHTMLDocument7_put_oncanplaythrough,
+    DocNodeHTMLDocument7_get_oncanplaythrough,
+    DocNodeHTMLDocument7_put_onchange,
+    DocNodeHTMLDocument7_get_onchange,
+    DocNodeHTMLDocument7_put_ondrag,
+    DocNodeHTMLDocument7_get_ondrag,
+    DocNodeHTMLDocument7_put_ondragend,
+    DocNodeHTMLDocument7_get_ondragend,
+    DocNodeHTMLDocument7_put_ondragenter,
+    DocNodeHTMLDocument7_get_ondragenter,
+    DocNodeHTMLDocument7_put_ondragleave,
+    DocNodeHTMLDocument7_get_ondragleave,
+    DocNodeHTMLDocument7_put_ondragover,
+    DocNodeHTMLDocument7_get_ondragover,
+    DocNodeHTMLDocument7_put_ondrop,
+    DocNodeHTMLDocument7_get_ondrop,
+    DocNodeHTMLDocument7_put_ondurationchange,
+    DocNodeHTMLDocument7_get_ondurationchange,
+    DocNodeHTMLDocument7_put_onemptied,
+    DocNodeHTMLDocument7_get_onemptied,
+    DocNodeHTMLDocument7_put_onended,
+    DocNodeHTMLDocument7_get_onended,
+    DocNodeHTMLDocument7_put_onerror,
+    DocNodeHTMLDocument7_get_onerror,
+    DocNodeHTMLDocument7_put_onfocus,
+    DocNodeHTMLDocument7_get_onfocus,
+    DocNodeHTMLDocument7_put_oninput,
+    DocNodeHTMLDocument7_get_oninput,
+    DocNodeHTMLDocument7_put_onload,
+    DocNodeHTMLDocument7_get_onload,
+    DocNodeHTMLDocument7_put_onloadeddata,
+    DocNodeHTMLDocument7_get_onloadeddata,
+    DocNodeHTMLDocument7_put_onloadedmetadata,
+    DocNodeHTMLDocument7_get_onloadedmetadata,
+    DocNodeHTMLDocument7_put_onloadstart,
+    DocNodeHTMLDocument7_get_onloadstart,
+    DocNodeHTMLDocument7_put_onpause,
+    DocNodeHTMLDocument7_get_onpause,
+    DocNodeHTMLDocument7_put_onplay,
+    DocNodeHTMLDocument7_get_onplay,
+    DocNodeHTMLDocument7_put_onplaying,
+    DocNodeHTMLDocument7_get_onplaying,
+    DocNodeHTMLDocument7_put_onprogress,
+    DocNodeHTMLDocument7_get_onprogress,
+    DocNodeHTMLDocument7_put_onratechange,
+    DocNodeHTMLDocument7_get_onratechange,
+    DocNodeHTMLDocument7_put_onreset,
+    DocNodeHTMLDocument7_get_onreset,
+    DocNodeHTMLDocument7_put_onscroll,
+    DocNodeHTMLDocument7_get_onscroll,
+    DocNodeHTMLDocument7_put_onseeked,
+    DocNodeHTMLDocument7_get_onseeked,
+    DocNodeHTMLDocument7_put_onseeking,
+    DocNodeHTMLDocument7_get_onseeking,
+    DocNodeHTMLDocument7_put_onselect,
+    DocNodeHTMLDocument7_get_onselect,
+    DocNodeHTMLDocument7_put_onstalled,
+    DocNodeHTMLDocument7_get_onstalled,
+    DocNodeHTMLDocument7_put_onsubmit,
+    DocNodeHTMLDocument7_get_onsubmit,
+    DocNodeHTMLDocument7_put_onsuspend,
+    DocNodeHTMLDocument7_get_onsuspend,
+    DocNodeHTMLDocument7_put_ontimeupdate,
+    DocNodeHTMLDocument7_get_ontimeupdate,
+    DocNodeHTMLDocument7_put_onvolumechange,
+    DocNodeHTMLDocument7_get_onvolumechange,
+    DocNodeHTMLDocument7_put_onwaiting,
+    DocNodeHTMLDocument7_get_onwaiting,
+    DocNodeHTMLDocument7_normalize,
+    DocNodeHTMLDocument7_importNode,
+    DocNodeHTMLDocument7_get_parentWindow,
+    DocNodeHTMLDocument7_put_body,
+    DocNodeHTMLDocument7_get_body,
+    DocNodeHTMLDocument7_get_head
+};
+
+static inline HTMLDocumentObj *HTMLDocumentObj_from_IHTMLDocument7(IHTMLDocument7 *iface)
+{
+    return CONTAINING_RECORD(iface, HTMLDocumentObj, IHTMLDocument7_iface);
+}
+
+HTMLDOCUMENTOBJ_IDISPATCH_METHODS(HTMLDocument7)
+
+static HRESULT WINAPI DocObjHTMLDocument7_get_defaultView(IHTMLDocument7 *iface, IHTMLWindow2 **p)
+{
+    HTMLDocumentObj *This = HTMLDocumentObj_from_IHTMLDocument7(iface);
+
+    TRACE("(%p)->(%p)\n", This, p);
+
+    if(This->basedoc.window) {
+        *p = &This->basedoc.window->base.IHTMLWindow2_iface;
+        IHTMLWindow2_AddRef(*p);
+    }else {
+        *p = NULL;
+    }
+    return S_OK;
+}
+
+HTMLDOCUMENTOBJ_FWD_TO_NODE_2(HTMLDocument7, createCDATASection, BSTR,IHTMLDOMNode**)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, getSelection, IHTMLSelection**)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_3(HTMLDocument7, getElementsByTagNameNS, VARIANT*,BSTR,IHTMLElementCollection**)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_3(HTMLDocument7, createElementNS, VARIANT*,BSTR,IHTMLElement**)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_3(HTMLDocument7, createAttributeNS, VARIANT*,BSTR,IHTMLDOMAttribute**)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onmsthumbnailclick, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onmsthumbnailclick, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_characterSet, BSTR*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_2(HTMLDocument7, createElement, BSTR,IHTMLElement**)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_2(HTMLDocument7, createAttribute, BSTR,IHTMLDOMAttribute**)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_2(HTMLDocument7, getElementsByClassName, BSTR,IHTMLElementCollection**)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_3(HTMLDocument7, createProcessingInstruction, BSTR,BSTR,IDOMProcessingInstruction**)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_2(HTMLDocument7, adoptNode, IHTMLDOMNode*,IHTMLDOMNode3**)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onmssitemodejumplistitemremoved, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onmssitemodejumplistitemremoved, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_all, IHTMLElementCollection**)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_inputEncoding, BSTR*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_xmlEncoding, BSTR*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_xmlStandalone, VARIANT_BOOL)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_xmlStandalone, VARIANT_BOOL*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_xmlVersion, BSTR)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_xmlVersion, BSTR*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, hasAttributes, VARIANT_BOOL*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onabort, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onabort, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onblur, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onblur, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_oncanplay, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_oncanplay, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_oncanplaythrough, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_oncanplaythrough, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onchange, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onchange, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_ondrag, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_ondrag, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_ondragend, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_ondragend, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_ondragenter, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_ondragenter, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_ondragleave, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_ondragleave, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_ondragover, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_ondragover, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_ondrop, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_ondrop, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_ondurationchange, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_ondurationchange, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onemptied, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onemptied, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onended, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onended, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onerror, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onerror, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onfocus, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onfocus, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_oninput, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_oninput, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onload, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onload, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onloadeddata, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onloadeddata, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onloadedmetadata, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onloadedmetadata, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onloadstart, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onloadstart, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onpause, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onpause, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onplay, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onplay, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onplaying, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onplaying, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onprogress, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onprogress, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onratechange, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onratechange, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onreset, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onreset, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onscroll, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onscroll, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onseeked, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onseeked, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onseeking, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onseeking, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onselect, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onselect, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onstalled, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onstalled, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onsubmit, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onsubmit, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onsuspend, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onsuspend, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_ontimeupdate, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_ontimeupdate, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onvolumechange, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onvolumechange, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, put_onwaiting, VARIANT)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_onwaiting, VARIANT*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_0(HTMLDocument7, normalize)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_3(HTMLDocument7, importNode, IHTMLDOMNode*,VARIANT_BOOL,IHTMLDOMNode3**)
+
+static HRESULT WINAPI DocObjHTMLDocument7_get_parentWindow(IHTMLDocument7 *iface, IHTMLWindow2 **p)
+{
+    HTMLDocumentObj *This = HTMLDocumentObj_from_IHTMLDocument7(iface);
+
+    TRACE("(%p)->(%p)\n", This, p);
+
+    return IHTMLDocument7_get_defaultView(&This->IHTMLDocument7_iface, p);
+}
+
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, putref_body, IHTMLElement*)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_body, IHTMLElement**)
+HTMLDOCUMENTOBJ_FWD_TO_NODE_1(HTMLDocument7, get_head, IHTMLElement**)
+
+static const IHTMLDocument7Vtbl DocObjHTMLDocument7Vtbl = {
+    DocObjHTMLDocument7_QueryInterface,
+    DocObjHTMLDocument7_AddRef,
+    DocObjHTMLDocument7_Release,
+    DocObjHTMLDocument7_GetTypeInfoCount,
+    DocObjHTMLDocument7_GetTypeInfo,
+    DocObjHTMLDocument7_GetIDsOfNames,
+    DocObjHTMLDocument7_Invoke,
+    DocObjHTMLDocument7_get_defaultView,
+    DocObjHTMLDocument7_createCDATASection,
+    DocObjHTMLDocument7_getSelection,
+    DocObjHTMLDocument7_getElementsByTagNameNS,
+    DocObjHTMLDocument7_createElementNS,
+    DocObjHTMLDocument7_createAttributeNS,
+    DocObjHTMLDocument7_put_onmsthumbnailclick,
+    DocObjHTMLDocument7_get_onmsthumbnailclick,
+    DocObjHTMLDocument7_get_characterSet,
+    DocObjHTMLDocument7_createElement,
+    DocObjHTMLDocument7_createAttribute,
+    DocObjHTMLDocument7_getElementsByClassName,
+    DocObjHTMLDocument7_createProcessingInstruction,
+    DocObjHTMLDocument7_adoptNode,
+    DocObjHTMLDocument7_put_onmssitemodejumplistitemremoved,
+    DocObjHTMLDocument7_get_onmssitemodejumplistitemremoved,
+    DocObjHTMLDocument7_get_all,
+    DocObjHTMLDocument7_get_inputEncoding,
+    DocObjHTMLDocument7_get_xmlEncoding,
+    DocObjHTMLDocument7_put_xmlStandalone,
+    DocObjHTMLDocument7_get_xmlStandalone,
+    DocObjHTMLDocument7_put_xmlVersion,
+    DocObjHTMLDocument7_get_xmlVersion,
+    DocObjHTMLDocument7_hasAttributes,
+    DocObjHTMLDocument7_put_onabort,
+    DocObjHTMLDocument7_get_onabort,
+    DocObjHTMLDocument7_put_onblur,
+    DocObjHTMLDocument7_get_onblur,
+    DocObjHTMLDocument7_put_oncanplay,
+    DocObjHTMLDocument7_get_oncanplay,
+    DocObjHTMLDocument7_put_oncanplaythrough,
+    DocObjHTMLDocument7_get_oncanplaythrough,
+    DocObjHTMLDocument7_put_onchange,
+    DocObjHTMLDocument7_get_onchange,
+    DocObjHTMLDocument7_put_ondrag,
+    DocObjHTMLDocument7_get_ondrag,
+    DocObjHTMLDocument7_put_ondragend,
+    DocObjHTMLDocument7_get_ondragend,
+    DocObjHTMLDocument7_put_ondragenter,
+    DocObjHTMLDocument7_get_ondragenter,
+    DocObjHTMLDocument7_put_ondragleave,
+    DocObjHTMLDocument7_get_ondragleave,
+    DocObjHTMLDocument7_put_ondragover,
+    DocObjHTMLDocument7_get_ondragover,
+    DocObjHTMLDocument7_put_ondrop,
+    DocObjHTMLDocument7_get_ondrop,
+    DocObjHTMLDocument7_put_ondurationchange,
+    DocObjHTMLDocument7_get_ondurationchange,
+    DocObjHTMLDocument7_put_onemptied,
+    DocObjHTMLDocument7_get_onemptied,
+    DocObjHTMLDocument7_put_onended,
+    DocObjHTMLDocument7_get_onended,
+    DocObjHTMLDocument7_put_onerror,
+    DocObjHTMLDocument7_get_onerror,
+    DocObjHTMLDocument7_put_onfocus,
+    DocObjHTMLDocument7_get_onfocus,
+    DocObjHTMLDocument7_put_oninput,
+    DocObjHTMLDocument7_get_oninput,
+    DocObjHTMLDocument7_put_onload,
+    DocObjHTMLDocument7_get_onload,
+    DocObjHTMLDocument7_put_onloadeddata,
+    DocObjHTMLDocument7_get_onloadeddata,
+    DocObjHTMLDocument7_put_onloadedmetadata,
+    DocObjHTMLDocument7_get_onloadedmetadata,
+    DocObjHTMLDocument7_put_onloadstart,
+    DocObjHTMLDocument7_get_onloadstart,
+    DocObjHTMLDocument7_put_onpause,
+    DocObjHTMLDocument7_get_onpause,
+    DocObjHTMLDocument7_put_onplay,
+    DocObjHTMLDocument7_get_onplay,
+    DocObjHTMLDocument7_put_onplaying,
+    DocObjHTMLDocument7_get_onplaying,
+    DocObjHTMLDocument7_put_onprogress,
+    DocObjHTMLDocument7_get_onprogress,
+    DocObjHTMLDocument7_put_onratechange,
+    DocObjHTMLDocument7_get_onratechange,
+    DocObjHTMLDocument7_put_onreset,
+    DocObjHTMLDocument7_get_onreset,
+    DocObjHTMLDocument7_put_onscroll,
+    DocObjHTMLDocument7_get_onscroll,
+    DocObjHTMLDocument7_put_onseeked,
+    DocObjHTMLDocument7_get_onseeked,
+    DocObjHTMLDocument7_put_onseeking,
+    DocObjHTMLDocument7_get_onseeking,
+    DocObjHTMLDocument7_put_onselect,
+    DocObjHTMLDocument7_get_onselect,
+    DocObjHTMLDocument7_put_onstalled,
+    DocObjHTMLDocument7_get_onstalled,
+    DocObjHTMLDocument7_put_onsubmit,
+    DocObjHTMLDocument7_get_onsubmit,
+    DocObjHTMLDocument7_put_onsuspend,
+    DocObjHTMLDocument7_get_onsuspend,
+    DocObjHTMLDocument7_put_ontimeupdate,
+    DocObjHTMLDocument7_get_ontimeupdate,
+    DocObjHTMLDocument7_put_onvolumechange,
+    DocObjHTMLDocument7_get_onvolumechange,
+    DocObjHTMLDocument7_put_onwaiting,
+    DocObjHTMLDocument7_get_onwaiting,
+    DocObjHTMLDocument7_normalize,
+    DocObjHTMLDocument7_importNode,
+    DocObjHTMLDocument7_get_parentWindow,
+    DocObjHTMLDocument7_putref_body,
+    DocObjHTMLDocument7_get_body,
+    DocObjHTMLDocument7_get_head
 };

static inline HTMLDocumentNode *HTMLDocumentNode_from_IDocumentSelector(IDocumentSelector *iface)
@@ -6910,8 +7157,6 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv)
         *ppv = &This->IDispatchEx_iface;
     else if(IsEqualGUID(&IID_IDispatchEx, riid))
         *ppv = &This->IDispatchEx_iface;
-    else if(IsEqualGUID(&IID_IHTMLDocument7, riid))
-        *ppv = &This->IHTMLDocument7_iface;
     else
         return FALSE;

@@ -6933,7 +7178,6 @@ static const cpc_entry_t HTMLDocumentNode_cpc[] = {

static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex)
 {
-    doc->IHTMLDocument7_iface.lpVtbl = &HTMLDocument7Vtbl;
     doc->IDispatchEx_iface.lpVtbl = &DocDispatchExVtbl;

doc->outer_unk = outer;
@@ -6966,6 +7210,8 @@ static HRESULT HTMLDocumentNode_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
         *ppv = &This->IHTMLDocument5_iface;
     else if(IsEqualGUID(&IID_IHTMLDocument6, riid))
         *ppv = &This->IHTMLDocument6_iface;
+    else if(IsEqualGUID(&IID_IHTMLDocument7, riid))
+        *ppv = &This->IHTMLDocument7_iface;
     else if(IsEqualGUID(&IID_IDocumentSelector, riid))
         *ppv = &This->IDocumentSelector_iface;
     else if(IsEqualGUID(&IID_IDocumentEvent, riid))
@@ -7435,6 +7681,7 @@ static HTMLDocumentNode *alloc_doc_node(HTMLDocumentObj *doc_obj, HTMLInnerWindo
     doc->IHTMLDocument4_iface.lpVtbl = &DocNodeHTMLDocument4Vtbl;
     doc->IHTMLDocument5_iface.lpVtbl = &DocNodeHTMLDocument5Vtbl;
     doc->IHTMLDocument6_iface.lpVtbl = &DocNodeHTMLDocument6Vtbl;
+    doc->IHTMLDocument7_iface.lpVtbl = &DocNodeHTMLDocument7Vtbl;
     doc->IDocumentSelector_iface.lpVtbl = &DocNodeDocumentSelectorVtbl;
     doc->IDocumentEvent_iface.lpVtbl = &DocNodeDocumentEventVtbl;
     doc->ISupportErrorInfo_iface.lpVtbl = &DocNodeSupportErrorInfoVtbl;
@@ -7574,6 +7821,8 @@ static HRESULT WINAPI HTMLDocumentObj_QueryInterface(IUnknown *iface, REFIID rii
         *ppv = &This->IHTMLDocument5_iface;
     }else if(IsEqualGUID(&IID_IHTMLDocument6, riid)) {
         *ppv = &This->IHTMLDocument6_iface;
+    }else if(IsEqualGUID(&IID_IHTMLDocument7, riid)) {
+        *ppv = &This->IHTMLDocument7_iface;
     }else if(IsEqualGUID(&IID_ICustomDoc, riid)) {
         *ppv = &This->ICustomDoc_iface;
     }else if(IsEqualGUID(&IID_IDocumentSelector, riid)) {
@@ -7889,6 +8138,7 @@ static HRESULT create_document_object(BOOL is_mhtml, IUnknown *outer, REFIID rii
     doc->IHTMLDocument4_iface.lpVtbl = &DocObjHTMLDocument4Vtbl;
     doc->IHTMLDocument5_iface.lpVtbl = &DocObjHTMLDocument5Vtbl;
     doc->IHTMLDocument6_iface.lpVtbl = &DocObjHTMLDocument6Vtbl;
+    doc->IHTMLDocument7_iface.lpVtbl = &DocObjHTMLDocument7Vtbl;
     doc->IDocumentSelector_iface.lpVtbl = &DocObjDocumentSelectorVtbl;
     doc->IDocumentEvent_iface.lpVtbl = &DocObjDocumentEventVtbl;
     doc->ISupportErrorInfo_iface.lpVtbl = &DocObjSupportErrorInfoVtbl;
diff --git a/dlls/mshtml/htmlevent.h b/dlls/mshtml/htmlevent.h
index fb2b395ca7a..f78c4a0f188 100644
--- a/dlls/mshtml/htmlevent.h
+++ b/dlls/mshtml/htmlevent.h
@@ -149,12 +149,12 @@ static inline HRESULT get_node_event(HTMLDOMNode *node, eventid_t eid, VARIANT *
     return get_event_handler(get_node_event_prop_target(node, eid), eid, var);
 }

-static inline HRESULT set_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *var)
+static inline HRESULT set_doc_event(HTMLDocumentNode *doc, eventid_t eid, VARIANT *var)
 {
-    return set_event_handler(&doc->doc_node->node.event_target, eid, var);
+    return set_event_handler(&doc->node.event_target, eid, var);
 }

-static inline HRESULT get_doc_event(HTMLDocument *doc, eventid_t eid, VARIANT *var)
+static inline HRESULT get_doc_event(HTMLDocumentNode *doc, eventid_t eid, VARIANT *var)
 {
-    return get_event_handler(&doc->doc_node->node.event_target, eid, var);
+    return get_event_handler(&doc->node.event_target, eid, var);
 }
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h
index de572a627d9..3f16910dde1 100644
--- a/dlls/mshtml/mshtml_private.h
+++ b/dlls/mshtml/mshtml_private.h
@@ -640,7 +640,6 @@ struct  ConnectionPoint {
 };

struct HTMLDocument {
-    IHTMLDocument7              IHTMLDocument7_iface;
     IDispatchEx                 IDispatchEx_iface;

IUnknown *outer_unk;
@@ -677,6 +676,7 @@ struct HTMLDocumentObj {
     IHTMLDocument4 IHTMLDocument4_iface;
     IHTMLDocument5 IHTMLDocument5_iface;
     IHTMLDocument6 IHTMLDocument6_iface;
+    IHTMLDocument7 IHTMLDocument7_iface;
     IDocumentSelector IDocumentSelector_iface;
     IDocumentEvent IDocumentEvent_iface;
     ISupportErrorInfo ISupportErrorInfo_iface;
@@ -901,6 +901,7 @@ struct HTMLDocumentNode {
     IHTMLDocument4               IHTMLDocument4_iface;
     IHTMLDocument5               IHTMLDocument5_iface;
     IHTMLDocument6               IHTMLDocument6_iface;
+    IHTMLDocument7               IHTMLDocument7_iface;
     IDocumentSelector            IDocumentSelector_iface;
     IDocumentEvent               IDocumentEvent_iface;
     ISupportErrorInfo            ISupportErrorInfo_iface;
diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c
index c49f1b4f55f..d3ffc29af4b 100644
--- a/dlls/mshtml/omnavigator.c
+++ b/dlls/mshtml/omnavigator.c
@@ -270,7 +270,7 @@ static HRESULT WINAPI HTMLDOMImplementation2_createHTMLDocument(IHTMLDOMImplemen
     if(FAILED(hres))
         return hres;

-    *new_document = &new_document_node->basedoc.IHTMLDocument7_iface;
+    *new_document = &new_document_node->IHTMLDocument7_iface;
     return S_OK;
 }