Rebase against 54b8c8c7eaafd19780cb4d91b763fe2f20327f50.

This commit is contained in:
Zebediah Figura
2022-02-07 23:49:59 -06:00
parent 54850aa1ff
commit 773483f7f5
8 changed files with 27 additions and 369 deletions

View File

@@ -1,17 +1,17 @@
From 695acc2e9bfd270253e8329e831d6cfba2ca454d Mon Sep 17 00:00:00 2001
From 2b59a31915fb56485db601970b5de91b3fc3849c 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: programs/winedbg: Print process arguments in info threads.
Subject: [PATCH] winedbg: Print process arguments in info threads.
---
programs/winedbg/info.c | 107 +++++++++++++++++++++++++++++++++++++++++++++++-
programs/winedbg/info.c | 107 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 105 insertions(+), 2 deletions(-)
diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c
index e521252ec32..d9261ecc090 100644
index 3ac00df911d..4722e1b1e59 100644
--- a/programs/winedbg/info.c
+++ b/programs/winedbg/info.c
@@ -562,6 +562,103 @@ static BOOL get_process_name(DWORD pid, PROCESSENTRY32* entry)
@@ -581,6 +581,103 @@ static BOOL get_process_name(DWORD pid, PROCESSENTRY32* entry)
return ret;
}
@@ -115,7 +115,7 @@ index e521252ec32..d9261ecc090 100644
void info_win32_threads(void)
{
HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0);
@@ -589,6 +686,7 @@ void info_win32_threads(void)
@@ -608,6 +705,7 @@ void info_win32_threads(void)
struct dbg_process* p = dbg_get_process(entry.th32OwnerProcessID);
PROCESSENTRY32 pcs_entry;
const char* exename;
@@ -123,13 +123,13 @@ index e521252ec32..d9261ecc090 100644
if (p)
exename = dbg_W2A(p->imageName, -1);
@@ -597,8 +695,13 @@ void info_win32_threads(void)
@@ -616,8 +714,13 @@ void info_win32_threads(void)
else
exename = "";
- dbg_printf("%08x%s %s\n",
- dbg_printf("%08lx%s %s\n",
- entry.th32OwnerProcessID, p ? " (D)" : "", exename);
+ dbg_printf("%08x%s %s\n", entry.th32OwnerProcessID, p ? " (D)" : "", exename);
+ dbg_printf("%08lx%s %s\n", entry.th32OwnerProcessID, p ? " (D)" : "", exename);
+ args = get_process_args(entry.th32OwnerProcessID);
+ if (args)
+ {
@@ -138,7 +138,7 @@ index e521252ec32..d9261ecc090 100644
+ }
lastProcessId = entry.th32OwnerProcessID;
}
dbg_printf("\t%08x %4d%s\n",
dbg_printf("\t%08lx %4ld%s\n",
--
2.11.0
2.34.1