Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 06:33:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

[Win32k|User32]

Browse source 
- Implement NtUserGetMenuIndex, see Bug 5528.

svn path=/trunk/; revision=49005
This commit is contained in:
James Tabor 2010-10-05 20:13:32 +00:00
parent 44e3333652
commit 76bac9c7df
2 changed files with 28 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

5
reactos/dll/win32/user32/misc/stubs.c
View file

@ -538,12 +538,11 @@ BOOL WINAPI CliImmSetHotKey(DWORD dwID, UINT uModifiers, UINT uVirtualKey, HKL h
} }
/* /*
* @unimplemented * @implemented
*/ */
DWORD WINAPI GetMenuIndex(HMENU hMenu, HMENU hSubMenu) DWORD WINAPI GetMenuIndex(HMENU hMenu, HMENU hSubMenu)
{ {
UNIMPLEMENTED; return NtUserGetMenuIndex(hMenu, hSubMenu);
return 0;
} }
/* /*

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

@ -2034,20 +2034,40 @@ CLEANUP:
END_CLEANUP; END_CLEANUP;
} }
/* /*
* @unimplemented * @implemented
*/ */
UINT APIENTRY UINT APIENTRY
NtUserGetMenuIndex( NtUserGetMenuIndex(
HMENU hMenu, HMENU hMenu,
UINT wID) HMENU hSubMenu)
{ {
UNIMPLEMENTED PMENU_OBJECT Menu, SubMenu;
PMENU_ITEM MenuItem;
DECLARE_RETURN(UINT);
return 0; DPRINT("Enter NtUserGetMenuIndex\n");
UserEnterShared();
if ( !(Menu = UserGetMenuObject(hMenu)) ||
!(SubMenu = UserGetMenuObject(hSubMenu)) )
RETURN(0xFFFFFFFF);
MenuItem = Menu->MenuItemList;
while(MenuItem)
{
if (MenuItem->hSubMenu == hSubMenu)
RETURN(MenuItem->wID);
MenuItem = MenuItem->Next;
} }
RETURN(0xFFFFFFFF);
CLEANUP:
DPRINT("Leave NtUserGetMenuIndex, ret=%i\n",_ret_);
UserLeave();
END_CLEANUP;
}
/* /*
* @implemented * @implemented
@ -2218,10 +2238,6 @@ UserMenuInfo(
return( Res); return( Res);
} }
/* /*
* @implemented * @implemented
*/ */