Skip to content

W
wine-winehq
Commit 1e678669 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Revert "comctl32: Fix a potential regression in ImageList_ReplaceIcon()."

This reverts commit 9e772d13.
parent fdd9a4e2
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 11 deletions
dlls/comctl32/imagelist.c
View file @ 1e678669
...@@ -2252,7 +2252,6 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) ...@@ -2252,7 +2252,6 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon)
BITMAP bmp; BITMAP bmp;
BOOL ret; BOOL ret;
POINT pt; POINT pt;
INT i;
TRACE("(%p %d %p)\n", himl, nIndex, hIcon); TRACE("(%p %d %p)\n", himl, nIndex, hIcon);
...@@ -2315,17 +2314,14 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon) ...@@ -2315,17 +2314,14 @@ ImageList_ReplaceIcon (HIMAGELIST himl, INT nIndex, HICON hIcon)
SetBkColor (himl->hdcImage, RGB(255,255,255)); SetBkColor (himl->hdcImage, RGB(255,255,255));
hbmOldSrc = SelectObject (hdcImage, ii.hbmColor); hbmOldSrc = SelectObject (hdcImage, ii.hbmColor);
for (i=0; i<(bmp.bmWidth/himl->cx); i++) { imagelist_point_from_index(himl, nIndex, &pt);
StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy,
imagelist_point_from_index(himl, nIndex+i, &pt); hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
StretchBlt (himl->hdcImage, pt.x, pt.y, himl->cx, himl->cy,
hdcImage, 0, 0, himl->cx*i, bmp.bmHeight, SRCCOPY);
if (himl->hbmMask) { if (himl->hbmMask) {
SelectObject (hdcImage, ii.hbmMask); SelectObject (hdcImage, ii.hbmMask);
StretchBlt (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy, StretchBlt (himl->hdcMask, pt.x, pt.y, himl->cx, himl->cy,
hdcImage, 0, 0, himl->cx*i, bmp.bmHeight, SRCCOPY); hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
}
} }
SelectObject (hdcImage, hbmOldSrc); SelectObject (hdcImage, hbmOldSrc);
......
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