[PATCH 4/4] gdiplus: Convert to 32bppARGB when indexed color PNG image with transparency is loaded.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44409 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/gdiplus/image.c | 36 ++++++++++++++++++++++++++++++++++++ dlls/gdiplus/tests/image.c | 4 ++-- 2 files changed, 38 insertions(+), 2 deletions(-)
Hi, While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=43883 Your paranoid android. === wxppro (32 bit Windows report) === gdiplus: image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 2: succeed to load image data image.c:5299: Test failed: 4 1: expected 0x26200a, got 0x10300c image.c:5299: Test failed: 4 2: expected 0x26200a, got 0x10300c image.c:5305: Test failed: 6 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 7 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 8 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 9 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 10 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 10 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 11 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 11 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 12 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 12 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 13 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 13 1: expected 0x10, got 0x12000 === w2003std (32 bit Windows report) === gdiplus: image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 2: succeed to load image data image.c:5299: Test failed: 4 1: expected 0x26200a, got 0x10300c image.c:5299: Test failed: 4 2: expected 0x26200a, got 0x10300c image.c:5305: Test failed: 6 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 7 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 8 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 9 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 10 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 10 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 11 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 11 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 12 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 12 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 13 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 13 1: expected 0x10, got 0x12000 === wvistau64 (32 bit Windows report) === gdiplus: image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 2: succeed to load image data image.c:5299: Test failed: 4 1: expected 0x26200a, got 0x10300c image.c:5299: Test failed: 4 2: expected 0x26200a, got 0x10300c image.c:5305: Test failed: 6 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 7 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 8 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 9 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 10 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 10 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 11 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 11 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 12 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 12 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 13 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 13 1: expected 0x10, got 0x12000 === wvistau64_zh_CN (32 bit Windows report) === gdiplus: image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 2: succeed to load image data image.c:5299: Test failed: 4 1: expected 0x26200a, got 0x10300c image.c:5299: Test failed: 4 2: expected 0x26200a, got 0x10300c image.c:5305: Test failed: 6 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 7 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 8 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 9 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 10 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 10 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 11 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 11 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 12 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 12 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 13 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 13 1: expected 0x10, got 0x12000 === wvistau64_fr (32 bit Windows report) === gdiplus: image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 2: succeed to load image data image.c:5299: Test failed: 4 1: expected 0x26200a, got 0x10300c image.c:5299: Test failed: 4 2: expected 0x26200a, got 0x10300c image.c:5305: Test failed: 6 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 7 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 8 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 9 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 10 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 10 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 11 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 11 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 12 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 12 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 13 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 13 1: expected 0x10, got 0x12000 === wvistau64_he (32 bit Windows report) === gdiplus: image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 2: succeed to load image data image.c:5299: Test failed: 4 1: expected 0x26200a, got 0x10300c image.c:5299: Test failed: 4 2: expected 0x26200a, got 0x10300c image.c:5305: Test failed: 6 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 7 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 8 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 9 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 10 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 10 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 11 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 11 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 12 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 12 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 13 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 13 1: expected 0x10, got 0x12000 === w2008s64 (32 bit Windows report) === gdiplus: image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 2: succeed to load image data image.c:5299: Test failed: 4 1: expected 0x26200a, got 0x10300c image.c:5299: Test failed: 4 2: expected 0x26200a, got 0x10300c image.c:5305: Test failed: 6 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 7 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 8 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 9 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 10 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 10 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 11 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 11 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 12 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 12 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 13 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 13 1: expected 0x10, got 0x12000 === wvistau64 (64 bit Windows report) === gdiplus: image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 2: succeed to load image data image.c:5299: Test failed: 4 1: expected 0x26200a, got 0x10300c image.c:5299: Test failed: 4 2: expected 0x26200a, got 0x10300c image.c:5305: Test failed: 6 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 7 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 8 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 9 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 10 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 10 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 11 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 11 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 12 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 12 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 13 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 13 1: expected 0x10, got 0x12000 === w2008s64 (64 bit Windows report) === gdiplus: image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 0 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 1 2: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 0: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 1: succeed to load image data image.c:3249: Test failed: GdipLoadImageFromStream should fail image.c:5289: Test failed: 2 2: succeed to load image data image.c:5299: Test failed: 4 1: expected 0x26200a, got 0x10300c image.c:5299: Test failed: 4 2: expected 0x26200a, got 0x10300c image.c:5305: Test failed: 6 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 7 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 8 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 9 0: expected 0x10, got 0x12042 image.c:5305: Test failed: 10 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 10 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 11 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 11 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 12 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 12 1: expected 0x10, got 0x12000 image.c:5305: Test failed: 13 0: expected 0x10, got 0x12006 image.c:5305: Test failed: 13 1: expected 0x10, got 0x12000
participants (2)
-
Akihiro Sagawa -
Marvin