diff options
| -rw-r--r-- | src/wrapped/generated/functions_list.txt | 1 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.c | 3 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.h | 1 | ||||
| -rwxr-xr-x | src/wrapped/wrappedfreetype_private.h | 15 |
4 files changed, 17 insertions, 3 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index 3f0c46fe..213232a0 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -420,6 +420,7 @@ #() iFpIi #() iFpII #() iFpCp +#() iFpWp #() iFpui #() iFpuu #() iFpuU diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c index fe1526e3..3b9c77c3 100644 --- a/src/wrapped/generated/wrapper.c +++ b/src/wrapped/generated/wrapper.c @@ -454,6 +454,7 @@ typedef int64_t (*iFpip_t)(void*, int64_t, void*); typedef int64_t (*iFpIi_t)(void*, int64_t, int64_t); typedef int64_t (*iFpII_t)(void*, int64_t, int64_t); typedef int64_t (*iFpCp_t)(void*, uint8_t, void*); +typedef int64_t (*iFpWp_t)(void*, uint16_t, void*); typedef int64_t (*iFpui_t)(void*, uint64_t, int64_t); typedef int64_t (*iFpuu_t)(void*, uint64_t, uint64_t); typedef int64_t (*iFpuU_t)(void*, uint64_t, uint64_t); @@ -2828,6 +2829,7 @@ void iFpip(x64emu_t *emu, uintptr_t fcn) { iFpip_t fn = (iFpip_t)fcn; R_RAX=(int void iFpIi(x64emu_t *emu, uintptr_t fcn) { iFpIi_t fn = (iFpIi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX); } void iFpII(x64emu_t *emu, uintptr_t fcn) { iFpII_t fn = (iFpII_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX); } void iFpCp(x64emu_t *emu, uintptr_t fcn) { iFpCp_t fn = (iFpCp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX); } +void iFpWp(x64emu_t *emu, uintptr_t fcn) { iFpWp_t fn = (iFpWp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX); } void iFpui(x64emu_t *emu, uintptr_t fcn) { iFpui_t fn = (iFpui_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int64_t)R_RDX); } void iFpuu(x64emu_t *emu, uintptr_t fcn) { iFpuu_t fn = (iFpuu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX); } void iFpuU(x64emu_t *emu, uintptr_t fcn) { iFpuU_t fn = (iFpuU_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX); } @@ -5141,6 +5143,7 @@ int isSimpleWrapper(wrapper_t fun) { if (fun == &iFpIi) return 1; if (fun == &iFpII) return 1; if (fun == &iFpCp) return 1; + if (fun == &iFpWp) return 1; if (fun == &iFpui) return 1; if (fun == &iFpuu) return 1; if (fun == &iFpuU) return 1; diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h index f0d487bf..6da13fcb 100644 --- a/src/wrapped/generated/wrapper.h +++ b/src/wrapped/generated/wrapper.h @@ -453,6 +453,7 @@ void iFpip(x64emu_t *emu, uintptr_t fnc); void iFpIi(x64emu_t *emu, uintptr_t fnc); void iFpII(x64emu_t *emu, uintptr_t fnc); void iFpCp(x64emu_t *emu, uintptr_t fnc); +void iFpWp(x64emu_t *emu, uintptr_t fnc); void iFpui(x64emu_t *emu, uintptr_t fnc); void iFpuu(x64emu_t *emu, uintptr_t fnc); void iFpuU(x64emu_t *emu, uintptr_t fnc); diff --git a/src/wrapped/wrappedfreetype_private.h b/src/wrapped/wrappedfreetype_private.h index c7c854e7..5beaad93 100755 --- a/src/wrapped/wrappedfreetype_private.h +++ b/src/wrapped/wrappedfreetype_private.h @@ -24,10 +24,11 @@ GO(FT_Done_Face, iFp) GO(FT_Done_FreeType, iFp) GO(FT_Done_Glyph, vFp) GO(FT_Done_Library, iFp) +GO(FT_Done_MM_Var, iFpp) GO(FT_Done_Size, iFp) //GO(FT_Face_CheckTrueTypePatents, //GO(FT_Face_GetCharsOfVariant, -//GO(FT_Face_GetCharVariantIndex, +GO(FT_Face_GetCharVariantIndex, uFpuu) //GO(FT_Face_GetCharVariantIsDefault, //GO(FT_Face_GetVariantSelectors, //GO(FT_Face_GetVariantsOfChar, @@ -40,6 +41,10 @@ GO(FT_Get_Advances, iFpuuip) //GO(FT_Get_BDF_Property, GO(FT_Get_Char_Index, uFpL) GO(FT_Get_Charmap_Index, iFp) +GO(FT_Get_Color_Glyph_Layer, iFpupp) +GO(FT_Get_Color_Glyph_Paint, iFpuip) +GO(FT_Get_Color_Glyph_ClipBox, iFpup) +GO(FT_Get_Colorline_Stops, iFppp) //GO(FT_Get_CID_From_Glyph_Index, //GO(FT_Get_CID_Is_Internally_CID_Keyed, //GO(FT_Get_CID_Registry_Ordering_Supplement, @@ -58,6 +63,8 @@ GO(FT_Get_MM_Var, iFpp) //GO(FT_Get_Multi_Master, GO(FT_Get_Name_Index, uFpp) GO(FT_Get_Next_Char, LFpLp) +GO(FT_Get_Paint, iFppip) // FT_OpaquePaint is a struct with "pi" +GO(FT_Get_Paint_Layers, iFppp) //GO(FT_Get_PFR_Advance, //GO(FT_Get_PFR_Kerning, //GO(FT_Get_PFR_Metrics, @@ -72,8 +79,9 @@ GO(FT_Get_Sfnt_Name_Count, uFp) GO(FT_Get_Sfnt_Table, pFpi) GO(FT_Get_SubGlyph_Info, iFpuppppp) GO(FT_Get_Track_Kerning, iFplip) +GO(FT_Get_Transform, vFppp) GO(FT_Get_TrueType_Engine_Type, iFp) -//GO(FT_Get_Var_Blend_Coordinates, +GO(FT_Get_Var_Blend_Coordinates, iFpup) //GO(FT_Get_Var_Design_Coordinates, GO(FT_Get_WinFNT_Header, iFpp) // does FT_WinFNT_HeaderRec_ needs alignment? GO(FT_Get_X11_Font_Format, pFp) @@ -132,6 +140,7 @@ GO(FT_Outline_Render, iFppp) GO(FT_Outline_Reverse, vFp) GO(FT_Outline_Transform, vFpp) GO(FT_Outline_Translate, vFpll) +GO(FT_Palette_Select, iFpWp) GO(FT_Property_Get, iFpppp) GO(FT_Property_Set, iFpppp) GO(FT_Reference_Face, iFp) @@ -152,7 +161,7 @@ GO(FT_Set_Pixel_Sizes, iFpuu) //GO(FT_Set_Renderer, GO(FT_Set_Transform, vFppp) //GO(FT_Set_Var_Blend_Coordinates, -//GO(FT_Set_Var_Design_Coordinates, +GO(FT_Set_Var_Design_Coordinates, iFpup) //GO(FT_Sfnt_Table_Info, GO(FT_Sin, lFl) //GO(FT_Stream_OpenBzip2, |