From 6fb67ddc0ec0e1d963b12d47140721f194e324a6 Mon Sep 17 00:00:00 2001 From: Joachim Henze Date: Sun, 11 Aug 2024 18:49:45 +0200 Subject: [PATCH] [REGEDIT] Strip ancient stuff from resource.h / framewnd.c (#7194) Stuff from the stone-age, not used anymore. * ID_REGISTRY_PRINTSUBTREE & ID_REGISTRY_PRINTERSETUP have been fused into one in newer MS regedit.exe. Older versions of MS regedt32.exe had that separated still, see https://github.com/reactos/reactos/pull/7194#discussion_r1695021919 for some details and screenshots about that. * ID_REGISTRY_OPENLOCAL is obsolete too for the same reason. * ID_REGISTRY_SELECTCOMPUTER can be stripped too, because it was historically replaced by ID_REGISTRY_(DIS)CONNECTNETWORKREGISTRY co-authored by hermes.belusca-maito@reactos.org --- base/applications/regedit/framewnd.c | 8 ------- base/applications/regedit/resource.h | 34 ---------------------------- 2 files changed, 42 deletions(-) diff --git a/base/applications/regedit/framewnd.c b/base/applications/regedit/framewnd.c index 8b025f07729..e22f383d970 100644 --- a/base/applications/regedit/framewnd.c +++ b/base/applications/regedit/framewnd.c @@ -1338,14 +1338,6 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_EDIT_PERMISSIONS: RegKeyEditPermissions(hWnd, hKeyRoot, NULL, keyPath); break; - case ID_REGISTRY_PRINTERSETUP: - //PRINTDLG pd; - //PrintDlg(&pd); - //PAGESETUPDLG psd; - //PageSetupDlg(&psd); - break; - case ID_REGISTRY_OPENLOCAL: - break; case ID_VIEW_REFRESH: RefreshTreeView(g_pChildWnd->hTreeWnd); keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); diff --git a/base/applications/regedit/resource.h b/base/applications/regedit/resource.h index 47abb06360d..1bb0e198ad6 100644 --- a/base/applications/regedit/resource.h +++ b/base/applications/regedit/resource.h @@ -34,7 +34,6 @@ #define IDD_REMOVEFAVORITES 139 #define IDD_FIND 140 #define IDD_FINDING 141 -#define IDC_LICENSE_EDIT 1029 #define ID_REGISTRY_EXIT 32770 #define ID_FAVOURITES_ADDTOFAVOURITES 32772 #define ID_FAVOURITES_REMOVEFAVOURITE 32773 @@ -60,48 +59,15 @@ #define ID_HELP_HELPTOPICS 32794 #define ID_HELP_ABOUT 32795 -#define ID_WINDOW_CASCADE 32797 -#define ID_WINDOW_TILE 32798 -#define ID_WINDOW_ARRANGEICONS 32799 -#define ID_OPTIONS_FONT 32800 -#define ID_OPTIONS_AUTOREFRESH 32801 -#define ID_OPTIONS_READONLYMODE 32802 -#define ID_OPTIONS_CONFIRMONDELETE 32803 -#define ID_OPTIONS_SAVESETTINGSONEXIT 32804 -#define ID_SECURITY_PERMISSIONS 32805 -#define ID_VIEW_TREEANDDATA 32806 -#define ID_VIEW_TREEONLY 32807 -#define ID_VIEW_DATAONLY 32808 -#define ID_VIEW_DISPLAYBINARYDATA 32810 -#define ID_VIEW_REFRESHALL 32811 -#define ID_VIEW_REFRESHACTIVE 32812 -#define ID_VIEW_FINDKEY 32813 -#define ID_TREE_EXPANDONELEVEL 32814 #define ID_TREE_EXPANDBRANCH 32815 -#define ID_TREE_EXPANDALL 32816 #define ID_TREE_COLLAPSEBRANCH 32817 -#define ID_EDIT_ADDKEY 32818 -#define ID_EDIT_ADDVALUE 32819 -#define ID_EDIT_BINARY 32821 -#define ID_EDIT_STRING 32822 -#define ID_EDIT_DWORD 32823 -#define ID_EDIT_MULTISTRING 32824 -#define ID_REGISTRY_OPENLOCAL 32825 -#define ID_REGISTRY_CLOSE 32826 #define ID_REGISTRY_LOADHIVE 32827 #define ID_REGISTRY_UNLOADHIVE 32828 -#define ID_REGISTRY_RESTORE 32829 -#define ID_REGISTRY_SAVEKEY 32830 -#define ID_REGISTRY_SELECTCOMPUTER 32831 -#define ID_REGISTRY_PRINTSUBTREE 32832 -#define ID_REGISTRY_PRINTERSETUP 32833 -#define ID_REGISTRY_SAVESUBTREEAS 32834 #define ID_HEXEDIT_CUT 32835 #define ID_HEXEDIT_COPY 32836 #define ID_HEXEDIT_PASTE 32837 #define ID_HEXEDIT_DELETE 32838 #define ID_HEXEDIT_SELECT_ALL 32839 -#define IDS_LICENSE 32835 #define IDS_ERROR 32836 #define IDS_BAD_VALUE 32837 #define IDS_UNSUPPORTED_TYPE 32838