[PATCH v4 2/4] dlls/gdiplus: Use GdipCreatePath2 when serializing paths

[David Kahurani]

From: David Kahurani

This seems like a better interface and avoids duplicating code.

Signed-off-by: David Kahurani 
---
 dlls/gdiplus/metafile.c | 46 ++++++++++++++++++-----------------------
 1 file changed, 20 insertions(+), 26 deletions(-)

diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c
index 5c50d0d1d37..a407366c734 100644
--- a/dlls/gdiplus/metafile.c
+++ b/dlls/gdiplus/metafile.c
@@ -2006,7 +2006,6 @@ static GpStatus metafile_deserialize_image(const BYTE *record_data, UINT data_si
 static GpStatus metafile_deserialize_path(const BYTE *record_data, UINT data_size, GpPath **path)
 {
     EmfPlusPath *data = (EmfPlusPath *)record_data;
-    GpStatus status;
     BYTE *types;
     UINT size;
     DWORD i;
@@ -2035,40 +2034,35 @@ static GpStatus metafile_deserialize_path(const BYTE *record_data, UINT data_siz
     if (data_size < size)
         return InvalidParameter;

-    status = GdipCreatePath(FillModeAlternate, path);
-    if (status != Ok)
-        return status;
-
-    (*path)->pathdata.Count = data->PathPointCount;
-    (*path)->pathdata.Points = malloc(data->PathPointCount * sizeof(*(*path)->pathdata.Points));
-    (*path)->pathdata.Types = malloc(data->PathPointCount * sizeof(*(*path)->pathdata.Types));
-    (*path)->datalen = (*path)->pathdata.Count;
-
-    if (!(*path)->pathdata.Points || !(*path)->pathdata.Types)
+    if (data->PathPointCount)
     {
-        GdipDeletePath(*path);
-        return OutOfMemory;
-    }
+        if (data->PathPointFlags & 0x4000) /* C */
+        {
+            EmfPlusPoint *points = (EmfPlusPoint *)data->data;
+            GpPointF *temp = malloc(sizeof(data->PathPointCount));

-    if (data->PathPointFlags & 0x4000) /* C */
-    {
-        EmfPlusPoint *points = (EmfPlusPoint *)data->data;
-        for (i = 0; i < data->PathPointCount; i++)
+            for (i = 0; i < data->PathPointCount; i++)
+            {
+                temp[i].X = points[i].X;
+                temp[i].Y = points[i].Y;
+            }
+            
+            types = (BYTE *)(points + i);
+            GdipCreatePath2(temp, types, data->PathPointCount, FillModeAlternate, path);
+            free(temp);
+        }
+        else
         {
-            (*path)->pathdata.Points[i].X = points[i].X;
-            (*path)->pathdata.Points[i].Y = points[i].Y;
+            EmfPlusPointF *points = (EmfPlusPointF *)data->data;
+            types = (BYTE *)(points + data->PathPointCount);
+            return GdipCreatePath2((GpPointF*)points, types, data->PathPointCount, FillModeAlternate, path);
         }
-        types = (BYTE *)(points + i);
     }
     else
     {
-        EmfPlusPointF *points = (EmfPlusPointF *)data->data;
-        memcpy((*path)->pathdata.Points, points, sizeof(*points) * data->PathPointCount);
-        types = (BYTE *)(points + data->PathPointCount);
+        return GdipCreatePath(FillModeAlternate, path);
     }

-    memcpy((*path)->pathdata.Types, types, sizeof(*types) * data->PathPointCount);
-
     return Ok;
 }