Jacek Caban : shdocvw: Pass the right IDispatch to NavigateComplete2 and DocumentComplete.

Alexandre Julliard julliard at winehq.org
Wed Aug 27 08:23:50 CDT 2008


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

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Tue Aug 26 13:55:27 2008 +0200

shdocvw: Pass the right IDispatch to NavigateComplete2 and DocumentComplete.

---

 dlls/shdocvw/dochost.c |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c
index 908503c..112c12a 100644
--- a/dlls/shdocvw/dochost.c
+++ b/dlls/shdocvw/dochost.c
@@ -48,15 +48,9 @@ LRESULT process_dochost_task(DocHost *This, LPARAM lparam)
 
 static void navigate_complete(DocHost *This)
 {
-    IDispatch *disp = NULL;
     DISPPARAMS dispparams;
     VARIANTARG params[2];
     VARIANT url;
-    HRESULT hres;
-
-    hres = IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)&disp);
-    if(FAILED(hres))
-        FIXME("Could not get IDispatch interface\n");
 
     dispparams.cArgs = 2;
     dispparams.cNamedArgs = 0;
@@ -67,7 +61,7 @@ static void navigate_complete(DocHost *This)
     V_BYREF(params) = &url;
 
     V_VT(params+1) = VT_DISPATCH;
-    V_DISPATCH(params+1) = disp;
+    V_DISPATCH(params+1) = This->disp;
 
     V_VT(&url) = VT_BSTR;
     V_BSTR(&url) = SysAllocString(This->url);
@@ -76,8 +70,6 @@ static void navigate_complete(DocHost *This)
     call_sink(This->cps.wbe2, DISPID_DOCUMENTCOMPLETE, &dispparams);
 
     SysFreeString(V_BSTR(&url));
-    if(disp)
-        IDispatch_Release(disp);
     This->busy = VARIANT_FALSE;
 }
 




More information about the wine-cvs mailing list