ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ieframe: Fixed a typo in IDocObjectService::FireNavigateComplete2.

This commit is contained in:
Jacek Caban 2012-01-25 13:59:06 +01:00 committed by Alexandre Julliard
parent c12f87fbfa
commit 1f03cbf281
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ieframe/shellbrowser.c
View File

@ -748,7 +748,7 @@ static HRESULT WINAPI DocObjectService_FireNavigateComplete2(
set_dochost_url(This->doc_host, url);
V_VT(params) = (VT_BYREF|VT_VARIANT);
V_BYREF(params) = &url;
V_VARIANTREF(params) = &url_var;
V_VT(params+1) = VT_DISPATCH;
V_DISPATCH(params+1) = (IDispatch*)This->doc_host->wb;

24
dlls/ieframe/tests/webbrowser.c
View File

@ -768,6 +768,26 @@ static void test_OnBeforeNavigate(const VARIANT *disp, const VARIANT *url, const
*V_BOOLREF(cancel));
}
static void test_navigatecomplete2(DISPPARAMS *dp)
{
VARIANT *v;
CHECK_EXPECT(Invoke_NAVIGATECOMPLETE2);
ok(dp->rgvarg != NULL, "rgvarg == NULL\n");
ok(dp->cArgs == 2, "cArgs=%d, expected 2\n", dp->cArgs);
ok(V_VT(dp->rgvarg) == (VT_BYREF|VT_VARIANT), "V_VT(dp->rgvarg) = %d\n", V_VT(dp->rgvarg));
v = V_VARIANTREF(dp->rgvarg);
ok(V_VT(v) == VT_BSTR, "V_VT(url) = %d\n", V_VT(v));
ok(!strcmp_wa(V_BSTR(v), current_url), "url=%s, expected %s\n", wine_dbgstr_w(V_BSTR(v)), current_url);
ok(V_VT(dp->rgvarg+1) == VT_DISPATCH, "V_VT(dp->rgvarg+1) = %d\n", V_VT(dp->rgvarg+1));
ok(V_DISPATCH(dp->rgvarg+1) == (IDispatch*)wb, "V_DISPATCH=%p, wb=%p\n", V_DISPATCH(dp->rgvarg+1), wb);
test_ready_state((dwl_flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK)) ? READYSTATE_COMPLETE : READYSTATE_LOADING);
}
static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMember, REFIID riid,
LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExcepInfo, UINT *puArgErr)
@ -896,9 +916,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe
break;
case DISPID_NAVIGATECOMPLETE2:
CHECK_EXPECT(Invoke_NAVIGATECOMPLETE2);
/* FIXME */
test_ready_state((dwl_flags & (DWL_FROM_PUT_HREF|DWL_FROM_GOBACK)) ? READYSTATE_COMPLETE : READYSTATE_LOADING);
test_navigatecomplete2(pDispParams);
break;
case DISPID_PROGRESSCHANGE: