Changeset 10097 for trunk/src/comctl32/imagelist.c

Timestamp:

May 15, 2003, 4:25:14 PM (22 years ago)

Author:

sandervl

Message:

Wine resync

File:

• trunk/src/comctl32/imagelist.c (modified) (86 diffs)

trunk/src/comctl32/imagelist.c

@@ -27 +27 @@
  * of Comctl32.dll version 6.0 on Sep. 12, 2002, by Dimitrie O. Paun.
  * 
- * Unless otherwise noted, we belive this code to be complete, as per
+ * Unless otherwise noted, we believe this code to be complete, as per
  * the specification mentioned above.
  * If you discover missing features, or bugs, please note them below.
@@ -46 +46 @@
 #include "winerror.h"
 #include "winbase.h"
-#include "wine/obj_base.h"
-#include "wine/obj_storage.h"
+#include "objbase.h"
 #include "commctrl.h"
 #include "imagelist.h"
@@ -78 +77 @@
 
 
+static inline BOOL is_valid(HIMAGELIST himl)
+{
+    return himl && himl->magic == IMAGELIST_MAGIC;
+}
+
 
 /*************************************************************************
@@ -97 +101 @@
 IMAGELIST_InternalExpandBitmaps (HIMAGELIST himl, INT nImageCount, INT cx, INT cy)
 {
-    HDC     hdcImageList, hdcBitmap;
-    HBITMAP hbmNewBitmap;
+    HDC     hdcBitmap;
+    HBITMAP hbmNewBitmap, hbmNull;
     INT     nNewWidth, nNewCount;
 
@@ -110 +114 @@
 
     TRACE("Create expanded bitmaps : himl=%p x=%d y=%d count=%d\n", himl, nNewWidth, cy, nNewCount);
-    hdcImageList = CreateCompatibleDC (0);
     hdcBitmap = CreateCompatibleDC (0);
 
@@ -118 +121 @@
         ERR("creating new image bitmap (x=%d y=%d)!\n", nNewWidth, cy);
 
-    SelectObject (hdcImageList, himl->hbmImage);
-    SelectObject (hdcBitmap, hbmNewBitmap);
+    hbmNull = SelectObject (hdcBitmap, hbmNewBitmap);
     BitBlt (hdcBitmap, 0, 0, himl->cCurImage * himl->cx, cy,
-              hdcImageList, 0, 0, SRCCOPY);
-
+              himl->hdcImage, 0, 0, SRCCOPY);
+
+    SelectObject (hdcBitmap, hbmNull);
+    SelectObject (himl->hdcImage, hbmNewBitmap);
     DeleteObject (himl->hbmImage);
     himl->hbmImage = hbmNewBitmap;
@@ -133 +137 @@
             ERR("creating new mask bitmap!\n");
 
-        SelectObject (hdcImageList, himl->hbmMask);
         SelectObject (hdcBitmap, hbmNewBitmap);
         BitBlt (hdcBitmap, 0, 0, himl->cCurImage * himl->cx, cy,
-                  hdcImageList, 0, 0, SRCCOPY);
+                  himl->hdcMask, 0, 0, SRCCOPY);
+        SelectObject (hdcBitmap, hbmNull);
+        SelectObject (himl->hdcMask, hbmNewBitmap);
         DeleteObject (himl->hbmMask);
         himl->hbmMask = hbmNewBitmap;
@@ -143 +148 @@
     himl->cMaxImage = nNewCount;
 
-    DeleteDC (hdcImageList);
     DeleteDC (hdcBitmap);
 }
@@ -166 +170 @@
 ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask)
 {
-    HDC     hdcImage, hdcBitmap;
+    HDC     hdcBitmap;
     INT     nFirstIndex, nImageCount;
     INT     nStartX;
     BITMAP  bmp;
-    HBITMAP hOldBitmapImage, hOldBitmap;
+    HBITMAP hOldBitmap;
 
     TRACE("himl=%p hbmimage=%p hbmmask=%p\n", himl, hbmImage, hbmMask);
-    if (!himl || !hbmImage)
+    if (!is_valid(himl))
         return -1;
 
@@ -183 +187 @@
     nStartX = himl->cCurImage * himl->cx;
 
-    hdcImage  = CreateCompatibleDC(0);
     hdcBitmap = CreateCompatibleDC(0);
 
-    hOldBitmapImage = SelectObject(hdcImage, himl->hbmImage);
     hOldBitmap = SelectObject(hdcBitmap, hbmImage);
 
     /* Copy result to the imagelist
     */
