ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Protect MDISetMenu from rogue menu handles.

This commit is contained in:
Richard Cohen 1999-09-19 14:05:05 +00:00 committed by Alexandre Julliard
parent 63556084e6
commit 55b92475f2
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
windows/mdi.c
View File

@ -207,7 +207,7 @@ static void MDI_CalcDefaultChildPos( WND* w, WORD n, LPPOINT lpPos,
static LRESULT MDISetMenu( HWND hwnd, HMENU hmenuFrame, static LRESULT MDISetMenu( HWND hwnd, HMENU hmenuFrame,
HMENU hmenuWindow) HMENU hmenuWindow)
{ {
WND *w = WIN_FindWndPtr(hwnd); WND *w;
MDICLIENTINFO *ci; MDICLIENTINFO *ci;
HWND hwndFrame = GetParent(hwnd); HWND hwndFrame = GetParent(hwnd);
HMENU oldFrameMenu = GetMenu(hwndFrame); HMENU oldFrameMenu = GetMenu(hwndFrame);
@ -215,6 +215,19 @@ static LRESULT MDISetMenu( HWND hwnd, HMENU hmenuFrame,
TRACE("%04x %04x %04x\n", TRACE("%04x %04x %04x\n",
hwnd, hmenuFrame, hmenuWindow); hwnd, hmenuFrame, hmenuWindow);
if (hmenuFrame && !IsMenu(hmenuFrame))
{
WARN("hmenuFrame is not a menu handle\n");
return 0L;
}
if (hmenuWindow && !IsMenu(hmenuWindow))
{
WARN("hmenuWindow is not a menu handle\n");
return 0L;
}
w = WIN_FindWndPtr(hwnd);
ci = (MDICLIENTINFO *) w->wExtra; ci = (MDICLIENTINFO *) w->wExtra;
if( ci->hwndChildMaximized && hmenuFrame && hmenuFrame!=oldFrameMenu ) if( ci->hwndChildMaximized && hmenuFrame && hmenuFrame!=oldFrameMenu )