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

shlwapi: UrlIs()'s check for the 'file:' protocol is case insensitive.

Browse Source
This commit is contained in:
Francois Gouget 2012-09-26 04:20:00 +02:00 committed by Alexandre Julliard
parent 7fcf7e831c
commit 7c42bfe107
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/shlwapi/tests/url.c
View File

@ -450,7 +450,8 @@ static const struct {
{ "file://e:/b/c", FALSE, TRUE }, { "file://e:/b/c", FALSE, TRUE },
{ "http:partial", FALSE, FALSE }, { "http:partial", FALSE, FALSE },
{ "mailto://www.winehq.org/test.html", TRUE, FALSE }, { "mailto://www.winehq.org/test.html", TRUE, FALSE },
{ "file:partial", FALSE, TRUE } { "file:partial", FALSE, TRUE },
{ "File:partial", FALSE, TRUE },
}; };
/* ########################### */ /* ########################### */

8
dlls/shlwapi/url.c
View File

@ -1864,7 +1864,8 @@ BOOL WINAPI UrlIsA(LPCSTR pszUrl, URLIS Urlis)
return FALSE; return FALSE;
case URLIS_FILEURL: case URLIS_FILEURL:
return !StrCmpNA("file:", pszUrl, 5); return (CompareStringA(LOCALE_INVARIANT, NORM_IGNORECASE, pszUrl, 5,
"file:", 5) == CSTR_EQUAL);
case URLIS_DIRECTORY: case URLIS_DIRECTORY:
last = pszUrl + strlen(pszUrl) - 1; last = pszUrl + strlen(pszUrl) - 1;
@ -1889,7 +1890,7 @@ BOOL WINAPI UrlIsA(LPCSTR pszUrl, URLIS Urlis)
*/ */
BOOL WINAPI UrlIsW(LPCWSTR pszUrl, URLIS Urlis) BOOL WINAPI UrlIsW(LPCWSTR pszUrl, URLIS Urlis)
{ {
static const WCHAR stemp[] = { 'f','i','l','e',':',0 }; static const WCHAR file_colon[] = { 'f','i','l','e',':',0 };
PARSEDURLW base; PARSEDURLW base;
DWORD res1; DWORD res1;
LPCWSTR last; LPCWSTR last;
@ -1917,7 +1918,8 @@ BOOL WINAPI UrlIsW(LPCWSTR pszUrl, URLIS Urlis)
return FALSE; return FALSE;
case URLIS_FILEURL: case URLIS_FILEURL:
return !strncmpW(stemp, pszUrl, 5); return (CompareStringW(LOCALE_INVARIANT, NORM_IGNORECASE, pszUrl, 5,
file_colon, 5) == CSTR_EQUAL);
case URLIS_DIRECTORY: case URLIS_DIRECTORY:
last = pszUrl + strlenW(pszUrl) - 1; last = pszUrl + strlenW(pszUrl) - 1;