From 728d5736d944a8cc56cdba253298ff354999fb10 Mon Sep 17 00:00:00 2001 From: Serge Gautherie Date: Sun, 13 Aug 2023 21:47:01 +0200 Subject: [PATCH] [NTUSER][USER32] Remove 4 remnant defines (#5572) IS_SYSTEM_MENU(): "moved" to ntuser on 6dfa71c (r68904). IS_SYSTEM_POPUP(): uselessly added on 6fc29cc (r8195). IS_BITMAP_ITEM(): uses removed on 07b6ddc (r23221). uselessly copied to ntuser on 6dfa71c (r68904). --- win32ss/user/ntuser/menu.c | 2 -- win32ss/user/user32/windows/menu.c | 8 -------- 2 files changed, 10 deletions(-) diff --git a/win32ss/user/ntuser/menu.c b/win32ss/user/ntuser/menu.c index 01740c9c23e..ebade16f1b7 100644 --- a/win32ss/user/ntuser/menu.c +++ b/win32ss/user/ntuser/menu.c @@ -60,8 +60,6 @@ BOOL fInEndMenu = FALSE; #define IS_SYSTEM_MENU(MenuInfo) \ (!((MenuInfo)->fFlags & MNF_POPUP) && ((MenuInfo)->fFlags & MNF_SYSMENU)) -#define IS_BITMAP_ITEM(flags) (MF_BITMAP == MENU_ITEM_TYPE(flags)) - #define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && ((INT_PTR)(id) >= -1)) #define IS_STRING_ITEM(flags) (MF_STRING == MENU_ITEM_TYPE(flags)) diff --git a/win32ss/user/user32/windows/menu.c b/win32ss/user/user32/windows/menu.c index 59c687f4c3a..0d20c780981 100644 --- a/win32ss/user/user32/windows/menu.c +++ b/win32ss/user/user32/windows/menu.c @@ -42,14 +42,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(menu); #define IS_STRING_ITEM(flags) (MF_STRING == MENU_ITEM_TYPE(flags)) #define IS_MAGIC_BITMAP(id) ((id) && ((INT_PTR)(id) < 12) && ((INT_PTR)(id) >= -1)) -#define IS_SYSTEM_MENU(MenuInfo) \ - (0 == ((MenuInfo)->fFlags & MNF_POPUP) && 0 != ((MenuInfo)->fFlags & MNF_SYSMENU)) - -#define IS_SYSTEM_POPUP(MenuInfo) \ - (0 != ((MenuInfo)->fFlags & MNF_POPUP) && 0 != ((MenuInfo)->fFlags & MNF_SYSMENU)) - -#define IS_BITMAP_ITEM(flags) (MF_BITMAP == MENU_ITEM_TYPE(flags)) - /********************************************************************* * PopupMenu class descriptor */