Sync with trunk r63174.

[reactos.git] / win32ss / user / ntuser / menu.h

diff --git a/win32ss/user/ntuser/menu.h b/win32ss/user/ntuser/menu.h
index 1ca1274..9ff6b0c 100644 (file)
--- a/win32ss/user/ntuser/menu.h
+++ b/win32ss/user/ntuser/menu.h
@@ -10,32 +10,6 @@
 #define MF_END             (0x0080)
 #endif
 
-typedef struct _MENU_ITEM
-{
-  struct _MENU_ITEM *Next;
-  UINT fType;
-  UINT fState;
-  UINT wID;
-  HMENU hSubMenu;
-  HBITMAP hbmpChecked;
-  HBITMAP hbmpUnchecked;
-  ULONG_PTR dwItemData;
-  UNICODE_STRING Text;
-  HBITMAP hbmpItem;
-  RECTL Rect;
-  UINT dxTab;
-} MENU_ITEM, *PMENU_ITEM;
-
-typedef struct _MENU_OBJECT
-{
-  PROCDESKHEAD head;
-  PEPROCESS Process;
-  LIST_ENTRY ListEntry;
-  PMENU_ITEM MenuItemList;
-  ROSMENUINFO MenuInfo;
-  BOOL RtoL;
-} MENU_OBJECT, *PMENU_OBJECT;
-
 typedef struct _SETMENUITEMRECT
 {
   UINT uItem;
@@ -43,33 +17,34 @@ typedef struct _SETMENUITEMRECT
   RECTL rcRect;
 } SETMENUITEMRECT, *PSETMENUITEMRECT;
 
-PMENU_OBJECT FASTCALL
+PMENU FASTCALL
 IntGetMenuObject(HMENU hMenu);
 
 #define IntReleaseMenuObject(MenuObj) \
   UserDereferenceObject(MenuObj)
 
 BOOL FASTCALL
-IntDestroyMenuObject(PMENU_OBJECT MenuObject, BOOL bRecurse, BOOL RemoveFromProcess);
+IntDestroyMenuObject(PMENU MenuObject, BOOL bRecurse, BOOL RemoveFromProcess);
 
-PMENU_OBJECT FASTCALL
-IntCloneMenu(PMENU_OBJECT Source);
+PMENU FASTCALL
+IntCloneMenu(PMENU Source);
 
 int FASTCALL
-IntGetMenuItemByFlag(PMENU_OBJECT MenuObject, UINT uSearchBy, UINT fFlag,
-                     PMENU_OBJECT *SubMenu, PMENU_ITEM *MenuItem,
-                     PMENU_ITEM *PrevMenuItem);
+IntGetMenuItemByFlag(PMENU MenuObject, UINT uSearchBy, UINT fFlag,
+                     PMENU *SubMenu, PITEM *MenuItem,
+                     PITEM *PrevMenuItem);
 
 BOOL FASTCALL
 IntCleanupMenus(struct _EPROCESS *Process, PPROCESSINFO Win32Process);
 
 BOOL FASTCALL
-IntInsertMenuItem(_In_ PMENU_OBJECT MenuObject, UINT uItem, BOOL fByPosition,
+IntInsertMenuItem(_In_ PMENU MenuObject, UINT uItem, BOOL fByPosition,
                   PROSMENUITEMINFO ItemInfo);
 
-PMENU_OBJECT FASTCALL
+PMENU FASTCALL
 IntGetSystemMenu(PWND Window, BOOL bRevert, BOOL RetMenu);
 
 UINT FASTCALL IntFindSubMenu(HMENU *hMenu, HMENU hSubTarget );
 UINT FASTCALL IntGetMenuState( HMENU hMenu, UINT uId, UINT uFlags);
-
+BOOL FASTCALL IntRemoveMenuItem(PMENU Menu, UINT uPosition, UINT uFlags, BOOL bRecurse);
+PITEM MENU_FindItem( PMENU *pmenu, UINT *nPos, UINT wFlags );