November 2018 - Wine-devel - list.winehq.org

[PATCH 4/5] kernelbase: Implement PathCchStripToRoot.
by Zhiyi Zhang 22 Nov '18

22 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 39 ++++++ dlls/kernelbase/tests/path.c | 128 ++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 170 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index e07fe02a51..a09889f415 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -18,5 +18,5 @@ @ stdcall PathCchRenameExtension(wstr long wstr) kernelbase.PathCchRenameExtension @ stdcall PathCchSkipRoot(wstr ptr) kernelbase.PathCchSkipRoot @ stdcall PathCchStripPrefix(wstr long) kernelbase.PathCchStripPrefix -@ stub PathCchStripToRoot +@ stdcall PathCchStripToRoot(wstr long) kernelbase.PathCchStripToRoot @ stdcall PathIsUNCEx(wstr ptr) kernelbase.PathIsUNCEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index eae67be147..aefc63e54c 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1047,7 +1047,7 @@ @ stdcall PathCchRenameExtension(wstr long wstr) @ stdcall PathCchSkipRoot(wstr ptr) @ stdcall PathCchStripPrefix(wstr long) -# @ stub PathCchStripToRoot +@ stdcall PathCchStripToRoot(wstr long) @ stdcall PathCombineA(ptr str str) shlwapi.PathCombineA @ stdcall PathCombineW(ptr wstr wstr) shlwapi.PathCombineW @ stdcall PathCommonPrefixA(str str ptr) shlwapi.PathCommonPrefixA diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 168edd0610..c59fba8d3e 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -330,6 +330,45 @@ HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size) return S_FALSE; } +HRESULT WINAPI PathCchStripToRoot(WCHAR *path, SIZE_T size) +{ + const WCHAR *root_end; + WCHAR *segment_end; + BOOL is_unc; + + TRACE("%s %lu\n", wine_dbgstr_w(path), size); + + if (!path || !*path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + /* \\\\?\\UNC\\* and \\\\* have to have at least two extra segments to be striped, + * e.g. \\\\?\\UNC\\a\\b\\c -> \\\\?\\UNC\\a\\b + * \\\\a\\b\\c -> \\\\a\\b */ + if ((is_unc = is_prefixed_unc(path)) || (path[0] == '\\' && path[1] == '\\' && path[2] != '?')) + { + root_end = is_unc ? path + 8 : path + 3; + if (!get_next_segment(root_end, &root_end)) return S_FALSE; + if (!get_next_segment(root_end, &root_end)) return S_FALSE; + + if (root_end - path >= size) return E_INVALIDARG; + + segment_end = path + (root_end - path) - 1; + *segment_end = 0; + return S_OK; + } + else if (PathCchSkipRoot(path, &root_end) == S_OK) + { + if (root_end - path >= size) return E_INVALIDARG; + + segment_end = path + (root_end - path); + if (!*segment_end) return S_FALSE; + + *segment_end = 0; + return S_OK; + } + else + return E_INVALIDARG; +} + BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server) { const WCHAR *result = NULL; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index f54e77be46..5b47b84831 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -39,6 +39,7 @@ HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT (WINAPI *pPathCchSkipRoot)(const WCHAR *path, const WCHAR **root_end); HRESULT (WINAPI *pPathCchStripPrefix)(WCHAR *path, SIZE_T size); +HRESULT (WINAPI *pPathCchStripToRoot)(WCHAR *path, SIZE_T size); BOOL (WINAPI *pPathIsUNCEx)(const WCHAR *path, const WCHAR **server); static const struct @@ -835,6 +836,131 @@ static void test_PathCchStripPrefix(void) } } +struct striptoroot_test +{ + const CHAR *path; + const CHAR *root; + HRESULT hr; + SIZE_T size; +}; + +static const struct striptoroot_test striptoroot_tests[] = +{ + /* Invalid */ + {"", "", E_INVALIDARG}, + {"C", NULL, E_INVALIDARG}, + {"\\\\?\\UNC", NULL, E_INVALIDARG}, + + /* Size */ + {"C:\\", NULL, E_INVALIDARG, PATHCCH_MAX_CCH + 1}, + {"C:\\", "C:\\", S_FALSE, PATHCCH_MAX_CCH}, + /* Size < original path length + 1, read beyond size */ + {"C:\\a", "C:\\", S_OK, ARRAY_SIZE("C:\\a") - 1}, + /* Size < stripped path length + 1 */ + {"C:\\a", "C:\\", E_INVALIDARG, ARRAY_SIZE("C:\\") - 1}, + {"\\\\a\\b\\c", NULL, E_INVALIDARG, ARRAY_SIZE("\\\\a\\b") - 1}, + + /* X: */ + {"C:", "C:", S_FALSE}, + {"C:a", "C:", S_OK}, + {"C:a\\b", "C:", S_OK}, + {"C:a\\b\\c", "C:", S_OK}, + + /* X:\ */ + {"C:\\", "C:\\", S_FALSE}, + {"C:\\a", "C:\\", S_OK}, + {"C:\\a\\b", "C:\\", S_OK}, + {"C:\\a\\b\\c", "C:\\", S_OK}, + + /* \ */ + {"\\", "\\", S_FALSE}, + {"\\a", "\\", S_OK}, + {"\\a\\b", "\\", S_OK}, + {"\\a\\b\\c", "\\", S_OK}, + + /* \\ */ + {"\\\\", "\\\\", S_FALSE}, + {"\\\\a", "\\\\a", S_FALSE}, + {"\\\\a\\b", "\\\\a\\b", S_FALSE}, + {"\\\\a\\b\\c", "\\\\a\\b", S_OK}, + + /* UNC */ + {"\\\\?\\UNC\\", "\\\\?\\UNC\\", S_FALSE}, + {"\\\\?\\UNC\\a", "\\\\?\\UNC\\a", S_FALSE}, + {"\\\\?\\UNC\\a\\b", "\\\\?\\UNC\\a\\b", S_FALSE}, + {"\\\\?\\UNC\\a\\b\\", "\\\\?\\UNC\\a\\b", S_OK}, + {"\\\\?\\UNC\\a\\b\\c", "\\\\?\\UNC\\a\\b", S_OK}, + + /* Prefixed X: */ + {"\\\\?\\C:", "\\\\?\\C:", S_FALSE}, + {"\\\\?\\C:a", "\\\\?\\C:", S_OK}, + {"\\\\?\\C:a\\b", "\\\\?\\C:", S_OK}, + {"\\\\?\\C:a\\b\\c", "\\\\?\\C:", S_OK}, + + /* Prefixed X:\ */ + {"\\\\?\\C:\\", "\\\\?\\C:\\", S_FALSE}, + {"\\\\?\\C:\\a", "\\\\?\\C:\\", S_OK}, + {"\\\\?\\C:\\a\\b", "\\\\?\\C:\\", S_OK}, + {"\\\\?\\C:\\a\\b\\c", "\\\\?\\C:\\", S_OK}, + + /* UNC Volume */ + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", S_FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a\\b", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a\\b\\c", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", S_OK}, + + /* UNC Volume with backslash */ + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", S_FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a\\b", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a\\b\\c", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", S_OK}, +}; + +static void test_PathCchStripToRoot(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH]; + CHAR rootA[PATHCCH_MAX_CCH]; + SIZE_T size; + HRESULT hr; + INT i; + + if (!pPathCchStripToRoot) + { + win_skip("PathCchStripToRoot() is not available.\n"); + return; + } + + /* Null arguments */ + hr = pPathCchStripToRoot(NULL, ARRAY_SIZE(pathW)); + ok(hr == E_INVALIDARG, "Expect result %#x, got %#x\n", E_INVALIDARG, hr); + + MultiByteToWideChar(CP_ACP, 0, "C:\\a", -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchStripToRoot(pathW, 0); + ok(hr == E_INVALIDARG, "Expect result %#x, got %#x\n", E_INVALIDARG, hr); + + for (i = 0; i < ARRAY_SIZE(striptoroot_tests); i++) + { + const struct striptoroot_test *t = striptoroot_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + size = t->size ? t->size : ARRAY_SIZE(pathW); + hr = pPathCchStripToRoot(pathW, size); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, rootA, ARRAY_SIZE(rootA), NULL, NULL); + ok(!lstrcmpA(rootA, t->root), "path %s expect stripped path %s, got %s\n", t->path, t->root, rootA); + } + } +} + struct isuncex_test { const CHAR *path; @@ -917,6 +1043,7 @@ START_TEST(path) pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); pPathCchSkipRoot = (void *)GetProcAddress(hmod, "PathCchSkipRoot"); pPathCchStripPrefix = (void *)GetProcAddress(hmod, "PathCchStripPrefix"); + pPathCchStripToRoot = (void *)GetProcAddress(hmod, "PathCchStripToRoot"); pPathIsUNCEx = (void *)GetProcAddress(hmod, "PathIsUNCEx"); test_PathCchCombineEx(); @@ -928,5 +1055,6 @@ START_TEST(path) test_PathCchRenameExtension(); test_PathCchSkipRoot(); test_PathCchStripPrefix(); + test_PathCchStripToRoot(); test_PathIsUNCEx(); } diff --git a/include/pathcch.h b/include/pathcch.h index 42bae4edd0..56920b3444 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -34,4 +34,5 @@ HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end); HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size); +HRESULT WINAPI PathCchStripToRoot(WCHAR *path, SIZE_T size); BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server); -- 2.19.1

1 0

[PATCH 3/5] kernelbase: Implement PathCchSkipRoot.
by Zhiyi Zhang 22 Nov '18

22 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 110 +++++++++++++++ dlls/kernelbase/tests/path.c | 128 ++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 241 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index 53f7b987ca..e07fe02a51 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -16,7 +16,7 @@ @ stdcall PathCchRemoveExtension(wstr long) kernelbase.PathCchRemoveExtension @ stub PathCchRemoveFileSpec @ stdcall PathCchRenameExtension(wstr long wstr) kernelbase.PathCchRenameExtension -@ stub PathCchSkipRoot +@ stdcall PathCchSkipRoot(wstr ptr) kernelbase.PathCchSkipRoot @ stdcall PathCchStripPrefix(wstr long) kernelbase.PathCchStripPrefix @ stub PathCchStripToRoot @ stdcall PathIsUNCEx(wstr ptr) kernelbase.PathIsUNCEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 8f4136eb6b..eae67be147 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1045,7 +1045,7 @@ @ stdcall PathCchRemoveExtension(wstr long) # @ stub PathCchRemoveFileSpec @ stdcall PathCchRenameExtension(wstr long wstr) -# @ stub PathCchSkipRoot +@ stdcall PathCchSkipRoot(wstr ptr) @ stdcall PathCchStripPrefix(wstr long) # @ stub PathCchStripToRoot @ stdcall PathCombineA(ptr str str) shlwapi.PathCombineA diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 366efa41e1..168edd0610 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -50,6 +50,84 @@ static BOOL is_prefixed_disk(const WCHAR *string) return !memcmp(string, prefix, sizeof(prefix)) && isalphaW(string[4]) && string[5] == ':'; } +static BOOL is_prefixed_volume(const WCHAR *string) +{ + static const WCHAR prefixed_volume[] = {'\\', '\\', '?', '\\', 'V', 'o', 'l', 'u', 'm', 'e'}; + const WCHAR *guid; + INT ret; + INT i = 0; + + ret = memicmpW(string, prefixed_volume, ARRAY_SIZE(prefixed_volume)); + if (ret) return FALSE; + + guid = string + ARRAY_SIZE(prefixed_volume); + + while (i <= 37) + { + switch (i) + { + case 0: + if (guid[i] != '{') return FALSE; + break; + case 9: + case 14: + case 19: + case 24: + if (guid[i] != '-') return FALSE; + break; + case 37: + if (guid[i] != '}') return FALSE; + break; + default: + if (!isalnumW(guid[i])) return FALSE; + break; + } + i++; + } + + return TRUE; +} + +/* Get the next character beyond end of the segment. + Return TRUE if the last segment ends with a backslash */ +static BOOL get_next_segment(const WCHAR *next, const WCHAR **next_segment) +{ + while (*next && *next != '\\') next++; + if (*next == '\\') + { + *next_segment = next + 1; + return TRUE; + } + else + { + *next_segment = next; + return FALSE; + } +} + +/* Find the last character of the root in a path, if there is one, without any segments */ +static const WCHAR *get_root_end(const WCHAR *path) +{ + /* Find path root */ + if (is_prefixed_volume(path)) + return path[48] == '\\' ? path + 48 : path + 47; + else if (is_prefixed_unc(path)) + return path + 7; + else if (is_prefixed_disk(path)) + return path[6] == '\\' ? path + 6 : path + 5; + /* \\ */ + else if (path[0] == '\\' && path[1] == '\\') + return path + 1; + /* \ */ + else if (path[0] == '\\') + return path; + /* X:\ */ + else if (isalphaW(path[0]) && path[1] == ':') + return path[2] == '\\' ? path + 2 : path + 1; + else + return NULL; +} + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size) { return PathCchAddBackslashEx(path, size, NULL, NULL); @@ -196,6 +274,38 @@ HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *ext return FAILED(hr) ? hr : S_OK; } +HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end) +{ + static const WCHAR unc_prefix[] = {'\\', '\\', '?'}; + + TRACE("%s %p\n", debugstr_w(path), root_end); + + if (!path || !path[0] || !root_end + || (!memicmpW(unc_prefix, path, ARRAY_SIZE(unc_prefix)) && !is_prefixed_volume(path) && !is_prefixed_unc(path) + && !is_prefixed_disk(path))) + return E_INVALIDARG; + + *root_end = get_root_end(path); + if (*root_end) + { + (*root_end)++; + if (is_prefixed_unc(path)) + { + get_next_segment(*root_end, root_end); + get_next_segment(*root_end, root_end); + } + else if (path[0] == '\\' && path[1] == '\\' && path[2] != '?') + { + /* Skip share server */ + get_next_segment(*root_end, root_end); + /* If mount point is empty, don't skip over mount point */ + if (**root_end != '\\') get_next_segment(*root_end, root_end); + } + } + + return *root_end ? S_OK : E_INVALIDARG; +} + HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size) { TRACE("%s %lu\n", wine_dbgstr_w(path), size); diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index af15e83d60..f54e77be46 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -37,6 +37,7 @@ HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, HRESULT (WINAPI *pPathCchFindExtension)(const WCHAR *path, SIZE_T size, const WCHAR **extension); HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT (WINAPI *pPathCchSkipRoot)(const WCHAR *path, const WCHAR **root_end); HRESULT (WINAPI *pPathCchStripPrefix)(WCHAR *path, SIZE_T size); BOOL (WINAPI *pPathIsUNCEx)(const WCHAR *path, const WCHAR **server); @@ -634,6 +635,131 @@ static void test_PathCchRenameExtension(void) } } +struct skiproot_test +{ + const char *path; + int root_offset; + HRESULT hr; +}; + +static const struct skiproot_test skiproot_tests [] = +{ + /* Basic combination */ + {"", 0, E_INVALIDARG}, + {"C:\\", 3, S_OK}, + {"\\", 1, S_OK}, + {"\\\\.\\", 4, S_OK}, + {"\\\\?\\UNC\\", 8, S_OK}, + {"\\\\?\\C:\\", 7, S_OK}, + + /* Basic + \ */ + {"C:\\\\", 3, S_OK}, + {"\\\\", 2, S_OK}, + {"\\\\.\\\\", 4, S_OK}, + {"\\\\?\\UNC\\\\", 9, S_OK}, + {"\\\\?\\C:\\\\", 7, S_OK}, + + /* Basic + a */ + {"a", 0, E_INVALIDARG}, + {"C:\\a", 3, S_OK}, + {"\\a", 1, S_OK}, + {"\\\\.\\a", 5, S_OK}, + {"\\\\?\\UNC\\a", 9, S_OK}, + + /* Basic + \a */ + {"\\a", 1, S_OK}, + {"C:\\\\a", 3, S_OK}, + {"\\\\a", 3, S_OK}, + {"\\\\.\\\\a", 4, S_OK}, + {"\\\\?\\UNC\\\\a", 10, S_OK}, + {"\\\\?\\C:\\\\a", 7, S_OK}, + + /* Basic + a\ */ + {"a\\", 0, E_INVALIDARG}, + {"C:\\a\\", 3, S_OK}, + {"\\a\\", 1, S_OK}, + {"\\\\.\\a\\", 6, S_OK}, + {"\\\\?\\UNC\\a\\", 10, S_OK}, + {"\\\\?\\C:\\a\\", 7, S_OK}, + + /* Network share */ + {"\\\\\\\\", 3, S_OK}, + {"\\\\a\\", 4, S_OK}, + {"\\\\a\\b", 5, S_OK}, + {"\\\\a\\b\\", 6, S_OK}, + {"\\\\a\\b\\\\", 6, S_OK}, + {"\\\\a\\b\\\\c", 6, S_OK}, + {"\\\\a\\b\\c", 6, S_OK}, + {"\\\\a\\b\\c\\", 6, S_OK}, + {"\\\\a\\b\\c\\d", 6, S_OK}, + {"\\\\a\\\\b\\c\\", 4, S_OK}, + {"\\\\aa\\bb\\cc\\", 8, S_OK}, + + /* UNC */ + {"\\\\?\\UNC\\\\", 9, S_OK}, + {"\\\\?\\UNC\\a\\b", 11, S_OK}, + {"\\\\?\\UNC\\a\\b", 11, S_OK}, + {"\\\\?\\UNC\\a\\b\\", 12, S_OK}, + {"\\\\?\\UNC\\a\\b\\c", 12, S_OK}, + {"\\\\?\\UNC\\a\\b\\c\\", 12, S_OK}, + {"\\\\?\\UNC\\a\\b\\c\\d", 12, S_OK}, + {"\\\\?\\C:", 6, S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}", 48, S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", 49, S_OK}, + {"\\\\?\\unc\\a\\b", 11, S_OK}, + {"\\\\?\\volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", 49, S_OK}, + {"\\\\?\\volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", 49, S_OK}, + + /* Malformed */ + {"C:", 2, S_OK}, + {":", 0, E_INVALIDARG}, + {":\\", 0, E_INVALIDARG}, + {"C\\", 0, E_INVALIDARG}, + {"\\?", 1, S_OK}, + {"\\?\\UNC", 1, S_OK}, + {"\\\\?\\", 0, E_INVALIDARG}, + {"\\\\?\\UNC", 0, E_INVALIDARG}, + {"\\\\?\\::\\", 0, E_INVALIDARG}, + {"\\\\?\\Volume", 0, E_INVALIDARG}, + {"\\.", 1, S_OK}, + {"\\\\..", 4, S_OK}, + {"\\\\..a", 5, S_OK} +}; + +static void test_PathCchSkipRoot(void) +{ + WCHAR pathW[MAX_PATH]; + const WCHAR *root_end; + HRESULT hr; + INT i; + + if (!pPathCchSkipRoot) + { + win_skip("PathCchSkipRoot() is not available.\n"); + return; + } + + root_end = (const WCHAR *)0xdeadbeef; + hr = pPathCchSkipRoot(NULL, &root_end); + ok(hr == E_INVALIDARG, "Expect result %#x, got %#x\n", E_INVALIDARG, hr); + ok(root_end == (const WCHAR *)0xdeadbeef, "Expect root_end 0xdeadbeef, got %p\n", root_end); + + MultiByteToWideChar(CP_ACP, 0, "C:\\", -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchSkipRoot(pathW, NULL); + ok(hr == E_INVALIDARG, "Expect result %#x, got %#x\n", E_INVALIDARG, hr); + + for (i = 0; i < ARRAY_SIZE(skiproot_tests); i++) + { + const struct skiproot_test *t = skiproot_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchSkipRoot(pathW, &root_end); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path, t->hr, hr); + if (SUCCEEDED(hr)) + ok(root_end - pathW == t->root_offset, "path %s expect root offset %d, got %d\n", t->path, t->root_offset, + root_end - pathW); + } +} + struct stripprefix_test { const CHAR *path; @@ -789,6 +915,7 @@ START_TEST(path) pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); + pPathCchSkipRoot = (void *)GetProcAddress(hmod, "PathCchSkipRoot"); pPathCchStripPrefix = (void *)GetProcAddress(hmod, "PathCchStripPrefix"); pPathIsUNCEx = (void *)GetProcAddress(hmod, "PathIsUNCEx"); @@ -799,6 +926,7 @@ START_TEST(path) test_PathCchFindExtension(); test_PathCchRemoveExtension(); test_PathCchRenameExtension(); + test_PathCchSkipRoot(); test_PathCchStripPrefix(); test_PathIsUNCEx(); } diff --git a/include/pathcch.h b/include/pathcch.h index 1ff9e24648..42bae4edd0 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -32,5 +32,6 @@ HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, con HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT WINAPI PathCchSkipRoot(const WCHAR *path, const WCHAR **root_end); HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size); BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server); -- 2.19.1

