Piotr Caban : gdiplus: Store newer gdi+ version in created GdipRegions.

[Alexandre Julliard]

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

Author: Piotr Caban 
Date:   Tue Jul 18 18:59:40 2017 +0200

gdiplus: Store newer gdi+ version in created GdipRegions.

Signed-off-by: Piotr Caban 
Signed-off-by: Vincent Povirk 
Signed-off-by: Alexandre Julliard

---

dlls/gdiplus/region.c       | 4 ++--
 dlls/gdiplus/tests/region.c | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c
index 390b50f..a905f0d 100644
--- a/dlls/gdiplus/region.c
+++ b/dlls/gdiplus/region.c
@@ -764,7 +764,7 @@ static void write_element(const region_element* element, DWORD *buffer,
             else
                 pathheader->size += 2 * sizeof(FLOAT) * path->pathdata.Count;
             pathheader->size += get_pathtypes_size(path);
-            pathheader->magic = VERSION_MAGIC;
+            pathheader->magic = VERSION_MAGIC2;
             pathheader->count = path->pathdata.Count;

*filled += 4;
@@ -852,7 +852,7 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size,
     region_header = (struct region_header *)buffer;
     region_header->size = sizeheader_size + get_element_size(&region->node);
     region_header->checksum = 0;
-    region_header->magic = VERSION_MAGIC;
+    region_header->magic = VERSION_MAGIC2;
     region_header->num_children = region->num_children;
     filled += 4;
     /* With few exceptions, everything written is DWORD aligned,
diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c
index d4d8772..2bf4470 100644
--- a/dlls/gdiplus/tests/region.c
+++ b/dlls/gdiplus/tests/region.c
@@ -37,7 +37,7 @@
 #define expectf_(expected, got, precision) ok(fabs((expected) - (got)) < (precision), "Expected %f, got %f\n", (expected), (got))
 #define expectf(expected, got) expectf_((expected), (got), 0.001)

-#define expect_magic(value) ok(*(value) == RGNDATA_MAGIC || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *(value))
+#define expect_magic(value) ok(broken(*(value) == RGNDATA_MAGIC) || *(value) == RGNDATA_MAGIC2, "Expected a known magic value, got %8x\n", *(value))
 #define expect_dword(value, expected) expect((expected), *(value))
 #define expect_float(value, expected) expectf((expected), *(FLOAT *)(value))