Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-03 16:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source 
svn path=/trunk/; revision=69562
This commit is contained in:
Amine Khaldi 2015-10-17 14:37:35 +00:00
parent ecfe47b635
commit 049574607a
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reactos/win32ss/gdi/gdi32/objects/font.c
View 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);