From c03ccff2ba4e8eb69f2a7492ab4b956e811c8a0e Mon Sep 17 00:00:00 2001 From: Michael Stefaniuc Date: Mon, 20 Jun 2016 12:08:13 +0200 Subject: [PATCH] user32/tests: Finish the move to use wine_dbgstr_rect(). Signed-off-by: Michael Stefaniuc Signed-off-by: Alexandre Julliard --- dlls/user32/tests/text.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/dlls/user32/tests/text.c b/dlls/user32/tests/text.c index e04f1e346b3..8438f10cd0a 100644 --- a/dlls/user32/tests/text.c +++ b/dlls/user32/tests/text.c @@ -130,15 +130,12 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); SetLastError( 0); heightcheck = textheight = DrawTextExA(hdc, emptystring, -1, &rect, DT_CALCRECT, NULL ); - ok( EMPTY(rect), - "rectangle should be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextExA\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextA(hdc, emptystring, -1, &rect, DT_CALCRECT); - ok( EMPTY(rect), - "rectangle should be empty got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextA\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); @@ -197,15 +194,14 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); SetLastError( 0); heightcheck = textheight = DrawTextExA(hdc, emptystring, -1, &rect, DT_CALCRECT|DT_SINGLELINE, NULL ); - ok( !EMPTY(rect) && MODIFIED(rect), - "rectangle should be modified got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); + ok(!EMPTY(rect) && MODIFIED(rect), "rectangle should be modified got %s\n", + wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextExA\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextA(hdc, emptystring, -1, &rect, DT_CALCRECT|DT_SINGLELINE); - ok( !EMPTY(rect) && MODIFIED (rect), - "rectangle should be modified got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(!EMPTY(rect) && MODIFIED (rect), "rectangle should be modified got %s\n", + wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextA\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); @@ -339,16 +335,12 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); heightcheck = textheight = DrawTextExW(hdc, emptystringW, -1, &rect, DT_CALCRECT, NULL ); - ok( EMPTY(rect), - "rectangle should be empty got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextExW\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT); - ok( EMPTY(rect), - "rectangle should be empty got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextW\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); @@ -406,16 +398,14 @@ static void test_DrawTextCalcRect(void) SetRect( &rect, 10,10, 100, 100); heightcheck = textheight = DrawTextExW(hdc, emptystringW, -1, &rect, DT_CALCRECT|DT_SINGLELINE, NULL ); - ok( !EMPTY(rect) && MODIFIED(rect), - "rectangle should be modified got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(!EMPTY(rect) && MODIFIED(rect), "rectangle should be modified got %s\n", + wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextExW\n"); SetRect( &rect, 10,10, 100, 100); textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT|DT_SINGLELINE); - ok( !EMPTY(rect) && MODIFIED(rect), - "rectangle should be modified got %d,%d-%d,%d\n", - rect.left, rect.top, rect.right, rect.bottom ); + ok(!EMPTY(rect) && MODIFIED(rect), "rectangle should be modified got %s\n", + wine_dbgstr_rect(&rect)); ok(textheight!=0,"Failed to get textheight from DrawTextW\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n");