Skip to content

W
wine-winehq
Commit acfc1175 authored by Rob Shearman's avatar Rob Shearman Committed by Alexandre Julliard
Browse files
Options

shlwapi: Fix UrlCombineW for absolute URLs without slashes.

parent fba87b11
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
dlls/shlwapi/tests/path.c
View file @ acfc1175
......@@ -205,6 +205,10 @@ const TEST_URL_COMBINE TEST_COMBINE[] = {
{"xxx:@MSITStore:file.chm/file.html", "dir/file", 0, S_OK, "xxx:dir/file"},
{"mk:@MSITStore:file.chm::/file.html", "/dir/file", 0, S_OK, "mk:@MSITStore:file.chm::/dir/file"},
{"mk:@MSITStore:file.chm::/file.html", "mk:@MSITStore:file.chm::/dir/file", 0, S_OK, "mk:@MSITStore:file.chm::/dir/file"},
{"foo:today", "foo:calendar", 0, S_OK, "foo:calendar"},
{"foo:today", "bar:calendar", 0, S_OK, "bar:calendar"},
{"foo:/today", "foo:calendar", 0, S_OK, "foo:/calendar"},
{"foo:/today/", "foo:calendar", 0, S_OK, "foo:/today/calendar"},
};
struct {
......
dlls/shlwapi/url.c
View file @ acfc1175
......@@ -736,8 +736,9 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
process_case = 4;
break;
}
/* case where scheme is followed by document path */
process_case = 5;
/* replace either just location if base's location starts with a
* slash or otherwise everything */
process_case = (*base.pszSuffix == '/') ? 5 : 1;
break;
}
if ((*relative.pszSuffix == '/') && (*(relative.pszSuffix+1) == '/')) {
......
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