[NETSHELL] Implement NcIsValidConnectionName + tests. Patch by Jared Smudde, modified...

svn path=/trunk/; revision=73409

diff --git a/reactos/dll/shellext/netshell/netshell.cpp b/reactos/dll/shellext/netshell/netshell.cpp
index 5c3aa33..cc37a24 100644 (file)
--- a/reactos/dll/shellext/netshell/netshell.cpp
+++ b/reactos/dll/shellext/netshell/netshell.cpp
@@ -70,4 +70,37 @@ NcFreeNetconProperties(NETCON_PROPERTIES *pProps)
     CoTaskMemFree(pProps);
 }
 
+BOOL
+WINAPI
+NcIsValidConnectionName(_In_ PCWSTR pszwName)
+{
+    if (!pszwName)
+        return FALSE;
+
+    BOOL nonSpace = FALSE;
+    while (*pszwName)
+    {
+        switch(*(pszwName++))
+        {
+        case L'\\':
+        case L'/':
+        case L':':
+        case L'*':
+        case L'\t':
+        case L'?':
+        case L'<':
+        case L'>':
+        case L'|':
+        case L'\"':
+            return FALSE;
+        case L' ':
+            break;
+        default:
+            nonSpace = TRUE;
+            break;
+        }
+    }
+    return nonSpace;
+}
+
 } // extern "C"

diff --git a/reactos/dll/shellext/netshell/netshell.spec b/reactos/dll/shellext/netshell/netshell.spec
index 6190d8f..6cbfbe7 100644 (file)
--- a/reactos/dll/shellext/netshell/netshell.spec
+++ b/reactos/dll/shellext/netshell/netshell.spec
@@ -21,7 +21,7 @@
 20 stub HrRunWizard
 21 stub InvokeDunFile
 22 stdcall NcFreeNetconProperties(ptr)
-23 stub NcIsValidConnectionName
+23 stdcall NcIsValidConnectionName(wstr)
 24 stub NetSetupAddRasConnection
 25 stub NetSetupFinishInstall
 26 stub NetSetupInstallSoftware

diff --git a/rostests/apitests/CMakeLists.txt b/rostests/apitests/CMakeLists.txt
index 51f702e..6509c57 100644 (file)
--- a/rostests/apitests/CMakeLists.txt
+++ b/rostests/apitests/CMakeLists.txt
@@ -18,6 +18,7 @@ endif()
 add_subdirectory(localspl)
 add_subdirectory(msgina)
 add_subdirectory(msvcrt)
+add_subdirectory(netshell)
 add_subdirectory(ntdll)
 add_subdirectory(ole32)
 add_subdirectory(pefile)

diff --git a/rostests/apitests/netshell/CMakeLists.txt b/rostests/apitests/netshell/CMakeLists.txt
new file mode 100644 (file)
index 0000000..9078879
--- /dev/null
+++ b/rostests/apitests/netshell/CMakeLists.txt
@@ -0,0 +1,5 @@
+
+add_executable(netshell_apitest NcIsValidConnectionName.c testlist.c)
+set_module_type(netshell_apitest win32cui)
+add_importlibs(netshell_apitest msvcrt kernel32)
+add_cd_file(TARGET netshell_apitest DESTINATION reactos/bin FOR all)

