From cd7c1882ed729920e70b64051e20d7508773f6a0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Fri, 13 Jan 2017 21:55:25 +0000 Subject: [PATCH] [SHLWAPI_APITEST] - Add tests for PathIsUNCServer and PathIsUNCServerShare, by Jared Smudde. Thanks! ROSTESTS-258 #resolve - Simplify the code: Since those functions (as well as PathIsUNC) are public and exported by name, we can directly load the apitest with shlwapi and call the APIs directly (no need for explicit LoadLibrary & GetProcAddress). svn path=/trunk/; revision=73544 --- rostests/apitests/shlwapi/CMakeLists.txt | 2 + rostests/apitests/shlwapi/PathIsUNC.c | 60 ++++++++----------- rostests/apitests/shlwapi/PathIsUNCServer.c | 44 ++++++++++++++ .../apitests/shlwapi/PathIsUNCServerShare.c | 42 +++++++++++++ rostests/apitests/shlwapi/testlist.c | 4 ++ 5 files changed, 117 insertions(+), 35 deletions(-) create mode 100644 rostests/apitests/shlwapi/PathIsUNCServer.c create mode 100644 rostests/apitests/shlwapi/PathIsUNCServerShare.c diff --git a/rostests/apitests/shlwapi/CMakeLists.txt b/rostests/apitests/shlwapi/CMakeLists.txt index c0d9f649629..8975ec5a4dc 100644 --- a/rostests/apitests/shlwapi/CMakeLists.txt +++ b/rostests/apitests/shlwapi/CMakeLists.txt @@ -1,6 +1,8 @@ list(APPEND SOURCE PathIsUNC.c + PathIsUNCServer.c + PathIsUNCServerShare.c PathUnExpandEnvStrings.c testlist.c) diff --git a/rostests/apitests/shlwapi/PathIsUNC.c b/rostests/apitests/shlwapi/PathIsUNC.c index ef37c568222..3b9d7868b2a 100644 --- a/rostests/apitests/shlwapi/PathIsUNC.c +++ b/rostests/apitests/shlwapi/PathIsUNC.c @@ -19,50 +19,40 @@ /* Documentation: https://msdn.microsoft.com/en-us/library/windows/desktop/bb773712(v=vs.85).aspx */ #include +#include -static BOOL (WINAPI *pPathIsUNC)(PCWSTR); - -#define CALL_ISUNC(exp, str) \ +#define DO_TEST(exp, str) \ do { \ - BOOL ret = pPathIsUNC((str)); \ + BOOL ret = PathIsUNCW((str)); \ ok(ret == (exp), "Expected %s to be %d, was %d\n", wine_dbgstr_w((str)), (exp), ret); \ } while (0) START_TEST(isuncpath) { - HMODULE hDll = LoadLibraryA("shlwapi.dll"); - - pPathIsUNC = (void*)GetProcAddress(hDll, "PathIsUNCW"); - if (!hDll || !pPathIsUNC) - { - skip("shlwapi.dll or export PathIsUNCW not found! Tests will be skipped\n"); - return; - } - - CALL_ISUNC(TRUE, L"\\\\path1\\path2"); - CALL_ISUNC(TRUE, L"\\\\path1"); - CALL_ISUNC(FALSE, L"reactos\\path4\\path5"); - CALL_ISUNC(TRUE, L"\\\\"); - CALL_ISUNC(TRUE, L"\\\\?\\UNC\\path1\\path2"); - CALL_ISUNC(TRUE, L"\\\\?\\UNC\\path1"); - CALL_ISUNC(TRUE, L"\\\\?\\UNC\\"); - CALL_ISUNC(FALSE, L"\\path1"); - CALL_ISUNC(FALSE, L"path1"); - CALL_ISUNC(FALSE, L"c:\\path1"); + DO_TEST(TRUE, L"\\\\path1\\path2"); + DO_TEST(TRUE, L"\\\\path1"); + DO_TEST(FALSE, L"reactos\\path4\\path5"); + DO_TEST(TRUE, L"\\\\"); + DO_TEST(TRUE, L"\\\\?\\UNC\\path1\\path2"); + DO_TEST(TRUE, L"\\\\?\\UNC\\path1"); + DO_TEST(TRUE, L"\\\\?\\UNC\\"); + DO_TEST(FALSE, L"\\path1"); + DO_TEST(FALSE, L"path1"); + DO_TEST(FALSE, L"c:\\path1"); /* MSDN says FALSE but the test shows TRUE on Windows 2003, but returns FALSE on Windows 7 */ - CALL_ISUNC(TRUE, L"\\\\?\\c:\\path1"); - - CALL_ISUNC(TRUE, L"\\\\path1\\"); - CALL_ISUNC(FALSE, L"//"); - CALL_ISUNC(FALSE, L"////path1"); - CALL_ISUNC(FALSE, L"////path1//path2"); - CALL_ISUNC(FALSE, L"reactos//path3//path4"); - CALL_ISUNC(TRUE, L"\\\\reactos\\?"); - CALL_ISUNC(TRUE, L"\\\\reactos\\\\"); - CALL_ISUNC(FALSE, (wchar_t*)NULL); - CALL_ISUNC(FALSE, L" "); + DO_TEST(TRUE, L"\\\\?\\c:\\path1"); + + DO_TEST(TRUE, L"\\\\path1\\"); + DO_TEST(FALSE, L"//"); + DO_TEST(FALSE, L"////path1"); + DO_TEST(FALSE, L"////path1//path2"); + DO_TEST(FALSE, L"reactos//path3//path4"); + DO_TEST(TRUE, L"\\\\reactos\\?"); + DO_TEST(TRUE, L"\\\\reactos\\\\"); + DO_TEST(FALSE, (wchar_t*)NULL); + DO_TEST(FALSE, L" "); /* The test shows TRUE on Windows 2003, but returns FALSE on Windows 7 */ - CALL_ISUNC(TRUE, L"\\\\?\\"); + DO_TEST(TRUE, L"\\\\?\\"); } diff --git a/rostests/apitests/shlwapi/PathIsUNCServer.c b/rostests/apitests/shlwapi/PathIsUNCServer.c new file mode 100644 index 00000000000..8827d7de3c8 --- /dev/null +++ b/rostests/apitests/shlwapi/PathIsUNCServer.c @@ -0,0 +1,44 @@ +/* + * Copyright 2017 Jared Smudde + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Documentation: https://msdn.microsoft.com/en-us/library/windows/desktop/bb773722(v=vs.85).aspx */ + +#include +#include + +#define DO_TEST(exp, str) \ +do { \ + BOOL ret = PathIsUNCServerW((str)); \ + ok(ret == (exp), "Expected %s to be %d, was %d\n", wine_dbgstr_w((str)), (exp), ret); \ +} while (0) + +START_TEST(isuncpathserver) +{ + DO_TEST(TRUE, L"\\\\server"); + DO_TEST(TRUE, L"\\\\"); + DO_TEST(FALSE, L"\\\\server\\folder"); + DO_TEST(FALSE, L"reactos\\some\\folder"); + DO_TEST(FALSE, L"////server//share"); + DO_TEST(FALSE, L"c:\\path1"); + DO_TEST(FALSE, (wchar_t*)NULL); + DO_TEST(FALSE, L""); + DO_TEST(FALSE, L" "); + + /* The test shows TRUE on Windows 2003, but returns FALSE on Windows 7 */ + DO_TEST(TRUE, L"\\\\?"); +} diff --git a/rostests/apitests/shlwapi/PathIsUNCServerShare.c b/rostests/apitests/shlwapi/PathIsUNCServerShare.c new file mode 100644 index 00000000000..f4f1f863f8d --- /dev/null +++ b/rostests/apitests/shlwapi/PathIsUNCServerShare.c @@ -0,0 +1,42 @@ +/* + * Copyright 2017 Jared Smudde + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* Documentation: https://msdn.microsoft.com/en-us/library/windows/desktop/bb773723(v=vs.85).aspx */ + +#include +#include + +#define DO_TEST(exp, str) \ +do { \ + BOOL ret = PathIsUNCServerShareW((str)); \ + ok(ret == (exp), "Expected %s to be %d, was %d\n", wine_dbgstr_w((str)), (exp), ret); \ +} while (0) + +START_TEST(isuncpathservershare) +{ + DO_TEST(TRUE, L"\\\\server\\share"); + DO_TEST(TRUE, L"\\\\reactos\\folder9"); + DO_TEST(FALSE, L"\\\\"); + DO_TEST(FALSE, L"reactos\\some\\folder"); + DO_TEST(FALSE, L"////server//share"); + DO_TEST(FALSE, L"c:\\path1"); + DO_TEST(FALSE, (wchar_t*)NULL); + DO_TEST(FALSE, L""); + DO_TEST(FALSE, L" "); + DO_TEST(FALSE, L"\\\\?"); +} diff --git a/rostests/apitests/shlwapi/testlist.c b/rostests/apitests/shlwapi/testlist.c index fc4559c6272..7a7015fc6e3 100644 --- a/rostests/apitests/shlwapi/testlist.c +++ b/rostests/apitests/shlwapi/testlist.c @@ -2,11 +2,15 @@ #include extern void func_isuncpath(void); +extern void func_isuncpathserver(void); +extern void func_isuncpathservershare(void); extern void func_PathUnExpandEnvStrings(void); const struct test winetest_testlist[] = { { "PathIsUNC", func_isuncpath }, + { "PathIsUNCServer", func_isuncpathserver }, + { "PathIsUNCServerShare", func_isuncpathservershare }, { "PathUnExpandEnvStrings", func_PathUnExpandEnvStrings }, { 0, 0 } }; -- 2.17.1