Jacek Caban : shlwapi: Change file path to URL in UrlCanonicalize.
Alexandre Julliard
julliard at wine.codeweavers.com
Mon Jul 31 04:32:06 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 5d1b0d89b402e80d8ffc6cbb8dcdd2df76b834be
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=5d1b0d89b402e80d8ffc6cbb8dcdd2df76b834be
Author: Jacek Caban <jacek at codeweavers.com>
Date: Sat Jul 29 16:11:31 2006 +0200
shlwapi: Change file path to URL in UrlCanonicalize.
---
dlls/shlwapi/tests/path.c | 7 ++++++-
dlls/shlwapi/url.c | 16 +++++++++++++++-
2 files changed, 21 insertions(+), 2 deletions(-)
diff --git a/dlls/shlwapi/tests/path.c b/dlls/shlwapi/tests/path.c
index abb13ce..d55d19d 100644
--- a/dlls/shlwapi/tests/path.c
+++ b/dlls/shlwapi/tests/path.c
@@ -77,6 +77,11 @@ const TEST_URL_CANONICALIZE TEST_CANONIC
{"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"},
+ {"c:\\dir\\file", 0, S_OK, "file:///c:/dir/file"},
+ {"file:///c:\\dir\\file", 0, S_OK, "file:///c:/dir/file"},
+ {"c:dir\\file", 0, S_OK, "file:///c:dir/file"},
+ {"A", 0, S_OK, "A"},
+ {"", 0, S_OK, ""}
};
typedef struct _TEST_URL_ESCAPE {
@@ -429,7 +434,7 @@ static void test_url_canonicalize(const
dwSize = INTERNET_MAX_URL_LENGTH;
ok(UrlCanonicalizeA(szUrl, NULL, &dwSize, dwFlags) != dwExpectReturn, "Unexpected return for NULL buffer\n");
ok(UrlCanonicalizeA(szUrl, szReturnUrl, &dwSize, dwFlags) == dwExpectReturn, "UrlCanonicalizeA didn't return 0x%08lx\n", dwExpectReturn);
- ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08lx Expected %s, but got %s\n", dwFlags, szExpectUrl, szReturnUrl);
+ ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08lx Expected \"%s\", but got \"%s\"\n", dwFlags, szExpectUrl, szReturnUrl);
dwSize = INTERNET_MAX_URL_LENGTH;
ok(UrlCanonicalizeW(wszUrl, NULL, &dwSize, dwFlags) != dwExpectReturn, "Unexpected return for NULL buffer\n");
diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index 47334f6..3c4f28b 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -340,8 +340,13 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR
if(!pszUrl || !pszCanonicalized || !pcchCanonicalized)
return E_INVALIDARG;
+ if(!*pszUrl) {
+ *pszCanonicalized = 0;
+ return S_OK;
+ }
+
nByteLen = (lstrlenW(pszUrl) + 1) * sizeof(WCHAR); /* length in bytes */
- lpszUrlCpy = HeapAlloc(GetProcessHeap(), 0, nByteLen);
+ lpszUrlCpy = HeapAlloc(GetProcessHeap(), 0, INTERNET_MAX_URL_LENGTH);
if((dwFlags & URL_FILE_USE_PATHURL) && nByteLen >= sizeof(wszFile)
&& !memcmp(wszFile, pszUrl, sizeof(wszFile)))
@@ -361,6 +366,15 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR
wk1 = (LPWSTR)pszUrl;
wk2 = lpszUrlCpy;
state = 0;
+
+ if(pszUrl[1] == ':') { /* Assume path */
+ static const WCHAR wszFilePrefix[] = {'f','i','l','e',':','/','/','/'};
+
+ memcpy(wk2, wszFilePrefix, sizeof(wszFilePrefix));
+ wk2 += sizeof(wszFilePrefix)/sizeof(WCHAR);
+ state = 5;
+ }
+
while (*wk1) {
switch (state) {
case 0:
More information about the wine-cvs
mailing list