Rein Klazes : user: Fix dereferencing a potential NULL pointer.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Apr 13 05:17:23 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 7a560493fe0e6aa31705d3d751072b5dc62914a4
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a560493fe0e6aa31705d3d751072b5dc62914a4
Author: Rein Klazes <wijn at wanadoo.nl>
Date: Sat Apr 8 12:48:13 2006 +0200
user: Fix dereferencing a potential NULL pointer.
---
dlls/user/menu.c | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/user/menu.c b/dlls/user/menu.c
index 897b5d8..a487347 100644
--- a/dlls/user/menu.c
+++ b/dlls/user/menu.c
@@ -1693,23 +1693,23 @@ static void MENU_DrawPopupMenu( HWND hwn
else
DrawEdge (hdc, &rect, EDGE_RAISED, BF_RECT);
- menu = MENU_GetMenu( hmenu );
-
- /* draw menu items */
- if (menu && 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 );
-
- }
+ if( (menu = MENU_GetMenu( hmenu )))
+ {
+ /* draw menu items */
+ if( menu->nItems)
+ {
+ MENUITEM *item;
+ UINT u;
- /* 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 );
More information about the wine-cvs
mailing list