Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-30 14:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.7][SHELL32] Fix item order in Folder Options (#415)

Browse source 
This fixes regression CORE-14393 for russian ros setups.

regression was introduced by SVN 75534 == git 0.4.7-dev-54-g
959a179f58

fix cherry picked from commit 0.4.9-dev-141-g
1f4c636453
This commit is contained in:
Joachim Henze 2020-10-03 21:50:32 +02:00
parent d7a6774bd7
commit b638ba6426
1 changed files with 41 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
dll/win32/shell32/dialogs/folder_options.cpp
View file

@ -361,6 +361,9 @@ CreateTreeImageList(VOID)
static ADVANCED_ENTRY *
Advanced_GetItem(DWORD dwID)
{
if (dwID == DWORD(-1))
return NULL;
for (INT i = 0; i < s_AdvancedCount; ++i)
{
ADVANCED_ENTRY *pEntry = &s_Advanced[i];
@ -703,24 +706,52 @@ Advanced_Compare(const void *x, const void *y)
{
ADVANCED_ENTRY *pEntry1 = (ADVANCED_ENTRY *)x;
ADVANCED_ENTRY *pEntry2 = (ADVANCED_ENTRY *)y;
DWORD dwParentID1 = pEntry1->dwParentID;
DWORD dwParentID2 = pEntry2->dwParentID;
while (dwParentID1 != dwParentID2)
if (dwParentID1 == dwParentID2)
return lstrcmpi(pEntry1->szText, pEntry2->szText);
DWORD i, m, n;
const UINT MAX_DEPTH = 32;
ADVANCED_ENTRY *pArray1[MAX_DEPTH];
ADVANCED_ENTRY *pArray2[MAX_DEPTH];
// Make ancestor lists
for (i = m = n = 0; i < MAX_DEPTH; ++i)
{
ADVANCED_ENTRY *pParent1 = Advanced_GetItem(dwParentID1);
ADVANCED_ENTRY *pParent2 = Advanced_GetItem(dwParentID2);
if (!pParent1 && !pParent2)
break;
if (!pParent1 && pParent2)
return -1;
if (pParent1 && !pParent2)
return 1;
INT nCompare = lstrcmpi(pParent1->szText, pParent2->szText);
if (nCompare)
return nCompare;
dwParentID1 = pParent1->dwParentID;
dwParentID2 = pParent2->dwParentID;
if (pParent1)
{
pArray1[m++] = pParent1;
dwParentID1 = pParent1->dwParentID;
}
if (pParent2)
{
pArray2[n++] = pParent2;
dwParentID2 = pParent2->dwParentID;
}
}
UINT k = min(m, n);
for (i = 0; i < k; ++i)
{
INT nCompare = lstrcmpi(pArray1[m - i - 1]->szText, pArray2[n - i - 1]->szText);
if (nCompare < 0)
return -1;
if (nCompare > 0)
return 1;
}
if (m < n)
return -1;
if (m > n)
return 1;
return lstrcmpi(pEntry1->szText, pEntry2->szText);
}