Author: mjansen
Date: Mon Sep 12 18:05:22 2016
New Revision: 72662
URL: http://svn.reactos.org/svn/reactos?rev=72662&view=rev
Log:
[SHELL32] Do not try to call a NULL m_pSF2Parent. CORE-11969 #comment Please
retest!
Modified:
trunk/reactos/dll/win32/shell32/CDefView.cpp
Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView.cpp?rev=72662&r1=72661&r2=72662&view=diff
==============================================================================
--- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Mon Sep 12
18:05:22 2016
@@ -641,7 +641,7 @@
}
else
{
- FIXME("no SF2\n");
+ FIXME("no m_pSF2Parent\n");
}
Shell_GetImageLists(&big_icons, &small_icons);
@@ -891,7 +891,14 @@
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 @@
}
else
{
- FIXME("no SF2\n");
+ FIXME("no m_pSF2Parent\n");
}
}
if(lpdi->item.mask & LVIF_IMAGE) /* image requested */