1 0

[PATCH 2/5] kernelbase: Implement PathCchStripPrefix.
by Zhiyi Zhang 22 Nov '18

22 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 30 +++++++ dlls/kernelbase/tests/path.c | 78 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 111 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index d874f8c802..53f7b987ca 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -17,6 +17,6 @@ @ stub PathCchRemoveFileSpec @ stdcall PathCchRenameExtension(wstr long wstr) kernelbase.PathCchRenameExtension @ stub PathCchSkipRoot -@ stub PathCchStripPrefix +@ stdcall PathCchStripPrefix(wstr long) kernelbase.PathCchStripPrefix @ stub PathCchStripToRoot @ stdcall PathIsUNCEx(wstr ptr) kernelbase.PathIsUNCEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index b3b28872af..8f4136eb6b 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1046,7 +1046,7 @@ # @ stub PathCchRemoveFileSpec @ stdcall PathCchRenameExtension(wstr long wstr) # @ stub PathCchSkipRoot -# @ stub PathCchStripPrefix +@ stdcall PathCchStripPrefix(wstr long) # @ stub PathCchStripToRoot @ stdcall PathCombineA(ptr str str) shlwapi.PathCombineA @ stdcall PathCombineW(ptr wstr wstr) shlwapi.PathCombineW diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 5f11e11962..366efa41e1 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -44,6 +44,12 @@ static BOOL is_prefixed_unc(const WCHAR *string) return !memicmpW(string, prefixed_unc, ARRAY_SIZE(prefixed_unc)); } +static BOOL is_prefixed_disk(const WCHAR *string) +{ + static const WCHAR prefix[] = {'\\', '\\', '?', '\\'}; + return !memcmp(string, prefix, sizeof(prefix)) && isalphaW(string[4]) && string[5] == ':'; +} + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size) { return PathCchAddBackslashEx(path, size, NULL, NULL); @@ -190,6 +196,30 @@ HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *ext return FAILED(hr) ? hr : S_OK; } +HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size) +{ + TRACE("%s %lu\n", wine_dbgstr_w(path), size); + + if (!path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + if (is_prefixed_unc(path)) + { + /* \\?\UNC\a -> \\a */ + if (size < strlenW(path + 8) + 3) return E_INVALIDARG; + strcpyW(path + 2, path + 8); + return S_OK; + } + else if (is_prefixed_disk(path)) + { + /* \\?\C:\ -> C:\ */ + if (size < strlenW(path + 4) + 1) return E_INVALIDARG; + strcpyW(path, path + 4); + return S_OK; + } + else + return S_FALSE; +} + BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server) { const WCHAR *result = NULL; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 8bd23191b0..af15e83d60 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -37,6 +37,7 @@ HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, HRESULT (WINAPI *pPathCchFindExtension)(const WCHAR *path, SIZE_T size, const WCHAR **extension); HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT (WINAPI *pPathCchStripPrefix)(WCHAR *path, SIZE_T size); BOOL (WINAPI *pPathIsUNCEx)(const WCHAR *path, const WCHAR **server); static const struct @@ -633,6 +634,81 @@ static void test_PathCchRenameExtension(void) } } +struct stripprefix_test +{ + const CHAR *path; + const CHAR *stripped_path; + HRESULT hr; + SIZE_T size; +}; + +static const struct stripprefix_test stripprefix_tests[] = +{ + {"\\\\?\\UNC\\", "\\\\", S_OK}, + {"\\\\?\\UNC\\a", "\\\\a", S_OK}, + {"\\\\?\\C:", "C:", S_OK}, + {"\\\\?\\C:\\", "C:\\", S_OK}, + {"\\\\?\\C:\\a", "C:\\a", S_OK}, + {"\\\\?\\unc\\", "\\\\", S_OK}, + {"\\\\?\\c:\\", "c:\\", S_OK}, + + {"\\", "\\", S_FALSE}, + {"\\\\", "\\\\", S_FALSE}, + {"\\\\a", "\\\\a", S_FALSE}, + {"\\\\a\\", "\\\\a\\", S_FALSE}, + {"\\\\?\\a", "\\\\?\\a", S_FALSE}, + {"\\\\?\\UNC", "\\\\?\\UNC", S_FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", S_FALSE}, + + /* Size Tests */ + {"C:\\", NULL, E_INVALIDARG, PATHCCH_MAX_CCH + 1}, + {"C:\\", "C:\\", S_FALSE, PATHCCH_MAX_CCH}, + /* Size < original path actual length + 1, read beyond size */ + {"\\\\?\\C:\\", "C:\\", S_OK, ARRAY_SIZE("\\\\?\\C:\\") - 1}, + /* Size < stripped path length + 1 */ + {"\\\\?\\C:\\", NULL, E_INVALIDARG, ARRAY_SIZE("C:\\") - 1}, + {"\\\\?\\UNC\\", NULL, E_INVALIDARG, ARRAY_SIZE("\\\\") - 1} +}; + +static void test_PathCchStripPrefix(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH + 1] = {0}; + CHAR stripped_pathA[PATHCCH_MAX_CCH]; + SIZE_T size; + HRESULT hr; + INT i; + + if (!pPathCchStripPrefix) + { + win_skip("PathCchStripPrefix(() is not available.\n"); + return; + } + + /* Null arguments */ + hr = pPathCchStripPrefix(NULL, PATHCCH_MAX_CCH); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchStripPrefix(pathW, 0); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", E_INVALIDARG, hr); + + for (i = 0; i < ARRAY_SIZE(stripprefix_tests); i++) + { + const struct stripprefix_test *t = stripprefix_tests + i; + + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + size = t->size ? t->size : PATHCCH_MAX_CCH; + hr = pPathCchStripPrefix(pathW, size); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, stripped_pathA, ARRAY_SIZE(stripped_pathA), NULL, NULL); + ok(!lstrcmpA(stripped_pathA, t->stripped_path), "path %s expect stripped path %s, got %s\n", t->path, + t->stripped_path, stripped_pathA); + } + } +} + struct isuncex_test { const CHAR *path; @@ -713,6 +789,7 @@ START_TEST(path) pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); + pPathCchStripPrefix = (void *)GetProcAddress(hmod, "PathCchStripPrefix"); pPathIsUNCEx = (void *)GetProcAddress(hmod, "PathIsUNCEx"); test_PathCchCombineEx(); @@ -722,5 +799,6 @@ START_TEST(path) test_PathCchFindExtension(); test_PathCchRemoveExtension(); test_PathCchRenameExtension(); + test_PathCchStripPrefix(); test_PathIsUNCEx(); } diff --git a/include/pathcch.h b/include/pathcch.h index 6973d6dda2..1ff9e24648 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -32,4 +32,5 @@ HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, con HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +HRESULT WINAPI PathCchStripPrefix(WCHAR *path, SIZE_T size); BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server); -- 2.19.1

