Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-03 07:53:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

sync shlwapi with wine 1.1.23

Browse source 
svn path=/trunk/; revision=41327
This commit is contained in:
Christoph von Wittich 2009-06-07 10:54:09 +00:00
parent 1f0e368a20
commit a4e75a5669
1 changed files with 1 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
reactos/dll/win32/shlwapi/url.c
View file

@ -129,19 +129,6 @@ static DWORD get_scheme_code(LPCWSTR scheme, DWORD scheme_len)
return URL_SCHEME_UNKNOWN;
}
static BOOL URL_JustLocation(LPCWSTR str)
{
while(*str && (*str == '/')) str++;
if (*str) {
while (*str && ((*str == '-') ||
(*str == '.') ||
isalnumW(*str))) str++;
if (*str == '/') return FALSE;
}
return TRUE;
}
/*************************************************************************
* @ [SHLWAPI.1]
*
@ -608,7 +595,6 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
DWORD len, res1, res2, process_case = 0;
LPWSTR work, preliminary, mbase, mrelative;
static const WCHAR myfilestr[] = {'f','i','l','e',':','/','/','/','\0'};
static const WCHAR single_slash[] = {'/','\0'};
HRESULT ret;
TRACE("(base %s, Relative %s, Combine size %d, flags %08x)\n",
@ -768,14 +754,8 @@ HRESULT WINAPI UrlCombineW(LPCWSTR pszBase, LPCWSTR pszRelative,
strcatW(preliminary, mrelative);
break;
case 2: /*
* Same as case 1, but if URL_PLUGGABLE_PROTOCOL was specified
* and pszRelative starts with "//", then append a "/"
*/
case 2: /* case where pszRelative replaces scheme, and location */
strcpyW(preliminary, mrelative);
if (!(dwFlags & URL_PLUGGABLE_PROTOCOL) &&
URL_JustLocation(relative.pszSuffix))
strcatW(preliminary, single_slash);
break;
case 3: /*