Rebase against 17f052c36a414a05fcb6a6e67bd3aac824fbed3e.

patches/server-PeekMessage/0001-server-Fix-handling-of-GetMessage-after-previous-Pee.patch

@@ -1,4 +1,4 @@
-From f53204bf14a0ac962d389467e9e915724639ad03 Mon Sep 17 00:00:00 2001
+From a3f14d043f05ff7cfaf00bc548d02f32dd85cc8f Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sun, 15 Mar 2015 01:05:48 +0100
 Subject: [PATCH] server: Fix handling of GetMessage after previous PeekMessage
@@ -93,10 +93,10 @@ index 398bb0a69ed..2aec627604c 100644
       * because both messages are in the same queue. */
  
 diff --git a/server/queue.c b/server/queue.c
-index 53306f46793..3cf1a20926d 100644
+index 4f58b795b7e..3fa5c05214e 100644
 --- a/server/queue.c
 +++ b/server/queue.c
-@@ -147,6 +147,7 @@ struct msg_queue
+@@ -143,6 +143,7 @@ struct msg_queue
      timeout_t              last_get_msg;    /* time of last get message call */
      int                    keystate_lock;   /* owns an input keystate lock */
      const queue_shm_t     *shared;          /* queue in session shared memory */
@@ -104,7 +104,7 @@ index 53306f46793..3cf1a20926d 100644
  };
  
  struct hotkey
-@@ -317,6 +318,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
+@@ -309,6 +310,7 @@ static struct msg_queue *create_msg_queue( struct thread *thread, struct thread_
          queue->hooks           = NULL;
          queue->last_get_msg    = current_time;
          queue->keystate_lock   = 0;
@@ -112,7 +112,7 @@ index 53306f46793..3cf1a20926d 100644
          list_init( &queue->send_result );
          list_init( &queue->callback_result );
          list_init( &queue->pending_timers );
-@@ -712,13 +714,21 @@ static inline struct msg_queue *get_current_queue(void)
+@@ -725,13 +727,21 @@ static inline struct msg_queue *get_current_queue(void)
  }
  
  /* get a (pseudo-)unique id to tag hardware messages */
@@ -135,7 +135,7 @@ index 53306f46793..3cf1a20926d 100644
  /* try to merge a WM_MOUSEMOVE message with the last in the list; return 1 if successful */
  static int merge_mousemove( struct thread_input *input, const struct message *msg )
  {
-@@ -1029,7 +1039,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win )
+@@ -1042,7 +1052,7 @@ static int match_window( user_handle_t win, user_handle_t msg_win )
  }
  
  /* retrieve a posted message */
