shlwapi: Don't unescape url in UrlCombineW with URL_FILE_USE_PATHURL flag.
This commit is contained in:
parent
fbfe9a72de
commit
dae390d90b
|
@ -195,7 +195,10 @@ const TEST_URL_COMBINE TEST_COMBINE[] = {
|
||||||
{"http://www.winehq.org/tests/#example", "tests9", 0, S_OK, "http://www.winehq.org/tests/tests9"},
|
{"http://www.winehq.org/tests/#example", "tests9", 0, S_OK, "http://www.winehq.org/tests/tests9"},
|
||||||
{"http://www.winehq.org/tests/../tests/", "/tests10/..", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests10/.."},
|
{"http://www.winehq.org/tests/../tests/", "/tests10/..", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests10/.."},
|
||||||
{"http://www.winehq.org/tests/../", "tests11", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests/../tests11"},
|
{"http://www.winehq.org/tests/../", "tests11", URL_DONT_SIMPLIFY, S_OK, "http://www.winehq.org/tests/../tests11"},
|
||||||
{"file:///C:\\dir\\file.txt", "test.txt", 0, S_OK, "file:///C:/dir/test.txt"}
|
{"file:///C:\\dir\\file.txt", "test.txt", 0, S_OK, "file:///C:/dir/test.txt"},
|
||||||
|
{"http://www.winehq.org/test/", "test%20file.txt", 0, S_OK, "http://www.winehq.org/test/test%20file.txt"},
|
||||||
|
{"http://www.winehq.org/test/", "test%20file.txt", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org/test/test%20file.txt"},
|
||||||
|
{"http://www.winehq.org%2ftest/", "test%20file.txt", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org%2ftest/test%20file.txt"}
|
||||||
};
|
};
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
|
|
|
@ -803,7 +803,7 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
|
||||||
|
|
||||||
if (ret == S_OK) {
|
if (ret == S_OK) {
|
||||||
/* Reuse mrelative as temp storage as its already allocated and not needed anymore */
|
/* Reuse mrelative as temp storage as its already allocated and not needed anymore */
|
||||||
ret = UrlCanonicalizeW(preliminary, mrelative, pcchCombined, dwFlags);
|
ret = UrlCanonicalizeW(preliminary, mrelative, pcchCombined, (dwFlags & ~URL_FILE_USE_PATHURL));
|
||||||
if(SUCCEEDED(ret) && pszCombined) {
|
if(SUCCEEDED(ret) && pszCombined) {
|
||||||
lstrcpyW(pszCombined, mrelative);
|
lstrcpyW(pszCombined, mrelative);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue