Skip to content

W
wine-winehq
Commit c03ccff2 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

user32/tests: Finish the move to use wine_dbgstr_rect().

Signed-off-by: 's avatarMichael Stefaniuc <mstefani@redhat.de> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 827cd8f3
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 22 deletions
dlls/user32/tests/text.c
View file @ c03ccff2
...@@ -130,15 +130,12 @@ static void test_DrawTextCalcRect(void) ...@@ -130,15 +130,12 @@ static void test_DrawTextCalcRect(void)
SetRect( &rect, 10,10, 100, 100); SetRect( &rect, 10,10, 100, 100);
SetLastError( 0); SetLastError( 0);
heightcheck = textheight = DrawTextExA(hdc, emptystring, -1, &rect, DT_CALCRECT, NULL ); heightcheck = textheight = DrawTextExA(hdc, emptystring, -1, &rect, DT_CALCRECT, NULL );
ok( EMPTY(rect), ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect));
"rectangle should be empty got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom );
ok(textheight!=0,"Failed to get textheight from DrawTextExA\n"); ok(textheight!=0,"Failed to get textheight from DrawTextExA\n");
SetRect( &rect, 10,10, 100, 100); SetRect( &rect, 10,10, 100, 100);
textheight = DrawTextA(hdc, emptystring, -1, &rect, DT_CALCRECT); textheight = DrawTextA(hdc, emptystring, -1, &rect, DT_CALCRECT);
ok( EMPTY(rect), ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect));
"rectangle should be empty got %d,%d-%d,%d\n",
rect.left, rect.top, rect.right, rect.bottom );
ok(textheight!=0,"Failed to get textheight from DrawTextA\n"); ok(textheight!=0,"Failed to get textheight from DrawTextA\n");
ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n");
...@@ -197,15 +194,14 @@ static void test_DrawTextCalcRect(void) ...@@ -197,15 +194,14 @@ static void test_DrawTextCalcRect(void)
SetRect( &rect, 10,10, 100, 100); SetRect( &rect, 10,10, 100, 100);
SetLastError( 0); SetLastError( 0);
heightcheck = textheight = DrawTextExA(hdc, emptystring, -1, &rect, DT_CALCRECT|DT_SINGLELINE, NULL ); heightcheck = textheight = DrawTextExA(hdc, emptystring, -1, &rect, DT_CALCRECT|DT_SINGLELINE, NULL );
ok( !EMPTY(rect) && MODIFIED(rect), ok(!EMPTY(rect) && MODIFIED(rect), "rectangle should be modified got %s\n",
"rectangle should be modified got %d,%d-%d,%d\n", rect.left, rect.top, rect.right, rect.bottom ); wine_dbgstr_rect(&rect));
ok(textheight!=0,"Failed to get textheight from DrawTextExA\n"); ok(textheight!=0,"Failed to get textheight from DrawTextExA\n");
SetRect( &rect, 10,10, 100, 100); SetRect( &rect, 10,10, 100, 100);
textheight = DrawTextA(hdc, emptystring, -1, &rect, DT_CALCRECT|DT_SINGLELINE); textheight = DrawTextA(hdc, emptystring, -1, &rect, DT_CALCRECT|DT_SINGLELINE);
ok( !EMPTY(rect) && MODIFIED (rect), ok(!EMPTY(rect) && MODIFIED (rect), "rectangle should be modified got %s\n",
"rectangle should be modified got %d,%d-%d,%d\n", wine_dbgstr_rect(&rect));
rect.left, rect.top, rect.right, rect.bottom );
ok(textheight!=0,"Failed to get textheight from DrawTextA\n"); ok(textheight!=0,"Failed to get textheight from DrawTextA\n");
ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n");
...@@ -339,16 +335,12 @@ static void test_DrawTextCalcRect(void) ...@@ -339,16 +335,12 @@ static void test_DrawTextCalcRect(void)
SetRect( &rect, 10,10, 100, 100); SetRect( &rect, 10,10, 100, 100);
heightcheck = textheight = DrawTextExW(hdc, emptystringW, -1, &rect, DT_CALCRECT, NULL ); heightcheck = textheight = DrawTextExW(hdc, emptystringW, -1, &rect, DT_CALCRECT, NULL );
ok( EMPTY(rect), ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect));
"rectangle should be empty got %d,%d-%d,%d\n",
rect.left, rect.top, rect.right, rect.bottom );
ok(textheight!=0,"Failed to get textheight from DrawTextExW\n"); ok(textheight!=0,"Failed to get textheight from DrawTextExW\n");
SetRect( &rect, 10,10, 100, 100); SetRect( &rect, 10,10, 100, 100);
textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT); textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT);
ok( EMPTY(rect), ok(EMPTY(rect), "rectangle should be empty got %s\n", wine_dbgstr_rect(&rect));
"rectangle should be empty got %d,%d-%d,%d\n",
rect.left, rect.top, rect.right, rect.bottom );
ok(textheight!=0,"Failed to get textheight from DrawTextW\n"); ok(textheight!=0,"Failed to get textheight from DrawTextW\n");
ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n");
...@@ -406,16 +398,14 @@ static void test_DrawTextCalcRect(void) ...@@ -406,16 +398,14 @@ static void test_DrawTextCalcRect(void)
SetRect( &rect, 10,10, 100, 100); SetRect( &rect, 10,10, 100, 100);
heightcheck = textheight = DrawTextExW(hdc, emptystringW, -1, &rect, DT_CALCRECT|DT_SINGLELINE, NULL ); heightcheck = textheight = DrawTextExW(hdc, emptystringW, -1, &rect, DT_CALCRECT|DT_SINGLELINE, NULL );
ok( !EMPTY(rect) && MODIFIED(rect), ok(!EMPTY(rect) && MODIFIED(rect), "rectangle should be modified got %s\n",
"rectangle should be modified got %d,%d-%d,%d\n", wine_dbgstr_rect(&rect));
rect.left, rect.top, rect.right, rect.bottom );
ok(textheight!=0,"Failed to get textheight from DrawTextExW\n"); ok(textheight!=0,"Failed to get textheight from DrawTextExW\n");
SetRect( &rect, 10,10, 100, 100); SetRect( &rect, 10,10, 100, 100);
textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT|DT_SINGLELINE); textheight = DrawTextW(hdc, emptystringW, -1, &rect, DT_CALCRECT|DT_SINGLELINE);
ok( !EMPTY(rect) && MODIFIED(rect), ok(!EMPTY(rect) && MODIFIED(rect), "rectangle should be modified got %s\n",
"rectangle should be modified got %d,%d-%d,%d\n", wine_dbgstr_rect(&rect));
rect.left, rect.top, rect.right, rect.bottom );
ok(textheight!=0,"Failed to get textheight from DrawTextW\n"); ok(textheight!=0,"Failed to get textheight from DrawTextW\n");
ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n"); ok(textheight == heightcheck,"DrawTextEx and DrawText differ in return\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment