[PATCH v4 3/4] win32u: Allow select_item to work with off-screen menus

[Vladislav Timonin]

From: Vladislav Timonin

---
 dlls/user32/tests/menu.c |  6 ------
 dlls/win32u/menu.c       | 40 +++++++++++++++++++++++++---------------
 2 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c
index b00c403940f..9cd24141ad5 100644
--- a/dlls/user32/tests/menu.c
+++ b/dlls/user32/tests/menu.c
@@ -2578,11 +2578,8 @@ static void test_menu_hilitemenuitem( void )
     ok(GetLastError() == 0xdeadbeef,
       "HiliteMenuItem: expected error 0xdeadbeef, got: %ld\n", GetLastError());

-    todo_wine
-    {
     ok(GetMenuState(hPopupMenu, 1, MF_BYPOSITION) & MF_HILITE,
       "HiliteMenuItem: Item 2 is not hilited\n");
-    }

/* unhilite a menu item (by position) */

@@ -2603,11 +2600,8 @@ static void test_menu_hilitemenuitem( void )
     ok(GetLastError() == 0xdeadbeef,
       "HiliteMenuItem: expected error 0xdeadbeef, got: %ld\n", GetLastError());

-    todo_wine
-    {
     ok(GetMenuState(hPopupMenu, 2, MF_BYPOSITION) & MF_HILITE,
       "HiliteMenuItem: Item 3 is not hilited\n");
-    }

/* unhilite a menu item (by command) */

diff --git a/dlls/win32u/menu.c b/dlls/win32u/menu.c
index 7bc017b28df..50ff451bf3e 100644
--- a/dlls/win32u/menu.c
+++ b/dlls/win32u/menu.c
@@ -3155,15 +3155,17 @@ static void ensure_menu_item_visible( struct menu *menu, UINT index, HDC hdc )
 static void clear_item_hilite(HWND owner, HMENU hmenu)
 {
     struct menu *menu;
-    HDC hdc;
+    HDC hdc = NULL;

TRACE( "owner %p menu %p\n", owner, hmenu);

menu = unsafe_menu_ptr( hmenu );
-    if (!menu || !menu->nItems || !menu->hWnd || menu->FocusedItem == NO_SELECTED_ITEM) return;
+    if (!menu || !menu->nItems || menu->FocusedItem == NO_SELECTED_ITEM) return;

menu->items[menu->FocusedItem].fState &= ~(MF_HILITE | MF_MOUSESELECT);

+    if (!menu->hWnd) return;
+
     if (menu->wFlags & MF_POPUP) hdc = NtUserGetDC( menu->hWnd );
     else hdc = NtUserGetDCEx( menu->hWnd, 0, DCX_CACHE | DCX_WINDOW);

@@ -3178,24 +3180,27 @@ static void clear_item_hilite(HWND owner, HMENU hmenu)
 static void select_item( HWND owner, HMENU hmenu, UINT index, BOOL send_select, HMENU topmenu )
 {
     struct menu *menu;
-    HDC hdc;
+    HDC hdc = NULL;

TRACE( "owner %p menu %p index 0x%04x select 0x%04x\n", owner, hmenu, index, send_select );

menu = unsafe_menu_ptr( hmenu );
-    if (!menu || !menu->nItems || !menu->hWnd) return;
+    if (!menu || !menu->nItems) return;

if (menu->FocusedItem == index) return;
-    if (menu->wFlags & MF_POPUP) hdc = NtUserGetDC( menu->hWnd );
-    else hdc = NtUserGetDCEx( menu->hWnd, 0, DCX_CACHE | DCX_WINDOW);
-    if (!top_popup)
+    if (menu->hWnd)
+    {
+        if (menu->wFlags & MF_POPUP) hdc = NtUserGetDC( menu->hWnd );
+        else hdc = NtUserGetDCEx( menu->hWnd, 0, DCX_CACHE | DCX_WINDOW);
+
+        NtGdiSelectFont( hdc, get_menu_font( FALSE ));
+    }
+    if (!top_popup && menu->hWnd)
     {
         top_popup = menu->hWnd;
         top_popup_hmenu = hmenu;
     }

-    NtGdiSelectFont( hdc, get_menu_font( FALSE ));
-
     /* Clear previous highlighted item */
     clear_item_hilite(owner, hmenu);

@@ -3206,11 +3211,14 @@ static void select_item( HWND owner, HMENU hmenu, UINT index, BOOL send_select,
         if (!(menu->items[index].fType & MF_SEPARATOR))
         {
             menu->items[index].fState |= MF_HILITE;
-            ensure_menu_item_visible( menu, index, hdc );
-            draw_menu_item( menu->hWnd, menu, owner, hdc, &menu->items[index],
-                            !(menu->wFlags & MF_POPUP), ODA_SELECT );
+            if (menu->hWnd)
+            {
+                ensure_menu_item_visible( menu, index, hdc );
+                draw_menu_item( menu->hWnd, menu, owner, hdc, &menu->items[index],
+                                !(menu->wFlags & MF_POPUP), ODA_SELECT );
+            }
         }
-        if (send_select)
+        if (send_select && menu->hWnd)
         {
             struct menu_item *ip = &menu->items[menu->FocusedItem];
             send_message( owner, WM_MENUSELECT,
@@ -3219,7 +3227,7 @@ static void select_item( HWND owner, HMENU hmenu, UINT index, BOOL send_select,
                           (LPARAM)hmenu );
         }
     }
-    else if (send_select)
+    else if (send_select && menu->hWnd)
     {
         if (topmenu)
         {
@@ -3234,7 +3242,9 @@ static void select_item( HWND owner, HMENU hmenu, UINT index, BOOL send_select,
             }
         }
     }
-    NtUserReleaseDC( menu->hWnd, hdc );
+
+    if (hdc)
+        NtUserReleaseDC( menu->hWnd, hdc );
 }

/***********************************************************************