Skip to content

Commit 02b4119

Browse files
committed
[SHELL32] Do not try to call a NULL m_pSF2Parent. CORE-11969 #comment Please retest!
svn path=/trunk/; revision=72662
1 parent c6f8d6f commit 02b4119

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

reactos/dll/win32/shell32/CDefView.cpp

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -641,7 +641,7 @@ BOOL CDefView::InitList()
641641
}
642642
else
643643
{
644-
FIXME("no SF2\n");
644+
FIXME("no m_pSF2Parent\n");
645645
}
646646

647647
Shell_GetImageLists(&big_icons, &small_icons);
@@ -891,7 +891,14 @@ HRESULT CDefView::FillList()
891891
DPA_DestroyCallback( hdpa, fill_list, this);
892892

893893
/* sort the array */
894-
m_pSF2Parent->GetDefaultColumn(NULL, (ULONG*)&m_sortInfo.nHeaderID, NULL);
894+
if (m_pSF2Parent)
895+
{
896+
m_pSF2Parent->GetDefaultColumn(NULL, (ULONG*)&m_sortInfo.nHeaderID, NULL);
897+
}
898+
else
899+
{
900+
FIXME("no m_pSF2Parent\n");
901+
}
895902
m_sortInfo.bIsAscending = TRUE;
896903
m_sortInfo.nLastHeaderID = m_sortInfo.nHeaderID;
897904
m_ListView.SortItems(ListViewCompareItems, this);
@@ -1748,7 +1755,7 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl
17481755
}
17491756
else
17501757
{
1751-
FIXME("no SF2\n");
1758+
FIXME("no m_pSF2Parent\n");
17521759
}
17531760
}
17541761
if(lpdi->item.mask & LVIF_IMAGE) /* image requested */

0 commit comments

Comments
 (0)