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

[SHELL32] Do not try to call a NULL m_pSF2Parent. CORE-11969 #comment Please retest!

Browse source 
svn path=/trunk/; revision=72662
This commit is contained in:
Mark Jansen 2016-09-12 18:05:22 +00:00
parent c6f8d6fe2c
commit 02b4119836
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
reactos/dll/win32/shell32/CDefView.cpp
View file

@ -641,7 +641,7 @@ BOOL CDefView::InitList()
} }
else else
{ {
FIXME("no SF2\n"); FIXME("no m_pSF2Parent\n");
} }
Shell_GetImageLists(&big_icons, &small_icons); Shell_GetImageLists(&big_icons, &small_icons);
@ -891,7 +891,14 @@ HRESULT CDefView::FillList()
DPA_DestroyCallback( hdpa, fill_list, this); DPA_DestroyCallback( hdpa, fill_list, this);
/* sort the array */ /* sort the array */
if (m_pSF2Parent)
{
m_pSF2Parent->GetDefaultColumn(NULL, (ULONG*)&m_sortInfo.nHeaderID, NULL); m_pSF2Parent->GetDefaultColumn(NULL, (ULONG*)&m_sortInfo.nHeaderID, NULL);
}
else
{
FIXME("no m_pSF2Parent\n");
}
m_sortInfo.bIsAscending = TRUE; m_sortInfo.bIsAscending = TRUE;
m_sortInfo.nLastHeaderID = m_sortInfo.nHeaderID; m_sortInfo.nLastHeaderID = m_sortInfo.nHeaderID;
m_ListView.SortItems(ListViewCompareItems, this); m_ListView.SortItems(ListViewCompareItems, this);
@ -1748,7 +1755,7 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
} }
else else
{ {
FIXME("no SF2\n"); FIXME("no m_pSF2Parent\n");
} }
} }
if(lpdi->item.mask & LVIF_IMAGE) /* image requested */ if(lpdi->item.mask & LVIF_IMAGE) /* image requested */