Nikolay Sivov : gdiplus/metafile: Support serialized brushes in EmfPlusFillRects.

Alexandre Julliard julliard at winehq.org
Mon Oct 16 14:38:31 CDT 2017


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

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Mon Oct 16 10:12:25 2017 +0300

gdiplus/metafile: Support serialized brushes in EmfPlusFillRects.

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

---

 dlls/gdiplus/metafile.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c
index 43d2d8c..1fd4db2 100644
--- a/dlls/gdiplus/metafile.c
+++ b/dlls/gdiplus/metafile.c
@@ -1852,8 +1852,12 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile,
             }
             else
             {
-                FIXME("brush deserialization not implemented\n");
-                return NotImplemented;
+                if (record->BrushID >= EmfPlusObjectTableSize ||
+                        real_metafile->objtable[record->BrushID].type != ObjectTypeBrush)
+                    return InvalidParameter;
+
+                brush = real_metafile->objtable[record->BrushID].u.brush;
+                stat = Ok;
             }
 
             if (stat == Ok)




More information about the wine-cvs mailing list