Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-28 17:01:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

[SHELLFIND] Use smart pointers for PIDLs

Browse source
This commit is contained in:
Brock Mammen 2019-08-03 11:58:49 -05:00 committed by Giannis Adamopoulos
parent 27ca55bce6
commit 6d6bc885cb
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
dll/win32/browseui/shellfind/CFindFolder.cpp
View file

@ -32,6 +32,11 @@ static FolderViewColumns g_ColumnDefs[] =
{L"Relevance", SHCOLSTATE_TYPE_STR, LVCFMT_LEFT, 0}
};
CFindFolder::CFindFolder() :
m_hStopEvent(NULL)
{
}
static LPITEMIDLIST _ILCreate(LPCWSTR lpszPath, LPCITEMIDLIST lpcFindDataPidl)
{
int pathLen = (wcslen(lpszPath) + 1) * sizeof(WCHAR);
@ -86,7 +91,7 @@ LRESULT CFindFolder::AddItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHan
return hr;
}
LPITEMIDLIST lpFSPidl;
CComHeapPtr<ITEMIDLIST> lpFSPidl;
DWORD pchEaten;
hr = pShellFolder->ParseDisplayName(NULL, NULL, path, &pchEaten, &lpFSPidl, NULL);
if (FAILED_UNEXPECTEDLY(hr))
@ -96,8 +101,7 @@ LRESULT CFindFolder::AddItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHan
}
LPITEMIDLIST lpLastFSPidl = ILFindLastID(lpFSPidl);
LPITEMIDLIST lpSearchPidl = _ILCreate(path, lpLastFSPidl);
ILFree(lpFSPidl);
CComHeapPtr<ITEMIDLIST> lpSearchPidl(_ILCreate(path, lpLastFSPidl));
LocalFree(path);
if (!lpSearchPidl)
{
@ -106,7 +110,6 @@ LRESULT CFindFolder::AddItem(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHan
UINT uItemIndex;
hr = m_shellFolderView->AddObject(lpSearchPidl, &uItemIndex);
ILFree(lpSearchPidl);
return hr;
}
@ -258,7 +261,7 @@ STDMETHODIMP CFindFolder::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHI
WCHAR path[MAX_PATH];
wcscpy(path, (LPCWSTR) apidl[0]->mkid.abID);
PathRemoveFileSpecW(path);
LPITEMIDLIST rootPidl = ILCreateFromPathW(path);
CComHeapPtr<ITEMIDLIST> rootPidl(ILCreateFromPathW(path));
if (!rootPidl)
return E_OUTOFMEMORY;
PCITEMID_CHILD aFSPidl[1];
@ -371,7 +374,7 @@ STDMETHODIMP CFindFolder::CallBack(IShellFolder *psf, HWND hwndOwner, IDataObjec
for (UINT i = 0; i < cidl; i++)
{
LPITEMIDLIST pidl;
CComHeapPtr<ITEMIDLIST> pidl;
DWORD attrs = 0;
hr = SHILCreateFromPathW((LPCWSTR) apidl[i]->mkid.abID, &pidl, &attrs);
if (SUCCEEDED(hr))

2
dll/win32/browseui/shellfind/CSearchBar.cpp
View file

@ -188,7 +188,7 @@ LRESULT CSearchBar::OnSearchButtonClicked(WORD wNotifyCode, WORD wID, HWND hWndC
if (FAILED_UNEXPECTEDLY(hr))
return hr;
LPITEMIDLIST findFolderPidl;
CComHeapPtr<ITEMIDLIST> findFolderPidl;
hr = SHParseDisplayName(szShellGuid, NULL, &findFolderPidl, 0, NULL);
if (FAILED_UNEXPECTEDLY(hr))
return hr;