Eric Pouech : winedbg: Fixed bt all so that current process/thread isn' t lost.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: f7908160eb898d4d6814fe886d4877f80a19c2c2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=f7908160eb898d4d6814fe886d...

Author: Eric Pouech 
Date:   Sun Jan 13 17:02:29 2008 +0100

winedbg: Fixed bt all so that current process/thread isn't lost.

---

programs/winedbg/stack.c |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/programs/winedbg/stack.c b/programs/winedbg/stack.c
index a416c8b..63103c1 100644
--- a/programs/winedbg/stack.c
+++ b/programs/winedbg/stack.c
@@ -351,6 +351,9 @@ static void backtrace_tid(struct dbg_process* pcs, DWORD tid)
 static void backtrace_all(void)
 {
     struct dbg_process* process = dbg_curr_process;
+    struct dbg_thread*  thread = dbg_curr_thread;
+    CONTEXT             ctx = dbg_context;
+    DWORD               cpid = dbg_curr_pid;
     THREADENTRY32       entry;
     HANDLE              snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0);

@@ -366,10 +369,16 @@ static void backtrace_all(void)
         do
         {
             if (entry.th32OwnerProcessID == GetCurrentProcessId()) continue;
-            if (dbg_curr_process && dbg_curr_pid != entry.th32OwnerProcessID)
+            if (dbg_curr_process && dbg_curr_pid != entry.th32OwnerProcessID &&
+                cpid != dbg_curr_pid)
                 dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE);

-            if (entry.th32OwnerProcessID != dbg_curr_pid)
+            if (entry.th32OwnerProcessID == cpid)
+            {
+                dbg_curr_process = process;
+                dbg_curr_pid = cpid;
+            }
+            else if (entry.th32OwnerProcessID != dbg_curr_pid)
             {
                 if (!dbg_attach_debuggee(entry.th32OwnerProcessID, FALSE))
                 {
@@ -387,12 +396,15 @@ static void backtrace_all(void)
         }
         while (Thread32Next(snapshot, &entry));

-        if (dbg_curr_process)
+        if (dbg_curr_process && cpid != dbg_curr_pid)
             dbg_curr_process->process_io->close_process(dbg_curr_process, FALSE);
     }
     CloseHandle(snapshot);
     dbg_curr_process = process;
-    dbg_curr_pid = process ? process->pid : 0;
+    dbg_curr_pid = cpid;
+    dbg_curr_thread = thread;
+    dbg_curr_tid = thread ? thread->tid : 0;
+    dbg_context = ctx;
 }

void stack_backtrace(DWORD tid)