Jacek Caban : user32: Use GetMenuInfo for IsMenu implementation.
Alexandre Julliard
julliard at winehq.org
Mon May 2 16:02:10 CDT 2022
Module: wine
Branch: master
Commit: 926f5bb416b77b1d479a71a8d18fc10204fc46d0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=926f5bb416b77b1d479a71a8d18fc10204fc46d0
Author: Jacek Caban <jacek at codeweavers.com>
Date: Fri Apr 29 22:25:17 2022 +0200
user32: Use GetMenuInfo for IsMenu implementation.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/user32/menu.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index cc6c5c953e9..cf68aaff31b 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -4482,19 +4482,16 @@ HMENU WINAPI LoadMenuIndirectA( LPCVOID template )
/**********************************************************************
* IsMenu (USER32.@)
*/
-BOOL WINAPI IsMenu(HMENU hmenu)
+BOOL WINAPI IsMenu( HMENU menu )
{
- POPUPMENU *menu;
- BOOL is_menu;
-
- menu = grab_menu_ptr(hmenu);
- is_menu = menu != NULL;
- release_menu_ptr(menu);
+ MENUINFO info;
- if (!is_menu)
- SetLastError(ERROR_INVALID_MENU_HANDLE);
+ info.cbSize = sizeof(info);
+ info.fMask = 0;
+ if (GetMenuInfo( menu, &info )) return TRUE;
- return is_menu;
+ SetLastError(ERROR_INVALID_MENU_HANDLE);
+ return FALSE;
}
/**********************************************************************
More information about the wine-cvs
mailing list