[reactos] 181/218: [WINESYNC] d3dx9: Remove a recursive call to ID3DXFont_DrawTextW when no rect is specified.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e6e305520c79c4a31230a5...

commit e6e305520c79c4a31230a53bbada76225cf73182
Author:     winesync [e-mail]
AuthorDate: Mon Sep 21 23:07:32 2020 +0200
Commit:     Jérôme Gardou [e-mail]
CommitDate: Thu Feb 4 16:37:06 2021 +0100

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

Signed-off-by: Sven Baars [e-mail]
    Signed-off-by: Matteo Bruni [e-mail]
    Signed-off-by: Alexandre Julliard [e-mail]

wine commit id 9796bdc966a89cd31829f3a094bb37ec71e21871 by Sven Baars [e-mail]
---
 dll/directx/wine/d3dx9_36/font.c | 13 ++-----------
 sdk/tools/winesync/d3dx9.cfg     |  2 +-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/font.c b/dll/directx/wine/d3dx9_36/font.c
index b260436e8ef..4546a261a49 100644
--- a/dll/directx/wine/d3dx9_36/font.c
+++ b/dll/directx/wine/d3dx9_36/font.c
@@ -633,17 +633,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;
@@ -720,7 +711,7 @@ static INT WINAPI ID3DXFontImpl_DrawTextW(ID3DXFont *iface, ID3DXSprite *sprite,
             break;
     }

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

diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 21245aabfc6..8db3c5290ea 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/inc
   include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h,
   include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h,
   include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
-tags: {wine: 787d98f47ce7254dda7f644fa6d033fe1776ae38}
+tags: {wine: 9796bdc966a89cd31829f3a094bb37ec71e21871}