system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

urlmon: Properly handle combining relative mk: URIs containing full internal path.

Browse source
This commit is contained in:
Jacek Caban 2012-02-09 15:16:38 +01:00 committed by Alexandre Julliard
parent ac8360b3bf
commit 9cbcbe8da6
1 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
dlls/urlmon/uri.c
View file

@ -6389,13 +6389,25 @@ static HRESULT merge_paths(parse_data *data, const WCHAR *base, DWORD base_len,
WCHAR *ptr;
if(base_len) {
/* Find the characters that will be copied over from
* the base path.
*/
end = memrchrW(base, '/', base_len);
if(!end && data->scheme_type == URL_SCHEME_FILE)
/* Try looking for a '\\'. */
end = memrchrW(base, '\\', base_len);
if(data->scheme_type == URL_SCHEME_MK && *relative == '/') {
/* Find '::' segment */
for(end = base; end < base+base_len-1; end++) {
if(end[0] == ':' && end[1] == ':') {
end++;
break;
}
}
/* If not found, try finding the end of @xxx: */
if(end == base+base_len-1)
end = *base == '@' ? memchr(base, ':', base_len) : NULL;
}else {
/* Find the characters that will be copied over from the base path. */
end = memrchrW(base, '/', base_len);
if(!end && data->scheme_type == URL_SCHEME_FILE)
/* Try looking for a '\\'. */
end = memrchrW(base, '\\', base_len);
}
}
if(end) {
@ -6420,6 +6432,7 @@ static HRESULT merge_paths(parse_data *data, const WCHAR *base, DWORD base_len,
*ptr = '\0';
*result_len = (ptr-*result);
TRACE("ret %s\n", debugstr_wn(*result, *result_len));
return S_OK;
}
@ -6541,7 +6554,7 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result,
* relative path doesn't begin with a '/' then the base path and relative
* path are merged together.
*/
if(relative->path_len && *(relative->canon_uri+relative->path_start) == '/') {
if(relative->path_len && *(relative->canon_uri+relative->path_start) == '/' && data.scheme_type != URL_SCHEME_MK) {
WCHAR *tmp = NULL;
BOOL copy_drive_path = FALSE;