Module: wine Branch: refs/heads/master Commit: fddd703b38675e9e8bffd21f8c5a48ca76e35fc3 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fddd703b38675e9e8bffd21f... Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jul 26 20:55:56 2006 +0200 shlwapi: Change '/'->'\' only for file protocol in UrlCanonicalize. --- dlls/shlwapi/tests/path.c | 2 ++ dlls/shlwapi/url.c | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c index 1124b2a..abb13ce 100644 --- a/dlls/shlwapi/tests/path.c +++ b/dlls/shlwapi/tests/path.c @@ -75,6 +75,8 @@ const TEST_URL_CANONICALIZE TEST_CANONIC {"file:///c://tests/foo%20bar", URL_FILE_USE_PATHURL, S_OK, "file://c:\\\\tests\\foo bar"}, {"file:///c:\\tests\\foo bar", 0, S_OK, "file:///c:/tests/foo bar"}, {"file:///c:\\tests\\foo bar", URL_DONT_SIMPLIFY, S_OK, "file:///c:/tests/foo bar"}, + {"http://www.winehq.org/site/about", URL_FILE_USE_PATHURL, S_OK, "http://www.winehq.org/site/about"}, + {"file_://www.winehq.org/site/about", URL_FILE_USE_PATHURL, S_OK, "file_://www.winehq.org/site/about"}, }; typedef struct _TEST_URL_ESCAPE { diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c index 4710e75..47334f6 100644 --- a/dlls/shlwapi/url.c +++ b/dlls/shlwapi/url.c @@ -330,7 +330,9 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR LPWSTR lpszUrlCpy, wk1, wk2, mp, mp2, root; INT nByteLen, state; DWORD nLen, nWkLen; - WCHAR slash = dwFlags & URL_FILE_USE_PATHURL ? '\\' : '/'; + WCHAR slash = '/'; + + static const WCHAR wszFile[] = {'f','i','l','e',':'}; TRACE("(%s %p %p 0x%08lx)\n", debugstr_w(pszUrl), pszCanonicalized, pcchCanonicalized, dwFlags); @@ -341,6 +343,10 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR nByteLen = (lstrlenW(pszUrl) + 1) * sizeof(WCHAR); /* length in bytes */ lpszUrlCpy = HeapAlloc(GetProcessHeap(), 0, nByteLen); + if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile) + && !memcmp(wszFile, pszUrl, sizeof(wszFile))) + slash = '\\'; + /* * state = * 0 initial 1,3