shlwapi: URL schemes may contain hyphen, plus, or period.

Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

shlwapi: URL schemes may contain hyphen, plus, or period.
3559c261 · Zebediah Figura · Alexandre Julliard · 52e45d8f · 3559c261 · 3559c261
Commit 3559c261 authored Sep 21, 2017 by Zebediah Figura Committed by Alexandre Julliard Sep 22, 2017
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

url.c dlls/shlwapi/tests/url.c +1 -0

url.c dlls/shlwapi/url.c +2 -2

No files found.
--- a/dlls/shlwapi/tests/url.c
+++ b/dlls/shlwapi/tests/url.c
@@ -1483,6 +1483,7 @@ static const struct parse_url_test_t {
    {"ab-://www.winehq.org/",S_OK,3,URL_SCHEME_UNKNOWN},
    {" http://www.winehq.org/",URL_E_INVALID_SYNTAX},
    {"HTTP://www.winehq.org/",S_OK,4,URL_SCHEME_HTTP},
+    {"a+-.://www.winehq.org/",S_OK,4,URL_SCHEME_UNKNOWN},
 };

 static void test_ParseURL(void)

--- a/dlls/shlwapi/url.c
+++ b/dlls/shlwapi/url.c
@@ -169,7 +169,7 @@ HRESULT WINAPI ParseURLA(LPCSTR x, PARSEDURLA *y)
    if(y->cbSize != sizeof(*y))
        return E_INVALIDARG;

-    while(*ptr && (isalnum(*ptr) || *ptr == '-'))
+    while(*ptr && (isalnum(*ptr) || *ptr == '-' || *ptr == '+' || *ptr == '.'))
        ptr++;

    if (*ptr != ':' || ptr <= x+1) {
@@ -203,7 +203,7 @@ HRESULT WINAPI ParseURLW(LPCWSTR x, PARSEDURLW *y)
    if(y->cbSize != sizeof(*y))
        return E_INVALIDARG;

-    while(*ptr && (isalnumW(*ptr) || *ptr == '-'))
+    while(*ptr && (isalnumW(*ptr) || *ptr == '-' || *ptr == '+' || *ptr == '.'))
        ptr++;

    if (*ptr != ':' || ptr <= x+1) {