- Fix all the user32 wine win test_CreateWindow tests.

svn path=/trunk/; revision=50185
This commit is contained in:
James Tabor 2010-12-28 10:38:38 +00:00
parent e6a4fb691d
commit 527d9e4e17

View file

@ -437,8 +437,9 @@ static LRESULT co_UserFreeWindow(PWND Window,
TIMER_RemoveWindowTimers(Window->head.h);
#endif
if (!(Window->style & WS_CHILD) && Window->IDMenu
&& (Menu = UserGetMenuObject((HMENU)Window->IDMenu)))
if ( ((Window->style & (WS_CHILD|WS_POPUP)) != WS_CHILD) &&
Window->IDMenu &&
(Menu = UserGetMenuObject((HMENU)Window->IDMenu)))
{
IntDestroyMenuObject(Menu, TRUE, TRUE);
Window->IDMenu = 0;