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

Timestamp:

Nov 24, 1999, 8:32:23 PM (26 years ago)

Author:

sandervl

Message:

desktop + misc updates

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.92 1999-11-22 21:42:06 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.93 1999-11-24 19:32:22 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2010 +2010 @@
 BOOL Win32BaseWindow::PostMessageA(ULONG msg, WPARAM wParam, LPARAM lParam)
 {
-  return OSLibPostMessage(OS2Hwnd, WIN32APP_USERMSGBASE+msg, wParam, 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);
 }
 //******************************************************************************
@@ -2016 +2022 @@
 BOOL Win32BaseWindow::PostMessageW(ULONG msg, WPARAM wParam, LPARAM lParam)
 {
-  return OSLibPostMessage(OS2Hwnd, WIN32APP_USERMSGBASE+msg, wParam, 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));
+
+    packet->Msg = msg;
+    packet->wParam = wParam;
+    packet->lParam = lParam;
+    packet->fUnicode = FALSE;
+    return O32_PostThreadMessage(threadid, WIN32APP_POSTMSG, WIN32PM_MAGIC, (DWORD)packet);
+}
+//******************************************************************************
+//******************************************************************************
+BOOL Win32BaseWindow::PostThreadMessageW(ULONG threadid, UINT 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 O32_PostThreadMessage(threadid, WIN32APP_POSTMSG, WIN32PM_MAGIC, (DWORD)packet);
+}
+//******************************************************************************
+//******************************************************************************
+void Win32BaseWindow::PostMessage(POSTMSG_PACKET *packet)
+{
+    if(packet == NULL)
+        return;
+
+    if(packet->fUnicode) {
+            SendMessageW(packet->Msg, packet->wParam, packet->lParam);
+    }
+    else    SendMessageA(packet->Msg, packet->wParam, packet->lParam);
+
+    free(packet);
+}
+//******************************************************************************
+//TODO: Probably not complete compatible with win32 implementation
+//******************************************************************************
+LRESULT Win32BaseWindow::BroadcastMessageA(int type, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+ POSTMSG_PACKET *packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
+
+    dprintf(("BroadCastMessageA %x %x %x", msg, wParam, lParam));
+    return 0;
+
+    packet->Msg = msg;
+    packet->wParam = wParam;
+    packet->lParam = lParam;
+    packet->fUnicode = FALSE;
+
+    return OSLibWinBroadcastMsg(WIN32APP_POSTMSG, WIN32PM_MAGIC, (DWORD)packet, type == BROADCAST_SEND);
+}
+//******************************************************************************
+//TODO: Probably not complete compatible with win32 implementation
+//******************************************************************************
+LRESULT Win32BaseWindow::BroadcastMessageW(int type, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+ POSTMSG_PACKET *packet = (POSTMSG_PACKET *)_smalloc(sizeof(POSTMSG_PACKET));
+
+    dprintf(("BroadCastMessageW %x %x %x", msg, wParam, lParam));
+    return 0;
+
+    packet->Msg = msg;
+    packet->wParam = wParam;
+    packet->lParam = lParam;
+    packet->fUnicode = TRUE;
+
+    return OSLibWinBroadcastMsg(WIN32APP_POSTMSG, WIN32PM_MAGIC, (DWORD)packet, type == BROADCAST_SEND);
 }
 //******************************************************************************
@@ -2441 +2525 @@
 //******************************************************************************
 HWND Win32BaseWindow::FindWindowEx(HWND hwndParent, HWND hwndChildAfter, LPSTR lpszClass, LPSTR lpszWindow,
-                               BOOL fUnicode)
+                                   BOOL fUnicode)
 {
  Win32BaseWindow *parent = GetWindowFromHandle(hwndParent);
@@ -2862 +2946 @@
  Win32BaseWindow *window;
 
-    if(hwnd == NULL && windowDesktop)
-         return windowDesktop;
-
     if(HwGetWindowHandleData(hwnd, (DWORD *)&window) == TRUE) {
          return window;