d3dx9: Implement clipping of glyphs in ID3DXFont_DrawText.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49546Signed-off-by: Sven Baars <sbaars@codeweavers.com> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx9: Implement clipping of glyphs in ID3DXFont_DrawText.
84cbf6a4 · Sven Baars · Alexandre Julliard · 2481e617 · 84cbf6a4
Commit 84cbf6a4 authored Nov 17, 2020 by Sven Baars Committed by Alexandre Julliard Nov 18, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 1 deletion

font.c dlls/d3dx9_36/font.c +15 -1

No files found.
--- a/dlls/d3dx9_36/font.c
+++ b/dlls/d3dx9_36/font.c
@@ -583,7 +583,6 @@ static const WCHAR *read_line(HDC hdc, const WCHAR *str, unsigned int *count,
        }
        else if (format & DT_SINGLELINE)
        {
-            *dest_len = num_fit;
            *count = 0;
        }
    }
@@ -768,6 +767,21 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
            pos.y = cell_inc.y + y;
            pos.z = 0;

+            if (!(format & DT_NOCLIP))
+            {
+                if (pos.x > rect->right)
+                {
+                    IDirect3DTexture9_Release(texture);
+                    continue;
+                }
+
+                if (pos.x + black_box.right - black_box.left > rect->right)
+                    black_box.right = black_box.left + rect->right - pos.x;
+
+                if (pos.y + black_box.bottom - black_box.top > rect->bottom)
+                    black_box.bottom = black_box.top + rect->bottom - pos.y;
+            }
+
            ID3DXSprite_Draw(target, texture, &black_box, NULL, &pos, color);
            IDirect3DTexture9_Release(texture);
        }