Jacek Caban : mshtml: Use CreateURLMonikerEx2 in SuperNavigate.
Alexandre Julliard
julliard at winehq.org
Mon Jul 25 11:43:07 CDT 2011
Module: wine
Branch: master
Commit: e325be79dc485c6189a8aef994763e0a9d94d62c
URL: http://source.winehq.org/git/wine.git/?a=commit;h=e325be79dc485c6189a8aef994763e0a9d94d62c
Author: Jacek Caban <jacek at codeweavers.com>
Date: Sat Jul 23 12:50:32 2011 +0200
mshtml: Use CreateURLMonikerEx2 in SuperNavigate.
---
dlls/mshtml/htmlwindow.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c
index 89702b1..377825d 100644
--- a/dlls/mshtml/htmlwindow.c
+++ b/dlls/mshtml/htmlwindow.c
@@ -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);
More information about the wine-cvs
mailing list