Nikolay Sivov : wincodecs: Trigger conversion to target format in WriteSource().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 62830143d107be38342c27cfb45f30f0fe6d2d04
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=62830143d107be38342c27cfb4...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Wed Nov 23 02:43:37 2016 +0300

wincodecs: Trigger conversion to target format in WriteSource().

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/windowscodecs/main.c | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/dlls/windowscodecs/main.c b/dlls/windowscodecs/main.c
index 442976f..3bed565 100644
--- a/dlls/windowscodecs/main.c
+++ b/dlls/windowscodecs/main.c
@@ -122,30 +122,20 @@ HRESULT configure_write_source(IWICBitmapFrameEncode *iface,
     const WICPixelFormatGUID *format,
     INT width, INT height, double xres, double yres)
 {
-    HRESULT hr=S_OK;
-    WICPixelFormatGUID src_format, dst_format;
+    HRESULT hr = S_OK;
 
     if (width == 0 || height == 0)
         return WINCODEC_ERR_WRONGSTATE;
 
-    hr = IWICBitmapSource_GetPixelFormat(source, &src_format);
-    if (FAILED(hr)) return hr;
-
     if (!format)
     {
-        dst_format = src_format;
+        WICPixelFormatGUID src_format;
 
-        hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &dst_format);
+        hr = IWICBitmapSource_GetPixelFormat(source, &src_format);
         if (FAILED(hr)) return hr;
 
-        format = &dst_format;
-    }
-
-    if (!IsEqualGUID(&src_format, format))
-    {
-        /* FIXME: should use WICConvertBitmapSource to convert */
-        ERR("format %s unsupported\n", debugstr_guid(&src_format));
-        return E_FAIL;
+        hr = IWICBitmapFrameEncode_SetPixelFormat(iface, &src_format);
+        if (FAILED(hr)) return hr;
     }
 
     if (xres == 0.0 || yres == 0.0)
@@ -164,6 +154,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface,
     const WICPixelFormatGUID *format, UINT bpp,
     INT width, INT height)
 {
+    IWICBitmapSource *converted_source;
     HRESULT hr=S_OK;
     WICRect rc;
     UINT stride;
@@ -184,12 +175,23 @@ HRESULT write_source(IWICBitmapFrameEncode *iface,
     if (prc->Width != width || prc->Height <= 0)
         return E_INVALIDARG;
 
+    hr = WICConvertBitmapSource(format, source, &converted_source);
+    if (FAILED(hr))
+    {
+        ERR("Failed to convert source, target format %s, %#x\n", debugstr_guid(format), hr);
+        return hr;
+    }
+
     stride = (bpp * width + 7)/8;
 
     pixeldata = HeapAlloc(GetProcessHeap(), 0, stride * prc->Height);
-    if (!pixeldata) return E_OUTOFMEMORY;
+    if (!pixeldata)
+    {
+        IWICBitmapSource_Release(converted_source);
+        return E_OUTOFMEMORY;
+    }
 
-    hr = IWICBitmapSource_CopyPixels(source, prc, stride,
+    hr = IWICBitmapSource_CopyPixels(converted_source, prc, stride,
         stride*prc->Height, pixeldata);
 
     if (SUCCEEDED(hr))
@@ -199,6 +201,7 @@ HRESULT write_source(IWICBitmapFrameEncode *iface,
     }
 
     HeapFree(GetProcessHeap(), 0, pixeldata);
+    IWICBitmapSource_Release(converted_source);
 
     return hr;
 }