mshtml: Added IHTMLDocument7 stub implementation.

dlls/ieframe/ieframe.h

@@ -58,7 +58,7 @@ typedef struct {
     IHlinkFrame    IHlinkFrame_iface;
     ITargetFrame2  ITargetFrame2_iface;
     ITargetFramePriv2 ITargetFramePriv2_iface;
-    IWebBrowserPriv2IE8 IWebBrowserPriv2IE8_iface;
+    IWebBrowserPriv2IE9 IWebBrowserPriv2IE9_iface;
 
     IUnknown *outer;
     DocHost *doc_host;

dlls/ieframe/navigate.c

@@ -1451,107 +1451,43 @@ static const ITargetFramePriv2Vtbl TargetFramePriv2Vtbl = {
     TargetFramePriv2_AggregatedNavigation2
 };
 
-static inline HlinkFrame *impl_from_IWebBrowserPriv2IE8(IWebBrowserPriv2IE8 *iface)
+static inline HlinkFrame *impl_from_IWebBrowserPriv2IE9(IWebBrowserPriv2IE9 *iface)
 {
-    return CONTAINING_RECORD(iface, HlinkFrame, IWebBrowserPriv2IE8_iface);
+    return CONTAINING_RECORD(iface, HlinkFrame, IWebBrowserPriv2IE9_iface);
 }
 
-static HRESULT WINAPI WebBrowserPriv2IE8_QueryInterface(IWebBrowserPriv2IE8 *iface, REFIID riid, void **ppv)
+static HRESULT WINAPI WebBrowserPriv2IE9_QueryInterface(IWebBrowserPriv2IE9 *iface, REFIID riid, void **ppv)
 {
-    HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface);
+    HlinkFrame *This = impl_from_IWebBrowserPriv2IE9(iface);
     return IUnknown_QueryInterface(This->outer, riid, ppv);
 }
 
-static ULONG WINAPI WebBrowserPriv2IE8_AddRef(IWebBrowserPriv2IE8 *iface)
+static ULONG WINAPI WebBrowserPriv2IE9_AddRef(IWebBrowserPriv2IE9 *iface)
 {
-    HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface);
+    HlinkFrame *This = impl_from_IWebBrowserPriv2IE9(iface);
     return IUnknown_AddRef(This->outer);
 }
 
-static ULONG WINAPI WebBrowserPriv2IE8_Release(IWebBrowserPriv2IE8 *iface)
+static ULONG WINAPI WebBrowserPriv2IE9_Release(IWebBrowserPriv2IE9 *iface)
 {
-    HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface);
+    HlinkFrame *This = impl_from_IWebBrowserPriv2IE9(iface);
     return IUnknown_Release(This->outer);
 }
 
-static HRESULT WINAPI WebBrowserPriv2IE8_NavigateWithBindCtx2(IWebBrowserPriv2IE8 *iface, IUri *uri, VARIANT *flags,
-        VARIANT *target_frame, VARIANT *post_data, VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment)
+static HRESULT WINAPI WebBrowserPriv2IE9_NavigateWithBindCtx2(IWebBrowserPriv2IE9 *iface, IUri *uri, VARIANT *flags,
+        VARIANT *target_frame, VARIANT *post_data, VARIANT *headers, IBindCtx *bind_ctx, LPOLESTR url_fragment, DWORD unused)
 {
-    HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface);
+    HlinkFrame *This = impl_from_IWebBrowserPriv2IE9(iface);
     FIXME("(%p)->(%p %s %s %s %s %p %s)\n", This, uri, debugstr_variant(flags), debugstr_variant(target_frame),
           debugstr_variant(post_data), debugstr_variant(headers), bind_ctx, debugstr_w(url_fragment));
     return E_NOTIMPL;
 }
 
