Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-21 13:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32] Enable to change shortcut icon (#784)

Browse source 
CORE-11407
This commit is contained in:
Katayama Hirofumi MZ 2018-08-21 20:49:32 +09:00 committed by Hermès BÉLUSCA - MAÏTO
parent b3cfe88eda
commit 73798d2e71
1 changed files with 4 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
dll/win32/shell32/CShellLink.cpp
View file

@ -1739,36 +1739,14 @@ HRESULT STDMETHODCALLTYPE CShellLink::GetIconLocation(UINT uFlags, PWSTR pszIcon
*/
uFlags |= GIL_FORSHORTCUT;
if (m_pPidl || m_sPath)
hr = GetIconLocation(pszIconFile, cchMax, piIndex);
if (FAILED(hr))
{
/* first look for an icon using the PIDL (if present) */
if (m_pPidl)
hr = SHELL_PidlGetIconLocationW(m_pPidl, uFlags, pszIconFile, cchMax, piIndex, pwFlags);
else
hr = E_FAIL;
#if 0 // FIXME: Analyse further whether this is needed...
/* if we couldn't find an icon yet, look for it using the file system path */
if (FAILED(hr) && m_sPath)
{
LPITEMIDLIST pidl;
CComPtr<IShellFolder> pdsk;
hr = SHGetDesktopFolder(&pdsk);
/* LPITEMIDLIST pidl = ILCreateFromPathW(sPath); */
hr = pdsk->ParseDisplayName(0, NULL, m_sPath, NULL, &pidl, NULL);
if (SUCCEEDED(hr))
{
hr = SHELL_PidlGetIconLocationW(pidl, uFlags, pszIconFile, cchMax, piIndex, pwFlags);
SHFree(pidl);
}
}
#endif
return hr;
}
return S_OK;
return hr;
}
HRESULT STDMETHODCALLTYPE
@ -2967,6 +2945,7 @@ LRESULT CShellLink::OnNotify(HWND hwndDlg, int idFrom, LPNMHDR pnmhdr)
TRACE("This %p m_sLinkPath %S\n", this, m_sLinkPath);
Save(m_sLinkPath, TRUE);
SHChangeNotify(SHCNE_UPDATEITEM, SHCNF_PATHW, m_sLinkPath, NULL);
SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, PSNRET_NOERROR);
return TRUE;
}