Rebase against 89a8b32d7a976504ee98ba1a7d08574bc9bc00e6.

patches/patchinstall.sh

@@ -51,7 +51,7 @@ usage()
 # Get the upstream commit sha
 upstream_commit()
 {
-	echo "842452d4e79b20c42d2b7e279063b2feabeb31de"
+	echo "89a8b32d7a976504ee98ba1a7d08574bc9bc00e6"
 }
 
 # Show version information

patches/winedbg-Process_Arguments/0001-programs-winedbg-Print-process-arguments-in-info-thr.patch

@@ -1,4 +1,4 @@
-From 2b59a31915fb56485db601970b5de91b3fc3849c Mon Sep 17 00:00:00 2001
+From 255c073514b8870677b58c88006dae6cb519f4c6 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,7 +8,7 @@ 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 3ac00df911d..4722e1b1e59 100644
+index 2b8e377e6f4..68b2c440df0 100644
 --- a/programs/winedbg/info.c
 +++ b/programs/winedbg/info.c
 @@ -581,6 +581,103 @@ static BOOL get_process_name(DWORD pid, PROCESSENTRY32* entry)
@@ -115,15 +115,15 @@ index 3ac00df911d..4722e1b1e59 100644
  void info_win32_threads(void)
  {
      HANDLE snap = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0);
-@@ -608,6 +705,7 @@ void info_win32_threads(void)
- 		    struct dbg_process*	p = dbg_get_process(entry.th32OwnerProcessID);
+@@ -609,6 +706,7 @@ void info_win32_threads(void)
+ 		{
                      PROCESSENTRY32 pcs_entry;
                      const char* exename;
 +                    char *args;
  
+                     p = dbg_get_process(entry.th32OwnerProcessID);
                      if (p)
-                         exename = dbg_W2A(p->imageName, -1);
-@@ -616,8 +714,13 @@ void info_win32_threads(void)
+@@ -618,8 +716,13 @@ void info_win32_threads(void)
                      else
                          exename = "";
  
@@ -138,7 +138,7 @@ index 3ac00df911d..4722e1b1e59 100644
 +                    }
                      lastProcessId = entry.th32OwnerProcessID;
  		}
-                 dbg_printf("\t%08lx %4ld%s\n",
+                 t = dbg_get_thread(p, entry.th32ThreadID);
 -- 
 2.34.1
 

staging/upstream-commit

@@ -1 +1 @@
-842452d4e79b20c42d2b7e279063b2feabeb31de
+89a8b32d7a976504ee98ba1a7d08574bc9bc00e6