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

mshtml: Always load URLs without a base URL through Wine.

This commit is contained in:
Andrew Eikum 2010-04-03 11:07:07 -05:00 committed by Alexandre Julliard
parent cf2a3af6f0
commit 3901185e94
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/mshtml/nsio.c
View File

@ -2453,7 +2453,6 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *
HTMLWindow *window = NULL; HTMLWindow *window = NULL;
nsIURI *uri = NULL; nsIURI *uri = NULL;
LPCWSTR base_wine_url = NULL; LPCWSTR base_wine_url = NULL;
BOOL is_wine_uri = FALSE;
nsresult nsres; nsresult nsres;
nsACString_GetData(aSpec, &spec); nsACString_GetData(aSpec, &spec);
@ -2464,10 +2463,8 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *
if(is_gecko_special_uri(spec)) if(is_gecko_special_uri(spec))
return nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, _retval); return nsIIOService_NewURI(nsio, aSpec, aOriginCharset, aBaseURI, _retval);
if(!strncmp(spec, "wine:", 5)) { if(!strncmp(spec, "wine:", 5))
spec += 5; spec += 5;
is_wine_uri = TRUE;
}
if(aBaseURI) { if(aBaseURI) {
PARSEDURLA parsed_url = {sizeof(PARSEDURLA)}; PARSEDURLA parsed_url = {sizeof(PARSEDURLA)};
@ -2512,7 +2509,7 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *
set_wine_url(wine_uri, url); set_wine_url(wine_uri, url);
else else
WARN("CoCombineUrl failed: %08x\n", hres); WARN("CoCombineUrl failed: %08x\n", hres);
}else if(is_wine_uri) { }else {
WCHAR url[INTERNET_MAX_URL_LENGTH]; WCHAR url[INTERNET_MAX_URL_LENGTH];
MultiByteToWideChar(CP_ACP, 0, spec, -1, url, sizeof(url)/sizeof(WCHAR)); MultiByteToWideChar(CP_ACP, 0, spec, -1, url, sizeof(url)/sizeof(WCHAR));