[PATCH] comctl32: Don't create a masked imagelist if CLR_NONE is specified.

[Huw Davies]

On Mon, Nov 20, 2017 at 01:16:02PM +0000, Huw Davies wrote:
> Signed-off-by: Huw Davies <huw at codeweavers.com>
> ---
>  dlls/comctl32/imagelist.c       |  9 +++++----
>  dlls/comctl32/tests/imagelist.c | 24 ++++++++++++++++++++++++
>  2 files changed, 29 insertions(+), 4 deletions(-)
> 
> diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c
> index 157344c633..49151145cf 100644
> --- a/dlls/comctl32/imagelist.c
> +++ b/dlls/comctl32/imagelist.c
> @@ -2018,10 +2018,10 @@ ImageList_LoadImageW (HINSTANCE hi, LPCWSTR lpbmp, INT cx, INT cGrow,
>  
>      if (uType == IMAGE_BITMAP) {
>          DIBSECTION dib;
> -        UINT color;
> +        UINT flags;
>  
> -        if (GetObjectW (handle, sizeof(dib), &dib) == sizeof(BITMAP)) color = ILC_COLOR;
> -        else color = dib.dsBm.bmBitsPixel;
> +        if (GetObjectW (handle, sizeof(dib), &dib) == sizeof(BITMAP)) flags = ILC_COLOR;
> +        else flags = dib.dsBm.bmBitsPixel;
>  

Actually I've just realised that there's a top-level parameter called
'uFlags', which makes this change confusing.  I'll send another version
where I stick with using 'color'.

Huw.