Alexandre Julliard : server: Don' t reset the idle event when the client stops waiting.

Alexandre Julliard julliard at winehq.org
Thu Dec 17 10:37:06 CST 2009


Module: wine
Branch: master
Commit: b57cc5561bd2eb2736331b94c1d309b22c2a1b8b
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b57cc5561bd2eb2736331b94c1d309b22c2a1b8b

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Wed Dec 16 17:22:34 2009 +0100

server: Don't reset the idle event when the client stops waiting.

---

 dlls/user32/tests/msg.c |    2 +-
 server/queue.c          |    9 ---------
 2 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c
index efa5b12..d721bda 100644
--- a/dlls/user32/tests/msg.c
+++ b/dlls/user32/tests/msg.c
@@ -12040,7 +12040,7 @@ static const struct
          { 0,            0,            FALSE },
 /* 10 */ { 0,            0,            TRUE  },
          { 0,            0,            FALSE },
-         { 0,            WAIT_TIMEOUT, TRUE  },
+         { 0,            WAIT_TIMEOUT, FALSE },
 };
 
 static void do_wait_idle_child( int arg )
diff --git a/server/queue.c b/server/queue.c
index b7cbc64..2c8140d 100644
--- a/server/queue.c
+++ b/server/queue.c
@@ -794,19 +794,10 @@ static int msg_queue_add_queue( struct object *obj, struct wait_queue_entry *ent
 static void msg_queue_remove_queue(struct object *obj, struct wait_queue_entry *entry )
 {
     struct msg_queue *queue = (struct msg_queue *)obj;
-    struct process *process = entry->thread->process;
 
     remove_queue( obj, entry );
     if (queue->fd && list_empty( &obj->wait_queue ))  /* last on the queue is gone */
         set_fd_events( queue->fd, 0 );
-
-    assert( entry->thread->queue == queue );
-
-    /* if waiting on the main process queue, reset the idle event */
-    if (process->queue == queue)
-    {
-        if (process->idle_event) reset_event( process->idle_event );
-    }
 }
 
 static void msg_queue_dump( struct object *obj, int verbose )




More information about the wine-cvs mailing list