Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 00:45:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.9][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 ca8fbad361
commit 65c7d4a17b
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

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