Alistair Leslie-Hughes : d2d1/tests: Use standard wine_dbgstr_longlong.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 4fc2dbb14a17ef61b1cb6832fb0cd00e071e9150
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=4fc2dbb14a17ef61b1cb6832fb0cd00e071e9150

Author: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date:   Wed Jul  5 02:37:05 2017 +0000

d2d1/tests: Use standard wine_dbgstr_longlong.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/d2d1/tests/d2d1.c | 35 ++++++++++++++---------------------
 1 file changed, 14 insertions(+), 21 deletions(-)

diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 0adeef4..e0318ce 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -1111,9 +1111,8 @@ static void test_state_block(void)
     ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_DEFAULT,
             "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode);
     ID2D1RenderTarget_GetTags(rt, &drawing_state.tag1, &drawing_state.tag2);
-    ok(!drawing_state.tag1 && !drawing_state.tag2, "Got unexpected tags %08x%08x:%08x%08x.\n",
-            (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1),
-            (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2));
+    ok(!drawing_state.tag1 && !drawing_state.tag2, "Got unexpected tags %s:%s.\n",
+            wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2));
     ID2D1RenderTarget_GetTransform(rt, &drawing_state.transform);
     ok(!memcmp(&drawing_state.transform, &identity, sizeof(drawing_state.transform)),
             "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n",
@@ -1129,9 +1128,8 @@ static void test_state_block(void)
             "Got unexpected antialias mode %#x.\n", drawing_state.antialiasMode);
     ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_DEFAULT,
             "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode);
-    ok(!drawing_state.tag1 && !drawing_state.tag2, "Got unexpected tags %08x%08x:%08x%08x.\n",
-            (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1),
-            (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2));
+    ok(!drawing_state.tag1 && !drawing_state.tag2, "Got unexpected tags %s:%s.\n",
+            wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2));
     ok(!memcmp(&drawing_state.transform, &identity, sizeof(drawing_state.transform)),
             "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n",
             drawing_state.transform._11, drawing_state.transform._12, drawing_state.transform._21,
@@ -1153,9 +1151,8 @@ static void test_state_block(void)
             "Got unexpected antialias mode %#x.\n", drawing_state.antialiasMode);
     ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_ALIASED,
             "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode);
-    ok(drawing_state.tag1 == 0xdead && drawing_state.tag2 == 0xbeef, "Got unexpected tags %08x%08x:%08x%08x.\n",
-            (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1),
-            (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2));
+    ok(drawing_state.tag1 == 0xdead && drawing_state.tag2 == 0xbeef, "Got unexpected tags %s:%s.\n",
+            wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2));
     ok(!memcmp(&drawing_state.transform, &transform1, sizeof(drawing_state.transform)),
             "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n",
             drawing_state.transform._11, drawing_state.transform._12, drawing_state.transform._21,
@@ -1174,9 +1171,8 @@ static void test_state_block(void)
     ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_ALIASED,
             "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode);
     ID2D1RenderTarget_GetTags(rt, &drawing_state.tag1, &drawing_state.tag2);
-    ok(drawing_state.tag1 == 0xdead && drawing_state.tag2 == 0xbeef, "Got unexpected tags %08x%08x:%08x%08x.\n",
-            (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1),
-            (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2));
+    ok(drawing_state.tag1 == 0xdead && drawing_state.tag2 == 0xbeef, "Got unexpected tags %s:%s.\n",
+            wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2));
     ID2D1RenderTarget_GetTransform(rt, &drawing_state.transform);
     ok(!memcmp(&drawing_state.transform, &transform1, sizeof(drawing_state.transform)),
             "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n",
@@ -1200,9 +1196,8 @@ static void test_state_block(void)
     ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE,
             "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode);
     ID2D1RenderTarget_GetTags(rt, &drawing_state.tag1, &drawing_state.tag2);
-    ok(drawing_state.tag1 == 1 && drawing_state.tag2 == 2, "Got unexpected tags %08x%08x:%08x%08x.\n",
-            (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1),
-            (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2));
+    ok(drawing_state.tag1 == 1 && drawing_state.tag2 == 2, "Got unexpected tags %s:%s.\n",
+            wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2));
     ID2D1RenderTarget_GetTransform(rt, &drawing_state.transform);
     ok(!memcmp(&drawing_state.transform, &transform2, sizeof(drawing_state.transform)),
             "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n",
@@ -1218,9 +1213,8 @@ static void test_state_block(void)
             "Got unexpected antialias mode %#x.\n", drawing_state.antialiasMode);
     ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE,
             "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode);
-    ok(drawing_state.tag1 == 1 && drawing_state.tag2 == 2, "Got unexpected tags %08x%08x:%08x%08x.\n",
-            (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1),
-            (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2));
+    ok(drawing_state.tag1 == 1 && drawing_state.tag2 == 2, "Got unexpected tags %s:%s.\n",
+            wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2));
     ok(!memcmp(&drawing_state.transform, &transform2, sizeof(drawing_state.transform)),
             "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n",
             drawing_state.transform._11, drawing_state.transform._12, drawing_state.transform._21,
@@ -1241,9 +1235,8 @@ static void test_state_block(void)
             "Got unexpected antialias mode %#x.\n", drawing_state.antialiasMode);
     ok(drawing_state.textAntialiasMode == D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE,
             "Got unexpected text antialias mode %#x.\n", drawing_state.textAntialiasMode);
-    ok(drawing_state.tag1 == 3 && drawing_state.tag2 == 4, "Got unexpected tags %08x%08x:%08x%08x.\n",
-            (unsigned int)(drawing_state.tag1 >> 32), (unsigned int)(drawing_state.tag1),
-            (unsigned int)(drawing_state.tag2 >> 32), (unsigned int)(drawing_state.tag2));
+    ok(drawing_state.tag1 == 3 && drawing_state.tag2 == 4, "Got unexpected tags %s:%s.\n",
+            wine_dbgstr_longlong(drawing_state.tag1), wine_dbgstr_longlong(drawing_state.tag2));
     ok(!memcmp(&drawing_state.transform, &transform1, sizeof(drawing_state.transform)),
             "Got unexpected matrix {%.8e, %.8e, %.8e, %.8e, %.8e, %.8e}.\n",
             drawing_state.transform._11, drawing_state.transform._12, drawing_state.transform._21,