system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-03 20:18:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

mshtml: Use CreateURLMonikerEx2 in SuperNavigate.

Browse source
This commit is contained in:
Jacek Caban 2011-07-23 12:50:32 +02:00 committed by Alexandre Julliard
parent 1e60c2f300
commit e325be79dc
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
dlls/mshtml/htmlwindow.c
View file

@ -1676,6 +1676,7 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface,
nsChannelBSC *bsc;
IMoniker *mon;
BSTR new_url;
IUri *uri;
HRESULT hres;
TRACE("(%p)->(%s %s %s %s %s %s %x)\n", This, debugstr_w(url), debugstr_w(arg2), debugstr_w(arg3), debugstr_w(arg4),
@ -1710,15 +1711,20 @@ static HRESULT WINAPI HTMLPrivateWindow_SuperNavigate(IHTMLPrivateWindow *iface,
}
}
/* FIXME: Why not set_ready_state? */
This->readystate = READYSTATE_UNINITIALIZED;
hres = CreateURLMoniker(NULL, new_url, &mon);
hres = CreateUri(new_url, 0, 0, &uri);
if(new_url != url)
SysFreeString(new_url);
if(FAILED(hres))
return hres;
hres = CreateURLMonikerEx2(NULL, uri, &mon, URL_MK_UNIFORM);
IUri_Release(uri);
if(FAILED(hres))
return hres;
/* FIXME: Why not set_ready_state? */
This->readystate = READYSTATE_UNINITIALIZED;
if(post_data_var) {
if(V_VT(post_data_var) == (VT_ARRAY|VT_UI1)) {
SafeArrayAccessData(V_ARRAY(post_data_var), (void**)&post_data);