Magic-Mirror/x64dbg
1
0
Fork 0
mirror of https://github.com/x64dbg/x64dbg.git synced 2024-11-30 08:10:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

display thread name for debuggee threads in handles view

Browse Source
This commit is contained in:
torusrxxx 2020-12-01 23:07:13 +08:00 committed by Duncan Ogilvie
parent d6bbca12c0
commit 427514e583
3 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dbg/_dbgfunctions.cpp
View File

@ -281,7 +281,7 @@ static void _getmnemonicbrief(const char* mnem, size_t resultSize, char* result)
static bool _enumhandles(ListOf(HANDLEINFO) handles)
{
std::vector<HANDLEINFO> handleV;
if(!HandlesEnum(fdProcessInfo->dwProcessId, handleV))
if(!HandlesEnum(handleV))
return false;
return BridgeList<HANDLEINFO>::CopyData(handles, handleV);
}
@ -290,7 +290,7 @@ static bool _gethandlename(duint handle, char* name, size_t nameSize, char* type
{
String nameS;
String typeNameS;
if(!HandlesGetName(fdProcessInfo->hProcess, HANDLE(handle), nameS, typeNameS))
if(!HandlesGetName(HANDLE(handle), nameS, typeNameS))
return false;
strncpy_s(name, nameSize, nameS.c_str(), _TRUNCATE);
strncpy_s(typeName, typeNameSize, typeNameS.c_str(), _TRUNCATE);

26
src/dbg/handles.cpp
View File

@ -1,8 +1,9 @@
#include <functional>
#include "handles.h"
#include "ntdll/ntdll.h"
#include "exception.h"
#include "debugger.h"
#include <functional>
#include "thread.h"
typedef NTSTATUS(NTAPI* ZWQUERYSYSTEMINFORMATION)(
IN LONG SystemInformationClass,
@ -19,10 +20,13 @@ typedef NTSTATUS(NTAPI* ZWQUERYOBJECT)(
OUT PULONG ReturnLength OPTIONAL
);
bool HandlesEnum(duint pid, std::vector<HANDLEINFO> & handles)
// Enumerate all handles in the debuggee
bool HandlesEnum(std::vector<HANDLEINFO> & handles)
{
duint pid;
Memory<PSYSTEM_HANDLE_INFORMATION> HandleInformation(16 * 1024, "_dbg_enumhandles");
NTSTATUS ErrorCode = ERROR_SUCCESS;
pid = fdProcessInfo->dwProcessId;
for(;;)
{
ErrorCode = NtQuerySystemInformation(SystemHandleInformation, HandleInformation(), ULONG(HandleInformation.size()), nullptr);
@ -55,8 +59,10 @@ static DWORD WINAPI getNameThread(LPVOID lpParam)
return 0;
}
bool HandlesGetName(HANDLE hProcess, HANDLE remoteHandle, String & name, String & typeName)
// Get the name of a handle of debuggee
bool HandlesGetName(HANDLE remoteHandle, String & name, String & typeName)
{
HANDLE hProcess = fdProcessInfo->hProcess;
HANDLE hLocalHandle;
if(DuplicateHandle(hProcess, remoteHandle, GetCurrentProcess(), &hLocalHandle, 0, FALSE, DUPLICATE_SAME_ACCESS)) //Needs privileges for PID/TID retrival
{
@ -134,7 +140,19 @@ bool HandlesGetName(HANDLE hProcess, HANDLE remoteHandle, String & name, String
}
if(TID > 0 && PID > 0)
name = StringUtils::sprintf("TID: %X, PID: %X", TID, PID);
{
// Check if the thread is in the debuggee
if(PID == fdProcessInfo->dwProcessId)
{
char ThreadName[MAX_THREAD_NAME_SIZE];
if(ThreadGetName(TID, ThreadName) && ThreadName[0] != 0)
name = StringUtils::sprintf("TID: %X (%s), PID: %X (Debuggee)", TID, ThreadName, PID);
else
name = StringUtils::sprintf("TID: %X, PID: %X (Debuggee)", TID, ThreadName, PID);
}
else //TODO: Display the process name
name = StringUtils::sprintf("TID: %X, PID: %X", TID, PID);
}
}
if(name.empty())
{

4
src/dbg/handles.h
View File

@ -4,8 +4,8 @@
#include "_global.h"
#include "_dbgfunctions.h"
bool HandlesEnum(duint pid, std::vector<HANDLEINFO> & handlesList);
bool HandlesGetName(HANDLE hProcess, HANDLE remoteHandle, String & name, String & typeName);
bool HandlesEnum(std::vector<HANDLEINFO> & handlesList);
bool HandlesGetName(HANDLE remoteHandle, String & name, String & typeName);
bool HandlesEnumWindows(std::vector<WINDOW_INFO> & windowsList);
bool HandlesEnumHeaps(std::vector<HEAPINFO> & heapList);