system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-08-31 22:54:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

win32u: Move CheckMenuRadioItem implementation from user32.

Browse source
This commit is contained in:
Jacek Caban 2022-06-21 17:53:02 +02:00 committed by Alexandre Julliard
parent 177513a532
commit d7dba1ed74
3 changed files with 51 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
dlls/user32/menu.c
View file

@ -1098,51 +1098,12 @@ BOOL WINAPI InsertMenuItemW(HMENU hMenu, UINT uItem, BOOL bypos,
/**********************************************************************
* CheckMenuRadioItem (USER32.@)
*/
BOOL WINAPI CheckMenuRadioItem(HMENU hMenu, UINT first, UINT last,
UINT check, UINT flags)
BOOL WINAPI CheckMenuRadioItem( HMENU menu, UINT first, UINT last, UINT check, UINT flags )
{
POPUPMENU *first_menu = NULL, *check_menu;
UINT i, check_pos;
BOOL done = FALSE;
for (i = first; i <= last; i++)
{
MENUITEM *item;
if (!(check_menu = find_menu_item(hMenu, i, flags, &check_pos)))
continue;
if (!first_menu)
first_menu = grab_menu_ptr(check_menu->obj.handle);
if (first_menu != check_menu)
{
release_menu_ptr(check_menu);
continue;
}
item = &check_menu->items[check_pos];
if (item->fType != MFT_SEPARATOR)
{
if (i == check)
{
item->fType |= MFT_RADIOCHECK;
item->fState |= MFS_CHECKED;
done = TRUE;
}
else
{
/* MSDN is wrong, Windows does not remove MFT_RADIOCHECK */
item->fState &= ~MFS_CHECKED;
}
}
release_menu_ptr(check_menu);
}
release_menu_ptr(first_menu);
return done;
MENUITEMINFOW info; /* abuse to pass last and check */
info.cch = last;
info.fMask = check;
return NtUserThunkedMenuItemInfo( menu, first, flags, NtUserCheckMenuRadioItem, &info, NULL );
}

45
dlls/win32u/menu.c
View file

@ -1109,6 +1109,48 @@ static BOOL get_menu_item_info( HMENU handle, UINT id, UINT flags, MENUITEMINFOW
return TRUE;
}
static BOOL check_menu_radio_item( HMENU handle, UINT first, UINT last, UINT check, UINT flags )
{
POPUPMENU *first_menu = NULL, *check_menu;
UINT i, check_pos;
BOOL done = FALSE;
for (i = first; i <= last; i++)
{
MENUITEM *item;
if (!(check_menu = find_menu_item( handle, i, flags, &check_pos ))) continue;
if (!first_menu) first_menu = grab_menu_ptr( check_menu->obj.handle );
if (first_menu != check_menu)
{
release_menu_ptr(check_menu);
continue;
}
item = &check_menu->items[check_pos];
if (item->fType != MFT_SEPARATOR)
{
if (i == check)
{
item->fType |= MFT_RADIOCHECK;
item->fState |= MFS_CHECKED;
done = TRUE;
}
else
{
/* Windows does not remove MFT_RADIOCHECK */
item->fState &= ~MFS_CHECKED;
}
}
release_menu_ptr( check_menu );
}
release_menu_ptr( first_menu );
return done;
}
/**********************************************************************
* NtUserThunkedMenuItemInfo (win32u.@)
*/
@ -1121,6 +1163,9 @@ UINT WINAPI NtUserThunkedMenuItemInfo( HMENU handle, UINT pos, UINT flags, UINT
switch (method)
{
case NtUserCheckMenuRadioItem:
return check_menu_radio_item( handle, pos, info->cch, info->fMask, flags );
case NtUserGetMenuItemID:
if (!(menu = find_menu_item( handle, pos, flags, &i ))) return -1;
ret = menu->items[i].fType & MF_POPUP ? -1 : menu->items[i].wID;

1
include/ntuser.h
View file

@ -224,6 +224,7 @@ enum
NtUserSetMenuItemInfo,
NtUserInsertMenuItem,
/* Wine extensions */
NtUserCheckMenuRadioItem,
NtUserGetMenuItemID,
NtUserGetMenuItemInfoA,
NtUserGetMenuItemInfoW,