Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 08:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOBJSHEX]

Browse source 
* Implement support for column sorting in CompareIDs, for Name, Type, and Creation Date columns. The link target, and registry key contents are not sortable yet.

svn path=/trunk/; revision=66732
This commit is contained in:
David Quintana 2015-03-15 18:17:27 +00:00
parent 975b75f825
commit 1185ffa6b7
2 changed files with 149 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,9 +33,10 @@ static const GUID GUID_NtObjectColumns = { 0xf4c430c3, 0x3a8d, 0x4b56, { 0xa0, 0
enum NtObjectColumns
{
NTOBJECT_COLUMN_NAME = 0,
NTOBJECT_COLUMN_TYPE = 1,
NTOBJECT_COLUMN_CREATEDATE = 2,
NTOBJECT_COLUMN_LINKTARGET = 3,
NTOBJECT_COLUMN_TYPE,
NTOBJECT_COLUMN_CREATEDATE,
NTOBJECT_COLUMN_LINKTARGET,
NTOBJECT_COLUMN_END
};
class CNtObjectFolderExtractIcon :
@ -293,14 +294,11 @@ public:
HRESULT CompareIDs(LPARAM lParam, NtPidlEntry * first, NtPidlEntry * second)
{
if (LOWORD(lParam) != 0)
if ((lParam & 0xFFFF0000) == SHCIDS_ALLFIELDS)
{
DbgPrint("Unsupported sorting mode.\n");
return E_INVALIDARG;
}
if (lParam != 0)
return E_INVALIDARG;
if (HIWORD(lParam) == SHCIDS_ALLFIELDS)
{
int minsize = min(first->cb, second->cb);
int ord = memcmp(second, first, minsize);
@ -312,42 +310,81 @@ public:
if (second->cb < first->cb)
return MAKE_HRESULT(0, 0, (USHORT) -1);
}
else if (HIWORD(lParam) == SHCIDS_CANONICALONLY)
{
int minlength = min(first->entryNameLength, second->entryNameLength);
int ord = StrCmpNW(first->entryName, second->entryName, minlength);
if (ord != 0)
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
{
bool f1 = (first->objectType == DIRECTORY_OBJECT) || (first->objectType == KEY_OBJECT);
bool f2 = (second->objectType == DIRECTORY_OBJECT) || (second->objectType == KEY_OBJECT);
bool canonical = ((lParam & 0xFFFF0000) == SHCIDS_CANONICALONLY);
if (f1 && !f2)
return MAKE_HRESULT(0, 0, (USHORT) -1);
if (f2 && !f1)
return MAKE_HRESULT(0, 0, (USHORT) 1);
switch (lParam & 0xFFFF)
{
case NTOBJECT_COLUMN_NAME:
{
bool f1 = (first->objectType == KEY_OBJECT) || (first->objectType == DIRECTORY_OBJECT);
bool f2 = (second->objectType == KEY_OBJECT) || (second->objectType == DIRECTORY_OBJECT);
int minlength = min(first->entryNameLength, second->entryNameLength);
int ord = StrCmpNW(first->entryName, second->entryName, minlength);
if (f1 && !f2)
return MAKE_HRESULT(0, 0, (USHORT) -1);
if (f2 && !f1)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (ord != 0)
return MAKE_HRESULT(0, 0, (USHORT) ord);
if (canonical)
{
// Shortcut: avoid comparing contents if not necessary when the results are not for display.
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 (second->entryNameLength > first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (second->entryNameLength < first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) -1);
int minlength = min(first->entryNameLength, second->entryNameLength);
int ord = StrCmpNW(first->entryName, second->entryName, minlength);
if (ord != 0)
return MAKE_HRESULT(0, 0, (USHORT) ord);
if (!canonical)
{
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;
}
case NTOBJECT_COLUMN_TYPE:
{
int ord = second->objectType - first->objectType;
if (ord > 0)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (ord < 0)
return MAKE_HRESULT(0, 0, (USHORT) -1);
return S_OK;
}
case NTOBJECT_COLUMN_CREATEDATE:
{
LONGLONG ord = second->objectInformation.CreateTime.QuadPart - first->objectInformation.CreateTime.QuadPart;
if (ord > 0)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (ord < 0)
return MAKE_HRESULT(0, 0, (USHORT) -1);
return S_OK;
}
case NTOBJECT_COLUMN_LINKTARGET:
{
// Can't sort by value
return E_INVALIDARG;
}
default:
{
DbgPrint("Unsupported sorting mode.\n");
return E_INVALIDARG;
}
}
}
return S_OK;
return E_INVALIDARG;
}
HRESULT CompareIDs(LPARAM lParam, NtPidlEntry * first, LPCITEMIDLIST pcidl)
@ -1226,6 +1263,12 @@ HRESULT STDMETHODCALLTYPE CNtObjectFolder::MessageSFVCB(UINT uMsg, WPARAM wParam
*pViewMode = FVM_DETAILS;
return S_OK;
}
case SFVM_COLUMNCLICK:
return S_FALSE;
case SFVM_BACKGROUNDENUM:
return S_OK;
case SFVM_DEFITEMCOUNT:
return m_PidlManager->GetCount((UINT*) lParam);
}
return E_NOTIMPL;
}

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

@ -33,8 +33,9 @@ static const GUID GUID_RegistryColumns = { 0x18a4b504, 0xf6d8, 0x4d8a, { 0x86, 0
enum RegistryColumns
{
REGISTRY_COLUMN_NAME = 0,
REGISTRY_COLUMN_TYPE = 1,
REGISTRY_COLUMN_VALUE = 2,
REGISTRY_COLUMN_TYPE,
REGISTRY_COLUMN_VALUE,
REGISTRY_COLUMN_END
};
class CRegistryFolderExtractIcon :
@ -289,14 +290,11 @@ public:
HRESULT CompareIDs(LPARAM lParam, RegPidlEntry * first, RegPidlEntry * second)
{
if (LOWORD(lParam) != 0)
if ((lParam & 0xFFFF0000) == SHCIDS_ALLFIELDS)
{
DbgPrint("Unsupported sorting mode.\n");
return E_INVALIDARG;
}
if (lParam != 0)
return E_INVALIDARG;
if (HIWORD(lParam) == SHCIDS_ALLFIELDS)
{
int minsize = min(first->cb, second->cb);
int ord = memcmp(second, first, minsize);
@ -308,42 +306,71 @@ public:
if (second->cb < first->cb)
return MAKE_HRESULT(0, 0, (USHORT) -1);
}
else if (HIWORD(lParam) == SHCIDS_CANONICALONLY)
{
int minlength = min(first->entryNameLength, second->entryNameLength);
int ord = StrCmpNW(first->entryName, second->entryName, minlength);
if (ord != 0)
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
{
bool f1 = (first->entryType == REG_ENTRY_KEY) || (first->entryType == REG_ENTRY_ROOT);
bool f2 = (second->entryType == REG_ENTRY_KEY) || (second->entryType == REG_ENTRY_ROOT);
bool canonical = ((lParam & 0xFFFF0000) == SHCIDS_CANONICALONLY);
if (f1 && !f2)
return MAKE_HRESULT(0, 0, (USHORT) -1);
if (f2 && !f1)
return MAKE_HRESULT(0, 0, (USHORT) 1);
switch (lParam & 0xFFFF)
{
case REGISTRY_COLUMN_NAME:
{
bool f1 = (first->entryType == REG_ENTRY_KEY) || (first->entryType == REG_ENTRY_ROOT);
bool f2 = (second->entryType == REG_ENTRY_KEY) || (second->entryType == REG_ENTRY_ROOT);
int minlength = min(first->entryNameLength, second->entryNameLength);
int ord = StrCmpNW(first->entryName, second->entryName, minlength);
if (f1 && !f2)
return MAKE_HRESULT(0, 0, (USHORT) -1);
if (f2 && !f1)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (ord != 0)
return MAKE_HRESULT(0, 0, (USHORT) ord);
if (canonical)
{
// Shortcut: avoid comparing contents if not necessary when the results are not for display.
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 (second->entryNameLength > first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (second->entryNameLength < first->entryNameLength)
return MAKE_HRESULT(0, 0, (USHORT) -1);
int minlength = min(first->entryNameLength, second->entryNameLength);
int ord = StrCmpNW(first->entryName, second->entryName, minlength);
if (ord != 0)
return MAKE_HRESULT(0, 0, (USHORT) ord);
if (!canonical)
{
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;
}
case REGISTRY_COLUMN_TYPE:
{
int ord = second->contentType - first->contentType;
if (ord > 0)
return MAKE_HRESULT(0, 0, (USHORT) 1);
if (ord < 0)
return MAKE_HRESULT(0, 0, (USHORT) -1);
return S_OK;
}
case REGISTRY_COLUMN_VALUE:
{
// Can't sort by value
return E_INVALIDARG;
}
default:
{
DbgPrint("Unsupported sorting mode.\n");
return E_INVALIDARG;
}
}
}
return S_OK;
return E_INVALIDARG;
}
HRESULT CompareIDs(LPARAM lParam, RegPidlEntry * first, LPCITEMIDLIST pcidl)
@ -1262,6 +1289,12 @@ HRESULT STDMETHODCALLTYPE CRegistryFolder::MessageSFVCB(UINT uMsg, WPARAM wParam
*pViewMode = FVM_DETAILS;
return S_OK;
}
case SFVM_COLUMNCLICK:
return S_FALSE;
case SFVM_BACKGROUNDENUM:
return S_OK;
case SFVM_DEFITEMCOUNT:
return m_PidlManager->GetCount((UINT*) lParam);
}
return E_NOTIMPL;
}