From d3ed71430a91b16dc255ef086354010f84b7be4a Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 28 Jul 2022 16:20:21 +1000
Subject: [PATCH] Rebase against 1381ced8ecbfaa57aa378ab32e94d5aa51873160.

---
 patches/patchinstall.sh                            |  2 +-
 ...nedbg-Print-process-arguments-in-info-thr.patch | 14 +++++++-------
 staging/upstream-commit                            |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh
index cc7e8a39..7193e4ca 100755
--- a/patches/patchinstall.sh
+++ b/patches/patchinstall.sh
@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "889fe64d9f2e1a0d9a3660bbb94e0a9b74155827"
+	echo "1381ced8ecbfaa57aa378ab32e94d5aa51873160"
 }
 
 # Show version information
diff --git a/patches/winedbg-Process_Arguments/0001-programs-winedbg-Print-process-arguments-in-info-thr.patch b/patches/winedbg-Process_Arguments/0001-programs-winedbg-Print-process-arguments-in-info-thr.patch
index aedaa2eb..b5ed7b44 100644
--- a/patches/winedbg-Process_Arguments/0001-programs-winedbg-Print-process-arguments-in-info-thr.patch
+++ b/patches/winedbg-Process_Arguments/0001-programs-winedbg-Print-process-arguments-in-info-thr.patch
@@ -1,4 +1,4 @@
-From 1a973b411e23c7a28ea7d997926be31be7569069 Mon Sep 17 00:00:00 2001
+From 1ed5c56620d147135732dff791c47d6ecf28471d 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.
@@ -8,11 +8,11 @@ Subject: [PATCH] winedbg: Print process arguments in info threads.
  1 file changed, 105 insertions(+), 2 deletions(-)
 
 diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c
-index bb933aeb455..57ac36165a2 100644
+index 5d6b45d715f..eff3c0948aa 100644
 --- a/programs/winedbg/info.c
 +++ b/programs/winedbg/info.c
-@@ -581,6 +581,103 @@ static BOOL get_process_name(DWORD pid, PROCESSENTRY32W* entry)
-     return ret;
+@@ -628,6 +628,103 @@ WCHAR* fetch_thread_description(DWORD tid)
+     return desc;
  }
  
 +static BOOL read_process_memory(HANDLE process, const void *ptr, void *buffer, SIZE_T length)
@@ -115,7 +115,7 @@ index bb933aeb455..57ac36165a2 100644
  void info_win32_threads(void)
  {
      HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0);
-@@ -609,6 +706,7 @@ void info_win32_threads(void)
+@@ -657,6 +754,7 @@ void info_win32_threads(void)
  		{
                      PROCESSENTRY32W pcs_entry;
                      const WCHAR* exename;
@@ -123,7 +123,7 @@ index bb933aeb455..57ac36165a2 100644
  
                      p = dbg_get_process(entry.th32OwnerProcessID);
                      if (p)
-@@ -618,8 +716,13 @@ void info_win32_threads(void)
+@@ -666,8 +764,13 @@ void info_win32_threads(void)
                      else
                          exename = L"";
  
@@ -138,7 +138,7 @@ index bb933aeb455..57ac36165a2 100644
 +                    }
                      lastProcessId = entry.th32OwnerProcessID;
  		}
-                 t = dbg_get_thread(p, entry.th32ThreadID);
+                 dbg_printf("\t%08lx %4ld%s ",
 -- 
 2.35.1
 
diff --git a/staging/upstream-commit b/staging/upstream-commit
index 66fd06a0..055942a1 100644
--- a/staging/upstream-commit
+++ b/staging/upstream-commit
@@ -1 +1 @@
-889fe64d9f2e1a0d9a3660bbb94e0a9b74155827
+1381ced8ecbfaa57aa378ab32e94d5aa51873160