@@ -144,7 +144,7 @@ index 53306f46793..3cf1a20926d 100644
                                 unsigned int first, unsigned int last, unsigned int flags,
                                 struct get_message_reply *reply )
  {
-@@ -1040,6 +1050,7 @@ static int get_posted_message( struct msg_queue *queue, user_handle_t win,
+@@ -1053,6 +1063,7 @@ static int get_posted_message( struct msg_queue *queue, user_handle_t win,
      {
          if (!match_window( win, msg->win )) continue;
          if (!check_msg_filter( msg->msg, first, last )) continue;
@@ -152,7 +152,7 @@ index 53306f46793..3cf1a20926d 100644
          goto found; /* found one */
      }
      return 0;
-@@ -1654,6 +1665,7 @@ found:
+@@ -1676,6 +1687,7 @@ found:
      msg->msg       = WM_HOTKEY;
      msg->wparam    = hotkey->id;
      msg->lparam    = ((hotkey->vkey & 0xffff) << 16) | modifiers;
@@ -160,7 +160,7 @@ index 53306f46793..3cf1a20926d 100644
  
      free( msg->data );
      msg->data      = NULL;
-@@ -2624,7 +2636,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
+@@ -2646,7 +2658,7 @@ static int get_hardware_message( struct thread *thread, unsigned int hw_id, user
          }
  
          /* now we can return it */
@@ -169,7 +169,7 @@ index 53306f46793..3cf1a20926d 100644
          reply->type   = MSG_HARDWARE;
          reply->win    = win;
          reply->msg    = msg_code;
-@@ -2731,6 +2743,7 @@ void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lpa
+@@ -2753,6 +2765,7 @@ void post_message( user_handle_t win, unsigned int message, lparam_t wparam, lpa
          msg->result    = NULL;
          msg->data      = NULL;
          msg->data_size = 0;
@@ -177,7 +177,7 @@ index 53306f46793..3cf1a20926d 100644
  
          get_message_defaults( thread->queue, &msg->x, &msg->y, &msg->time );
  
-@@ -3025,6 +3038,7 @@ DECL_HANDLER(send_message)
+@@ -3070,6 +3083,7 @@ DECL_HANDLER(send_message)
              set_queue_bits( recv_queue, QS_SENDMESSAGE );
              break;
          case MSG_POSTED:
@@ -185,7 +185,7 @@ index 53306f46793..3cf1a20926d 100644
              list_add_tail( &recv_queue->msg_list[POST_MESSAGE], &msg->entry );
              set_queue_bits( recv_queue, QS_POSTMESSAGE|QS_ALLPOSTMESSAGE );
              if (msg->msg == WM_HOTKEY)
-@@ -3151,12 +3165,12 @@ DECL_HANDLER(get_message)
+@@ -3202,12 +3216,12 @@ DECL_HANDLER(get_message)
  
      /* then check for posted messages */
      if ((filter & QS_POSTMESSAGE) &&
@@ -200,7 +200,7 @@ index 53306f46793..3cf1a20926d 100644
          return;
  
      /* only check for quit messages if not posted messages pending */
-@@ -3167,7 +3181,7 @@ DECL_HANDLER(get_message)
+@@ -3218,7 +3232,7 @@ DECL_HANDLER(get_message)
      if ((filter & QS_INPUT) &&
          filter_contains_hw_range( req->get_first, req->get_last ) &&
          get_hardware_message( current, req->hw_id, get_win, req->get_first, req->get_last, req->flags, reply ))
@@ -209,7 +209,7 @@ index 53306f46793..3cf1a20926d 100644
  
      /* now check for WM_PAINT */
      if ((filter & QS_PAINT) &&
-@@ -3180,7 +3194,7 @@ DECL_HANDLER(get_message)
+@@ -3231,7 +3245,7 @@ DECL_HANDLER(get_message)
          reply->wparam = 0;
          reply->lparam = 0;
          get_message_defaults( queue, &reply->x, &reply->y, &reply->time );
@@ -218,7 +218,7 @@ index 53306f46793..3cf1a20926d 100644
      }
  
      /* now check for timer */
-@@ -3196,13 +3210,30 @@ DECL_HANDLER(get_message)
+@@ -3247,9 +3261,19 @@ DECL_HANDLER(get_message)
          get_message_defaults( queue, &reply->x, &reply->y, &reply->time );
          if (!(req->flags & PM_NOYIELD) && current->process->idle_event)
              set_event( current->process->idle_event );
@@ -237,8 +237,11 @@ index 53306f46793..3cf1a20926d 100644
 +        return;
 +
      if (get_win == -1 && current->process->idle_event) set_event( current->process->idle_event );
-     queue->wake_mask = req->wake_mask;
-     queue->changed_mask = req->changed_mask;
+ 
+     SHARED_WRITE_BEGIN( queue_shm, queue_shm_t )
+@@ -3260,6 +3284,13 @@ DECL_HANDLER(get_message)
+     SHARED_WRITE_END;
+ 
      set_error( STATUS_PENDING );  /* FIXME */
 +    return;
 +
@@ -250,7 +253,7 @@ index 53306f46793..3cf1a20926d 100644
  }
  
  
-@@ -3220,7 +3251,10 @@ DECL_HANDLER(reply_message)
+@@ -3277,7 +3308,10 @@ DECL_HANDLER(reply_message)
  DECL_HANDLER(accept_hardware_message)
  {
      if (current->queue)