commit d21c131fb543cd3c43632821dc96df930cb8f84e
author Peter Dons Tychsen <donpedro@tdcadsl.dk> Mon Jan 11 21:47:43 2010 +0100
committer Alexandre Julliard <julliard@winehq.org> Thu Jan 14 09:04:55 2010 -0600
tree 6fe9d1ca63b7bbf7c5edfaa3a2c03db01362e75d
parent f6a34c4ece9b59898b892b5ab3ebb5f308bc819d

user32: Do not allow a change of capture if the currently capture window is a menu unless explicitly specified.

server/queue.c

diff --git a/server/queue.c b/server/queue.c
index d880dff..cfe9818 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -2145,6 +2145,12 @@
     {
         struct thread_input *input = queue->input;
 
+        /* if in menu mode, reject all requests to change focus, except if the menu bit is set */
+        if (input->menu_owner && !(req->flags & CAPTURE_MENU))
+        {
+            set_error(STATUS_ACCESS_DENIED);
+            return;
+        }
         reply->previous = input->capture;
         input->capture = get_user_full_handle( req->handle );
         input->menu_owner = (req->flags & CAPTURE_MENU) ? input->capture : 0;