1 0

[PATCH 1/5] kernelbase: Implement PathIsUNCEx.
by Zhiyi Zhang 22 Nov '18

22 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 21 ++++++ dlls/kernelbase/tests/path.c | 72 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 96 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index 0524e7c304..d874f8c802 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -19,4 +19,4 @@ @ stub PathCchSkipRoot @ stub PathCchStripPrefix @ stub PathCchStripToRoot -@ stub PathIsUNCEx +@ stdcall PathIsUNCEx(wstr ptr) kernelbase.PathIsUNCEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 286dae0001..b3b28872af 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1082,7 +1082,7 @@ @ stdcall PathIsSameRootA(str str) shlwapi.PathIsSameRootA @ stdcall PathIsSameRootW(wstr wstr) shlwapi.PathIsSameRootW @ stdcall PathIsUNCA(str) shlwapi.PathIsUNCA -# @ stub PathIsUNCEx +@ stdcall PathIsUNCEx(wstr ptr) @ stdcall PathIsUNCServerA(str) shlwapi.PathIsUNCServerA @ stdcall PathIsUNCServerShareA(str) shlwapi.PathIsUNCServerShareA @ stdcall PathIsUNCServerShareW(wstr) shlwapi.PathIsUNCServerShareW diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 047017eb47..5f11e11962 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -38,6 +38,12 @@ static SIZE_T strnlenW(const WCHAR *string, SIZE_T maxlen) return i; } +static BOOL is_prefixed_unc(const WCHAR *string) +{ + static const WCHAR prefixed_unc[] = {'\\', '\\', '?', '\\', 'U', 'N', 'C', '\\'}; + return !memicmpW(string, prefixed_unc, ARRAY_SIZE(prefixed_unc)); +} + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size) { return PathCchAddBackslashEx(path, size, NULL, NULL); @@ -183,3 +189,18 @@ HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *ext hr = PathCchAddExtension(path, size, extension); return FAILED(hr) ? hr : S_OK; } + +BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server) +{ + const WCHAR *result = NULL; + + TRACE("%s %p\n", wine_dbgstr_w(path), server); + + if (is_prefixed_unc(path)) + result = path + 8; + else if (path[0] == '\\' && path[1] == '\\' && path[2] != '?') + result = path + 2; + + if (server) *server = result; + return result ? TRUE : FALSE; +} diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 1d6f44ee76..8bd23191b0 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -37,6 +37,7 @@ HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, HRESULT (WINAPI *pPathCchFindExtension)(const WCHAR *path, SIZE_T size, const WCHAR **extension); HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); +BOOL (WINAPI *pPathIsUNCEx)(const WCHAR *path, const WCHAR **server); static const struct { @@ -632,6 +633,75 @@ static void test_PathCchRenameExtension(void) } } +struct isuncex_test +{ + const CHAR *path; + INT server_offset; + BOOL ret; +}; + +static const struct isuncex_test isuncex_tests[] = +{ + {"\\\\", 2, TRUE}, + {"\\\\a\\", 2, TRUE}, + {"\\\\.\\", 2, TRUE}, + {"\\\\?\\UNC\\", 8, TRUE}, + {"\\\\?\\UNC\\a", 8, TRUE}, + {"\\\\?\\unc\\", 8, TRUE}, + {"\\\\?\\unc\\a", 8, TRUE}, + + {"", 0, FALSE}, + {"\\", 0, FALSE}, + {"C:\\", 0, FALSE}, + {"\\??\\", 0, FALSE}, + {"\\\\?\\", 0, FALSE}, + {"\\\\?\\UNC", 0, FALSE}, + {"\\\\?\\C:", 0, FALSE}, + {"\\\\?\\C:\\", 0, FALSE}, + {"\\\\?\\C:\\a", 0, FALSE}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", 0, FALSE} +}; + +static void test_PathIsUNCEx(void) +{ + WCHAR pathW[MAX_PATH]; + const WCHAR *server; + BOOL ret; + INT i; + + if (!pPathIsUNCEx) + { + win_skip("PathIsUNCEx(() is not available.\n"); + return; + } + + /* No NULL check for path pointers on Windows */ + if (0) + { + ret = pPathIsUNCEx(NULL, &server); + ok(ret == FALSE, "expect FALSE\n"); + } + + MultiByteToWideChar(CP_ACP, 0, "C:\\", -1, pathW, ARRAY_SIZE(pathW)); + ret = pPathIsUNCEx(pathW, NULL); + ok(ret == FALSE, "expect FALSE\n"); + + for (i = 0; i < ARRAY_SIZE(isuncex_tests); i++) + { + const struct isuncex_test *t = isuncex_tests + i; + + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + server = (const WCHAR *)0xdeadbeef; + ret = pPathIsUNCEx(pathW, &server); + ok(ret == t->ret, "path \"%s\" expect return %d, got %d\n", t->path, t->ret, ret); + if (ret) + ok(server == pathW + t->server_offset, "path \"%s\" expect server offset %d, got %d\n", t->path, + t->server_offset, server - pathW); + else + ok(!server, "expect server is null, got %p\n", server); + } +} + START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); @@ -643,6 +713,7 @@ START_TEST(path) pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); + pPathIsUNCEx = (void *)GetProcAddress(hmod, "PathIsUNCEx"); test_PathCchCombineEx(); test_PathCchAddBackslash(); @@ -651,4 +722,5 @@ START_TEST(path) test_PathCchFindExtension(); test_PathCchRemoveExtension(); test_PathCchRenameExtension(); + test_PathIsUNCEx(); } diff --git a/include/pathcch.h b/include/pathcch.h index 3057b6c1ec..6973d6dda2 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -32,3 +32,4 @@ HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, con HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); +BOOL WINAPI PathIsUNCEx(const WCHAR *path, const WCHAR **server); -- 2.19.1

