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

Timestamp:

Jul 12, 1999, 5:58:51 PM (26 years ago)

Author:

cbratschi

Message:

wine-990704 updates, TBCUSTOMIZE implemented

File:

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

trunk/src/comctl32/imagelist.c

@@ -1 @@
-/* $Id: imagelist.c,v 1.4 1999-06-23 19:45:00 achimha Exp $ */
+/* $Id: imagelist.c,v 1.5 1999-07-12 15:58:47 cbratschi Exp $ */
 /*
  *  ImageList implementation
@@ -21 +21 @@
  *    - ImageList_Draw, ImageList_DrawEx and ImageList_GetIcon use
  *      ImageList_DrawIndirect. Since ImageList_DrawIndirect is still
- *      partially imlemented, the functions mentioned above will be 
+ *      partially imlemented, the functions mentioned above will be
  *      limited in functionality too.
  */
+
+/* CB: todo
+  - ImageList_Read
+  - ImageList_Write
+*/
 
 /* This must be defined because the HIMAGELIST type is just a pointer
@@ -32 +37 @@
 #define __WINE_IMAGELIST_C
 
-#include "imagelist.h" 
+#include "imagelist.h"
 #include "commctrl.h"
 #include "comctl32.h"
@@ -57 +62 @@
 
 /*************************************************************************
- * IMAGELIST_InternalExpandBitmaps [Internal] 
+ * IMAGELIST_InternalExpandBitmaps [Internal]
  *
  * Expands the bitmaps of an image list by the given number of images.
@@ -101 +106 @@
 
     if (himl->hbmMask) {
-        hbmNewBitmap = 
+        hbmNewBitmap =
             CreateBitmap (nNewWidth, himl->cy, 1, 1, NULL);
 
@@ -138 +143 @@
 
 INT WINAPI
-ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask)
+ImageList_Add (HIMAGELIST himl, HBITMAP hbmImage, HBITMAP hbmMask)
 {
     HDC    hdcSrc, hdcDst;
@@ -146 +151 @@
 
     if (!himl || !hbmImage)
-        return -1;
+        return -1;
 
     GetObjectA (hbmImage, sizeof(BITMAP), (LPVOID)&bmp);
@@ -164 +169 @@
     BitBlt (hdcDst, himl->cCurImage * himl->cx, 0,
               bmp.bmWidth, himl->cy, hdcSrc, 0, 0, SRCCOPY);
-          
+
     if (himl->hbmMask) {
         if (hbmMask) {
-            /* copy mask bitmap */
+            /* copy mask bitmap */
             SelectObject (hdcDst, himl->hbmMask);
             SelectObject (hdcSrc, hbmMask);
             BitBlt (hdcDst, nStartX, 0, bmp.bmWidth, himl->cy,
-                      hdcSrc, 0, 0, SRCCOPY);
+                      hdcSrc, 0, 0, SRCCOPY);
         }
         else {
-            /* copy monochrome image to the mask bitmap */
+            /* copy monochrome image to the mask bitmap */
             SelectObject (hdcDst, himl->hbmMask);
             SelectObject (hdcSrc, hbmImage);
-            SetBkColor (hdcSrc, GetNearestColor (hdcSrc,
-                          GetPixel (hdcSrc, 0, 0)));
-            BitBlt (hdcDst, nStartX, 0, bmp.bmWidth, himl->cy,
-                      hdcSrc, nStartX, 0, SRCCOPY);
+            SetBkColor (hdcSrc, GetNearestColor (hdcSrc,
+                          GetPixel (hdcSrc, 0, 0)));
+            BitBlt (hdcDst, nStartX, 0, bmp.bmWidth, himl->cy,
+                      hdcSrc, nStartX, 0, SRCCOPY);
         }
     }
@@ -216 +221 @@
 
 /*************************************************************************
- * ImageList_AddMasked [COMCTL32.41] 
+ * ImageList_AddMasked [COMCTL32.41]
  *
  * Adds an image or images to an image list and creates a mask from the
@@ -239 +244 @@
 
     if (himl == NULL)
-        return -1;
+        return -1;
 
     if (!GetObjectA (hBitmap, sizeof(BITMAP), &bmp))
-        return -1;
+        return -1;
 
     nImageCount = bmp.bmWidth / himl->cx;
@@ -261 +266 @@
 
     if (himl->hbmMask) {
-        COLORREF bkColor = (clrMask != CLR_DEFAULT) ? clrMask :
-            GetNearestColor (hdcBitmap, GetPixel (hdcBitmap, 0, 0));
-
-        /* create mask from image */
+        COLORREF bkColor = (clrMask != CLR_DEFAULT) ? clrMask :
+            GetNearestColor (hdcBitmap, GetPixel (hdcBitmap, 0, 0));
+
+        /* create mask from image */
         hdcMask = CreateCompatibleDC (0);
         SelectObject (hdcMask, himl->hbmMask);
 
