Changeset 5805 for trunk/src

Timestamp:

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

Author:

sandervl

Message:

Post(Thread)/SendMessage updates & fixes

Location:

trunk/src/user32

Files:

• oslibmsg.cpp (modified) (9 diffs)
• oslibmsgtranslate.cpp (modified) (3 diffs)
• pmwindow.cpp (modified) (4 diffs)
• win32wbase.h (modified) (3 diffs)
• windowmsg.cpp (modified) (5 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.37 2001-04-27 17:36:37 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.38 2001-05-25 19:59:29 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -128 +128 @@
 
     if(msg >= WINWM_USER)
-        return WIN32APP_POSTMSG;
+        return msg + WIN32APP_POSTMSG;
 
     for(int i=0;i<MAX_MSGTRANSTAB;i++)
@@ -143 +143 @@
     }
 
-    //not found, probaby WIN32APP_POSTMSG
-    return WIN32APP_POSTMSG;
+    //not found, get everything
+    dprintf(("WARNING: TranslateWinMsg: message %x not found", msg));
+    return 0;
 }
 //******************************************************************************
@@ -351 +352 @@
 
   if(rc == FALSE) {
-    return FALSE;
+      return FALSE;
   }
 
@@ -358 +359 @@
      //unused PM message; dispatch immediately and grab next one
      dprintf2(("OSLibWinPeekMsg: Untranslated message; dispatched immediately"));