1 0

[PATCH 1/3] setupapi/tests: Remove workarounds in testCreateDeviceInterface().
by Zebediah Figura 22 Nov '18

22 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 132 +++++++++++++++++++----------------------- 1 file changed, 61 insertions(+), 71 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 888b247d6d..86af09d31e 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -603,87 +603,77 @@ todo_wine devinst_RegDeleteTreeW(HKEY_LOCAL_MACHINE, bogus); } -static void testCreateDeviceInterface(void) +static void test_device_iface(void) { + SP_DEVICE_INTERFACE_DATA iface = {sizeof(iface)}; + SP_DEVINFO_DATA device = {0}; BOOL ret; HDEVINFO set; + DWORD i; - if (!pSetupDiCreateDeviceInterfaceA || !pSetupDiEnumDeviceInterfaces) - { - win_skip("SetupDiCreateDeviceInterfaceA and/or SetupDiEnumDeviceInterfaces are not available\n"); - return; - } SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInterfaceA(NULL, NULL, NULL, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); + ret = SetupDiCreateDeviceInterfaceA(NULL, NULL, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); + SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInterfaceA(NULL, NULL, &guid, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_HANDLE, - "Expected ERROR_INVALID_HANDLE, got %d\n", GetLastError()); - set = pSetupDiCreateDeviceInfoList(&guid, NULL); - ok(set != NULL, "SetupDiCreateDeviceInfoList failed: %d\n", GetLastError()); - if (set) - { - SP_DEVINFO_DATA devInfo = { 0 }; - SP_DEVICE_INTERFACE_DATA interfaceData = { sizeof(interfaceData), - { 0 } }; - DWORD i; + ret = SetupDiCreateDeviceInterfaceA(NULL, NULL, &guid, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_HANDLE, "Got unexpected error %#x.\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInterfaceA(set, NULL, NULL, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, NULL, NULL, 0, - NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError()); - devInfo.cbSize = sizeof(devInfo); - ret = pSetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0000", &guid, - NULL, NULL, 0, &devInfo); - ok(ret, "SetupDiCreateDeviceInfoA failed: %08x\n", GetLastError()); - SetLastError(0xdeadbeef); - ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, NULL, NULL, 0, - NULL); - ok(!ret && GetLastError() == ERROR_INVALID_USER_BUFFER, - "Expected ERROR_INVALID_USER_BUFFER, got %08x\n", GetLastError()); - ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, &guid, NULL, 0, - NULL); - ok(ret, "SetupDiCreateDeviceInterfaceA failed: %08x\n", GetLastError()); - /* Creating the same interface a second time succeeds */ - ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, &guid, NULL, 0, - NULL); - ok(ret, "SetupDiCreateDeviceInterfaceA failed: %08x\n", GetLastError()); - ret = pSetupDiCreateDeviceInterfaceA(set, &devInfo, &guid, "Oogah", 0, - NULL); - ok(ret, "SetupDiCreateDeviceInterfaceA failed: %08x\n", GetLastError()); - ret = pSetupDiEnumDeviceInterfaces(set, &devInfo, &guid, 0, - &interfaceData); - ok(ret, "SetupDiEnumDeviceInterfaces failed: %d\n", GetLastError()); - i = 0; - while (pSetupDiEnumDeviceInterfaces(set, &devInfo, &guid, i, - &interfaceData)) - i++; - ok(i == 2, "expected 2 interfaces, got %d\n", i); - ok(GetLastError() == ERROR_NO_MORE_ITEMS, - "SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError()); - - for (i = 0; i < 2; i++) - { - ret = pSetupDiEnumDeviceInterfaces(set, &devInfo, &guid, i, &interfaceData); - ok(ret, "SetupDiEnumDeviceInterfaces failed: %08x\n", GetLastError()); + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != NULL, "Failed to create device list, error %#x.\n", GetLastError()); - ret = pSetupDiRemoveDeviceInterface(set, &interfaceData); - todo_wine ok(ret, "SetupDiRemoveDeviceInterface failed: %08x\n", GetLastError()); - } + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInterfaceA(set, NULL, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); - ret = pSetupDiRemoveDevice(set, &devInfo); - todo_wine ok(ret, "got %u\n", GetLastError()); + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInterfaceA(set, &device, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + device.cbSize = sizeof(device); + ret = SetupDiCreateDeviceInfoA(set, "ROOT\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + SetLastError(0xdeadbeef); + ret = SetupDiCreateDeviceInterfaceA(set, &device, NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, NULL, 0, NULL); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); - ret = pSetupDiDestroyDeviceInfoList(set); - ok(ret, "SetupDiDestroyDeviceInfoList failed: %08x\n", GetLastError()); + /* Creating the same interface a second time succeeds */ + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, NULL, 0, NULL); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + + ret = SetupDiCreateDeviceInterfaceA(set, &device, &guid, "Oogah", 0, NULL); + ok(ret, "Failed to create interface, error %#x.\n", GetLastError()); + + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, 0, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + + i = 0; + while (SetupDiEnumDeviceInterfaces(set, &device, &guid, i, &iface)) + i++; + ok(i == 2, "expected 2 interfaces, got %d\n", i); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + + for (i = 0; i < 2; i++) + { + ret = SetupDiEnumDeviceInterfaces(set, &device, &guid, i, &iface); + ok(ret, "Failed to enumerate interfaces, error %#x.\n", GetLastError()); + + ret = SetupDiRemoveDeviceInterface(set, &iface); +todo_wine + ok(ret, "Failed to remove interface, error %#x.\n", GetLastError()); } + + ret = SetupDiDestroyDeviceInfoList(set); + ok(ret, "Failed to destroy device list, error %#x.\n", GetLastError()); } static void testGetDeviceInterfaceDetail(void) @@ -1538,7 +1528,7 @@ START_TEST(devinst) test_device_info(); test_get_device_instance_id(); test_register_device_info(); - testCreateDeviceInterface(); + test_device_iface(); testGetDeviceInterfaceDetail(); testDevRegKey(); testRegisterAndGetDetail(); -- 2.14.1

1 2

[PATCH] user32: Attempt to set scroll info in SetScrollPos even if SCROLL_GetInternalInfo fails.
by Jacek Caban 22 Nov '18

22 Nov '18

SetScrollPos may be called on non-scroll window and we should send SBM_SETSCROLLINFO. This fixes scrollbars in Visio. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/scroll.c | 5 ++--- dlls/user32/tests/scroll.c | 27 +++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-)

