[PATCH] regedit: Make it clear whether it is a key or a value that is about to be removed

[Hugh McMaster]

From: Nikolay Sivov <nsivov at codeweavers.com>

From: Nikolay Sivov <nsivov at codeweavers.com>

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>

Changes in this version:
* A minor wording change.
---
 programs/regedit/edit.c     | 5 +++--
 programs/regedit/framewnd.c | 4 ++--
 programs/regedit/regedit.rc | 8 +++++---
 programs/regedit/resource.h | 8 +++++---
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/programs/regedit/edit.c b/programs/regedit/edit.c
index c6a6629..28ea474 100644
--- a/programs/regedit/edit.c
+++ b/programs/regedit/edit.c
@@ -392,7 +392,7 @@ BOOL DeleteKey(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath)
 	return FALSE;
     }
     
-    if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_BOX_TITLE, IDS_DELETE_BOX_TEXT, keyPath) != IDYES)
+    if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_KEY_TITLE, IDS_DELETE_KEY_TEXT, keyPath) != IDYES)
 	goto done;
 	
     lRet = SHDeleteKeyW(hKeyRoot, keyPath);
@@ -420,7 +420,8 @@ BOOL DeleteValue(HWND hwnd, HKEY hKeyRoot, LPCWSTR keyPath, LPCWSTR valueName, B
 
     if (showMessageBox)
     {
-        if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_BOX_TITLE, IDS_DELETE_BOX_TEXT, visibleValueName) != IDYES)
+        if (messagebox(hwnd, MB_YESNO | MB_ICONEXCLAMATION, IDS_DELETE_VALUE_TITLE, IDS_DELETE_VALUE_TEXT,
+                visibleValueName) != IDYES)
             goto done;
     }
 
diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c
index 6b549d6..1c4885a 100644
--- a/programs/regedit/framewnd.c
+++ b/programs/regedit/framewnd.c
@@ -719,8 +719,8 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 
             curIndex = SendMessageW(g_pChildWnd->hListWnd, LVM_GETNEXTITEM, curIndex, MAKELPARAM(LVNI_SELECTED, 0));
             if(curIndex != -1 && firstItem) {
-                if (MessageBoxW(hWnd, MAKEINTRESOURCEW(IDS_DELETE_BOX_TEXT_MULTIPLE),
-                                MAKEINTRESOURCEW(IDS_DELETE_BOX_TITLE),
+                if (MessageBoxW(hWnd, MAKEINTRESOURCEW(IDS_DELETE_VALUE_TEXT_MULTIPLE),
+                                MAKEINTRESOURCEW(IDS_DELETE_VALUE_TITLE),
                                 MB_YESNO | MB_ICONEXCLAMATION) != IDYES)
                     break;
             }
diff --git a/programs/regedit/regedit.rc b/programs/regedit/regedit.rc
index 4bfd23a..1cd8381 100644
--- a/programs/regedit/regedit.rc
+++ b/programs/regedit/regedit.rc
@@ -180,9 +180,11 @@ BEGIN
     IDS_BAD_VALUE           "Unable to query the registry value '%1'."
     IDS_UNSUPPORTED_TYPE    "Unable to edit registry keys of this type (%1!u!)."
     IDS_TOO_BIG_VALUE       "The value is too big (%1!u!)."
-    IDS_DELETE_BOX_TITLE    "Confirm Value Delete"
-    IDS_DELETE_BOX_TEXT     "Are you sure you want to delete the registry value '%1'?"
-    IDS_DELETE_BOX_TEXT_MULTIPLE "Are you sure you want to delete these values?"
+    IDS_DELETE_VALUE_TITLE  "Confirm Value Delete"
+    IDS_DELETE_VALUE_TEXT   "Are you sure you want to delete the registry value '%1'?"
+    IDS_DELETE_VALUE_TEXT_MULTIPLE "Are you sure you want to delete these values?"
+    IDS_DELETE_KEY_TITLE    "Confirm Key Delete"
+    IDS_DELETE_KEY_TEXT     "Are you sure you want to delete the registry key '%1' and all of its subkeys?"
     IDS_NEWKEY              "New Key #%d"
     IDS_NEWVALUE            "New Value #%d"
     IDS_NOTFOUND            "Search complete. The string '%1' was not found."
diff --git a/programs/regedit/resource.h b/programs/regedit/resource.h
index f09a75a..996cf76 100644
--- a/programs/regedit/resource.h
+++ b/programs/regedit/resource.h
@@ -121,10 +121,10 @@
 #define IDS_BAD_VALUE			32837
 #define IDS_UNSUPPORTED_TYPE		32838
 #define IDS_TOO_BIG_VALUE		32839
-#define IDS_DELETE_BOX_TITLE		32840
-#define IDS_DELETE_BOX_TEXT		32841
+#define IDS_DELETE_VALUE_TITLE		32840
+#define IDS_DELETE_VALUE_TEXT		32841
 #define IDS_NOTFOUND    		32842
-#define IDS_DELETE_BOX_TEXT_MULTIPLE	32843
+#define IDS_DELETE_VALUE_TEXT_MULTIPLE	32843
 #define IDD_EDIT_DWORD			32850
 #define IDC_DWORD_BASE			32852
 #define IDC_DWORD_HEX			32853
@@ -139,6 +139,8 @@
 #define ID_EDIT_NEW_MULTI_STRINGVALUE   33100
 #define ID_EDIT_EXPORT                  33101
 #define ID_EDIT_NEW_EXPANDVALUE         33102
+#define IDS_DELETE_KEY_TITLE            33103
+#define IDS_DELETE_KEY_TEXT             33104
 
 #define IDD_EDIT_STRING			2000
 #define IDC_VALUE_NAME			2001
-- 
2.7.4