ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-08-26 19:33:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32] SEE_MASK_IDLIST should not assume the PIDL is always a FS path (#7693)

Browse Source 
CORE-16898 CORE-14177
This commit is contained in:
Whindmar Saksit
2025-01-31 21:15:13 +01:00
committed by GitHub
parent 6265add147
commit f335322ace
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dll/win32/shell32/shlexec.cpp
+11 -4
View File
@@ -2076,10 +2076,10 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc)
if (sei_tmp.fMask & SEE_MASK_IDLIST &&
(sei_tmp.fMask & SEE_MASK_INVOKEIDLIST) != SEE_MASK_INVOKEIDLIST)
{
LPCITEMIDLIST pidl = (LPCITEMIDLIST)sei_tmp.lpIDList;
CComPtr<IShellExecuteHookW> pSEH;
HRESULT hr = SHBindToParent((LPCITEMIDLIST)sei_tmp.lpIDList, IID_PPV_ARG(IShellExecuteHookW, &pSEH), NULL);
HRESULT hr = SHBindToParent(pidl, IID_PPV_ARG(IShellExecuteHookW, &pSEH), NULL);
if (SUCCEEDED(hr))
{
hr = pSEH->Execute(&sei_tmp);
@@ -2087,7 +2087,14 @@ static BOOL SHELL_execute(LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc)
return TRUE;
}
SHGetPathFromIDListW((LPCITEMIDLIST)sei_tmp.lpIDList, wszApplicationName);
hr = SHGetNameAndFlagsW(pidl, SHGDN_FORPARSING, wszApplicationName, dwApplicationNameLen, NULL);
if (FAILED(hr))
{
if (dwApplicationNameLen)
*wszApplicationName = UNICODE_NULL;
if (!_ILIsDesktop(pidl))
TRACE("Unable to get PIDL parsing path\n");
}
appKnownSingular = TRUE;
TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName));
}