From 534b6557e7dadb9557fc4e75e87e899dd2edb584 Mon Sep 17 00:00:00 2001 From: Daniel Lehman Date: Tue, 23 Nov 2021 07:42:22 -0800 Subject: [PATCH 1/2] shlwapi/tests: Add some UrlApplyScheme tests. Signed-off-by: Daniel Lehman --- dlls/shlwapi/tests/url.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/shlwapi/tests/url.c b/dlls/shlwapi/tests/url.c index 9e04c6d7b6f6..ea180155f214 100644 --- a/dlls/shlwapi/tests/url.c +++ b/dlls/shlwapi/tests/url.c @@ -73,6 +73,7 @@ typedef struct _TEST_URL_APPLY { HRESULT res; DWORD newlen; const char * newurl; + BOOL todo; } TEST_URL_APPLY; static const TEST_URL_APPLY TEST_APPLY[] = { @@ -97,6 +98,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", TRUE}, + {"\\\\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}, }; /* ################ */ @@ -543,6 +549,7 @@ static void test_UrlApplyScheme(void) len = TEST_APPLY_MAX_LENGTH; lstrcpyA(newurl, untouchedA); res = pUrlApplySchemeA(TEST_APPLY[i].url, newurl, &len, TEST_APPLY[i].flags); + todo_wine_if(TEST_APPLY[i].todo) { ok( res == TEST_APPLY[i].res, "#%dA: got HRESULT 0x%x (expected 0x%x)\n", i, res, TEST_APPLY[i].res); @@ -551,7 +558,7 @@ static void test_UrlApplyScheme(void) ok( !lstrcmpA(newurl, TEST_APPLY[i].newurl), "#%dA: got '%s' (expected '%s')\n", i, newurl, TEST_APPLY[i].newurl); - + } /* returned length is in character */ len = TEST_APPLY_MAX_LENGTH; lstrcpyA(newurl, untouchedA); @@ -560,6 +567,7 @@ static void test_UrlApplyScheme(void) res = pUrlApplySchemeW(urlW, newurlW, &len, TEST_APPLY[i].flags); WideCharToMultiByte(CP_ACP, 0, newurlW, -1, newurl, TEST_APPLY_MAX_LENGTH, NULL, NULL); + todo_wine_if(TEST_APPLY[i].todo) { ok( res == TEST_APPLY[i].res, "#%dW: got HRESULT 0x%x (expected 0x%x)\n", i, res, TEST_APPLY[i].res); @@ -568,7 +576,7 @@ static void test_UrlApplyScheme(void) ok( !lstrcmpA(newurl, TEST_APPLY[i].newurl), "#%dW: got '%s' (expected '%s')\n", i, newurl, TEST_APPLY[i].newurl); - + } } /* buffer too small */ -- 2.27.0