Eric Pouech : dplayx/tests: Use function in checkFlags macro to handle integral conversion.

Alexandre Julliard julliard at winehq.org
Fri Feb 25 14:17:22 CST 2022


Module: wine
Branch: master
Commit: 72a5a29b6f39627cbfe368799c19948b8c81e8ed
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=72a5a29b6f39627cbfe368799c19948b8c81e8ed

Author: Eric Pouech <eric.pouech at gmail.com>
Date:   Thu Feb 24 11:28:08 2022 +0100

dplayx/tests: Use function in checkFlags macro to handle integral conversion.

Signed-off-by: Eric Pouech <eric.pouech at gmail.com>
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/dplayx/tests/dplayx.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/dlls/dplayx/tests/dplayx.c b/dlls/dplayx/tests/dplayx.c
index 11d96706e9f..75c05cbb282 100644
--- a/dlls/dplayx/tests/dplayx.c
+++ b/dlls/dplayx/tests/dplayx.c
@@ -45,11 +45,15 @@ static HRESULT (WINAPI *pDirectPlayCreate)( GUID *GUID, LPDIRECTPLAY *lplpDP, IU
     ok( (result != NULL) && (!strcmp(expected, result)),        \
         "expected=%s got=%s\n",                                 \
         expected, result );
-#define checkFlags(expected, result, flags)     \
-    ok( (expected) == (result),                 \
-        "expected=0x%08x(%s) got=0x%08x(%s)\n", \
-        expected, dwFlags2str(expected, flags), \
+static LPCSTR dwFlags2str(DWORD dwFlags, DWORD flagType);
+#define checkFlags(expected, result, flags) checkFlags_(__LINE__, expected, result, flags)
+static void checkFlags_(unsigned line, DWORD expected, DWORD result, DWORD flags)
+{
+    ok_(__FILE__, line)( expected == result,
+        "expected=0x%08x(%s) got=0x%08x(%s)\n",
+        expected, dwFlags2str(expected, flags),
         result, dwFlags2str(result, flags) );
+}
 #define checkGuid(expected, result)             \
     ok( IsEqualGUID(expected, result),          \
         "expected=%s got=%s\n",                 \




More information about the wine-cvs mailing list