[ros-diffs] [cwittich] 41327: sync shlwapi with wine 1.1.23

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sun Jun  7 14:54:09 2009
New Revision: 41327

URL: http://svn.reactos.org/svn/reactos?rev=41327&view=rev
Log:
sync shlwapi with wine 1.1.23

Modified:
    trunk/reactos/dll/win32/shlwapi/url.c

Modified: trunk/reactos/dll/win32/shlwapi/url.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/url.c?rev=41327&r1=41326&r2=41327&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/url.c [iso-8859-1] Sun Jun  7 14:54:09 2009
@@ -128,19 +128,6 @@
 
     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 @@
     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 @@
 	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:  /*