user32: Reimplement GetMenuContextHelpId on top of GetMenuInfo.

Signed-off-by: Jacek Caban <jacek@codeweavers.com>

user32: Reimplement GetMenuContextHelpId on top of GetMenuInfo.
eda3732a · Jacek Caban · Alexandre Julliard · d4b8ca78 · eda3732a
Commit eda3732a authored Jun 11, 2022 by Jacek Caban Committed by Alexandre Julliard Jun 14, 2022
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 13 deletions

menu.c dlls/user32/menu.c +6 -13

No files found.
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -4309,20 +4309,13 @@ BOOL WINAPI GetMenuInfo( HMENU menu, MENUINFO *info )
 /**********************************************************************
 *         GetMenuContextHelpId    (USER32.@)
 */
-DWORD WINAPI GetMenuContextHelpId( HMENU hMenu )
+DWORD WINAPI GetMenuContextHelpId( HMENU menu )
 {
-    DWORD help_id = 0;
+    MENUINFO info;
-    POPUPMENU *menu;
+    TRACE( "(%p)\n", menu );
+    info.cbSize = sizeof(info);
-    TRACE("(%p)\n", hMenu);
+    info.fMask = MIM_HELPID;
+    return GetMenuInfo( menu, &info ) ? info.dwContextHelpID : 0;
-    if ((menu = grab_menu_ptr(hMenu)))
-    {
-        help_id = menu->dwContextHelpID;
-        release_menu_ptr(menu);
-    }
-    return help_id;
 }
 /**********************************************************************