You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ma...@apache.org on 2019/05/23 20:56:00 UTC

[commons-daemon] 01/04: Rename in preparation for adding more account options

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-daemon.git

commit b901e7598440a0743e0a4c0b036c4e878d1aaf64
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu May 23 17:39:55 2019 +0100

    Rename in preparation for adding more account options
---
 src/native/windows/apps/prunmgr/prunmgr.c  | 10 +++++-----
 src/native/windows/apps/prunmgr/prunmgr.h  |  2 +-
 src/native/windows/apps/prunmgr/prunmgr.rc |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/native/windows/apps/prunmgr/prunmgr.c b/src/native/windows/apps/prunmgr/prunmgr.c
index 610b7c6..8f92f95 100644
--- a/src/native/windows/apps/prunmgr/prunmgr.c
+++ b/src/native/windows/apps/prunmgr/prunmgr.c
@@ -721,13 +721,13 @@ LRESULT CALLBACK __logonProperty(HWND hDlg,
                 /* Check if we use LocalSystem or user defined account */
                 if (lstrcmpiW(_currentEntry->szObjectName, STAT_SYSTEM)) {
                     bAccount = TRUE;
-                    CheckRadioButton(hDlg, IDC_PPSLLS, IDC_PPSLUA, IDC_PPSLUA);
+                    CheckRadioButton(hDlg, IDC_PPSLLSYS, IDC_PPSLUA, IDC_PPSLUA);
                     SetDlgItemTextW(hDlg, IDC_PPSLUSER, _currentEntry->szObjectName);
                     SetDlgItemTextW(hDlg, IDC_PPSLPASS, EMPTY_PASSWORD);
                     SetDlgItemTextW(hDlg, IDC_PPSLCPASS, EMPTY_PASSWORD);
                 }
                 else {
-                    CheckRadioButton(hDlg, IDC_PPSLLS, IDC_PPSLUA, IDC_PPSLLS);
+                    CheckRadioButton(hDlg, IDC_PPSLLSYS, IDC_PPSLUA, IDC_PPSLLSYS);
                     if (_currentEntry->lpConfig->dwServiceType &
                         SERVICE_INTERACTIVE_PROCESS)
                         CheckDlgButton(hDlg, IDC_PPSLID, BST_CHECKED);
@@ -743,7 +743,7 @@ LRESULT CALLBACK __logonProperty(HWND hDlg,
         break;
         case WM_COMMAND:
             switch (LOWORD(wParam)) {
-                case IDC_PPSLLS:
+                case IDC_PPSLLSYS:
                     SetDlgItemTextW(hDlg, IDC_PPSLUSER, L"");
                     SetDlgItemTextW(hDlg, IDC_PPSLPASS, L"");
                     SetDlgItemTextW(hDlg, IDC_PPSLCPASS, L"");
@@ -754,7 +754,7 @@ LRESULT CALLBACK __logonProperty(HWND hDlg,
                     EnableWindow(GetDlgItem(hDlg, IDC_PPSLPASS), FALSE);
                     EnableWindow(GetDlgItem(hDlg, IDL_PPSLCPASS), FALSE);
                     EnableWindow(GetDlgItem(hDlg, IDC_PPSLCPASS), FALSE);
-                    CheckRadioButton(hDlg, IDC_PPSLLS, IDC_PPSLUA, (INT)wParam);
+                    CheckRadioButton(hDlg, IDC_PPSLLSYS, IDC_PPSLUA, (INT)wParam);
                     if (lstrcmpiW(_currentEntry->szObjectName, STAT_SYSTEM)) {
                         PropSheet_Changed(GetParent(hDlg), hDlg);
                         SET_BIT_FLAG(_propertyChanged, 2);
@@ -775,7 +775,7 @@ LRESULT CALLBACK __logonProperty(HWND hDlg,
                     EnableWindow(GetDlgItem(hDlg, IDC_PPSLPASS), TRUE);
                     EnableWindow(GetDlgItem(hDlg, IDL_PPSLCPASS), TRUE);
                     EnableWindow(GetDlgItem(hDlg, IDC_PPSLCPASS), TRUE);
-                    CheckRadioButton(hDlg, IDC_PPSLLS, IDC_PPSLUA, (INT)wParam);
+                    CheckRadioButton(hDlg, IDC_PPSLLSYS, IDC_PPSLUA, (INT)wParam);
                     if (lstrcmpW(_currentEntry->szObjectName, STAT_SYSTEM)) {
                         PropSheet_Changed(GetParent(hDlg), hDlg);
                         SET_BIT_FLAG(_propertyChanged, 2);
diff --git a/src/native/windows/apps/prunmgr/prunmgr.h b/src/native/windows/apps/prunmgr/prunmgr.h
index 29bc6a2..206074c 100644
--- a/src/native/windows/apps/prunmgr/prunmgr.h
+++ b/src/native/windows/apps/prunmgr/prunmgr.h
@@ -58,7 +58,7 @@
 #define IDC_PPSGRESTART                 2610
 
 #define IDD_PROPPAGE_LOGON              2620
-#define IDC_PPSLLS                      2621
+#define IDC_PPSLLSYS                    2621
 #define IDC_PPSLID                      2622
 #define IDC_PPSLUA                      2623
 #define IDC_PPSLUSER                    2624
diff --git a/src/native/windows/apps/prunmgr/prunmgr.rc b/src/native/windows/apps/prunmgr/prunmgr.rc
index 5dbecff..1b1e1e2 100644
--- a/src/native/windows/apps/prunmgr/prunmgr.rc
+++ b/src/native/windows/apps/prunmgr/prunmgr.rc
@@ -108,7 +108,7 @@ STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
     LTEXT           "Log on as:",IDC_STATIC,10,8,51,8
-    CONTROL         "&Local System account",IDC_PPSLLS,"Button",
+    CONTROL         "&Local System account",IDC_PPSLLSYS,"Button",
                     BS_AUTORADIOBUTTON,10,23,85,10
     CONTROL         "Allo&w service to interact with desktop",IDC_PPSLID,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,21,37,135,10