Jacek Caban : shlwapi: Fixed UrlCanonicalizeW for URLs without slashes after scheme.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a4ea1c608a198069147a10dae8ad40d2b0e25a98
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a4ea1c608a198069147a10dae8...

Author: Jacek Caban 
Date:   Wed Jul  9 20:01:57 2008 +0200

shlwapi: Fixed UrlCanonicalizeW for URLs without slashes after scheme.

---

dlls/shlwapi/tests/url.c |    1 +
 dlls/shlwapi/url.c       |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c
index 3b0633a..4eb581f 100644
--- a/dlls/shlwapi/tests/url.c
+++ b/dlls/shlwapi/tests/url.c
@@ -103,6 +103,7 @@ static const TEST_URL_CANONICALIZE TEST_CANONICALIZE[] = {
     {"res:///c:\tests\foo bar", URL_DONT_SIMPLIFY, S_OK, "res:///c:\tests\foo bar", TRUE},
     {"A", 0, S_OK, "A", FALSE},
     {"/uri-res/N2R?urn:sha1:B3K", URL_DONT_ESCAPE_EXTRA_INFO | URL_WININET_COMPATIBILITY /*0x82000000*/, S_OK, "/uri-res/N2R?urn:sha1:B3K", TRUE} /*LimeWire online installer calls this*/,
+    {"http:www.winehq.org/dir/../index.html", 0, S_OK, "http:www.winehq.org/index.html"},
     {"", 0, S_OK, "", FALSE}
 };

diff --git a/dlls/shlwapi/url.c b/dlls/shlwapi/url.c
index 2efe386..00d319d 100644
--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -384,7 +384,6 @@ HRESULT WINAPI UrlCanonicalizeW(LPCWSTR pszUrl, LPWSTR pszCanonicalized,
             if (*wk1++ == ':') state = 2;
             break;
         case 2:
-            if (*wk1 != '/') {state = 3; break;}
             *wk2++ = *wk1++;
             if (*wk1 != '/') {state = 6; break;}
             *wk2++ = *wk1++;