- Fix to allow characters for computer name as specified in MSDN, even '-'

- See issue #3304 for more details.

svn path=/trunk/; revision=34275

diff --git a/reactos/dll/win32/kernel32/misc/computername.c b/reactos/dll/win32/kernel32/misc/computername.c
index c0a0f7f..f0bb6c8 100644 (file)
--- a/reactos/dll/win32/kernel32/misc/computername.c
+++ b/reactos/dll/win32/kernel32/misc/computername.c
@@ -298,22 +298,10 @@ IsValidComputerName (
   p = (PWCHAR)lpComputerName;
   while (*p != 0)
     {
-      if ((!iswctype (*p, _ALPHA) && !iswctype (*p, _DIGIT)) ||
-           *p == L'!' ||
-           *p == L'@' ||
-           *p == L'#' ||
-           *p == L'$' ||
-           *p == L'%' ||
-           *p == L'^' ||
-           *p == L'&' ||
-           *p == L'\'' ||
-           *p == L')' ||
-           *p == L'(' ||
-           *p == L'.' ||
-           *p == L'_' ||
-           *p == L'{' ||
-           *p == L'}' ||
-           *p == L'~')
+      if (!(iswalnum(*p) || *p == L'!' || *p == L'@' || *p == L'#' ||
+       *p == L'$' || *p == L'%' || *p == L'^' || *p == L'&' || *p == L'\'' ||
+       *p == L')' || *p == L'(' || *p == L'.' || *p == L'-' || *p == L'_' ||
+       *p == L'{' || *p == L'}' || *p == L'~'))
        return FALSE;
 
       Length++;