Return NULL only in error case

svn path=/trunk/; revision=9248
This commit is contained in:
Gé van Geldorp 2004-04-29 21:17:36 +00:00
parent edbeb9c88b
commit e9a87d53bd

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: window.c,v 1.220 2004/04/24 14:21:36 weiden Exp $ /* $Id: window.c,v 1.221 2004/04/29 21:17:36 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS kernel * PROJECT: ReactOS kernel
@ -206,25 +206,23 @@ IntWinListChildren(PWINDOW_OBJECT Window)
for (Child = Window->FirstChild; Child; Child = Child->NextSibling) for (Child = Window->FirstChild; Child; Child = Child->NextSibling)
++NumChildren; ++NumChildren;
if (NumChildren != 0) List = ExAllocatePoolWithTag(PagedPool, (NumChildren + 1) * sizeof(HWND), TAG_WINLIST);
if(!List)
{ {
List = ExAllocatePoolWithTag(PagedPool, (NumChildren + 1) * sizeof(HWND), TAG_WINLIST); DPRINT1("Failed to allocate memory for children array\n");
if(!List) IntUnLockRelatives(Window);
{ SetLastWin32Error(ERROR_NOT_ENOUGH_MEMORY);
DPRINT1("Failed to allocate memory for children array\n"); return NULL;
IntUnLockRelatives(Window);
return NULL;
}
for (Child = Window->FirstChild, Index = 0;
Child != NULL;
Child = Child->NextSibling, ++Index)
List[Index] = Child->Self;
List[Index] = NULL;
} }
for (Child = Window->FirstChild, Index = 0;
Child != NULL;
Child = Child->NextSibling, ++Index)
List[Index] = Child->Self;
List[Index] = NULL;
IntUnLockRelatives(Window); IntUnLockRelatives(Window);
return (NumChildren > 0) ? List : NULL; return List;
} }
/*********************************************************************** /***********************************************************************