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

Timestamp:

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

Author:

sandervl

Message:

PostMessage memory leak fixed

File:

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

trunk/src/user32/oslibmsg.cpp

@@ -1 @@
-/* $Id: oslibmsg.cpp,v 1.17 1999-12-29 12:39:44 sandervl Exp $ */
+/* $Id: oslibmsg.cpp,v 1.18 1999-12-29 14:37:16 sandervl Exp $ */
 /*
  * Window message translation functions for OS/2
@@ -124 +124 @@
 ULONG TranslateWinMsg(ULONG msg, BOOL fMinFilter)
 {
- POSTMSG_PACKET *packet;
-
     if(msg == 0)
         return 0;
@@ -235 +233 @@
     } while (eaten);
   }
-  OS2ToWinMsgTranslate((PVOID)thdb, MsgThreadPtr, pMsg, isUnicode);
+  OS2ToWinMsgTranslate((PVOID)thdb, MsgThreadPtr, pMsg, isUnicode, MSG_REMOVE);
   return rc;
 }
@@ -287 +285 @@
   }
 
-  OS2ToWinMsgTranslate((PVOID)thdb, &os2msg, pMsg, isUnicode);
+  OS2ToWinMsgTranslate((PVOID)thdb, &os2msg, pMsg, isUnicode, (fRemove & PM_REMOVE_W) ? MSG_REMOVE : MSG_NOREMOVE);
   //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) {
@@ -366 +364 @@
 //******************************************************************************
 //******************************************************************************
-BOOL OSLibPostMessage(HWND hwnd, ULONG msg, ULONG wParam, ULONG lParam)
-{
-  return WinPostMsg(hwnd, msg, (MPARAM)wParam, (MPARAM)lParam);
-}
-//******************************************************************************
-//******************************************************************************
-ULONG OSLibSendMessage(HWND hwnd, ULONG msg, ULONG wParam, ULONG lParam)
-{
-  return (ULONG)WinSendMsg(hwnd, msg, (MPARAM)wParam, (MPARAM)lParam);
+ULONG OSLibSendMessage(HWND hwnd, ULONG msg, ULONG wParam, ULONG lParam, BOOL fUnicode)
+{
+ POSTMSG_PACKET *packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
+
+    packet->Msg    = msg;
+    packet->wParam = wParam;
+    packet->lParam = lParam;
+
+    return (ULONG)WinSendMsg(hwnd, WIN32APP_POSTMSG, (MPARAM)((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (MPARAM)packet);
 }
 //******************************************************************************
@@ -380 +378 @@
 ULONG OSLibWinBroadcastMsg(ULONG msg, ULONG wParam, ULONG lParam, BOOL fSend)
 {
-  return WinBroadcastMsg(HWND_DESKTOP, msg, (MPARAM)wParam, (MPARAM)lParam,
-                         (fSend) ? BMSG_SEND : BMSG_POST);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL OSLibPostThreadMessage(ULONG threadid, UINT msg, WPARAM wParam, LPARAM lParam)
+    return WinBroadcastMsg(HWND_DESKTOP, msg, (MPARAM)wParam, (MPARAM)lParam,
+                           (fSend) ? BMSG_SEND : BMSG_POST);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibPostMessage(HWND hwnd, ULONG msg, ULONG wParam, ULONG lParam, BOOL fUnicode)
+{
+ POSTMSG_PACKET *packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
+
+    packet->Msg = msg;
+    packet->wParam = wParam;
+    packet->lParam = lParam;
+    return WinPostMsg(hwnd, WIN32APP_POSTMSG, (MPARAM)((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (MPARAM)packet);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL OSLibPostThreadMessage(ULONG threadid, UINT msg, WPARAM wParam, LPARAM lParam, BOOL fUnicode)
 {
  THDB *thdb = GetTHDBFromThreadId(threadid);
+ POSTMSG_PACKET *packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
 
     if(thdb == NULL) {
@@ -393 +403 @@
         return FALSE;
     }
-    return WinPostQueueMsg(thdb->hmq, msg, (MPARAM)wParam, (MPARAM)lParam);
-}
-//******************************************************************************
-//******************************************************************************
-
+    dprintf(("PostThreadMessageA %x %x %x %x", threadid, msg, wParam, lParam));
+    packet->Msg = msg;
+    packet->wParam = wParam;
+    packet->lParam = lParam;
+    return WinPostQueueMsg(thdb->hmq, WIN32APP_POSTMSG, (MPARAM)((fUnicode) ? WIN32MSG_MAGICW : WIN32MSG_MAGICA), (MPARAM)packet);
+}
+//******************************************************************************
+//******************************************************************************
+