Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 05:26:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

[0.4.11] [WIN32K:NTUSER] Reference menus owned by a popup menu. CORE-15504

Browse source 
Fixes a BSOD mentioned in CORE-15504

cherry picked from commit 0.4.12-dev-218-g
e3c8002dfc
This commit is contained in:
Thomas Faber 2018-12-28 13:39:23 +01:00 committed by Joachim Henze
parent 2522ec1b06
commit b5fef42955
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
win32ss/user/ntuser/menu.c
View file

@ -4504,6 +4504,10 @@ PopupMenuWndProc(
{
CREATESTRUCTW *cs = (CREATESTRUCTW *) lParam;
pPopupMenu->spmenu = UserGetMenuObject(cs->lpCreateParams);
if (pPopupMenu->spmenu)
{
UserReferenceObject(pPopupMenu->spmenu);
}
break;
}
@ -4548,6 +4552,10 @@ PopupMenuWndProc(
case WM_NCDESTROY:
{
if (pPopupMenu->spmenu)
{
IntReleaseMenuObject(pPopupMenu->spmenu);
}
DesktopHeapFree(Wnd->head.rpdesk, pPopupMenu );
((PMENUWND)Wnd)->ppopupmenu = 0;
Wnd->fnid = FNID_DESTROY;
@ -4563,6 +4571,11 @@ PopupMenuWndProc(
ERR("Bad Menu Handle\n");
break;
}
UserReferenceObject(pmenu);
if (pPopupMenu->spmenu)
{
IntReleaseMenuObject(pPopupMenu->spmenu);
}
pPopupMenu->spmenu = pmenu;
break;
}