From eb39c4e4fe26cc6784db9eeee362cac29458d90f Mon Sep 17 00:00:00 2001 From: Eric Pouech Date: Mon, 28 Feb 2022 08:25:50 +0100 Subject: [PATCH] gdiplus/tests: Introduce helper functions (expect*) to handle integral conversions. Signed-off-by: Eric Pouech Signed-off-by: Esme Povirk Signed-off-by: Alexandre Julliard --- dlls/gdiplus/tests/brush.c | 6 +++++- dlls/gdiplus/tests/font.c | 7 ++++++- dlls/gdiplus/tests/metafile.c | 6 +++++- dlls/gdiplus/tests/pen.c | 6 +++++- dlls/gdiplus/tests/region.c | 6 +++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 0287078bc80..fd4116240d4 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -25,7 +25,11 @@ #include "gdiplus.h" #include "wine/test.h" -#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %.8d, got %.8d\n", expected, got); +} #define expectf(expected, got) ok(fabs(expected - got) < 0.0001, "Expected %.2f, got %.2f\n", expected, got) static HWND hwnd; diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index d8f8a474742..3fe123e25c4 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -25,7 +25,12 @@ #include "gdiplus.h" #include "wine/test.h" -#define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) +#define expect(expected,got) expect_inline(__LINE__, expected, got) +static inline void expect_inline(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\n", expected, got); +} + #define expect_(expected, got, precision) ok(abs((expected) - (got)) <= (precision), "Expected %d, got %d\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) diff --git a/dlls/gdiplus/tests/metafile.c b/dlls/gdiplus/tests/metafile.c index 3ad3db35273..51193f76b6a 100644 --- a/dlls/gdiplus/tests/metafile.c +++ b/dlls/gdiplus/tests/metafile.c @@ -25,7 +25,11 @@ #include "winspool.h" #include "wine/test.h" -#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %.8d, got %.8d\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) diff --git a/dlls/gdiplus/tests/pen.c b/dlls/gdiplus/tests/pen.c index 28caf29acbe..bfd4b233081 100644 --- a/dlls/gdiplus/tests/pen.c +++ b/dlls/gdiplus/tests/pen.c @@ -24,7 +24,11 @@ #include "gdiplus.h" #include "wine/test.h" -#define expect(expected, got) ok(got == expected, "Expected %.8x, got %.8x\n", expected, got) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %.8d, got %.8d\n", expected, got); +} #define expectf(expected, got) ok(fabs(got - expected) < 0.1, "Expected %.2f, got %.2f\n", expected, got) static void test_startup(void) diff --git a/dlls/gdiplus/tests/region.c b/dlls/gdiplus/tests/region.c index 04c388bf5a7..04db033a7e0 100644 --- a/dlls/gdiplus/tests/region.c +++ b/dlls/gdiplus/tests/region.c @@ -33,7 +33,11 @@ #define RGNDATA_MAGIC 0xdbc01001 #define RGNDATA_MAGIC2 0xdbc01002 -#define expect(expected, got) ok((got) == (expected), "Expected %.8x, got %.8x\n", (expected), (got)) +#define expect(expected,got) expect_(__LINE__, expected, got) +static inline void expect_(unsigned line, DWORD expected, DWORD got) +{ + ok_(__FILE__, line)(expected == got, "Expected %d, got %d\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)