From 049574607a9fed85b817e22d171b41718db94080 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 17 Oct 2015 14:37:35 +0000 Subject: [PATCH] [GDI32] Use NtGdiGetGlyphIndicesW() in GetCharacterPlacementW() as we do have it. Fixes OpenOffice: v1.x.x garbled text. Brought to you by Vort. CORE-867 svn path=/trunk/; revision=69562 --- reactos/win32ss/gdi/gdi32/objects/font.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/reactos/win32ss/gdi/gdi32/objects/font.c b/reactos/win32ss/gdi/gdi32/objects/font.c index e4f593b666e..9e28ac225f8 100644 --- a/reactos/win32ss/gdi/gdi32/objects/font.c +++ b/reactos/win32ss/gdi/gdi32/objects/font.c @@ -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);