Skip to content

W
wine-winehq
Commit 9eb140db authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard
Browse files
Options

urlmon: Fix handling of mailto URIs in CoInternetCombineUrlEx.

parent 873efd46
Show whitespace changes
Inline Side-by-side
Showing with 117 additions and 7 deletions
dlls/urlmon/tests/uri.c
View file @ 9eb140db
...@@ -4521,6 +4521,56 @@ static const uri_properties uri_tests[] = { ...@@ -4521,6 +4521,56 @@ static const uri_properties uri_tests[] = {
{URL_SCHEME_UNKNOWN,S_OK}, {URL_SCHEME_UNKNOWN,S_OK},
{URLZONE_INVALID,E_NOTIMPL} {URLZONE_INVALID,E_NOTIMPL}
} }
},
{ "mailto://", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE,
{
{"mailto:",S_OK},
{"",S_FALSE},
{"mailto:",S_OK},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"mailto://",S_OK,FALSE,"mailto:"},
{"mailto",S_OK},
{"",S_FALSE},
{"",S_FALSE}
},
{
{Uri_HOST_UNKNOWN,S_OK},
{0,S_FALSE},
{URL_SCHEME_MAILTO,S_OK},
{URLZONE_INVALID,E_NOTIMPL}
}
},
{ "mailto://a@b.com", Uri_CREATE_NO_CANONICALIZE, S_OK, FALSE,
{
{"mailto:a@b.com",S_OK},
{"",S_FALSE},
{"mailto:a@b.com",S_OK},
{"",S_FALSE},
{".com",S_OK},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"a@b.com",S_OK},
{"a@b.com",S_OK},
{"",S_FALSE},
{"mailto://a@b.com",S_OK,FALSE,"mailto:a@b.com"},
{"mailto",S_OK},
{"",S_FALSE},
{"",S_FALSE}
},
{
{Uri_HOST_UNKNOWN,S_OK},
{0,S_FALSE},
{URL_SCHEME_MAILTO,S_OK},
{URLZONE_INVALID,E_NOTIMPL}
}
} }
}; };
...@@ -7005,8 +7055,61 @@ static const uri_combine_test uri_combine_tests[] = { ...@@ -7005,8 +7055,61 @@ static const uri_combine_test uri_combine_tests[] = {
{URL_SCHEME_FILE,S_OK}, {URL_SCHEME_FILE,S_OK},
{URLZONE_INVALID,E_NOTIMPL} {URLZONE_INVALID,E_NOTIMPL}
} }
},
{ "http://winehq.org",0,
"mailto://",Uri_CREATE_NO_CANONICALIZE,
0,S_OK,FALSE,
{
{"mailto:",S_OK},
{"",S_FALSE},
{"mailto:",S_OK},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"mailto://",S_OK,FALSE,"mailto:"},
{"mailto",S_OK},
{"",S_FALSE},
{"",S_FALSE}
},
{
{Uri_HOST_UNKNOWN,S_OK},
{0,S_FALSE},
{URL_SCHEME_MAILTO,S_OK},
{URLZONE_INVALID,E_NOTIMPL}
}
},
{ "http://winehq.org",0,
"mailto://a@b.com",Uri_CREATE_NO_CANONICALIZE,
0,S_OK,FALSE,
{
{"mailto:a@b.com",S_OK},
{"",S_FALSE},
{"mailto:a@b.com",S_OK},
{"",S_FALSE},
{".com",S_OK},
{"",S_FALSE},
{"",S_FALSE},
{"",S_FALSE},
{"a@b.com",S_OK},
{"a@b.com",S_OK},
{"",S_FALSE},
{"mailto://a@b.com",S_OK,FALSE,"mailto:a@b.com"},
{"mailto",S_OK},
{"",S_FALSE},
{"",S_FALSE}
},
{
{Uri_HOST_UNKNOWN,S_OK},
{0,S_FALSE},
{URL_SCHEME_MAILTO,S_OK},
{URLZONE_INVALID,E_NOTIMPL}
}
} }
}; };
typedef struct _uri_parse_test { typedef struct _uri_parse_test {
...@@ -10317,7 +10420,7 @@ static void test_CoInternetCombineIUri(void) { ...@@ -10317,7 +10420,7 @@ static void test_CoInternetCombineIUri(void) {
todo_wine { todo_wine {
ok(!strcmp_aw(prop.value, received) || ok(!strcmp_aw(prop.value, received) ||
broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)),
"Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n",
prop.value, wine_dbgstr_w(received), i, j); prop.value, wine_dbgstr_w(received), i, j);
} }
} else { } else {
...@@ -10326,7 +10429,7 @@ static void test_CoInternetCombineIUri(void) { ...@@ -10326,7 +10429,7 @@ static void test_CoInternetCombineIUri(void) {
hr, prop.expected, i, j); hr, prop.expected, i, j);
ok(!strcmp_aw(prop.value, received) || ok(!strcmp_aw(prop.value, received) ||
broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)),
"Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n",
prop.value, wine_dbgstr_w(received), i, j); prop.value, wine_dbgstr_w(received), i, j);
} }
SysFreeString(received); SysFreeString(received);
...@@ -10634,7 +10737,7 @@ static void test_CoInternetCombineUrlEx(void) { ...@@ -10634,7 +10737,7 @@ static void test_CoInternetCombineUrlEx(void) {
todo_wine { todo_wine {
ok(!strcmp_aw(value, received) || ok(!strcmp_aw(value, received) ||
broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)),
"Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n",
value, wine_dbgstr_w(received), i, j); value, wine_dbgstr_w(received), i, j);
} }
} else { } else {
...@@ -10643,7 +10746,7 @@ static void test_CoInternetCombineUrlEx(void) { ...@@ -10643,7 +10746,7 @@ static void test_CoInternetCombineUrlEx(void) {
hr, prop.expected, i, j); hr, prop.expected, i, j);
ok(!strcmp_aw(value, received) || ok(!strcmp_aw(value, received) ||
broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)), broken(prop.broken_value && !strcmp_aw(prop.broken_value, received)),
"Error: Expected %s but got %s instead on uri_combine_tests[%d].str_props[%d].\n", "Error: Expected \"%s\" but got %s instead on uri_combine_tests[%d].str_props[%d].\n",
value, wine_dbgstr_w(received), i, j); value, wine_dbgstr_w(received), i, j);
} }
SysFreeString(received); SysFreeString(received);
......
dlls/urlmon/uri.c
View file @ 9eb140db
...@@ -422,7 +422,7 @@ static inline BOOL is_hierarchical_uri(const WCHAR **ptr, const parse_data *data ...@@ -422,7 +422,7 @@ static inline BOOL is_hierarchical_uri(const WCHAR **ptr, const parse_data *data
else if(is_hierarchical_scheme(data->scheme_type) && (*ptr)[0] == '\\' && (*ptr)[1] == '\\') { else if(is_hierarchical_scheme(data->scheme_type) && (*ptr)[0] == '\\' && (*ptr)[1] == '\\') {
*ptr += 2; *ptr += 2;
return TRUE; return TRUE;
} else if(check_hierarchical(ptr)) } else if(data->scheme_type != URL_SCHEME_MAILTO && check_hierarchical(ptr))
return TRUE; return TRUE;
*ptr = start; *ptr = start;
...@@ -1917,7 +1917,14 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f ...@@ -1917,7 +1917,14 @@ static BOOL parse_path_hierarchical(const WCHAR **ptr, parse_data *data, DWORD f
static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) { static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) {
const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN;
const BOOL is_file = data->scheme_type == URL_SCHEME_FILE; const BOOL is_file = data->scheme_type == URL_SCHEME_FILE;
const BOOL is_mailto = data->scheme_type == URL_SCHEME_MAILTO;
if (is_mailto && (*ptr)[0] == '/' && (*ptr)[1] == '/')
{
if ((*ptr)[2]) data->path = *ptr + 2;
else data->path = NULL;
}
else
data->path = *ptr; data->path = *ptr;
while(!is_path_delim(**ptr)) { while(!is_path_delim(**ptr)) {
...@@ -1938,7 +1945,7 @@ static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags) ...@@ -1938,7 +1945,7 @@ static BOOL parse_path_opaque(const WCHAR **ptr, parse_data *data, DWORD flags)
++(*ptr); ++(*ptr);
} }
data->path_len = *ptr - data->path; if (data->path) data->path_len = *ptr - data->path;
TRACE("(%p %p %x): Parsed opaque URI path %s len=%d\n", ptr, data, flags, TRACE("(%p %p %x): Parsed opaque URI path %s len=%d\n", ptr, data, flags,
debugstr_wn(data->path, data->path_len), data->path_len); debugstr_wn(data->path, data->path_len), data->path_len);
return TRUE; return TRUE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment