Do not touch the new user name if the user cancels the rename action.

svn path=/trunk/; revision=33479

diff --git a/reactos/dll/cpl/usrmgr/users.c b/reactos/dll/cpl/usrmgr/users.c
index 69f967c..fa5f92a 100644 (file)
--- a/reactos/dll/cpl/usrmgr/users.c
+++ b/reactos/dll/cpl/usrmgr/users.c
@@ -203,18 +203,29 @@ OnEndLabelEdit(LPNMLVDISPINFO pnmv)
     USER_INFO_0 useri0;\r
     NET_API_STATUS status;\r
 \r
+    /* Leave, if there is no valid listview item */\r
     if (pnmv->item.iItem == -1)\r
         return FALSE;\r
 \r
+    /* Get the new user name */\r
     ListView_GetItemText(pnmv->hdr.hwndFrom,\r
                          pnmv->item.iItem, 0,\r
                          szOldUserName,\r
                          UNLEN);\r
+\r
+    /* Leave, if the user canceled the edit action */\r
+    if (pnmv->item.pszText == NULL)\r
+        return FALSE;\r
+\r
+    /* Get the new user name */\r
     lstrcpy(szNewUserName, pnmv->item.pszText);\r
 \r
+    /* Leave, if the user name was not changed */\r
     if (lstrcmp(szOldUserName, szNewUserName) == 0)\r
         return FALSE;\r
 \r
+\r
+    /* Change the user name */\r
     useri0.usri0_name = szNewUserName;\r
 \r
 #if 0\r
@@ -225,11 +236,12 @@ OnEndLabelEdit(LPNMLVDISPINFO pnmv)
     if (status != NERR_Success)\r
     {\r
         TCHAR szText[256];\r
-        wsprintf(szText, _T("Error: %u"), status);\r
-        MessageBox(NULL, szText, _T("NetUserSetInfo"), MB_ICONERROR | MB_OK);\r
+        wsprintf(szText, TEXT("Error: %u"), status);\r
+        MessageBox(NULL, szText, TEXT("NetUserSetInfo"), MB_ICONERROR | MB_OK);\r
         return FALSE;\r
     }\r
 \r
+    /* Update the listview item */\r
     ListView_SetItemText(pnmv->hdr.hwndFrom,\r
                          pnmv->item.iItem, 0,\r
                          szNewUserName);\r