PATCH: ImageList_LoadImageW (comctl32) (resend)

Sander van Leeuwen sandervl at xs4all.nl
Thu May 30 01:42:35 CDT 2002


Please ignore the previous version. It had + & - reversed as others have noted.

Changelog:
- Match behaviour of ImageList_LoadImageA wrt cx parameter (when set to zero)

Author: Sander van Leeuwen/Odin (sandervl at xs4all.nl)

--- imagelist.co	Wed May 29 17:32:38 2002
+++ imagelist.c	Wed May 29 17:31:28 2002
@@ -1907,6 +1907,19 @@
     if (uType == IMAGE_BITMAP) {
         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;
 
         himl = ImageList_Create (cx, bmp.bmHeight, ILC_MASK | ILC_COLOR,





More information about the wine-patches mailing list