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

[SHELL32] Simplify HIDA usage

Browse source
This commit is contained in:
Mark Jansen 2021-07-25 01:10:24 +02:00
parent eb0c005c1b
commit fa0f5cc4be
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
6 changed files with 26 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

38
dll/win32/shell32/COpenWithMenu.cpp
View file

@ -1352,53 +1352,33 @@ COpenWithMenu::Initialize(PCIDLIST_ABSOLUTE pidlFolder,
IDataObject *pdtobj,
HKEY hkeyProgID)
{
STGMEDIUM medium;
FORMATETC fmt;
HRESULT hr;
LPIDA pida;
LPCITEMIDLIST pidlFolder2;
LPCITEMIDLIST pidlChild;
LPCITEMIDLIST pidl;
LPCWSTR pwszExt;
TRACE("This %p\n", this);
if (pdtobj == NULL)
return E_INVALIDARG;
fmt.cfFormat = RegisterClipboardFormatW(CFSTR_SHELLIDLIST);
fmt.ptd = NULL;
fmt.dwAspect = DVASPECT_CONTENT;
fmt.lindex = -1;
fmt.tymed = TYMED_HGLOBAL;
hr = pdtobj->GetData(&fmt, &medium);
if (FAILED(hr))
CDataObjectHIDA pida(pdtobj);
if (FAILED(pida.hr()))
{
ERR("pdtobj->GetData failed with 0x%x\n", hr);
return hr;
ERR("pdtobj->GetData failed with 0x%x\n", pida.hr());
return pida.hr();
}
pida = (LPIDA)GlobalLock(medium.hGlobal);
ASSERT(pida->cidl >= 1);
pidlFolder2 = (LPCITEMIDLIST) ((LPBYTE)pida + pida->aoffset[0]);
pidlChild = (LPCITEMIDLIST) ((LPBYTE)pida + pida->aoffset[1]);
pidlFolder2 = HIDA_GetPIDLFolder(pida);
pidlChild = HIDA_GetPIDLItem(pida, 0);
if (!_ILIsValue(pidlChild))
{
TRACE("pidl is not a file\n");
GlobalUnlock(medium.hGlobal);
ReleaseStgMedium(&medium);
return E_FAIL;
}
pidl = ILCombine(pidlFolder2, pidlChild);
GlobalUnlock(medium.hGlobal);
ReleaseStgMedium(&medium);
CComHeapPtr<ITEMIDLIST> pidl(ILCombine(pidlFolder2, pidlChild));
if (!pidl)
{
ERR("no mem\n");
@ -1407,15 +1387,13 @@ COpenWithMenu::Initialize(PCIDLIST_ABSOLUTE pidlFolder,
if (!SHGetPathFromIDListW(pidl, m_wszPath))
{
SHFree((void*)pidl);
ERR("SHGetPathFromIDListW failed\n");
return E_FAIL;
}
SHFree((void*)pidl);
TRACE("szPath %s\n", debugstr_w(m_wszPath));
pwszExt = PathFindExtensionW(m_wszPath);
LPCWSTR pwszExt = PathFindExtensionW(m_wszPath);
if (PathIsExeW(pwszExt) || !_wcsicmp(pwszExt, L".lnk"))
{
TRACE("file is a executable or shortcut\n");