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

[SHELL32] Allow custom shortcut overlay icon (#6419)

Browse source 
Use correct icon index in SIC_OverlayShortcutImage() to properly load
shortcut overlay icon from registry instead of always using default icon.
This allows to use custom shortcut icon set by user, in case it was
specified there.

As FIXME comment stated, the icon indexes were not implemented in the far
past, so this workaround was badly required. But now they are implemented,
so no need to always use default resource from shell32, enable the correct
code instead.

Also adapt this to CShellLink::CreateShortcutIcon() when the shortcut icon
is being changed in its properties dialog, as well as in CNewMenu class
when displaying menu items for creating a new folder or a shortcut.

Addendum to f9a5344254. CORE-14758
This commit is contained in:
Oleg Dubinskiy 2024-03-04 14:30:43 +01:00 • committed by GitHub
parent bbbcd8ed68
commit eb96d377d1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 47 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
dll/win32/shell32/CNewMenu.cpp
View file

@ -33,6 +33,8 @@ CNewMenu::CNewMenu() :
m_idCmdFirst(0),
m_idCmdFolder(-1),
m_idCmdLink(-1),
m_bCustomIconFolder(FALSE),
m_bCustomIconLink(FALSE),
m_hIconFolder(NULL),
m_hIconLink(NULL)
{
@ -42,6 +44,10 @@ CNewMenu::~CNewMenu()
{
UnloadAllItems();
if (m_bCustomIconFolder && m_hIconFolder)
DestroyIcon(m_hIconFolder);
if (m_bCustomIconLink && m_hIconLink)
DestroyIcon(m_hIconLink);
if (m_pidlFolder)
ILFree(m_pidlFolder);
}
@ -768,10 +774,32 @@ HRESULT WINAPI
CNewMenu::Initialize(PCIDLIST_ABSOLUTE pidlFolder,
IDataObject *pdtobj, HKEY hkeyProgID)
{
const INT cx = GetSystemMetrics(SM_CXSMICON), cy = GetSystemMetrics(SM_CYSMICON);
WCHAR wszIconPath[MAX_PATH];
int icon_idx;
m_pidlFolder = ILClone(pidlFolder);
/* Load folder and shortcut icons */
m_hIconFolder = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, 16, 16, LR_SHARED);
m_hIconLink = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_SHORTCUT), IMAGE_ICON, 16, 16, LR_SHARED);
if (HLM_GetIconW(IDI_SHELL_FOLDER - 1, wszIconPath, _countof(wszIconPath), &icon_idx))
{
::ExtractIconExW(wszIconPath, icon_idx, &m_hIconFolder, NULL, 1);
m_bCustomIconFolder = TRUE;
}
else
{
m_hIconFolder = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_FOLDER), IMAGE_ICON, cx, cy, LR_SHARED);
}
if (HLM_GetIconW(IDI_SHELL_SHORTCUT - 1, wszIconPath, _countof(wszIconPath), &icon_idx))
{
::ExtractIconExW(wszIconPath, icon_idx, &m_hIconLink, NULL, 1);
m_bCustomIconLink = TRUE;
}
else
{
m_hIconLink = (HICON)LoadImage(shell32_hInstance, MAKEINTRESOURCE(IDI_SHELL_SHORTCUT), IMAGE_ICON, cx, cy, LR_SHARED);
}
return S_OK;
}