[PATCH 2/2] oleaut32: Use common helper for masked bitmaps to render an icon.

[Dmitry Timoshkov]

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
---
 dlls/oleaut32/olepicture.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/dlls/oleaut32/olepicture.c b/dlls/oleaut32/olepicture.c
index 36fd7c21a9..e88aaed346 100644
--- a/dlls/oleaut32/olepicture.c
+++ b/dlls/oleaut32/olepicture.c
@@ -711,9 +711,18 @@ static HRESULT WINAPI OLEPictureImpl_Render(IPicture *iface, HDC hdc,
   }
 
   case PICTYPE_ICON:
-    FIXME("Not quite correct implementation of rendering icons...\n");
-    DrawIconEx(hdc, x, y, This->desc.u.icon.hicon, cx, cy, 0, NULL, DI_NORMAL);
+  {
+    ICONINFO info;
+
+    if (!GetIconInfo(This->desc.u.icon.hicon, &info))
+        return E_FAIL;
+
+    render_masked_bitmap(This, hdc, x, y, cx, cy, xSrc, ySrc, cxSrc, cySrc, info.hbmMask, info.hbmColor);
+
+    DeleteObject(info.hbmMask);
+    if (info.hbmColor) DeleteObject(info.hbmColor);
     break;
+  }
 
   case PICTYPE_METAFILE:
   {
-- 
2.17.1

[Alexandre Julliard]

Dmitry Timoshkov <dmitry(a)baikal.ru> writes:
> Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru>
> ---
>  dlls/oleaut32/olepicture.c | 13 +++++++++++--
>  1 file changed, 11 insertions(+), 2 deletions(-)

It doesn't work here:

../../../tools/runtest -q -P wine -T ../../.. -M oleaut32.dll -p oleaut32_test.exe.so olepicture && touch olepicture.ok
olepicture.c:877: Test failed: Color at 5,5 should have changed, but still was 0x223344
Makefile:269: recipe for target 'olepicture.ok' failed
make: *** [olepicture.ok] Error 1

-- 
Alexandre Julliard
julliard(a)winehq.org