kernelbase: Handle UNC path in UrlApplySchemeW.

Fixes loading XML from a UNC path. Signed-off-by: Daniel Lehman <dlehman@esri.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

kernelbase: Handle UNC path in UrlApplySchemeW.
2a5682d9 · Daniel Lehman · Alexandre Julliard · ebc60f64 · 2a5682d9 · 2a5682d9
Commit 2a5682d9 authored Nov 23, 2021 by Daniel Lehman Committed by Alexandre Julliard Nov 23, 2021
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

path.c dlls/kernelbase/path.c +1 -1

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

No files found.
--- a/dlls/kernelbase/path.c
+++ b/dlls/kernelbase/path.c
@@ -4020,7 +4020,7 @@ HRESULT WINAPI UrlApplySchemeW(const WCHAR *url, WCHAR *out, DWORD *length, DWOR

    if (flags & URL_APPLY_GUESSFILE)
    {
-        if (*length > 1 && ':' == url[1])
+        if ((*length > 1 && ':' == url[1]) || PathIsUNCW(url))
        {
            res1 = *length;
            hr = url_create_from_path(url, out, &res1);

--- a/dlls/shlwapi/tests/url.c
+++ b/dlls/shlwapi/tests/url.c
@@ -97,6 +97,11 @@ static const TEST_URL_APPLY TEST_APPLY[] = {
    {"u:\\windows", URL_APPLY_DEFAULT, S_OK, 17, "http://u:\\windows"},
    {"file:///c:/windows", URL_APPLY_GUESSFILE , S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA},
    {"aa:\\windows", URL_APPLY_GUESSFILE , S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA},
+    {"\\\\server\\share", URL_APPLY_DEFAULT, S_OK, 21, "http://\\\\server\\share"},
+    {"\\\\server\\share", URL_APPLY_GUESSFILE, S_OK, 19, "file://server/share"},
+    {"\\\\server\\share", URL_APPLY_GUESSSCHEME, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA},
+    {"file://server/share", URL_APPLY_GUESSFILE, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA},
+    {"file://server/share", URL_APPLY_GUESSSCHEME, S_FALSE, TEST_APPLY_MAX_LENGTH, untouchedA},
 };

 /* ################ */