Skip to content

W
wine-winehq
Commit c91c8686 authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard
Browse files
Options

If a font has a version 0 OS2 table then Windows uses ANSI_CHARSET if

the first charcode < 0x100, else it uses SYMBOL_CHARSET. Based on a patch by Rein Klazes.
parent 31c50ccb
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 0 deletions
dlls/gdi/freetype.c
View file @ c91c8686
...@@ -96,6 +96,7 @@ static void *ft_handle = NULL; ...@@ -96,6 +96,7 @@ static void *ft_handle = NULL;
MAKE_FUNCPTR(FT_Vector_Unit); MAKE_FUNCPTR(FT_Vector_Unit);
MAKE_FUNCPTR(FT_Done_Face); MAKE_FUNCPTR(FT_Done_Face);
MAKE_FUNCPTR(FT_Get_Char_Index); MAKE_FUNCPTR(FT_Get_Char_Index);
MAKE_FUNCPTR(FT_Get_First_Char);
MAKE_FUNCPTR(FT_Get_Sfnt_Table); MAKE_FUNCPTR(FT_Get_Sfnt_Table);
MAKE_FUNCPTR(FT_Init_FreeType); MAKE_FUNCPTR(FT_Init_FreeType);
MAKE_FUNCPTR(FT_Load_Glyph); MAKE_FUNCPTR(FT_Load_Glyph);
...@@ -398,6 +399,14 @@ static BOOL AddFontFileToList(const char *file, char *fake_family) ...@@ -398,6 +399,14 @@ static BOOL AddFontFileToList(const char *file, char *fake_family)
(*insertface)->fs.fsUsb[0], (*insertface)->fs.fsUsb[1], (*insertface)->fs.fsUsb[0], (*insertface)->fs.fsUsb[1],
(*insertface)->fs.fsUsb[2], (*insertface)->fs.fsUsb[3]); (*insertface)->fs.fsUsb[2], (*insertface)->fs.fsUsb[3]);
if(pOS2->version == 0) {
FT_UInt dummy;
if(pFT_Get_First_Char( ft_face, &dummy ) < 0x100)
(*insertface)->fs.fsCsb[0] |= 1;
else
(*insertface)->fs.fsCsb[0] |= 1L << 31;
}
if((*insertface)->fs.fsCsb[0] == 0) { /* let's see if we can find any interesting cmaps */ if((*insertface)->fs.fsCsb[0] == 0) { /* let's see if we can find any interesting cmaps */
for(i = 0; i < ft_face->num_charmaps; i++) { for(i = 0; i < ft_face->num_charmaps; i++) {
switch(ft_face->charmaps[i]->encoding) { switch(ft_face->charmaps[i]->encoding) {
...@@ -769,6 +778,7 @@ BOOL WineEngInit(void) ...@@ -769,6 +778,7 @@ BOOL WineEngInit(void)
LOAD_FUNCPTR(FT_Vector_Unit) LOAD_FUNCPTR(FT_Vector_Unit)
LOAD_FUNCPTR(FT_Done_Face) LOAD_FUNCPTR(FT_Done_Face)
LOAD_FUNCPTR(FT_Get_Char_Index) LOAD_FUNCPTR(FT_Get_Char_Index)
LOAD_FUNCPTR(FT_Get_First_Char)
LOAD_FUNCPTR(FT_Get_Sfnt_Table) LOAD_FUNCPTR(FT_Get_Sfnt_Table)
LOAD_FUNCPTR(FT_Init_FreeType) LOAD_FUNCPTR(FT_Init_FreeType)
LOAD_FUNCPTR(FT_Load_Glyph) LOAD_FUNCPTR(FT_Load_Glyph)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment