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

[Kun Yang (＠yangkun)]

When I was porting a software from windows, I met a problem that the icons in the imagelist were not displaying correctly.
  In the Application, the correct icons are:
  ![1](/uploads/7274d570f0fd04beeefebf978b92ab1d/1.bmp){width=269 height=29}
  But when I run it under wine is like this:
  ![2](/uploads/ba6abd5d54fdfe3acccb63480441875a/2.bmp){width=271 height=29}
  When I disassable the application code I found that the Application calls ImageList_Create by given a very large cInitial, which is 0xc0c0c0. This  will lead to CreateDIBSection fail. Then the source hbitmap is lost, only hMask is left and shown up on the screen. 
  I use windbg to debug this application on windows, I found that after ImageList_Create is called on Winodws, there is a valid hbitmap handle generated. When ImageList_Add is called for 4 times, it changed and called Bitblt to copy the hbitmap already added. So I guess windows has the error handling for ImageList_Create. If CreateDIBSection failes due to the large image count, it reduced the image count. By observing the action in ImageList_Add, I think the reduced count is 1 (4x1). Then fix the cMaxImage to 1+1 which is same as ImageListImpl_Initialize to make the hbitmap expand. The example in the attachment can reproduce this bug. [imagelist.7z](/uploads/1dc389930eb809adc02be617f05b771e/imagelist.7z)

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

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

[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 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index 93c502ec0bd..443078600e4 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -3088,6 +3088,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 2, expand when exceeded.
+            himl->cMaxImage = newImageCount + 1;
+        }
     }
     else /*if (ilc == ILC_COLORDDB)*/
     {
-- 
GitLab

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