-        /* create monochrome image to the mask bitmap */
-        SetBkColor (hdcBitmap, bkColor);
-        BitBlt (hdcMask, nIndex * himl->cx, 0, bmp.bmWidth, himl->cy,
-                  hdcBitmap, 0, 0, SRCCOPY);
+        /* create monochrome image to the mask bitmap */
+        SetBkColor (hdcBitmap, bkColor);
+        BitBlt (hdcMask, nIndex * himl->cx, 0, bmp.bmWidth, himl->cy,
+                  hdcBitmap, 0, 0, SRCCOPY);
 
         DeleteDC (hdcMask);
@@ -278 +283 @@
     DeleteDC (hdcImage);
     DeleteDC (hdcBitmap);
-  
+
     return nIndex;
 }
@@ -284 +289 @@
 
 /*************************************************************************
- * ImageList_BeginDrag [COMCTL32.42] 
+ * ImageList_BeginDrag [COMCTL32.42]
  *
  * Creates a temporary image list that contains one image. It will be used
@@ -302 +307 @@
 BOOL WINAPI
 ImageList_BeginDrag (HIMAGELIST himlTrack, INT iTrack,
-                     INT dxHotspot, INT dyHotspot)
+                     INT dxHotspot, INT dyHotspot)
 {
     HDC hdcSrc, hdcDst;
@@ -309 +314 @@
 
     if (himlTrack == NULL)
-        return FALSE;
+        return FALSE;
 
     if (himlInternalDrag)
@@ -315 +320 @@
 
     himlInternalDrag =
-        ImageList_Create (himlTrack->cx, himlTrack->cy,
-                          himlTrack->flags, 1, 1);
+        ImageList_Create (himlTrack->cx, himlTrack->cy,
+                          himlTrack->flags, 1, 1);
     if (himlInternalDrag == NULL) {
 //        ERR(imagelist, "Error creating drag image list!\n");
@@ -350 +355 @@
 
 /*************************************************************************
- * ImageList_Copy [COMCTL32.43] 
- *
- *  Copies an image of the source image list to an image of the 
+ * ImageList_Copy [COMCTL32.43]
+ *
+ *  Copies an image of the source image list to an image of the
  *  destination image list. Images can be copied or swapped.
  *
@@ -373 +378 @@
 
 BOOL WINAPI
-ImageList_Copy (HIMAGELIST himlDst, INT iDst,   HIMAGELIST himlSrc,
-                INT iSrc, INT uFlags)
-{
-    HDC hdcSrc, hdcDst;    
+ImageList_Copy (HIMAGELIST himlDst, INT iDst,   HIMAGELIST himlSrc,
+                INT iSrc, INT uFlags)
+{
+    HDC hdcSrc, hdcDst;
 
 //    TRACE(imagelist, "iDst=%d  iSrc=%d\n", iDst, iSrc);
 
     if ((himlSrc == NULL) || (himlDst == NULL))
-        return FALSE;
+        return FALSE;
     if ((iDst < 0) || (iDst >= himlDst->cCurImage))
-        return FALSE;
+        return FALSE;
     if ((iSrc < 0) || (iSrc >= himlSrc->cCurImage))
-        return FALSE;
+        return FALSE;
 
     hdcSrc = CreateCompatibleDC (0);
@@ -401 +406 @@
                                        himlSrc->uBitsPixel, NULL);
         hbmTempMask = CreateBitmap (himlSrc->cx, himlSrc->cy, 1,
-                                      1, NULL);
+                                      1, NULL);
 
         /* copy (and stretch) destination to temporary bitmaps.(save) */
