Changeset 2250 for trunk/src/user32/pmwindow.cpp

Timestamp:

Dec 29, 1999, 3:37:19 PM (26 years ago)

Author:

sandervl

Message:

PostMessage memory leak fixed

File:

• trunk/src/user32/pmwindow.cpp (modified) (7 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.72 1999-12-27 18:43:42 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.73 1999-12-29 14:37:16 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -167 +167 @@
         qmsg.reserved = 0;
 
-        if(OS2ToWinMsgTranslate((PVOID)thdb, &qmsg, &winMsg, FALSE, ODINMSG_NOEXTRAMSGS) == FALSE)
+        if(OS2ToWinMsgTranslate((PVOID)thdb, &qmsg, &winMsg, FALSE, MSG_REMOVE) == FALSE)
         {//message was not translated
             memset(&winMsg, 0, sizeof(MSG));
@@ -178 +178 @@
   }
 
-  if(msg == WIN32APP_POSTMSG && (ULONG)mp1 == WIN32PM_MAGIC) {
-        //win32 app user message
-        return (MRESULT)win32wnd->PostMessage((POSTMSG_PACKET *)mp2);
+  if(msg == WIN32APP_POSTMSG) {
+        //probably win32 app user message
+        if((ULONG)mp1 == WIN32MSG_MAGICA) {
+            return (MRESULT)win32wnd->DispatchMsgA(pWinMsg);
+        }
+        else
+        if((ULONG)mp1 == WIN32MSG_MAGICW) {
+            return (MRESULT)win32wnd->DispatchMsgW(pWinMsg);
+        }
   }
   switch( msg )
@@ -403 +409 @@
     case WM_COMMAND:
         dprintf(("OS2: WM_COMMAND %x %x %x", hwnd, mp1, mp2));
-        win32wnd->DispatchMsg(pWinMsg);
+        win32wnd->DispatchMsgA(pWinMsg);
         break;
 
     case WM_SYSCOMMAND:
-        win32wnd->DispatchMsg(pWinMsg);
+        win32wnd->DispatchMsgA(pWinMsg);
         break;
 
     case WM_CHAR:
-        win32wnd->DispatchMsg(pWinMsg);
+        win32wnd->DispatchMsgA(pWinMsg);
         break;
 
@@ -419 +425 @@
 
     case WM_TIMER:
-        win32wnd->DispatchMsg(pWinMsg);
+        win32wnd->DispatchMsgA(pWinMsg);
         goto RunDefWndProc;
 
@@ -461 +467 @@
 
     case WM_PAINT:
-        win32wnd->DispatchMsg(pWinMsg);
+        win32wnd->DispatchMsgA(pWinMsg);
         goto RunDefWndProc;
 
@@ -488 +494 @@
     case WM_CONTEXTMENU:
     {
-        win32wnd->DispatchMsg(pWinMsg);
+        win32wnd->DispatchMsgA(pWinMsg);
 
         RestoreOS2TIB();