Nikolay Sivov : d2d1/tests: Add some missing EndDraw() checks (Coverity).

[Alexandre Julliard]

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

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Tue Mar  5 13:54:16 2019 +0300

d2d1/tests: Add some missing EndDraw() checks (Coverity).

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/d2d1/tests/d2d1.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c
index 617977f..2214be6 100644
--- a/dlls/d2d1/tests/d2d1.c
+++ b/dlls/d2d1/tests/d2d1.c
@@ -4884,7 +4884,7 @@ static void test_draw_text_layout(void)
 
     hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
 todo_wine
-    ok(hr == D2DERR_WRONG_FACTORY, "EndDraw failure expected, hr %#x.\n", hr);
+    ok(hr == D2DERR_WRONG_FACTORY, "Unexpected hr %#x.\n", hr);
 
     /* Effect is d2d resource, but not a brush. */
     set_rect(&rect, 0.0f, 0.0f, 10.0f, 10.0f);
@@ -4903,7 +4903,7 @@ todo_wine
     ID2D1RenderTarget_DrawTextLayout(rt, origin, text_layout, (ID2D1Brush*)brush, D2D1_DRAW_TEXT_OPTIONS_NONE);
 
     hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
-    ok(hr == S_OK, "EndDraw failure expected, hr %#x.\n", hr);
+    ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr);
 
     for (i = 0; i < ARRAY_SIZE(antialias_mode_tests); ++i)
     {
@@ -6576,12 +6576,14 @@ todo_wine
     ok(SUCCEEDED(hr), "GetDC() was expected to succeed, hr %#x.\n", hr);
     ok(dc != NULL, "Expected NULL dc, got %p.\n", dc);
     ID2D1GdiInteropRenderTarget_ReleaseDC(interop, NULL);
-    ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
+    hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
+    ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr);
 
     ID2D1RenderTarget_BeginDraw(rt);
     set_color(&color, 1.0f, 0.0f, 0.0f, 1.0f);
     ID2D1RenderTarget_Clear(rt, &color);
-    ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
+    hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
+    ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr);
 
     match = compare_wic_bitmap(wic_bitmap, "54034063dbc1c1bb61cb60ec57e4498678dc2b13");
     ok(match, "Bitmap does not match.\n");
@@ -6596,7 +6598,8 @@ todo_wine
     FillRect(dc, &rect, GetStockObject(BLACK_BRUSH));
     ID2D1GdiInteropRenderTarget_ReleaseDC(interop, NULL);
 
-    ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
+    hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL);
+    ok(SUCCEEDED(hr), "EndDraw() failed, hr %#x.\n", hr);
 
     match = compare_wic_bitmap(wic_bitmap, "60cacbf3d72e1e7834203da608037b1bf83b40e8");
     ok(match, "Bitmap does not match.\n");