Nikolay Sivov : dwrite: Fix underline/ strikethrough position adjustment caused by text alignment.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: a62a9fcc1f856ded124c4ba3026730f7823921a6
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=a62a9fcc1f856ded124c4ba302...

Author: Nikolay Sivov 
Date:   Sun Jan 24 18:11:02 2016 +0300

dwrite: Fix underline/strikethrough position adjustment caused by text alignment.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/dwrite/layout.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index 9842746..b6f4a65 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -3151,7 +3151,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface,
         IDWriteTextRenderer_DrawUnderline(renderer,
             context,
             /* horizontal underline always grows from left to right, width is always added to origin regardless of run direction */
-            (is_run_rtl(u->run) ? u->run->origin_x - u->run->width : u->run->origin_x) + run->align_dx + origin_x,
+            (is_run_rtl(u->run) ? u->run->origin_x - u->run->width : u->run->origin_x) + u->run->align_dx + origin_x,
             SNAP_COORD(u->run->origin_y + origin_y),
             &u->u,
             u->run->effect);
@@ -3161,7 +3161,7 @@ static HRESULT WINAPI dwritetextlayout_Draw(IDWriteTextLayout2 *iface,
     LIST_FOR_EACH_ENTRY(s, &This->strikethrough, struct layout_strikethrough, entry) {
         IDWriteTextRenderer_DrawStrikethrough(renderer,
             context,
-            s->run->origin_x + run->align_dx + origin_x,
+            s->run->origin_x + s->run->align_dx + origin_x,
             SNAP_COORD(s->run->origin_y + origin_y),
             &s->s,
             s->run->effect);