[comctl32] Remove deadcode (Coverity)
Paul Vriens
paul.vriens.wine at gmail.com
Sat Nov 11 12:28:18 CST 2006
Hi,
after one of Mike's changes:
commit e74b0ee9102470d1b866e94c54527b34806cf876
Author: Mike McCormack <mike at codeweavers.com>
Date: Wed Nov 8 15:01:04 2006 +0900
comctl32: Remove Nx1 assumptions in ImageList_Read.
hbmMask wasn't used anymore.
This should fix Coverity-424.
Changelog
Remove deadcode
Cheers,
Paul.
---
dlls/comctl32/imagelist.c | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 36fe384..e9970e0 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -1980,7 +1980,7 @@ HIMAGELIST WINAPI ImageList_Read (LPSTRE
{
ILHEAD ilHead;
HIMAGELIST himl;
- HBITMAP hbmColor=0,hbmMask=0;
+ HBITMAP hbmColor=0;
int i;
TRACE("%p\n", pstm);
@@ -1995,7 +1995,6 @@ HIMAGELIST WINAPI ImageList_Read (LPSTRE
himl = ImageList_Create(ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage);
if (!himl) {
DeleteObject(hbmColor);
- DeleteObject(hbmMask);
return NULL;
}
if (!_read_bitmap(himl, himl->hdcImage, pstm, ilHead.flags & ~ILC_MASK)) {
@@ -2012,11 +2011,6 @@ HIMAGELIST WINAPI ImageList_Read (LPSTRE
SelectObject(himl->hdcImage, hbmColor);
DeleteObject(himl->hbmImage);
himl->hbmImage = hbmColor;
- if (hbmMask){
- SelectObject(himl->hdcMask, hbmMask);
- DeleteObject(himl->hbmMask);
- himl->hbmMask = hbmMask;
- }
himl->cCurImage = ilHead.cCurImage;
himl->cMaxImage = ilHead.cMaxImage;
--
1.4.3.4
More information about the wine-patches
mailing list