@@ -494 +499 @@
 HIMAGELIST WINAPI
 ImageList_Create (INT cx, INT cy, UINT flags,
-                  INT cInitial, INT cGrow)
+                  INT cInitial, INT cGrow)
 {
     HIMAGELIST himl;
@@ -500 +505 @@
     INT      nCount;
     HBITMAP  hbmTemp;
-    static WORD aBitBlend25[] = 
+    static WORD aBitBlend25[] =
         {0xAA, 0x00, 0x55, 0x00, 0xAA, 0x00, 0x55, 0x00};
 
@@ -542 +547 @@
     if (himl->flags & ILC_MASK) {
         himl->hbmMask = CreateBitmap (himl->cx * himl->cMaxImage, himl->cy,
-                                        1, 1, NULL);
+                                        1, 1, NULL);
         if (himl->hbmMask == 0) {
 //            ERR(imagelist, "Error creating mask bitmap!\n");
@@ -567 +572 @@
 
 /*************************************************************************
- * ImageList_Destroy [COMCTL32.45] 
+ * ImageList_Destroy [COMCTL32.45]
  *
  * Destroys an image list.
@@ -581 +586 @@
 BOOL WINAPI
 ImageList_Destroy (HIMAGELIST himl)
-{ 
+{
     if (!himl)
-        return FALSE;
+        return FALSE;
 
     /* delete image bitmaps */
@@ -596 +601 @@
     if (himl->hbrBlend50)
         DeleteObject (himl->hbrBlend50);
-        
+
     COMCTL32_Free (himl);
 
@@ -604 +609 @@
 
 /*************************************************************************
- * ImageList_DragEnter [COMCTL32.46] 
+ * ImageList_DragEnter [COMCTL32.46]
  *
  * Locks window update and displays the drag image at the given position.
@@ -626 +631 @@
 {
     if (himlInternalDrag == NULL)
-        return FALSE;
+        return FALSE;
 
     if (hwndLock)
-        hwndInternalDrag = hwndLock;
+        hwndInternalDrag = hwndLock;
     else
-        hwndInternalDrag = GetDesktopWindow ();
+        hwndInternalDrag = GetDesktopWindow ();
 
     xInternalPos = x;
@@ -638 +643 @@
     hdcBackBuffer = CreateCompatibleDC (0);
     hbmBackBuffer = CreateCompatibleBitmap (hdcBackBuffer,
-                himlInternalDrag->cx, himlInternalDrag->cy);
+                himlInternalDrag->cx, himlInternalDrag->cy);
 
     ImageList_DragShowNolock (TRUE);
@@ -647 +652 @@
 
 /*************************************************************************
- * ImageList_DragLeave [COMCTL32.47] 
+ * ImageList_DragLeave [COMCTL32.47]
  *
  * Unlocks window update and hides the drag image.
@@ -663 +668 @@
 {
     if (hwndLock)
-        hwndInternalDrag = hwndLock;
+        hwndInternalDrag = hwndLock;
     else
-        hwndInternalDrag = GetDesktopWindow ();
+        hwndInternalDrag = GetDesktopWindow ();
 
     ImageList_DragShowNolock (FALSE);
@@ -677 +682 @@
 
 /*************************************************************************
- * ImageList_DragMove [COMCTL32.48] 
+ * ImageList_DragMove [COMCTL32.48]
  *
  * Moves the drag image.
@@ -709 +714 @@
 
 /*************************************************************************
- * ImageList_DragShowNolock [COMCTL32.49] 
+ * ImageList_DragShowNolock [COMCTL32.49]
  *
  * Shows or hides the drag image.
@@ -733 +738 @@
 
     hdcDrag = GetDCEx (hwndInternalDrag, 0,
-                         DCX_WINDOW | DCX_CACHE | DCX_LOCKWINDOWUPDATE);
+                         DCX_WINDOW | DCX_CACHE | DCX_LOCKWINDOWUPDATE);
 
     if (bShow) {
-        /* show drag image */
-
-        /* save background */
-
-        /* draw drag image */
+        /* show drag image */
+
+        /* save background */
+
+        /* draw drag image */
 
     }
     else {
-        /* hide drag image */
-
-        /* restore background */
+        /* hide drag image */
+
+        /* restore background */
 
     }
@@ -780 +785 @@
 BOOL WINAPI
 ImageList_Draw (HIMAGELIST himl, INT i, HDC hdc,
-                INT x, INT y, UINT fStyle)
+                INT x, INT y, UINT fStyle)
 {
     IMAGELISTDRAWPARAMS imldp;
@@ -833 +838 @@
 BOOL WINAPI
 ImageList_DrawEx (HIMAGELIST himl, INT i, HDC hdc, INT x, INT y,
-                  INT dx, INT dy, COLORREF rgbBk, COLORREF rgbFg,
-                  UINT fStyle)
+                  INT dx, INT dy, COLORREF rgbBk, COLORREF rgbFg,
+                  UINT fStyle)
 {
     IMAGELISTDRAWPARAMS imldp;
@@ -858 +863 @@
 
 /*************************************************************************
- * ImageList_DrawIndirect [COMCTL32.52] 
+ * ImageList_DrawIndirect [COMCTL32.52]
  *
  * Draws an image using ...
@@ -888 +893 @@
 
     if (pimldp == NULL)
-        return FALSE;
+        return FALSE;
     if (pimldp->cbSize < sizeof(IMAGELISTDRAWPARAMS))
-        return FALSE;
+        return FALSE;
     if (pimldp->himl == NULL)
-        return FALSE;
+        return FALSE;
     if ((pimldp->i < 0) || (pimldp->i > pimldp->himl->cCurImage))
-        return FALSE;
+        return FALSE;
 
     himlLocal = pimldp->himl;
@@ -914 +919 @@
         bMaskTrans = TRUE;
     }
-    
+
     /* ILD_IMAGE state (changes) */
     if (pimldp->fStyle & ILD_IMAGE)
@@ -922 +927 @@
         bImageTrans = FALSE;
     }
