[PATCH] comctl32/imagelist: fix ImageList_Read/Write.

[Денис Маликов]

From: Denis Malikov 
Date: Sat, 16 Jun 2018 16:35:45 +0700
Subject: [PATCH] comctl32/imagelist: fix ImageList_Read/Write.

Fixed acceptable version and pointer calculation for mixing image and mask bits.

Tested on ReactOS 0.4.10 with *.reg files extracted from XP/2003 key HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\TrayNotify

Signed-off-by: Denis Malikov 
---
 dlls/comctl32/imagelist.c | 48 +++++++++++++++++++++++------------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
index a08d60752e..f0f8a695fe 100644
--- a/dlls/comctl32/imagelist.c
+++ b/dlls/comctl32/imagelist.c
@@ -2257,38 +2257,38 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm)
     BITMAPINFO *image_info = (BITMAPINFO *)image_buf;
     BITMAPINFO *mask_info = (BITMAPINFO *)mask_buf;
     void *image_bits, *mask_bits = NULL;
-    ILHEAD    ilHead;
-    HIMAGELIST    himl;
+    ILHEAD ilHead;
+    HIMAGELIST himl;
     unsigned int i;
 
     TRACE("%p\n", pstm);
 
     if (FAILED(IStream_Read (pstm, &ilHead, sizeof(ILHEAD), NULL)))
-    return NULL;
+        return NULL;
     if (ilHead.usMagic != (('L' << 8) | 'I'))
-    return NULL;
-    if (ilHead.usVersion != 0x101) /* probably version? */
-    return NULL;
+        return NULL;
+    if (ilHead.usVersion != 0x600) /* XP/2003 version */
+        return NULL;
 
     TRACE("cx %u, cy %u, flags 0x%04x, cCurImage %u, cMaxImage %u\n",
           ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage);
 
     himl = ImageList_Create(ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage);
     if (!himl)
-    return NULL;
+        return NULL;
 
     if (!(image_bits = read_bitmap(pstm, image_info)))
     {
-    WARN("failed to read bitmap from stream\n");
-    return NULL;
+        WARN("failed to read bitmap from stream\n");
+        return NULL;
     }
     if (ilHead.flags & ILC_MASK)
     {
         if (!(mask_bits = read_bitmap(pstm, mask_info)))
         {
             WARN("failed to read mask bitmap from stream\n");
-        return NULL;
-    }
+            return NULL;
+        }
     }
     else mask_info = NULL;
 
@@ -2296,23 +2296,23 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm)
     {
         DWORD *ptr = image_bits;
         BYTE *mask_ptr = mask_bits;
-        int stride = himl->cy * image_info->bmiHeader.biWidth;
+        int stride = himl->cy * himl->cx;
 
         if (image_info->bmiHeader.biHeight > 0)  /* bottom-up */
         {
             ptr += image_info->bmiHeader.biHeight * image_info->bmiHeader.biWidth - stride;
-            mask_ptr += (image_info->bmiHeader.biHeight * image_info->bmiHeader.biWidth - stride) / 8;
+            mask_ptr += (image_info->bmiHeader.biHeight * image_info->bmiHeader.biWidth - stride) / 4;
             stride = -stride;
             image_info->bmiHeader.biHeight = himl->cy;
         }
         else image_info->bmiHeader.biHeight = -himl->cy;
 
-        for (i = 0; i < ilHead.cCurImage; i += TILE_COUNT)
+        for (i = 0; i < ilHead.cCurImage; i++)
         {
-            add_dib_bits( himl, i, min( ilHead.cCurImage - i, TILE_COUNT ),
+            add_dib_bits( himl, i, 1,
                           himl->cx, himl->cy, image_info, mask_info, ptr, mask_ptr );
             ptr += stride;
-            mask_ptr += stride / 8;
+            mask_ptr += stride / 4;
         }
     }
     else
@@ -2333,7 +2333,7 @@ HIMAGELIST WINAPI ImageList_Read(IStream *pstm)
 
     ImageList_SetBkColor(himl,ilHead.bkcolor);
     for (i=0;i<4;i++)
-    ImageList_SetOverlayImage(himl,ilHead.ovls[i],i+1);
+        ImageList_SetOverlayImage(himl,ilHead.ovls[i],i+1);
     return himl;
 }
 
@@ -3078,10 +3078,10 @@ BOOL WINAPI ImageList_Write(HIMAGELIST himl, IStream *pstm)
     TRACE("%p %p\n", himl, pstm);
 
     if (!is_valid(himl))
-    return FALSE;
+        return FALSE;
 
     ilHead.usMagic   = (('L' << 8) | 'I');
-    ilHead.usVersion = 0x101;
+    ilHead.usVersion = 0x600;
     ilHead.cCurImage = himl->cCurImage;
     ilHead.cMaxImage = himl->cMaxImage;
     ilHead.cGrow     = himl->cGrow;
@@ -3090,23 +3090,23 @@ BOOL WINAPI ImageList_Write(HIMAGELIST himl, IStream *pstm)
     ilHead.bkcolor   = himl->clrBk;
     ilHead.flags     = himl->flags;
     for(i = 0; i < 4; i++) {
-    ilHead.ovls[i] = himl->nOvlIdx[i];
+        ilHead.ovls[i] = himl->nOvlIdx[i];
     }
 
     TRACE("cx %u, cy %u, flags 0x04%x, cCurImage %u, cMaxImage %u\n",
           ilHead.cx, ilHead.cy, ilHead.flags, ilHead.cCurImage, ilHead.cMaxImage);
 
     if(FAILED(IStream_Write(pstm, &ilHead, sizeof(ILHEAD), NULL)))
-    return FALSE;
+        return FALSE;
 
     /* write the bitmap */
     if(!_write_bitmap(himl->hbmImage, pstm))
-    return FALSE;
+        return FALSE;
 
     /* write the mask if we have one */
     if(himl->flags & ILC_MASK) {
-    if(!_write_bitmap(himl->hbmMask, pstm))
-        return FALSE;
+        if(!_write_bitmap(himl->hbmMask, pstm))
+            return FALSE;
     }
 
     return TRUE;