[PATCH 0/1] MR10059: comctl32: Fix the bug when the cInitial is too large which lead to...

[Kun Yang (＠yangkun)]

I'm sorry I have pushed another mr for this topic due to my fault for pushing to the master branch of my forked project. This is about the failure of CreateDIBSection in ImageList_Create. Last discussion is in !10039 (https://gitlab.winehq.org/wine/wine/-/merge_requests/10039). I have made my last fix in https://gitlab.winehq.org/wine/wine/-/merge_requests/10039#note_129134. Please review it again @zhiyi . 
I am sorry for making a new merge request again.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10059

[PATCH 1/1] comctl32: Fix the bug when the cInitial is too large which lead to CreateDIBSection fails in ImageList_CreateImage.

[Kun Yang]

From: Kun Yang <[e-mail]>

Logs: When CreateDIBSection does not return a valid hbitmap, the source image is lost that only masked icon is shown in imagelist.

Signed-off-by: Kun Yang <[e-mail]>
---
 dlls/comctl32/imagelist.c       |  9 +++++++++
 dlls/comctl32/tests/imagelist.c | 22 ++++++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index ab65bca7c07..5788bf22a53 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -3089,6 +3089,15 @@ static HBITMAP ImageList_CreateImage(HDC hdc, HIMAGELIST himl, UINT count)
             }
         }
 	hbmNewBitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, 0, 0);
+        if(!hbmNewBitmap)
+        {
+            UINT newImageCount = 1;
+            /*if CreateDIBSection failed, allocate for 1 image only.*/
+            bmi->bmiHeader.biHeight = newImageCount * himl->cy;
+            hbmNewBitmap = CreateDIBSection(hdc, bmi, DIB_RGB_COLORS, NULL, 0, 0);
+            /*the max image count is set to 1, expand when exceeded.*/
+            himl->cMaxImage = newImageCount;
+        }
     }
     else /*if (ilc == ILC_COLORDDB)*/
     {
diff --git a/dlls/comctl32/tests/imagelist.c b/dlls/comctl32/tests/imagelist.c
index 68ad0ce7a4c..af592e2dde3 100644
--- a/dlls/comctl32/tests/imagelist.c
+++ b/dlls/comctl32/tests/imagelist.c
@@ -2207,6 +2207,11 @@ static void test_create_destroy(void)
     INT cx, cy;
     BOOL rc;
     INT ret;
+    HDC hdc;
+    HBITMAP hbm;
+    BITMAPINFO bmi;
+    void *bits;
+    IMAGEINFO info;
 
     /* list with zero or negative image dimensions */
     himl = pImageList_Create(0, 0, ILC_COLOR16, 0, 3);
@@ -2263,6 +2268,23 @@ static void test_create_destroy(void)
     ok(himl == NULL, "got %p\n", himl);
     himl = pImageList_Create(1, -1, ILC_COLORDDB, 4, 4);
     ok(himl == NULL, "got %p\n", himl);
+
+    /* Test create large cInitial image count */
+    himl = pImageList_Create(32, 32, ILC_COLOR32 | ILC_MASK, 0xc0c0c0, 1);
+    hdc = CreateCompatibleDC(NULL);
+    memset(&bmi, 0, sizeof(bmi));
+    bmi.bmiHeader.biSize = sizeof(bmi.bmiHeader);
+    bmi.bmiHeader.biWidth = 32;
+    bmi.bmiHeader.biHeight = -32;
+    bmi.bmiHeader.biPlanes = 1;
+    bmi.bmiHeader.biBitCount = 32;
+    bmi.bmiHeader.biCompression = BI_RGB;
+    hbm = CreateDIBSection(hdc, &bmi, DIB_RGB_COLORS, &bits, NULL, 0);
+    ret = pImageList_AddMasked(himl, hbm, RGB(0, 0, 0));
+    ret = pImageList_GetImageInfo(himl, 0, &info);
+    ok(ret, "got %d\n", ret);
+    ok(info.hbmImage != NULL, "got %p\n", info.hbmImage);
+    ok(info.hbmMask != NULL, "got %p\n", info.hbmMask);
 }
 
 static void check_color_table(const char *name, HDC hdc, HIMAGELIST himl, UINT ilc,
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10059

[Zhiyi Zhang (＠zhiyi)]

Please add a test first and mark the test failing on Wine with a todo_wine, and then fix it in the second patch.

Also, I wonder if you can test cMaxImage by calling ImageList_Replace(). For example, if cMaxImage ends up being 1 after you try to create an imagelist with an excessively large image count, then ImageList_Replace(imagelist, 0, ...) should succeed, and ImageList_Replace(imagelist, 1, ...) should fail, at least according to Wine's implementation. If that doesn't work, I would recommend using Wine's `struct _IMAGELIST` layout and reading cMaxImage. The struct layout should be compatible with Windows for the first few members.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10059#note_131087