system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-31 12:19:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make WineEngGetFontData always return the used byte count.

Browse source
This commit is contained in:
Rein Klazes 2005-12-01 11:10:59 +01:00 committed by Alexandre Julliard
parent 724981bf60
commit c7e860d48a
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
dlls/gdi/freetype.c
View file

@ -3692,9 +3692,15 @@ DWORD WineEngGetFontData(GdiFont font, DWORD table, DWORD offset, LPVOID buf,
}
/* If the FT_Load_Sfnt_Table function is there we'll use it */
if(pFT_Load_Sfnt_Table)
if(pFT_Load_Sfnt_Table) {
/* make sure value of len is the value freetype says it needs */
if( buf && len) {
DWORD needed = 0;
err = pFT_Load_Sfnt_Table(ft_face, table, offset, NULL, &needed);
if( !err && needed < len) len = needed;
}
err = pFT_Load_Sfnt_Table(ft_face, table, offset, buf, &len);
else { /* Do it the hard way */
} else { /* Do it the hard way */
TT_Face tt_face = (TT_Face) ft_face;
SFNT_Interface *sfnt;
if (FT_Version.major==2 && FT_Version.minor==0)
@ -3707,6 +3713,12 @@ DWORD WineEngGetFontData(GdiFont font, DWORD table, DWORD offset, LPVOID buf,
/* A field was added in the middle of the structure in 2.1.x */
sfnt = *(SFNT_Interface**)((char*)tt_face + 532);
}
/* make sure value of len is the value freetype says it needs */
if( buf && len) {
DWORD needed = 0;
err = sfnt->load_any(tt_face, table, offset, NULL, &needed);
if( !err && needed < len) len = needed;
}
err = sfnt->load_any(tt_face, table, offset, buf, &len);
}
if(err) {