mirror of
https://github.com/reactos/reactos.git
synced 2024-08-01 17:11:35 +00:00
[User32]
- Fixed more wine tests. WM_UNINITMENUPOPUP is called before destroying pop up menu window. svn path=/trunk/; revision=63183
This commit is contained in:
parent
26c219947c
commit
4cef95b542
|
@ -2944,13 +2944,18 @@ MenuHideSubPopups(HWND WndOwner, PROSMENUINFO MenuInfo,
|
||||||
{
|
{
|
||||||
MenuHideSubPopups(WndOwner, &SubMenuInfo, FALSE, wFlags);
|
MenuHideSubPopups(WndOwner, &SubMenuInfo, FALSE, wFlags);
|
||||||
MenuSelectItem(WndOwner, &SubMenuInfo, NO_SELECTED_ITEM, SendMenuSelect, NULL);
|
MenuSelectItem(WndOwner, &SubMenuInfo, NO_SELECTED_ITEM, SendMenuSelect, NULL);
|
||||||
DestroyWindow(SubMenuInfo.Wnd);
|
|
||||||
SubMenuInfo.Wnd = NULL;
|
|
||||||
MenuSetRosMenuInfo(&SubMenuInfo);
|
|
||||||
|
|
||||||
if (!(wFlags & TPM_NONOTIFY))
|
if (!(wFlags & TPM_NONOTIFY))
|
||||||
SendMessageW( WndOwner, WM_UNINITMENUPOPUP, (WPARAM)ItemInfo.hSubMenu,
|
SendMessageW( WndOwner, WM_UNINITMENUPOPUP, (WPARAM)ItemInfo.hSubMenu,
|
||||||
MAKELPARAM(0, IS_SYSTEM_MENU(&SubMenuInfo)) );
|
MAKELPARAM(0, IS_SYSTEM_MENU(&SubMenuInfo)) );
|
||||||
|
////
|
||||||
|
// Call WM_UNINITMENUPOPUP FIRST before destroy!!
|
||||||
|
// Fixes todo_wine User32 test menu.c line 2233 GetMenuBarInfo callback....
|
||||||
|
//
|
||||||
|
DestroyWindow(SubMenuInfo.Wnd);
|
||||||
|
SubMenuInfo.Wnd = NULL;
|
||||||
|
MenuSetRosMenuInfo(&SubMenuInfo);
|
||||||
|
////
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue