Nikolay Sivov : d2d1: Pass zeros as text layout size for inverted rectangles in DrawText().

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 783e043e78392722c5164dfdf4215b7356e8ccb1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=783e043e78392722c5164dfdf...

Author: Nikolay Sivov <nsivov(a)codeweavers.com>
Date:   Tue Jan 19 15:48:16 2021 +0300

d2d1: Pass zeros as text layout size for inverted rectangles in DrawText().

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 9521c6a1eb781ff7cb75a83544bf9b78f889a9e2)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 dlls/d2d1/device.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index a4583c1c65c..a75121de38b 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -1155,6 +1155,7 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawText(ID2D1DeviceContext *if
     IDWriteTextLayout *text_layout;
     IDWriteFactory *dwrite_factory;
     D2D1_POINT_2F origin;
+    float width, height;
     HRESULT hr;
 
     TRACE("iface %p, string %s, string_len %u, text_format %p, layout_rect %s, "
@@ -1169,13 +1170,15 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawText(ID2D1DeviceContext *if
         return;
     }
 
+    width = max(0.0f, layout_rect->right - layout_rect->left);
+    height = max(0.0f, layout_rect->bottom - layout_rect->top);
     if (measuring_mode == DWRITE_MEASURING_MODE_NATURAL)
         hr = IDWriteFactory_CreateTextLayout(dwrite_factory, string, string_len, text_format,
-                layout_rect->right - layout_rect->left, layout_rect->bottom - layout_rect->top, &text_layout);
+                width, height, &text_layout);
     else
         hr = IDWriteFactory_CreateGdiCompatibleTextLayout(dwrite_factory, string, string_len, text_format,
-                layout_rect->right - layout_rect->left, layout_rect->bottom - layout_rect->top, render_target->desc.dpiX / 96.0f,
-                (DWRITE_MATRIX*)&render_target->drawing_state.transform, measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, &text_layout);
+                width, height, render_target->desc.dpiX / 96.0f, (DWRITE_MATRIX *)&render_target->drawing_state.transform,
+                measuring_mode == DWRITE_MEASURING_MODE_GDI_NATURAL, &text_layout);
     IDWriteFactory_Release(dwrite_factory);
     if (FAILED(hr))
     {