-    
+
     /* ILD_MASK state (changes) */
     if ((pimldp->fStyle & ILD_MASK) && (himlLocal->hbmMask))
@@ -947 +952 @@
     if (bMask)
     {
-        /* draw the mask */
-        SelectObject (hdcImageList, himlLocal->hbmMask);
-        SetBkColor (hdcImageList, RGB(255, 255, 255));
-        SetTextColor (hdcImageList, RGB(0, 0, 0));
-        BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
-                  hdcImageList, himlLocal->cx * pimldp->i, 0,
-                  bMaskTrans ? SRCAND : SRCCOPY);
+        /* draw the mask */
+        SelectObject (hdcImageList, himlLocal->hbmMask);
+        SetBkColor (hdcImageList, RGB(255, 255, 255));
+        SetTextColor (hdcImageList, RGB(0, 0, 0));
+        BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
+                  hdcImageList, himlLocal->cx * pimldp->i, 0,
+                  bMaskTrans ? SRCAND : SRCCOPY);
     }
 
     if (bImage)
     {
-        /* draw the image */
-        SelectObject (hdcImageList, himlLocal->hbmImage);
+        /* draw the image */
+        SelectObject (hdcImageList, himlLocal->hbmImage);
 
         if (!bImageTrans)
@@ -993 +998 @@
             SelectObject (hdcImageList, himlLocal->hbmMask);
             BitBlt (hdcTempImage, 0, 0, himlLocal->cx,
-                      himlLocal->cy, hdcImageList, 
+                      himlLocal->cy, hdcImageList,
                       pimldp->i * himlLocal->cx, 0, SRCPAINT);
 
             BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
-                      hdcTempImage, 0, 0, SRCAND);
+                      hdcTempImage, 0, 0, SRCAND);
 
             /* fill */
@@ -1011 +1016 @@
             SelectObject (hdcImageList, himlLocal->hbmMask);
             BitBlt (hdcTempImage, 0, 0, himlLocal->cx,
-                      himlLocal->cy, hdcImageList, 
+                      himlLocal->cy, hdcImageList,
                       pimldp->i * himlLocal->cx, 0, SRCPAINT);
 
@@ -1020 +1025 @@
             DeleteDC (hdcTempImage);
         }
