Dmitry Timoshkov : user32: Simplify height calculation.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: b5186e17dd44972c40a1f4e4a305d8b937cc7b2d
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=b5186e17dd44972c40a1f4e4a305d8b937cc7b2d

Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date:   Tue Feb 27 15:56:01 2007 +0800

user32: Simplify height calculation.

---

 dlls/user32/cursoricon.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dlls/user32/cursoricon.c b/dlls/user32/cursoricon.c
index 1d6101a..38e2ac6 100644
--- a/dlls/user32/cursoricon.c
+++ b/dlls/user32/cursoricon.c
@@ -1759,6 +1759,8 @@ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo)
       iconinfo->yHotspot = ciconinfo->ptHotSpot.y;
     }
 
+    height = ciconinfo->nHeight;
+
     if (ciconinfo->bBitsPerPixel > 1)
     {
         iconinfo->hbmColor = CreateBitmap( ciconinfo->nWidth, ciconinfo->nHeight,
@@ -1766,12 +1768,11 @@ BOOL WINAPI GetIconInfo(HICON hIcon, PICONINFO iconinfo)
                                 (char *)(ciconinfo + 1)
                                 + ciconinfo->nHeight *
                                 get_bitmap_width_bytes (ciconinfo->nWidth,1) );
-        height = ciconinfo->nHeight;
     }
     else
     {
         iconinfo->hbmColor = 0;
-        height = ciconinfo->nHeight * 2;
+        height *= 2;
     }
 
     iconinfo->hbmMask = CreateBitmap ( ciconinfo->nWidth, height,