[PATCH v2 3/5] d3dx9/tests: Add some tests for ID3DXFont_DrawText.

Sven Baars sbaars at codeweavers.com
Mon Jan 27 05:28:07 CST 2020


From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>

Signed-off-by: Sven Baars <sbaars at codeweavers.com>
---
v2: Removed the -2 test for DrawTextW since it crashes on Windows, and
    was added as a result of random testing (and not an applcation needing it).
    Also removed the if statement. I also did this for the other tests
    in the previous patch.

 dlls/d3dx9_36/tests/core.c | 56 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c
index 537109c59d..ed4e0cbba8 100644
--- a/dlls/d3dx9_36/tests/core.c
+++ b/dlls/d3dx9_36/tests/core.c
@@ -624,6 +624,62 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
 
         ID3DXFont_Release(font);
     }
+
+
+    /* ID3DXFont_DrawTextA, ID3DXFont_DrawTextW */
+    hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Tahoma", &font);
+    ok(hr == D3D_OK, "D3DXCreateFont returned %#x, expected %#x\n", hr, D3D_OK);
+
+    todo_wine {
+    SetRect(&rect, 10, 10, 200, 200);
+
+    height = ID3DXFont_DrawTextA(font, NULL, "test", -2, &rect, 0, 0xFF00FF);
+    ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
+
+    height = ID3DXFont_DrawTextA(font, NULL, "test", -1, &rect, 0, 0xFF00FF);
+    ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
+
+    height = ID3DXFont_DrawTextA(font, NULL, "test", 0, &rect, 0, 0xFF00FF);
+    ok(height == 0, "DrawTextA returned %d, expected 0.\n", height);
+
+    height = ID3DXFont_DrawTextA(font, NULL, "test", 1, &rect, 0, 0xFF00FF);
+    ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
+
+    height = ID3DXFont_DrawTextA(font, NULL, "test", 2, &rect, 0, 0xFF00FF);
+    ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
+
+    height = ID3DXFont_DrawTextA(font, NULL, "test", -1, NULL, 0, 0xFF00FF);
+    ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
+
+    height = ID3DXFont_DrawTextA(font, NULL, "test", -1, NULL, DT_CALCRECT, 0xFF00FF);
+    ok(height == 12, "DrawTextA returned %d, expected 12.\n", height);
+
+    height = ID3DXFont_DrawTextA(font, NULL, NULL, -1, NULL, 0, 0xFF00FF);
+    ok(height == 0, "DrawTextA returned %d, expected 0.\n", height);
+
+    height = ID3DXFont_DrawTextW(font, NULL, testW, -1, &rect, 0, 0xFF00FF);
+    ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
+
+    height = ID3DXFont_DrawTextW(font, NULL, testW, 0, &rect, 0, 0xFF00FF);
+    ok(height == 0, "DrawTextW returned %d, expected 0.\n", height);
+
+    height = ID3DXFont_DrawTextW(font, NULL, testW, 1, &rect, 0, 0xFF00FF);
+    ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
+
+    height = ID3DXFont_DrawTextW(font, NULL, testW, 2, &rect, 0, 0xFF00FF);
+    ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
+
+    height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, 0, 0xFF00FF);
+    ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
+
+    height = ID3DXFont_DrawTextW(font, NULL, testW, -1, NULL, DT_CALCRECT, 0xFF00FF);
+    ok(height == 12, "DrawTextW returned %d, expected 12.\n", height);
+
+    height = ID3DXFont_DrawTextW(font, NULL, NULL, -1, NULL, 0, 0xFF00FF);
+    ok(height == 0, "DrawTextW returned %d, expected 0.\n", height);
+    }
+
+    ID3DXFont_Release(font);
 }
 
 static void test_D3DXCreateRenderToSurface(IDirect3DDevice9 *device)
-- 
2.24.0




More information about the wine-devel mailing list