Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-06-12 06:08:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

[REGEDIT] Use shell icons for the tree view

Browse source 
- This makes regedit.exe smaller
- Reduces resource duplication in the source tree
- Potentially improves support for theming

CORE-10764
This commit is contained in:
Stanislav Motylkov 2022-11-03 01:38:05 +03:00
parent ed7b0d0bd9
commit 5daf5cd057
No known key found for this signature in database
GPG key ID: AFE513258CBA9E92
6 changed files with 21 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

3
base/applications/regedit/regedit.rc
View file

@ -33,9 +33,6 @@
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDI_OPEN_FILE ICON "res/folderopen.ico"
IDI_CLOSED_FILE ICON "res/folder.ico"
IDI_ROOT ICON "res/computer.ico"
IDI_STRING ICON "res/string.ico" IDI_STRING ICON "res/string.ico"
IDI_BIN ICON "res/bin.ico" IDI_BIN ICON "res/bin.ico"
IDI_REGEDIT ICON "res/regedit.ico" IDI_REGEDIT ICON "res/regedit.ico"

BIN
base/applications/regedit/res/computer.ico
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.5 KiB

BIN
base/applications/regedit/res/folder.ico
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
base/applications/regedit/res/folderopen.ico
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 2.8 KiB

3
base/applications/regedit/resource.h
View file

@ -40,9 +40,6 @@
#define IDC_REGEDIT_FRAME 110 #define IDC_REGEDIT_FRAME 110
#define IDR_REGEDIT_MENU 130 #define IDR_REGEDIT_MENU 130
#define IDD_EXPORTRANGE 131 #define IDD_EXPORTRANGE 131
#define IDI_OPEN_FILE 132
#define IDI_CLOSED_FILE 133
#define IDI_ROOT 134
#define IDI_STRING 135 #define IDI_STRING 135
#define IDI_BIN 136 #define IDI_BIN 136
#define IDR_POPUP_MENUS 137 #define IDR_POPUP_MENUS 137

36
base/applications/regedit/treeview.c
View file

@ -32,6 +32,11 @@ static LPWSTR pathBuffer;
#define NUM_ICONS 3 #define NUM_ICONS 3
/* External resources in shell32.dll */
#define IDI_SHELL_FOLDER 4
#define IDI_SHELL_FOLDER_OPEN 5
#define IDI_SHELL_MY_COMPUTER 16
static BOOL get_item_path(HWND hwndTV, HTREEITEM hItem, HKEY* phKey, LPWSTR* pKeyPath, int* pPathLen, int* pMaxLen) static BOOL get_item_path(HWND hwndTV, HTREEITEM hItem, HKEY* phKey, LPWSTR* pKeyPath, int* pPathLen, int* pMaxLen)
{ {
TVITEMW item; TVITEMW item;
@ -441,42 +446,43 @@ static BOOL InitTreeViewImageLists(HWND hwndTV)
HICON hico; /* handle to icon */ HICON hico; /* handle to icon */
INT cx = GetSystemMetrics(SM_CXSMICON); INT cx = GetSystemMetrics(SM_CXSMICON);
INT cy = GetSystemMetrics(SM_CYSMICON); INT cy = GetSystemMetrics(SM_CYSMICON);
HMODULE hShell32 = GetModuleHandleW(L"shell32.dll");
/* Create the image list. */ /* Create the image list. */
if ((himl = ImageList_Create(cx, cy, ILC_MASK | ILC_COLOR32, 0, NUM_ICONS)) == NULL) if ((himl = ImageList_Create(cx, cy, ILC_MASK | ILC_COLOR32, 0, NUM_ICONS)) == NULL)
return FALSE; return FALSE;
/* Add the open file, closed file, and document bitmaps. */ /* Add the open file, closed file, and document bitmaps. */
hico = LoadImageW(hInst, hico = LoadImageW(hShell32,
MAKEINTRESOURCEW(IDI_OPEN_FILE), MAKEINTRESOURCEW(IDI_SHELL_FOLDER_OPEN),
IMAGE_ICON, IMAGE_ICON,
GetSystemMetrics(SM_CXSMICON), cx,
GetSystemMetrics(SM_CYSMICON), cy,
0); LR_DEFAULTCOLOR);
if (hico) if (hico)
{ {
Image_Open = ImageList_AddIcon(himl, hico); Image_Open = ImageList_AddIcon(himl, hico);
DestroyIcon(hico); DestroyIcon(hico);
} }
hico = LoadImageW(hInst, hico = LoadImageW(hShell32,
MAKEINTRESOURCEW(IDI_CLOSED_FILE), MAKEINTRESOURCEW(IDI_SHELL_FOLDER),
IMAGE_ICON, IMAGE_ICON,
GetSystemMetrics(SM_CXSMICON), cx,
GetSystemMetrics(SM_CYSMICON), cy,
0); LR_DEFAULTCOLOR);
if (hico) if (hico)
{ {
Image_Closed = ImageList_AddIcon(himl, hico); Image_Closed = ImageList_AddIcon(himl, hico);
DestroyIcon(hico); DestroyIcon(hico);
} }
hico = LoadImageW(hInst, hico = LoadImageW(hShell32,
MAKEINTRESOURCEW(IDI_ROOT), MAKEINTRESOURCEW(IDI_SHELL_MY_COMPUTER),
IMAGE_ICON, IMAGE_ICON,
GetSystemMetrics(SM_CXSMICON), cx,
GetSystemMetrics(SM_CYSMICON), cy,
0); LR_DEFAULTCOLOR);
if (hico) if (hico)
{ {
Image_Root = ImageList_AddIcon(himl, hico); Image_Root = ImageList_AddIcon(himl, hico);