Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 09:43:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

don't hold more than one WM_MOUSEMOVE message at the same time in the message queue

Browse source 
svn path=/trunk/; revision=8430
This commit is contained in:
Thomas Bluemel 2004-02-28 00:44:28 +00:00
parent 82cff84c9a
commit 9ece8f9451
2 changed files with 72 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/subsys/win32k/include/msgqueue.h
View file

@ -51,6 +51,8 @@ typedef struct _USER_MESSAGE_QUEUE
FAST_MUTEX HardwareLock; FAST_MUTEX HardwareLock;
/* Lock for the queue. */ /* Lock for the queue. */
FAST_MUTEX Lock; FAST_MUTEX Lock;
/* Pointer to the current WM_MOUSEMOVE message */
PUSER_MESSAGE MouseMoveMsg;
/* True if a WM_QUIT message is pending. */ /* True if a WM_QUIT message is pending. */
BOOLEAN QuitPosted; BOOLEAN QuitPosted;
/* The quit exit code. */ /* The quit exit code. */

84
reactos/subsys/win32k/ntuser/msgqueue.c
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.73 2004/02/26 22:23:54 weiden Exp $ /* $Id: msgqueue.c,v 1.74 2004/02/28 00:44:28 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -242,8 +242,9 @@ BOOL STATIC STDCALL
MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh, MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
PUSER_MESSAGE Message, BOOL Remove, PBOOL Freed, PUSER_MESSAGE Message, BOOL Remove, PBOOL Freed,
PWINDOW_OBJECT ScopeWin, PUSHORT HitTest, PWINDOW_OBJECT ScopeWin, PUSHORT HitTest,
PPOINT ScreenPoint, PBOOL MouseClick, BOOL FromGlobalQueue) PPOINT ScreenPoint, BOOL FromGlobalQueue)
{ {
PUSER_MESSAGE_QUEUE ThreadQueue;
USHORT Msg = Message->Msg.message; USHORT Msg = Message->Msg.message;
PWINDOW_OBJECT CaptureWin, Window = NULL; PWINDOW_OBJECT CaptureWin, Window = NULL;
POINT Point; POINT Point;
@ -350,7 +351,8 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
return(FALSE); return(FALSE);
} }
if (Window->MessageQueue != PsGetWin32Thread()->MessageQueue) ThreadQueue = PsGetWin32Thread()->MessageQueue;
if (Window->MessageQueue != ThreadQueue)
{ {
if (! FromGlobalQueue) if (! FromGlobalQueue)
{ {
@ -359,17 +361,38 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
* to move it to a different queue, perhaps because a new window * to move it to a different queue, perhaps because a new window
* was created which now covers the screen area previously taken * was created which now covers the screen area previously taken
* by another window. To move it, we need to take it out of the * by another window. To move it, we need to take it out of the
* old queue. Note that we're already holding the lock mutes of the * old queue. Note that we're already holding the lock mutexes of the
* old queue */ * old queue */
RemoveEntryList(&Message->ListEntry); RemoveEntryList(&Message->ListEntry);
/* remove the pointer for the current WM_MOUSEMOVE message in case we
just removed it */
if(ThreadQueue->MouseMoveMsg == Message)
{
ThreadQueue->MouseMoveMsg = NULL;
}
} }
IntLockHardwareMessageQueue(Window->MessageQueue); IntLockHardwareMessageQueue(Window->MessageQueue);
InsertTailList(&Window->MessageQueue->HardwareMessagesListHead, if((Message->Msg.message == WM_MOUSEMOVE) && Window->MessageQueue->MouseMoveMsg)
&Message->ListEntry); {
/* we do not hold more than one WM_MOUSEMOVE message in the queue */
Window->MessageQueue->MouseMoveMsg->Msg = Message->Msg;
ExFreePool(Message);
*Freed = TRUE;
}
else
{
InsertTailList(&Window->MessageQueue->HardwareMessagesListHead,
&Message->ListEntry);
if(Message->Msg.message == WM_MOUSEMOVE)
{
Window->MessageQueue->MouseMoveMsg = Message;
}
*Freed = FALSE;
}
IntUnLockHardwareMessageQueue(Window->MessageQueue); IntUnLockHardwareMessageQueue(Window->MessageQueue);
KeSetEvent(&Window->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); KeSetEvent(&Window->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE);
IntReleaseWindowObject(Window); IntReleaseWindowObject(Window);
*Freed = FALSE;
return(FALSE); return(FALSE);
} }
@ -377,12 +400,26 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
!IntIsChildWindow(hWnd, Window->Self)) !IntIsChildWindow(hWnd, Window->Self))
{ {
IntLockHardwareMessageQueue(Window->MessageQueue); IntLockHardwareMessageQueue(Window->MessageQueue);
InsertTailList(&Window->MessageQueue->HardwareMessagesListHead, if((Message->Msg.message == WM_MOUSEMOVE) && Window->MessageQueue->MouseMoveMsg)
&Message->ListEntry); {
/* we do not hold more than one WM_MOUSEMOVE message in the queue */
Window->MessageQueue->MouseMoveMsg->Msg = Message->Msg;
ExFreePool(Message);
*Freed = TRUE;
}
else
{
InsertTailList(&Window->MessageQueue->HardwareMessagesListHead,
&Message->ListEntry);
if(Message->Msg.message == WM_MOUSEMOVE)
{
Window->MessageQueue->MouseMoveMsg = Message;
}
*Freed = FALSE;
}
IntUnLockHardwareMessageQueue(Window->MessageQueue); IntUnLockHardwareMessageQueue(Window->MessageQueue);
KeSetEvent(&Window->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); KeSetEvent(&Window->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE);
IntReleaseWindowObject(Window); IntReleaseWindowObject(Window);
*Freed = FALSE;
return(FALSE); return(FALSE);
} }
@ -452,7 +489,6 @@ MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd,
USHORT HitTest; USHORT HitTest;
POINT ScreenPoint; POINT ScreenPoint;
BOOL Accept, Freed; BOOL Accept, Freed;
BOOL MouseClick;
PLIST_ENTRY CurrentEntry; PLIST_ENTRY CurrentEntry;
PWINDOW_OBJECT DesktopWindow; PWINDOW_OBJECT DesktopWindow;
PVOID WaitObjects[2]; PVOID WaitObjects[2];
@ -493,12 +529,16 @@ MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd,
Accept = MsqTranslateMouseMessage(hWnd, FilterLow, FilterHigh, Accept = MsqTranslateMouseMessage(hWnd, FilterLow, FilterHigh,
Current, Remove, &Freed, Current, Remove, &Freed,
DesktopWindow, &HitTest, DesktopWindow, &HitTest,
&ScreenPoint, &MouseClick, FALSE); &ScreenPoint, FALSE);
if (Accept) if (Accept)
{ {
if (Remove) if (Remove)
{ {
RemoveEntryList(&Current->ListEntry); RemoveEntryList(&Current->ListEntry);
if(MessageQueue->MouseMoveMsg == Current)
{
MessageQueue->MouseMoveMsg = NULL;
}
} }
IntUnLockHardwareMessageQueue(MessageQueue); IntUnLockHardwareMessageQueue(MessageQueue);
IntUnLockSystemHardwareMessageQueueLock(FALSE); IntUnLockSystemHardwareMessageQueueLock(FALSE);
@ -560,7 +600,7 @@ MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd,
Accept = MsqTranslateMouseMessage(hWnd, FilterLow, FilterHigh, Accept = MsqTranslateMouseMessage(hWnd, FilterLow, FilterHigh,
Current, Remove, &Freed, Current, Remove, &Freed,
DesktopWindow, &HitTest, DesktopWindow, &HitTest,
&ScreenPoint, &MouseClick, TRUE); &ScreenPoint, TRUE);
if (Accept) if (Accept)
{ {
/* Check for no more messages in the system queue. */ /* Check for no more messages in the system queue. */
@ -579,8 +619,22 @@ MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd,
if (!Remove) if (!Remove)
{ {
IntLockHardwareMessageQueue(MessageQueue); IntLockHardwareMessageQueue(MessageQueue);
InsertTailList(&MessageQueue->HardwareMessagesListHead, if((Current->Msg.message == WM_MOUSEMOVE) && MessageQueue->MouseMoveMsg)
&Current->ListEntry); {
/* we do not hold more than one WM_MOUSEMOVE message in the queue */
MessageQueue->MouseMoveMsg->Msg = Current->Msg;
*Message = MessageQueue->MouseMoveMsg;
ExFreePool(Current);
}
else
{
InsertTailList(&MessageQueue->HardwareMessagesListHead,
&Current->ListEntry);
if(Current->Msg.message == WM_MOUSEMOVE)
{
MessageQueue->MouseMoveMsg = Current;
}
}
IntUnLockHardwareMessageQueue(MessageQueue); IntUnLockHardwareMessageQueue(MessageQueue);
} }
IntUnLockSystemHardwareMessageQueueLock(FALSE); IntUnLockSystemHardwareMessageQueueLock(FALSE);