The depth of the colour bitmap needs to match that of the screen.
This commit is contained in:
parent
4cfce24f0e
commit
b675c1a92e
|
@ -1405,14 +1405,19 @@ ImageList_GetIcon (HIMAGELIST himl, INT i, UINT fStyle)
|
||||||
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;
|
||||||
|
|
||||||
hdcDst = CreateCompatibleDC(0);
|
|
||||||
|
|
||||||
ii.fIcon = TRUE;
|
ii.fIcon = TRUE;
|
||||||
ii.xHotspot = 0;
|
ii.xHotspot = 0;
|
||||||
ii.yHotspot = 0;
|
ii.yHotspot = 0;
|
||||||
|
|
||||||
|
/* create colour bitmap */
|
||||||
|
hdcDst = GetDC(0);
|
||||||
|
ii.hbmColor = CreateCompatibleBitmap(hdcDst, himl->cx, himl->cy);
|
||||||
|
ReleaseDC(0, hdcDst);
|
||||||
|
|
||||||
|
hdcDst = CreateCompatibleDC(0);
|
||||||
|
|
||||||
/* draw mask*/
|
/* draw mask*/
|
||||||
ii.hbmMask = CreateCompatibleBitmap (hdcDst, himl->cx, himl->cy);
|
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,
|
||||||
|
@ -1422,7 +1427,6 @@ ImageList_GetIcon (HIMAGELIST himl, INT i, UINT fStyle)
|
||||||
PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS);
|
PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS);
|
||||||
|
|
||||||
/* draw image*/
|
/* draw image*/
|
||||||
ii.hbmColor = CreateCompatibleBitmap (himl->hdcImage, himl->cx, himl->cy);
|
|
||||||
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, i * himl->cx, 0, SRCCOPY);
|
||||||
|
|
Loading…
Reference in New Issue