Alexandre Julliard : server: Add support for suspending the thread directly in the get/ set_thread_context requests.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Fri May  6 12:31:11 2011 +0200

server: Add support for suspending the thread directly in the get/set_thread_context requests.

---

server/thread.c |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/server/thread.c b/server/thread.c
index 7cfbc60..9e56b1b 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -1471,12 +1471,23 @@ DECL_HANDLER(get_thread_context)
         return;
     }
     if (!(thread = get_thread_from_handle( req->handle, THREAD_GET_CONTEXT ))) return;
+    reply->self = (thread == current);

if (thread != current && !thread->context)
     {
         /* thread is not suspended, retry (if it's still running) */
-        if (thread->state != RUNNING) set_error( STATUS_ACCESS_DENIED );
-        else set_error( STATUS_PENDING );
+        if (thread->state == RUNNING)
+        {
+            set_error( STATUS_PENDING );
+            if (req->suspend)
+            {
+                release_object( thread );
+                /* make sure we have suspend access */
+                if (!(thread = get_thread_from_handle( req->handle, THREAD_SUSPEND_RESUME ))) return;
+                suspend_thread( thread );
+            }
+        }
+        else set_error( STATUS_ACCESS_DENIED );
     }
     else if ((context = set_reply_data_size( sizeof(context_t) )))
     {
@@ -1487,7 +1498,6 @@ DECL_HANDLER(get_thread_context)
         if (thread->context) copy_context( context, thread->context, req->flags & ~flags );
         if (flags) get_thread_context( thread, context, flags );
     }
-    reply->self = (thread == current);
     release_object( thread );
 }

@@ -1503,12 +1513,23 @@ DECL_HANDLER(set_thread_context)
         return;
     }
     if (!(thread = get_thread_from_handle( req->handle, THREAD_SET_CONTEXT ))) return;
+    reply->self = (thread == current);

if (thread != current && !thread->context)
     {
         /* thread is not suspended, retry (if it's still running) */
-        if (thread->state != RUNNING) set_error( STATUS_ACCESS_DENIED );
-        else set_error( STATUS_PENDING );
+        if (thread->state == RUNNING)
+        {
+            set_error( STATUS_PENDING );
+            if (req->suspend)
+            {
+                release_object( thread );
+                /* make sure we have suspend access */
+                if (!(thread = get_thread_from_handle( req->handle, THREAD_SUSPEND_RESUME ))) return;
+                suspend_thread( thread );
+            }
+        }
+        else set_error( STATUS_ACCESS_DENIED );
     }
     else if (context->cpu == thread->process->cpu)
     {
@@ -1520,7 +1541,6 @@ DECL_HANDLER(set_thread_context)
     }
     else set_error( STATUS_INVALID_PARAMETER );

-    reply->self = (thread == current);
     release_object( thread );
 }