From 02b4119836623c06c0a56bc237ee58d326099b5c Mon Sep 17 00:00:00 2001 From: Mark Jansen Date: Mon, 12 Sep 2016 18:05:22 +0000 Subject: [PATCH] [SHELL32] Do not try to call a NULL m_pSF2Parent. CORE-11969 #comment Please retest! svn path=/trunk/; revision=72662 --- reactos/dll/win32/shell32/CDefView.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/reactos/dll/win32/shell32/CDefView.cpp b/reactos/dll/win32/shell32/CDefView.cpp index 5611f17872b..0d639a4f80f 100644 --- a/reactos/dll/win32/shell32/CDefView.cpp +++ b/reactos/dll/win32/shell32/CDefView.cpp @@ -641,7 +641,7 @@ BOOL CDefView::InitList() } else { - FIXME("no SF2\n"); + FIXME("no m_pSF2Parent\n"); } Shell_GetImageLists(&big_icons, &small_icons); @@ -891,7 +891,14 @@ HRESULT CDefView::FillList() DPA_DestroyCallback( hdpa, fill_list, this); /* sort the array */ - m_pSF2Parent->GetDefaultColumn(NULL, (ULONG*)&m_sortInfo.nHeaderID, NULL); + if (m_pSF2Parent) + { + m_pSF2Parent->GetDefaultColumn(NULL, (ULONG*)&m_sortInfo.nHeaderID, NULL); + } + else + { + FIXME("no m_pSF2Parent\n"); + } m_sortInfo.bIsAscending = TRUE; m_sortInfo.nLastHeaderID = m_sortInfo.nHeaderID; m_ListView.SortItems(ListViewCompareItems, this); @@ -1748,7 +1755,7 @@ LRESULT CDefView::OnNotify(UINT uMsg, WPARAM wParam, LPARAM lParam, BOOL &bHandl } else { - FIXME("no SF2\n"); + FIXME("no m_pSF2Parent\n"); } } if(lpdi->item.mask & LVIF_IMAGE) /* image requested */