Signed-off-by: Nikolay Sivov nsivov@codeweavers.com --- 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 bd3af3d16ff..23ce03dce5e 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1161,6 +1161,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, " @@ -1175,13 +1176,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)) {