Changeset 6501 for trunk/src

Timestamp:

Aug 9, 2001, 10:45:41 AM (24 years ago)

Author:

sandervl

Message:

rewrote PostThreadMessage + query message queue of first thread with WinQueueFromId

Location:

trunk/src/user32

Files:

• USER32.DEF (modified) (2 diffs)
• oslibmsg.cpp (modified) (2 diffs)
• pmwindow.cpp (modified) (3 diffs)

trunk/src/user32/USER32.DEF

@@ -1 @@
-; $Id: USER32.DEF,v 1.65 2001-08-08 10:07:18 sandervl Exp $
+; $Id: USER32.DEF,v 1.66 2001-08-09 08:45:40 sandervl Exp $
 
 LIBRARY USER32 INITINSTANCE TERMINSTANCE
@@ -19 +19 @@
     __SwapMouseButton           = PMMERGE.10019
     WinReplyMsg                 = PMMERGE.5325
+    WinQueueFromID              = PMMERGE.5313
     _GpiEnableYInversion        = PMGPI.723
     _GpiQueryYInversion         = PMGPI.726

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.40 2001-07-30 20:48:51 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.41 2001-08-09 08:45:40 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -507 +507 @@
 BOOL OSLibPostThreadMessage(ULONG threadid, UINT msg, WPARAM wParam, LPARAM lParam, BOOL fUnicode)
 {
-// TEB *teb = GetTEBFromThreadId(threadid);
+ TEB *teb = GetTEBFromThreadId(threadid);
  POSTMSG_PACKET *packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
-
-//    if(teb == NULL) {
-//        dprintf(("OSLibPostThreadMessage: thread %x not found!", threadid));
-//        return FALSE;
-//    }
-    dprintf(("PostThreadMessageA %x %x %x %x", threadid, msg, wParam, lParam));
+ BOOL ret;
+
+    if(teb == NULL) {
+        dprintf(("OSLibPostThreadMessage: thread %x not found!", threadid));
+        return FALSE;
+    }
+    dprintf(("PostThreadMessageA %x %x %x %x -> hmq %x", threadid, msg, wParam, lParam, teb->o.odin.hmq));
     packet->wParam   = wParam;
     packet->lParam   = lParam;
-#ifdef USING_OPEN32
-    return O32_PostThreadMessage(threadid, WIN32APP_POSTMSG-OPEN32_MSGDIFF+msg, ((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (LPARAM)packet);
-#else
-    return O32_PostThreadMessage(threadid, WIN32APP_POSTMSG+msg, ((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (LPARAM)packet);
-#endif
-}
-//******************************************************************************
-//******************************************************************************
-
+
+    ret = WinPostQueueMsg((HMQ)teb->o.odin.hmq, WIN32APP_POSTMSG+msg, 
+                          (MPARAM)((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), 
+                          (MPARAM)packet);
+
+    if(ret == FALSE)
+    {
+       SetLastError(ERROR_INVALID_PARAMETER_W);
+       return FALSE;
+    }
+    SetLastError(ERROR_SUCCESS_W);
+    return TRUE;
+}
+//******************************************************************************
+//******************************************************************************
+

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.142 2001-08-02 14:50:42 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.143 2001-08-09 08:45:41 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -75 +75 @@
 BOOL InitPM()
 {
-
     hab = WinInitialize(0);
     dprintf(("Winitialize returned %x", hab));
@@ -98 +97 @@
             }
             if(!hmq) {
-                hmq = HMQ_CURRENT;
+                PTIB ptib;
+                PPIB ppib;
+
+                DosGetInfoBlocks(&ptib, &ppib);
+
+                hmq = WinQueueFromID(hab, ppib->pib_ulpid, ptib->tib_ptib2->tib2_ultid);
             }
         }