Peter Oberndorfer : comctl32: Fix imagelist regression from "comctl32: Remove Nx1 assumptions in ImageList_Read".

[Alexandre Julliard]

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

Author: Peter Oberndorfer 
Date:   Sun Dec 10 16:57:06 2006 +0100

comctl32: Fix imagelist regression from "comctl32: Remove Nx1 assumptions in ImageList_Read".

---

dlls/comctl32/imagelist.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 18a88c5..f14149b 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -1980,7 +1980,6 @@ HIMAGELIST WINAPI ImageList_Read (LPSTRE
 {
     ILHEAD	ilHead;
     HIMAGELIST	himl;
-    HBITMAP	hbmColor=0;
     int		i;

TRACE("%p\n", pstm);
@@ -1994,7 +1993,6 @@ HIMAGELIST WINAPI ImageList_Read (LPSTRE

himl = ImageList_Create(ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage);
     if (!himl) {
-	DeleteObject(hbmColor);
    return NULL;
     }
     if (!_read_bitmap(himl, himl->hdcImage, pstm, ilHead.flags & ~ILC_MASK)) {
@@ -2003,14 +2001,10 @@ HIMAGELIST WINAPI ImageList_Read (LPSTRE
     }
     if (ilHead.flags & ILC_MASK) {
    if (!_read_bitmap(himl, himl->hdcMask, pstm, 0)) {
-	    DeleteObject(hbmColor);
        return NULL;
    }
     }

-    SelectObject(himl->hdcImage, hbmColor);
-    DeleteObject(himl->hbmImage);
-    himl->hbmImage = hbmColor;
     himl->cCurImage = ilHead.cCurImage;
     himl->cMaxImage = ilHead.cMaxImage;