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

user: Fix dereferencing a potential NULL pointer.

This commit is contained in:
Rein Klazes 2006-04-08 12:48:13 +02:00 committed by Alexandre Julliard
parent 5f4b424553
commit 7a560493fe
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
dlls/user/menu.c
View File

@ -1693,23 +1693,23 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu )
else
DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT);
menu = MENU_GetMenu( hmenu );
/* draw menu items */
if (menu && menu->nItems)
{
MENUITEM *item;
UINT u;
if( (menu = MENU_GetMenu( hmenu )))
{
/* draw menu items */
if( menu->nItems)
{
MENUITEM *item;
UINT u;
for (u = menu->nItems, item = menu->items; u > 0; u--, item++)
MENU_DrawMenuItem( hwnd, hmenu, menu->hwndOwner, hdc, item,
menu->Height, FALSE, ODA_DRAWENTIRE );
}
/* draw scroll arrows */
if (menu->bScrolling)
MENU_DrawScrollArrows(menu, hdc);
item = menu->items;
for( u = menu->nItems; u > 0; u--, item++)
MENU_DrawMenuItem( hwnd, hmenu, menu->hwndOwner, hdc,
item, menu->Height, FALSE, ODA_DRAWENTIRE );
}
/* draw scroll arrows */
if (menu->bScrolling)
MENU_DrawScrollArrows(menu, hdc);
}
} else
{
SelectObject( hdc, hPrevBrush );