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

[SHELL32] Check for valid listview in CDefView::_PidlByItem and CDefView::RemoveObject

Browse source 
This fixes failing ATLASSERTs in shell32_winetest:shlview
This commit is contained in:
Timo Kreuzer 2022-12-14 09:27:53 +02:00
parent 902cdbc63a
commit 7d4de5f8ea
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dll/win32/shell32/CDefView.cpp
View file

@ -867,11 +867,15 @@ BOOL CDefView::_Sort()
PCUITEMID_CHILD CDefView::_PidlByItem(int i)
{
if (!m_ListView)
return nullptr;
return reinterpret_cast<PCUITEMID_CHILD>(m_ListView.GetItemData(i));
}
PCUITEMID_CHILD CDefView::_PidlByItem(LVITEM& lvItem)
{
if (!m_ListView)
return nullptr;
return reinterpret_cast<PCUITEMID_CHILD>(lvItem.lParam);
}
@ -3112,6 +3116,9 @@ HRESULT STDMETHODCALLTYPE CDefView::RemoveObject(PITEMID_CHILD pidl, UINT *item)
TRACE("(%p)->(%p %p)\n", this, pidl, item);
if (!m_ListView)
return E_FAIL;
if (pidl)
{
*item = LV_FindItemByPidl(ILFindLastID(pidl));
@ -3154,7 +3161,8 @@ HRESULT STDMETHODCALLTYPE CDefView::RefreshObject(PITEMID_CHILD pidl, UINT *item
HRESULT STDMETHODCALLTYPE CDefView::SetRedraw(BOOL redraw)
{
TRACE("(%p)->(%d)\n", this, redraw);
m_ListView.SetRedraw(redraw);
if (m_ListView)
m_ListView.SetRedraw(redraw);
return S_OK;
}