commit 15ca8209d656ebdd7851da35384c8beef6f2f8c4
author Alexandre Julliard <julliard@winehq.org> Thu Jun 17 20:00:25 2004 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Jun 17 20:00:25 2004 +0000
tree 132bbdad75e6fef96fd67182c8c57388e6104eda
parent 3d60a19287a7d79d18d39312d99fd19956197360

Properly reset msg_thread when releasing the thread input structure.

server/queue.c

diff --git a/server/queue.c b/server/queue.c
index 4868a23..7946099 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -204,6 +204,22 @@
     return input;
 }
 
+/* release the thread input data of a given thread */
+static void release_thread_input( struct thread *thread )
+{
+    struct thread_input *input = thread->queue->input;
+
+    if (!input) return;
+    if (input->msg_thread == thread)
+    {
+        release_object( input->msg_thread );
+        input->msg_thread = NULL;
+        input->msg = NULL;
+    }
+    release_object( input );
+    thread->queue->input = NULL;
+}
+
 /* create a message queue object */
 static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_input *input )
 {
@@ -257,6 +273,7 @@
             process->idle_event = NULL;
         }
     }
+    release_thread_input( thread );
     release_object( thread->queue );
     thread->queue = NULL;
 }
@@ -807,7 +824,7 @@
 
     if (thread_from->queue)
     {
-        release_object( thread_from->queue->input );
+        release_thread_input( thread_from );
         thread_from->queue->input = input;
     }
     else
@@ -831,7 +848,7 @@
     }
     if ((input = create_thread_input()))
     {
-        release_object( thread_from->queue->input );
+        release_thread_input( thread_from );
         thread_from->queue->input = input;
     }
 }