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

fixed a crash caused by removing a message twice from the queue

Browse source 
svn path=/trunk/; revision=8903
This commit is contained in:
Thomas Bluemel 2004-03-28 16:21:58 +00:00
parent bdaa4495d0
commit 352d841f3b
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
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.77 2004/03/23 22:24:27 weiden Exp $ /* $Id: msgqueue.c,v 1.78 2004/03/28 16:21:58 weiden Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -385,11 +385,10 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
{ {
/* we do not hold more than one WM_MOUSEMOVE message in the queue */ /* we do not hold more than one WM_MOUSEMOVE message in the queue */
Window->MessageQueue->MouseMoveMsg->Msg = Message->Msg; Window->MessageQueue->MouseMoveMsg->Msg = Message->Msg;
if(RemoveWhenFreed) if(RemoveWhenFreed && FromGlobalQueue)
{ {
RemoveEntryList(&Message->ListEntry); RemoveEntryList(&Message->ListEntry);
} }
ExFreePool(Message);
*Freed = TRUE; *Freed = TRUE;
} }
else else
@ -403,6 +402,10 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
*Freed = FALSE; *Freed = FALSE;
} }
IntUnLockHardwareMessageQueue(Window->MessageQueue); IntUnLockHardwareMessageQueue(Window->MessageQueue);
if(*Freed)
{
ExFreePool(Message);
}
KeSetEvent(&Window->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); KeSetEvent(&Window->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE);
IntReleaseWindowObject(Window); IntReleaseWindowObject(Window);
return(FALSE); return(FALSE);
@ -420,7 +423,6 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
{ {
RemoveEntryList(&Message->ListEntry); RemoveEntryList(&Message->ListEntry);
} }
ExFreePool(Message);
*Freed = TRUE; *Freed = TRUE;
} }
else else
@ -434,6 +436,10 @@ MsqTranslateMouseMessage(HWND hWnd, UINT FilterLow, UINT FilterHigh,
*Freed = FALSE; *Freed = FALSE;
} }
IntUnLockHardwareMessageQueue(Window->MessageQueue); IntUnLockHardwareMessageQueue(Window->MessageQueue);
if(*Freed)
{
ExFreePool(Message);
}
KeSetEvent(&Window->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE); KeSetEvent(&Window->MessageQueue->NewMessages, IO_NO_INCREMENT, FALSE);
IntReleaseWindowObject(Window); IntReleaseWindowObject(Window);
return(FALSE); return(FALSE);