Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-31 00:28:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

- When adding new items into a submenu, they are placed incorrectly. Fix this.

Browse source 
svn path=/trunk/; revision=29727
This commit is contained in:
Aleksey Bragin 2007-10-21 09:08:04 +00:00
parent d4a661abf0
commit b54db7180d
2 changed files with 32 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
reactos/subsystems/win32/win32k/include/menu.h
View file

@ -86,7 +86,8 @@ IntSetMenuInfo(PMENU_OBJECT MenuObject, PROSMENUINFO lpmi);
int FASTCALL int FASTCALL
IntGetMenuItemByFlag(PMENU_OBJECT MenuObject, UINT uSearchBy, UINT fFlag, IntGetMenuItemByFlag(PMENU_OBJECT MenuObject, UINT uSearchBy, UINT fFlag,
PMENU_ITEM *MenuItem, PMENU_ITEM *PrevMenuItem); PMENU_OBJECT *SubMenu, PMENU_ITEM *MenuItem,
PMENU_ITEM *PrevMenuItem);
UINT FASTCALL UINT FASTCALL
IntEnableMenuItem(PMENU_OBJECT MenuObject, UINT uIDEnableItem, UINT uEnable); IntEnableMenuItem(PMENU_OBJECT MenuObject, UINT uIDEnableItem, UINT uEnable);

51
reactos/subsystems/win32/win32k/ntuser/menu.c
View file

