Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 11:17:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOBJSHEX]

Browse source 
* Fix CompareID sorting to prefer "folders" first, and sort by name otherwise.

svn path=/trunk/; revision=66729
This commit is contained in:
David Quintana 2015-03-15 17:33:55 +00:00
parent ecc5539849
commit 975b75f825
2 changed files with 58 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

46
reactos/dll/shellext/ntobjshex/ntobjns.cpp
View file

@ -294,45 +294,57 @@ public:
HRESULT CompareIDs(LPARAM lParam, NtPidlEntry * first, NtPidlEntry * second) HRESULT CompareIDs(LPARAM lParam, NtPidlEntry * first, NtPidlEntry * second)
{ {
if (LOWORD(lParam) != 0) if (LOWORD(lParam) != 0)
{
DbgPrint("Unsupported sorting mode.\n");
return E_INVALIDARG; return E_INVALIDARG;
}
if (second->cb > first->cb)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (second->cb < first->cb)
return MAKE_HRESULT(0, 0, (USHORT) -1);
if (second->entryNameLength > first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (second->entryNameLength < first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) -1);
if (HIWORD(lParam) == SHCIDS_ALLFIELDS) if (HIWORD(lParam) == SHCIDS_ALLFIELDS)
{ {
int ord = memcmp(second, first, first->cb); int minsize = min(first->cb, second->cb);
int ord = memcmp(second, first, minsize);
if (ord != 0) if (ord != 0)
return MAKE_HRESULT(0, 0, (USHORT) ord); return MAKE_HRESULT(0, 0, (USHORT) ord);
if (second->cb > first->cb)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (second->cb < first->cb)
return MAKE_HRESULT(0, 0, (USHORT) -1);
} }
else if (HIWORD(lParam) == SHCIDS_CANONICALONLY) else if (HIWORD(lParam) == SHCIDS_CANONICALONLY)
{ {
int ord = StrCmpNW(second->entryName, first->entryName, first->entryNameLength); int minlength = min(first->entryNameLength, second->entryNameLength);
int ord = StrCmpNW(first->entryName, second->entryName, minlength);
if (ord != 0) if (ord != 0)
return MAKE_HRESULT(0, 0, (USHORT) ord); return MAKE_HRESULT(0, 0, (USHORT) ord);
if (second->entryNameLength > first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (second->entryNameLength < first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) -1);
} }
else else
{ {
int ord = (int) second->objectType - (int) first->objectType; bool f1 = (first->objectType == DIRECTORY_OBJECT) || (first->objectType == KEY_OBJECT);
bool f2 = (second->objectType == DIRECTORY_OBJECT) || (second->objectType == KEY_OBJECT);
if (ord > 0) if (f1 && !f2)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (ord < 0)
return MAKE_HRESULT(0, 0, (USHORT) -1); return MAKE_HRESULT(0, 0, (USHORT) -1);
if (f2 && !f1)
return MAKE_HRESULT(0, 0, (USHORT) 1);
ord = StrCmpNW(second->entryName, first->entryName, first->entryNameLength / sizeof(WCHAR)); int minlength = min(first->entryNameLength, second->entryNameLength);
int ord = StrCmpNW(first->entryName, second->entryName, minlength);
if (ord != 0) if (ord != 0)
return MAKE_HRESULT(0, 0, (USHORT) ord); return MAKE_HRESULT(0, 0, (USHORT) ord);
if (second->entryNameLength > first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (second->entryNameLength < first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) -1);
} }
return S_OK; return S_OK;

46
reactos/dll/shellext/ntobjshex/regfolder.cpp
View file

@ -290,45 +290,57 @@ public:
HRESULT CompareIDs(LPARAM lParam, RegPidlEntry * first, RegPidlEntry * second) HRESULT CompareIDs(LPARAM lParam, RegPidlEntry * first, RegPidlEntry * second)
{ {
if (LOWORD(lParam) != 0) if (LOWORD(lParam) != 0)
{
DbgPrint("Unsupported sorting mode.\n");
return E_INVALIDARG; return E_INVALIDARG;
}
if (second->cb > first->cb)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (second->cb < first->cb)
return MAKE_HRESULT(0, 0, (USHORT) -1);
if (second->entryNameLength > first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (second->entryNameLength < first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) -1);
if (HIWORD(lParam) == SHCIDS_ALLFIELDS) if (HIWORD(lParam) == SHCIDS_ALLFIELDS)
{ {
int ord = memcmp(second, first, first->cb); int minsize = min(first->cb, second->cb);
int ord = memcmp(second, first, minsize);
if (ord != 0) if (ord != 0)
return MAKE_HRESULT(0, 0, (USHORT) ord); return MAKE_HRESULT(0, 0, (USHORT) ord);
if (second->cb > first->cb)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (second->cb < first->cb)
return MAKE_HRESULT(0, 0, (USHORT) -1);
} }
else if (HIWORD(lParam) == SHCIDS_CANONICALONLY) else if (HIWORD(lParam) == SHCIDS_CANONICALONLY)
{ {
int ord = StrCmpNW(second->entryName, first->entryName, first->entryNameLength); int minlength = min(first->entryNameLength, second->entryNameLength);
int ord = StrCmpNW(first->entryName, second->entryName, minlength);
if (ord != 0) if (ord != 0)
return MAKE_HRESULT(0, 0, (USHORT) ord); return MAKE_HRESULT(0, 0, (USHORT) ord);
if (second->entryNameLength > first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (second->entryNameLength < first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) -1);
} }
else else
{ {
int ord = (int) second->entryType - (int) first->entryType; bool f1 = (first->entryType == REG_ENTRY_KEY) || (first->entryType == REG_ENTRY_ROOT);
bool f2 = (second->entryType == REG_ENTRY_KEY) || (second->entryType == REG_ENTRY_ROOT);
if (ord > 0) if (f1 && !f2)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (ord < 0)
return MAKE_HRESULT(0, 0, (USHORT) -1); return MAKE_HRESULT(0, 0, (USHORT) -1);
if (f2 && !f1)
return MAKE_HRESULT(0, 0, (USHORT) 1);
ord = StrCmpNW(second->entryName, first->entryName, first->entryNameLength / sizeof(WCHAR)); int minlength = min(first->entryNameLength, second->entryNameLength);
int ord = StrCmpNW(first->entryName, second->entryName, minlength);
if (ord != 0) if (ord != 0)
return MAKE_HRESULT(0, 0, (USHORT) ord); return MAKE_HRESULT(0, 0, (USHORT) ord);
if (second->entryNameLength > first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (second->entryNameLength < first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) -1);
} }
return S_OK; return S_OK;