Fabian Maurer : user32/menu: Release menu in HiliteMenuItem() to avoid deadlock.
Alexandre Julliard
julliard at winehq.org
Fri Jul 20 12:14:32 CDT 2018
Module: wine
Branch: master
Commit: a9ac425a903968f74f074eba06863b913ba7dffc
URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9ac425a903968f74f074eba06863b913ba7dffc
Author: Fabian Maurer <dark.shadow4 at web.de>
Date: Fri Jul 20 16:29:43 2018 +0200
user32/menu: Release menu in HiliteMenuItem() to avoid deadlock.
MENU_SelectItem sends a message, and we must not hold the lock when
that happens
Signed-off-by: Fabian Maurer <dark.shadow4 at web.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/menu.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index bae4500..3b1e3f2 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -3859,17 +3859,23 @@ BOOL WINAPI HiliteMenuItem( HWND hWnd, HMENU hMenu, UINT wItemID,
{
POPUPMENU *menu;
UINT pos;
+ HMENU handle_menu;
+ UINT focused_item;
TRACE("(%p, %p, %04x, %04x);\n", hWnd, hMenu, wItemID, wHilite);
if (!(menu = find_menu_item(hMenu, wItemID, wHilite, &pos))) return FALSE;
- if (menu->FocusedItem != pos)
+ handle_menu = menu->obj.handle;
+ focused_item = menu->FocusedItem;
+ release_menu_ptr(menu);
+
+ if (focused_item != pos)
{
- MENU_HideSubPopups( hWnd, menu->obj.handle, FALSE, 0 );
- MENU_SelectItem( hWnd, menu->obj.handle, pos, TRUE, 0 );
+ MENU_HideSubPopups( hWnd, handle_menu, FALSE, 0 );
+ MENU_SelectItem( hWnd, handle_menu, pos, TRUE, 0 );
}
- release_menu_ptr(menu);
+
return TRUE;
}
More information about the wine-cvs
mailing list