Rebase against 429325b6891bbb7488b3e8d8f97e4abb92879ce7.

This commit is contained in:
Alistair Leslie-Hughes
2022-03-22 10:46:29 +11:00
parent 8fb1779241
commit 5d30a5655f
6 changed files with 62 additions and 60 deletions

View File

@@ -1,17 +1,17 @@
From 255c073514b8870677b58c88006dae6cb519f4c6 Mon Sep 17 00:00:00 2001
From 973213adb5e132d1f2d52ba566f188e3193defb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 21 Jan 2017 17:23:48 +0100
Subject: [PATCH] winedbg: Print process arguments in info threads.
---
programs/winedbg/info.c | 107 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 105 insertions(+), 2 deletions(-)
programs/winedbg/info.c | 111 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 107 insertions(+), 4 deletions(-)
diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c
index 2b8e377e6f4..68b2c440df0 100644
index bb933aeb455..b7aeb58fe9a 100644
--- a/programs/winedbg/info.c
+++ b/programs/winedbg/info.c
@@ -581,6 +581,103 @@ static BOOL get_process_name(DWORD pid, PROCESSENTRY32* entry)
@@ -581,6 +581,103 @@ static BOOL get_process_name(DWORD pid, PROCESSENTRY32W* entry)
return ret;
}
@@ -115,21 +115,25 @@ index 2b8e377e6f4..68b2c440df0 100644
void info_win32_threads(void)
{
HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0);
@@ -609,6 +706,7 @@ void info_win32_threads(void)
@@ -607,8 +704,9 @@ void info_win32_threads(void)
*/
if (entry.th32OwnerProcessID != lastProcessId)
{
PROCESSENTRY32 pcs_entry;
const char* exename;
- PROCESSENTRY32W pcs_entry;
- const WCHAR* exename;
+ PROCESSENTRY32 pcs_entry;
+ const char* exename;
+ char *args;
p = dbg_get_process(entry.th32OwnerProcessID);
if (p)
@@ -618,8 +716,13 @@ void info_win32_threads(void)
else
exename = "";
exename = L"";
- dbg_printf("%08lx%s %s\n",
- dbg_printf("%08lx%s %ls\n",
- entry.th32OwnerProcessID, p ? " (D)" : "", exename);
+ dbg_printf("%08lx%s %s\n", entry.th32OwnerProcessID, p ? " (D)" : "", exename);
+ dbg_printf("%08lx%s %ls\n", entry.th32OwnerProcessID, p ? " (D)" : "", exename);
+ args = get_process_args(entry.th32OwnerProcessID);
+ if (args)
+ {
@@ -140,5 +144,5 @@ index 2b8e377e6f4..68b2c440df0 100644
}
t = dbg_get_thread(p, entry.th32ThreadID);
--
2.34.1
2.35.1