From 532cb947f9e33287601845a7070f30059e64f9dd Mon Sep 17 00:00:00 2001 From: Thomas Bluemel Date: Fri, 21 Nov 2003 23:05:28 +0000 Subject: [PATCH] small bugfix svn path=/trunk/; revision=6745 --- reactos/subsys/win32k/ntuser/msgqueue.c | 43 ++++++++++++++----------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/reactos/subsys/win32k/ntuser/msgqueue.c b/reactos/subsys/win32k/ntuser/msgqueue.c index 8649f919d75..b84fc9b0e15 100644 --- a/reactos/subsys/win32k/ntuser/msgqueue.c +++ b/reactos/subsys/win32k/ntuser/msgqueue.c @@ -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: msgqueue.c,v 1.33 2003/11/21 17:01:16 navaraf Exp $ +/* $Id: msgqueue.c,v 1.34 2003/11/21 23:05:28 weiden Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel @@ -224,27 +224,32 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh, { DbgPrint("Changing Focus window to 0x%X\n", Wnd); - Window = IntGetWindowObject(Wnd); SpareLParam = MAKELONG(WinPosWindowFromPoint(ScopeWin, Message->Msg.pt, &Window), Msg); - Result = NtUserSendMessage(Wnd, WM_MOUSEACTIVATE, (WPARAM)NtUserGetParent(Window->Self), (LPARAM)SpareLParam); - - IntReleaseWindowObject(Window); - - switch (Result) + if(Window) { - case MA_NOACTIVATEANDEAT: - return TRUE; - case MA_NOACTIVATE: - break; - case MA_ACTIVATEANDEAT: - IntSetFocusWindow(Wnd); - return TRUE; -/* case MA_ACTIVATE: - case 0:*/ - default: - IntSetFocusWindow(Wnd); - break; + Result = NtUserSendMessage(Wnd, WM_MOUSEACTIVATE, (WPARAM)NtUserGetParent(Window->Self), (LPARAM)SpareLParam); + + switch (Result) + { + case MA_NOACTIVATEANDEAT: + return TRUE; + case MA_NOACTIVATE: + break; + case MA_ACTIVATEANDEAT: + IntSetFocusWindow(Wnd); + return TRUE; +/* case MA_ACTIVATE: + case 0:*/ + default: + IntSetFocusWindow(Wnd); + break; + } + } + else + { + ExFreePool(Message); + return(FALSE); } }