reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2024-11-26 13:10:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

mshtml: Split setting window URI from set_current_mon.

Browse Source
This commit is contained in:
Jacek Caban 2011-11-15 13:30:12 +01:00 committed by Alexandre Julliard
parent f86abedb40
commit bc701d5965
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
dlls/mshtml/persist.c
View File

@ -70,9 +70,31 @@ static BOOL use_gecko_script(HTMLWindow *window)
return FAILED(hres) || scheme != URL_SCHEME_ABOUT; return FAILED(hres) || scheme != URL_SCHEME_ABOUT;
} }
static void set_current_uri(HTMLWindow *window, IUri *uri)
{
if(window->uri) {
IUri_Release(window->uri);
window->uri = NULL;
}
if(window->url) {
SysFreeString(window->url);
window->url = NULL;
}
if(!uri)
return;
IUri_AddRef(uri);
window->uri = uri;
IUri_GetDisplayUri(uri, &window->url);
}
void set_current_mon(HTMLWindow *This, IMoniker *mon) void set_current_mon(HTMLWindow *This, IMoniker *mon)
{ {
IUriContainer *uri_container; IUriContainer *uri_container;
IUri *uri = NULL;
HRESULT hres; HRESULT hres;
if(This->mon) { if(This->mon) {
@ -80,15 +102,6 @@ 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) {
SysFreeString(This->url);
This->url = NULL;
}
if(!mon) if(!mon)
return; return;
@ -98,23 +111,26 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon)
hres = IMoniker_QueryInterface(mon, &IID_IUriContainer, (void**)&uri_container); hres = IMoniker_QueryInterface(mon, &IID_IUriContainer, (void**)&uri_container);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
hres = IUriContainer_GetIUri(uri_container, &This->uri); hres = IUriContainer_GetIUri(uri_container, &uri);
IUriContainer_Release(uri_container); IUriContainer_Release(uri_container);
if(hres != S_OK) { if(hres != S_OK) {
WARN("GetIUri failed: %08x\n", hres); WARN("GetIUri failed: %08x\n", hres);
This->uri = NULL; uri = NULL;
} }
} }
if(!This->uri) { if(!uri) {
WCHAR *url; WCHAR *url;
hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url); hres = IMoniker_GetDisplayName(mon, NULL, NULL, &url);
if(SUCCEEDED(hres)) { if(SUCCEEDED(hres)) {
hres = CreateUri(url, 0, 0, &This->uri); hres = CreateUri(url, 0, 0, &uri);
if(FAILED(hres)) { if(FAILED(hres)) {
WARN("CrateUri failed: %08x\n", hres); WARN("CrateUri failed: %08x\n", hres);
set_current_uri(This, NULL);
This->url = SysAllocString(url); This->url = SysAllocString(url);
CoTaskMemFree(url);
return;
} }
CoTaskMemFree(url); CoTaskMemFree(url);
}else { }else {
@ -122,12 +138,9 @@ void set_current_mon(HTMLWindow *This, IMoniker *mon)
} }
} }
if(!This->url && This->uri) { set_current_uri(This, uri);
hres = IUri_GetDisplayUri(This->uri, &This->url); if(uri)
if(FAILED(hres)) IUri_Release(uri);
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);
} }