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

shlwapi: Fix UrlCombineW for absolute URLs without slashes.

This commit is contained in:
Rob Shearman 2007-08-23 16:42:29 +01:00 committed by Alexandre Julliard
parent fba87b110f
commit acfc1175a2
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/shlwapi/tests/path.c
View File

@ -205,6 +205,10 @@ const TEST_URL_COMBINE TEST_COMBINE[] = {
{"xxx:@MSITStore:file.chm/file.html", "dir/file", 0, S_OK, "xxx:dir/file"}, {"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", "/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"}, {"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 { struct {

5
dlls/shlwapi/url.c
View File

@ -736,8 +736,9 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
process_case = 4; process_case = 4;
break; break;
} }
/* case where scheme is followed by document path */ /* replace either just location if base's location starts with a
process_case = 5; * slash or otherwise everything */
process_case = (*base.pszSuffix == '/') ? 5 : 1;
break; break;
} }
if ((*relative.pszSuffix == '/') && (*(relative.pszSuffix+1) == '/')) { if ((*relative.pszSuffix == '/') && (*(relative.pszSuffix+1) == '/')) {