Dmitry Timoshkov : gdiplus: Make get_palette() usable for generating predefined palettes.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0b40df2990284ae5d6f5386c994e8902cb7114e1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0b40df2990284ae5d6f5386c99...

Author: Dmitry Timoshkov 
Date:   Wed Jul 18 17:28:20 2012 +0900

gdiplus: Make get_palette() usable for generating predefined palettes.

---

dlls/gdiplus/image.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c
index cef619f..c20eee5 100644
--- a/dlls/gdiplus/image.c
+++ b/dlls/gdiplus/image.c
@@ -76,7 +76,9 @@ static ColorPalette *get_palette(IWICBitmapFrameDecode *frame, WICBitmapPaletteT
     hr = IWICImagingFactory_CreatePalette(factory, &wic_palette);
     if (hr == S_OK)
     {
-        hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette);
+        hr = WINCODEC_ERR_PALETTEUNAVAILABLE;
+        if (frame)
+            hr = IWICBitmapFrameDecode_CopyPalette(frame, wic_palette);
         if (hr != S_OK)
         {
             TRACE("using predefined palette %#x\n", palette_type);