-    }   
+    }
 
     /* Draw overlay image */
     if (pimldp->fStyle & 0x0700) {
-        nOvlIdx = (pimldp->fStyle & 0x0700) >> 8;
-        if ((nOvlIdx >= 1) && (nOvlIdx <= MAX_OVERLAYIMAGE)) {
-            nOvlIdx = pimldp->himl->nOvlIdx[nOvlIdx - 1];
-            if ((nOvlIdx >= 0) && (nOvlIdx <= pimldp->himl->cCurImage)) {
-                if (pimldp->himl->hbmMask) {  
+        nOvlIdx = (pimldp->fStyle & 0x0700) >> 8;
+        if ((nOvlIdx >= 1) && (nOvlIdx <= MAX_OVERLAYIMAGE)) {
+            nOvlIdx = pimldp->himl->nOvlIdx[nOvlIdx - 1];
+            if ((nOvlIdx >= 0) && (nOvlIdx <= pimldp->himl->cCurImage)) {
+                if (pimldp->himl->hbmMask) {
                     SelectObject (hdcImageList, pimldp->himl->hbmMask);
                     BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y, cx, cy,
                               hdcImageList, pimldp->himl->cx * nOvlIdx, 0,
-                              SRCAND);
-                }  
+                              SRCAND);
+                }
                 SelectObject (hdcImageList, pimldp->himl->hbmImage);
                 BitBlt (pimldp->hdcDst, pimldp->x, pimldp->y,
@@ -1043 +1048 @@
 
     DeleteDC (hdcImageList);
-  
+
     return TRUE;
 }
@@ -1151 +1156 @@
 {
     if (himl == NULL)
-        return CLR_NONE;
+        return CLR_NONE;
 
     return himl->clrBk;
@@ -1187 +1192 @@
 
 /*************************************************************************
- * ImageList_GetIcon [COMCTL32.57] 
+ * ImageList_GetIcon [COMCTL32.57]
  *
  * Creates an icon from a masked image of an image list.
@@ -1209 +1214 @@
 
     if ((himl == NULL) || (i < 0) || (i >= himl->cCurImage))
-        return 0;
+        return 0;
 
     hdcSrc = CreateCompatibleDC(0);
@@ -1222 +1227 @@
     SelectObject (hdcDst, ii.hbmMask);
     if (himl->hbmMask) {
-        SelectObject (hdcSrc, himl->hbmMask);
-        BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
-                  hdcSrc, i * himl->cx, 0, SRCCOPY);
+        SelectObject (hdcSrc, himl->hbmMask);
+        BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
+                  hdcSrc, i * himl->cx, 0, SRCCOPY);
     }
     else
-        PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS);
+        PatBlt (hdcDst, 0, 0, himl->cx, himl->cy, BLACKNESS);
 
     /* draw image*/
@@ -1233 +1238 @@
     SelectObject (hdcSrc, himl->hbmImage);
     BitBlt (hdcDst, 0, 0, himl->cx, himl->cy,
-              hdcSrc, i * himl->cx, 0, SRCCOPY);
-
-    hIcon = CreateIconIndirect (&ii);    
+              hdcSrc, i * himl->cx, 0, SRCCOPY);
+
+    hIcon = CreateIconIndirect (&ii);
 
     DeleteDC (hdcSrc);
@@ -1268 +1273 @@
 {
     if (himl == NULL)
-        return FALSE;
+        return FALSE;
     if ((himl->cx <= 0) || (himl->cy <= 0))
-        return FALSE;
+        return FALSE;
 
     if (cx)
-        *cx = himl->cx;
+        *cx = himl->cx;
     if (cy)
-        *cy = himl->cy;
+        *cy = himl->cy;
 
     return TRUE;
@@ -1298 +1303 @@
 {
     if (himl == NULL)
-        return 0;
+        return 0;
 
     return himl->cCurImage;
@@ -1323 +1328 @@
 {
     if ((himl == NULL) || (pImageInfo == NULL))
-        return FALSE;
+        return FALSE;
     if ((i < 0) || (i >= himl->cCurImage))
-        return FALSE;
+        return FALSE;
 
     pImageInfo->hbmImage = himl->hbmImage;
     pImageInfo->hbmMask  = himl->hbmMask;
-    
+
     pImageInfo->rcImage.top    = 0;
     pImageInfo->rcImage.bottom = himl->cy;
     pImageInfo->rcImage.left   = i * himl->cx;
     pImageInfo->rcImage.right  = (i+1) * himl->cx;
-    
+
     return TRUE;
 }
@@ -1340 +1345 @@
 
 /*************************************************************************
- * ImageList_GetImageRect [COMCTL32.61] 
+ * ImageList_GetImageRect [COMCTL32.61]
  *
  * Retrieves the rectangle of the specified image in an image list.
@@ -1361 +1366 @@
 {
     if ((himl == NULL) || (lpRect == NULL))
-        return FALSE;
+        return FALSE;
     if ((i < 0) || (i >= himl->cCurImage))
-        return FALSE;
+        return FALSE;
 
     lpRect->left   = i * himl->cx;
@@ -1397 +1402 @@
 
 HIMAGELIST WINAPI
-ImageList_LoadImageA (HINSTANCE hi, LPCSTR lpbmp, INT cx,       INT cGrow,
-                        COLORREF clrMask, UINT uType,   UINT uFlags)
+ImageList_LoadImageA (HINSTANCE hi, LPCSTR lpbmp, INT cx,       INT cGrow,
+                        COLORREF clrMask, UINT uType,   UINT uFlags)
 {
     HIMAGELIST himl = NULL;
@@ -1413 +1418 @@
         BITMAP bmp;
         GetObjectA (handle, sizeof(BITMAP), &bmp);
+
+        /* To match windows behavior, if cx is set to zero and
+         the flag DI_DEFAULTSIZE is specified, cx becomes the
+         system metric value for icons. If the flag is not specified
+         the function sets the size to the height of the bitmap */
+        if (cx == 0)
+        {
+            if (uFlags & DI_DEFAULTSIZE)
+                cx = GetSystemMetrics (SM_CXICON);
+            else
+                cx = bmp.bmHeight;
+        }
+
         nImageCount = bmp.bmWidth / cx;
 
@@ -1425 +1443 @@
         GetIconInfo (handle, &ii);
         GetObjectA (ii.hbmColor, sizeof(BITMAP), (LPVOID)&bmp);
-        himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight, 
+        himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight,
                                  ILC_MASK | ILC_COLOR, 1, cGrow);
         ImageList_Add (himl, ii.hbmColor, ii.hbmMask);
@@ -1433 +1451 @@
 
     DeleteObject (handle);
-    
+
     return himl;
 }
@@ -1462 +1480 @@
 HIMAGELIST WINAPI
 ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow,
-                        COLORREF clrMask, UINT uType,   UINT uFlags)
+                        COLORREF clrMask, UINT uType,   UINT uFlags)
 {
     HIMAGELIST himl = NULL;
@@ -1489 +1507 @@
         GetIconInfo (handle, &ii);
         GetObjectA (ii.hbmMask, sizeof(BITMAP), (LPVOID)&bmp);
-        himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight, 
+        himl = ImageList_Create (bmp.bmWidth, bmp.bmHeight,
                                  ILC_MASK | ILC_COLOR, 1, cGrow);
         ImageList_Add (himl, ii.hbmColor, ii.hbmMask);
@@ -1497 +1515 @@
 
     DeleteObject (handle);
-    
+
     return himl;
 }
@@ -1503 +1521 @@
 
 /*************************************************************************
- * ImageList_Merge [COMCTL32.65] 
+ * ImageList_Merge [COMCTL32.65]
  *
  * Creates a new image list that contains a merged image from the specified
@@ -1523 +1541 @@
 HIMAGELIST WINAPI
 ImageList_Merge (HIMAGELIST himl1, INT i1, HIMAGELIST himl2, INT i2,
-                 INT dx, INT dy)
+                 INT dx, INT dy)
 {
     HIMAGELIST himlDst = NULL;
@@ -1532 +1550 @@
 
     if ((himl1 == NULL) || (himl2 == NULL))
-        return NULL;
+        return NULL;
 
     /* check indices */
@@ -1584 +1602 @@
         nX1 = i1 * himl1->cx;
         nX2 = i2 * himl2->cx;
-        
+
         /* copy image */
         SelectObject (hdcSrcImage, himl1->hbmImage);
         SelectObject (hdcDstImage, himlDst->hbmImage);
-        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst, 
+        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst,
                   hdcSrcImage, 0, 0, BLACKNESS);