diff --git a/rostests/apitests/netshell/NcIsValidConnectionName.c b/rostests/apitests/netshell/NcIsValidConnectionName.c
new file mode 100644 (file)
index 0000000..041f1df
--- /dev/null
+++ b/rostests/apitests/netshell/NcIsValidConnectionName.c
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2016 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/aa366197%28v=vs.85%29.aspx */
+
+#include <apitest.h>
+
+static BOOL (WINAPI *pNcIsValidConnectionName)(PCWSTR);
+
+#define CALL_NC(exp, str) \
+    do { \
+        BOOL ret = pNcIsValidConnectionName((str)); \
+        ok(ret == (exp), "Expected %s to be %d, was %d\n", wine_dbgstr_w((str)), (exp), ret); \
+    } while (0)
+
+
+
+static void test_BadLetters(void)
+{
+    BOOL ret;
+
+    WCHAR buf[3] = { 0 };
+    int i;
+
+    for (i = 1; i <= 0xFFFF; ++i)
+    {
+        buf[0] = (WCHAR)i;
+        buf[1] = buf[2] = L'\0';
+
+        if (wcspbrk(buf, L"\\/:\t*? <>|\"") != NULL)
+        {
+            ret = pNcIsValidConnectionName(buf);
+            ok(ret == FALSE, "Expected %s (%i) to fail.\n", wine_dbgstr_w(buf), i);
+
+            /* How about two of a kind? */
+            buf[1] = (WCHAR)i;
+            ret = pNcIsValidConnectionName(buf);
+            ok(ret == FALSE, "Expected %s (%i) to fail.\n", wine_dbgstr_w(buf), i);
+
+            /* And something (bad) combined with a space? */
+            buf[1] = L' ';
+            ret = pNcIsValidConnectionName(buf);
+            ok(ret == FALSE, "Expected %s (%i) to fail.\n", wine_dbgstr_w(buf), i);
+
+
+            /* Something bad combined with a letter */
+            buf[1] = L'a';
+            ret = pNcIsValidConnectionName(buf);
+            if ((WCHAR)i == L' ')
+                ok(ret == TRUE, "Expected %s (%i) to succeed.\n", wine_dbgstr_w(buf), i);
+            else
+                ok(ret == FALSE, "Expected %s (%i) to fail.\n", wine_dbgstr_w(buf), i);
+        }
+        else
+        {
+            ret = pNcIsValidConnectionName(buf);
+            ok(ret == TRUE, "Expected %s (%i) to succeed.\n", wine_dbgstr_w(buf), i);
+
+            buf[1] = (WCHAR)i;
+            ret = pNcIsValidConnectionName(buf);
+            ok(ret == TRUE, "Expected %s (%i) to succeed.\n", wine_dbgstr_w(buf), i);
+
+            buf[1] = L'a';
+            ret = pNcIsValidConnectionName(buf);
+            ok(ret == TRUE, "Expected %s (%i) to succeed.\n", wine_dbgstr_w(buf), i);
+
+            buf[1] = L' ';
+            ret = pNcIsValidConnectionName(buf);
+            ok(ret == TRUE, "Expected %s (%i) to succeed.\n", wine_dbgstr_w(buf), i);
+        }
+    }
+}
+
+START_TEST(isvalidname)
+{
+    HMODULE hDll = LoadLibraryA("netshell.dll");
+
+    pNcIsValidConnectionName = (void*)GetProcAddress(hDll, "NcIsValidConnectionName");
+    if (!hDll || !pNcIsValidConnectionName)
+    {
+        skip("netshell.dll or export NcIsValidConnectionName not found! Tests will be skipped\n");
+        return;
+    }
+
+    CALL_NC(TRUE, L"Network");
+    CALL_NC(FALSE, L"Network?");
+
+    CALL_NC(FALSE, L"\\");
+    CALL_NC(FALSE, L"/");
+    CALL_NC(FALSE, L":");
+    CALL_NC(FALSE, L"*");
+    CALL_NC(FALSE, L"?");
+    CALL_NC(FALSE, L"<");
+    CALL_NC(FALSE, L">");
+    CALL_NC(FALSE, L"|");
+
+    CALL_NC(FALSE, NULL);
+
+    CALL_NC(TRUE, L"Wireless");
+    CALL_NC(FALSE, L"Wireless:1");
+    CALL_NC(TRUE, L"Intranet");
+    CALL_NC(FALSE, L"Intranet<");
+    CALL_NC(TRUE, L"Network Connection");
+
+    test_BadLetters();
+}

diff --git a/rostests/apitests/netshell/testlist.c b/rostests/apitests/netshell/testlist.c
new file mode 100644 (file)
index 0000000..4013bde
--- /dev/null
+++ b/rostests/apitests/netshell/testlist.c
@@ -0,0 +1,11 @@
+#define STANDALONE
+#include "R:\hook\base_hk.h"
+#include <apitest.h>
+
+extern void func_isvalidname(void);
+
+const struct test winetest_testlist[] =
+{
+    { "NcIsValidConnectionName", func_isvalidname },
+    { 0, 0 }
+};