commit 19e7fab981a75cdf0a339db35d36d9c1a6e64494
author Dmitry Timoshkov <dmitry@codeweavers.com> Fri Jul 07 23:01:51 2006 +0900
committer Alexandre Julliard <julliard@winehq.org> Mon Jul 10 11:47:44 2006 +0200
tree 23bab37d8629ba4152fe1e33d908938545e4ceca
parent eb527c82e232d4fe93d498715de9a8bce0e1f36e

user: Improve SetActiveWindow test, add SetForegroundWindow test, make them pass under Wine.

server/queue.c

diff --git a/server/queue.c b/server/queue.c
index 769895a..607c102 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -1999,26 +1999,21 @@
 /* set the system foreground window */
 DECL_HANDLER(set_foreground_window)
 {
+    struct thread *thread;
     struct msg_queue *queue = get_current_queue();
 
     reply->previous = foreground_input ? foreground_input->active : 0;
     reply->send_msg_old = (reply->previous && foreground_input != queue->input);
     reply->send_msg_new = FALSE;
 
-    if (req->handle)
+    if (is_top_level_window( req->handle ) &&
+        ((thread = get_window_thread( req->handle ))))
     {
-        struct thread *thread;
-
-        if (is_top_level_window( req->handle ) &&
-            ((thread = get_window_thread( req->handle ))))
-        {
-            foreground_input = thread->queue->input;
-            reply->send_msg_new = (foreground_input != queue->input);
-            release_object( thread );
-        }
-        else set_error( STATUS_INVALID_HANDLE );
+        foreground_input = thread->queue->input;
+        reply->send_msg_new = (foreground_input != queue->input);
+        release_object( thread );
     }
-    else foreground_input = NULL;
+    else set_win32_error( ERROR_INVALID_WINDOW_HANDLE );
 }