3 2

[PATCH] winebus: Don't override real VID/PID for controllers
by Brendan McGrath 21 Nov '18

21 Nov '18

From: Andrew Eikum <aeikum(a)codeweavers.com> It's unclear what this was useful for, possibly native xinput requires it. Our built-in xinput is good enough now, though, so let's keep the real VID/PID. This lets applications match setupapi devices with dinput devices, see: "XInput and DirectInput" https://docs.microsoft.com/en-us/windows/desktop/xinput/xinput-and-directin… Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- This is the patch from Proton that removed the VID/PID override for controllers. If there is demand for the overrides - I can always add the registry hacks in a later commit (but with the improved XInput functionality I don't expect there to be). I wasn't sure if you needed my Signed-off tag but I added it just in case. dlls/winebus.sys/bus_sdl.c | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 6b2b28e8c90..a17f11e0457 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -818,25 +818,17 @@ static void try_add_device(SDL_JoystickID index) controller = pSDL_GameControllerOpen(index); id = pSDL_JoystickInstanceID(joystick); - if (controller) - { - vid = VID_MICROSOFT; - pid = PID_XBOX_CONTROLLERS[3]; - version = 0x01; + + if (pSDL_JoystickGetProductVersion != NULL) { + vid = pSDL_JoystickGetVendor(joystick); + pid = pSDL_JoystickGetProduct(joystick); + version = pSDL_JoystickGetProductVersion(joystick); } else { - if (pSDL_JoystickGetProductVersion != NULL) { - vid = pSDL_JoystickGetVendor(joystick); - pid = pSDL_JoystickGetProduct(joystick); - version = pSDL_JoystickGetProductVersion(joystick); - } - else - { - vid = 0x01; - pid = pSDL_JoystickInstanceID(joystick) + 1; - version = 0; - } + vid = 0x01; + pid = pSDL_JoystickInstanceID(joystick) + 1; + version = 0; } guid = pSDL_JoystickGetGUID(joystick); -- 2.17.1

