- Free all memory in error case of GetClassInfoExCommon.

- Fix RegisterClassExA for menu-less window classes.

svn path=/trunk/; revision=12353
This commit is contained in:
Filip Navara 2004-12-26 23:56:16 +00:00
parent f6f130ea4b
commit 89ae96ff47

View file

@ -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 * COPYRIGHT: See COPYING in the top level directory
* PROJECT: ReactOS user32.dll * PROJECT: ReactOS user32.dll
@ -86,6 +86,7 @@ static BOOL GetClassInfoExCommon(
if ( !str3.Buffer ) if ( !str3.Buffer )
{ {
SetLastError (RtlNtStatusToDosError(STATUS_NO_MEMORY)); SetLastError (RtlNtStatusToDosError(STATUS_NO_MEMORY));
HEAP_free ( str2.Buffer );
if ( !IS_ATOM(str) ) if ( !IS_ATOM(str) )
HEAP_free ( str ); HEAP_free ( str );
return FALSE; return FALSE;
@ -438,7 +439,7 @@ RegisterClassExA(CONST WNDCLASSEXA *lpwcx)
RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXW)); RtlCopyMemory(&WndClass, lpwcx, sizeof(WNDCLASSEXW));
if (IS_ATOM(lpwcx->lpszMenuName)) if (IS_ATOM(lpwcx->lpszMenuName) || lpwcx->lpszMenuName == 0)
{ {
MenuName.Length = MenuName.Length =
MenuName.MaximumLength = 0; MenuName.MaximumLength = 0;