-     rc = WinPeekMsg(teb->o.odin.hab, &os2msg, hwndOS2, TranslateWinMsg(uMsgFilterMin, TRUE),
-                     TranslateWinMsg(uMsgFilterMax, FALSE), PM_REMOVE);
+     if(!(fRemove & PM_REMOVE_W)) {
+         rc = WinPeekMsg(teb->o.odin.hab, &os2msg, hwndOS2, TranslateWinMsg(uMsgFilterMin, TRUE),
+                         TranslateWinMsg(uMsgFilterMax, FALSE), PM_REMOVE);
+     }
      WinDispatchMsg(teb->o.odin.hab, &os2msg);
      return OSLibWinPeekMsg(pMsg, hwnd, uMsgFilterMin, uMsgFilterMax,
@@ -454 +457 @@
  POSTMSG_PACKET *packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
 
-    packet->Msg    = msg;
-    packet->wParam = wParam;
-    packet->lParam = lParam;
-
-    return (ULONG)WinSendMsg(hwnd, WIN32APP_POSTMSG, (MPARAM)((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (MPARAM)packet);
+    packet->wParam   = wParam;
+    packet->lParam   = lParam;
+
+    return (ULONG)WinSendMsg(hwnd, WIN32APP_POSTMSG+msg, (MPARAM)((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (MPARAM)packet);
 }
 //******************************************************************************
@@ -464 +466 @@
 ULONG OSLibWinBroadcastMsg(ULONG msg, ULONG wParam, ULONG lParam, BOOL fSend)
 {
-    return WinBroadcastMsg(HWND_DESKTOP, msg, (MPARAM)wParam, (MPARAM)lParam,
+    return WinBroadcastMsg(HWND_DESKTOP, WIN32APP_POSTMSG+msg, (MPARAM)wParam, (MPARAM)lParam,
                            (fSend) ? BMSG_SEND : BMSG_POST);
 }
@@ -473 +475 @@
  POSTMSG_PACKET *packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
 
-    packet->Msg = msg;
-    packet->wParam = wParam;
-    packet->lParam = lParam;
-    return WinPostMsg(hwnd, WIN32APP_POSTMSG, (MPARAM)((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (MPARAM)packet);
+    packet->wParam   = wParam;
+    packet->lParam   = lParam;
+    return WinPostMsg(hwnd, WIN32APP_POSTMSG+msg, (MPARAM)((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (MPARAM)packet);
 }
 //******************************************************************************
@@ -509 +510 @@
 //    }
     dprintf(("PostThreadMessageA %x %x %x %x", threadid, msg, wParam, lParam));
-    packet->Msg = msg;
-    packet->wParam = wParam;
-    packet->lParam = lParam;
-    return O32_PostThreadMessage(threadid, WIN32APP_POSTMSG-OPEN32_MSGDIFF, ((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (LPARAM)packet);
-}
-//******************************************************************************
-//******************************************************************************
-
+    packet->wParam   = wParam;
+    packet->lParam   = lParam;
+    return O32_PostThreadMessage(threadid, WIN32APP_POSTMSG-OPEN32_MSGDIFF+msg, ((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (LPARAM)packet);
+}
+//******************************************************************************
+//******************************************************************************
+

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:

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.131 2001-05-22 09:33:12 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.132 2001-05-25 19:59:29 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -167 +167 @@
     win32wnd = Win32BaseWindow::GetWindowFromOS2Handle(hwnd);
 
+////    dprintf(("window %x msg %x", (win32wnd) ? win32wnd->getWindowHandle() : 0, msg));
+
     if(!teb || (msg != WM_CREATE && win32wnd == NULL)) {
         dprintf(("OS2: Invalid win32wnd pointer for window %x msg %x", hwnd, msg));
@@ -199 +201 @@
     //NOTE-------------->>>>>> If this is changed, also change Win32WindowProc!! <<<<<<<<<<<-------------------- END
 
-    if(msg == WIN32APP_POSTMSG) {
+    if(msg >= WIN32APP_POSTMSG) {
         //probably win32 app user message
+        dprintf2(("Posted message %x->%x", msg, msg-WIN32APP_POSTMSG));
         if((ULONG)mp1 == WIN32MSG_MAGICA) {
             rc = (MRESULT)win32wnd->DispatchMsgA(pWinMsg);
@@ -207 +210 @@
         if((ULONG)mp1 == WIN32MSG_MAGICW) {
             rc = (MRESULT)win32wnd->DispatchMsgW(pWinMsg);
+        }
+        else {//broadcasted message
+            rc = (MRESULT)win32wnd->DispatchMsgA(pWinMsg);
         }
         RestoreOS2TIB();

trunk/src/user32/win32wbase.h

@@ -1 @@
-/* $Id: win32wbase.h,v 1.116 2001-05-11 08:39:45 sandervl Exp $ */
+/* $Id: win32wbase.h,v 1.117 2001-05-25 19:59:30 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -55 +55 @@
 //PM doesn't allow SetFocus during WM_SETFOCUS message processing; must delay
 //this by posting a message
-#define WIN32APP_SETFOCUSMSG      (0x1001+OPEN32_MSGDIFF)
+//NOTE Must be smaller than WIN32APP_POSTMSG!
+#define WIN32APP_SETFOCUSMSG      (WIN32APP_POSTMSG-1)
 
 #define WIN32MSG_MAGICA           0x12345678
@@ -62 +63 @@
 typedef struct
 {
-        ULONG           Msg;
         ULONG           wParam;
         ULONG           lParam;

trunk/src/user32/windowmsg.cpp

@@ -1 @@
-/* $Id: windowmsg.cpp,v 1.24 2001-04-27 17:36:39 sandervl Exp $ */
+/* $Id: windowmsg.cpp,v 1.25 2001-05-25 19:59:30 sandervl Exp $ */
 /*
  * Win32 window message APIs for OS/2
@@ -85 +85 @@
  BOOL fFoundMsg;
  
-    dprintf2(("PeekMessagA %x %d-%d %d", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg));
+    dprintf2(("PeekMessageA %x %d-%d %d", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg));
     fFoundMsg = OSLibWinPeekMsg(msg, hwndOwner, uMsgFilterMin, uMsgFilterMax,
                                 fuRemoveMsg, FALSE);
     if(fFoundMsg) {
-        dprintf2(("PeekMessagA %x %d-%d %d found message %x %d %x %x", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg, msg->hwnd, msg->message, msg->wParam, msg->lParam));
+        dprintf2(("PeekMessageA %x %d-%d %d found message %x %d %x %x", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg, msg->hwnd, msg->message, msg->wParam, msg->lParam));
         HOOK_CallHooksA(WH_GETMESSAGE, HC_ACTION, fuRemoveMsg & PM_REMOVE, (LPARAM)msg );
         if (msg->message == WM_QUIT && (fuRemoveMsg & PM_REMOVE)) {
@@ -104 +104 @@
  BOOL fFoundMsg;
 
-    dprintf2(("PeekMessagW %x %d-%d %d", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg));
+    dprintf2(("PeekMessageW %x %d-%d %d", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg));
     fFoundMsg = OSLibWinPeekMsg(msg, hwndOwner, uMsgFilterMin, uMsgFilterMax,
                                 fuRemoveMsg, FALSE);
     if(fFoundMsg) {
-        dprintf2(("PeekMessagW %x %d-%d %d found message %x %d %x %x", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg, msg->hwnd, msg->message, msg->wParam, msg->lParam));
+        dprintf2(("PeekMessageW %x %d-%d %d found message %x %d %x %x", hwndOwner, uMsgFilterMin, uMsgFilterMax, fuRemoveMsg, msg->hwnd, msg->message, msg->wParam, msg->lParam));
         HOOK_CallHooksW(WH_GETMESSAGE, HC_ACTION, fuRemoveMsg & PM_REMOVE, (LPARAM)msg );
         if (msg->message == WM_QUIT && (fuRemoveMsg & (PM_REMOVE))) {
@@ -1051 +1051 @@
 /* Synchronization Functions */
 //******************************************************************************
-DWORD MsgWaitForMultipleObjects(DWORD nCount, LPHANDLE pHandles, BOOL fWaitAll,
-                                DWORD dwMilliseconds, DWORD dwWakeMask)
-{
- DWORD curtime, endtime;
+DWORD WIN32API MsgWaitForMultipleObjects(DWORD nCount, LPHANDLE pHandles, BOOL fWaitAll,
+                                         DWORD dwMilliseconds, DWORD dwWakeMask)
+{
+ DWORD curtime, endtime, ret;
  MSG msg;
 
@@ -1097 +1097 @@
   }
   //SvL: Call handlemanager function as we need to translate handles
-  return HMMsgWaitForMultipleObjects(nCount,pHandles,fWaitAll,dwMilliseconds,dwWakeMask);
-}
+  //TODO: doesn't work at all if waiting for message
+  ret = HMMsgWaitForMultipleObjects(nCount,pHandles,fWaitAll,dwMilliseconds,dwWakeMask);
+  return ret;
+}