lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-05-30 14:34:57 +08:00
Code Issues Packages Projects Releases 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
6 changed files with 26 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dll/win32/shell32/CMoveToMenu.cpp
View File

@@ -124,10 +124,9 @@ BrowseCallbackProc(HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData)
HRESULT CMoveToMenu::DoRealMove(LPCMINVOKECOMMANDINFO lpici, LPCITEMIDLIST pidl)
{
CComHeapPtr<CIDA> pCIDA;
HRESULT hr = _GetCidlFromDataObject(m_pDataObject, &pCIDA);
if (FAILED_UNEXPECTEDLY(hr))
return hr;
CDataObjectHIDA pCIDA(m_pDataObject);
if (FAILED_UNEXPECTEDLY(pCIDA.hr()))
return pCIDA.hr();
PCUIDLIST_ABSOLUTE pidlParent = HIDA_GetPIDLFolder(pCIDA);
if (!pidlParent)
@@ -191,9 +190,8 @@ CStringW CMoveToMenu::DoGetFileTitle()
{
CStringW ret = L"(file)";
CComHeapPtr<CIDA> pCIDA;
HRESULT hr = _GetCidlFromDataObject(m_pDataObject, &pCIDA);
if (FAILED_UNEXPECTEDLY(hr))
CDataObjectHIDA pCIDA(m_pDataObject);
if (FAILED_UNEXPECTEDLY(pCIDA.hr()))
return ret;
PCUIDLIST_ABSOLUTE pidlParent = HIDA_GetPIDLFolder(pCIDA);