[PATCH 1/2] d2d1: Fix scaling when rendering text in bitmap mode.

[Nikolay Sivov]

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
 dlls/d2d1/device.c | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c
index 67b3fab906..58e39b30b2 100644
--- a/dlls/d2d1/device.c
+++ b/dlls/d2d1/device.c
@@ -1107,10 +1107,10 @@ static void d2d_rt_draw_glyph_run_outline(struct d2d_d3d_render_target *render_t
 
 static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_target,
         D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush,
-        float ppd, DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode,
+        DWRITE_RENDERING_MODE rendering_mode, DWRITE_MEASURING_MODE measuring_mode,
         DWRITE_TEXT_ANTIALIAS_MODE antialias_mode)
 {
-    D2D1_MATRIX_3X2_F prev_transform, *transform;
+    D2D1_MATRIX_3X2_F prev_transform, *transform, scale, m;
     ID2D1RectangleGeometry *geometry = NULL;
     ID2D1BitmapBrush *opacity_brush = NULL;
     D2D1_BITMAP_PROPERTIES bitmap_desc;
@@ -1119,10 +1119,10 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta
     DWRITE_TEXTURE_TYPE texture_type;
     D2D1_BRUSH_PROPERTIES brush_desc;
     IDWriteFactory2 *dwrite_factory;
-    DWRITE_GLYPH_RUN scaled_run;
     void *opacity_values = NULL;
     size_t opacity_values_size;
     D2D1_SIZE_U bitmap_size;
+    float scale_x, scale_y;
     D2D1_RECT_F run_rect;
     RECT bounds;
     HRESULT hr;
@@ -1134,11 +1134,13 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta
         return;
     }
 
-    scaled_run = *glyph_run;
-    scaled_run.fontEmSize *= ppd;
-    hr = IDWriteFactory2_CreateGlyphRunAnalysis(dwrite_factory, &scaled_run,
-            (DWRITE_MATRIX *)&render_target->drawing_state.transform, rendering_mode, measuring_mode,
-            DWRITE_GRID_FIT_MODE_DEFAULT, antialias_mode, baseline_origin.x,
+    m = render_target->drawing_state.transform;
+    memset(&scale, 0, sizeof(scale));
+    scale._11 = render_target->desc.dpiX / 96.0f;
+    scale._22 = render_target->desc.dpiY / 96.0f;
+    d2d_matrix_multiply(&m, &scale);
+    hr = IDWriteFactory2_CreateGlyphRunAnalysis(dwrite_factory, glyph_run, (DWRITE_MATRIX *)&m,
+            rendering_mode, measuring_mode, DWRITE_GRID_FIT_MODE_DEFAULT, antialias_mode, baseline_origin.x,
             baseline_origin.y, &analysis);
     IDWriteFactory2_Release(dwrite_factory);
     if (FAILED(hr))
@@ -1194,13 +1196,18 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta
         goto done;
     }
 
+    scale_x = 96.0f / render_target->desc.dpiX;
+    scale_y = 96.0f / render_target->desc.dpiY;
+    d2d_rect_set(&run_rect, bounds.left * scale_x, bounds.top * scale_y, bounds.right * scale_x,
+            bounds.bottom * scale_y);
+
     brush_desc.opacity = 1.0f;
     brush_desc.transform._11 = 1.0f;
     brush_desc.transform._12 = 0.0f;
     brush_desc.transform._21 = 0.0f;
     brush_desc.transform._22 = 1.0f;
-    brush_desc.transform._31 = bounds.left;
-    brush_desc.transform._32 = bounds.top;
+    brush_desc.transform._31 = run_rect.left;
+    brush_desc.transform._32 = run_rect.top;
     if (FAILED(hr = d2d_d3d_render_target_CreateBitmapBrush(&render_target->ID2D1RenderTarget_iface,
             opacity_bitmap, NULL, &brush_desc, &opacity_brush)))
     {
@@ -1208,7 +1215,6 @@ static void d2d_rt_draw_glyph_run_bitmap(struct d2d_d3d_render_target *render_ta
         goto done;
     }
 
-    d2d_rect_set(&run_rect, bounds.left, bounds.top, bounds.right, bounds.bottom);
     if (FAILED(hr = ID2D1Factory_CreateRectangleGeometry(render_target->factory, &run_rect, &geometry)))
     {
         ERR("Failed to create geometry, hr %#x.\n", hr);
@@ -1313,7 +1319,7 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_DrawGlyphRun(ID2D1RenderTarg
         d2d_rt_draw_glyph_run_outline(render_target, baseline_origin, glyph_run, brush);
     else
         d2d_rt_draw_glyph_run_bitmap(render_target, baseline_origin, glyph_run, brush,
-                ppd, rendering_mode, measuring_mode, antialias_mode);
+                rendering_mode, measuring_mode, antialias_mode);
 }
 
 static void STDMETHODCALLTYPE d2d_d3d_render_target_SetTransform(ID2D1RenderTarget *iface,
-- 
2.18.0