Huw Davies : usp10: Fix the offset calculations for rtl display.

[Alexandre Julliard]

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

Author: Huw Davies 
Date:   Fri Jan 11 11:09:21 2013 +0000

usp10: Fix the offset calculations for rtl display.

---

dlls/usp10/usp10.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c
index 850c486..b25e956 100644
--- a/dlls/usp10/usp10.c
+++ b/dlls/usp10/usp10.c
@@ -3237,7 +3237,7 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN
                              const int *piJustify, const GOFFSET *pGoffset)
 {
     HRESULT hr = S_OK;
-    INT i;
+    INT i, dir = 1;
     INT *lpDx;
     WORD *reordered_glyphs = (WORD *)pwGlyphs;

@@ -3268,27 +3268,29 @@ HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UIN

for (i = 0; i < cGlyphs; i++)
             reordered_glyphs[i] = pwGlyphs[cGlyphs - 1 - i];
+        dir = -1;
     }

for (i = 0; i < cGlyphs; i++)
     {
-        lpDx[i * 2] = piAdvance[i];
+        int orig_index = (dir > 0) ? i : cGlyphs - 1 - i;
+        lpDx[i * 2] = piAdvance[orig_index];
         lpDx[i * 2 + 1] = 0;

if (pGoffset)
         {
             if (i == 0)
             {
-                x += pGoffset[i].du;
-                y += pGoffset[i].dv;
+                x += pGoffset[orig_index].du * dir;
+                y += pGoffset[orig_index].dv * dir;
             }
             else
             {
-                lpDx[(i - 1) * 2]     += pGoffset[i].du;
-                lpDx[(i - 1) * 2 + 1] += pGoffset[i].dv;
+                lpDx[(i - 1) * 2]     += pGoffset[orig_index].du * dir;
+                lpDx[(i - 1) * 2 + 1] += pGoffset[orig_index].dv * dir;
             }
-            lpDx[i * 2]     -= pGoffset[i].du;
-            lpDx[i * 2 + 1] -= pGoffset[i].dv;
+            lpDx[i * 2]     -= pGoffset[orig_index].du * dir;
+            lpDx[i * 2 + 1] -= pGoffset[orig_index].dv * dir;
         }
     }