[PATCH 3/4] regedit: Update and sort the pop-up menus

[Hugh McMaster]

Signed-off-by: Hugh McMaster <hugh.mcmaster at outlook.com>
---
 programs/regedit/childwnd.c |  2 +-
 programs/regedit/listview.c |  2 +-
 programs/regedit/main.h     |  7 ++++---
 programs/regedit/regedit.rc | 22 ++++++++++++----------
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/programs/regedit/childwnd.c b/programs/regedit/childwnd.c
index b20ff9a..7d7c1a2 100644
--- a/programs/regedit/childwnd.c
+++ b/programs/regedit/childwnd.c
@@ -378,7 +378,7 @@ LRESULT CALLBACK ChildWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPa
         ScreenToClient(g_pChildWnd->hTreeWnd, &ht.pt);
         if (SendMessageW(g_pChildWnd->hTreeWnd, TVM_HITTEST, 0, (LPARAM)&ht)) {
             SendMessageW(g_pChildWnd->hTreeWnd, TVM_SELECTITEM, TVGN_CARET, (LPARAM)ht.hItem);
-            TrackPopupMenu(GetSubMenu(hPopupMenus, PM_NEW), TPM_RIGHTBUTTON,
+            TrackPopupMenu(GetSubMenu(hPopupMenus, PM_TREEVIEW), TPM_RIGHTBUTTON,
                            pt.x, pt.y, 0, hFrameWnd, NULL);
         }
         break;
diff --git a/programs/regedit/listview.c b/programs/regedit/listview.c
index a78a406..a374bbd 100644
--- a/programs/regedit/listview.c
+++ b/programs/regedit/listview.c
@@ -463,7 +463,7 @@ static LRESULT CALLBACK ListWndProc(HWND hWnd, UINT message, WPARAM wParam, LPAR
         break;
     case WM_CONTEXTMENU: {
         int cnt = SendMessageW(hWnd, LVM_GETNEXTITEM, -1, MAKELPARAM(LVNI_SELECTED, 0));
-        TrackPopupMenu(GetSubMenu(hPopupMenus, cnt == -1 ? PM_NEW : PM_MODIFYVALUE),
+        TrackPopupMenu(GetSubMenu(hPopupMenus, cnt == -1 ? PM_TREEVIEW : PM_MODIFY_VALUE),
                        TPM_RIGHTBUTTON, (short)LOWORD(lParam), (short)HIWORD(lParam),
                        0, hFrameWnd, NULL);
         break;
diff --git a/programs/regedit/main.h b/programs/regedit/main.h
index 73f49e2..518b861 100644
--- a/programs/regedit/main.h
+++ b/programs/regedit/main.h
@@ -32,13 +32,14 @@
 
 #define COUNT_OF(a) (sizeof(a)/sizeof(a[0]))
 
-#define PM_MODIFYVALUE  0
-#define PM_NEW          1
-
 #define MAX_NEW_KEY_LEN 128
 
 #define WM_NOTIFY_REFLECT (WM_USER+1024)
 
+/* Pop-Up Menus */
+#define PM_TREEVIEW      0
+#define PM_MODIFY_VALUE  1
+
 /* HexEdit Class */
 #define HEM_SETDATA (WM_USER+0)
 #define HEM_GETDATA (WM_USER+1)
diff --git a/programs/regedit/regedit.rc b/programs/regedit/regedit.rc
index 28fa0f5..3a2075d 100644
--- a/programs/regedit/regedit.rc
+++ b/programs/regedit/regedit.rc
@@ -84,14 +84,7 @@ END
 
 IDR_POPUP_MENUS MENU
 BEGIN
-  POPUP ""
-  BEGIN
-	MENUITEM "&Modify...",                  ID_EDIT_MODIFY
-	MENUITEM "Modify Binary Data...",       ID_EDIT_MODIFY_BIN
-	MENUITEM SEPARATOR
-	MENUITEM "&Delete\tDel",                ID_EDIT_DELETE
-	MENUITEM "&Rename",                     ID_EDIT_RENAME
-  END
+  /* PM_TREEVIEW */
   POPUP ""
   BEGIN
         POPUP "&New"
@@ -104,14 +97,23 @@ BEGIN
             MENUITEM "&Multi-String Value",         ID_EDIT_NEW_MULTI_STRINGVALUE
             MENUITEM "&Expandable String Value",    ID_EDIT_NEW_EXPANDVALUE
         END
+        MENUITEM "&Find...\tCtrl+F",            ID_EDIT_FIND, GRAYED
         MENUITEM SEPARATOR
         MENUITEM "&Delete\tDel",                ID_EDIT_DELETE
         MENUITEM "&Rename\tF2",                 ID_EDIT_RENAME
         MENUITEM SEPARATOR
         MENUITEM "&Export...",                  ID_EDIT_EXPORT
-        MENUITEM "&Copy Key Name",              ID_EDIT_COPYKEYNAME
         MENUITEM SEPARATOR
-        MENUITEM "&Find...\tCtrl+F",            ID_EDIT_FIND, GRAYED
+        MENUITEM "&Copy Key Name",              ID_EDIT_COPYKEYNAME
+  END
+  /* PM_MODIFY_VALUE */
+  POPUP ""
+  BEGIN
+	MENUITEM "&Modify...",                  ID_EDIT_MODIFY
+	MENUITEM "Modify Binary Data...",       ID_EDIT_MODIFY_BIN
+	MENUITEM SEPARATOR
+	MENUITEM "&Delete\tDel",                ID_EDIT_DELETE
+	MENUITEM "&Rename",                     ID_EDIT_RENAME
   END
 END
 
-- 
2.7.4