kernelbase: Also parse hostnames for news schemes in UrlGetPart().

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

kernelbase: Also parse hostnames for news schemes in UrlGetPart().
0df41c35 · Zebediah Figura · Alexandre Julliard · 05e82ba1 · 0df41c35 · 0df41c35
Commit 0df41c35 authored Feb 13, 2022 by Zebediah Figura Committed by Alexandre Julliard Feb 14, 2022
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 10 deletions

path.c dlls/kernelbase/path.c +6 -3

url.c dlls/shlwapi/tests/url.c +6 -7

No files found.
--- a/dlls/kernelbase/path.c
+++ b/dlls/kernelbase/path.c
@@ -4347,12 +4347,15 @@ HRESULT WINAPI UrlGetPartW(const WCHAR *url, WCHAR *out, DWORD *out_len, DWORD p
    case URL_PART_HOSTNAME:
        switch (scheme)
        {
+            case URL_SCHEME_FILE:
            case URL_SCHEME_FTP:
-            case URL_SCHEME_HTTP:
            case URL_SCHEME_GOPHER:
-            case URL_SCHEME_TELNET:
-            case URL_SCHEME_FILE:
+            case URL_SCHEME_HTTP:
            case URL_SCHEME_HTTPS:
+            case URL_SCHEME_TELNET:
+            case URL_SCHEME_NEWS:
+            case URL_SCHEME_NNTP:
+            case URL_SCHEME_SNEWS:
                break;
            default:
                *out_len = 0;

--- a/dlls/shlwapi/tests/url.c
+++ b/dlls/shlwapi/tests/url.c
@@ -728,11 +728,11 @@ static void test_UrlGetPart(void)
        {"local://hostname/", URL_PART_HOSTNAME, 0, E_FAIL},
        {"mailto://hostname/", URL_PART_HOSTNAME, 0, E_FAIL},
        {"mk://hostname/", URL_PART_HOSTNAME, 0, E_FAIL},
-        {"news://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname", .todo_hr = TRUE},
-        {"nntp://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname", .todo_hr = TRUE},
+        {"news://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname"},
+        {"nntp://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname"},
        {"res://hostname/", URL_PART_HOSTNAME, 0, E_FAIL},
        {"shell://hostname/", URL_PART_HOSTNAME, 0, E_FAIL},
-        {"snews://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname", .todo_hr = TRUE},
+        {"snews://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname"},
        {"telnet://hostname/", URL_PART_HOSTNAME, 0, S_OK, "hostname"},
        {"vbscript://hostname/", URL_PART_HOSTNAME, 0, E_FAIL},
        {"wais://hostname/", URL_PART_HOSTNAME, 0, E_FAIL},
@@ -742,9 +742,9 @@ static void test_UrlGetPart(void)
        {"gopher://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "gopher:hostname"},
        {"http://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "http:hostname"},
        {"https://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "https:hostname"},
-        {"news://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "news:hostname", .todo_hr = TRUE},
-        {"nntp://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "nntp:hostname", .todo_hr = TRUE},
-        {"snews://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "snews:hostname", .todo_hr = TRUE},
+        {"news://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "news:hostname"},
+        {"nntp://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "nntp:hostname"},
+        {"snews://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "snews:hostname"},
        {"telnet://hostname/", URL_PART_HOSTNAME, URL_PARTFLAG_KEEPSCHEME, S_OK, "telnet:hostname"},
    };

@@ -876,7 +876,6 @@ static void test_UrlGetPart(void)
        {
            ok(size == wcslen(bufferW), "Got size %u.\n", size);
            MultiByteToWideChar(CP_ACP, 0, buffer, -1, expectW, ARRAY_SIZE(expectW));
-            todo_wine_if (strstr(url, "news") || strstr(url, "nntp"))
            ok(!wcscmp(bufferW, expectW), "Got result %s.\n", debugstr_w(bufferW));
        }
        else