commit baf0a064dbe6b54bf98fb2f0d0037f53e5296527
author Alexandre Julliard <julliard@winehq.org> Tue Mar 11 01:48:53 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Mar 11 01:48:53 2003 +0000
tree 514ea10a6305f23d1e034273caf03ffb974a8394
parent cb816d2c3f72f31d6cf51e1e6aa328b7410b9aaa

Attaching the debugger to a running process should work again
(reported by Eric Pouech). Misc cleanups.

server/debugger.c

diff --git a/server/debugger.c b/server/debugger.c
index 0e9b875..29f92b2 100644
--- a/server/debugger.c
+++ b/server/debugger.c
@@ -429,20 +429,13 @@
         goto error;
 
     suspend_process( process );
-
-    /* we must have been able to attach all threads */
-    if (!process->thread_list) goto error2;
-    for (thread = process->thread_list; thread; thread = thread->proc_next)
+    if (!attach_process( process ) || !set_process_debugger( process, debugger ))
     {
-        if (!thread->attached) goto error2;
+        resume_process( process );
+        return 0;
     }
+    return 1;
 
-    if (set_process_debugger( process, debugger )) return 1;
-    resume_process( process );
-    return 0;
-
- error2:
-    resume_process( process );
  error:
     set_error( STATUS_ACCESS_DENIED );
     return 0;
@@ -452,7 +445,6 @@
 /* detach a process from a debugger thread (and resume it ?) */
 int debugger_detach( struct process *process, struct thread *debugger )
 {
-    struct thread *thread;
     struct debug_event *event;
     struct debug_ctx *debug_ctx;
 
@@ -488,15 +480,7 @@
     process->debugger = NULL;
     release_object( debugger->debug_ctx );
     debugger->debug_ctx = NULL;
-
-    /* now detach all the threads */
-    for (thread = process->thread_list; thread; thread = thread->proc_next)
-    {
-        if (thread->attached)
-        {
-            detach_thread( thread, 0 );
-        }
-    }
+    detach_process( process );
 
     /* from this function */
     resume_process( process );