Paul Vriens : comctl32: Remove deadcode (Coverity).

Alexandre Julliard julliard at wine.codeweavers.com
Mon Nov 13 09:24:34 CST 2006


Module: wine
Branch: master
Commit: d4796304ad9ea2844990166599aa53ce24ea0614
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d4796304ad9ea2844990166599aa53ce24ea0614

Author: Paul Vriens <paul.vriens.wine at gmail.com>
Date:   Sat Nov 11 19:28:18 2006 +0100

comctl32: Remove deadcode (Coverity).

---

 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;
 




More information about the wine-cvs mailing list