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

urlmon: Don't set is_opaque for file URIs in validate_components.

This commit is contained in:
Jacek Caban 2011-11-16 12:51:23 +01:00 committed by Alexandre Julliard
parent 1183577150
commit 1fb705de62
2 changed files with 66 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
dlls/urlmon/tests/uri.c
View File

@ -5525,6 +5525,70 @@ static const uri_builder_test uri_builder_tests[] = {
0,INET_E_INVALID_URL,FALSE, 0,INET_E_INVALID_URL,FALSE,
0,INET_E_INVALID_URL,FALSE, 0,INET_E_INVALID_URL,FALSE,
0,0,0,INET_E_INVALID_URL,FALSE 0,0,0,INET_E_INVALID_URL,FALSE
},
{ "file:///c:/dir/file.html",0,S_OK,FALSE,
{
{TRUE,NULL,NULL,Uri_PROPERTY_FRAGMENT,S_OK},
},
{FALSE},
0,S_OK,FALSE,
0,S_OK,FALSE,
0,0,0,S_OK,FALSE,
{
{"file:///c:/dir/file.html",S_OK},
{"",S_FALSE},
{"file:///c:/dir/file.html",S_OK},
{"",S_FALSE},
{".html",S_OK},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"/c:/dir/file.html",S_OK},
{"/c:/dir/file.html",S_OK},
{"",S_FALSE},
{"file:///c:/dir/file.html",S_OK},
{"file",S_OK},
{"",S_FALSE},
{"",S_FALSE}
},
{
{Uri_HOST_UNKNOWN,S_OK},
{0,S_FALSE},
{URL_SCHEME_FILE,S_OK},
{URLZONE_INVALID,E_NOTIMPL}
}
},
{ "file:///c:/dir/file.html",0,S_OK,FALSE,
{
{TRUE,"#",NULL,Uri_PROPERTY_FRAGMENT,S_OK},
},
{FALSE},
0,S_OK,FALSE,
0,S_OK,FALSE,
0,0,0,S_OK,FALSE,
{
{"file:///c:/dir/file.html#",S_OK},
{"",S_FALSE},
{"file:///c:/dir/file.html#",S_OK},
{"",S_FALSE},
{".html",S_OK},
{"#",S_OK},
{"",S_FALSE},
{"",S_FALSE},
{"/c:/dir/file.html",S_OK},
{"/c:/dir/file.html",S_OK},
{"",S_FALSE},
{"file:///c:/dir/file.html#",S_OK},
{"file",S_OK},
{"",S_FALSE},
{"",S_FALSE}
},
{
{Uri_HOST_UNKNOWN,S_OK},
{0,S_FALSE},
{URL_SCHEME_FILE,S_OK},
{URLZONE_INVALID,E_NOTIMPL}
}
} }
}; };

3
dlls/urlmon/uri.c
View File

@ -3941,7 +3941,8 @@ static HRESULT validate_components(const UriBuilder *builder, parse_data *data,
/* The URI is opaque if it doesn't have an authority component. */ /* The URI is opaque if it doesn't have an authority component. */
if(!data->is_relative) if(!data->is_relative)
data->is_opaque = !data->username && !data->password && !data->host && !data->has_port; data->is_opaque = !data->username && !data->password && !data->host && !data->has_port
&& data->scheme_type != URL_SCHEME_FILE;
else else
data->is_opaque = !data->host && !data->has_port; data->is_opaque = !data->host && !data->has_port;