From 5a54e722b311d0e12f55b4e6348a67adbb5f6063 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Mon, 25 Dec 2017 22:11:57 +0100 Subject: [PATCH] [USRMGR] Rename some functions. #179 --- dll/cpl/usrmgr/groupprops.c | 12 ++++++------ dll/cpl/usrmgr/groups.c | 16 ++++++++-------- dll/cpl/usrmgr/userprops.c | 16 ++++++++-------- dll/cpl/usrmgr/users.c | 14 +++++++------- 4 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dll/cpl/usrmgr/groupprops.c b/dll/cpl/usrmgr/groupprops.c index e9be4f678da..f888beb36ae 100644 --- a/dll/cpl/usrmgr/groupprops.c +++ b/dll/cpl/usrmgr/groupprops.c @@ -354,9 +354,9 @@ RemoveUserFromGroup(HWND hwndDlg, static BOOL -OnNotify(HWND hwndDlg, - PGENERAL_GROUP_DATA pGroupData, - LPARAM lParam) +OnGroupPropSheetNotify(HWND hwndDlg, + PGENERAL_GROUP_DATA pGroupData, + LPARAM lParam) { LPNMLISTVIEW lpnmlv = (LPNMLISTVIEW)lParam; @@ -581,7 +581,7 @@ GroupGeneralPageProc(HWND hwndDlg, } else { - return OnNotify(hwndDlg, pGroupData, lParam); + return OnGroupPropSheetNotify(hwndDlg, pGroupData, lParam); } break; @@ -595,7 +595,7 @@ GroupGeneralPageProc(HWND hwndDlg, static VOID -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPTSTR pszGroup) +InitGroupPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPTSTR pszGroup) { ZeroMemory(psp, sizeof(PROPSHEETPAGE)); psp->dwSize = sizeof(PROPSHEETPAGE); @@ -638,7 +638,7 @@ GroupProperties(HWND hwndDlg) psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_GROUP_GENERAL, GroupGeneralPageProc, szGroupName); + InitGroupPropSheetPage(&psp[0], IDD_GROUP_GENERAL, GroupGeneralPageProc, szGroupName); return (PropertySheet(&psh) == IDOK); } diff --git a/dll/cpl/usrmgr/groups.c b/dll/cpl/usrmgr/groups.c index e6caf5222ea..73ce4e1368d 100644 --- a/dll/cpl/usrmgr/groups.c +++ b/dll/cpl/usrmgr/groups.c @@ -294,7 +294,7 @@ GroupDelete(HWND hwndDlg) static VOID -OnInitDialog(HWND hwndDlg) +OnGroupsPageInitDialog(HWND hwndDlg) { HWND hwndListView; HIMAGELIST hImgList; @@ -319,7 +319,7 @@ OnInitDialog(HWND hwndDlg) static BOOL -OnBeginLabelEdit(LPNMLVDISPINFO pnmv) +OnGroupsPageBeginLabelEdit(LPNMLVDISPINFO pnmv) { HWND hwndEdit; @@ -334,7 +334,7 @@ OnBeginLabelEdit(LPNMLVDISPINFO pnmv) static BOOL -OnEndLabelEdit(LPNMLVDISPINFO pnmv) +OnGroupsPageEndLabelEdit(LPNMLVDISPINFO pnmv) { TCHAR szOldGroupName[UNLEN]; TCHAR szNewGroupName[UNLEN]; @@ -388,7 +388,7 @@ OnEndLabelEdit(LPNMLVDISPINFO pnmv) static BOOL -OnNotify(HWND hwndDlg, PGROUP_DATA pGroupData, NMHDR *phdr) +OnGroupsPageNotify(HWND hwndDlg, PGROUP_DATA pGroupData, NMHDR *phdr) { LPNMLISTVIEW lpnmlv = (LPNMLISTVIEW)phdr; @@ -420,10 +420,10 @@ OnNotify(HWND hwndDlg, PGROUP_DATA pGroupData, NMHDR *phdr) break; case LVN_BEGINLABELEDIT: - return OnBeginLabelEdit((LPNMLVDISPINFO)phdr); + return OnGroupsPageBeginLabelEdit((LPNMLVDISPINFO)phdr); case LVN_ENDLABELEDIT: - return OnEndLabelEdit((LPNMLVDISPINFO)phdr); + return OnGroupsPageEndLabelEdit((LPNMLVDISPINFO)phdr); } break; } @@ -455,7 +455,7 @@ GroupsPageProc(HWND hwndDlg, pGroupData->hPopupMenu = LoadMenu(hApplet, MAKEINTRESOURCE(IDM_POPUP_GROUP)); - OnInitDialog(hwndDlg); + OnGroupsPageInitDialog(hwndDlg); SetMenuDefaultItem(GetSubMenu(pGroupData->hPopupMenu, 1), IDM_GROUP_PROPERTIES, FALSE); @@ -487,7 +487,7 @@ GroupsPageProc(HWND hwndDlg, break; case WM_NOTIFY: - return OnNotify(hwndDlg, pGroupData, (NMHDR *)lParam); + return OnGroupsPageNotify(hwndDlg, pGroupData, (NMHDR *)lParam); case WM_DESTROY: DestroyMenu(pGroupData->hPopupMenu); diff --git a/dll/cpl/usrmgr/userprops.c b/dll/cpl/usrmgr/userprops.c index fd76a91767f..44a3abcb40b 100644 --- a/dll/cpl/usrmgr/userprops.c +++ b/dll/cpl/usrmgr/userprops.c @@ -586,9 +586,9 @@ AddGroupToUser(HWND hwndDlg, static BOOL -OnNotify(HWND hwndDlg, - PMEMBERSHIP_USER_DATA pUserData, - LPARAM lParam) +OnUserPropSheetNotify(HWND hwndDlg, + PMEMBERSHIP_USER_DATA pUserData, + LPARAM lParam) { LPNMLISTVIEW lpnmlv = (LPNMLISTVIEW)lParam; @@ -664,7 +664,7 @@ UserMembershipPageProc(HWND hwndDlg, } else { - return OnNotify(hwndDlg, pUserData, lParam); + return OnUserPropSheetNotify(hwndDlg, pUserData, lParam); } break; @@ -885,7 +885,7 @@ UserGeneralPageProc(HWND hwndDlg, static VOID -InitPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPTSTR pszUser) +InitUserPropSheetPage(PROPSHEETPAGE *psp, WORD idDlg, DLGPROC DlgProc, LPTSTR pszUser) { ZeroMemory(psp, sizeof(PROPSHEETPAGE)); psp->dwSize = sizeof(PROPSHEETPAGE); @@ -928,9 +928,9 @@ UserProperties(HWND hwndDlg) psh.nStartPage = 0; psh.ppsp = psp; - InitPropSheetPage(&psp[0], IDD_USER_GENERAL, UserGeneralPageProc, szUserName); - InitPropSheetPage(&psp[1], IDD_USER_MEMBERSHIP, UserMembershipPageProc, szUserName); - InitPropSheetPage(&psp[2], IDD_USER_PROFILE, UserProfilePageProc, szUserName); + InitUserPropSheetPage(&psp[0], IDD_USER_GENERAL, UserGeneralPageProc, szUserName); + InitUserPropSheetPage(&psp[1], IDD_USER_MEMBERSHIP, UserMembershipPageProc, szUserName); + InitUserPropSheetPage(&psp[2], IDD_USER_PROFILE, UserProfilePageProc, szUserName); return (PropertySheet(&psh) == IDOK); } diff --git a/dll/cpl/usrmgr/users.c b/dll/cpl/usrmgr/users.c index 52b31e0c167..c137e66ce49 100644 --- a/dll/cpl/usrmgr/users.c +++ b/dll/cpl/usrmgr/users.c @@ -153,9 +153,9 @@ UserChangePassword(HWND hwndDlg) static VOID -UpdateUserOptions(HWND hwndDlg, - PUSER_INFO_3 userInfo, - BOOL bInit) +UpdateNewUserOptions(HWND hwndDlg, + PUSER_INFO_3 userInfo, + BOOL bInit) { EnableWindow(GetDlgItem(hwndDlg, IDC_USER_NEW_CANNOT_CHANGE), !userInfo->usri3_password_expired); @@ -201,7 +201,7 @@ NewUserDlgProc(HWND hwndDlg, userInfo = (PUSER_INFO_3)lParam; SetWindowLongPtr(hwndDlg, DWLP_USER, lParam); SendDlgItemMessage(hwndDlg, IDC_USER_NEW_NAME, EM_SETLIMITTEXT, 20, 0); - UpdateUserOptions(hwndDlg, userInfo, TRUE); + UpdateNewUserOptions(hwndDlg, userInfo, TRUE); break; case WM_COMMAND: @@ -217,17 +217,17 @@ NewUserDlgProc(HWND hwndDlg, case IDC_USER_NEW_FORCE_CHANGE: userInfo->usri3_password_expired = !userInfo->usri3_password_expired; - UpdateUserOptions(hwndDlg, userInfo, FALSE); + UpdateNewUserOptions(hwndDlg, userInfo, FALSE); break; case IDC_USER_NEW_CANNOT_CHANGE: userInfo->usri3_flags ^= UF_PASSWD_CANT_CHANGE; - UpdateUserOptions(hwndDlg, userInfo, FALSE); + UpdateNewUserOptions(hwndDlg, userInfo, FALSE); break; case IDC_USER_NEW_NEVER_EXPIRES: userInfo->usri3_flags ^= UF_DONT_EXPIRE_PASSWD; - UpdateUserOptions(hwndDlg, userInfo, FALSE); + UpdateNewUserOptions(hwndDlg, userInfo, FALSE); break; case IDC_USER_NEW_DISABLED: -- 2.17.1