Sven Baars : d3dx9: Implement clipping of glyphs in ID3DXFont_DrawText.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 84cbf6a49dfe75b9fd497b2c3ef7e922857bb618
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=84cbf6a49dfe75b9fd497b2c3...

Author: Sven Baars <sbaars(a)codeweavers.com>
Date:   Tue Nov 17 15:33:31 2020 +0100

d3dx9: Implement clipping of glyphs in ID3DXFont_DrawText.

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

---

 dlls/d3dx9_36/font.c | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c
index 235ae11072b..f5775384da3 100644
--- 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);
         }