Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't allow setting menu for child windows in IntSetMenu.

Browse source 
svn path=/trunk/; revision=16735
This commit is contained in:
Filip Navara 2005-07-26 10:35:13 +00:00
parent c5646382a5
commit ead342935a
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reactos/subsys/win32k/ntuser/window.c
View file

@ -499,13 +499,19 @@ IntSetMenu(
{ {
PMENU_OBJECT OldMenuObject, NewMenuObject = NULL; PMENU_OBJECT OldMenuObject, NewMenuObject = NULL;
if ((WindowObject->Style & (WS_CHILD | WS_POPUP)) == WS_CHILD)
{
SetLastWin32Error(ERROR_INVALID_WINDOW_HANDLE);
return FALSE;
}
*Changed = (WindowObject->IDMenu != (UINT) Menu); *Changed = (WindowObject->IDMenu != (UINT) Menu);
if (! *Changed) if (! *Changed)
{ {
return TRUE; return TRUE;
} }
if (0 != WindowObject->IDMenu) if (WindowObject->IDMenu)
{ {
OldMenuObject = IntGetMenuObject((HMENU) WindowObject->IDMenu); OldMenuObject = IntGetMenuObject((HMENU) WindowObject->IDMenu);
ASSERT(NULL == OldMenuObject || OldMenuObject->MenuInfo.Wnd == WindowObject->Self); ASSERT(NULL == OldMenuObject || OldMenuObject->MenuInfo.Wnd == WindowObject->Self);