Jacek Caban : mshtml: Added IHTMLDocument7:: get_defaultView implementation and use it for get_parentWindow implementation.
Alexandre Julliard
julliard at winehq.org
Tue Sep 12 15:40:38 CDT 2017
Module: wine
Branch: master
Commit: 697f1cb60fc182cc65a8dec2ce278182923fafa5
URL: http://source.winehq.org/git/wine.git/?a=commit;h=697f1cb60fc182cc65a8dec2ce278182923fafa5
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Sep 12 13:14:32 2017 +0200
mshtml: Added IHTMLDocument7::get_defaultView implementation and use it for get_parentWindow implementation.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/mshtml/htmldoc.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c
index f9775f8..ea6bb20 100644
--- a/dlls/mshtml/htmldoc.c
+++ b/dlls/mshtml/htmldoc.c
@@ -1632,9 +1632,7 @@ static HRESULT WINAPI HTMLDocument_get_parentWindow(IHTMLDocument2 *iface, IHTML
TRACE("(%p)->(%p)\n", This, p);
- *p = &This->window->base.IHTMLWindow2_iface;
- IHTMLWindow2_AddRef(*p);
- return S_OK;
+ return IHTMLDocument7_get_defaultView(&This->IHTMLDocument7_iface, p);
}
static HRESULT WINAPI HTMLDocument_get_styleSheets(IHTMLDocument2 *iface,
@@ -3254,8 +3252,12 @@ static HRESULT WINAPI HTMLDocument7_Invoke(IHTMLDocument7 *iface, DISPID dispIdM
static HRESULT WINAPI HTMLDocument7_get_defaultView(IHTMLDocument7 *iface, IHTMLWindow2 **p)
{
HTMLDocument *This = impl_from_IHTMLDocument7(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+
+ TRACE("(%p)->(%p)\n", This, p);
+
+ *p = &This->window->base.IHTMLWindow2_iface;
+ IHTMLWindow2_AddRef(*p);
+ return S_OK;
}
static HRESULT WINAPI HTMLDocument7_createCDATASection(IHTMLDocument7 *iface, BSTR text, IHTMLDOMNode **newCDATASectionNode)
@@ -3977,8 +3979,10 @@ static HRESULT WINAPI HTMLDocument7_importNode(IHTMLDocument7 *iface, IHTMLDOMNo
static HRESULT WINAPI HTMLDocument7_get_parentWindow(IHTMLDocument7 *iface, IHTMLWindow2 **p)
{
HTMLDocument *This = impl_from_IHTMLDocument7(iface);
- FIXME("(%p)->(%p)\n", This, p);
- return E_NOTIMPL;
+
+ TRACE("(%p)->(%p)\n", This, p);
+
+ return IHTMLDocument7_get_defaultView(&This->IHTMLDocument7_iface, p);
}
static HRESULT WINAPI HTMLDocument7_put_body(IHTMLDocument7 *iface, IHTMLElement *v)
More information about the wine-cvs
mailing list