Commit 7a560493 authored by Rein Klazes's avatar Rein Klazes Committed by Alexandre Julliard

user: Fix dereferencing a potential NULL pointer.

parent 5f4b4245
...@@ -1693,23 +1693,23 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu ) ...@@ -1693,23 +1693,23 @@ static void MENU_DrawPopupMenu( HWND hwnd, HDC hdc, HMENU hmenu )
else else
DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT); DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT);
menu = MENU_GetMenu( hmenu ); if( (menu = MENU_GetMenu( hmenu )))
{
/* draw menu items */ /* draw menu items */
if (menu && menu->nItems) if( menu->nItems)
{ {
MENUITEM *item; MENUITEM *item;
UINT u; 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 */ item = menu->items;
if (menu->bScrolling) for( u = menu->nItems; u > 0; u--, item++)
MENU_DrawScrollArrows(menu, hdc); MENU_DrawMenuItem( hwnd, hmenu, menu->hwndOwner, hdc,
item, menu->Height, FALSE, ODA_DRAWENTIRE );
}
/* draw scroll arrows */
if (menu->bScrolling)
MENU_DrawScrollArrows(menu, hdc);
}
} else } else
{ {
SelectObject( hdc, hPrevBrush ); SelectObject( hdc, hPrevBrush );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment