Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 21:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NtUser]

Browse source 
- Fix a potential crash in test_menu_locked_by_window.

svn path=/trunk/; revision=75734
This commit is contained in:
James Tabor 2017-09-02 04:08:22 +00:00
parent 5e78e7c3c1
commit 968673daab
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
reactos/win32ss/user/ntuser/nonclient.c
View file

@ -940,10 +940,13 @@ VOID UserDrawCaptionBar(
/* Draw menu bar */
if (pWnd->state & WNDS_HASMENU && pWnd->IDMenu) // Should be pWnd->spmenu
{
PMENU menu = UserGetMenuObject(UlongToHandle(pWnd->IDMenu)); // FIXME!
TempRect = CurrentRect;
TempRect.bottom = TempRect.top + menu->cyMenu; // Should be pWnd->spmenu->cyMenu;
CurrentRect.top += MENU_DrawMenuBar(hDC, &TempRect, pWnd, FALSE);
PMENU menu;
if ((menu = UserGetMenuObject(UlongToHandle(pWnd->IDMenu)))) // FIXME! Use pWnd->spmenu,
{
TempRect = CurrentRect;
TempRect.bottom = TempRect.top + menu->cyMenu; // Should be pWnd->spmenu->cyMenu;
CurrentRect.top += MENU_DrawMenuBar(hDC, &TempRect, pWnd, FALSE);
}
}
if (ExStyle & WS_EX_CLIENTEDGE)
@ -1111,10 +1114,14 @@ NC_DoNCPaint(PWND pWnd, HDC hDC, INT Flags)
{
if (!(Flags & DC_NOSENDMSG))
{
PMENU menu = UserGetMenuObject(UlongToHandle(pWnd->IDMenu)); // FIXME!
TempRect = CurrentRect;
TempRect.bottom = TempRect.top + menu->cyMenu; // Should be pWnd->spmenu->cyMenu;
CurrentRect.top += MENU_DrawMenuBar(hDC, &TempRect, pWnd, FALSE);
PMENU menu;
// Fix crash in test_menu_locked_by_window, should use pWnd->spmenu....
if ((menu = UserGetMenuObject(UlongToHandle(pWnd->IDMenu)))) // FIXME! Use pWnd->spmenu,
{
TempRect = CurrentRect;
TempRect.bottom = TempRect.top + menu->cyMenu; // Should be pWnd->spmenu->cyMenu;
CurrentRect.top += MENU_DrawMenuBar(hDC, &TempRect, pWnd, FALSE);
}
}
}