[ros-diffs] [akhaldi] 69562: [GDI32] Use NtGdiGetGlyphIndicesW() in GetCharacterPlacementW() as we do have it. Fixes OpenOffice: v1.x.x garbled text. Brought to you by Vort. CORE-867

Author: akhaldi
Date: Sat Oct 17 14:37:35 2015
New Revision: 69562

URL: http://svn.reactos.org/svn/reactos?rev=69562&view=rev
Log:
[GDI32] Use NtGdiGetGlyphIndicesW() in GetCharacterPlacementW() as we do have it. Fixes
OpenOffice: v1.x.x garbled text. Brought to you by Vort. CORE-867

Modified:
    trunk/reactos/win32ss/gdi/gdi32/objects/font.c

Modified: trunk/reactos/win32ss/gdi/gdi32/objects/font.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/…
==============================================================================
--- trunk/reactos/win32ss/gdi/gdi32/objects/font.c	[iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/gdi32/objects/font.c	[iso-8859-1] Sat Oct 17 14:37:35 2015
@@ -460,9 +460,6 @@
     if(lpResults->lpOutString)
         lstrcpynW( lpResults->lpOutString, lpString, nSet );
 
-    if(lpResults->lpGlyphs)
-        lstrcpynW( lpResults->lpGlyphs, lpString, nSet );
-
     if(lpResults->lpOrder)
     {
         for(i = 0; i < nSet; i++)
@@ -495,8 +492,8 @@
                 lpResults->lpCaretPos[i] = (pos += size.cx);
     }
 
-    /*if(lpResults->lpGlyphs)
-      NtGdiGetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0);*/
+    if (lpResults->lpGlyphs)
+        NtGdiGetGlyphIndicesW(hdc, lpString, nSet, lpResults->lpGlyphs, 0);
 
     if (GetTextExtentPoint32W(hdc, lpString, uCount, &size))
         ret = MAKELONG(size.cx, size.cy);