[Win32k|User32]

[reactos.git] / reactos / subsystems / win32 / win32k / include / menu.h

diff --git a/reactos/subsystems/win32/win32k/include/menu.h b/reactos/subsystems/win32/win32k/include/menu.h
index 450a6ee..94d7106 100644 (file)
--- a/reactos/subsystems/win32/win32k/include/menu.h
+++ b/reactos/subsystems/win32/win32k/include/menu.h
@@ -1,5 +1,4 @@
-#ifndef _WIN32K_MENU_H
-#define _WIN32K_MENU_H
+#pragma once
 
 #define IS_ATOM(x) \
   (((ULONG_PTR)(x) > 0x0) && ((ULONG_PTR)(x) < 0x10000))
@@ -23,12 +22,13 @@ typedef struct _MENU_ITEM
   ULONG_PTR dwItemData;
   UNICODE_STRING Text;
   HBITMAP hbmpItem;
-  RECT Rect;
-  UINT XTab;
+  RECTL Rect;
+  UINT dxTab;
 } MENU_ITEM, *PMENU_ITEM;
 
 typedef struct _MENU_OBJECT
 {
+  PROCDESKHEAD head;
   PEPROCESS Process;
   LIST_ENTRY ListEntry;
   PMENU_ITEM MenuItemList;
@@ -40,7 +40,7 @@ typedef struct _SETMENUITEMRECT
 {
   UINT uItem;
   BOOL fByPosition;
-  RECT rcRect;
+  RECTL rcRect;
 } SETMENUITEMRECT, *PSETMENUITEMRECT;
 
 PMENU_OBJECT FASTCALL
@@ -77,9 +77,6 @@ IntSetMenuContextHelpId(PMENU_OBJECT MenuObject, DWORD dwContextHelpId);
 BOOL FASTCALL
 IntGetMenuInfo(PMENU_OBJECT MenuObject, PROSMENUINFO lpmi);
 
-BOOL FASTCALL
-IntIsMenu(HMENU hMenu);
-
 BOOL FASTCALL
 IntSetMenuInfo(PMENU_OBJECT MenuObject, PROSMENUINFO lpmi);
 
@@ -95,12 +92,12 @@ DWORD FASTCALL
 IntCheckMenuItem(PMENU_OBJECT MenuObject, UINT uIDCheckItem, UINT uCheck);
 
 BOOL FASTCALL
-IntSetMenuItemRect(PMENU_OBJECT MenuObject, UINT Item, BOOL fByPos, RECT *rcRect);
+IntSetMenuItemRect(PMENU_OBJECT MenuObject, UINT Item, BOOL fByPos, RECTL *rcRect);
 
 DWORD APIENTRY UserInsertMenuItem(HMENU hMenu, UINT uItem, BOOL fByPosition, LPCMENUITEMINFOW lpmii);
 
 BOOL FASTCALL
-IntCleanupMenus(struct _EPROCESS *Process, PW32PROCESS Win32Process);
+IntCleanupMenus(struct _EPROCESS *Process, PPROCESSINFO Win32Process);
 
 BOOL FASTCALL
 IntInsertMenuItem(PMENU_OBJECT MenuObject, UINT uItem, BOOL fByPosition,
@@ -112,5 +109,3 @@ InitMenuImpl(VOID);
 
 NTSTATUS FASTCALL
 CleanupMenuImpl(VOID);
-
-#endif /* _WIN32K_MENU_H */