-        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy, 
+        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy,
                   hdcSrcImage, nX1, 0, SRCCOPY);
 
         SelectObject (hdcSrcImage, himl2->hbmMask);
-        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
+        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy,
                   hdcSrcImage, nX2, 0, SRCAND);
 
         SelectObject (hdcSrcImage, himl2->hbmImage);
-        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
+        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy,
                   hdcSrcImage, nX2, 0, SRCPAINT);
 
@@ -1604 +1622 @@
         SelectObject (hdcSrcImage, himl1->hbmMask);
         SelectObject (hdcDstImage, himlDst->hbmMask);
-        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst, 
+        BitBlt (hdcDstImage, 0, 0, cxDst, cyDst,
                   hdcSrcImage, 0, 0, WHITENESS);
-        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy, 
+        BitBlt (hdcDstImage, xOff1, yOff1, himl1->cx, himl1->cy,
                   hdcSrcImage, nX1, 0, SRCCOPY);
 
         SelectObject (hdcSrcImage, himl2->hbmMask);
-        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy, 
+        BitBlt (hdcDstImage, xOff2, yOff2, himl2->cx, himl2->cy,
                   hdcSrcImage, nX2, 0, SRCAND);
 
@@ -1616 +1634 @@
         DeleteDC (hdcDstImage);
     }
