Vitaly Lipatov : user: Fix uninitialized rectangle in menu arrow painting.

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: e96f03a1d7780985aa7ad27e4b00ce60643c9ba3
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=e96f03a1d7780985aa7ad27e...

Author: Vitaly Lipatov 
Date:   Wed Mar  1 20:56:47 2006 +0300

user: Fix uninitialized rectangle in menu arrow painting.

---

dlls/user/menu.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dlls/user/menu.c b/dlls/user/menu.c
index 673fcc4..a1a1c04 100644
--- a/dlls/user/menu.c
+++ b/dlls/user/menu.c
@@ -1375,6 +1375,10 @@ static void MENU_DrawMenuItem( HWND hwnd
    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)
     {
         /*
@@ -1399,8 +1403,7 @@ static void MENU_DrawMenuItem( HWND hwnd
         dis.itemAction = odaction; /* ODA_DRAWENTIRE | ODA_SELECT | ODA_FOCUS; */
         dis.hwndItem   = (HWND)hmenu;
         dis.hDC        = hdc;
-        dis.rcItem     = lpitem->rect;
-        MENU_AdjustMenuItemRect(MENU_GetMenu(hmenu), &dis.rcItem);
+        dis.rcItem     = rect;
         TRACE("Ownerdraw: owner=%p itemID=%d, itemState=%d, itemAction=%d, "
          "hwndItem=%p, hdc=%p, rcItem=%s\n", hwndOwner,
          dis.itemID, dis.itemState, dis.itemAction, dis.hwndItem,
@@ -1413,13 +1416,8 @@ static void MENU_DrawMenuItem( HWND hwnd
         return;
     }

-    TRACE("rect=%s\n", wine_dbgstr_rect( &lpitem->rect));
-
     if (menuBar && (lpitem->fType & MF_SEPARATOR)) return;

-    rect = lpitem->rect;
-    MENU_AdjustMenuItemRect(MENU_GetMenu(hmenu), &rect);
-
     if (lpitem->fState & MF_HILITE)
     {
         if (flat_menu)