Used wrapperhelper on wrapped freetype

4 files changed, 28 insertions, 28 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index fd42d74c..69c26ce8 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -898,7 +898,6 @@
 #() iFpiUp
 #() iFpild
 #() iFpipi
-#() iFpipC
 #() iFpipu
 #() iFpipL
 #() iFpipp
@@ -920,6 +919,7 @@
 #() iFpuLL
 #() iFpuLp
 #() iFpupi
+#() iFpupC
 #() iFpupu
 #() iFpupU
 #() iFpupL
@@ -1286,7 +1286,7 @@
 #() vFpddii
 #() vFpdddd
 #() vFpddpp
-#() vFpliil
+#() vFpluul
 #() vFplppp
 #() vFpLLLL
 #() vFpLLpp
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 0095cc57..8586f2ef 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -934,7 +934,6 @@ typedef int32_t (*iFpiup_t)(void*, int32_t, uint32_t, void*);
 typedef int32_t (*iFpiUp_t)(void*, int32_t, uint64_t, void*);
 typedef int32_t (*iFpild_t)(void*, int32_t, intptr_t, double);
 typedef int32_t (*iFpipi_t)(void*, int32_t, void*, int32_t);
-typedef int32_t (*iFpipC_t)(void*, int32_t, void*, uint8_t);
 typedef int32_t (*iFpipu_t)(void*, int32_t, void*, uint32_t);
 typedef int32_t (*iFpipL_t)(void*, int32_t, void*, uintptr_t);
 typedef int32_t (*iFpipp_t)(void*, int32_t, void*, void*);
@@ -956,6 +955,7 @@ typedef int32_t (*iFpuUp_t)(void*, uint32_t, uint64_t, void*);
 typedef int32_t (*iFpuLL_t)(void*, uint32_t, uintptr_t, uintptr_t);
 typedef int32_t (*iFpuLp_t)(void*, uint32_t, uintptr_t, void*);
 typedef int32_t (*iFpupi_t)(void*, uint32_t, void*, int32_t);
+typedef int32_t (*iFpupC_t)(void*, uint32_t, void*, uint8_t);
 typedef int32_t (*iFpupu_t)(void*, uint32_t, void*, uint32_t);
 typedef int32_t (*iFpupU_t)(void*, uint32_t, void*, uint64_t);
 typedef int32_t (*iFpupL_t)(void*, uint32_t, void*, uintptr_t);
@@ -1322,7 +1322,7 @@ typedef void (*vFpdiII_t)(void*, double, int32_t, int64_t, int64_t);
 typedef void (*vFpddii_t)(void*, double, double, int32_t, int32_t);
 typedef void (*vFpdddd_t)(void*, double, double, double, double);
 typedef void (*vFpddpp_t)(void*, double, double, void*, void*);
