commit 329072dcab9654906c4078a17445e2c7a91e9ca9
author Eric Kohl <ekohl@abo.rhein-zeitung.de> Sat Oct 24 10:46:10 1998 +0000
committer Alexandre Julliard <julliard@winehq.org> Sat Oct 24 10:46:10 1998 +0000
tree e3e386f755efd8fa08ccedbbfff34fc53acfa11a
parent d0b79c0886e2bd8f9a9d8f3c57182f9084a19e2d

Fixed a popup menu selection bug.

controls/menu.c

diff --git a/controls/menu.c b/controls/menu.c
index abefac9..682fe20 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -3895,13 +3895,18 @@
 {
     POPUPMENU *menu;
 
-    if (!(menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hmenu))) return 0; /*FIXME*/
+    if (!(menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hmenu)))
+	return -1;
 
     FIXME(menu, "(0x%x,%d,%d), stub!\n", hmenu, bypos, flags);
     if (bypos & MF_BYPOSITION)
     	return menu->defitem;
-    else
-    	return menu->items[menu->defitem].wID;
+    else {
+	FIXME (menu, "default item 0x%x\n", menu->defitem);
+	if ((menu->defitem > 0) && (menu->defitem < menu->nItems))
+	    return menu->items[menu->defitem].wID;
+    }
+    return -1;
 }
 
 /*******************************************************************