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

Timestamp:

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

Author:

sandervl

Message:

PostMessage memory leak fixed

File:

• trunk/src/user32/win32wbase.cpp (modified) (11 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.123 1999-12-29 12:39:45 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.124 1999-12-29 14:37:17 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -923 +923 @@
 //******************************************************************************
 //******************************************************************************
-ULONG Win32BaseWindow::DispatchMsg(MSG *msg)
+ULONG Win32BaseWindow::DispatchMsgA(MSG *msg)
 {
     return SendInternalMessageA(msg->message, msg->wParam, msg->lParam);
+}
+//******************************************************************************
+//******************************************************************************
+ULONG Win32BaseWindow::DispatchMsgW(MSG *msg)
+{
+    return SendInternalMessageW(msg->message, msg->wParam, msg->lParam);
 }
 //******************************************************************************
@@ -1818 +1824 @@
             Win32BaseWindow *window = GetTopParent();
             if(window && !(window->getClass()->getStyle() & CS_NOCLOSE))
-                window->PostMessageA(WM_SYSCOMMAND, SC_CLOSE, 0);
+                PostMessageA(getWindowHandle(), WM_SYSCOMMAND, SC_CLOSE, 0);
         }
 
@@ -1977 +1983 @@
 LRESULT Win32BaseWindow::SendMessageA(ULONG Msg, WPARAM wParam, LPARAM lParam)
 {
- POSTMSG_PACKET *packet;
-
     //if the destination window is created by this process & thread, call window proc directly
     if(dwProcessId == currentProcessId && dwThreadId == GetCurrentThreadId()) {
@@ -1984 +1988 @@
     }
     //otherwise use WinSendMsg to send it to the right process/thread
-    packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
-    packet->Msg = Msg;
-    packet->wParam = wParam;
-    packet->lParam = lParam;
-    packet->fUnicode = FALSE;
-    return OSLibSendMessage(getOS2WindowHandle(), WIN32APP_POSTMSG, WIN32PM_MAGIC, (DWORD)packet);
+    return OSLibSendMessage(getOS2WindowHandle(), Msg, wParam, lParam, FALSE);
 }
 //******************************************************************************
@@ -1995 +1994 @@
 LRESULT Win32BaseWindow::SendMessageW(ULONG Msg, WPARAM wParam, LPARAM lParam)
 {
- POSTMSG_PACKET *packet;
-
     //if the destination window is created by this process & thread, call window proc directly
     if(dwProcessId == currentProcessId && dwThreadId == GetCurrentThreadId()) {
@@ -2002 +1999 @@
     }
     //otherwise use WinSendMsg to send it to the right process/thread
-    packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
-    packet->Msg = Msg;
-    packet->wParam = wParam;
-    packet->lParam = lParam;
-    packet->fUnicode = TRUE;
-    return OSLibSendMessage(getOS2WindowHandle(), WIN32APP_POSTMSG, WIN32PM_MAGIC, (DWORD)packet);
+    return OSLibSendMessage(getOS2WindowHandle(), Msg, wParam, lParam, TRUE);
 }
 //******************************************************************************
@@ -2127 +2119 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32BaseWindow::PostMessageA(ULONG msg, WPARAM wParam, LPARAM lParam)
-{
- POSTMSG_PACKET *packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
-
-    packet->Msg = msg;
-    packet->wParam = wParam;
-    packet->lParam = lParam;
-    packet->fUnicode = FALSE;
-    return OSLibPostMessage(OS2Hwnd, WIN32APP_POSTMSG, WIN32PM_MAGIC, (DWORD)packet);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL Win32BaseWindow::PostMessageW(ULONG msg, WPARAM wParam, LPARAM lParam)
-{
- POSTMSG_PACKET *packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
-
-    packet->Msg = msg;
-    packet->wParam = wParam;
-    packet->lParam = lParam;
-    packet->fUnicode = TRUE;
-    return OSLibPostMessage(OS2Hwnd, WIN32APP_POSTMSG, WIN32PM_MAGIC, (DWORD)packet);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL Win32BaseWindow::PostThreadMessageA(ULONG threadid, UINT msg, WPARAM wParam, LPARAM lParam)
-{
- POSTMSG_PACKET *packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
-
-    dprintf(("PostThreadMessageA %x %x %x %x", threadid, msg, wParam, lParam));
-    packet->Msg = msg;
-    packet->wParam = wParam;
-    packet->lParam = lParam;
-    packet->fUnicode = FALSE;
-    return OSLibPostThreadMessage(threadid, WIN32APP_POSTMSG, WIN32PM_MAGIC, (LPARAM)packet);
-}
-//******************************************************************************
-//******************************************************************************
-BOOL Win32BaseWindow::PostThreadMessageW(ULONG threadid, UINT msg, WPARAM wParam, LPARAM lParam)
-{
- POSTMSG_PACKET *packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
-
-    dprintf(("PostThreadMessageW %x %x %x %x", threadid, msg, wParam, lParam));
-    packet->Msg = msg;
-    packet->wParam = wParam;
-    packet->lParam = lParam;
-    packet->fUnicode = TRUE;
-    return OSLibPostThreadMessage(threadid, WIN32APP_POSTMSG, WIN32PM_MAGIC, (LPARAM)packet);
-}
-//******************************************************************************
-//******************************************************************************
-ULONG Win32BaseWindow::PostMessage(POSTMSG_PACKET *packet)
-{
- ULONG rc;
-
-    if(packet == NULL)
-        return 0;
-
-    if(packet->fUnicode) {
-            rc = SendInternalMessageW(packet->Msg, packet->wParam, packet->lParam);
-    }
-    else    rc = SendInternalMessageA(packet->Msg, packet->wParam, packet->lParam);
-
-    free(packet);
-    return rc;
-}
 //******************************************************************************
 //TODO: Do this more efficiently
@@ -2211 +2138 @@
                         window->SendInternalMessageA(msg, wParam, lParam);
                 }
-                else    window->PostMessageA(msg, wParam, lParam);
+                else    PostMessageA(window->getWindowHandle(), msg, wParam, lParam);
             }
         }
@@ -2224 +2151 @@
  Win32BaseWindow *window;
  HWND hwnd = WNDHANDLE_MAGIC_HIGHWORD;
-
 
     dprintf(("BroadCastMessageW %x %x %x", msg, wParam, lParam));
@@ -2237 +2163 @@
                         window->SendInternalMessageW(msg, wParam, lParam);
                 }
-                else    window->PostMessageW(msg, wParam, lParam);
+                else    PostMessageW(window->getWindowHandle(), msg, wParam, lParam);
             }
         }