Skip to content

W
wine-winehq
Commit 4925186b authored by Juergen Schmied's avatar Juergen Schmied Committed by Alexandre Julliard
Browse files
Options

- prevent crash when GetMenuDefaultItem is called on empty menu

- set default item on system menu
parent 0a277b63
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 0 deletions
controls/menu.c
View file @ 4925186b
...@@ -279,6 +279,7 @@ static HMENU MENU_CopySysPopup(void) ...@@ -279,6 +279,7 @@ static HMENU MENU_CopySysPopup(void)
if( hMenu ) { if( hMenu ) {
POPUPMENU* menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hMenu); POPUPMENU* menu = (POPUPMENU *) USER_HEAP_LIN_ADDR(hMenu);
menu->wFlags |= MF_SYSMENU | MF_POPUP; menu->wFlags |= MF_SYSMENU | MF_POPUP;
SetMenuDefaultItem(hMenu, SC_CLOSE, FALSE);
} }
else { else {
hMenu = 0; hMenu = 0;
...@@ -4395,6 +4396,10 @@ UINT WINAPI GetMenuDefaultItem(HMENU hmenu, UINT bypos, UINT flags) ...@@ -4395,6 +4396,10 @@ UINT WINAPI GetMenuDefaultItem(HMENU hmenu, UINT bypos, UINT flags)
/* find default item */ /* find default item */
item = menu->items; item = menu->items;
/* empty menu */
if (! item) return -1;
while ( !( item->fState & MFS_DEFAULT ) ) while ( !( item->fState & MFS_DEFAULT ) )
{ {
i++; item++; i++; item++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment