commit b3a99de50dba746c72f97cd581635bf1c2925b87
author Stephane Lussier <stephane@macadamian.com> Tue Feb 09 15:35:12 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Tue Feb 09 15:35:12 1999 +0000
tree 394b33e5eb794c82fbfb80e9271421534f4b15db
parent 7bb6fd1db3a3627bac3be2aa9e4426ed82cda2d5

-Fixed MESSAGE functions that were thunking down to 16 bits implementation.
So PeekMessage32, GetMessage32, PostMessage32, PostThreadMessage are fixed
with this patch. Unicode version of those functions is currently only
calling the ASCII version.
-Fixed queue signaling using a new EVENT object in the queue for 32 bits
thread. MsgWaitForMultipleObject has been fixed and is now blocking on the
right EVENT.

windows/queue.c

diff --git a/windows/queue.c b/windows/queue.c
index 9195e27..84d28c5 100644
--- a/windows/queue.c
+++ b/windows/queue.c
@@ -332,6 +332,8 @@
         if ( --queue->lockCount == 0 )
         {
             DeleteCriticalSection ( &queue->cSection );
+            if (queue->hEvent)
+                CloseHandle( queue->hEvent );
             GlobalFree16( queue->self );
         }
     
@@ -449,6 +451,23 @@
     msgQueue->wWinVersion = pTask ? pTask->version : 0;
     
     InitializeCriticalSection( &msgQueue->cSection );
+
+    /* Create an Event object for waiting on message, used by win32 thread
+       only */
+    if ( !THREAD_IsWin16( THREAD_Current() ) )
+    {
+        msgQueue->hEvent = CreateEvent32A( NULL, FALSE, FALSE, NULL);
+
+        if (msgQueue->hEvent == 0)
+        {
+            WARN(msg, "CreateEvent32A is not able to create an event object");
+            return 0;
+        }
+        msgQueue->hEvent = ConvertToGlobalHandle( msgQueue->hEvent );
+    }
+    else
+        msgQueue->hEvent = 0;
+         
     msgQueue->lockCount = 1;
     msgQueue->magic = QUEUE_MAGIC;
     
@@ -561,16 +580,6 @@
     return sysMsgQueue;
 }
 
-/***********************************************************************
- *           QUEUE_Signal
- */
-void QUEUE_Signal( THDB *thdb  )
-{
-    /* Wake up thread waiting for message */
-    SetEvent( thdb->event );
-
-    PostEvent( thdb->process->task );
-}
 
 /***********************************************************************
  *           QUEUE_Wait
@@ -604,7 +613,14 @@
     if (queue->wakeMask & bit)
     {
         queue->wakeMask = 0;
-        QUEUE_Signal( queue->thdb );
+        
+        /* Wake up thread waiting for message */
+        if ( THREAD_IsWin16( queue->thdb ) )
+            PostEvent( queue->thdb->process->task );
+        else
+        {
+            SetEvent( queue->hEvent );
+        }
     }
 }