From ead342935a4141fba9598c1554e53756b2a9d3aa Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Tue, 26 Jul 2005 10:35:13 +0000 Subject: [PATCH] Don't allow setting menu for child windows in IntSetMenu. svn path=/trunk/; revision=16735 --- reactos/subsys/win32k/ntuser/window.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/reactos/subsys/win32k/ntuser/window.c b/reactos/subsys/win32k/ntuser/window.c index 2b8b4340b58..f0790e5b4b4 100644 --- a/reactos/subsys/win32k/ntuser/window.c +++ b/reactos/subsys/win32k/ntuser/window.c @@ -499,13 +499,19 @@ IntSetMenu( { 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); if (! *Changed) { return TRUE; } - if (0 != WindowObject->IDMenu) + if (WindowObject->IDMenu) { OldMenuObject = IntGetMenuObject((HMENU) WindowObject->IDMenu); ASSERT(NULL == OldMenuObject || OldMenuObject->MenuInfo.Wnd == WindowObject->Self); -- 2.17.1