only send WM_SETCURSOR messages when not capturing a window

svn path=/trunk/; revision=6753
This commit is contained in:
Thomas Bluemel 2003-11-22 12:22:07 +00:00
parent d2c5f3b3b6
commit 668ad67060

View file

@ -16,7 +16,7 @@
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
/* $Id: msgqueue.c,v 1.34 2003/11/21 23:05:28 weiden Exp $ /* $Id: msgqueue.c,v 1.35 2003/11/22 12:22:07 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -177,7 +177,7 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
PPOINT ScreenPoint, PBOOL MouseClick) PPOINT ScreenPoint, PBOOL MouseClick)
{ {
USHORT Msg = Message->Msg.message; USHORT Msg = Message->Msg.message;
PWINDOW_OBJECT Window = NULL; PWINDOW_OBJECT CaptureWin, Window = NULL;
HWND Wnd; HWND Wnd;
POINT Point; POINT Point;
@ -255,7 +255,9 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
} }
if ((Window = IntGetCaptureWindow()) == NULL) CaptureWin = IntGetCaptureWindow();
if ((Window = CaptureWin) == NULL)
{ {
*HitTest = WinPosWindowFromPoint(ScopeWin, Message->Msg.pt, &Window); *HitTest = WinPosWindowFromPoint(ScopeWin, Message->Msg.pt, &Window);
} }
@ -267,6 +269,7 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
if (Window == NULL) if (Window == NULL)
{ {
/* set default cursor */ /* set default cursor */
if(CaptureWin == NULL)
IntSendSetCursorMessage(NULL, Msg, HTNOWHERE); IntSendSetCursorMessage(NULL, Msg, HTNOWHERE);
ExFreePool(Message); ExFreePool(Message);
@ -308,7 +311,7 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
*ScreenPoint = Message->Msg.pt; *ScreenPoint = Message->Msg.pt;
Point = Message->Msg.pt; Point = Message->Msg.pt;
if(!IntSendSetCursorMessage(Window, Msg, *HitTest)) if(!CaptureWin && !IntSendSetCursorMessage(Window, Msg, *HitTest))
{ {
/* FIXME - what should we do here? */ /* FIXME - what should we do here? */
} }