@ -248,7 +248,7 @@ IntRemoveMenuItem(PMENU_OBJECT Menu, UINT uPosition, UINT uFlags,
BOOL bRecurse) BOOL bRecurse)
{ {
PMENU_ITEM PrevMenuItem, MenuItem; PMENU_ITEM PrevMenuItem, MenuItem;
if(IntGetMenuItemByFlag(Menu, uPosition, uFlags, &MenuItem, if(IntGetMenuItemByFlag(Menu, uPosition, uFlags, NULL, &MenuItem,
&PrevMenuItem) > -1) &PrevMenuItem) > -1)
{ {
if(MenuItem) if(MenuItem)
@ -566,7 +566,8 @@ IntSetMenuInfo(PMENU_OBJECT Menu, PROSMENUINFO lpmi)
int FASTCALL int FASTCALL
IntGetMenuItemByFlag(PMENU_OBJECT Menu, UINT uSearchBy, UINT fFlag, IntGetMenuItemByFlag(PMENU_OBJECT Menu, UINT uSearchBy, UINT fFlag,
PMENU_ITEM *MenuItem, PMENU_ITEM *PrevMenuItem) PMENU_OBJECT *SubMenu, PMENU_ITEM *MenuItem,
PMENU_ITEM *PrevMenuItem)
{ {
PMENU_ITEM PrevItem = NULL; PMENU_ITEM PrevItem = NULL;
PMENU_ITEM CurItem = Menu->MenuItemList; PMENU_ITEM CurItem = Menu->MenuItemList;
@ -611,18 +612,24 @@ IntGetMenuItemByFlag(PMENU_OBJECT Menu, UINT uSearchBy, UINT fFlag,
*MenuItem = CurItem; *MenuItem = CurItem;
if(PrevMenuItem) if(PrevMenuItem)
*PrevMenuItem = PrevItem; *PrevMenuItem = PrevItem;
if(SubMenu)
*SubMenu = Menu;
return p; return p;
} }
else if (0 != (CurItem->fType & MF_POPUP)) else
{ {
Menu = UserGetMenuObject(CurItem->hSubMenu); if(CurItem->fType & MF_POPUP)
if (NULL != Menu)
{ {
ret = IntGetMenuItemByFlag(Menu, uSearchBy, fFlag, PMENU_OBJECT NewMenu = UserGetMenuObject(CurItem->hSubMenu);
MenuItem, PrevMenuItem); if(Menu)
if (-1 != ret)
{ {
return ret; ret = IntGetMenuItemByFlag(NewMenu, uSearchBy, fFlag,
SubMenu, MenuItem, PrevMenuItem);
if(ret != -1)
{
return ret;
}
} }
} }
} }
@ -922,6 +929,7 @@ IntInsertMenuItem(PMENU_OBJECT MenuObject, UINT uItem, BOOL fByPosition,
{ {
int pos = (int)uItem; int pos = (int)uItem;
PMENU_ITEM MenuItem; PMENU_ITEM MenuItem;
PMENU_OBJECT SubMenu;
if (MAX_MENU_ITEMS <= MenuObject->MenuInfo.MenuItemCount) if (MAX_MENU_ITEMS <= MenuObject->MenuInfo.MenuItemCount)
{ {
@ -931,6 +939,7 @@ IntInsertMenuItem(PMENU_OBJECT MenuObject, UINT uItem, BOOL fByPosition,
if (fByPosition) if (fByPosition)
{ {
SubMenu = MenuObject;
/* calculate position */ /* calculate position */
if(MenuObject->MenuInfo.MenuItemCount < pos) if(MenuObject->MenuInfo.MenuItemCount < pos)
{ {
@ -939,7 +948,7 @@ IntInsertMenuItem(PMENU_OBJECT MenuObject, UINT uItem, BOOL fByPosition,
} }
else else
{ {
pos = IntGetMenuItemByFlag(MenuObject, uItem, MF_BYCOMMAND, NULL, NULL); pos = IntGetMenuItemByFlag(MenuObject, uItem, MF_BYCOMMAND, &SubMenu, NULL, NULL);
} }
if (pos < -1) if (pos < -1)
{ {
@ -963,7 +972,7 @@ IntInsertMenuItem(PMENU_OBJECT MenuObject, UINT uItem, BOOL fByPosition,
RtlInitUnicodeString(&MenuItem->Text, NULL); RtlInitUnicodeString(&MenuItem->Text, NULL);
MenuItem->hbmpItem = (HBITMAP)0; MenuItem->hbmpItem = (HBITMAP)0;
if (! IntSetMenuItemInfo(MenuObject, MenuItem, ItemInfo)) if(!IntSetMenuItemInfo(SubMenu, MenuItem, ItemInfo))
{ {
ExFreePool(MenuItem); ExFreePool(MenuItem);
return FALSE; return FALSE;
@ -972,7 +981,7 @@ IntInsertMenuItem(PMENU_OBJECT MenuObject, UINT uItem, BOOL fByPosition,
/* Force size recalculation! */ /* Force size recalculation! */
MenuObject->MenuInfo.Height = 0; MenuObject->MenuInfo.Height = 0;
pos = IntInsertMenuItemToList(MenuObject, MenuItem, pos); pos = IntInsertMenuItemToList(SubMenu, MenuItem, pos);
DPRINT("IntInsertMenuItemToList = %i\n", pos); DPRINT("IntInsertMenuItemToList = %i\n", pos);
@ -983,7 +992,7 @@ UINT FASTCALL
IntEnableMenuItem(PMENU_OBJECT MenuObject, UINT uIDEnableItem, UINT uEnable) IntEnableMenuItem(PMENU_OBJECT MenuObject, UINT uIDEnableItem, UINT uEnable)
{ {
PMENU_ITEM MenuItem; PMENU_ITEM MenuItem;
UINT res = IntGetMenuItemByFlag(MenuObject, uIDEnableItem, uEnable, &MenuItem, NULL); UINT res = IntGetMenuItemByFlag(MenuObject, uIDEnableItem, uEnable, NULL, &MenuItem, NULL);
if(!MenuItem || (res == (UINT)-1)) if(!MenuItem || (res == (UINT)-1))
{ {
return (UINT)-1; return (UINT)-1;
@ -1129,7 +1138,7 @@ IntCheckMenuItem(PMENU_OBJECT MenuObject, UINT uIDCheckItem, UINT uCheck)
PMENU_ITEM MenuItem; PMENU_ITEM MenuItem;
int res = -1; int res = -1;
if((IntGetMenuItemByFlag(MenuObject, uIDCheckItem, uCheck, &MenuItem, NULL) < 0) || !MenuItem) if((IntGetMenuItemByFlag(MenuObject, uIDCheckItem, uCheck, NULL, &MenuItem, NULL) < 0) || !MenuItem)
{ {
return -1; return -1;
} }
@ -1154,7 +1163,7 @@ IntHiliteMenuItem(PWINDOW_OBJECT WindowObject, PMENU_OBJECT MenuObject,
UINT uItemHilite, UINT uHilite) UINT uItemHilite, UINT uHilite)
{ {
PMENU_ITEM MenuItem; PMENU_ITEM MenuItem;
BOOL res = IntGetMenuItemByFlag(MenuObject, uItemHilite, uHilite, &MenuItem, NULL); BOOL res = IntGetMenuItemByFlag(MenuObject, uItemHilite, uHilite, NULL, &MenuItem, NULL);
if(!MenuItem || !res) if(!MenuItem || !res)
{ {
return FALSE; return FALSE;
@ -1331,7 +1340,7 @@ IntSetMenuItemRect(PMENU_OBJECT Menu, UINT Item, BOOL fByPos, RECT *rcRect)
{ {
PMENU_ITEM mi; PMENU_ITEM mi;
if(IntGetMenuItemByFlag(Menu, Item, (fByPos ? MF_BYPOSITION : MF_BYCOMMAND), if(IntGetMenuItemByFlag(Menu, Item, (fByPos ? MF_BYPOSITION : MF_BYCOMMAND),
&mi, NULL) > -1) NULL, &mi, NULL) > -1)
{ {
mi->Rect = *rcRect; mi->Rect = *rcRect;
return TRUE; return TRUE;
@ -1753,7 +1762,7 @@ NtUserGetMenuBarInfo(
kmbi.hMenu = hMenu; kmbi.hMenu = hMenu;
if (idItem) /* Non-Zero-Based. */ if (idItem) /* Non-Zero-Based. */
{ {
if (IntGetMenuItemByFlag(MenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) if (IntGetMenuItemByFlag(MenuObject, idItem-1, MF_BYPOSITION, NULL, &mi, NULL) > -1)
kmbi.rcBar = mi->Rect; kmbi.rcBar = mi->Rect;
else else
{ {
@ -1802,7 +1811,7 @@ NtUserGetMenuBarInfo(
} }
if (idItem) if (idItem)
{ {
if (IntGetMenuItemByFlag(SubMenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) if (IntGetMenuItemByFlag(SubMenuObject, idItem-1, MF_BYPOSITION, NULL, &mi, NULL) > -1)
kmbi.rcBar = mi->Rect; kmbi.rcBar = mi->Rect;
else else
{ {
@ -1852,7 +1861,7 @@ NtUserGetMenuBarInfo(
kmbi.hMenu = SysMenuObject->MenuInfo.Self; kmbi.hMenu = SysMenuObject->MenuInfo.Self;
if (idItem) if (idItem)
{ {
if (IntGetMenuItemByFlag(SysMenuObject, idItem-1, MF_BYPOSITION, &mi, NULL) > -1) if (IntGetMenuItemByFlag(SysMenuObject, idItem-1, MF_BYPOSITION, NULL, &mi, NULL) > -1)
kmbi.rcBar = mi->Rect; kmbi.rcBar = mi->Rect;
else else
{ {
@ -1953,7 +1962,7 @@ NtUserGetMenuItemRect(
RETURN(FALSE); RETURN(FALSE);
} }
if (IntGetMenuItemByFlag(Menu, uItem, MF_BYPOSITION, &MenuItem, NULL) > -1) if (IntGetMenuItemByFlag(Menu, uItem, MF_BYPOSITION, NULL, &MenuItem, NULL) > -1)
Rect = MenuItem->Rect; Rect = MenuItem->Rect;
else else
RETURN(FALSE); RETURN(FALSE);
@ -2213,7 +2222,7 @@ UserMenuItemInfo(
if (IntGetMenuItemByFlag(Menu, Item, if (IntGetMenuItemByFlag(Menu, Item,
(ByPosition ? MF_BYPOSITION : MF_BYCOMMAND), (ByPosition ? MF_BYPOSITION : MF_BYCOMMAND),
&MenuItem, NULL) < 0) NULL, &MenuItem, NULL) < 0)
{ {
SetLastWin32Error(ERROR_INVALID_PARAMETER); SetLastWin32Error(ERROR_INVALID_PARAMETER);
return( FALSE); return( FALSE);