Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 01:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

Port the system message queue WM_MOUSEDOWN coalesce fix from win32k rewrite branch.

Browse source 
svn path=/trunk/; revision=18027
This commit is contained in:
Filip Navara 2005-09-24 17:34:09 +00:00
parent 5f8c990b41
commit ffb2fee46a
1 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
reactos/subsys/win32k/ntuser/msgqueue.c
View file

@ -42,7 +42,6 @@ static MSG SystemMessageQueue[SYSTEM_MESSAGE_QUEUE_SIZE];
static ULONG SystemMessageQueueHead = 0; static ULONG SystemMessageQueueHead = 0;
static ULONG SystemMessageQueueTail = 0; static ULONG SystemMessageQueueTail = 0;
static ULONG SystemMessageQueueCount = 0; static ULONG SystemMessageQueueCount = 0;
static ULONG SystemMessageQueueMouseMove = -1;
static KSPIN_LOCK SystemMessageQueueLock; static KSPIN_LOCK SystemMessageQueueLock;
static ULONG volatile HardwareMessageQueueStamp = 0; static ULONG volatile HardwareMessageQueueStamp = 0;
@ -148,45 +147,54 @@ MsqInsertSystemMessage(MSG* Msg)
{ {
LARGE_INTEGER LargeTickCount; LARGE_INTEGER LargeTickCount;
KIRQL OldIrql; KIRQL OldIrql;
ULONG mmov = (ULONG)-1; ULONG Prev;
KeQueryTickCount(&LargeTickCount);
Msg->time = LargeTickCount.u.LowPart;
IntLockSystemMessageQueue(OldIrql); IntLockSystemMessageQueue(OldIrql);
/* only insert WM_MOUSEMOVE messages if not already in system message queue */ /*
if(Msg->message == WM_MOUSEMOVE) * Bail out if the queue is full. FIXME: We should handle this case
mmov = SystemMessageQueueMouseMove; * more gracefully.
*/
if(mmov != (ULONG)-1) if (SystemMessageQueueCount == SYSTEM_MESSAGE_QUEUE_SIZE)
{ {
/* insert message at the queue head */ IntUnLockSystemMessageQueue(OldIrql);
while (mmov != SystemMessageQueueHead ) return;
{
ULONG prev = mmov ? mmov - 1 : SYSTEM_MESSAGE_QUEUE_SIZE - 1;
ASSERT((LONG) mmov >= 0);
ASSERT(mmov < SYSTEM_MESSAGE_QUEUE_SIZE);
SystemMessageQueue[mmov] = SystemMessageQueue[prev];
mmov = prev;
}
SystemMessageQueue[SystemMessageQueueHead] = *Msg;
} }
else
KeQueryTickCount(&LargeTickCount);
Msg->time = LargeTickCount.u.LowPart;
/*
* If we got WM_MOUSEMOVE and there are already messages in the
* system message queue, check if the last message is mouse move
* and if it is then just overwrite it.
*/
if (Msg->message == WM_MOUSEMOVE && SystemMessageQueueCount)
{ {
if (SystemMessageQueueCount == SYSTEM_MESSAGE_QUEUE_SIZE) if (SystemMessageQueueTail == 0)
Prev = SYSTEM_MESSAGE_QUEUE_SIZE - 1;
else
Prev = SystemMessageQueueTail - 1;
if (SystemMessageQueue[Prev].message == WM_MOUSEMOVE)
{ {
IntUnLockSystemMessageQueue(OldIrql); SystemMessageQueueTail = Prev;
return; SystemMessageQueueCount--;
} }
SystemMessageQueue[SystemMessageQueueTail] = *Msg;
if(Msg->message == WM_MOUSEMOVE)
SystemMessageQueueMouseMove = SystemMessageQueueTail;
SystemMessageQueueTail =
(SystemMessageQueueTail + 1) % SYSTEM_MESSAGE_QUEUE_SIZE;
SystemMessageQueueCount++;
} }
/*
* Actually insert the message into the system message queue.
*/
SystemMessageQueue[SystemMessageQueueTail] = *Msg;
SystemMessageQueueTail =
(SystemMessageQueueTail + 1) % SYSTEM_MESSAGE_QUEUE_SIZE;
SystemMessageQueueCount++;
IntUnLockSystemMessageQueue(OldIrql); IntUnLockSystemMessageQueue(OldIrql);
KeSetEvent(&HardwareMessageEvent, IO_NO_INCREMENT, FALSE); KeSetEvent(&HardwareMessageEvent, IO_NO_INCREMENT, FALSE);
} }
@ -583,11 +591,6 @@ co_MsqPeekHardwareMessage(PUSER_MESSAGE_QUEUE MessageQueue, HWND hWnd,
} }
IntLockSystemMessageQueue(OldIrql); IntLockSystemMessageQueue(OldIrql);
} }
/*
* we could set this to -1 conditionally if we find one, but
* this is more efficient and just as effective.
*/
SystemMessageQueueMouseMove = -1;
HardwareMessageQueueStamp++; HardwareMessageQueueStamp++;
IntUnLockSystemMessageQueue(OldIrql); IntUnLockSystemMessageQueue(OldIrql);