Module: wine Branch: master Commit: 6f9e1e078e9b264da812d238201be4e5ebe4e8be URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9e1e078e9b264da812d2382...
Author: Nikolay Sivov nsivov@codeweavers.com Date: Mon Mar 15 10:36:50 2021 +0300
dwrite/gdiinterop: Pass target transform when getting recommended rendering mode.
Signed-off-by: Nikolay Sivov nsivov@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/dwrite/font.c | 4 ++-- dlls/dwrite/gdiinterop.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c index c0fff68ed15..e5050476938 100644 --- a/dlls/dwrite/font.c +++ b/dlls/dwrite/font.c @@ -1265,7 +1265,7 @@ static HRESULT WINAPI dwritefontface2_GetRecommendedRenderingMode(IDWriteFontFac TRACE("%p, %.8e, %.8e, %.8e, %p, %d, %d, %d, %p, %p, %p.\n", iface, emSize, dpiX, dpiY, m, is_sideways, threshold, measuringmode, params, renderingmode, gridfitmode);
- if (m) + if (m && memcmp(m, &identity, sizeof(*m))) FIXME("transform not supported %s\n", debugstr_matrix(m));
if (is_sideways) @@ -1452,7 +1452,7 @@ static HRESULT WINAPI dwritefontface3_GetRecommendedRenderingMode(IDWriteFontFac TRACE("%p, %.8e, %.8e, %.8e, %p, %d, %d, %d, %p, %p, %p.\n", iface, emSize, dpiX, dpiY, m, is_sideways, threshold, measuring_mode, params, rendering_mode, gridfit_mode);
- if (m) + if (m && memcmp(m, &identity, sizeof(*m))) FIXME("transform not supported %s\n", debugstr_matrix(m));
if (is_sideways) diff --git a/dlls/dwrite/gdiinterop.c b/dlls/dwrite/gdiinterop.c index 84d1f615f75..6a5953a67e9 100644 --- a/dlls/dwrite/gdiinterop.c +++ b/dlls/dwrite/gdiinterop.c @@ -369,7 +369,7 @@ static HRESULT WINAPI rendertarget_DrawGlyphRun(IDWriteBitmapRenderTarget1 *ifac }
hr = IDWriteFontFace3_GetRecommendedRenderingMode(fontface, run->fontEmSize, target->ppdip * 96.0f, - target->ppdip * 96.0f, NULL /* FIXME */, run->isSideways, DWRITE_OUTLINE_THRESHOLD_ALIASED, measuring_mode, + target->ppdip * 96.0f, &target->m, run->isSideways, DWRITE_OUTLINE_THRESHOLD_ALIASED, measuring_mode, params, &rendermode, &gridfitmode); IDWriteFontFace3_Release(fontface); if (FAILED(hr))