Skip to content

W
wine-cw
Commit d4796304 authored by Paul Vriens's avatar Paul Vriens Committed by Alexandre Julliard
Browse files
Options

comctl32: Remove deadcode (Coverity).

parent 131d9964
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 7 deletions
dlls/comctl32/imagelist.c
View file @ d4796304
...@@ -1980,7 +1980,7 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) ...@@ -1980,7 +1980,7 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm)
{ {
ILHEAD ilHead; ILHEAD ilHead;
HIMAGELIST himl; HIMAGELIST himl;
HBITMAP hbmColor=0,hbmMask=0; HBITMAP hbmColor=0;
int i; int i;
TRACE("%p\n", pstm); TRACE("%p\n", pstm);
...@@ -1995,7 +1995,6 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) ...@@ -1995,7 +1995,6 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm)
himl = ImageList_Create(ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage); himl = ImageList_Create(ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage);
if (!himl) { if (!himl) {
DeleteObject(hbmColor); DeleteObject(hbmColor);
DeleteObject(hbmMask);
return NULL; return NULL;
} }
if (!_read_bitmap(himl, himl->hdcImage, pstm, ilHead.flags & ~ILC_MASK)) { if (!_read_bitmap(himl, himl->hdcImage, pstm, ilHead.flags & ~ILC_MASK)) {
...@@ -2012,11 +2011,6 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm) ...@@ -2012,11 +2011,6 @@ HIMAGELIST WINAPI ImageList_Read (LPSTREAM pstm)
SelectObject(himl->hdcImage, hbmColor); SelectObject(himl->hdcImage, hbmColor);
DeleteObject(himl->hbmImage); DeleteObject(himl->hbmImage);
himl->hbmImage = hbmColor; himl->hbmImage = hbmColor;
if (hbmMask){
SelectObject(himl->hdcMask, hbmMask);
DeleteObject(himl->hbmMask);
himl->hbmMask = hbmMask;
}
himl->cCurImage = ilHead.cCurImage; himl->cCurImage = ilHead.cCurImage;
himl->cMaxImage = ilHead.cMaxImage; himl->cMaxImage = ilHead.cMaxImage;
......
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