mshtml: Move the IHTMLDocument7 interface out of basedoc.

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);
 }

dlls/mshtml/mshtml_private.h

@@ -640,7 +640,6 @@ struct  ConnectionPoint {
 };
 
 struct HTMLDocument {
-    IHTMLDocument7              IHTMLDocument7_iface;
     IDispatchEx                 IDispatchEx_iface;
 
     IUnknown *outer_unk;
@@ -680,6 +679,7 @@ struct HTMLDocumentObj {
     IHTMLDocument4 IHTMLDocument4_iface;
     IHTMLDocument5 IHTMLDocument5_iface;
     IHTMLDocument6 IHTMLDocument6_iface;
+    IHTMLDocument7 IHTMLDocument7_iface;
     IDocumentSelector IDocumentSelector_iface;
     IDocumentEvent IDocumentEvent_iface;
     ISupportErrorInfo ISupportErrorInfo_iface;
@@ -904,6 +904,7 @@ struct HTMLDocumentNode {
     IHTMLDocument4               IHTMLDocument4_iface;
     IHTMLDocument5               IHTMLDocument5_iface;
     IHTMLDocument6               IHTMLDocument6_iface;
+    IHTMLDocument7               IHTMLDocument7_iface;
     IDocumentSelector            IDocumentSelector_iface;
     IDocumentEvent               IDocumentEvent_iface;
     ISupportErrorInfo            ISupportErrorInfo_iface;

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;
 }