1 0

[PATCH v2] winebus.sys: Allow XBOX Masquerade to be turned off
by Brendan McGrath 21 Nov '18

21 Nov '18

Elite Dangerous appears to iterate input devices via DInput and will only defer to XInput if there is a HID device with a matching VID and PID. The current behaviour of the SDLBUS is to masquerade any controller as an XBOX controller. This causes Elite Dangerous to treat any other type of contoller as a Joystick. This patch allows this masquerading behaviour to be switched off via two REG_DWORD registry entries under HKLM\System\CurrentControlSet\Services\SDLJOY: - 'Controller VID' - 'Controller PID' 0 - Turns it off (so it uses the real VID and PID) Any other value will define the value used in the masquerade. If the values are missing, the default behaviour is to leave it as is (i.e an XBOX controller). Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- Changes since v2: - allow VID and PID to be defined (as well as switched off) - use the existing SDLJOY registry entry I'm using a Logitech F310 gamepad. SDL recognises it as a controller but Elite Dangerous ignores it (due to the masquerade). At the moment, if 'Map Controllers' is set to '1' - the VID and PID is hard-coded to be an XBOX controller (I'm not familiar with the history to understand why that is - but I suspect for better game support). So I would say the device is able to be programmatically recognised by using the the SDL_IsGameController API. But this is currently only used when 'Map Controllers' is set to '1' and thus the real VID and PID values are lost (note that Proton does not have this masquerade thus the controller is working). When I set 'Map Controllers' to '0' - the correct VID and PID are added, but not as a gamepad (it uses an 'IM' entry instead of 'IG'). So again Elite Dangerous ignores the entry. This is because my controller reports 11 buttons where as the code expects a gamepad to report 14 or more. I changed it to look for 10 and a hat and this worked - but the mapping was all wrong. This is an approach I could explore further - but I feel the SDL_IsGameController approach is already working - but for the masquerade. dlls/winebus.sys/bus_sdl.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 6b2b28e8c90..86e652faa14 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -84,6 +84,8 @@ static DRIVER_OBJECT *sdl_driver_obj = NULL; static const WCHAR sdl_busidW[] = {'S','D','L','J','O','Y',0}; static DWORD map_controllers = 0; +static DWORD controller_vid = 0; +static DWORD controller_pid = 0; #include "initguid.h" DEFINE_GUID(GUID_DEVCLASS_SDL, 0x463d60b5,0x802b,0x4bb2,0x8f,0xdb,0x7d,0xa9,0xb9,0x96,0x04,0xd8); @@ -820,9 +822,9 @@ static void try_add_device(SDL_JoystickID index) id = pSDL_JoystickInstanceID(joystick); if (controller) { - vid = VID_MICROSOFT; - pid = PID_XBOX_CONTROLLERS[3]; - version = 0x01; + vid = (controller_vid) ? controller_vid : pSDL_JoystickGetVendor(joystick); + pid = (controller_pid) ? controller_pid : pSDL_JoystickGetProduct(joystick); + version = (controller_vid || controller_pid) ? 0x01 : pSDL_JoystickGetProductVersion(joystick); } else { @@ -935,7 +937,11 @@ void sdl_driver_unload( void ) NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_path) { static const WCHAR controller_modeW[] = {'M','a','p',' ','C','o','n','t','r','o','l','l','e','r','s',0}; + static const WCHAR controller_vid_valueW[] = {'C','o','n','t','r','o','l','l','e','r',' ','V','I','D',0}; + static const WCHAR controller_pid_valueW[] = {'C','o','n','t','r','o','l','l','e','r',' ','P','I','D',0}; static const UNICODE_STRING controller_mode = {sizeof(controller_modeW) - sizeof(WCHAR), sizeof(controller_modeW), (WCHAR*)controller_modeW}; + static const UNICODE_STRING controller_vid_value = {sizeof(controller_vid_valueW) - sizeof(WCHAR), sizeof(controller_vid_valueW), (WCHAR*)controller_vid_valueW}; + static const UNICODE_STRING controller_pid_value = {sizeof(controller_pid_valueW) - sizeof(WCHAR), sizeof(controller_pid_valueW), (WCHAR*)controller_pid_valueW}; HANDLE events[2]; DWORD result; @@ -993,6 +999,8 @@ NTSTATUS WINAPI sdl_driver_init(DRIVER_OBJECT *driver, UNICODE_STRING *registry_ driver->MajorFunction[IRP_MJ_INTERNAL_DEVICE_CONTROL] = hid_internal_dispatch; map_controllers = check_bus_option(registry_path, &controller_mode, 1); + controller_vid = check_bus_option(registry_path, &controller_vid_value, VID_MICROSOFT); + controller_pid = check_bus_option(registry_path, &controller_pid_value, PID_XBOX_CONTROLLERS[3]); if (!(events[0] = CreateEventW(NULL, TRUE, FALSE, NULL))) goto error; -- 2.17.1

