lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-06-02 09:20:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32] Use the folder column, not the list column during DefView sorting (#8162)

Browse Source 
IShellFolder::CompareIDs does not understand ListView columns, we must provide it with a column index it understands during sorting.

CORE-20251
This commit is contained in:
Whindmar Saksit
2025-06-24 15:46:48 +02:00
committed by GitHub
parent c25856d1c0
commit 81931d1ac0
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dll/win32/shell32/CDefView.cpp
View File

@@ -65,6 +65,7 @@ struct LISTVIEW_SORT_INFO
bool bColumnIsFolderColumn;
UINT8 Reserved; // Unused
INT ListColumn;
INT FolderColumn; // Only valid during a sorting operation
enum { UNSPECIFIEDCOLUMN = -1 };
void Reset()
@@ -1262,7 +1263,7 @@ INT CALLBACK CDefView::ListViewCompareItems(LPARAM lParam1, LPARAM lParam2, LPAR
PCUIDLIST_RELATIVE pidl2 = reinterpret_cast<PCUIDLIST_RELATIVE>(lParam2);
CDefView *pThis = reinterpret_cast<CDefView*>(lpData);
HRESULT hres = pThis->m_pSFParent->CompareIDs(pThis->m_sortInfo.ListColumn, pidl1, pidl2);
HRESULT hres = pThis->m_pSFParent->CompareIDs(pThis->m_sortInfo.FolderColumn, pidl1, pidl2);
if (FAILED_UNEXPECTEDLY(hres))
return 0;
@@ -1317,7 +1318,7 @@ BOOL CDefView::_Sort(int Col)
hColumn.fmt |= (m_sortInfo.Direction > 0 ? HDF_SORTUP : HDF_SORTDOWN);
Header_SetItem(hHeader, m_sortInfo.ListColumn, &hColumn);
/* Sort the list, using the current values of ListColumn and bIsAscending */
m_sortInfo.FolderColumn = MapListColumnToFolderColumn(m_sortInfo.ListColumn);
ASSERT(m_sortInfo.Direction == 1 || m_sortInfo.Direction == -1);
return m_ListView.SortItems(ListViewCompareItems, this);
}