Skip to content

W
wine-winehq
Commit e96f03a1 authored by Vitaly Lipatov's avatar Vitaly Lipatov Committed by Alexandre Julliard
Browse files
Options

user: Fix uninitialized rectangle in menu arrow painting.

parent af9288d5
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 7 deletions
dlls/user/menu.c
View file @ e96f03a1
...@@ -1375,6 +1375,10 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, ...@@ -1375,6 +1375,10 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
SetBkColor( hdc, GetSysColor( bkgnd ) ); SetBkColor( hdc, GetSysColor( bkgnd ) );
} }
TRACE("rect=%s\n", wine_dbgstr_rect( &lpitem->rect));
rect = lpitem->rect;
MENU_AdjustMenuItemRect(MENU_GetMenu(hmenu), &rect);
if (lpitem->fType & MF_OWNERDRAW) if (lpitem->fType & MF_OWNERDRAW)
{ {
/* /*
...@@ -1399,8 +1403,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, ...@@ -1399,8 +1403,7 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
dis.itemAction = odaction; /* ODA_DRAWENTIRE | ODA_SELECT | ODA_FOCUS; */ dis.itemAction = odaction; /* ODA_DRAWENTIRE | ODA_SELECT | ODA_FOCUS; */
dis.hwndItem = (HWND)hmenu; dis.hwndItem = (HWND)hmenu;
dis.hDC = hdc; dis.hDC = hdc;
dis.rcItem = lpitem->rect; dis.rcItem = rect;
MENU_AdjustMenuItemRect(MENU_GetMenu(hmenu), &dis.rcItem);
TRACE("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, " TRACE("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, "
"hwndItem=%p, hdc=%p, rcItem=%s\n", hwndOwner, "hwndItem=%p, hdc=%p, rcItem=%s\n", hwndOwner,
dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem, dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem,
...@@ -1413,13 +1416,8 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc, ...@@ -1413,13 +1416,8 @@ static void MENU_DrawMenuItem( HWND hwnd, HMENU hmenu, HWND hwndOwner, HDC hdc,
return; return;
} }
TRACE("rect=%s\n", wine_dbgstr_rect( &lpitem->rect));
if (menuBar && (lpitem->fType & MF_SEPARATOR)) return; if (menuBar && (lpitem->fType & MF_SEPARATOR)) return;
rect = lpitem->rect;
MENU_AdjustMenuItemRect(MENU_GetMenu(hmenu), &rect);
if (lpitem->fState & MF_HILITE) if (lpitem->fState & MF_HILITE)
{ {
if (flat_menu) if (flat_menu)
......
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