[GDI32] Use NtGdiGetGlyphIndicesW() in GetCharacterPlacementW() as we do have it...
authorAmine Khaldi <amine.khaldi@reactos.org>
Sat, 17 Oct 2015 14:37:35 +0000 (14:37 +0000)
committerAmine Khaldi <amine.khaldi@reactos.org>
Sat, 17 Oct 2015 14:37:35 +0000 (14:37 +0000)
svn path=/trunk/; revision=69562

reactos/win32ss/gdi/gdi32/objects/font.c

index e4f593b..9e28ac2 100644 (file)
@@ -460,9 +460,6 @@ GetCharacterPlacementW(
     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 @@ GetCharacterPlacementW(
                 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);