[PATCH v4 2/2] gdiplus: Fix drawing indexed bitmaps with a palette that has alpha.

[Zhiyi Zhang]

From: Zhiyi Zhang

---
 dlls/gdiplus/graphics.c       | 4 ++--
 dlls/gdiplus/tests/graphics.c | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c
index 49a9d453b3d..700914e6f6e 100644
--- a/dlls/gdiplus/graphics.c
+++ b/dlls/gdiplus/graphics.c
@@ -3451,7 +3451,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image
             if (bitmap->format == PixelFormat16bppRGB555 ||
                 bitmap->format == PixelFormat24bppRGB)
                 dst_format = bitmap->format;
-            else if (bitmap->format & (PixelFormatAlpha|PixelFormatPAlpha))
+            else if (bitmap->image.flags & ImageFlagsHasAlpha)
                 dst_format = PixelFormat32bppPARGB;
             else
                 dst_format = PixelFormat32bppRGB;
@@ -3494,7 +3494,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image

gdi_transform_acquire(graphics);

-            if (bitmap->format & (PixelFormatAlpha|PixelFormatPAlpha))
+            if (bitmap->image.flags & ImageFlagsHasAlpha)
             {
                 gdi_alpha_blend(graphics, pti[0].x, pti[0].y, pti[1].x - pti[0].x, pti[2].y - pti[0].y,
                                 src_hdc, srcx, srcy, srcwidth, srcheight);
diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c
index fc9700b1058..96ef52ce935 100644
--- a/dlls/gdiplus/tests/graphics.c
+++ b/dlls/gdiplus/tests/graphics.c
@@ -6934,7 +6934,6 @@ static void test_GdipDrawImagePointsRectOnMemoryDC(void)

pixel = GetBitmapPixelBuffer(hdc, bmp, width, height);
     color[0] = get_bitmap_pixel(width / 2, height / 2);
-    todo_wine
     ok(is_blue_color(color[0]), "Got unexpected color %#lx.\n", color[0]);
     GdipFree(pixel);

@@ -6950,7 +6949,6 @@ static void test_GdipDrawImagePointsRectOnMemoryDC(void)

pixel = GetBitmapPixelBuffer(hdc, bmp, width, height);
     color[0] = get_bitmap_pixel(width / 2, height / 2);
-    todo_wine
     ok(is_blue_color(color[0]), "Got unexpected color %#lx.\n", color[0]);
     GdipFree(pixel);