ntdll: Avoid inter-process APCs when called for the process itself.

include/wine/server_protocol.h

@@ -714,6 +714,7 @@ struct queue_apc_reply
 {
     struct reply_header __header;
     obj_handle_t handle;
+    int          self;
 };
 
 
@@ -4624,6 +4625,6 @@ union generic_reply
     struct query_symlink_reply query_symlink_reply;
 };
 
-#define SERVER_PROTOCOL_VERSION 273
+#define SERVER_PROTOCOL_VERSION 274
 
 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */

server/protocol.def

@@ -635,6 +635,7 @@ typedef union
     apc_call_t   call;         /* call arguments */
 @REPLY
     obj_handle_t handle;       /* APC handle */
+    int          self;         /* run APC in caller itself? */
 @END
 
 

server/thread.c

@@ -1172,7 +1172,7 @@ DECL_HANDLER(queue_apc)
         break;
     case APC_MAP_VIEW:
         process = get_process_from_handle( req->process, PROCESS_VM_OPERATION );
-        if (process)
+        if (process && process != current->process)
         {
             /* duplicate the handle into the target process */
             obj_handle_t handle = duplicate_handle( current->process, apc->call.map_view.handle,
@@ -1200,18 +1200,22 @@ DECL_HANDLER(queue_apc)
     }
     else if (process)
     {
-        obj_handle_t handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 );
-        if (handle)
+        reply->self = (process == current->process);
+        if (!reply->self)
         {
-            if (queue_apc( process, NULL, apc ))
+            obj_handle_t handle = alloc_handle( current->process, apc, SYNCHRONIZE, 0 );
+            if (handle)
             {
-                apc->caller = (struct thread *)grab_object( current );
-                reply->handle = handle;
-            }
-            else
-            {
-                close_handle( current->process, handle );
-                set_error( STATUS_PROCESS_IS_TERMINATING );
+                if (queue_apc( process, NULL, apc ))
+                {
+                    apc->caller = (struct thread *)grab_object( current );
+                    reply->handle = handle;
+                }
+                else
+                {
+                    close_handle( current->process, handle );
+                    set_error( STATUS_PROCESS_IS_TERMINATING );
+                }
             }
         }
         release_object( process );

server/trace.c

@@ -995,7 +995,8 @@ static void dump_queue_apc_request( const struct queue_apc_request *req )
 
 static void dump_queue_apc_reply( const struct queue_apc_reply *req )
 {
-    fprintf( stderr, " handle=%p", req->handle );
+    fprintf( stderr, " handle=%p,", req->handle );
+    fprintf( stderr, " self=%d", req->self );
 }
 
 static void dump_get_apc_request( const struct get_apc_request *req )