[PATCH] d3dx9/tests: Add initial tests for ID3DXFont::DrawText().

14 Jun 2018

From: Kieran Duggan <kieranduggan15(a)gmail.com>

Signed-off-by: Kieran Duggan <kieranduggan15(a)gmail.com>
Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
---
 dlls/d3dx9_36/tests/core.c | 81 +++++++++++++++++++++++++++++++++++-----------
 1 file changed, 62 insertions(+), 19 deletions(-)

diff --git a/dlls/d3dx9_36/tests/core.c b/dlls/d3dx9_36/tests/core.c
index 75d33c1e0dc..3ed25f8176b 100644
--- a/dlls/d3dx9_36/tests/core.c
+++ b/dlls/d3dx9_36/tests/core.c
@@ -305,23 +305,28 @@ static void test_ID3DXSprite(IDirect3DDevice9 *device)
 
 static void test_ID3DXFont(IDirect3DDevice9 *device)
 {
-    D3DXFONT_DESCA desc;
-    ID3DXFont *font;
-    HRESULT hr;
-    int ref;
-    int i;
-    static const struct {
-        INT font_height;
-        UINT expected_size;
-        DWORD expected_levels;
-    } texture_tests[] = {
+    static const WCHAR testW[] = {'t','e','s','t',0};
+    static const struct
+    {
+        int font_height;
+        unsigned int expected_size;
+        unsigned int expected_levels;
+    }
+    tests[] =
+    {
         {  6, 128, 4 },
         {  8, 128, 4 },
         { 10, 256, 5 },
         { 12, 256, 5 },
-        { 72, 256, 8 }
+        { 72, 256, 8 },
     };
-
+    const unsigned int size = ARRAY_SIZE(testW);
+    D3DXFONT_DESCA desc;
+    ID3DXSprite *sprite;
+    int ref, i, height;
+    ID3DXFont *font;
+    HRESULT hr;
+    RECT rect;
 
     /* D3DXCreateFont */
     ref = get_ref((IUnknown*)device);
@@ -463,8 +468,6 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
     /* ID3DXFont_PreloadText */
     hr = D3DXCreateFontA(device, 12, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font);
     if(SUCCEEDED(hr)) {
-        const WCHAR testW[] = {'t','e','s','t',0};
-
         todo_wine {
         hr = ID3DXFont_PreloadTextA(font, NULL, -1);
         ok(hr == D3DERR_INVALIDCALL, "ID3DXFont_PreloadTextA returned %#x, expected %#x\n", hr, D3DERR_INVALIDCALL);
@@ -552,7 +555,8 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
         check_release((IUnknown*)font, 0);
     } else skip("Failed to create a ID3DXFont object\n");
 
-    for(i = 0; i < ARRAY_SIZE(texture_tests); i++) {
+    for (i = 0; i < ARRAY_SIZE(tests); ++i)
+    {
         HDC hdc;
         DWORD ret;
         HRESULT hr;
@@ -560,7 +564,8 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
         char c = 'a';
         IDirect3DTexture9 *texture;
 
-        hr = D3DXCreateFontA(device, texture_tests[i].font_height, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET, OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font);
+        hr = D3DXCreateFontA(device, tests[i].font_height, 0, FW_DONTCARE, 0, FALSE, DEFAULT_CHARSET,
+                OUT_DEFAULT_PRECIS, DEFAULT_QUALITY, DEFAULT_PITCH, "Arial", &font);
         if(FAILED(hr)) {
             skip("Failed to create a ID3DXFont object\n");
             continue;
@@ -578,17 +583,55 @@ static void test_ID3DXFont(IDirect3DDevice9 *device)
             D3DSURFACE_DESC desc;
 
             levels = IDirect3DTexture9_GetLevelCount(texture);
-            ok(levels == texture_tests[i].expected_levels, "Got levels %u, expected %u\n", levels, texture_tests[i].expected_levels);
+            ok(levels == tests[i].expected_levels, "Got levels %u, expected %u\n",
+                    levels, tests[i].expected_levels);
             hr = IDirect3DTexture9_GetLevelDesc(texture, 0, &desc);
             ok(hr == D3D_OK, "IDirect3DTexture9_GetLevelDesc failed\n");
             ok(desc.Format == D3DFMT_A8R8G8B8, "Got format %#x, expected %#x\n", desc.Format, D3DFMT_A8R8G8B8);
             ok(desc.Usage == 0, "Got usage %#x, expected %#x\n", desc.Usage, 0);
-            ok(desc.Width == texture_tests[i].expected_size, "Got width %u, expected %u\n", desc.Width, texture_tests[i].expected_size);
-            ok(desc.Height == texture_tests[i].expected_size, "Got height %u, expected %u\n", desc.Height, texture_tests[i].expected_size);
+            ok(desc.Width == tests[i].expected_size, "Got width %u, expected %u\n",
+                    desc.Width, tests[i].expected_size);
+            ok(desc.Height == tests[i].expected_size, "Got height %u, expected %u\n",
+                    desc.Height, tests[i].expected_size);
             ok(desc.Pool == D3DPOOL_MANAGED, "Got pool %u, expected %u\n", desc.Pool, D3DPOOL_MANAGED);
 
             IDirect3DTexture9_Release(texture);
         }
+
+        /* ID3DXFontImpl_DrawText */
+        D3DXCreateSprite(device, &sprite);
+        SetRect(&rect, 0, 0, 640, 480);
+
+        IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 1.0f, 0);
+
+        IDirect3DDevice9_BeginScene(device);
+        hr = ID3DXSprite_Begin(sprite, D3DXSPRITE_ALPHABLEND);
+        ok (hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+
+        height = ID3DXFont_DrawTextW(font, sprite, testW, -1, &rect, DT_TOP, 0xffffffff);
+        ok(height == tests[i].font_height, "Got unexpected height %u.\n", height);
+        height = ID3DXFont_DrawTextW(font, sprite, testW, size, &rect, DT_TOP, 0xffffffff);
+        ok(height == tests[i].font_height, "Got unexpected height %u.\n", height);
+        height = ID3DXFont_DrawTextW(font, sprite, testW, size, &rect, DT_RIGHT, 0xffffffff);
+        ok(height == tests[i].font_height, "Got unexpected height %u.\n", height);
+        height = ID3DXFont_DrawTextW(font, sprite, testW, size, &rect, DT_LEFT | DT_NOCLIP,
+                0xffffffff);
+        ok(height == tests[i].font_height, "Got unexpected height %u.\n", height);
+
+        SetRect(&rect, 0, 0, 0, 0);
+        height = ID3DXFont_DrawTextW(font, sprite, testW, size, &rect,
+                DT_LEFT | DT_CALCRECT, 0xffffffff);
+        ok(height == tests[i].font_height, "Got unexpected height %u.\n", height);
+        ok(!rect.left, "Got unexpected rect left %d.\n", rect.left);
+        ok(!rect.top, "Got unexpected rect top %d.\n", rect.top);
+        ok(rect.right, "Got unexpected rect right %d.\n", rect.right);
+        ok(rect.bottom == tests[i].font_height, "Got unexpected rect bottom %d.\n", rect.bottom);
+
+        hr = ID3DXSprite_End(sprite);
+        ok (hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
+        IDirect3DDevice9_EndScene(device);
+        ID3DXSprite_Release(sprite);
+
         ID3DXFont_Release(font);
     }
 }
-- 
2.16.1

    

Matteo Bruni

Alexandre Julliard

Matteo Bruni

tags

participants (3)