Improve object handles enumeration without KSI

- Added found handles counts: Total, By address, By name
winsiderss · Sep 29, 2024 · affa749 · affa749
1 parent 90918e7
commit affa749
Show file tree

Hide file tree

Showing 6 changed files with 245 additions and 129 deletions.
diff --git a/SystemInformer/hndlprp.c b/SystemInformer/hndlprp.c
@@ -330,7 +330,7 @@ VOID PhShowHandlePropertiesEx(
  _In_ HWND ParentWindowHandle,
  _In_ HANDLE ProcessId,
  _In_ PPH_HANDLE_ITEM HandleItem,
- _In_ PPH_PLUGIN OwnerPlugin,
+ _In_opt_ PPH_PLUGIN OwnerPlugin,
  _In_opt_ PWSTR Caption
 )
 {

diff --git a/SystemInformer/include/phplug.h b/SystemInformer/include/phplug.h
@@ -943,7 +943,7 @@ PhShowHandlePropertiesEx(
  _In_ HWND ParentWindowHandle,
  _In_ HANDLE ProcessId,
  _In_ PPH_HANDLE_ITEM HandleItem,
- _In_ PPH_PLUGIN OwnerPlugin,
+ _In_opt_ PPH_PLUGIN OwnerPlugin,
  _In_opt_ PWSTR Caption
 );
 // end_phapppub

diff --git a/plugins/ExtendedTools/ExtendedTools.rc b/plugins/ExtendedTools/ExtendedTools.rc
@@ -463,12 +463,18 @@ BEGIN
  RTEXT "Static",IDC_ZSENDBYTESDELTA_V,223,33,59,8,SS_ENDELLIPSIS
 END
 
-IDD_OBJHANDLES DIALOGEX 0, 0, 260, 260
+IDD_OBJHANDLES DIALOGEX 0, 0, 260, 269
 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_STATIC,195,257,31,8
+ LTEXT "100000",IDC_OBJ_HANDLESBYNAME,227,257,27,8
 END
 
 IDD_OBJWINSTA DIALOGEX 0, 0, 260, 200

diff --git a/plugins/ExtendedTools/objmgr.c b/plugins/ExtendedTools/objmgr.c
@@ -144,10 +144,6 @@ VOID NTAPI EtpObjectManagerSearchControlCallback(
  _In_opt_ PVOID Context
  );
 
-NTSTATUS NTAPI EtpStartResolverThread(
- POBJECT_CONTEXT Context
- );
-
 NTSTATUS EtpObjectManagerOpenRealObject(
  _Out_ PHANDLE Handle,
  _In_ PHANDLE_OPEN_CONTEXT Context,
@@ -1763,7 +1759,7 @@ NTSTATUS NTAPI EtpObjectManagerObjectProperties(
  NULL
  )))
  {
- // We will remove access row in EtHandlePropertiesWindowPreOpen callback
+ // We will remove access row in EtHandlePropertiesWindowInitialized callback
  //handleItem->GrantedAccess = objectInfo.GrantedAccess;
  handleItem->Attributes = objectInfo.Attributes;
  EtObjectManagerTimeCached = objectInfo.CreationTime;