mirror of
https://github.com/reactos/reactos.git
synced 2024-07-31 00:28:56 +00:00
small fixes
svn path=/trunk/; revision=7278
This commit is contained in:
parent
94859ee96d
commit
bb4da13c9c
|
@ -16,7 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id: menu.c,v 1.37 2003/12/28 00:19:24 weiden Exp $
|
/* $Id: menu.c,v 1.38 2003/12/28 01:13:02 weiden Exp $
|
||||||
*
|
*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
|
@ -52,24 +52,24 @@
|
||||||
#define UpdateMenuItemState(state, change) \
|
#define UpdateMenuItemState(state, change) \
|
||||||
{\
|
{\
|
||||||
if((change) & MFS_DISABLED) { \
|
if((change) & MFS_DISABLED) { \
|
||||||
if(!((state) & MFS_DISABLED)) (state) |= MFS_DISABLED; \
|
(state) |= MFS_DISABLED; \
|
||||||
} else { \
|
} else { \
|
||||||
if((state) & MFS_DISABLED) (state) ^= MFS_DISABLED; \
|
(state) &= ~MFS_DISABLED; \
|
||||||
} \
|
} \
|
||||||
if((change) & MFS_CHECKED) { \
|
if((change) & MFS_CHECKED) { \
|
||||||
if(!((state) & MFS_CHECKED)) (state) |= MFS_CHECKED; \
|
(state) |= MFS_CHECKED; \
|
||||||
} else { \
|
} else { \
|
||||||
if((state) & MFS_CHECKED) (state) ^= MFS_CHECKED; \
|
(state) &= ~MFS_CHECKED; \
|
||||||
} \
|
} \
|
||||||
if((change) & MFS_HILITE) { \
|
if((change) & MFS_HILITE) { \
|
||||||
if(!((state) & MFS_HILITE)) (state) |= MFS_HILITE; \
|
(state) |= MFS_HILITE; \
|
||||||
} else { \
|
} else { \
|
||||||
if((state) & MFS_HILITE) (state) ^= MFS_HILITE; \
|
(state) &= ~MFS_HILITE; \
|
||||||
} \
|
} \
|
||||||
if(((change) & MFS_DEFAULT) && !((state) & MFS_DEFAULT)) { \
|
if((change) & MFS_DEFAULT) { \
|
||||||
(state) |= MFS_DEFAULT; \
|
(state) |= MFS_DEFAULT; \
|
||||||
} else if(((state) & MFS_DEFAULT) && !((change) & MFS_DEFAULT)) { \
|
} else { \
|
||||||
(state) ^= MFS_DEFAULT; \
|
(state) &= ~MFS_DEFAULT; \
|
||||||
} \
|
} \
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -435,16 +435,15 @@ IntGetMenuInfo(PMENU_OBJECT MenuObject, LPMENUINFO lpmi)
|
||||||
BOOL FASTCALL
|
BOOL FASTCALL
|
||||||
IntIsMenu(HMENU hMenu)
|
IntIsMenu(HMENU hMenu)
|
||||||
{
|
{
|
||||||
|
|
||||||
PMENU_OBJECT Menu;
|
PMENU_OBJECT Menu;
|
||||||
|
|
||||||
if (!(Menu = IntGetMenuObject(hMenu)))
|
if((Menu = IntGetMenuObject(hMenu)))
|
||||||
return FALSE;
|
{
|
||||||
else
|
|
||||||
IntReleaseMenuObject(Menu);
|
IntReleaseMenuObject(Menu);
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
BOOL FASTCALL
|
BOOL FASTCALL
|
||||||
|
@ -1467,8 +1466,12 @@ NtUserMenuItemInfo(
|
||||||
LPMENUITEMINFOW lpmii,
|
LPMENUITEMINFOW lpmii,
|
||||||
BOOL fsog)
|
BOOL fsog)
|
||||||
{
|
{
|
||||||
BOOL res = FALSE;
|
PMENU_OBJECT MenuObject;
|
||||||
PMENU_OBJECT MenuObject = IntGetMenuObject(hMenu);
|
PMENU_ITEM MenuItem;
|
||||||
|
MENUITEMINFOW Safemii;
|
||||||
|
NTSTATUS Status;
|
||||||
|
|
||||||
|
MenuObject = IntGetMenuObject(hMenu);
|
||||||
if(!MenuObject)
|
if(!MenuObject)
|
||||||
{
|
{
|
||||||
SetLastWin32Error(ERROR_INVALID_MENU_HANDLE);
|
SetLastWin32Error(ERROR_INVALID_MENU_HANDLE);
|
||||||
|
@ -1481,12 +1484,25 @@ NtUserMenuItemInfo(
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
/* Get menu item info */
|
if((IntGetMenuItemByFlag(MenuObject, uItem, (fByPosition ? MF_BYPOSITION : MF_BYCOMMAND),
|
||||||
|
&MenuItem, NULL) > -1) &&
|
||||||
|
IntGetMenuItemInfo(MenuObject, MenuItem, &Safemii))
|
||||||
|
{
|
||||||
|
Status = MmCopyToCaller(lpmii, &Safemii, sizeof(MENUITEMINFOW));
|
||||||
|
if(!NT_SUCCESS(Status))
|
||||||
|
{
|
||||||
|
IntReleaseMenuObject(MenuObject);
|
||||||
|
SetLastNtError(Status);
|
||||||
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
IntReleaseMenuObject(MenuObject);
|
IntReleaseMenuObject(MenuObject);
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return res;
|
IntReleaseMenuObject(MenuObject);
|
||||||
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue