gdiplus: Don't require specific gdi+ versions in metafile structures.

Based on testing of manually edited metafiles, only the signature portion of version fields are tested, not the version number. Signed-off-by: Vincent Povirk <vincent@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

gdiplus: Don't require specific gdi+ versions in metafile structures.
cfe2b3fa · Vincent Povirk · Alexandre Julliard · 88abcf3a · cfe2b3fa · cfe2b3fa
Commit cfe2b3fa authored Jul 18, 2017 by Vincent Povirk Committed by Alexandre Julliard Jul 18, 2017
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

gdiplus_private.h dlls/gdiplus/gdiplus_private.h +1 -0

region.c dlls/gdiplus/region.c +2 -3

No files found.
--- a/dlls/gdiplus/gdiplus_private.h
+++ b/dlls/gdiplus/gdiplus_private.h
@@ -41,6 +41,7 @@
 #define VERSION_MAGIC  0xdbc01001
 #define VERSION_MAGIC2 0xdbc01002
+#define VALID_MAGIC(x) (((x) & 0xfffff000) == 0xdbc01000)
 #define TENSION_CONST (0.3)
 #define GIF_DISPOSE_UNSPECIFIED 0

--- a/dlls/gdiplus/region.c
+++ b/dlls/gdiplus/region.c
@@ -961,7 +961,7 @@ static GpStatus read_element(struct memory_buffer *mbuf, GpRegion *region, regio
            ERR("failed to read path header\n");
            return InvalidParameter;
        }
-        if (path_header->magic != VERSION_MAGIC)
+        if (!VALID_MAGIC(path_header->magic))
        {
            ERR("invalid path header magic %#x\n", path_header->magic);
            return InvalidParameter;
@@ -1069,8 +1069,7 @@ GpStatus WINGDIPAPI GdipCreateRegionRgnData(GDIPCONST BYTE *data, INT size, GpRe
    init_memory_buffer(&mbuf, data, size);
    region_header = buffer_read(&mbuf, sizeof(*region_header));
-    if (!region_header || (region_header->magic != VERSION_MAGIC &&
+    if (!region_header || !VALID_MAGIC(region_header->magic))
-                           region_header->magic != VERSION_MAGIC2))
        return InvalidParameter;
    status = GdipCreateRegion(region);