d3dx9: Remove a recursive call to ID3DXFont_DrawTextW when no rect is specified.

Signed-off-by: Sven Baars <sbaars@codeweavers.com> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx9: Remove a recursive call to ID3DXFont_DrawTextW when no rect is specified.
9796bdc9 · Sven Baars · Alexandre Julliard · 787d98f4 · 9796bdc9
Commit 9796bdc9 authored Mar 24, 2020 by Sven Baars Committed by Alexandre Julliard Mar 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 11 deletions

font.c dlls/d3dx9_36/font.c +2 -11

No files found.
--- a/dlls/d3dx9_36/font.c
+++ b/dlls/d3dx9_36/font.c
@@ -629,17 +629,8 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
    if (format & DT_SINGLELINE)
        format &= ~DT_WORDBREAK;

-    if (!rect)
-    {
-        y = ID3DXFont_DrawTextW(iface, NULL, string, count, &textrect, format | DT_CALCRECT, 0);
-
-        if (format & DT_CALCRECT)
-            return y;
-    }
-    else
-    {
+    if (rect)
        textrect = *rect;
-    }

    x = textrect.left;
    y = textrect.top;
@@ -716,7 +707,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
            break;
    }

-    if (format & DT_CALCRECT)
+    if (format & DT_CALCRECT && rect)
    {
        *rect = textrect;