From 5d8ed11b10484ba4c63abbf7238c5196d1c412b6 Mon Sep 17 00:00:00 2001 From: Gunnar Dalsnes Date: Wed, 7 Sep 2005 21:05:16 +0000 Subject: [PATCH] window pointer was incorrectly passed as wparam to co_IntSendMessage instead of hwnd svn path=/trunk/; revision=17729 --- reactos/subsys/win32k/ntuser/message.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/reactos/subsys/win32k/ntuser/message.c b/reactos/subsys/win32k/ntuser/message.c index 365ba3dc357..88fbc364dee 100644 --- a/reactos/subsys/win32k/ntuser/message.c +++ b/reactos/subsys/win32k/ntuser/message.c @@ -506,6 +506,7 @@ co_IntActivateWindowMouse(PUSER_MESSAGE_QUEUE ThreadQueue, LPMSG Msg, PWINDOW_OB USHORT *HitTest) { ULONG Result; + PWINDOW_OBJECT Parent; if(*HitTest == (USHORT)HTTRANSPARENT) { @@ -513,7 +514,14 @@ co_IntActivateWindowMouse(PUSER_MESSAGE_QUEUE ThreadQueue, LPMSG Msg, PWINDOW_OB return TRUE; } - Result = co_IntSendMessage(MsgWindow->hSelf, WM_MOUSEACTIVATE, (WPARAM)IntGetParent(MsgWindow), (LPARAM)MAKELONG(*HitTest, Msg->message)); + Parent = IntGetParent(MsgWindow); + /* fixme: abort if no parent ? */ + Result = co_IntSendMessage(MsgWindow->hSelf, + WM_MOUSEACTIVATE, + (WPARAM) (Parent ? Parent->hSelf : NULL), + (LPARAM)MAKELONG(*HitTest, Msg->message) + ); + switch (Result) { case MA_NOACTIVATEANDEAT: