[PATCH v3 4/5] win32u: Reset focused item if it was removed when removing a menu item

[Vladislav Timonin]

From: Vladislav Timonin

---
 dlls/user32/tests/menu.c | 17 +++++++++++++++++
 dlls/win32u/menu.c       |  4 ++++
 2 files changed, 21 insertions(+)

diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c
index 9cd24141ad5..f6b37365209 100644
--- a/dlls/user32/tests/menu.c
+++ b/dlls/user32/tests/menu.c
@@ -2614,6 +2614,23 @@ static void test_menu_hilitemenuitem( void )
     ok(!(GetMenuState(hPopupMenu, 2, MF_BYPOSITION) & MF_HILITE),
       "HiliteMenuItem: Item 3 is hilited\n");

+    /* deleting an off-screen menu item doesn't reset hilite */
+
+    SetLastError(0xdeadbeef);
+    ok(HiliteMenuItem(hWnd, hPopupMenu, 0, MF_HILITE | MF_BYPOSITION),
+      "HiliteMenuItem: call should not have failed.\n");
+    ok(GetLastError() == 0xdeadbeef,
+      "HiliteMenuItem: expected error 0xdeadbeef, got: %ld\n", GetLastError());
+    ok(GetMenuState(hPopupMenu, 0, MF_BYPOSITION) & MF_HILITE,
+      "HiliteMenuItem: Item 1 is not hilited\n");
+
+    ok(DeleteMenu(hPopupMenu, 2, MF_BYPOSITION),
+      "DeleteMenu: call should have succeeded.\n");
+    ok(GetMenuState(hPopupMenu, 0, MF_BYPOSITION) & MF_HILITE,
+      "HiliteMenuItem: Item 1 is not hilited\n");
+    ok(!(GetMenuState(hPopupMenu, 1, MF_BYPOSITION) & MF_HILITE),
+      "HiliteMenuItem: Item 2 is hilited\n");
+
     DestroyWindow(hWnd);
 }

diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c
index a0fb851bb87..706c63b39c4 100644
--- a/dlls/win32u/menu.c
+++ b/dlls/win32u/menu.c
@@ -1370,11 +1370,15 @@ BOOL WINAPI NtUserRemoveMenu( HMENU handle, UINT id, UINT flags )
     {
         free( menu->items );
         menu->items = NULL;
+        menu->FocusedItem = NO_SELECTED_ITEM;
     }
     else
     {
         struct menu_item *new_items, *item = &menu->items[pos];

+        if (menu->FocusedItem >= menu->nItems)
+            menu->FocusedItem = NO_SELECTED_ITEM;
+
         while (pos < menu->nItems)
         {
             *item = item[1];