win32/comctl32/comctl32_ros.diff

618 @@ -1243,8 +1243,11 @@ ImageList_DrawEx (HIMAGELIST himl, INT i
624 +static BOOL alpha_blend_image( HIMAGELIST himl, HDC srce_dc, HDC dest_dc, int dest_x, int dest_y,
626  static BOOL alpha_blend_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y,
638      if (!(bmp = CreateDIBSection( himl->hdcImage, info, DIB_RGB_COLORS, &bits, 0, 0 ))) goto done;
644      BitBlt( hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY );
654 +HDC saturate_image( HIMAGELIST himl, HDC dest_dc, int dest_x, int dest_y,
680 +    if (!(bmp = CreateDIBSection(himl->hdcImage, info, DIB_RGB_COLORS, &bits, 0, 0 ))) goto done;
686 +    BitBlt(hdc, 0, 0, cx, cy, himl->hdcImage, src_x, src_y, SRCCOPY);
726      if (!pimldp || !(himl = pimldp->himl)) return FALSE;
727      if (!is_valid(himl)) return FALSE;
739 +        hdcSaturated = saturate_image(himl, pimldp->hdcDst, pimldp->x, pimldp->y,
750      has_alpha = (himl->has_alpha && himl->has_alpha[pimldp->i]);
758 +            bResult = alpha_blend_image( himl, hImageListDC, pimldp->hdcDst, pimldp->x, pimldp->y,
760              bResult = alpha_blend_image( himl, pimldp->hdcDst, pimldp->x, pimldp->y,
770 +        alpha_blend_image( himl, hImageListDC, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, b…
772          alpha_blend_image( himl, hImageDC, 0, 0, pt.x, pt.y, cx, cy, func, fStyle, blend_col );
889 -static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL small)
890 +static inline void set_icon_size(SIZE *size, HIMAGELIST himl, BOOL is_small)
1905      HIMAGELIST himl = NULL;
1919          if (!himl)
1921              himl = TOOLBAR_GetImageListForDrawing(infoPtr, btnPtr, IMAGE_LIST_DEFAULT, &index);
1924 +            ImageList_GetImageInfo(himl, index, &info);
1942        index, himl, left, top, offset);
1947          TOOLBAR_DrawMasked (himl, index, tbcd->nmcd.hdc, left + offset, top + offset, draw_flags);
1955 +        imldp.himl   = himl;
1971          ImageList_Draw (himl, index, tbcd->nmcd.hdc, left + offset, top + offset, draw_flags);
2412  static HIMAGELIST TOOLBAR_InsertImageList(PIMLENTRY **pies, INT *cies, HIMAGELIST himl, INT id)