- Pass args to MsqSendMessage in correct order
- Implement message sending to HWND_BROADCAST

reactos/subsys/win32k/ntuser

diff -u -r1.54 -r1.55
--- message.c	11 Mar 2004 16:17:25 -0000	1.54
+++ message.c	7 Apr 2004 17:52:32 -0000	1.55
@@ -16,7 +16,7 @@

  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */

-/* $Id: message.c,v 1.54 2004/03/11 16:17:25 weiden Exp $

+/* $Id: message.c,v 1.55 2004/04/07 17:52:32 gvg Exp $

  *
  * COPYRIGHT:        See COPYING in the top level directory
  * PROJECT:          ReactOS kernel

@@ -725,14 +725,14 @@

   return 0;
 }
 

-LRESULT STDCALL
-IntSendMessageTimeout(HWND hWnd,
-                      UINT Msg,
-                      WPARAM wParam,
-                      LPARAM lParam,
-                      UINT uFlags,
-                      UINT uTimeout,
-                      ULONG_PTR *uResult)

+static LRESULT STDCALL
+IntSendMessageTimeoutSingle(HWND hWnd,
+                            UINT Msg,
+                            WPARAM wParam,
+                            LPARAM lParam,
+                            UINT uFlags,
+                            UINT uTimeout,
+                            ULONG_PTR *uResult)

 {
   LRESULT Result;
   NTSTATUS Status;

@@ -742,8 +742,6 @@

   LPARAM lParamPacked;
   PW32THREAD Win32Thread;
 

-  /* FIXME: Check for a broadcast or topmost destination. */
-

   /* FIXME: Call hooks. */
   Window = IntGetWindowObject(hWnd);
   if (!Window)

@@ -814,7 +812,7 @@

   }
   
   Status = MsqSendMessage(Window->MessageQueue, hWnd, Msg, wParam, lParam, 

-                          (uFlags & SMTO_BLOCK), uTimeout, &Result);

+                          uTimeout, (uFlags & SMTO_BLOCK), &Result);

   if(Status == STATUS_TIMEOUT)
   {
     IntReleaseWindowObject(Window);

@@ -828,6 +826,45 @@

   return TRUE;
 }
 

+LRESULT STDCALL
+IntSendMessageTimeout(HWND hWnd,
+                      UINT Msg,
+                      WPARAM wParam,
+                      LPARAM lParam,
+                      UINT uFlags,
+                      UINT uTimeout,
+                      ULONG_PTR *uResult)
+{
+  PWINDOW_OBJECT DesktopWindow;
+  HWND *Children;
+  HWND *Child;
+
+  if (HWND_BROADCAST != hWnd)
+    {
+      return IntSendMessageTimeoutSingle(hWnd, Msg, wParam, lParam, uFlags, uTimeout, uResult);
+    }
+
+  DesktopWindow = IntGetWindowObject(IntGetDesktopWindow());
+  if (NULL == DesktopWindow)
+    {
+      SetLastWin32Error(ERROR_INTERNAL_ERROR);
+      return 0;
+    }
+  Children = IntWinListChildren(DesktopWindow);
+  IntReleaseWindowObject(DesktopWindow);
+  if (NULL == Children)
+    {
+      return 0;
+    }
+
+  for (Child = Children; NULL != *Child; Child++)
+    {
+      IntSendMessageTimeoutSingle(*Child, Msg, wParam, lParam, uFlags, uTimeout, uResult);
+    }
+
+  return (LRESULT) TRUE;
+}
+

 static NTSTATUS FASTCALL
 CopyMsgToKernelMem(MSG *KernelModeMsg, MSG *UserModeMsg)
 {

@@ -938,25 +975,26 @@

   MSG UserModeMsg;
   MSG KernelModeMsg;
 

-  /* FIXME: Check for a broadcast or topmost destination. */
-

   RtlZeroMemory(&Info, sizeof(NTUSERSENDMESSAGEINFO));
 
   /* FIXME: Call hooks. */

-  Window = IntGetWindowObject(Wnd);
-  if (NULL == Window)

+  if (HWND_BROADCAST != Wnd)

     {

-      /* Tell usermode to not touch this one */
-      Info.HandledByKernel = TRUE;
-      MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO));
-      SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE);
-      return 0;

+      Window = IntGetWindowObject(Wnd);
+      if (NULL == Window)
+        {
+          /* Tell usermode to not touch this one */
+          Info.HandledByKernel = TRUE;
+          MmCopyToCaller(UnsafeInfo, &Info, sizeof(NTUSERSENDMESSAGEINFO));
+          SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE);
+          return 0;
+        }

     }
 
   /* FIXME: Check for an exiting window. */
 
   /* See if the current thread can handle the message */

-  if (NULL != PsGetWin32Thread() &&

+  if (HWND_BROADCAST != Wnd && NULL != PsGetWin32Thread() &&

       Window->MessageQueue == PsGetWin32Thread()->MessageQueue)
     {
       /* Gather the information usermode needs to call the window proc directly */

@@ -992,7 +1030,10 @@

   else
     {
       /* Must be handled by other thread */

-      IntReleaseWindowObject(Window);

+      if (HWND_BROADCAST != Wnd)
+        {
+          IntReleaseWindowObject(Window);
+        }

       Info.HandledByKernel = TRUE;
       UserModeMsg.hwnd = Wnd;
       UserModeMsg.message = Msg;

@@ -1046,7 +1087,7 @@

 {
   DOSENDMESSAGE dsm;
   LRESULT Result;

-  

+

   dsm.uFlags = uFlags;
   dsm.uTimeout = uTimeout;
   Result = IntDoSendMessage(hWnd, Msg, wParam, lParam, &dsm, UnsafeInfo);