Changeset 2379 for trunk/src

Timestamp:

Jan 8, 2000, 6:08:56 PM (26 years ago)

Author:

sandervl

Message:

message translation fixes

Location:

trunk/src/user32/new

Files:

• oslibmsg.cpp (modified) (5 diffs)
• oslibmsgtranslate.cpp (modified) (3 diffs)

trunk/src/user32/new/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.9 2000-01-05 21:25:03 cbratschi Exp $ */
+/* $Id: oslibmsg.cpp,v 1.10 2000-01-08 17:08:55 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));
 }
@@ -179 +179 @@
             memcpy(&thdb->msg, msg, sizeof(MSG));
         }
-        return (LONG)WinDispatchMsg(thdb->hab, &os2msg);
+        if(os2msg.hwnd || os2msg.msg == WM_QUIT) {
+            return (LONG)WinDispatchMsg(thdb->hab, &os2msg);
+        }
+        //SvL: Don't dispatch messages sent by PostThreadMessage (correct??)
+        return 0;
+
   }
   else {//is this allowed?
@@ -225 +230 @@
         while(rc == FALSE);
 
-        return rc;
+    return (pMsg->message == WINWM_QUIT);
   }
   else
@@ -236 +241 @@
     } 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;
 }

trunk/src/user32/new/oslibmsgtranslate.cpp

@@ -1 @@
-/* $Id: oslibmsgtranslate.cpp,v 1.7 2000-01-08 16:47:46 cbratschi Exp $ */
+/* $Id: oslibmsgtranslate.cpp,v 1.8 2000-01-08 17:08:56 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -139 +139 @@
   if (!win32wnd) win32wnd = Win32BaseWindow::GetWindowFromOS2FrameHandle(os2Msg->hwnd);
   //PostThreadMessage posts WIN32APP_POSTMSG msg without window handle
-  if((win32wnd == 0) && (os2Msg->msg != WM_CREATE) && (os2Msg->msg != WIN32APP_POSTMSG))
+  if(win32wnd == 0 && (os2Msg->msg != WM_CREATE && os2Msg->msg != WM_QUIT && os2Msg->msg != WIN32APP_POSTMSG))
   {
         goto dummymessage; //not a win32 client window
@@ -147 +147 @@
   winMsg->pt.y = mapScreenY(os2Msg->ptl.y);
 
-  if(win32wnd) //==0 for WM_CREATE
+  if(win32wnd) //==0 for WM_CREATE/WM_QUIT
     winMsg->hwnd = win32wnd->getWindowHandle();