Module: wine Branch: master Commit: 6a5eed549de8947e6d789c6e87ae24b58bc979b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a5eed549de8947e6d789c6e8...
Author: Esme Povirk esme@codeweavers.com Date: Wed Sep 16 16:29:01 2020 -0500
gdiplus/tests: Don't test point type array padding.
Since the point types are an array of bytes, padded to a DWORD boundary, some of the bytes at the end are undefined, and there's no good reason to test them.
Signed-off-by: Esme Povirk esme@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/gdiplus/tests/region.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index d69f09db60..04c388bf5a 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -641,8 +641,8 @@ static void test_getregiondata(void) expect_float(buf + 25, 50.0); expect_float(buf + 26, 70.2); expect_dword(buf + 27, 0x01010100); - ok(*(buf + 28) == 0x00000101 || *(buf + 28) == 0x43050101 /* Win 7 */, - "expected 00000101 or 43050101 got %08x\n", *(buf + 28)); + ok((*(buf + 28) & 0xffff) == 0x0101, + "expected ????0101 got %08x\n", *(buf + 28)); expect_dword(buf + 29, 0xeeeeeeee); test_region_data(buf, needed, __LINE__);
@@ -791,9 +791,8 @@ static void test_getregiondata(void) expect_float(buf + 30, 789.799561); expect_dword(buf + 31, 0x03030300); expect_dword(buf + 32, 0x03030301); - ok(*(buf + 33) == 0x00030303 /* before win7 */ || - *(buf + 33) == 0x43030303 /* 32-bit win7 */ || *(buf + 33) == 0x4c030303 /* 64-bit win7 */, - "expected 0x00030303 or 0x43030303 or 0x4c030303 got %08x\n", *(buf + 33)); + ok((*(buf + 33) & 0xffffff) == 0x030303, + "expected 0x??030303 got %08x\n", *(buf + 33)); expect_dword(buf + 34, 0xeeeeeeee); test_region_data(buf, needed, __LINE__);