4 8

[PATCH v3] ws2_32: Return WSAEAFNOSUPPORT when ip4/6 disabled
by Brendan McGrath 21 Nov '18

21 Nov '18

Currently, when IPv6 is disabled by the kernel, attempting to use the 'WebRequest' API with .NET native causes a crash. This can be recreated using the following gist: https://gist.github.com/redmcg/7d81ef833c77bee6965b5f441006f697 This patch fixes the crash by returning WSAEAFNOSUPPORT, as expected by .NET. See: https://referencesource.microsoft.com/#System/net/System/Net/Sockets/Socket… Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- Changes since v2: - Add the 'Signed-off-by' tag dlls/ws2_32/socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index df068fe8527..956ead2e9d5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7646,6 +7646,8 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, /* invalid combination of valid parameters, like SOCK_STREAM + IPPROTO_UDP */ if (err == WSAEINVAL) err = WSAESOCKTNOSUPPORT; + else if (err == WSAEOPNOTSUPP && (unixaf == AF_INET || unixaf == AF_INET6)) + err = WSAEAFNOSUPPORT; else if (err == WSAEOPNOTSUPP) err = WSAEPROTONOSUPPORT; } -- 2.17.1

2 7

[PATCH v4 01/11] comctl32/tests: Confirm that emptying the listbox sends a LB_RESETCONTENT to itself
by Gabriel Ivăncescu 21 Nov '18

21 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/tests/listbox.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/comctl32/tests/listbox.c b/dlls/comctl32/tests/listbox.c index 43da3ca..d457b13 100644 --- a/dlls/comctl32/tests/listbox.c +++ b/dlls/comctl32/tests/listbox.c @@ -110,6 +110,15 @@ static HWND create_listbox(DWORD add_style, HWND parent) return handle; } +static UINT lb_resetcontent_count; +static WNDPROC lb_test_subclass_proc_prev; +static LRESULT WINAPI lb_test_subclass_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) +{ + if (msg == LB_RESETCONTENT) lb_resetcontent_count++; + + return CallWindowProcW(lb_test_subclass_proc_prev, hwnd, msg, wParam, lParam); +} + struct listbox_prop { DWORD add_style; @@ -227,6 +236,17 @@ static void run_test(DWORD style, const struct listbox_test test) res = SendMessageA(hLB, LB_GETCOUNT, 0, 0); ok(res == 4, "Expected 4 items, got %d\n", res); + /* Confirm that emptying the listbox sends a LB_RESETCONTENT to itself */ + lb_test_subclass_proc_prev = (WNDPROC)SetWindowLongPtrW(hLB, GWLP_WNDPROC, (LONG_PTR)lb_test_subclass_proc); + + lb_resetcontent_count = 0; + for (i = 4; i--;) + { + res = SendMessageA(hLB, LB_DELETESTRING, 0, 0); + ok(res == i, "Expected %d items, got %d\n", i, res); + } + ok(lb_resetcontent_count == 1, "Expected 1 LB_RESETCONTENT message, got %u\n", lb_resetcontent_count); + DestroyWindow(hLB); } @@ -1798,6 +1818,14 @@ static void test_set_count( void ) GetUpdateRect( listbox, &r, TRUE ); ok( !IsRectEmpty( &r ), "got empty rect\n"); + /* Confirm that emptying the listbox sends a LB_RESETCONTENT to itself */ + lb_test_subclass_proc_prev = (WNDPROC)SetWindowLongPtrW(listbox, GWLP_WNDPROC, (LONG_PTR)lb_test_subclass_proc); + + lb_resetcontent_count = 0; + ret = SendMessageA(listbox, LB_SETCOUNT, 0, 0); + ok(ret == 0, "got %d\n", ret); + ok(lb_resetcontent_count == 1, "Expected 1 LB_RESETCONTENT message, got %u\n", lb_resetcontent_count); + DestroyWindow( listbox ); for (i = 0; i < ARRAY_SIZE(styles); ++i) -- 2.19.1

1 10