commit 4925186bb2fd4e0d3a985c3e9b027189f9564f93
author Juergen Schmied <juergen.schmied@pop3.pop.debitel.net> Thu May 13 18:42:03 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu May 13 18:42:03 1999 +0000
tree 81b093fea8aebd0331214947ac082020f417aad6
parent 0a277b638cb0ea0ce565782abcb8d71e398d78eb

- prevent crash when GetMenuDefaultItem is called on empty menu
- set default item on system menu

controls/menu.c

diff --git a/controls/menu.c b/controls/menu.c
index c2534fa..9035912 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -279,6 +279,7 @@
     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 @@
 
 	/* find default item */
 	item = menu->items;
+	
+	/* empty menu */
+	if (! item) return -1;
+	
 	while ( !( item->fState & MFS_DEFAULT ) )
 	{
 	    i++; item++;