-    BitBlt (hdcImage, nStartX, 0, bmp.bmWidth, bmp.bmHeight,
+    BitBlt (himl->hdcImage, nStartX, 0, bmp.bmWidth, bmp.bmHeight,
         hdcBitmap, 0, 0, SRCCOPY);
 
     if(himl->hbmMask)
     {
-        HDC hdcMask, hdcTemp;
-        HBITMAP hOldBitmapMask, hOldBitmapTemp;
-
-        hdcMask   = CreateCompatibleDC (0);
+        HDC hdcTemp;
+        HBITMAP hOldBitmapTemp;
+
         hdcTemp   = CreateCompatibleDC(0);
-        hOldBitmapMask = SelectObject(hdcMask, himl->hbmMask);
         hOldBitmapTemp = SelectObject(hdcTemp, hbmMask);
 
-        BitBlt (hdcMask,
+        BitBlt (himl->hdcMask,
             nStartX, 0, bmp.bmWidth, bmp.bmHeight,
             hdcTemp,
@@ -215 +215 @@
         /* Remove the background from the image
         */
-        BitBlt (hdcImage,
+        BitBlt (himl->hdcImage,
             nStartX, 0, bmp.bmWidth, bmp.bmHeight,
-            hdcMask,
+            himl->hdcMask,
             nStartX, 0,
             0x220326); /* NOTSRCAND */
-
-        SelectObject(hdcMask, hOldBitmapMask);
-        DeleteDC(hdcMask);
-    }
-
-    SelectObject(hdcImage, hOldBitmapImage);
+    }
+
     SelectObject(hdcBitmap, hOldBitmap);
-    DeleteDC(hdcImage);
     DeleteDC(hdcBitmap);
 
@@ -250 +245 @@
  *     Failure: -1
  */
-
-INT WINAPI
-ImageList_AddIcon (HIMAGELIST himl, HICON hIcon)
+#undef ImageList_AddIcon
+INT WINAPI ImageList_AddIcon (HIMAGELIST himl, HICON hIcon)
 {
     return ImageList_ReplaceIcon (himl, -1, hIcon);
@@ -277 +271 @@
 ImageList_AddMasked (HIMAGELIST himl, HBITMAP hBitmap, COLORREF clrMask)
 {
-    HDC    hdcImage, hdcMask, hdcBitmap;
+    HDC    hdcMask, hdcBitmap;
     INT    nIndex, nImageCount, nMaskXOffset=0;
     BITMAP bmp;
-    HBITMAP hOldBitmap, hOldBitmapMask, hOldBitmapImage;
+    HBITMAP hOldBitmap;
     HBITMAP hMaskBitmap=0;
     COLORREF bkColor;
 
     TRACE("himl=%p hbitmap=%p clrmask=%lx\n", himl, hBitmap, clrMask);
-    if (himl == NULL)
+    if (!is_valid(himl))
         return -1;
 
@@ -298 +292 @@
     himl->cCurImage += nImageCount;
 
-    hdcMask   = CreateCompatibleDC (0);
-    hdcImage  = CreateCompatibleDC(0);
     hdcBitmap = CreateCompatibleDC(0);
 
 
-    hOldBitmapImage = SelectObject(hdcImage, himl->hbmImage);
     hOldBitmap = SelectObject(hdcBitmap, hBitmap);
     if(himl->hbmMask)
     {
-        hOldBitmapMask = SelectObject(hdcMask, himl->hbmMask);
+        hdcMask = himl->hdcMask;
         nMaskXOffset = nIndex * himl->cx;
     }
@@ -316 +307 @@
             the Image (Windows does this even if there is no mask)
         */
+        hdcMask = CreateCompatibleDC(0);
         hMaskBitmap = CreateBitmap(bmp.bmWidth, bmp.bmHeight, 1, 1, NULL);
-        hOldBitmapMask = SelectObject(hdcMask, hMaskBitmap);
+        SelectObject(hdcMask, hMaskBitmap);
         nMaskXOffset = 0;
     }
@@ -348 +340 @@
     /* Copy result to the imagelist
     */
-    BitBlt (hdcImage,
+    BitBlt (himl->hdcImage,
         nIndex * himl->cx, 0, bmp.bmWidth, bmp.bmHeight,
         hdcBitmap,
@@ -355 +347 @@
     /* Clean up
     */
-    SelectObject(hdcMask,hOldBitmapMask);
-    SelectObject(hdcImage, hOldBitmapImage);
     SelectObject(hdcBitmap, hOldBitmap);
-    DeleteDC(hdcMask);
-    DeleteDC(hdcImage);
     DeleteDC(hdcBitmap);
     if(!himl->hbmMask)
     {
         DeleteObject(hMaskBitmap);
+        DeleteDC(hdcMask);
     }
 
@@ -391 +380 @@
                      INT dxHotspot, INT dyHotspot)
 {
-    HDC hdcSrc, hdcDst;
     INT cx, cy;
 
@@ -397 +385 @@
           dxHotspot, dyHotspot);
 
-    if (himlTrack == NULL)
+    if (!is_valid(himlTrack))
         return FALSE;
 
@@ -415 +403 @@
     InternalDrag.dyHotspot = dyHotspot;
 
-    hdcSrc = CreateCompatibleDC (0);
-    hdcDst = CreateCompatibleDC (0);
-
     /* copy image */
-    SelectObject (hdcSrc, himlTrack->hbmImage);
-    SelectObject (hdcDst, InternalDrag.himl->hbmImage);
-    BitBlt (hdcDst, 0, 0, cx, cy, hdcSrc, iTrack * cx, 0, SRCCOPY);
+    BitBlt (InternalDrag.himl->hdcImage, 0, 0, cx, cy, himlTrack->hdcImage, iTrack * cx, 0, SRCCOPY);
 
     /* copy mask */
-    SelectObject (hdcSrc, himlTrack->hbmMask);
-    SelectObject (hdcDst, InternalDrag.himl->hbmMask);
-    BitBlt (hdcDst, 0, 0, cx, cy, hdcSrc, iTrack * cx, 0, SRCCOPY);
-
-    DeleteDC (hdcSrc);
-    DeleteDC (hdcDst);
+    BitBlt (InternalDrag.himl->hdcMask, 0, 0, cx, cy, himlTrack->hdcMask, iTrack * cx, 0, SRCCOPY);
 
     InternalDrag.himl->cCurImage = 1;
@@ -465 +443 @@
                 INT iSrc, INT uFlags)
 {
-    HDC hdcSrc, hdcDst;
-
     TRACE("iDst=%d  iSrc=%d\n", iDst, iSrc);
 
-    if ((himlSrc == NULL) || (himlDst == NULL))
+    if (!is_valid(himlSrc) || !is_valid(himlDst))
         return FALSE;
     if ((iDst < 0) || (iDst >= himlDst->cCurImage))
@@ -476 +452 @@
         return FALSE;
 
-    hdcSrc = CreateCompatibleDC (0);
-    if (himlDst == himlSrc)
-        hdcDst = hdcSrc;
-    else
-        hdcDst = CreateCompatibleDC (0);
-
     if (uFlags & ILCF_SWAP) {
         /* swap */
+        HDC     hdcBmp;
         HBITMAP hbmTempImage, hbmTempMask;
 
+        hdcBmp = CreateCompatibleDC (0);
+        
         /* create temporary bitmaps */
         hbmTempImage = CreateBitmap (himlSrc->cx, himlSrc->cy, 1,
@@ -494 +467 @@
         /* copy (and stretch) destination to temporary bitmaps.(save) */
         /* image */
-        SelectObject (hdcSrc, himlDst->hbmImage);
-        SelectObject (hdcDst, hbmTempImage);
-        StretchBlt (hdcDst, 0, 0, himlSrc->cx, himlSrc->cy,
-                      hdcSrc, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
+        SelectObject (hdcBmp, hbmTempImage);
+        StretchBlt   (hdcBmp, 0, 0, himlSrc->cx, himlSrc->cy,
+                      himlDst->hdcImage, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
                       SRCCOPY);
         /* mask */
-        SelectObject (hdcSrc, himlDst->hbmMask);
-        SelectObject (hdcDst, hbmTempMask);
-        StretchBlt (hdcDst, 0, 0, himlSrc->cx, himlSrc->cy,
-                      hdcSrc, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
+        SelectObject (hdcBmp, hbmTempMask);
+        StretchBlt   (hdcBmp, 0, 0, himlSrc->cx, himlSrc->cy,
+                      himlDst->hdcMask, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
                       SRCCOPY);
 
         /* copy (and stretch) source to destination */
         /* image */
-        SelectObject (hdcSrc, himlSrc->hbmImage);
-        SelectObject (hdcDst, himlDst->hbmImage);
-        StretchBlt (hdcDst, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
-                      hdcSrc, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
+        StretchBlt   (himlDst->hdcImage, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
+                      himlSrc->hdcImage, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
                       SRCCOPY);
         /* mask */
-        SelectObject (hdcSrc, himlSrc->hbmMask);
-        SelectObject (hdcDst, himlDst->hbmMask);
-        StretchBlt (hdcDst, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
-                      hdcSrc, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
+        StretchBlt   (himlDst->hdcMask, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
+                      himlSrc->hdcMask, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
                       SRCCOPY);
 
         /* copy (without stretching) temporary bitmaps to source (restore) */
+        /* mask */
+        BitBlt       (himlSrc->hdcMask, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
+                      hdcBmp, 0, 0, SRCCOPY);
+
         /* image */
-        SelectObject (hdcSrc, hbmTempImage);
-        SelectObject (hdcDst, himlSrc->hbmImage);
-        BitBlt (hdcDst, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
-                  hdcSrc, 0, 0, SRCCOPY);
-        /* mask */
-        SelectObject (hdcSrc, hbmTempMask);
-        SelectObject (hdcDst, himlSrc->hbmMask);
-        BitBlt (hdcDst, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
-                  hdcSrc, 0, 0, SRCCOPY);
-
+        BitBlt       (himlSrc->hdcImage, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
+                      hdcBmp, 0, 0, SRCCOPY);
         /* delete temporary bitmaps */
         DeleteObject (hbmTempMask);
         DeleteObject (hbmTempImage);
+        DeleteDC(hdcBmp);
     }
     else {
         /* copy image */
-        SelectObject (hdcSrc, himlSrc->hbmImage);
-        if (himlSrc == himlDst)
-            hdcDst = hdcSrc;
-        else
-            SelectObject (hdcDst, himlDst->hbmImage);
-        StretchBlt (hdcDst, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
-                      hdcSrc, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
+        StretchBlt   (himlDst->hdcImage, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
+                      himlSrc->hdcImage, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
                       SRCCOPY);
 
         /* copy mask */
-        SelectObject (hdcSrc, himlSrc->hbmMask);
-        if (himlSrc == himlDst)
-            hdcDst = hdcSrc;
-        else
-            SelectObject (hdcDst, himlDst->hbmMask);
-        StretchBlt (hdcDst, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
-                      hdcSrc, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
+        StretchBlt   (himlDst->hdcMask, iDst * himlDst->cx, 0, himlDst->cx, himlDst->cy,
+                      himlSrc->hdcMask, iSrc * himlSrc->cx, 0, himlSrc->cx, himlSrc->cy,
                       SRCCOPY);
     }
-
-    DeleteDC (hdcSrc);
-    if (himlSrc != himlDst)
-        DeleteDC (hdcDst);
 
     return TRUE;
@@ -586 +536 @@
 {
     HIMAGELIST himl;
-    HDC      hdc;
     INT      nCount;
     HBITMAP  hbmTemp;
@@ -601 +550 @@
         return NULL;
 
+    cGrow = (cGrow < 4) ? 4 : (cGrow + 3) & ~3;
+
+    himl->magic     = IMAGELIST_MAGIC;
     himl->cx        = cx;
     himl->cy        = cy;
@@ -607 +559 @@
     himl->cInitial  = cInitial;
     himl->cGrow     = cGrow;
-    himl->cCurImage = 0;
     himl->clrFg     = CLR_DEFAULT;
     himl->clrBk     = CLR_NONE;
@@ -615 +566 @@
         himl->nOvlIdx[nCount] = -1;
 
-    hdc = CreateCompatibleDC (0);
-    himl->uBitsPixel = (UINT)GetDeviceCaps (hdc, BITSPIXEL);
-    DeleteDC (hdc);
+    /* Create Image & Mask DCs */
+    himl->hdcImage = CreateCompatibleDC (0);
+    if (!himl->hdcImage)
+        goto cleanup;
+    if (himl->flags & ILC_MASK){
+        himl->hdcMask = CreateCompatibleDC(0);
+        if (!himl->hdcMask)
+            goto cleanup;
+    }
+
+    himl->uBitsPixel = (UINT)GetDeviceCaps (himl->hdcImage, BITSPIXEL);
 
     TRACE("Image: %d Bits per Pixel\n", himl->uBitsPixel);
@@ -627 +586 @@
         if (himl->hbmImage == 0) {
             ERR("Error creating image bitmap!\n");
-            return NULL;
+            goto cleanup;
         }
-    }
-    else
-        himl->hbmImage = 0;
-
-    if ( (himl->flags & ILC_MASK)) {
-        int images = himl->cMaxImage;
-        if (images <= 0)
-            images = 1;
-
-        himl->hbmMask = CreateBitmap (himl->cx * images, himl->cy,
-                                        1, 1, NULL);
+        SelectObject(himl->hdcImage, himl->hbmImage);
+    }
+
+    if (himl->flags & ILC_MASK) {
+        himl->hbmMask =
+          CreateBitmap (himl->cx * himl->cMaxImage, himl->cy,
+                        1, 1, NULL);
         if (himl->hbmMask == 0) {
             ERR("Error creating mask bitmap!\n");
-            if (himl->hbmImage)
-                DeleteObject (himl->hbmImage);
-            return NULL;
+            goto cleanup;
         }
-    }
-    else
-        himl->hbmMask = 0;
+        SelectObject(himl->hdcMask, himl->hbmMask);
+    }
 
     /* create blending brushes */
@@ -661 +613 @@
     TRACE("created imagelist %p\n", himl);
     return himl;
+
+cleanup:
+    if (himl) ImageList_Destroy(himl);
+    return NULL;
 }
 
@@ -680 +636 @@
 ImageList_Destroy (HIMAGELIST himl)
 {
-    if (!himl)
+    if (!is_valid(himl))
         return FALSE;
 
@@ -689 +645 @@
         DeleteObject (himl->hbmMask);
 
+    /* delete image & mask DCs */
+    if (himl->hdcImage)
+        DeleteDC(himl->hdcImage);
+    if (himl->hdcMask)
+        DeleteDC(himl->hdcMask);
+
     /* delete blending brushes */
     if (himl->hbrBlend25)
@@ -726 +688 @@
     TRACE("(hwnd=%p x=%d y=%d)\n", hwndLock, x, y);
 
-    if (InternalDrag.himl == NULL)
+    if (!is_valid(InternalDrag.himl))
         return FALSE;
 
@@ -848 +810 @@
     TRACE("(x=%d y=%d)\n", x, y);
 
-    if (!InternalDrag.himl) {
+    if (!is_valid(InternalDrag.himl))
         return FALSE;
-    }
 
     /* draw/update the drag image */
@@ -937 +898 @@
     INT x, y;
 
+    if (!is_valid(InternalDrag.himl))
+        return FALSE;
+    
     TRACE("bShow=0x%X!\n", bShow);
 
@@ -1081 +1045 @@
     COLORREF clrBk, oldImageBk, oldImageFg;
     HDC hImageDC, hImageListDC, hMaskListDC;
-    HBITMAP hImageBmp, hOldImageBmp, hOldImageListBmp, hOldMaskListBmp, hBlendMaskBmp;
+    HBITMAP hImageBmp, hOldImageBmp, hBlendMaskBmp;
     BOOL bIsTransparent, bBlend, bResult = FALSE;
     HIMAGELIST himl;
 
     if (!pimldp || !(himl = pimldp->himl)) return FALSE;
+    if (!is_valid(himl)) return FALSE;
     if ((pimldp->i < 0) || (pimldp->i >= himl->cCurImage)) return FALSE;
 
@@ -1103 +1068 @@
 
     /* we will use these DCs to access the images and masks in the ImageList */
-    hImageListDC = CreateCompatibleDC(0);
-    hMaskListDC = himl->hbmMask ? CreateCompatibleDC(0) : 0;
+    hImageListDC = himl->hdcImage;
+    hMaskListDC  = himl->hdcMask;
 
     /* these will accumulate the image and mask for the image we're drawing */
@@ -1116 +1081 @@
         goto cleanup;
     
-    hOldImageListBmp = SelectObject(hImageListDC, himl->hbmImage);
     hOldImageBmp = SelectObject(hImageDC, hImageBmp);
-    hOldMaskListBmp = hMaskListDC ? SelectObject(hMaskListDC, himl->hbmMask) : 0;
   
     /*
@@ -1220 +1183 @@
     SetTextColor(hImageDC, oldImageFg);
     SelectObject(hImageDC, hOldImageBmp);
-    SelectObject(hImageListDC, hOldImageListBmp);
-    if (hMaskListDC) SelectObject(hMaskListDC, hOldMaskListBmp);
 cleanup:
     DeleteObject(hBlendMaskBmp);
     DeleteObject(hImageBmp);
     DeleteDC(hImageDC);
-    DeleteDC(hImageListDC);
-    DeleteDC(hMaskListDC);
 
     return bResult;
@@ -1248 +1207 @@
 {
     HIMAGELIST himlDst;
-    HDC hdcSrc, hdcDst;
-
-    if (himlSrc == NULL) {
+
+    if (!is_valid(himlSrc)) {
         ERR("Invalid image list handle!\n");
         return NULL;
@@ -1260 +1218 @@
     if (himlDst)
     {
-        hdcSrc = CreateCompatibleDC (0);
-        hdcDst = CreateCompatibleDC (0);
-        SelectObject (hdcSrc, himlSrc->hbmImage);
-        SelectObject (hdcDst, himlDst->hbmImage);
-        BitBlt (hdcDst, 0, 0, himlSrc->cCurImage * himlSrc->cx, himlSrc->cy,
-                  hdcSrc, 0, 0, SRCCOPY);
+        BitBlt (himlDst->hdcImage, 0, 0, himlSrc->cCurImage * himlSrc->cx, himlSrc->cy,
+                himlSrc->hdcImage, 0, 0, SRCCOPY);
 
         if (himlDst->hbmMask)
-        {
-            SelectObject (hdcSrc, himlSrc->hbmMask);
-            SelectObject (hdcDst, himlDst->hbmMask);
-            BitBlt (hdcDst, 0, 0, himlSrc->cCurImage * himlSrc->cx,
-                      himlSrc->cy, hdcSrc, 0, 0, SRCCOPY);
-        }
-
-        DeleteDC (hdcDst);
-        DeleteDC (hdcSrc);
+            BitBlt (himlDst->hdcMask, 0, 0, himlSrc->cCurImage * himlSrc->cx, himlSrc->cy,
+                    himlSrc->hdcMask, 0, 0, SRCCOPY);
 
         himlDst->cCurImage = himlSrc->cCurImage;
@@ -1355 +1302 @@
 ImageList_GetDragImage (POINT *ppt, POINT *pptHotspot)
 {
-    if (InternalDrag.himl) {
+    if (is_valid(InternalDrag.himl)) {
         if (ppt) {
             ppt->x = InternalDrag.x;
@@ -1409 +1356 @@
     HDC hdcDst;
 
-    if ((himl == NULL) || (i < 0) || (i >= himl->cCurImage)) return 0;
+    TRACE("%p %d %d\n", himl, i, fStyle);
+    if (!is_valid(himl) || (i < 0) || (i >= himl->cCurImage)) return NULL;
 
     hdcDst = CreateCompatibleDC(0);
 
     ii.fIcon = TRUE;
+    ii.xHotspot = 0;
+    ii.yHotspot = 0;
 
     /* draw mask*/
     ii.hbmMask  = CreateCompatibleBitmap (hdcDst, himl->cx, himl->cy);
-    hOldDstBitmap = (HBITMAP)SelectObject (hdcDst, ii.hbmMask);
-    ImageList_Draw(himl, i, hdcDst, 0, 0, ILD_MASK);
+    hOldDstBitmap = SelectObject (hdcDst, ii.hbmMask);
+    PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, WHITENESS);
+    ImageList_Draw(himl, i, hdcDst, 0, 0, fStyle | ILD_MASK);
 
     /* draw image*/
-    SelectObject (hdcDst, himl->hbmImage);
-    ii.hbmColor = CreateCompatibleBitmap (hdcDst, himl->cx, himl->cy);
+    ii.hbmColor = CreateCompatibleBitmap (himl->hdcImage, himl->cx, himl->cy);
     SelectObject (hdcDst, ii.hbmColor);
-    ImageList_Draw(himl, i, hdcDst, 0, 0, fStyle);
+    PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS);
+    ImageList_Draw(himl, i, hdcDst, 0, 0, fStyle | ILD_TRANSPARENT);
 
     /*
@@ -1463 +1414 @@
 ImageList_GetIconSize (HIMAGELIST himl, INT *cx, INT *cy)
 {
-    if (himl == NULL)
+    if (!is_valid(himl))
         return FALSE;
     if ((himl->cx <= 0) || (himl->cy <= 0))
@@ -1493 +1444 @@
 ImageList_GetImageCount (HIMAGELIST himl)
 {
-    if (himl == NULL)
+    if (!is_valid(himl))
         return 0;
 
@@ -1518 +1469 @@
 ImageList_GetImageInfo (HIMAGELIST himl, INT i, IMAGEINFO *pImageInfo)
 {
-    if ((himl == NULL) || (pImageInfo == NULL))
+    if (!is_valid(himl) || (pImageInfo == NULL))
         return FALSE;
     if ((i < 0) || (i >= himl->cCurImage))
@@ -1556 +1507 @@
 ImageList_GetImageRect (HIMAGELIST himl, INT i, LPRECT lpRect)
 {
-    if ((himl == NULL) || (lpRect == NULL))
+    if (!is_valid(himl) || (lpRect == NULL))
         return FALSE;
     if ((i < 0) || (i >= himl->cCurImage))
@@ -1627 +1578 @@
         himl = ImageList_Create (cx, bmp.bmHeight, ILC_MASK | ILC_COLOR,
                                  nImageCount, cGrow);
+        if (!himl) {
+            DeleteObject (handle);
+            return NULL;
+        }
         ImageList_AddMasked (himl, (HBITMAP)handle, clrMask);
     }
@@ -1637 +1592 @@
         himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight,
                                  ILC_MASK | ILC_COLOR, 1, cGrow);
+        if (!himl) {
+            DeleteObject (ii.hbmColor);
+            DeleteObject (ii.hbmMask);
+            DeleteObject (handle);
+            return NULL;
+        }
         ImageList_Add (himl, ii.hbmColor, ii.hbmMask);
         DeleteObject (ii.hbmColor);
@@ -1704 +1665 @@
         himl = ImageList_Create (cx, bmp.bmHeight, ILC_MASK | ILC_COLOR,
                                  nImageCount, cGrow);
+        if (!himl) {
+            DeleteObject (handle);
+            return NULL;
+        }
         ImageList_AddMasked (himl, (HBITMAP)handle, clrMask);
     }
@@ -1711 +1676 @@
 
         GetIconInfo (handle, &ii);
-        GetObjectA (ii.hbmMask, sizeof(BITMAP), (LPVOID)&bmp);
+        GetObjectW (ii.hbmMask, sizeof(BITMAP), (LPVOID)&bmp);
         himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight,
                                  ILC_MASK | ILC_COLOR, 1, cGrow);
+        if (!himl) {
+            DeleteObject (ii.hbmColor);
+            DeleteObject (ii.hbmMask);
+            DeleteObject (handle);
+            return NULL;
+        }
         ImageList_Add (himl, ii.hbmColor, ii.hbmMask);
         DeleteObject (ii.hbmColor);
@@ -1749 +1720 @@
 {
     HIMAGELIST himlDst = NULL;
-    HDC      hdcSrcImage, hdcDstImage;
     INT      cxDst, cyDst;
     INT      xOff1, yOff1, xOff2, yOff2;
@@ -1757 +1727 @@
            i2, dx, dy);
 
-    if ((himl1 == NULL) || (himl2 == NULL))
+    if (!is_valid(himl1) || !is_valid(himl2))
         return NULL;
 
@@ -1804 +1774 @@
 
     himlDst = ImageList_Create (cxDst, cyDst, ILC_MASK | ILC_COLOR, 1, 1);
+    if (!himlDst)
+        return NULL;
 
     if (himlDst) {
-        hdcSrcImage = CreateCompatibleDC (0);
-        hdcDstImage = CreateCompatibleDC (0);
         nX1 = i1 * himl1->cx;
         nX2 = i2 * himl2->cx;
 
         /* copy image */
-        SelectObject (hdcSrcImage, himl1->hbmImage);
-        SelectObject (hdcDstImage, himlDst->hbmImage);
-        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst,
-                  hdcSrcImage, 0, 0, BLACKNESS);
-        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy,
-                  hdcSrcImage, nX1, 0, SRCCOPY);
-
-        SelectObject (hdcSrcImage, himl2->hbmMask);
-        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy,
-                  hdcSrcImage, nX2, 0, SRCAND);
-
-        SelectObject (hdcSrcImage, himl2->hbmImage);
-        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy,
-                  hdcSrcImage, nX2, 0, SRCPAINT);
+        BitBlt (himlDst->hdcImage,     0,     0,     cxDst,     cyDst, himl1->hdcImage,   0, 0, BLACKNESS);
+        BitBlt (himlDst->hdcImage, xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcImage, nX1, 0, SRCCOPY);
+        BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask , nX2, 0, SRCAND);
+        BitBlt (himlDst->hdcImage, xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcImage, nX2, 0, SRCPAINT);
 
         /* copy mask */
-        SelectObject (hdcSrcImage, himl1->hbmMask);
-        SelectObject (hdcDstImage, himlDst->hbmMask);
-        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst,
-                  hdcSrcImage, 0, 0, WHITENESS);
-        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy,
-                  hdcSrcImage, nX1, 0, SRCCOPY);
-
-        SelectObject (hdcSrcImage, himl2->hbmMask);
-        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy,
-                  hdcSrcImage, nX2, 0, SRCAND);
-
-        DeleteDC (hdcSrcImage);
-        DeleteDC (hdcDstImage);
+        BitBlt (himlDst->hdcMask,      0,     0,     cxDst,     cyDst, himl1->hdcMask,    0, 0, WHITENESS);
+        BitBlt (himlDst->hdcMask,  xOff1, yOff1, himl1->cx, himl1->cy, himl1->hdcMask,  nX1, 0, SRCCOPY);
+        BitBlt (himlDst->hdcMask,  xOff2, yOff2, himl2->cx, himl2->cy, himl2->hdcMask,  nX2, 0, SRCAND);
+
         himlDst->cCurImage = 1;
     }
@@ -1862 +1813 @@
 /* helper for ImageList_Read, see comments below */
 static HBITMAP _read_bitmap(LPSTREAM pstm,int ilcFlag,int cx,int cy) {
-    HDC                 xdc = 0;
+    HDC                        xdc = 0, hBitmapDC =0;
     BITMAPFILEHEADER    bmfh;
     BITMAPINFOHEADER    bmih;
@@ -1868 +1819 @@
     LPBITMAPINFOHEADER  bmihc = NULL;
     int                 result = 0;
-    HBITMAP             hbitmap = 0;
-    LPBYTE              bits = NULL,nbits = NULL;
-    int                 nbytesperline,bytesperline;
+    HBITMAP            hbitmap = 0, hDIB = 0;
+    LPBYTE             bits = NULL;
 
     if (!SUCCEEDED(IStream_Read ( pstm, &bmfh, sizeof(bmfh), NULL))     ||
@@ -1910 +1860 @@
 #endif
     {
-        int i,nwidth,nheight;
+       int i,nwidth,nheight,nRows;
 
         nwidth  = width*(height/cy);
         nheight = cy;
+        nRows   = (height/cy);
 
         if (bitsperpixel==1)
@@ -1920 +1871 @@
             hbitmap = CreateCompatibleBitmap(xdc,nwidth,nheight);
 
-        /* Might be a bit excessive memory use here */
-        bits = (LPBYTE)LocalAlloc(LMEM_ZEROINIT,bmihc->biSizeImage);
-        nbits = (LPBYTE)LocalAlloc(LMEM_ZEROINIT,bmihc->biSizeImage);
-        if (!SUCCEEDED(IStream_Read ( pstm, bits, bmihc->biSizeImage, NULL)))
-                goto ret1;
+       hDIB = CreateDIBSection(xdc,(BITMAPINFO*)bmihc,0,(LPVOID*)&bits,0,0);
+       if (!hDIB)
+           goto ret1;
+       if (!SUCCEEDED(IStream_Read( pstm, bits, bmihc->biSizeImage, NULL)))
+           goto ret1;
+
+        hBitmapDC = CreateCompatibleDC(0);
+        SelectObject(hBitmapDC, hbitmap);
 
         /* Copy the NxM bitmap into a 1x(N*M) bitmap we need, linewise */
         /* Do not forget that windows bitmaps are bottom->top */
-        bytesperline    = longsperline*4;
-        nbytesperline   = (height/cy)*bytesperline;
-        for (i=0;i<height;i++) {
-            memcpy(
-                nbits+((height-1-i)%cy)*nbytesperline+(i/cy)*bytesperline,
-                bits+bytesperline*(height-1-i),
-                bytesperline
-            );
-        }
-        bmihc->biWidth  = nwidth;
-        bmihc->biHeight = nheight;
-        if (!SetDIBits(xdc,hbitmap,0,nheight,nbits,(BITMAPINFO*)bmihc,0))
-                goto ret1;
-        LocalFree((HLOCAL)nbits);
-        LocalFree((HLOCAL)bits);
+        TRACE("nRows=%d\n", nRows);
+        for (i=0; i < nRows; i++){
+            StretchDIBits(hBitmapDC, width*i, 0, width, cy, 0, cy*(nRows-1-i), width, cy, bits,
+                (BITMAPINFO*)bmihc, DIB_RGB_COLORS, SRCCOPY);
+        }
+        
         result = 1;
     }
@@ -1948 +1893 @@
     if (xdc)    ReleaseDC(0,xdc);
     if (bmihc)  LocalFree((HLOCAL)bmihc);
+    if (hDIB)   DeleteObject(hDIB);
+    if (hBitmapDC)   DeleteDC(hBitmapDC);
     if (!result) {
         if (hbitmap) {
@@ -2041 +1988 @@
         return NULL;
     }
+    SelectObject(himl->hdcImage, hbmColor);
+    DeleteObject(himl->hbmImage);
     himl->hbmImage = hbmColor;
-    himl->hbmMask = hbmMask;
+    if (hbmMask){
+        SelectObject(himl->hdcMask, hbmMask);
+        DeleteObject(himl->hbmMask);
+        himl->hbmMask = hbmMask;
+    }
     himl->cCurImage = ilHead.cCurImage;
     himl->cMaxImage = ilHead.cMaxImage;
@@ -2069 +2022 @@
 {
     HBITMAP hbmNewImage, hbmNewMask;
-    HDC     hdcSrc, hdcDst;
+    HDC     hdcBmp;
     INT     cxNew, nCount;
 
     TRACE("(himl=%p i=%d)\n", himl, i);
 
-    if (himl == NULL) {
+    if (!is_valid(himl)) {
         ERR("Invalid image list handle!\n");
         return FALSE;
@@ -2097 +2050 @@
              himl->nOvlIdx[nCount] = -1;
 
+        hbmNewImage = CreateBitmap (himl->cMaxImage * himl->cx, himl->cy,
+                            1, himl->uBitsPixel, NULL);
+        SelectObject (himl->hdcImage, hbmNewImage);
         DeleteObject (himl->hbmImage);
-        himl->hbmImage =
-            CreateBitmap (himl->cMaxImage * himl->cx, himl->cy,
-                            1, himl->uBitsPixel, NULL);
+        himl->hbmImage = hbmNewImage;
 
         if (himl->hbmMask) {
+            hbmNewMask = CreateBitmap (himl->cMaxImage * himl->cx, himl->cy,
+                                1, 1, NULL);
+            SelectObject (himl->hdcMask, hbmNewMask);
             DeleteObject (himl->hbmMask);
-            himl->hbmMask =
-                CreateBitmap (himl->cMaxImage * himl->cx, himl->cy,
-                                1, 1, NULL);
+            himl->hbmMask = hbmNewMask;
         }
     }
@@ -2129 +2084 @@
             hbmNewMask = 0;  /* Just to keep compiler happy! */
 
-        hdcSrc = CreateCompatibleDC (0);
-        hdcDst = CreateCompatibleDC (0);
+        hdcBmp = CreateCompatibleDC (0);
 
         /* copy all images and masks prior to the "removed" image */
@@ -2136 +2090 @@
             TRACE("Pre image copy: Copy %d images\n", i);
 
-            SelectObject (hdcSrc, himl->hbmImage);
-            SelectObject (hdcDst, hbmNewImage);
-            BitBlt (hdcDst, 0, 0, i * himl->cx, himl->cy,
-                      hdcSrc, 0, 0, SRCCOPY);
+            SelectObject (hdcBmp, hbmNewImage);
+            BitBlt (hdcBmp, 0, 0, i * himl->cx, himl->cy,
+                    himl->hdcImage, 0, 0, SRCCOPY);
 
             if (himl->hbmMask) {
-                SelectObject (hdcSrc, himl->hbmMask);
-                SelectObject (hdcDst, hbmNewMask);
-                BitBlt (hdcDst, 0, 0, i * himl->cx, himl->cy,
-                          hdcSrc, 0, 0, SRCCOPY);
+                SelectObject (hdcBmp, hbmNewMask);
+                BitBlt (hdcBmp, 0, 0, i * himl->cx, himl->cy,
+                        himl->hdcMask, 0, 0, SRCCOPY);
             }
         }
@@ -2152 +2104 @@
         if (i < himl->cCurImage - 1) {
             TRACE("Post image copy!\n");
-            SelectObject (hdcSrc, himl->hbmImage);
-            SelectObject (hdcDst, hbmNewImage);
-            BitBlt (hdcDst, i * himl->cx, 0, (himl->cCurImage - i - 1) * himl->cx,
-                      himl->cy, hdcSrc, (i + 1) * himl->cx, 0, SRCCOPY);
+            SelectObject (hdcBmp, hbmNewImage);
+            BitBlt (hdcBmp, i * himl->cx, 0, (himl->cCurImage - i - 1) * himl->cx,
+                      himl->cy, himl->hdcImage, (i + 1) * himl->cx, 0, SRCCOPY);
 
             if (himl->hbmMask) {
-                SelectObject (hdcSrc, himl->hbmMask);
-                SelectObject (hdcDst, hbmNewMask);
-                BitBlt (hdcDst, i * himl->cx, 0,
+                SelectObject (hdcBmp, hbmNewMask);
+                BitBlt (hdcBmp, i * himl->cx, 0,
                           (himl->cCurImage - i - 1) * himl->cx,
-                          himl->cy, hdcSrc, (i + 1) * himl->cx, 0, SRCCOPY);
+                          himl->cy, himl->hdcMask, (i + 1) * himl->cx, 0, SRCCOPY);
             }
         }
 
-        DeleteDC (hdcSrc);
-        DeleteDC (hdcDst);
+        DeleteDC (hdcBmp);
 
         /* delete old images and insert new ones */
+        SelectObject (himl->hdcImage, hbmNewImage);
         DeleteObject (himl->hbmImage);
         himl->hbmImage = hbmNewImage;
         if (himl->hbmMask) {
+            SelectObject (himl->hdcMask, hbmNewMask);
             DeleteObject (himl->hbmMask);
             himl->hbmMask = hbmNewMask;
@@ -2205 +2156 @@
                    HBITMAP hbmMask)
 {
-    HDC hdcImageList, hdcImage;
+    HDC hdcImage;
     BITMAP bmp;
 
     TRACE("%p %d %p %p\n", himl, i, hbmImage, hbmMask);
 
-    if (himl == NULL) {
+    if (!is_valid(himl)) {
         ERR("Invalid image list handle!\n");
         return FALSE;
@@ -2220 +2171 @@
     }
 
-    hdcImageList = CreateCompatibleDC (0);
     hdcImage = CreateCompatibleDC (0);
     GetObjectA (hbmImage, sizeof(BITMAP), (LPVOID)&bmp);
 
     /* Replace Image */
-    SelectObject (hdcImageList, himl->hbmImage);
     SelectObject (hdcImage, hbmImage);
 
-    StretchBlt (hdcImageList, i * himl->cx, 0, himl->cx, himl->cy,
+    StretchBlt (himl->hdcImage, i * himl->cx, 0, himl->cx, himl->cy,
                   hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
 
@@ -2234 +2183 @@
     {
         /* Replace Mask */
-        SelectObject (hdcImageList, himl->hbmMask);
         SelectObject (hdcImage, hbmMask);
 
-        StretchBlt (hdcImageList, i * himl->cx, 0, himl->cx, himl->cy,
+        StretchBlt (himl->hdcMask, i * himl->cx, 0, himl->cx, himl->cy,
                       hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
 
@@ -2243 +2191 @@
         /* Remove the background from the image
         */
-        SelectObject (hdcImageList, himl->hbmImage);
-        StretchBlt (hdcImageList,
+        StretchBlt (himl->hdcImage,
             i*himl->cx, 0, himl->cx, himl->cy,
             hdcImage,
@@ -2252 +2199 @@
 
     DeleteDC (hdcImage);
-    DeleteDC (hdcImageList);
 
     return TRUE;
@@ -2276 +2222 @@
 ImageList_ReplaceIcon (HIMAGELIST himl, INT i, HICON hIcon)
 {
-    HDC     hdcImageList, hdcImage;
+    HDC     hdcImage;
     INT     nIndex;
     HICON   hBestFitIcon;
-    HBITMAP hbmOldSrc, hbmOldDst;
+    HBITMAP hbmOldSrc;
     ICONINFO  ii;
     BITMAP  bmp;
@@ -2285 +2231 @@
     TRACE("(0x%lx 0x%x %p)\n", (DWORD)himl, i, hIcon);
 
-    if (himl == NULL)
+    if (!is_valid(himl))
         return -1;
     if ((i >= himl->cMaxImage) || (i < -1))
@@ -2312 +2258 @@
         nIndex = i;
 
-    hdcImageList = CreateCompatibleDC (0);
-    TRACE("hdcImageList=%p!\n", hdcImageList);
-    if (hdcImageList == 0)
-        ERR("invalid hdcImageList!\n");
-
     hdcImage = CreateCompatibleDC (0);
-    TRACE("hdcImage=%p!\n", hdcImage);
+    TRACE("hdcImage=%p\n", hdcImage);
     if (hdcImage == 0)
         ERR("invalid hdcImage!\n");
 
-    hbmOldDst = SelectObject (hdcImageList, himl->hbmImage);
-    SetTextColor( hdcImageList, RGB(0,0,0));
-    SetBkColor( hdcImageList, RGB(255,255,255));
+    SetTextColor(himl->hdcImage, RGB(0,0,0));
+    SetBkColor  (himl->hdcImage, RGB(255,255,255));
     hbmOldSrc = SelectObject (hdcImage, ii.hbmColor);
-    StretchBlt (hdcImageList, nIndex * himl->cx, 0, himl->cx, himl->cy,
+
+    StretchBlt (himl->hdcImage, nIndex * himl->cx, 0, himl->cx, himl->cy,
                   hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
 
     if (himl->hbmMask) {
-        SelectObject (hdcImageList, himl->hbmMask);
         SelectObject (hdcImage, ii.hbmMask);
-        StretchBlt (hdcImageList, nIndex * himl->cx, 0, himl->cx, himl->cy,
+        StretchBlt   (himl->hdcMask, nIndex * himl->cx, 0, himl->cx, himl->cy,
                       hdcImage, 0, 0, bmp.bmWidth, bmp.bmHeight, SRCCOPY);
     }
 
     SelectObject (hdcImage, hbmOldSrc);
-    SelectObject (hdcImageList, hbmOldDst);
 
     if(hBestFitIcon)
         DestroyIcon(hBestFitIcon);
-    if (hdcImageList)
-        DeleteDC (hdcImageList);
     if (hdcImage)
         DeleteDC (hdcImage);
@@ -2373 +2310 @@
     COLORREF clrOldBk;
 
-    if (himl == NULL)
+    if (!is_valid(himl))
         return CLR_NONE;
 
@@ -2411 +2348 @@
     BOOL visible;
 
-    if (InternalDrag.himl == NULL)
+    if (!is_valid(InternalDrag.himl) || !is_valid(himlDrag))
         return FALSE;
 
@@ -2527 +2464 @@
 {
     INT nCount;
-
-    if (!himl)
+    HBITMAP hbmNew;
+
+    if (!is_valid(himl))
         return FALSE;
 
@@ -2541 +2479 @@
         himl->nOvlIdx[nCount] = -1;
 
+    hbmNew = CreateBitmap (himl->cMaxImage * himl->cx, himl->cy,
+                        1, himl->uBitsPixel, NULL);
+    SelectObject (himl->hdcImage, hbmNew);
     DeleteObject (himl->hbmImage);
-    himl->hbmImage =
-        CreateBitmap (himl->cMaxImage * himl->cx, himl->cy,
-                        1, himl->uBitsPixel, NULL);
+    himl->hbmImage = hbmNew;
 
     if (himl->hbmMask) {
+        hbmNew = CreateBitmap (himl->cMaxImage * himl->cx, himl->cy,
+                            1, 1, NULL);
+        SelectObject (himl->hdcMask, hbmNew);
         DeleteObject (himl->hbmMask);
-        himl->hbmMask =
-            CreateBitmap (himl->cMaxImage * himl->cx, himl->cy,
-                            1, 1, NULL);
+        himl->hbmMask = hbmNew;
     }
 
@@ -2574 +2514 @@
 ImageList_SetImageCount (HIMAGELIST himl, INT iImageCount)
 {
-    HDC     hdcImageList, hdcBitmap;
+    HDC     hdcBitmap;
     HBITMAP hbmNewBitmap;
     INT     nNewCount, nCopyCount;
@@ -2580 +2520 @@
     TRACE("%p %d\n",himl,iImageCount);
 
-    if (!himl)
+    if (!is_valid(himl))
         return FALSE;
     if (himl->cCurImage >= iImageCount)
@@ -2593 +2533 @@
     nCopyCount = min(himl->cCurImage, iImageCount);
 
-    hdcImageList = CreateCompatibleDC (0);
     hdcBitmap = CreateCompatibleDC (0);
 
@@ -2600 +2539 @@
     if (hbmNewBitmap != 0)
     {
-        SelectObject (hdcImageList, himl->hbmImage);
         SelectObject (hdcBitmap, hbmNewBitmap);
 
         /* copy images */
         BitBlt (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy,
-                  hdcImageList, 0, 0, SRCCOPY);
+                himl->hdcImage, 0, 0, SRCCOPY);
 #if 0
         /* delete 'empty' image space */
@@ -2613 +2551 @@
                   (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
 #endif
+        SelectObject (himl->hdcImage, hbmNewBitmap);
         DeleteObject (himl->hbmImage);
         himl->hbmImage = hbmNewBitmap;
@@ -2625 +2564 @@
         if (hbmNewBitmap != 0)
         {
-            SelectObject (hdcImageList, himl->hbmMask);
             SelectObject (hdcBitmap, hbmNewBitmap);
 
             /* copy images */
             BitBlt (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy,
-                      hdcImageList, 0, 0, SRCCOPY);
+                    himl->hdcMask, 0, 0, SRCCOPY);
 #if 0
             /* delete 'empty' image space */
@@ -2638 +2576 @@
                       (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
 #endif
+            SelectObject (himl->hdcMask, hbmNewBitmap);
             DeleteObject (himl->hbmMask);
             himl->hbmMask = hbmNewBitmap;
@@ -2645 +2584 @@
     }
 
-    DeleteDC (hdcImageList);
     DeleteDC (hdcBitmap);
 
@@ -2674 +2612 @@
 ImageList_SetOverlayImage (HIMAGELIST himl, INT iImage, INT iOverlay)
 {
-    if (!himl)
+    if (!is_valid(himl))
         return FALSE;
     if ((iOverlay < 1) || (iOverlay > MAX_OVERLAYIMAGE))
@@ -2807 +2745 @@
     int i;
 
-    if (!himl)
+    if (!is_valid(himl))
         return FALSE;