Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed multiwin crashing win32k when closing the window with the child window

Browse source 
svn path=/trunk/; revision=6385
This commit is contained in:
Thomas Bluemel 2003-10-20 14:00:58 +00:00
parent 139847baad
commit a5ab15b6e3
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
reactos/subsys/win32k/ntuser/winpos.c
View file

@ -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: winpos.c,v 1.33 2003/10/18 17:35:44 navaraf Exp $
/* $Id: winpos.c,v 1.34 2003/10/20 14:00:58 weiden Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -1228,19 +1228,27 @@ WinPosSetActiveWindow(PWINDOW_OBJECT Window, BOOL Mouse, BOOL ChangeFocus)
if (PrevActive != NULL)
{
PWINDOW_OBJECT PrevActiveWindow = IntGetWindowObject(PrevActive);
WORD Iconised = HIWORD(PrevActiveWindow->Style & WS_MINIMIZE);
if (!IntSendMessage(PrevActive, WM_NCACTIVATE, FALSE, 0, TRUE))
{
/* FIXME: Check if the new window is system modal. */
return(FALSE);
}
IntSendMessage(PrevActive,
WM_ACTIVATE,
MAKEWPARAM(WA_INACTIVE, Iconised),
(LPARAM)Window->Self,
TRUE);
/* FIXME: Check if anything changed while processing the message. */
IntReleaseWindowObject(PrevActiveWindow);
if(PrevActiveWindow)
{
WORD Iconised = HIWORD(PrevActiveWindow->Style & WS_MINIMIZE);
if (!IntSendMessage(PrevActive, WM_NCACTIVATE, FALSE, 0, TRUE))
{
/* FIXME: Check if the new window is system modal. */
return(FALSE);
}
IntSendMessage(PrevActive,
WM_ACTIVATE,
MAKEWPARAM(WA_INACTIVE, Iconised),
(LPARAM)Window->Self,
TRUE);
/* FIXME: Check if anything changed while processing the message. */
IntReleaseWindowObject(PrevActiveWindow);
}
else
{
ActiveQueue->ActiveWindow = NULL;
PrevActive = NULL;
}
}
if (Window != NULL)