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

Revert previous change to dialog.c and fix the problem at it's root,

Browse source 
in EnumChildWindows. Thanks to Thomas Weidenmueller.

svn path=/trunk/; revision=6101
This commit is contained in:
Gé van Geldorp 2003-09-20 19:52:23 +00:00
parent 0504e0cffa
commit b2869f7a74
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/lib/user32/windows/dialog.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: dialog.c,v 1.18 2003/09/20 19:24:11 gvg Exp $ /* $Id: dialog.c,v 1.19 2003/09/20 19:52:23 gvg Exp $
* *
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
* FILE: lib/user32/windows/dialog.c * FILE: lib/user32/windows/dialog.c
@ -1699,7 +1699,7 @@ GetDlgItem(
GETDLGITEMINFO info; GETDLGITEMINFO info;
info.nIDDlgItem = nIDDlgItem; info.nIDDlgItem = nIDDlgItem;
info.control = 0; info.control = 0;
if(hDlg && EnumChildWindows(hDlg, (ENUMWINDOWSPROC)&GetDlgItemEnumProc, (LPARAM)&info)) if(hDlg && !EnumChildWindows(hDlg, (ENUMWINDOWSPROC)&GetDlgItemEnumProc, (LPARAM)&info))
return info.control; return info.control;
else else
return 0; return 0;

7
reactos/lib/user32/windows/window.c
View file

@ -1,4 +1,4 @@
/* $Id: window.c,v 1.72 2003/09/13 13:58:38 weiden Exp $ /* $Id: window.c,v 1.73 2003/09/20 19:52:23 gvg Exp $
* *
* COPYRIGHT: See COPYING in the top level directory * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
@ -844,7 +844,10 @@ User32EnumWindows (
if ( !(ULONG)pHwnd[i] ) /* don't enumerate a NULL HWND */ if ( !(ULONG)pHwnd[i] ) /* don't enumerate a NULL HWND */
continue; continue;
if ( !(*lpfn)( pHwnd[i], lParam ) ) if ( !(*lpfn)( pHwnd[i], lParam ) )
break; {
HeapFree ( hHeap, 0, pHwnd );
return FALSE;
}
} }
if ( pHwnd ) if ( pHwnd )
HeapFree ( hHeap, 0, pHwnd ); HeapFree ( hHeap, 0, pHwnd );