commit ebf31c0ac62c6de409af782df1f673583c5b129d
author Dmitry Timoshkov <dmitry@baikal.ru> Fri Jul 13 11:50:05 2012 +0900
committer Alexandre Julliard <julliard@winehq.org> Mon Jul 16 18:19:46 2012 +0200
tree 9041ae0b0a9df6003f8ff963758f2b4dbfce61a0
parent eca107412c581c28dc198d0808949bc999197872

gdiplus: Fix palette flags for a not indexed 1-bpp image.

dlls/gdiplus/image.c

diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index 18df589..f7bfd1a 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -2983,6 +2983,7 @@
                 gdip_format = PixelFormat32bppARGB;
                 IWICBitmapSource_Release(bmp_source);
             }
+            TRACE("%s => %#x\n", wine_dbgstr_guid(&wic_format), gdip_format);
         }
 
         if (SUCCEEDED(hr)) /* got source */
@@ -3063,6 +3064,8 @@
         bitmap->image.frame_count = frame_count;
         bitmap->image.current_frame = active_frame;
         bitmap->image.stream = stream;
+        if (IsEqualGUID(&wic_format, &GUID_WICPixelFormatBlackWhite))
+            bitmap->image.palette_flags = 0;
         /* Pin the source stream */
         IStream_AddRef(stream);
     }

dlls/gdiplus/tests/image.c

diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c
index a735172..69970ec 100644
--- a/dlls/gdiplus/tests/image.c
+++ b/dlls/gdiplus/tests/image.c
@@ -3340,7 +3340,6 @@
 
     status = GdipGetImagePalette(image, &palette.pal, size);
     expect(Ok, status);
-todo_wine
     expect(0, palette.pal.Flags);
     expect(2, palette.pal.Count);
     if (palette.pal.Count == 2)