[PATCH v2 2/4] win32u: Add deselect to HiliteMenuItem

[Vladislav Timonin]

From: Vladislav Timonin

---
 dlls/win32u/menu.c | 47 +++++++++++++++++++++++++++++++++++++---------
 1 file changed, 38 insertions(+), 9 deletions(-)

diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c
index 3e42547650a..397fda2420d 100644
--- a/dlls/win32u/menu.c
+++ b/dlls/win32u/menu.c
@@ -3152,6 +3152,35 @@ static void ensure_menu_item_visible( struct menu *menu, UINT index, HDC hdc )
     }
 }

+static void deselect_item(HWND owner, HMENU hmenu)
+{
+    struct menu *menu;
+    HDC hdc;
+
+    TRACE( "owner %p menu %p\n", owner, hmenu);
+
+    menu = unsafe_menu_ptr( hmenu );
+    if (!menu || !menu->nItems || !menu->hWnd)
+        return;
+
+    if (menu->wFlags & MF_POPUP)
+        hdc = NtUserGetDCEx( menu->hWnd, 0, DCX_USESTYLE );
+    else
+        hdc = NtUserGetDCEx( menu->hWnd, 0, DCX_CACHE | DCX_WINDOW );
+
+    NtGdiSelectFont( hdc, get_menu_font( FALSE ) );
+
+    if (menu->FocusedItem != NO_SELECTED_ITEM)
+    {
+        menu->items[menu->FocusedItem].fState &= ~(MF_HILITE | MF_MOUSESELECT);
+        draw_menu_item( menu->hWnd, menu, owner, hdc, &menu->items[menu->FocusedItem],
+                        !(menu->wFlags & MF_POPUP), ODA_SELECT );
+        menu->FocusedItem = NO_SELECTED_ITEM;
+    }
+
+    NtUserReleaseDC( menu->hWnd, hdc );
+}
+
 static void select_item( HWND owner, HMENU hmenu, UINT index, BOOL send_select, HMENU topmenu )
 {
     struct menu *menu;
@@ -3174,12 +3203,7 @@ static void select_item( HWND owner, HMENU hmenu, UINT index, BOOL send_select,
     NtGdiSelectFont( hdc, get_menu_font( FALSE ));

/* Clear previous highlighted item */
-    if (menu->FocusedItem != NO_SELECTED_ITEM)
-    {
-        menu->items[menu->FocusedItem].fState &= ~(MF_HILITE|MF_MOUSESELECT);
-        draw_menu_item( menu->hWnd, menu, owner, hdc, &menu->items[menu->FocusedItem],
-                        !(menu->wFlags & MF_POPUP), ODA_SELECT );
-    }
+    deselect_item(owner, hmenu);

/* Highlight new item (if any) */
     menu->FocusedItem = index;
@@ -4556,11 +4580,16 @@ BOOL WINAPI NtUserHiliteMenuItem( HWND hwnd, HMENU handle, UINT item, UINT hilit
     focused_item = menu->FocusedItem;
     release_menu_ptr(menu);

-    if (focused_item != pos)
+    if ((hilite & MF_HILITE))
     {
-        hide_sub_popups( hwnd, handle_menu, FALSE, 0 );
-        select_item( hwnd, handle_menu, pos, TRUE, 0 );
+        if (focused_item != pos)
+        {
+            hide_sub_popups( hwnd, handle_menu, FALSE, 0 );
+            select_item( hwnd, handle_menu, pos, TRUE, 0 );
+        }
     }
+    else /* MF_UNHILITE */
+        deselect_item( hwnd, handle_menu );

return TRUE;
 }