-   
+
     return himlDst;
 }
@@ -1711 +1729 @@
 //        TRACE(imagelist, " - Max. number of images: %d / %d (Old/New)\n",
 //                 himl->cMaxImage, himl->cCurImage + himl->cGrow - 1);
-        
+
         hbmNewImage =
             CreateBitmap (cxNew, himl->cy, 1, himl->uBitsPixel, NULL);
@@ -1726 +1744 @@
         if (i > 0) {
 //            TRACE (imagelist, "Pre image copy: Copy %d images\n", i);
-       
+
             SelectObject (hdcSrc, himl->hbmImage);
             SelectObject (hdcDst, hbmNewImage);
@@ -1777 +1795 @@
 
 /*************************************************************************
- * ImageList_Replace [COMCTL32.68] 
+ * ImageList_Replace [COMCTL32.68]
  *
  * Replaces an image in an image list with a new image.
@@ -1794 +1812 @@
 BOOL WINAPI
 ImageList_Replace (HIMAGELIST himl, INT i, HBITMAP hbmImage,
-                   HBITMAP hbmMask)
+                   HBITMAP hbmMask)
 {
     HDC hdcImageList, hdcImage;
@@ -1803 +1821 @@
         return FALSE;
     }
-    
+
     if ((i >= himl->cCurImage) || (i < 0)) {
 //        ERR (imagelist, "Invalid image index!\n");
@@ -1864 +1882 @@
 
     if (himl == NULL)
-        return -1;
+        return -1;
     if ((i >= himl->cCurImage) || (i < -1))
-        return -1;
+        return -1;
 
     GetIconInfo (hIcon, &ii);
 //    if (ii.hbmMask == 0)
-//      ERR (imagelist, "no mask!\n");
+//      ERR (imagelist, "no mask!\n");
 //    if (ii.hbmColor == 0)
-//      ERR (imagelist, "no color!\n");
+//      ERR (imagelist, "no color!\n");
     GetObjectA (ii.hbmMask, sizeof(BITMAP), (LPVOID)&bmp);
 
@@ -1888 +1906 @@
 //    TRACE (imagelist, "hdcImageList=0x%x!\n", hdcImageList);
 //    if (hdcImageList == 0)
-//      ERR (imagelist, "invalid hdcImageList!\n");
+//      ERR (imagelist, "invalid hdcImageList!\n");
 
     hdcImage = CreateCompatibleDC (0);
 //    TRACE (imagelist, "hdcImage=0x%x!\n", hdcImage);
 //    if (hdcImage == 0)
-//      ERR (imagelist, "invalid hdcImage!\n");
+//      ERR (imagelist, "invalid hdcImage!\n");
 
     hbmOldDst = SelectObject (hdcImageList, himl->hbmImage);
@@ -1913 +1931 @@
 
     if (hdcImageList)
-        DeleteDC (hdcImageList);
+        DeleteDC (hdcImageList);
     if (hdcImage)
-        DeleteDC (hdcImage);
+        DeleteDC (hdcImage);
     if (ii.hbmColor)
-        DeleteObject (ii.hbmColor);
+        DeleteObject (ii.hbmColor);
     if (ii.hbmMask)
-        DeleteObject (ii.hbmMask);
+        DeleteObject (ii.hbmMask);
 
     return nIndex;
@@ -1926 +1944 @@
 
 /*************************************************************************
- * ImageList_SetBkColor [COMCTL32.70] 
+ * ImageList_SetBkColor [COMCTL32.70]
  *
  * Sets the background color of an image list.
@@ -1945 +1963 @@
 
     if (himl == NULL)
-        return CLR_NONE;
+        return CLR_NONE;
 
     clrOldBk = himl->clrBk;
@@ -1974 +1992 @@
 BOOL WINAPI
 ImageList_SetDragCursorImage (HIMAGELIST himlDrag, INT iDrag,
-                              INT dxHotspot, INT dyHotspot)
+                              INT dxHotspot, INT dyHotspot)
 {
     HIMAGELIST himlTemp;
@@ -1981 +1999 @@
 
     if (himlInternalDrag == NULL)
-        return FALSE;
+        return FALSE;
 
 //    TRACE (imagelist, " dxH=%d dyH=%d nX=%d nY=%d\n",
-//         dxHotspot, dyHotspot, nInternalDragHotspotX, nInternalDragHotspotY);
+//         dxHotspot, dyHotspot, nInternalDragHotspotX, nInternalDragHotspotY);
 
     himlTemp = ImageList_Merge (himlInternalDrag, 0, himlDrag, iDrag,
-                                dxHotspot, dyHotspot);
+                                dxHotspot, dyHotspot);
 
     ImageList_Destroy (himlInternalDrag);
@@ -2000 +2018 @@
 
 /*************************************************************************
- * ImageList_SetFilter [COMCTL32.76] 
+ * ImageList_SetFilter [COMCTL32.76]
  *
  * Sets a filter (or does something completely different)!!???
@@ -2022 +2040 @@
 {
 //    FIXME (imagelist, "(%p 0x%x 0x%lx):empty stub!\n",
-//         himl, i, dwFilter);
+//         himl, i, dwFilter);
 
     return FALSE;
@@ -2049 +2067 @@
 
     if (!himl)
-        return FALSE;
+        return FALSE;
 
     /* remove all images*/
@@ -2099 +2117 @@
 
     if (!himl)
-        return FALSE;
+        return FALSE;
     if (himl->cCurImage >= iImageCount)
-        return FALSE;
+        return FALSE;
     if (himl->cMaxImage > iImageCount)
-        return TRUE;
+        return TRUE;
 
     nNewCount = iImageCount + himl->cGrow;
@@ -2118 +2136 @@
         SelectObject (hdcBitmap, hbmNewBitmap);
 
-        /* copy images */
+        /* copy images */
         BitBlt (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy,
                   hdcImageList, 0, 0, SRCCOPY);
 
-        /* delete 'empty' image space */
-        SetBkColor (hdcBitmap, RGB(255, 255, 255));
-        SetTextColor (hdcBitmap, RGB(0, 0, 0));
-        PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0, 
-                  (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
-
-        DeleteObject (himl->hbmImage);
-        himl->hbmImage = hbmNewBitmap;
+        /* delete 'empty' image space */
+        SetBkColor (hdcBitmap, RGB(255, 255, 255));
+        SetTextColor (hdcBitmap, RGB(0, 0, 0));
+        PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0,
+                  (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
+
+        DeleteObject (himl->hbmImage);
+        himl->hbmImage = hbmNewBitmap;
     }
 //    else
-//      ERR (imagelist, "Could not create new image bitmap !\n");
+//      ERR (imagelist, "Could not create new image bitmap !\n");
 
     if (himl->hbmMask)
@@ -2143 +2161 @@
             SelectObject (hdcBitmap, hbmNewBitmap);
 
-            /* copy images */
+            /* copy images */
             BitBlt (hdcBitmap, 0, 0, nCopyCount * himl->cx, himl->cy,
                       hdcImageList, 0, 0, SRCCOPY);
 
-            /* delete 'empty' image space */
-            SetBkColor (hdcBitmap, RGB(255, 255, 255));
-            SetTextColor (hdcBitmap, RGB(0, 0, 0));
-            PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0, 
-                      (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
+            /* delete 'empty' image space */
+            SetBkColor (hdcBitmap, RGB(255, 255, 255));
+            SetTextColor (hdcBitmap, RGB(0, 0, 0));
+            PatBlt (hdcBitmap,  nCopyCount * himl->cx, 0,
+                      (nNewCount - nCopyCount) * himl->cx, himl->cy, BLACKNESS);
 
             DeleteObject (himl->hbmMask);
@@ -2191 +2209 @@
 {
     if (!himl)
-        return FALSE;
+        return FALSE;
     if ((iOverlay < 1) || (iOverlay > MAX_OVERLAYIMAGE))
-        return FALSE;
+        return FALSE;
     if ((iImage < 0) || (iImage > himl->cCurImage))
-        return FALSE;
-    
+        return FALSE;
+
     himl->nOvlIdx[iOverlay - 1] = iImage;
     return TRUE;
@@ -2227 +2245 @@
 //{
 //    if (!himl)
-//      return FALSE;
+//      return FALSE;
 //
 //    FIXME (imagelist, "empty stub!\n");