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

Timestamp:

Jan 8, 2000, 3:15:38 PM (26 years ago)

Author:

sandervl

Message:

OSLibGetMsg bugfix + WM_QUIT translation fix

File:

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

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.21 2000-01-03 22:53:16 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.22 2000-01-08 14:15:06 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -151 +151 @@
  APIRET rc;
 
-  rc = WinPostQueueMsg(NULLHANDLE, WM_QUIT, (MPARAM)nExitCode, 0);
+  rc = WinPostQueueMsg(NULLHANDLE, WM_QUIT, MPFROMLONG(nExitCode), 0);
   dprintf(("WinPostQueueMsg %d returned %d", nExitCode, rc));
 }
@@ -174 +174 @@
         memcpy(&os2msg, MsgThreadPtr, sizeof(QMSG));
         MsgThreadPtr->time = -1;
-        if(msg->hwnd) {
+        if(os2msg.hwnd || os2msg.msg == WM_QUIT) {
             thdb->nrOfMsgs = 1;
             thdb->msgstate++; //odd -> next call to our PM window handler should dispatch the translated msg
             memcpy(&thdb->msg, msg, sizeof(MSG));
-        }
-        return (LONG)WinDispatchMsg(thdb->hab, &os2msg);
+            return (LONG)WinDispatchMsg(thdb->hab, &os2msg);
+        }
+        //SvL: Don't dispatch messages sent by PostThreadMessage (correct??)
+        return 0;
+
   }
   else {//is this allowed?
@@ -225 +228 @@
         while(rc == FALSE);
 
-        return rc;
+    return (pMsg->message == WINWM_QUIT);
   }
   else
@@ -236 +239 @@
     } while (eaten);
   }
-  if(rc) {
-        OS2ToWinMsgTranslate((PVOID)thdb, &os2msg, pMsg, isUnicode, MSG_REMOVE);
-        memcpy(MsgThreadPtr, &os2msg, sizeof(QMSG));
-  }
+  OS2ToWinMsgTranslate((PVOID)thdb, &os2msg, pMsg, isUnicode, MSG_REMOVE);
+  memcpy(MsgThreadPtr, &os2msg, sizeof(QMSG));
   return rc;
 }
@@ -410 +411 @@
 
     return yyrc;
-} 
+}
 //******************************************************************************
 BOOL OSLibPostThreadMessage(ULONG threadid, UINT msg, WPARAM wParam, LPARAM lParam, BOOL fUnicode)