From 89ae96ff47106fdd3e5fb1c980b7c5d0cee6b980 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Sun, 26 Dec 2004 23:56:16 +0000 Subject: [PATCH] - Free all memory in error case of GetClassInfoExCommon. - Fix RegisterClassExA for menu-less window classes. svn path=/trunk/; revision=12353 --- reactos/lib/user32/windows/class.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/reactos/lib/user32/windows/class.c b/reactos/lib/user32/windows/class.c index 739396971ea..37b6a74821a 100644 --- a/reactos/lib/user32/windows/class.c +++ b/reactos/lib/user32/windows/class.c @@ -1,4 +1,4 @@ -/* $Id: class.c,v 1.55 2004/12/24 17:45:58 weiden Exp $ +/* $Id: class.c,v 1.56 2004/12/26 23:56:16 navaraf Exp $ * * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll @@ -86,6 +86,7 @@ static BOOL GetClassInfoExCommon( if ( !str3.Buffer ) { SetLastError (RtlNtStatusToDosError(STATUS_NO_MEMORY)); + HEAP_free ( str2.Buffer ); if ( !IS_ATOM(str) ) HEAP_free ( str ); return FALSE; @@ -438,7 +439,7 @@ RegisterClassExA(CONST WNDCLASSEXA *lpwcx) RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXW)); - if (IS_ATOM(lpwcx->lpszMenuName)) + if (IS_ATOM(lpwcx->lpszMenuName) || lpwcx->lpszMenuName == 0) { MenuName.Length = MenuName.MaximumLength = 0;