Changeset 3525 for trunk/src/user32/oslibmsg.cpp

Timestamp:

May 12, 2000, 8:09:42 PM (25 years ago)

Author:

sandervl

Message:

hook, syscolor & message bugfixes

File:

• trunk/src/user32/oslibmsg.cpp (modified) (8 diffs)

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.32 2000-04-13 18:50:44 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.33 2000-05-12 18:09:40 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -99 +99 @@
 #define MAX_MSGTRANSTAB (sizeof(MsgTransTab)/sizeof(MsgTransTab[0]))
 
-QMSG *MsgThreadPtr = 0;
-
 LRESULT WIN32API SendMessageA(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 
-//******************************************************************************
-//******************************************************************************
-BOOL OSLibInitMsgQueue()
-{
-   if(DosAllocThreadLocalMemory(sizeof(QMSG)/sizeof(ULONG), (PULONG *)&MsgThreadPtr) != 0)
-   {
-        dprintf(("OSLibInitMsgQueue: local thread memory alloc failed!!"));
-        DebugInt3();
-        return FALSE;
-   }
-   return TRUE;
-}
 //******************************************************************************
 //******************************************************************************
@@ -176 +162 @@
   //  WinToOS2MsgTranslate(msg, &qmsg, isUnicode);
 
-  if(msg->time == MsgThreadPtr->time || msg->hwnd == 0) {
-        memcpy(&os2msg, MsgThreadPtr, sizeof(QMSG));
-        MsgThreadPtr->time = -1;
+  if(!memcmp(msg, &thdb->winmsg, sizeof(MSG)) || msg->hwnd == 0) {
+        memcpy(&os2msg, &thdb->os2msg, sizeof(QMSG));
+        thdb->os2msg.time = -1;
+        thdb->winmsg.time = -1;
         if(msg->hwnd) {
                 thdb->nrOfMsgs = 1;
@@ -185 +172 @@
         }
         if(os2msg.hwnd || os2msg.msg == WM_QUIT) {
-                memset(MsgThreadPtr, 0, sizeof(*MsgThreadPtr));
+                memset(&thdb->os2msg, 0, sizeof(thdb->os2msg));
+                memset(&thdb->winmsg, 0, sizeof(thdb->winmsg));
                 return (LONG)WinDispatchMsg(thdb->hab, &os2msg);
         }
@@ -235 +223 @@
         thdb->fTranslated = FALSE;
         memcpy(pMsg, &thdb->msgWCHAR, sizeof(MSG));
-        MsgThreadPtr->msg  = 0;
-        MsgThreadPtr->hwnd = 0;
+        thdb->os2msg.msg  = 0;
+        thdb->os2msg.hwnd = 0;
         return (pMsg->message != WINWM_QUIT);
   }
@@ -261 +249 @@
 
   OS2ToWinMsgTranslate((PVOID)thdb, &os2msg, pMsg, isUnicode, MSG_REMOVE);
-  memcpy(MsgThreadPtr, &os2msg, sizeof(QMSG));
+  memcpy(&thdb->os2msg, &os2msg, sizeof(QMSG));
+  memcpy(&thdb->winmsg, pMsg, sizeof(MSG));
 
   if(pMsg->message <= WINWM_KEYLAST && pMsg->message >= WINWM_KEYDOWN)
@@ -317 +306 @@
         if(fRemove & PM_REMOVE_W) {
             thdb->fTranslated = FALSE;
-            MsgThreadPtr->msg  = 0;
-            MsgThreadPtr->hwnd = 0;
+            thdb->os2msg.msg  = 0;
+            thdb->os2msg.hwnd = 0;
         }
         memcpy(pMsg, &thdb->msgWCHAR, sizeof(MSG));
@@ -343 +332 @@
   //TODO: This is not safe! There's no guarantee this message will be dispatched and it might overwrite a previous message
   if(fRemove & PM_REMOVE_W) {
-        memcpy(MsgThreadPtr, &os2msg, sizeof(QMSG));
+        memcpy(&thdb->os2msg, &os2msg, sizeof(QMSG));
+        memcpy(&thdb->winmsg, pMsg, sizeof(MSG));
   }