gdi32: Use the helper function in GetCharABCWidthsFloatA to support DBCS.

This commit is contained in:
Akihiro Sagawa 2011-01-16 23:00:29 +09:00 committed by Alexandre Julliard
parent da76ffa90e
commit ac66c57523
1 changed files with 5 additions and 8 deletions

View File

@ -3005,19 +3005,16 @@ GetCharacterPlacementW(
*/ */
BOOL WINAPI GetCharABCWidthsFloatA( HDC hdc, UINT first, UINT last, LPABCFLOAT abcf ) BOOL WINAPI GetCharABCWidthsFloatA( HDC hdc, UINT first, UINT last, LPABCFLOAT abcf )
{ {
INT i, wlen, count = (INT)(last - first + 1); INT i, wlen;
LPSTR str; LPSTR str;
LPWSTR wstr; LPWSTR wstr;
BOOL ret = TRUE; BOOL ret = TRUE;
if (count <= 0) return FALSE; str = FONT_GetCharsByRangeA(first, last, &i);
if (str == NULL)
return FALSE;
str = HeapAlloc(GetProcessHeap(), 0, count); wstr = FONT_mbtowc( hdc, str, i, &wlen, NULL );
for(i = 0; i < count; i++)
str[i] = (BYTE)(first + i);
wstr = FONT_mbtowc( hdc, str, count, &wlen, NULL );
for (i = 0; i < wlen; i++) for (i = 0; i < wlen; i++)
{ {