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

mshtml: Use IUri in set_current_mon if possible and store it in window object.

Browse Source
This commit is contained in:
Jacek Caban 2011-11-10 14:35:41 +01:00 committed by Alexandre Julliard
parent 535e2b23a3
commit d7f7f33e7d
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/mshtml/mshtml_private.h
View File

@ -308,6 +308,7 @@ struct HTMLWindow {
nsChannelBSC *bscallback; nsChannelBSC *bscallback;
IMoniker *mon; IMoniker *mon;
IUri *uri;
BSTR url; BSTR url;
IHTMLEventObj *event; IHTMLEventObj *event;

41
dlls/mshtml/persist.c
View File

@ -68,7 +68,7 @@ static BOOL use_gecko_script(HTMLWindow *window)
void set_current_mon(HTMLWindow *This, IMoniker *mon) void set_current_mon(HTMLWindow *This, IMoniker *mon)
{ {
WCHAR *url; IUriContainer *uri_container;
HRESULT hres; HRESULT hres;
if(This->mon) { if(This->mon) {
@ -76,6 +76,11 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon)
This->mon = NULL; This->mon = NULL;
} }
if(This->uri) {
IUri_Release(This->uri);
This->uri = NULL;
}
if(This->url) { if(This->url) {
SysFreeString(This->url); SysFreeString(This->url);
This->url = NULL; This->url = NULL;
@ -87,12 +92,36 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon)
IMoniker_AddRef(mon); IMoniker_AddRef(mon);
This->mon = mon; This->mon = mon;
hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); hres = IMoniker_QueryInterface(mon, &IID_IUriContainer, (void**)&uri_container);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
This->url = SysAllocString(url); hres = IUriContainer_GetIUri(uri_container, &This->uri);
CoTaskMemFree(url); IUriContainer_Release(uri_container);
}else { if(hres != S_OK) {
WARN("GetDisplayName failed: %08x\n", hres); WARN("GetIUri failed: %08x\n", hres);
This->uri = NULL;
}
}
if(!This->uri) {
WCHAR *url;
hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url);
if(SUCCEEDED(hres)) {
hres = CreateUri(url, 0, 0, &This->uri);
if(FAILED(hres)) {
WARN("CrateUri failed: %08x\n", hres);
This->url = SysAllocString(url);
}
CoTaskMemFree(url);
}else {
WARN("GetDisplayName failed: %08x\n", hres);
}
}
if(!This->url && This->uri) {
hres = IUri_GetDisplayUri(This->uri, &This->url);
if(FAILED(hres))
WARN("GetDisplayUri failed: %08x\n", hres);
} }
set_script_mode(This, use_gecko_script(This) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT); set_script_mode(This, use_gecko_script(This) ? SCRIPTMODE_GECKO : SCRIPTMODE_ACTIVESCRIPT);