commit b660aaa9ea3a74c052bd1254939c67ee37f22ea0
author Alexandre Julliard <julliard@winehq.org> Fri Dec 26 12:19:41 2008 +0100
committer Alexandre Julliard <julliard@winehq.org> Fri Dec 26 12:33:31 2008 +0100
tree e23017e2c2b0b4274d3f61100b685c7ff8e811b6
parent a7b3efde0e3d04ec0c5db843e3f13f567d93a062

server: Use the same field for process and thread handle in the queue_apc request.

server/protocol.def

diff --git a/server/protocol.def b/server/protocol.def
index ad05b64..a4c154c 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -673,8 +673,7 @@
 
 /* Queue an APC for a thread or process */
 @REQ(queue_apc)
-    obj_handle_t thread;       /* thread handle */
-    obj_handle_t process;      /* process handle */
+    obj_handle_t handle;       /* thread or process handle */
     apc_call_t   call;         /* call arguments */
 @REPLY
     obj_handle_t handle;       /* APC handle */

server/thread.c

diff --git a/server/thread.c b/server/thread.c
index 0c496db..1eeb59f 100644
--- a/server/thread.c
+++ b/server/thread.c
@@ -1242,7 +1242,7 @@
     {
     case APC_NONE:
     case APC_USER:
-        thread = get_thread_from_handle( req->thread, THREAD_SET_CONTEXT );
+        thread = get_thread_from_handle( req->handle, THREAD_SET_CONTEXT );
         break;
     case APC_VIRTUAL_ALLOC:
     case APC_VIRTUAL_FREE:
@@ -1251,13 +1251,13 @@
     case APC_VIRTUAL_LOCK:
     case APC_VIRTUAL_UNLOCK:
     case APC_UNMAP_VIEW:
-        process = get_process_from_handle( req->process, PROCESS_VM_OPERATION );
+        process = get_process_from_handle( req->handle, PROCESS_VM_OPERATION );
         break;
     case APC_VIRTUAL_QUERY:
-        process = get_process_from_handle( req->process, PROCESS_QUERY_INFORMATION );
+        process = get_process_from_handle( req->handle, PROCESS_QUERY_INFORMATION );
         break;
     case APC_MAP_VIEW:
-        process = get_process_from_handle( req->process, PROCESS_VM_OPERATION );
+        process = get_process_from_handle( req->handle, PROCESS_VM_OPERATION );
         if (process && process != current->process)
         {
             /* duplicate the handle into the target process */
@@ -1272,7 +1272,7 @@
         }
         break;
     case APC_CREATE_THREAD:
-        process = get_process_from_handle( req->process, PROCESS_CREATE_THREAD );
+        process = get_process_from_handle( req->handle, PROCESS_CREATE_THREAD );
         break;
     default:
         set_error( STATUS_INVALID_PARAMETER );

server/trace.c

diff --git a/server/trace.c b/server/trace.c
index 165c83f..5d39293 100644
--- a/server/trace.c
+++ b/server/trace.c
@@ -1077,8 +1077,7 @@
 
 static void dump_queue_apc_request( const struct queue_apc_request *req )
 {
-    fprintf( stderr, " thread=%04x,", req->thread );
-    fprintf( stderr, " process=%04x,", req->process );
+    fprintf( stderr, " handle=%04x,", req->handle );
     fprintf( stderr, " call=" );
     dump_apc_call( &req->call );
 }