[ros-diffs] [ekohl] 33565: Check user name for illegal characters when it is changed from within the user list.

[ekohl at svn.reactos.org]

Author: ekohl
Date: Sat May 17 17:33:04 2008
New Revision: 33565

URL: http://svn.reactos.org/svn/reactos?rev=33565&view=rev
Log:
Check user name for illegal characters when it is changed from within the user list.

Modified:
    trunk/reactos/dll/cpl/usrmgr/users.c

Modified: trunk/reactos/dll/cpl/usrmgr/users.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/usrmgr/users.c?rev=33565&r1=33564&r2=33565&view=diff
==============================================================================
--- trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] (original)
+++ trunk/reactos/dll/cpl/usrmgr/users.c [iso-8859-1] Sat May 17 17:33:04 2008
@@ -58,15 +58,20 @@
 
 static BOOL
 CheckUserName(HWND hwndDlg,
-              INT nIdDlgItem)
+              INT nIdDlgItem,
+              LPTSTR lpUserName)
 {
     TCHAR szUserName[256];
     UINT uLen;
 
-    uLen = GetDlgItemText(hwndDlg, nIdDlgItem, szUserName, 256);
+    if (lpUserName)
+        uLen = _tcslen(lpUserName);
+    else
+        uLen = GetDlgItemText(hwndDlg, nIdDlgItem, szUserName, 256);
 
     /* Check the user name */
-    if (uLen > 0 && _tcspbrk(szUserName, TEXT("\"*+,/\\:;<=>?[]|")) != NULL)
+    if (uLen > 0 &&
+        _tcspbrk((lpUserName) ? lpUserName : szUserName, TEXT("\"*+,/\\:;<=>?[]|")) != NULL)
     {
         MessageBox(hwndDlg,
                    TEXT("The user name you entered is invalid! A user name must not contain the following charecters: *+,/:;<=>?[\\]|"),
@@ -199,7 +204,7 @@
                     break;
 
                 case IDOK:
-                    if (!CheckUserName(hwndDlg, IDC_USER_NEW_NAME))
+                    if (!CheckUserName(hwndDlg, IDC_USER_NEW_NAME, NULL))
                     {
                         SetFocus(GetDlgItem(hwndDlg, IDC_USER_NEW_NAME));
                         SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, EM_SETSEL, 0, -1);
@@ -333,6 +338,24 @@
 }
 
 
+static VOID
+UserRename(HWND hwndDlg)
+{
+    HWND hwndLV;
+    INT nItem;
+
+    hwndLV = GetDlgItem(hwndDlg, IDC_USERS_LIST);
+    if (hwndLV == NULL)
+        return;
+
+    nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED);
+    if (nItem != -1)
+    {
+        (void)ListView_EditLabel(hwndLV, nItem);
+    }
+}
+
+
 static BOOL
 UserDelete(HWND hwndDlg)
 {
@@ -530,6 +553,9 @@
     if (lstrcmp(szOldUserName, szNewUserName) == 0)
         return FALSE;
 
+    /* Check the user name for illegal characters */
+    if (!CheckUserName(NULL, 0, szNewUserName))
+        return FALSE;
 
     /* Change the user name */
     useri0.usri0_name = szNewUserName;
@@ -633,17 +659,7 @@
                     break;
 
                 case IDM_USER_RENAME:
-                    {
-                        INT nItem;
-                        HWND hwndLV;
-
-                        hwndLV = GetDlgItem(hwndDlg, IDC_USERS_LIST);
-                        nItem = ListView_GetNextItem(hwndLV, -1, LVNI_SELECTED);
-                        if (nItem != -1)
-                        {
-                            (void)ListView_EditLabel(hwndLV, nItem);
-                        }
-                    }
+                    UserRename(hwndDlg);
                     break;
 
                 case IDM_USER_NEW: