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

IntGetParentObject() does it's own locking, prevent double lock

Browse source 
svn path=/trunk/; revision=8937
This commit is contained in:
Gé van Geldorp 2004-03-31 19:20:18 +00:00
parent 21beea176d
commit dfa957c310
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/subsys/win32k/ntuser/window.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: window.c,v 1.205 2004/03/31 18:37:12 gvg Exp $
/* $Id: window.c,v 1.206 2004/03/31 19:20:18 gvg Exp $
*
* COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel
@ -2616,7 +2616,6 @@ NtUserGetWindow(HWND hWnd, UINT Relationship)
return NULL;
}
IntLockRelatives(WindowObject);
switch (Relationship)
{
case GW_HWNDFIRST:
@ -2642,28 +2641,35 @@ NtUserGetWindow(HWND hWnd, UINT Relationship)
break;
case GW_HWNDNEXT:
IntLockRelatives(WindowObject);
if (WindowObject->NextSibling)
hWndResult = WindowObject->NextSibling->Self;
IntUnLockRelatives(WindowObject);
break;
case GW_HWNDPREV:
IntLockRelatives(WindowObject);
if (WindowObject->PrevSibling)
hWndResult = WindowObject->PrevSibling->Self;
IntUnLockRelatives(WindowObject);
break;
case GW_OWNER:
IntLockRelatives(WindowObject);
if((Parent = IntGetWindowObject(WindowObject->Owner)))
{
hWndResult = Parent->Self;
IntReleaseWindowObject(Parent);
}
IntUnLockRelatives(WindowObject);
break;
case GW_CHILD:
IntLockRelatives(WindowObject);
if (WindowObject->FirstChild)
hWndResult = WindowObject->FirstChild->Self;
IntUnLockRelatives(WindowObject);
break;
}
IntUnLockRelatives(WindowObject);
IntReleaseWindowObject(WindowObject);