Changeset 5805 for trunk/src/user32/oslibmsgtranslate.cpp

Timestamp:

May 25, 2001, 9:59:30 PM (24 years ago)

Author:

sandervl

Message:

Post(Thread)/SendMessage updates & fixes

File:

• trunk/src/user32/oslibmsgtranslate.cpp (modified) (3 diffs)

trunk/src/user32/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.51 2001-05-15 14:31:38 sandervl Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.52 2001-05-25 19:59:29 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -206 +206 @@
     //PostThreadMessage posts WIN32APP_POSTMSG msg without window handle
     //Realplayer starts a timer with hwnd 0 & proc 0; check this here
-    if(win32wnd == 0 && (os2Msg->msg != WM_CREATE && os2Msg->msg != WM_QUIT && os2Msg->msg != WM_TIMER && os2Msg->msg != WIN32APP_POSTMSG))
+    if(win32wnd == 0 && (os2Msg->msg != WM_CREATE && os2Msg->msg != WM_QUIT && os2Msg->msg != WM_TIMER && os2Msg->msg < WIN32APP_POSTMSG))
     {
         goto dummymessage; //not a win32 client window
@@ -218 +218 @@
         winMsg->hwnd = win32wnd->getWindowHandle();
 
-    switch(os2Msg->msg)
-    {
-    case WIN32APP_POSTMSG:
-    {
+    if(os2Msg->msg >= WIN32APP_POSTMSG) {
         packet = (POSTMSG_PACKET *)os2Msg->mp2;
         if(packet && ((ULONG)os2Msg->mp1 == WIN32MSG_MAGICA || (ULONG)os2Msg->mp1 == WIN32MSG_MAGICW)) {
-            winMsg->message = packet->Msg;
+            winMsg->message = os2Msg->msg - WIN32APP_POSTMSG;
             winMsg->wParam  = packet->wParam;
             winMsg->lParam  = packet->lParam;
             if(fMsgRemoved == MSG_REMOVE) free(packet); //free the shared memory here
-            break;
+            return TRUE;
+        }
+        else {//broadcasted message (no packet present)
+            winMsg->message = os2Msg->msg - WIN32APP_POSTMSG;
+            winMsg->wParam  = (UINT)os2Msg->mp1;
+            winMsg->lParam  = (DWORD)os2Msg->mp2;
+            return TRUE;
         }
         goto dummymessage;
     }
 
+    switch(os2Msg->msg)
+    {
     //OS/2 msgs
     case WM_CREATE: