Jacek Caban : mshtml: Use stored nsdoc in HTMLCurrentStyle_Create.

Alexandre Julliard julliard at winehq.org
Thu Oct 9 07:42:46 CDT 2008


Module: wine
Branch: master
Commit: 502532ee23ca76a863d67801301f1625e984e077
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=502532ee23ca76a863d67801301f1625e984e077

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Oct  8 13:28:34 2008 -0500

mshtml: Use stored nsdoc in HTMLCurrentStyle_Create.

---

 dlls/mshtml/htmlcurstyle.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/dlls/mshtml/htmlcurstyle.c b/dlls/mshtml/htmlcurstyle.c
index 8bb56f3..414ac78 100644
--- a/dlls/mshtml/htmlcurstyle.c
+++ b/dlls/mshtml/htmlcurstyle.c
@@ -888,19 +888,16 @@ HRESULT HTMLCurrentStyle_Create(HTMLElement *elem, IHTMLCurrentStyle **p)
     nsIDOMDocumentView *nsdocview;
     nsIDOMAbstractView *nsview;
     nsIDOMViewCSS *nsviewcss;
-    nsIDOMDocument *nsdoc;
     nsAString nsempty_str;
     HTMLCurrentStyle *ret;
     nsresult nsres;
 
-    nsres = nsIWebNavigation_GetDocument(elem->node.doc->nscontainer->navigation, &nsdoc);
-    if(NS_FAILED(nsres)) {
-        ERR("GetDocument failed: %08x\n", nsres);
-        return E_FAIL;
+    if(!elem->node.doc->nsdoc)  {
+        WARN("NULL nsdoc\n");
+        return E_UNEXPECTED;
     }
 
-    nsres = nsIDOMDocument_QueryInterface(nsdoc, &IID_nsIDOMDocumentView, (void**)&nsdocview);
-    nsIDOMDocument_Release(nsdoc);
+    nsres = nsIDOMHTMLDocument_QueryInterface(elem->node.doc->nsdoc, &IID_nsIDOMDocumentView, (void**)&nsdocview);
     if(NS_FAILED(nsres)) {
         ERR("Could not get nsIDOMDocumentView: %08x\n", nsres);
         return E_FAIL;




More information about the wine-cvs mailing list