Commit 55453327 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard

gdiplus: Store newer gdi+ version in created GdipRegions.

parent 45284246
...@@ -764,7 +764,7 @@ static void write_element(const region_element* element, DWORD *buffer, ...@@ -764,7 +764,7 @@ static void write_element(const region_element* element, DWORD *buffer,
else else
pathheader->size += 2 * sizeof(FLOAT) * path->pathdata.Count; pathheader->size += 2 * sizeof(FLOAT) * path->pathdata.Count;
pathheader->size += get_pathtypes_size(path); pathheader->size += get_pathtypes_size(path);
pathheader->magic = VERSION_MAGIC; pathheader->magic = VERSION_MAGIC2;
pathheader->count = path->pathdata.Count; pathheader->count = path->pathdata.Count;
*filled += 4; *filled += 4;
...@@ -852,7 +852,7 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size, ...@@ -852,7 +852,7 @@ GpStatus WINGDIPAPI GdipGetRegionData(GpRegion *region, BYTE *buffer, UINT size,
region_header = (struct region_header *)buffer; region_header = (struct region_header *)buffer;
region_header->size = sizeheader_size + get_element_size(&region->node); region_header->size = sizeheader_size + get_element_size(&region->node);
region_header->checksum = 0; region_header->checksum = 0;
region_header->magic = VERSION_MAGIC; region_header->magic = VERSION_MAGIC2;
region_header->num_children = region->num_children; region_header->num_children = region->num_children;
filled += 4; filled += 4;
/* With few exceptions, everything written is DWORD aligned, /* With few exceptions, everything written is DWORD aligned,
......
...@@ -37,7 +37,7 @@ ...@@ -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, precision) ok(fabs((expected) - (got)) < (precision), "Expected %f, got %f\n", (expected), (got))
#define expectf(expected, got) expectf_((expected), (got), 0.001) #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_dword(value, expected) expect((expected), *(value))
#define expect_float(value, expected) expectf((expected), *(FLOAT *)(value)) #define expect_float(value, expected) expectf((expected), *(FLOAT *)(value))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment