Skip to content

W
wine-cw
Commit 9cd86ddd authored by Mike McCormack's avatar Mike McCormack Committed by Alexandre Julliard
Browse files
Options

comctl32: Remove Nx1 assumptions in ImageList_GetIcon().

parent 1328ca57
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
dlls/comctl32/imagelist.c
View file @ 9cd86ddd
...@@ -1441,6 +1441,7 @@ ImageList_GetIcon (HIMAGELIST himl, INT i, UINT fStyle) ...@@ -1441,6 +1441,7 @@ ImageList_GetIcon (HIMAGELIST himl, INT i, UINT fStyle)
HICON hIcon; HICON hIcon;
HBITMAP hOldDstBitmap; HBITMAP hOldDstBitmap;
HDC hdcDst; HDC hdcDst;
POINT pt;
TRACE("%p %d %d\n", himl, i, fStyle); TRACE("%p %d %d\n", himl, i, fStyle);
if (!is_valid(himl) || (i < 0) || (i >= himl->cCurImage)) return NULL; if (!is_valid(himl) || (i < 0) || (i >= himl->cCurImage)) return NULL;
...@@ -1456,12 +1457,14 @@ ImageList_GetIcon (HIMAGELIST himl, INT i, UINT fStyle) ...@@ -1456,12 +1457,14 @@ ImageList_GetIcon (HIMAGELIST himl, INT i, UINT fStyle)
hdcDst = CreateCompatibleDC(0); hdcDst = CreateCompatibleDC(0);
imagelist_point_from_index( himl, i, &pt );
/* draw mask*/ /* draw mask*/
ii.hbmMask = CreateBitmap (himl->cx, himl->cy, 1, 1, NULL); ii.hbmMask = CreateBitmap (himl->cx, himl->cy, 1, 1, NULL);
hOldDstBitmap = SelectObject (hdcDst, ii.hbmMask); hOldDstBitmap = SelectObject (hdcDst, ii.hbmMask);
if (himl->hbmMask) { if (himl->hbmMask) {
BitBlt (hdcDst, 0, 0, himl->cx, himl->cy, BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
himl->hdcMask, i * himl->cx, 0, SRCCOPY); himl->hdcMask, pt.x, pt.y, SRCCOPY);
} }
else else
PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS); PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS);
...@@ -1469,7 +1472,7 @@ ImageList_GetIcon (HIMAGELIST himl, INT i, UINT fStyle) ...@@ -1469,7 +1472,7 @@ ImageList_GetIcon (HIMAGELIST himl, INT i, UINT fStyle)
/* draw image*/ /* draw image*/
SelectObject (hdcDst, ii.hbmColor); SelectObject (hdcDst, ii.hbmColor);
BitBlt (hdcDst, 0, 0, himl->cx, himl->cy, BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
himl->hdcImage, i * himl->cx, 0, SRCCOPY); himl->hdcImage, pt.x, pt.y, SRCCOPY);
/* /*
* CreateIconIndirect requires us to deselect the bitmaps from * CreateIconIndirect requires us to deselect the bitmaps from
......
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