- prevent crash when GetMenuDefaultItem is called on empty menu

- set default item on system menu

- prevent crash when GetMenuDefaultItem is called on empty menu
4925186b · Juergen Schmied · Alexandre Julliard · 0a277b63 · 4925186b
Commit 4925186b authored May 13, 1999 by Juergen Schmied Committed by Alexandre Julliard May 13, 1999
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

menu.c controls/menu.c +5 -0

No files found.
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -279,6 +279,7 @@ static HMENU MENU_CopySysPopup(void)
    if( hMenu ) {
        POPUPMENU* menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hMenu);
        menu->wFlags |= MF_SYSMENU | MF_POPUP;
+	SetMenuDefaultItem(hMenu, SC_CLOSE, FALSE);
    }
    else {
 	hMenu = 0;
@@ -4395,6 +4396,10 @@ UINT WINAPI GetMenuDefaultItem(HMENU hmenu, UINT bypos, UINT flags)

 	/* find default item */
 	item = menu->items;
+	
+	/* empty menu */
+	if (! item) return -1;
+	
 	while ( !( item->fState & MFS_DEFAULT ) )
 	{
 	    i++; item++;