-typedef void (*vFpliil_t)(void*, intptr_t, int32_t, int32_t, intptr_t);
+typedef void (*vFpluul_t)(void*, intptr_t, uint32_t, uint32_t, intptr_t);
 typedef void (*vFplppp_t)(void*, intptr_t, void*, void*, void*);
 typedef void (*vFpLLLL_t)(void*, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
 typedef void (*vFpLLpp_t)(void*, uintptr_t, uintptr_t, void*, void*);
@@ -3527,7 +3527,6 @@ void iFpiup(x64emu_t *emu, uintptr_t fcn) { iFpiup_t fn = (iFpiup_t)fcn; R_RAX=(
 void iFpiUp(x64emu_t *emu, uintptr_t fcn) { iFpiUp_t fn = (iFpiUp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX); }
 void iFpild(x64emu_t *emu, uintptr_t fcn) { iFpild_t fn = (iFpild_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX, emu->xmm[0].d[0]); }
 void iFpipi(x64emu_t *emu, uintptr_t fcn) { iFpipi_t fn = (iFpipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
-void iFpipC(x64emu_t *emu, uintptr_t fcn) { iFpipC_t fn = (iFpipC_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uint8_t)R_RCX); }
 void iFpipu(x64emu_t *emu, uintptr_t fcn) { iFpipu_t fn = (iFpipu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void iFpipL(x64emu_t *emu, uintptr_t fcn) { iFpipL_t fn = (iFpipL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void iFpipp(x64emu_t *emu, uintptr_t fcn) { iFpipp_t fn = (iFpipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -3549,6 +3548,7 @@ void iFpuUp(x64emu_t *emu, uintptr_t fcn) { iFpuUp_t fn = (iFpuUp_t)fcn; R_RAX=(
 void iFpuLL(x64emu_t *emu, uintptr_t fcn) { iFpuLL_t fn = (iFpuLL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
 void iFpuLp(x64emu_t *emu, uintptr_t fcn) { iFpuLp_t fn = (iFpuLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void iFpupi(x64emu_t *emu, uintptr_t fcn) { iFpupi_t fn = (iFpupi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
+void iFpupC(x64emu_t *emu, uintptr_t fcn) { iFpupC_t fn = (iFpupC_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint8_t)R_RCX); }
 void iFpupu(x64emu_t *emu, uintptr_t fcn) { iFpupu_t fn = (iFpupu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void iFpupU(x64emu_t *emu, uintptr_t fcn) { iFpupU_t fn = (iFpupU_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint64_t)R_RCX); }
 void iFpupL(x64emu_t *emu, uintptr_t fcn) { iFpupL_t fn = (iFpupL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
@@ -3915,7 +3915,7 @@ void vFpdiII(x64emu_t *emu, uintptr_t fcn) { vFpdiII_t fn = (vFpdiII_t)fcn; fn((
 void vFpddii(x64emu_t *emu, uintptr_t fcn) { vFpddii_t fn = (vFpddii_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (int32_t)R_RSI, (int32_t)R_RDX); }
 void vFpdddd(x64emu_t *emu, uintptr_t fcn) { vFpdddd_t fn = (vFpdddd_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0]); }
 void vFpddpp(x64emu_t *emu, uintptr_t fcn) { vFpddpp_t fn = (vFpddpp_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (void*)R_RSI, (void*)R_RDX); }
-void vFpliil(x64emu_t *emu, uintptr_t fcn) { vFpliil_t fn = (vFpliil_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (intptr_t)R_R8); }
+void vFpluul(x64emu_t *emu, uintptr_t fcn) { vFpluul_t fn = (vFpluul_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (intptr_t)R_R8); }
 void vFplppp(x64emu_t *emu, uintptr_t fcn) { vFplppp_t fn = (vFplppp_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFpLLLL(x64emu_t *emu, uintptr_t fcn) { vFpLLLL_t fn = (vFpLLLL_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8); }
 void vFpLLpp(x64emu_t *emu, uintptr_t fcn) { vFpLLpp_t fn = (vFpLLpp_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -5980,7 +5980,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpiUp) return 1;
 	if (fun == &iFpild) return 2;
 	if (fun == &iFpipi) return 1;
-	if (fun == &iFpipC) return 1;
 	if (fun == &iFpipu) return 1;
 	if (fun == &iFpipL) return 1;
 	if (fun == &iFpipp) return 1;
@@ -6001,6 +6000,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpuLL) return 1;
 	if (fun == &iFpuLp) return 1;
 	if (fun == &iFpupi) return 1;
+	if (fun == &iFpupC) return 1;
 	if (fun == &iFpupu) return 1;
 	if (fun == &iFpupU) return 1;
 	if (fun == &iFpupL) return 1;
@@ -6311,7 +6311,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpddii) return 3;
 	if (fun == &vFpdddd) return 5;
 	if (fun == &vFpddpp) return 3;
-	if (fun == &vFpliil) return 1;
+	if (fun == &vFpluul) return 1;
 	if (fun == &vFplppp) return 1;
 	if (fun == &vFpLLLL) return 1;
 	if (fun == &vFpLLpp) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index f2ef2d67..4b185580 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -935,7 +935,6 @@ void iFpiup(x64emu_t *emu, uintptr_t fnc);
 void iFpiUp(x64emu_t *emu, uintptr_t fnc);
 void iFpild(x64emu_t *emu, uintptr_t fnc);
 void iFpipi(x64emu_t *emu, uintptr_t fnc);
-void iFpipC(x64emu_t *emu, uintptr_t fnc);
 void iFpipu(x64emu_t *emu, uintptr_t fnc);
 void iFpipL(x64emu_t *emu, uintptr_t fnc);
 void iFpipp(x64emu_t *emu, uintptr_t fnc);
@@ -957,6 +956,7 @@ void iFpuUp(x64emu_t *emu, uintptr_t fnc);
 void iFpuLL(x64emu_t *emu, uintptr_t fnc);
 void iFpuLp(x64emu_t *emu, uintptr_t fnc);
 void iFpupi(x64emu_t *emu, uintptr_t fnc);
+void iFpupC(x64emu_t *emu, uintptr_t fnc);
 void iFpupu(x64emu_t *emu, uintptr_t fnc);
 void iFpupU(x64emu_t *emu, uintptr_t fnc);
 void iFpupL(x64emu_t *emu, uintptr_t fnc);
@@ -1323,7 +1323,7 @@ void vFpdiII(x64emu_t *emu, uintptr_t fnc);
 void vFpddii(x64emu_t *emu, uintptr_t fnc);
 void vFpdddd(x64emu_t *emu, uintptr_t fnc);
 void vFpddpp(x64emu_t *emu, uintptr_t fnc);
-void vFpliil(x64emu_t *emu, uintptr_t fnc);
+void vFpluul(x64emu_t *emu, uintptr_t fnc);
 void vFplppp(x64emu_t *emu, uintptr_t fnc);
 void vFpLLLL(x64emu_t *emu, uintptr_t fnc);
 void vFpLLpp(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedfreetype_private.h b/src/wrapped/wrappedfreetype_private.h
index 9c4318fd..40956930 100755
--- a/src/wrapped/wrappedfreetype_private.h
+++ b/src/wrapped/wrappedfreetype_private.h
@@ -19,7 +19,7 @@ GO(FT_Bitmap_New, vFp)
 //GO(FT_ClassicKern_Free, 
 //GO(FT_ClassicKern_Validate, 
 GO(FT_Cos, lFl)
-//GO(FT_DivFix, 
+GO(FT_DivFix, lFll)
 GO(FT_Done_Face, iFp)
 GO(FT_Done_FreeType, iFp)
 GO(FT_Done_Glyph, vFp)
@@ -34,7 +34,7 @@ GO(FT_Face_GetCharVariantIndex, uFpuu)
 //GO(FT_Face_GetVariantsOfChar, 
 GO(FT_Face_Properties, iFpup)
 //GO(FT_Face_SetUnpatentedHinting, 
-//GO(FT_FloorFix, 
+GO(FT_FloorFix, lFl)
 GO(FT_Get_Advance, iFpiup)
 GO(FT_Get_Advances, iFpuuip)
 //GO(FT_Get_BDF_Charset_ID, 
@@ -59,7 +59,7 @@ GO(FT_Get_Glyph_Name, iFpupu)
 GO(FT_Get_Kerning, iFpuuup)
 //GO(FT_Get_MM_Blend_Coordinates, 
 GO(FT_Get_MM_Var, iFpp)
-//GO(FT_Get_Module, 
+GO(FT_Get_Module, pFpp)
 //GO(FT_Get_Multi_Master, 
 GO(FT_Get_Name_Index, uFpp)
 GO(FT_Get_Next_Char, LFpLp)
@@ -72,7 +72,7 @@ GO(FT_Get_Postscript_Name, pFp)
 GO(FT_Get_PS_Font_Info, iFpp)
 //GO(FT_Get_PS_Font_Private, 
 //GO(FT_Get_PS_Font_Value, 
-//GO(FT_Get_Renderer, 
+GO(FT_Get_Renderer, pFpu)
 //GO(FT_Get_Sfnt_LangTag, 
 GO(FT_Get_Sfnt_Name, iFpip)
 GO(FT_Get_Sfnt_Name_Count, uFp)
@@ -80,7 +80,7 @@ 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_TrueType_Engine_Type, uFp)
 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?
@@ -90,23 +90,23 @@ GO(FT_Glyph_Get_CBox, vFpup)
 GO(FT_GlyphSlot_Embolden, vFp)
 GO(FT_GlyphSlot_Oblique, vFp)
 GO(FT_GlyphSlot_Own_Bitmap, iFp)
-GO(FT_Glyph_Stroke, iFppi)
+GO(FT_Glyph_Stroke, iFppC)
 GO(FT_Glyph_StrokeBorder, iFppCC)
-GO(FT_Glyph_To_Bitmap, iFpipC)
+GO(FT_Glyph_To_Bitmap, iFpupC)
 GO(FT_Glyph_Transform, iFppp)
 //GO(FT_Gzip_Uncompress, 
 //GO(FT_Has_PS_Glyph_Names, 
 GO(FT_Init_FreeType, iFp)
-GO(FT_Library_SetLcdFilter, iFpi)
+GO(FT_Library_SetLcdFilter, iFpu)
 GO(FT_Library_SetLcdFilterWeights, iFpp)
 GO(FT_Library_Version, vFpppp)
 //GO(FT_List_Add, 
 //GO(FT_List_Finalize, 
-//GO(FT_List_Find, 
+GO(FT_List_Find, pFpp)
 //GO(FT_List_Insert, 
 //GO(FT_List_Iterate, 
 //GO(FT_List_Remove, 
-//GO(FT_List_Up, 
+GO(FT_List_Up, vFpp)
 GO(FT_Load_Char, iFpLi)
 GO(FT_Load_Glyph, iFpui)
 GO(FT_Load_Sfnt_Table, iFpLlpp)
@@ -132,8 +132,8 @@ GO(FT_Outline_Get_BBox, iFpp)
 GO(FT_Outline_Get_Bitmap, iFppp)
 GO(FT_Outline_Get_CBox, vFpp)
 //GO(FT_Outline_GetInsideBorder, 
-//GO(FT_Outline_Get_Orientation, 
-//GO(FT_Outline_GetOutsideBorder, 
+GO(FT_Outline_Get_Orientation, uFp)
+GO(FT_Outline_GetOutsideBorder, uFp)
 GO(FT_Outline_New, iFpuip)
 //GO(FT_Outline_New_Internal, 
 GO(FT_Outline_Render, iFppp)
@@ -145,8 +145,8 @@ GO(FT_Property_Get, iFpppp)
 GO(FT_Property_Set, iFpppp)
 GO(FT_Reference_Face, iFp)
 //GO(FT_Reference_Library, 
-//GO(FT_Remove_Module, 
-GO(FT_Render_Glyph, iFpi)
+GO(FT_Remove_Module, iFpp)
+GO(FT_Render_Glyph, iFpu)
 GO(FT_Request_Size, iFpp)
 //GO(FT_RoundFix, 
 GO(FT_Select_Charmap, iFpi)
@@ -158,7 +158,7 @@ GO(FT_Set_Char_Size, iFplluu)
 //GO(FT_Set_MM_Blend_Coordinates, 
 GO(FT_Set_MM_Design_Coordinates, iFpup)
 GO(FT_Set_Pixel_Sizes, iFpuu)
-//GO(FT_Set_Renderer, 
+GO(FT_Set_Renderer, iFppup)
 GO(FT_Set_Transform, vFppp)
 //GO(FT_Set_Var_Blend_Coordinates, 
 GO(FT_Set_Var_Design_Coordinates, iFpup)
@@ -173,14 +173,14 @@ GO(FT_Stroker_CubicTo, iFpppp)
 GO(FT_Stroker_Done, vFp)
 GO(FT_Stroker_EndSubPath, iFp)
 GO(FT_Stroker_Export, vFpp)
-GO(FT_Stroker_ExportBorder, vFpip)
-GO(FT_Stroker_GetBorderCounts, iFpipp)
+GO(FT_Stroker_ExportBorder, vFpup)
+GO(FT_Stroker_GetBorderCounts, iFpupp)
 GO(FT_Stroker_GetCounts, iFppp)
 GO(FT_Stroker_LineTo, iFpp)
 GO(FT_Stroker_New, iFpp)
 GO(FT_Stroker_ParseOutline, iFppC)
 GO(FT_Stroker_Rewind, vFp)
-GO(FT_Stroker_Set, vFpliil)
+GO(FT_Stroker_Set, vFpluul)
 GO(FT_Tan, lFl)
 //GO(FT_TrueTypeGX_Free, 
 //GO(FT_TrueTypeGX_Validate,