objmgr cleanup and fixes

- KphObjectAttributesInformation -> KphObjectExtendedInformation, retrieve object address, type index and flags.
- Public hndlmenu.h APIs. ID_HANDLE_OBJECTPROPERTIES[1/2] menu support for Device/File, Key, Section handles.
- Add Security menu item.
- Add Name and Original name columns for Device/File, Key, ALPC Port.

Author: DartVanya

KSystemInformer/object.c

@@ -2086,13 +2086,16 @@ NTSTATUS KphQueryInformationObject(
 
             break;
         }
-        case KphObjectAttributesInformation:
+        case KphObjectExtendedInformation:
         {
+            POBJECT_TYPE objectType;
+            USHORT objectTypeIndex;
+
             if (!ObjectInformation ||
-                (ObjectInformationLength < sizeof(KPH_OBJECT_ATTRIBUTES_INFORMATION)))
+                (ObjectInformationLength < sizeof(KPH_OBJECT_EXTENDED_INFORMATION)))
             {
                 status = STATUS_INFO_LENGTH_MISMATCH;
-                returnLength = sizeof(KPH_OBJECT_ATTRIBUTES_INFORMATION);
+                returnLength = sizeof(KPH_OBJECT_EXTENDED_INFORMATION);
                 goto Exit;
             }
 
@@ -2115,13 +2118,30 @@ NTSTATUS KphQueryInformationObject(
                 goto Exit;
             }
 
+            objectTypeIndex = USHORT_MAX;
+
+            objectType = ObGetObjectType(object);
+            if (objectType)
+            {
+                dyn = KphReferenceDynData();
+                if (dyn && (dyn->OtIndex != ULONG_MAX)) {
+                    UCHAR typeIndex;
+
+                    typeIndex = *(PUCHAR)Add2Ptr(objectType, dyn->OtIndex);
+
+                    objectTypeIndex = (USHORT)typeIndex;
+                }
+            }
+
             __try
             {
-                PKPH_OBJECT_ATTRIBUTES_INFORMATION attributesInfo;
+                PKPH_OBJECT_EXTENDED_INFORMATION extendedInfo;
 
-                attributesInfo = ObjectInformation;
-                attributesInfo->Flags = OBJECT_TO_OBJECT_HEADER(object)->Flags;
-                returnLength = sizeof(KPH_OBJECT_ATTRIBUTES_INFORMATION);
+                extendedInfo = ObjectInformation;
+                extendedInfo->Object = object;
+                extendedInfo->ObjectTypeIndex = objectTypeIndex;
+                extendedInfo->Flags = OBJECT_TO_OBJECT_HEADER(object)->Flags;
+                returnLength = sizeof(KPH_OBJECT_EXTENDED_INFORMATION);
             }
             __except (EXCEPTION_EXECUTE_HANDLER)
             {

SystemInformer/SystemInformer.def

@@ -1147,3 +1147,8 @@ EXPORTS
     PhFilterConnectCommunicationPort                                              @2053     NONAME
     PhQuerySymbolicLinkObject                                                     @2054     NONAME
     PhGetDriverServiceKeyName                                                     @2055     NONAME
+
+; hndlmenu
+    PhInsertHandleObjectPropertiesEMenuItems                                      @2059     NONAME
+    PhShowHandleObjectProperties1                                                 @2060     NONAME
+    PhShowHandleObjectProperties2                                                 @2061     NONAME

SystemInformer/include/hndlmenu.h

@@ -12,6 +12,11 @@
 #ifndef PH_HNDLMENU_H
 #define PH_HNDLMENU_H
 
+#define PhaAppendCtrlEnter(Text, Enable) ((Enable) ? PhaConcatStrings2((Text), L"\tCtrl+Enter")->Buffer : (Text))
+
+#define PH_MAX_SECTION_EDIT_SIZE (32 * 1024 * 1024) // 32 MB
+
+ // begin_phapppub
 typedef struct _PH_HANDLE_ITEM_INFO
 {
     HANDLE ProcessId;
@@ -20,7 +25,8 @@ typedef struct _PH_HANDLE_ITEM_INFO
     PPH_STRING BestObjectName;
 } PH_HANDLE_ITEM_INFO, *PPH_HANDLE_ITEM_INFO;
 
-#define PhaAppendCtrlEnter(Text, Enable) ((Enable) ? PhaConcatStrings2((Text), L"\tCtrl+Enter")->Buffer : (Text))
+#define ID_HANDLE_OBJECTPROPERTIES1     40282
+#define ID_HANDLE_OBJECTPROPERTIES2     40283
 
 VOID PhInsertHandleObjectPropertiesEMenuItems(
     _In_ struct _PH_EMENU_ITEM *Menu,
@@ -29,8 +35,6 @@ VOID PhInsertHandleObjectPropertiesEMenuItems(
     _In_ PPH_HANDLE_ITEM_INFO Info
     );
 
-#define PH_MAX_SECTION_EDIT_SIZE (32 * 1024 * 1024) // 32 MB
-
 VOID PhShowHandleObjectProperties1(
     _In_ HWND hWnd,
     _In_ PPH_HANDLE_ITEM_INFO Info
@@ -40,5 +44,6 @@ VOID PhShowHandleObjectProperties2(
     _In_ HWND hWnd,
     _In_ PPH_HANDLE_ITEM_INFO Info
     );
+// end_phapppub
 
 #endif

kphlib/include/kphapi.h

@@ -204,7 +204,7 @@ typedef enum _KPH_OBJECT_INFORMATION_CLASS
     KphObjectSectionOriginalBaseInformation,  // q: PVOID BaseAddress
     KphObjectSectionInternalImageInformation, // q: SECTION_INTERNAL_IMAGE_INFORMATION
     KphObjectSectionMappingsInformation,      // q: KPH_SECTION_MAPPINGS_INFORMATION
-    KphObjectAttributesInformation,           // q: KPH_OBJECT_ATTRIBUTES_INFORMATION
+    KphObjectExtendedInformation,             // q: KPH_OBJECT_EXTENDED_INFORMATION
     MaxKphObjectInfoClass
 } KPH_OBJECT_INFORMATION_CLASS;
 
@@ -255,8 +255,10 @@ typedef struct _KPH_FILE_OBJECT_DRIVER
     HANDLE DriverHandle;
 } KPH_FILE_OBJECT_DRIVER, *PKPH_FILE_OBJECT_DRIVER;
 
-typedef struct _KPH_OBJECT_ATTRIBUTES_INFORMATION
+typedef struct _KPH_OBJECT_EXTENDED_INFORMATION
 {
+    PVOID Object;
+    USHORT ObjectTypeIndex;
     union
     {
         UCHAR Flags;
@@ -272,7 +274,7 @@ typedef struct _KPH_OBJECT_ATTRIBUTES_INFORMATION
             UCHAR DeletedInline : 1;
         };
     };
-} KPH_OBJECT_ATTRIBUTES_INFORMATION, *PKPH_OBJECT_ATTRIBUTES_INFORMATION;
+} KPH_OBJECT_EXTENDED_INFORMATION, *PKPH_OBJECT_EXTENDED_INFORMATION;
 
 // Driver information
 

phlib/theme.c

@@ -2550,7 +2550,7 @@ VOID ThemeWindowRenderTabControl(
             //case 1: // Old colors
             {
                 // SetTextColor(bufferDc, PhThemeWindowTextColor);
-                SetDCBrushColor(bufferDc, PhThemeWindowBackgroundColor);
+                SetDCBrushColor(bufferDc, PhEnableThemeTabBorders ? PhMakeColorBrighter(PhThemeWindowBackgroundColor, 6) : PhThemeWindowBackgroundColor);
                 FillRect(bufferDc, &itemRect, PhGetStockBrush(DC_BRUSH));
                 if (PhEnableThemeTabBorders)
                 {

plugins/ExtendedTools/ExtendedTools.rc

@@ -477,18 +477,18 @@ BEGIN
     RTEXT           "Static",IDC_ZSENDBYTESDELTA_V,223,33,59,8,SS_ENDELLIPSIS
 END
 
-IDD_OBJHANDLES DIALOGEX 0, 0, 260, 269
+IDD_OBJHANDLES DIALOGEX 0, 0, 300, 285
 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Handles"
 FONT 8, "MS Shell Dlg", 400, 0, 0x1
 BEGIN
-    CONTROL         "",IDC_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,7,246,246
-    LTEXT           "Total handles found:",IDC_STATIC,10,257,67,8
-    LTEXT           "100000",IDC_OBJ_HANDLESTOTAL,78,257,32,8
-    LTEXT           "By address:",IDC_STATIC,117,257,39,8
-    LTEXT           "100000",IDC_OBJ_HANDLESBYOBJECT,157,257,27,8
-    LTEXT           "By name:", IDC_OBJ_HANDLESBYNAME_L,195,257,31,8
-    LTEXT           "100000",IDC_OBJ_HANDLESBYNAME,227,257,27,8
+    CONTROL         "",IDC_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_SHAREIMAGELISTS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,7,286,262
+    LTEXT           "Total handles found:",IDC_STATIC,10,273,67,8
+    LTEXT           "100000",IDC_OBJ_HANDLESTOTAL,78,273,32,8
+    LTEXT           "By address:",IDC_STATIC,137,273,39,8
+    LTEXT           "100000",IDC_OBJ_HANDLESBYOBJECT,177,273,27,8
+    LTEXT           "By name:", IDC_OBJ_HANDLESBYNAME_L,235,273,31,8
+    LTEXT           "100000",IDC_OBJ_HANDLESBYNAME,267,273,27,8
 END
 
 IDD_OBJWINSTA DIALOGEX 0, 0, 260, 200

plugins/ExtendedTools/exttools.h

@@ -1647,6 +1647,14 @@ extern PPH_LIST EtObjectManagerOwnHandles;
 extern HICON EtObjectManagerPropIcon;
 extern PPH_HASHTABLE EtObjectManagerPropWindows;
 
+extern ULONG EtAlpcPortTypeIndex;
+extern ULONG EtDeviceTypeIndex;
+extern ULONG EtFilterPortTypeIndex;
+extern ULONG EtFileTypeIndex;
+extern ULONG EtKeyTypeIndex;
+extern ULONG EtSectionTypeIndex;
+extern ULONG EtWinStaTypeIndex;
+
 VOID EtShowObjectManagerDialog(
     _In_ HWND ParentWindowHandle
     );