user32/tests: Finish the move to use wine_dbgstr_rect().
Signed-off-by: Michael Stefaniuc <mstefani@redhat.de> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
827cd8f332
commit
c03ccff2ba
|
@ -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");
|
||||
|
||||
|
|
Loading…
Reference in New Issue