-static HRESULT WINAPI WebBrowserPriv2IE8_SetBrowserFrameOptions(IWebBrowserPriv2IE8 *iface, DWORD opt1, DWORD opt2)
-{
-    HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface);
-    FIXME("(%p)->(%x %x)\n", This, opt1, opt2);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI WebBrowserPriv2IE8_DetachConnectionPoints(IWebBrowserPriv2IE8 *iface)
-{
-    HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface);
-    FIXME("(%p)->()\n", This);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI WebBrowserPriv2IE8_GetProcessId(IWebBrowserPriv2IE8 *iface, DWORD *pid)
-{
-    HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface);
-    FIXME("(%p)->(%p)\n", This, pid);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI WebBrowserPriv2IE8_CompatAttachEditEvents(IWebBrowserPriv2IE8 *iface)
-{
-    HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface);
-    FIXME("(%p)->()\n", This);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI WebBrowserPriv2IE8_HandleOpenOptions(IWebBrowserPriv2IE8 *iface, IUnknown *obj, BSTR bstr, int options)
-{
-    HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface);
-    FIXME("(%p)->(%p %s %x)\n", This, obj, debugstr_w(bstr), options);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI WebBrowserPriv2IE8_SetSearchTerm(IWebBrowserPriv2IE8 *iface, BSTR term)
-{
-    HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface);
-    FIXME("(%p)->(%s)\n", This, debugstr_w(term));
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI WebBrowserPriv2IE8_GetSearchTerm(IWebBrowserPriv2IE8 *iface, BSTR *term)
-{
-    HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface);
-    FIXME("(%p)->(%p)\n", This, term);
-    return E_NOTIMPL;
-}
-
-static HRESULT WINAPI WebBrowserPriv2IE8_GetCurrentDocument(IWebBrowserPriv2IE8 *iface, IDispatch **doc)
-{
-    HlinkFrame *This = impl_from_IWebBrowserPriv2IE8(iface);
-    FIXME("(%p)->(%p)\n", This, doc);
-    return E_NOTIMPL;
-}
-
-static const IWebBrowserPriv2IE8Vtbl WebBrowserPriv2IE8Vtbl = {
-    WebBrowserPriv2IE8_QueryInterface,
-    WebBrowserPriv2IE8_AddRef,
-    WebBrowserPriv2IE8_Release,
-    WebBrowserPriv2IE8_NavigateWithBindCtx2,
-    WebBrowserPriv2IE8_SetBrowserFrameOptions,
-    WebBrowserPriv2IE8_DetachConnectionPoints,
-    WebBrowserPriv2IE8_GetProcessId,
-    WebBrowserPriv2IE8_CompatAttachEditEvents,
-    WebBrowserPriv2IE8_HandleOpenOptions,
-    WebBrowserPriv2IE8_SetSearchTerm,
-    WebBrowserPriv2IE8_GetSearchTerm,
-    WebBrowserPriv2IE8_GetCurrentDocument
+static const IWebBrowserPriv2IE9Vtbl WebBrowserPriv2IE9Vtbl = {
+    WebBrowserPriv2IE9_QueryInterface,
+    WebBrowserPriv2IE9_AddRef,
+    WebBrowserPriv2IE9_Release,
+    WebBrowserPriv2IE9_NavigateWithBindCtx2
 };
 
 BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv)
@@ -1568,9 +1504,9 @@ BOOL HlinkFrame_QI(HlinkFrame *This, REFIID riid, void **ppv)
     }else if(IsEqualGUID(&IID_ITargetFramePriv2, riid)) {
         TRACE("(%p)->(IID_ITargetFramePriv2 %p)\n", This, ppv);
         *ppv = &This->ITargetFramePriv2_iface;
-    }else if(IsEqualGUID(&IID_IWebBrowserPriv2IE8, riid)) {
-        TRACE("(%p)->(IID_IWebBrowserPriv2IE8 %p)\n", This, ppv);
-        *ppv = &This->IWebBrowserPriv2IE8_iface;
+    }else if(IsEqualGUID(&IID_IWebBrowserPriv2IE9, riid)) {
+        TRACE("(%p)->(IID_IWebBrowserPriv2IE9 %p)\n", This, ppv);
+        *ppv = &This->IWebBrowserPriv2IE9_iface;
     }else {
         return FALSE;
     }
@@ -1584,7 +1520,7 @@ void HlinkFrame_Init(HlinkFrame *This, IUnknown *outer, DocHost *doc_host)
     This->IHlinkFrame_iface.lpVtbl   = &HlinkFrameVtbl;
     This->ITargetFrame2_iface.lpVtbl = &TargetFrame2Vtbl;
     This->ITargetFramePriv2_iface.lpVtbl = &TargetFramePriv2Vtbl;
-    This->IWebBrowserPriv2IE8_iface.lpVtbl = &WebBrowserPriv2IE8Vtbl;
+    This->IWebBrowserPriv2IE9_iface.lpVtbl = &WebBrowserPriv2IE9Vtbl;
 
     This->outer = outer;
     This->doc_host = doc_host;

dlls/mshtml/mshtml_private.h

@@ -488,6 +488,7 @@ struct HTMLDocument {
     IHTMLDocument4              IHTMLDocument4_iface;
     IHTMLDocument5              IHTMLDocument5_iface;
     IHTMLDocument6              IHTMLDocument6_iface;
+    IHTMLDocument7              IHTMLDocument7_iface;
     IPersistMoniker             IPersistMoniker_iface;
     IPersistFile                IPersistFile_iface;
     IPersistHistory             IPersistHistory_iface;

dlls/mshtml/navigate.c

@@ -1657,7 +1657,7 @@ static IUri *get_moniker_uri(IMoniker *mon)
 
 static void handle_extern_mime_navigation(nsChannelBSC *This)
 {
-    IWebBrowserPriv2IE8 *webbrowser_priv;
+    IWebBrowserPriv2IE9 *webbrowser_priv;
     IOleCommandTarget *cmdtrg;
     HTMLDocumentObj *doc_obj;
     IBindCtx *bind_ctx;
@@ -1698,8 +1698,8 @@ static void handle_extern_mime_navigation(nsChannelBSC *This)
 
     hres = IUnknown_QueryInterface(doc_obj->webbrowser, &IID_IWebBrowserPriv2IE8, (void**)&webbrowser_priv);
     if(SUCCEEDED(hres)) {
-        hres = IWebBrowserPriv2IE8_NavigateWithBindCtx2(webbrowser_priv, uri, &flags, NULL, NULL, NULL, bind_ctx, NULL);
-        IWebBrowserPriv2IE8_Release(webbrowser_priv);
+        hres = IWebBrowserPriv2IE9_NavigateWithBindCtx2(webbrowser_priv, uri, &flags, NULL, NULL, NULL, bind_ctx, NULL, 0);
+        IWebBrowserPriv2IE9_Release(webbrowser_priv);
     }else {
         IWebBrowserPriv *webbrowser_priv_old;
         VARIANT uriv;