Used wrapperhelper on wrapped cairo and friends

6 files changed, 143 insertions, 89 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index a1bb1d72..00517a34 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -519,6 +519,7 @@
 #() uFEpu
 #() uFEpU
 #() uFEpp
+#() uFiuu
 #() uFipu
 #() uFuii
 #() uFuip
@@ -776,6 +777,7 @@
 #() vFpiii
 #() vFpiiu
 #() vFpiip
+#() vFpiui
 #() vFpiuu
 #() vFpiuL
 #() vFpiup
@@ -995,6 +997,7 @@
 #() uFEpup
 #() uFEppp
 #() uFiiii
+#() uFiiuu
 #() uFifff
 #() uFuuuu
 #() uFpiip
@@ -1290,6 +1293,7 @@
 #() vFpilpp
 #() vFpipii
 #() vFpipiu
+#() vFpippi
 #() vFpuiip
 #() vFpuipp
 #() vFpuuuu
@@ -1328,6 +1332,7 @@
 #() vFppuui
 #() vFppuuu
 #() vFppuup
+#() vFppudd
 #() vFppupi
 #() vFppupp
 #() vFppfff
@@ -1385,6 +1390,7 @@
 #() iFipppi
 #() iFipppp
 #() iFuppLp
+#() iFLppip
 #() iFpwwww
 #() iFpwppp
 #() iFpiiii
@@ -1680,8 +1686,10 @@
 #() vFpiiiii
 #() vFpiiipp
 #() vFpiiuuu
+#() vFpiippi
 #() vFpiippp
 #() vFpiUuup
+#() vFpipipp
 #() vFpipipV
 #() vFpipppi
 #() vFpipppp
@@ -1908,6 +1916,7 @@
 #() pFplpppp
 #() pFpLppii
 #() pFppiiii
+#() pFppiipp
 #() pFppiCCC
 #() pFppiupp
 #() pFppipip
@@ -2143,6 +2152,7 @@
 #() pFpWppWpp
 #() pFpuuuwwu
 #() pFpuupwwC
+#() pFpupiipp
 #() pFpuppipp
 #() pFplppppp
 #() pFpLppiip
@@ -2218,6 +2228,7 @@
 #() vFpiUuupup
 #() vFpippiiuu
 #() vFpippiipi
+#() vFpudddddd
 #() vFpuppippp
 #() vFpuppLLLL
 #() vFpUiUiupi
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 23cc99b2..0464d4ca 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -555,6 +555,7 @@ typedef uint32_t (*uFEpW_t)(x64emu_t*, void*, uint16_t);
 typedef uint32_t (*uFEpu_t)(x64emu_t*, void*, uint32_t);
 typedef uint32_t (*uFEpU_t)(x64emu_t*, void*, uint64_t);
 typedef uint32_t (*uFEpp_t)(x64emu_t*, void*, void*);
+typedef uint32_t (*uFiuu_t)(int32_t, uint32_t, uint32_t);
 typedef uint32_t (*uFipu_t)(int32_t, void*, uint32_t);
 typedef uint32_t (*uFuii_t)(uint32_t, int32_t, int32_t);
 typedef uint32_t (*uFuip_t)(uint32_t, int32_t, void*);
@@ -812,6 +813,7 @@ typedef void (*vFLuui_t)(uintptr_t, uint32_t, uint32_t, int32_t);
 typedef void (*vFpiii_t)(void*, int32_t, int32_t, int32_t);
 typedef void (*vFpiiu_t)(void*, int32_t, int32_t, uint32_t);
 typedef void (*vFpiip_t)(void*, int32_t, int32_t, void*);
+typedef void (*vFpiui_t)(void*, int32_t, uint32_t, int32_t);
 typedef void (*vFpiuu_t)(void*, int32_t, uint32_t, uint32_t);
 typedef void (*vFpiuL_t)(void*, int32_t, uint32_t, uintptr_t);
 typedef void (*vFpiup_t)(void*, int32_t, uint32_t, void*);
@@ -1031,6 +1033,7 @@ typedef uint32_t (*uFEupp_t)(x64emu_t*, uint32_t, void*, void*);
 typedef uint32_t (*uFEpup_t)(x64emu_t*, void*, uint32_t, void*);
 typedef uint32_t (*uFEppp_t)(x64emu_t*, void*, void*, void*);
 typedef uint32_t (*uFiiii_t)(int32_t, int32_t, int32_t, int32_t);
+typedef uint32_t (*uFiiuu_t)(int32_t, int32_t, uint32_t, uint32_t);
 typedef uint32_t (*uFifff_t)(int32_t, float, float, float);
 typedef uint32_t (*uFuuuu_t)(uint32_t, uint32_t, uint32_t, uint32_t);
 typedef uint32_t (*uFpiip_t)(void*, int32_t, int32_t, void*);
@@ -1326,6 +1329,7 @@ typedef void (*vFpiUUp_t)(void*, int32_t, uint64_t, uint64_t, void*);
 typedef void (*vFpilpp_t)(void*, int32_t, intptr_t, void*, void*);
 typedef void (*vFpipii_t)(void*, int32_t, void*, int32_t, int32_t);
 typedef void (*vFpipiu_t)(void*, int32_t, void*, int32_t, uint32_t);
+typedef void (*vFpippi_t)(void*, int32_t, void*, void*, int32_t);
 typedef void (*vFpuiip_t)(void*, uint32_t, int32_t, int32_t, void*);
 typedef void (*vFpuipp_t)(void*, uint32_t, int32_t, void*, void*);
 typedef void (*vFpuuuu_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t);
@@ -1364,6 +1368,7 @@ typedef void (*vFppuii_t)(void*, void*, uint32_t, int32_t, int32_t);
 typedef void (*vFppuui_t)(void*, void*, uint32_t, uint32_t, int32_t);
 typedef void (*vFppuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t);
 typedef void (*vFppuup_t)(void*, void*, uint32_t, uint32_t, void*);
+typedef void (*vFppudd_t)(void*, void*, uint32_t, double, double);
 typedef void (*vFppupi_t)(void*, void*, uint32_t, void*, int32_t);
 typedef void (*vFppupp_t)(void*, void*, uint32_t, void*, void*);
 typedef void (*vFppfff_t)(void*, void*, float, float, float);
@@ -1421,6 +1426,7 @@ typedef int32_t (*iFippLp_t)(int32_t, void*, void*, uintptr_t, void*);
 typedef int32_t (*iFipppi_t)(int32_t, void*, void*, void*, int32_t);
 typedef int32_t (*iFipppp_t)(int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFuppLp_t)(uint32_t, void*, void*, uintptr_t, void*);
+typedef int32_t (*iFLppip_t)(uintptr_t, void*, void*, int32_t, void*);
 typedef int32_t (*iFpwwww_t)(void*, int16_t, int16_t, int16_t, int16_t);
 typedef int32_t (*iFpwppp_t)(void*, int16_t, void*, void*, void*);
 typedef int32_t (*iFpiiii_t)(void*, int32_t, int32_t, int32_t, int32_t);
@@ -1716,8 +1722,10 @@ typedef void (*vFdddppp_t)(double, double, double, void*, void*, void*);
 typedef void (*vFpiiiii_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFpiiipp_t)(void*, int32_t, int32_t, int32_t, void*, void*);
 typedef void (*vFpiiuuu_t)(void*, int32_t, int32_t, uint32_t, uint32_t, uint32_t);
+typedef void (*vFpiippi_t)(void*, int32_t, int32_t, void*, void*, int32_t);
 typedef void (*vFpiippp_t)(void*, int32_t, int32_t, void*, void*, void*);
 typedef void (*vFpiUuup_t)(void*, int32_t, uint64_t, uint32_t, uint32_t, void*);
+typedef void (*vFpipipp_t)(void*, int32_t, void*, int32_t, void*, void*);
 typedef void (*vFpipipV_t)(void*, int32_t, void*, int32_t, void*, void*);
 typedef void (*vFpipppi_t)(void*, int32_t, void*, void*, void*, int32_t);
 typedef void (*vFpipppp_t)(void*, int32_t, void*, void*, void*, void*);
@@ -1944,6 +1952,7 @@ typedef void* (*pFpupppp_t)(void*, uint32_t, void*, void*, void*, void*);
 typedef void* (*pFplpppp_t)(void*, intptr_t, void*, void*, void*, void*);
 typedef void* (*pFpLppii_t)(void*, uintptr_t, void*, void*, int32_t, int32_t);
 typedef void* (*pFppiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t);
+typedef void* (*pFppiipp_t)(void*, void*, int32_t, int32_t, void*, void*);
 typedef void* (*pFppiCCC_t)(void*, void*, int32_t, uint8_t, uint8_t, uint8_t);
 typedef void* (*pFppiupp_t)(void*, void*, int32_t, uint32_t, void*, void*);
 typedef void* (*pFppipip_t)(void*, void*, int32_t, void*, int32_t, void*);
@@ -2179,6 +2188,7 @@ typedef void* (*pFpCpWWup_t)(void*, uint8_t, void*, uint16_t, uint16_t, uint32_t
 typedef void* (*pFpWppWpp_t)(void*, uint16_t, void*, void*, uint16_t, void*, void*);
 typedef void* (*pFpuuuwwu_t)(void*, uint32_t, uint32_t, uint32_t, int16_t, int16_t, uint32_t);
 typedef void* (*pFpuupwwC_t)(void*, uint32_t, uint32_t, void*, int16_t, int16_t, uint8_t);
+typedef void* (*pFpupiipp_t)(void*, uint32_t, void*, int32_t, int32_t, void*, void*);
 typedef void* (*pFpuppipp_t)(void*, uint32_t, void*, void*, int32_t, void*, void*);
 typedef void* (*pFplppppp_t)(void*, intptr_t, void*, void*, void*, void*, void*);
 typedef void* (*pFpLppiip_t)(void*, uintptr_t, void*, void*, int32_t, int32_t, void*);
@@ -2254,6 +2264,7 @@ typedef void (*vFpiiULipp_t)(void*, int32_t, int32_t, uint64_t, uintptr_t, int32
 typedef void (*vFpiUuupup_t)(void*, int32_t, uint64_t, uint32_t, uint32_t, void*, uint32_t, void*);
 typedef void (*vFpippiiuu_t)(void*, int32_t, void*, void*, int32_t, int32_t, uint32_t, uint32_t);
 typedef void (*vFpippiipi_t)(void*, int32_t, void*, void*, int32_t, int32_t, void*, int32_t);
+typedef void (*vFpudddddd_t)(void*, uint32_t, double, double, double, double, double, double);
 typedef void (*vFpuppippp_t)(void*, uint32_t, void*, void*, int32_t, void*, void*, void*);
 typedef void (*vFpuppLLLL_t)(void*, uint32_t, void*, void*, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
 typedef void (*vFpUiUiupi_t)(void*, uint64_t, int32_t, uint64_t, int32_t, uint32_t, void*, int32_t);
@@ -3225,6 +3236,7 @@ void uFEpW(x64emu_t *emu, uintptr_t fcn) { uFEpW_t fn = (uFEpW_t)fcn; R_RAX=(uin
 void uFEpu(x64emu_t *emu, uintptr_t fcn) { uFEpu_t fn = (uFEpu_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI); }
 void uFEpU(x64emu_t *emu, uintptr_t fcn) { uFEpU_t fn = (uFEpU_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint64_t)R_RSI); }
 void uFEpp(x64emu_t *emu, uintptr_t fcn) { uFEpp_t fn = (uFEpp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI); }
+void uFiuu(x64emu_t *emu, uintptr_t fcn) { uFiuu_t fn = (uFiuu_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX); }
 void uFipu(x64emu_t *emu, uintptr_t fcn) { uFipu_t fn = (uFipu_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX); }
 void uFuii(x64emu_t *emu, uintptr_t fcn) { uFuii_t fn = (uFuii_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX); }
 void uFuip(x64emu_t *emu, uintptr_t fcn) { uFuip_t fn = (uFuip_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
@@ -3482,6 +3494,7 @@ void vFLuui(x64emu_t *emu, uintptr_t fcn) { vFLuui_t fn = (vFLuui_t)fcn; fn((uin
 void vFpiii(x64emu_t *emu, uintptr_t fcn) { vFpiii_t fn = (vFpiii_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void vFpiiu(x64emu_t *emu, uintptr_t fcn) { vFpiiu_t fn = (vFpiiu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX); }
 void vFpiip(x64emu_t *emu, uintptr_t fcn) { vFpiip_t fn = (vFpiip_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
+void vFpiui(x64emu_t *emu, uintptr_t fcn) { vFpiui_t fn = (vFpiui_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX); }
 void vFpiuu(x64emu_t *emu, uintptr_t fcn) { vFpiuu_t fn = (vFpiuu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void vFpiuL(x64emu_t *emu, uintptr_t fcn) { vFpiuL_t fn = (vFpiuL_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX); }
 void vFpiup(x64emu_t *emu, uintptr_t fcn) { vFpiup_t fn = (vFpiup_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
@@ -3701,6 +3714,7 @@ void uFEupp(x64emu_t *emu, uintptr_t fcn) { uFEupp_t fn = (uFEupp_t)fcn; R_RAX=(
 void uFEpup(x64emu_t *emu, uintptr_t fcn) { uFEpup_t fn = (uFEpup_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); }
 void uFEppp(x64emu_t *emu, uintptr_t fcn) { uFEppp_t fn = (uFEppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void uFiiii(x64emu_t *emu, uintptr_t fcn) { uFiiii_t fn = (uFiiii_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
+void uFiiuu(x64emu_t *emu, uintptr_t fcn) { uFiiuu_t fn = (uFiiuu_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void uFifff(x64emu_t *emu, uintptr_t fcn) { uFifff_t fn = (uFifff_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
 void uFuuuu(x64emu_t *emu, uintptr_t fcn) { uFuuuu_t fn = (uFuuuu_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void uFpiip(x64emu_t *emu, uintptr_t fcn) { uFpiip_t fn = (uFpiip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
@@ -3996,6 +4010,7 @@ void vFpiUUp(x64emu_t *emu, uintptr_t fcn) { vFpiUUp_t fn = (vFpiUUp_t)fcn; fn((
 void vFpilpp(x64emu_t *emu, uintptr_t fcn) { vFpilpp_t fn = (vFpilpp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFpipii(x64emu_t *emu, uintptr_t fcn) { vFpipii_t fn = (vFpipii_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void vFpipiu(x64emu_t *emu, uintptr_t fcn) { vFpipiu_t fn = (vFpipiu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); }
+void vFpippi(x64emu_t *emu, uintptr_t fcn) { vFpippi_t fn = (vFpippi_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void vFpuiip(x64emu_t *emu, uintptr_t fcn) { vFpuiip_t fn = (vFpuiip_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void vFpuipp(x64emu_t *emu, uintptr_t fcn) { vFpuipp_t fn = (vFpuipp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFpuuuu(x64emu_t *emu, uintptr_t fcn) { vFpuuuu_t fn = (vFpuuuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
@@ -4034,6 +4049,7 @@ void vFppuii(x64emu_t *emu, uintptr_t fcn) { vFppuii_t fn = (vFppuii_t)fcn; fn((
 void vFppuui(x64emu_t *emu, uintptr_t fcn) { vFppuui_t fn = (vFppuui_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8); }
 void vFppuuu(x64emu_t *emu, uintptr_t fcn) { vFppuuu_t fn = (vFppuuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void vFppuup(x64emu_t *emu, uintptr_t fcn) { vFppuup_t fn = (vFppuup_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
+void vFppudd(x64emu_t *emu, uintptr_t fcn) { vFppudd_t fn = (vFppudd_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void vFppupi(x64emu_t *emu, uintptr_t fcn) { vFppupi_t fn = (vFppupi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void vFppupp(x64emu_t *emu, uintptr_t fcn) { vFppupp_t fn = (vFppupp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFppfff(x64emu_t *emu, uintptr_t fcn) { vFppfff_t fn = (vFppfff_t)fcn; fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
@@ -4091,6 +4107,7 @@ void iFippLp(x64emu_t *emu, uintptr_t fcn) { iFippLp_t fn = (iFippLp_t)fcn; R_RA
 void iFipppi(x64emu_t *emu, uintptr_t fcn) { iFipppi_t fn = (iFipppi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void iFipppp(x64emu_t *emu, uintptr_t fcn) { iFipppp_t fn = (iFipppp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFuppLp(x64emu_t *emu, uintptr_t fcn) { iFuppLp_t fn = (iFuppLp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
+void iFLppip(x64emu_t *emu, uintptr_t fcn) { iFLppip_t fn = (iFLppip_t)fcn; R_RAX=(int32_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void iFpwwww(x64emu_t *emu, uintptr_t fcn) { iFpwwww_t fn = (iFpwwww_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int16_t)R_RSI, (int16_t)R_RDX, (int16_t)R_RCX, (int16_t)R_R8); }
 void iFpwppp(x64emu_t *emu, uintptr_t fcn) { iFpwppp_t fn = (iFpwppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int16_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpiiii(x64emu_t *emu, uintptr_t fcn) { iFpiiii_t fn = (iFpiiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
@@ -4386,8 +4403,10 @@ void vFdddppp(x64emu_t *emu, uintptr_t fcn) { vFdddppp_t fn = (vFdddppp_t)fcn; f
 void vFpiiiii(x64emu_t *emu, uintptr_t fcn) { vFpiiiii_t fn = (vFpiiiii_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void vFpiiipp(x64emu_t *emu, uintptr_t fcn) { vFpiiipp_t fn = (vFpiiipp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFpiiuuu(x64emu_t *emu, uintptr_t fcn) { vFpiiuuu_t fn = (vFpiiuuu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
+void vFpiippi(x64emu_t *emu, uintptr_t fcn) { vFpiippi_t fn = (vFpiippi_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void vFpiippp(x64emu_t *emu, uintptr_t fcn) { vFpiippp_t fn = (vFpiippp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFpiUuup(x64emu_t *emu, uintptr_t fcn) { vFpiUuup_t fn = (vFpiUuup_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
+void vFpipipp(x64emu_t *emu, uintptr_t fcn) { vFpipipp_t fn = (vFpipipp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFpipipV(x64emu_t *emu, uintptr_t fcn) { vFpipipV_t fn = (vFpipipV_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)(R_RSP + 8)); }
 void vFpipppi(x64emu_t *emu, uintptr_t fcn) { vFpipppi_t fn = (vFpipppi_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void vFpipppp(x64emu_t *emu, uintptr_t fcn) { vFpipppp_t fn = (vFpipppp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -4614,6 +4633,7 @@ void pFpupppp(x64emu_t *emu, uintptr_t fcn) { pFpupppp_t fn = (pFpupppp_t)fcn; R
 void pFplpppp(x64emu_t *emu, uintptr_t fcn) { pFplpppp_t fn = (pFplpppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFpLppii(x64emu_t *emu, uintptr_t fcn) { pFpLppii_t fn = (pFpLppii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void pFppiiii(x64emu_t *emu, uintptr_t fcn) { pFppiiii_t fn = (pFppiiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
+void pFppiipp(x64emu_t *emu, uintptr_t fcn) { pFppiipp_t fn = (pFppiipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFppiCCC(x64emu_t *emu, uintptr_t fcn) { pFppiCCC_t fn = (pFppiCCC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8, (uint8_t)R_R9); }
 void pFppiupp(x64emu_t *emu, uintptr_t fcn) { pFppiupp_t fn = (pFppiupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void pFppipip(x64emu_t *emu, uintptr_t fcn) { pFppipip_t fn = (pFppipip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9); }
@@ -4849,6 +4869,7 @@ void pFpCpWWup(x64emu_t *emu, uintptr_t fcn) { pFpCpWWup_t fn = (pFpCpWWup_t)fcn
 void pFpWppWpp(x64emu_t *emu, uintptr_t fcn) { pFpWppWpp_t fn = (pFpWppWpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint16_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFpuuuwwu(x64emu_t *emu, uintptr_t fcn) { pFpuuuwwu_t fn = (pFpuuuwwu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void pFpuupwwC(x64emu_t *emu, uintptr_t fcn) { pFpuupwwC_t fn = (pFpuupwwC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int16_t)R_R8, (int16_t)R_R9, *(uint8_t*)(R_RSP + 8)); }
+void pFpupiipp(x64emu_t *emu, uintptr_t fcn) { pFpupiipp_t fn = (pFpupiipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFpuppipp(x64emu_t *emu, uintptr_t fcn) { pFpuppipp_t fn = (pFpuppipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFplppppp(x64emu_t *emu, uintptr_t fcn) { pFplppppp_t fn = (pFplppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFpLppiip(x64emu_t *emu, uintptr_t fcn) { pFpLppiip_t fn = (pFpLppiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
@@ -4924,6 +4945,7 @@ void vFpiiULipp(x64emu_t *emu, uintptr_t fcn) { vFpiiULipp_t fn = (vFpiiULipp_t)
 void vFpiUuupup(x64emu_t *emu, uintptr_t fcn) { vFpiUuupup_t fn = (vFpiUuupup_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFpippiiuu(x64emu_t *emu, uintptr_t fcn) { vFpippiiuu_t fn = (vFpippiiuu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void vFpippiipi(x64emu_t *emu, uintptr_t fcn) { vFpippiipi_t fn = (vFpippiipi_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
+void vFpudddddd(x64emu_t *emu, uintptr_t fcn) { vFpudddddd_t fn = (vFpudddddd_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], emu->xmm[4].d[0], emu->xmm[5].d[0]); }
 void vFpuppippp(x64emu_t *emu, uintptr_t fcn) { vFpuppippp_t fn = (vFpuppippp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFpuppLLLL(x64emu_t *emu, uintptr_t fcn) { vFpuppLLLL_t fn = (vFpuppLLLL_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16)); }
 void vFpUiUiupi(x64emu_t *emu, uintptr_t fcn) { vFpUiUiupi_t fn = (vFpUiUiupi_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (int32_t)R_RDX, (uint64_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
@@ -5823,6 +5845,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &CFuLu) return 1;
 	if (fun == &CFppp) return 1;
 	if (fun == &WFppp) return 1;
+	if (fun == &uFiuu) return 1;
 	if (fun == &uFipu) return 1;
 	if (fun == &uFuii) return 1;
 	if (fun == &uFuip) return 1;
@@ -6037,6 +6060,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpiii) return 1;
 	if (fun == &vFpiiu) return 1;
 	if (fun == &vFpiip) return 1;
+	if (fun == &vFpiui) return 1;
 	if (fun == &vFpiuu) return 1;
 	if (fun == &vFpiuL) return 1;
 	if (fun == &vFpiup) return 1;
@@ -6222,6 +6246,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &CFpupp) return 1;
 	if (fun == &CFppip) return 1;
 	if (fun == &uFiiii) return 1;
+	if (fun == &uFiiuu) return 1;
 	if (fun == &uFifff) return 4;
 	if (fun == &uFuuuu) return 1;
 	if (fun == &uFpiip) return 1;
@@ -6469,6 +6494,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpilpp) return 1;
 	if (fun == &vFpipii) return 1;
 	if (fun == &vFpipiu) return 1;
+	if (fun == &vFpippi) return 1;
 	if (fun == &vFpuiip) return 1;
 	if (fun == &vFpuipp) return 1;
 	if (fun == &vFpuuuu) return 1;
@@ -6507,6 +6533,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFppuui) return 1;
 	if (fun == &vFppuuu) return 1;
 	if (fun == &vFppuup) return 1;
+	if (fun == &vFppudd) return 3;
 	if (fun == &vFppupi) return 1;
 	if (fun == &vFppupp) return 1;
 	if (fun == &vFppfff) return 4;
@@ -6540,6 +6567,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFipppi) return 1;
 	if (fun == &iFipppp) return 1;
 	if (fun == &iFuppLp) return 1;
+	if (fun == &iFLppip) return 1;
 	if (fun == &iFpwwww) return 1;
 	if (fun == &iFpwppp) return 1;
 	if (fun == &iFpiiii) return 1;
@@ -6790,8 +6818,10 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpiiiii) return 1;
 	if (fun == &vFpiiipp) return 1;
 	if (fun == &vFpiiuuu) return 1;
+	if (fun == &vFpiippi) return 1;
 	if (fun == &vFpiippp) return 1;
 	if (fun == &vFpiUuup) return 1;
+	if (fun == &vFpipipp) return 1;
 	if (fun == &vFpipppi) return 1;
 	if (fun == &vFpipppp) return 1;
 	if (fun == &vFpuiiii) return 1;
@@ -6982,6 +7012,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFplpppp) return 1;
 	if (fun == &pFpLppii) return 1;
 	if (fun == &pFppiiii) return 1;
+	if (fun == &pFppiipp) return 1;
 	if (fun == &pFppiCCC) return 1;
 	if (fun == &pFppiupp) return 1;
 	if (fun == &pFppipip) return 1;
@@ -7024,6 +7055,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFuCCCCfff) return 4;
 	if (fun == &vFuuufffff) return 6;
 	if (fun == &vFffffffff) return 9;
+	if (fun == &vFpudddddd) return 7;
 	if (fun == &vFuffffffff) return 9;
 	if (fun == &vFffCCCCfff) return 6;
 	if (fun == &vFppddddidd) return 7;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index a18be2cb..e514ed4b 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -556,6 +556,7 @@ void uFEpW(x64emu_t *emu, uintptr_t fnc);
 void uFEpu(x64emu_t *emu, uintptr_t fnc);
 void uFEpU(x64emu_t *emu, uintptr_t fnc);
 void uFEpp(x64emu_t *emu, uintptr_t fnc);
+void uFiuu(x64emu_t *emu, uintptr_t fnc);
 void uFipu(x64emu_t *emu, uintptr_t fnc);
 void uFuii(x64emu_t *emu, uintptr_t fnc);
 void uFuip(x64emu_t *emu, uintptr_t fnc);
@@ -813,6 +814,7 @@ void vFLuui(x64emu_t *emu, uintptr_t fnc);
 void vFpiii(x64emu_t *emu, uintptr_t fnc);
 void vFpiiu(x64emu_t *emu, uintptr_t fnc);
 void vFpiip(x64emu_t *emu, uintptr_t fnc);
+void vFpiui(x64emu_t *emu, uintptr_t fnc);
 void vFpiuu(x64emu_t *emu, uintptr_t fnc);
 void vFpiuL(x64emu_t *emu, uintptr_t fnc);
 void vFpiup(x64emu_t *emu, uintptr_t fnc);
@@ -1032,6 +1034,7 @@ void uFEupp(x64emu_t *emu, uintptr_t fnc);
 void uFEpup(x64emu_t *emu, uintptr_t fnc);
 void uFEppp(x64emu_t *emu, uintptr_t fnc);
 void uFiiii(x64emu_t *emu, uintptr_t fnc);
+void uFiiuu(x64emu_t *emu, uintptr_t fnc);
 void uFifff(x64emu_t *emu, uintptr_t fnc);
 void uFuuuu(x64emu_t *emu, uintptr_t fnc);
 void uFpiip(x64emu_t *emu, uintptr_t fnc);
@@ -1327,6 +1330,7 @@ void vFpiUUp(x64emu_t *emu, uintptr_t fnc);
 void vFpilpp(x64emu_t *emu, uintptr_t fnc);
 void vFpipii(x64emu_t *emu, uintptr_t fnc);
 void vFpipiu(x64emu_t *emu, uintptr_t fnc);
+void vFpippi(x64emu_t *emu, uintptr_t fnc);
 void vFpuiip(x64emu_t *emu, uintptr_t fnc);
 void vFpuipp(x64emu_t *emu, uintptr_t fnc);
 void vFpuuuu(x64emu_t *emu, uintptr_t fnc);
@@ -1365,6 +1369,7 @@ void vFppuii(x64emu_t *emu, uintptr_t fnc);
 void vFppuui(x64emu_t *emu, uintptr_t fnc);
 void vFppuuu(x64emu_t *emu, uintptr_t fnc);
 void vFppuup(x64emu_t *emu, uintptr_t fnc);
+void vFppudd(x64emu_t *emu, uintptr_t fnc);
 void vFppupi(x64emu_t *emu, uintptr_t fnc);
 void vFppupp(x64emu_t *emu, uintptr_t fnc);
 void vFppfff(x64emu_t *emu, uintptr_t fnc);
@@ -1422,6 +1427,7 @@ void iFippLp(x64emu_t *emu, uintptr_t fnc);
 void iFipppi(x64emu_t *emu, uintptr_t fnc);
 void iFipppp(x64emu_t *emu, uintptr_t fnc);
 void iFuppLp(x64emu_t *emu, uintptr_t fnc);
+void iFLppip(x64emu_t *emu, uintptr_t fnc);
 void iFpwwww(x64emu_t *emu, uintptr_t fnc);
 void iFpwppp(x64emu_t *emu, uintptr_t fnc);
 void iFpiiii(x64emu_t *emu, uintptr_t fnc);
@@ -1717,8 +1723,10 @@ void vFdddppp(x64emu_t *emu, uintptr_t fnc);
 void vFpiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFpiiipp(x64emu_t *emu, uintptr_t fnc);
 void vFpiiuuu(x64emu_t *emu, uintptr_t fnc);
+void vFpiippi(x64emu_t *emu, uintptr_t fnc);
 void vFpiippp(x64emu_t *emu, uintptr_t fnc);
 void vFpiUuup(x64emu_t *emu, uintptr_t fnc);
+void vFpipipp(x64emu_t *emu, uintptr_t fnc);
 void vFpipipV(x64emu_t *emu, uintptr_t fnc);
 void vFpipppi(x64emu_t *emu, uintptr_t fnc);
 void vFpipppp(x64emu_t *emu, uintptr_t fnc);
@@ -1945,6 +1953,7 @@ void pFpupppp(x64emu_t *emu, uintptr_t fnc);
 void pFplpppp(x64emu_t *emu, uintptr_t fnc);
 void pFpLppii(x64emu_t *emu, uintptr_t fnc);
 void pFppiiii(x64emu_t *emu, uintptr_t fnc);
+void pFppiipp(x64emu_t *emu, uintptr_t fnc);
 void pFppiCCC(x64emu_t *emu, uintptr_t fnc);
 void pFppiupp(x64emu_t *emu, uintptr_t fnc);
 void pFppipip(x64emu_t *emu, uintptr_t fnc);
@@ -2180,6 +2189,7 @@ void pFpCpWWup(x64emu_t *emu, uintptr_t fnc);
 void pFpWppWpp(x64emu_t *emu, uintptr_t fnc);
 void pFpuuuwwu(x64emu_t *emu, uintptr_t fnc);
 void pFpuupwwC(x64emu_t *emu, uintptr_t fnc);
+void pFpupiipp(x64emu_t *emu, uintptr_t fnc);
 void pFpuppipp(x64emu_t *emu, uintptr_t fnc);
 void pFplppppp(x64emu_t *emu, uintptr_t fnc);
 void pFpLppiip(x64emu_t *emu, uintptr_t fnc);
@@ -2255,6 +2265,7 @@ void vFpiiULipp(x64emu_t *emu, uintptr_t fnc);
 void vFpiUuupup(x64emu_t *emu, uintptr_t fnc);
 void vFpippiiuu(x64emu_t *emu, uintptr_t fnc);
 void vFpippiipi(x64emu_t *emu, uintptr_t fnc);
+void vFpudddddd(x64emu_t *emu, uintptr_t fnc);
 void vFpuppippp(x64emu_t *emu, uintptr_t fnc);
 void vFpuppLLLL(x64emu_t *emu, uintptr_t fnc);
 void vFpUiUiupi(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedpango_private.h b/src/wrapped/wrappedpango_private.h
index b472a4a2..db3b9058 100755
--- a/src/wrapped/wrappedpango_private.h
+++ b/src/wrapped/wrappedpango_private.h
@@ -45,30 +45,30 @@ GO(pango_attr_stretch_new, pFi)
 GO(pango_attr_strikethrough_color_new, pFWWW)
 GO(pango_attr_strikethrough_new, pFi)
 GO(pango_attr_style_new, pFi)
-GO(pango_attr_type_get_name, pFp)
+GO(pango_attr_type_get_name, pFu)
 GO(pango_attr_type_get_type, iFv)
-GO(pango_attr_type_register, iFp)
+GO(pango_attr_type_register, uFp)
 GO(pango_attr_underline_color_new, pFWWW)
 GO(pango_attr_underline_new, pFi)
 GO(pango_attr_variant_new, pFi)
 GO(pango_attr_weight_new, pFi)
-//GO(pango_bidi_type_for_unichar, 
+GO(pango_bidi_type_for_unichar, uFu)
 //GO(pango_bidi_type_get_type, 
 //GO(pango_break, 
 GO(pango_color_copy, pFp)
 GO(pango_color_free, vFp)
 GO(pango_color_get_type, iFv)
 GO(pango_color_parse, iFpp)
-//GO(pango_color_to_string, 
+GO(pango_color_to_string, pFp)
 GO(pango_config_key_get, pFp)
 //GO(pango_config_key_get_system, 
 GO(pango_context_changed, vFp)
-GO(pango_context_get_base_dir, iFp)
+GO(pango_context_get_base_dir, uFp)
 GO(pango_context_get_base_gravity, iFp)
 GO(pango_context_get_font_description, pFp)
 GO(pango_context_get_font_map, pFp)
-GO(pango_context_get_gravity, iFp)
-GO(pango_context_get_gravity_hint, iFp)
+GO(pango_context_get_gravity, uFp)
+GO(pango_context_get_gravity_hint, uFp)
 GO(pango_context_get_language, pFp)
 GO(pango_context_get_matrix, pFp)
 GO(pango_context_get_metrics, pFppp)
@@ -78,33 +78,33 @@ GO(pango_context_list_families, vFppp)
 GO(pango_context_load_font, pFpp)
 GO(pango_context_load_fontset, pFppp)
 GO(pango_context_new, pFv)
-GO(pango_context_set_base_dir, vFpi)
-GO(pango_context_set_base_gravity, vFpi)
+GO(pango_context_set_base_dir, vFpu)
+GO(pango_context_set_base_gravity, vFpu)
 GO(pango_context_set_font_description, vFpp)
 GO(pango_context_set_font_map, vFpp)
-GO(pango_context_set_gravity_hint, vFpi)
+GO(pango_context_set_gravity_hint, vFpu)
 GO(pango_context_set_language, vFpp)
 GO(pango_context_set_matrix, vFpp)
-//GO(pango_coverage_copy, 
-//GO(pango_coverage_from_bytes, 
-//GO(pango_coverage_get, 
+GO(pango_coverage_copy, pFp)
+GO(pango_coverage_from_bytes, pFpi)
+GO(pango_coverage_get, uFpi)
 //GO(pango_coverage_level_get_type, 
-//GO(pango_coverage_max, 
-//GO(pango_coverage_new, 
+GO(pango_coverage_max, vFpp)
+GO(pango_coverage_new, pFv)
 //GO(pango_coverage_ref, 
-//GO(pango_coverage_set, 
-//GO(pango_coverage_to_bytes, 
+GO(pango_coverage_set, vFpiu)
+GO(pango_coverage_to_bytes, vFppp)
 //GO(pango_coverage_unref, 
-//GO(pango_default_break, 
+GO(pango_default_break, vFpippi)
 //GO(pango_direction_get_type, 
 GO(pango_ellipsize_mode_get_type, lFv)
 //GO(pango_engine_get_type, 
 //GO(pango_engine_lang_get_type, 
 //GO(pango_engine_shape_get_type, 
 GO(pango_extents_to_pixels, vFpp)
-//GO(pango_find_base_dir, 
+GO(pango_find_base_dir, uFpi)
 //GO(pango_find_map, 
-//GO(pango_find_paragraph_boundary, 
+GO(pango_find_paragraph_boundary, vFpipp)
 GO(pango_font_describe, pFp)
 GO(pango_font_describe_with_absolute_size, pFp)
 GO(pango_font_description_better_match, iFppp)
@@ -114,15 +114,15 @@ GO(pango_font_description_equal, iFpp)
 GO(pango_font_description_free, vFp)
 GO(pango_font_description_from_string, pFp)
 GO(pango_font_description_get_family, pFp)
-GO(pango_font_description_get_gravity, iFp)
-GO(pango_font_description_get_set_fields, iFp)
+GO(pango_font_description_get_gravity, uFp)
+GO(pango_font_description_get_set_fields, uFp)
 GO(pango_font_description_get_size, iFp)
 GO(pango_font_description_get_size_is_absolute, iFp)
-GO(pango_font_description_get_stretch, iFp)
-GO(pango_font_description_get_style, iFp)
+GO(pango_font_description_get_stretch, uFp)
+GO(pango_font_description_get_style, uFp)
 GO(pango_font_description_get_type, iFv)
-GO(pango_font_description_get_variant, vFpi)
-GO(pango_font_description_get_weight, iFp)
+GO(pango_font_description_get_variant, uFp)
+GO(pango_font_description_get_weight, uFp)
 GO(pango_font_description_hash, uFp)
 GO(pango_font_description_merge, vFppi)
 GO(pango_font_description_merge_static, vFppi)
@@ -130,16 +130,16 @@ GO(pango_font_description_new, pFv)
 GO(pango_font_description_set_absolute_size, vFpd)
 GO(pango_font_description_set_family, vFpp)
 GO(pango_font_description_set_family_static, vFpp)
-GO(pango_font_description_set_gravity, vFpi)
+GO(pango_font_description_set_gravity, vFpu)
 GO(pango_font_description_set_size, vFpi)
-GO(pango_font_description_set_stretch, vFpi)
-GO(pango_font_description_set_style, vFpi)
-GO(pango_font_description_set_variant, vFpi)
-GO(pango_font_description_set_weight, vFpi)
+GO(pango_font_description_set_stretch, vFpu)
+GO(pango_font_description_set_style, vFpu)
+GO(pango_font_description_set_variant, vFpu)
+GO(pango_font_description_set_weight, vFpu)
 GO(pango_font_descriptions_free, vFpi)
 GO(pango_font_description_to_filename, pFp)
 GO(pango_font_description_to_string, pFp)
-GO(pango_font_description_unset_fields, vFpi)
+GO(pango_font_description_unset_fields, vFpu)
 GO(pango_font_face_describe, pFp)
 GO(pango_font_face_get_face_name, pFp)
 GO(pango_font_face_get_type, iFv)
@@ -152,7 +152,7 @@ GO(pango_font_family_list_faces, vFppp)
 GO(pango_font_find_shaper, pFppu)
 GO(pango_font_get_coverage, pFpp)
 GO(pango_font_get_font_map, pFp)
-GO(pango_font_get_glyph_extents, vFpppp)
+GO(pango_font_get_glyph_extents, vFpupp)
 GO(pango_font_get_metrics, pFpp)
 GO(pango_font_get_type, iFv)
 GO(pango_font_map_create_context, pFp)
@@ -179,13 +179,13 @@ GO(pango_font_metrics_unref, vFp)
 GO(pango_fontset_get_font, pFpu)
 GO(pango_fontset_get_metrics, pFp)
 //GO(pango_fontset_get_type, 
-//GO(pango_fontset_simple_append, 
+GO(pango_fontset_simple_append, vFpp)
 //GO(pango_fontset_simple_get_type, 
-//GO(pango_fontset_simple_new, 
-//GO(pango_fontset_simple_size, 
+GO(pango_fontset_simple_new, pFp)
+GO(pango_fontset_simple_size, iFp)
 //GO(pango_get_lib_subdirectory, 
-//GO(pango_get_log_attrs, 
-//GO(pango_get_mirror_char, 
+GO(pango_get_log_attrs, vFpiippi)
+GO(pango_get_mirror_char, iFup)
 //GO(pango_get_sysconf_subdirectory, 
 GO(pango_glyph_item_apply_attrs, pFppp)
 GO(pango_glyph_item_copy, pFp)
@@ -212,20 +212,20 @@ GO(pango_glyph_string_index_to_x, vFppipiip)
 GO(pango_glyph_string_new, pFv)
 GO(pango_glyph_string_set_size, vFpi)
 GO(pango_glyph_string_x_to_index, vFppipipp)
-//GO(pango_gravity_get_for_matrix, 
-//GO(pango_gravity_get_for_script, 
-//GO(pango_gravity_get_for_script_and_width, 
+GO(pango_gravity_get_for_matrix, uFp)
+GO(pango_gravity_get_for_script, uFiuu)
+GO(pango_gravity_get_for_script_and_width, uFiiuu)
 GO(pango_gravity_get_type, iFv)
 //GO(pango_gravity_hint_get_type, 
-//GO(pango_gravity_to_rotation, 
-//GO(pango_is_zero_width, 
-//GO(pango_item_copy, 
-//GO(pango_item_free, 
+GO(pango_gravity_to_rotation, dFu)
+GO(pango_is_zero_width, iFu)
+GO(pango_item_copy, pFp)
+GO(pango_item_free, vFp)
 //GO(pango_item_get_type, 
-//GO(pango_itemize, 
-//GO(pango_itemize_with_base_dir, 
-//GO(pango_item_new, 
-//GO(pango_item_split, 
+GO(pango_itemize, pFppiipp)
+GO(pango_itemize_with_base_dir, pFpupiipp)
+GO(pango_item_new, pFv)
+GO(pango_item_split, pFpii)
 GO(pango_language_from_string, pFp)
 GO(pango_language_get_default, pFv)
 GO(pango_language_get_sample_string, pFp)
@@ -236,14 +236,14 @@ GO(pango_language_matches, iFpp)
 GO(pango_language_to_string, pFp)
 GO(pango_layout_context_changed, vFp)
 GO(pango_layout_copy, pFp)
-GO(pango_layout_get_alignment, iFp)
+GO(pango_layout_get_alignment, uFp)
 GO(pango_layout_get_attributes, pFp)
 GO(pango_layout_get_auto_dir, iFp)
 GO(pango_layout_get_baseline, iFp)
 GO(pango_layout_get_character_count, iFp)
 GO(pango_layout_get_context, pFp)
 GO(pango_layout_get_cursor_pos, vFpipp)
-GO(pango_layout_get_ellipsize, iFp)
+GO(pango_layout_get_ellipsize, uFp)
 GO(pango_layout_get_extents, vFppp)
 GO(pango_layout_get_font_description, pFp)
 GO(pango_layout_get_height, iFp)
@@ -268,7 +268,7 @@ GO(pango_layout_get_text, pFp)
 GO(pango_layout_get_type, iFv)
 GO(pango_layout_get_unknown_glyphs_count, iFp)
 GO(pango_layout_get_width, iFp)
-GO(pango_layout_get_wrap, iFp)
+GO(pango_layout_get_wrap, uFp)
 GO(pango_layout_index_to_line_x, vFpiipp)
 GO(pango_layout_index_to_pos, vFpip)
 GO(pango_layout_is_ellipsized, iFp)
@@ -304,10 +304,10 @@ GO(pango_layout_line_unref, vFp)
 GO(pango_layout_line_x_to_index, iFpipp)
 GO(pango_layout_move_cursor_visually, vFpiiiipp)
 GO(pango_layout_new, pFp)
-GO(pango_layout_set_alignment, vFpi)
+GO(pango_layout_set_alignment, vFpu)
 GO(pango_layout_set_attributes, vFpp)
 GO(pango_layout_set_auto_dir, vFpi)
-GO(pango_layout_set_ellipsize, vFpi)
+GO(pango_layout_set_ellipsize, vFpu)
 GO(pango_layout_set_font_description, vFpp)
 GO(pango_layout_set_height, vFpi)
 GO(pango_layout_set_indent, vFpi)
@@ -319,13 +319,13 @@ GO(pango_layout_set_spacing, vFpi)
 GO(pango_layout_set_tabs, vFpp)
 GO(pango_layout_set_text, vFppi)
 GO(pango_layout_set_width, vFpi)
-GO(pango_layout_set_wrap, vFpi)
+GO(pango_layout_set_wrap, vFpu)
 GO(pango_layout_xy_to_index, iFpiipp)
-//GO(pango_log2vis_get_embedding_levels, 
+GO(pango_log2vis_get_embedding_levels, pFpip)
 //GO(pango_lookup_aliases, 
 //GO(pango_map_get_engine, 
 //GO(pango_map_get_engines, 
-//GO(pango_markup_parser_finish, 
+GO(pango_markup_parser_finish, iFppppp)
 GO(pango_markup_parser_new, pFu)
 GO(pango_matrix_concat, vFpp)
 GO(pango_matrix_copy, pFp)
@@ -341,34 +341,34 @@ GO(pango_matrix_transform_point, vFppp)
 GO(pango_matrix_transform_rectangle, vFpp)
 GO(pango_matrix_translate, vFpdd)
 //GO(pango_module_register, 
-//GO(pango_parse_enum, 
+GO(pango_parse_enum, iFLppip)
 GO(pango_parse_markup, iFpiupppp)
-//GO(pango_parse_stretch, 
-//GO(pango_parse_style, 
-//GO(pango_parse_variant, 
-//GO(pango_parse_weight, 
-//GO(pango_quantize_line_geometry, 
+GO(pango_parse_stretch, iFppi)
+GO(pango_parse_style, iFppi)
+GO(pango_parse_variant, iFppi)
+GO(pango_parse_weight, iFppi)
+GO(pango_quantize_line_geometry, vFpp)
 GO(pango_read_line, iFpp)
 //GO(pango_renderer_activate, 
-//GO(pango_renderer_deactivate, 
-//GO(pango_renderer_draw_error_underline, 
-//GO(pango_renderer_draw_glyph, 
-//GO(pango_renderer_draw_glyph_item, 
-//GO(pango_renderer_draw_glyphs, 
-//GO(pango_renderer_draw_layout, 
-//GO(pango_renderer_draw_layout_line, 
-//GO(pango_renderer_draw_rectangle, 
-//GO(pango_renderer_draw_trapezoid, 
-//GO(pango_renderer_get_color, 
-//GO(pango_renderer_get_layout, 
-//GO(pango_renderer_get_layout_line, 
-//GO(pango_renderer_get_matrix, 
-//GO(pango_renderer_get_type, 
-//GO(pango_renderer_part_changed, 
-//GO(pango_renderer_set_color, 
-//GO(pango_renderer_set_matrix, 
+GO(pango_renderer_deactivate, vFp)
+GO(pango_renderer_draw_error_underline, vFpiiii)
+GO(pango_renderer_draw_glyph, vFppudd)
+GO(pango_renderer_draw_glyph_item, vFpppii)
+GO(pango_renderer_draw_glyphs, vFpppii)
+GO(pango_renderer_draw_layout, vFppii)
+GO(pango_renderer_draw_layout_line, vFppii)
+GO(pango_renderer_draw_rectangle, vFpuiiii)
+GO(pango_renderer_draw_trapezoid, vFpudddddd)
+GO(pango_renderer_get_color, pFpu)
+GO(pango_renderer_get_layout, pFp)
+GO(pango_renderer_get_layout_line, pFp)
+GO(pango_renderer_get_matrix, pFp)
+GO(pango_renderer_get_type, LFv)
+GO(pango_renderer_part_changed, vFpu)
+GO(pango_renderer_set_color, vFpup)
+GO(pango_renderer_set_matrix, vFpp)
 //GO(pango_render_part_get_type, 
-//GO(pango_reorder_items, 
+GO(pango_reorder_items, pFp)
 GO(pango_scan_int, iFpp)
 GO(pango_scan_string, iFpp)
 GO(pango_scan_word, iFpp)
@@ -379,8 +379,8 @@ GO(pango_script_iter_free, vFp)
 GO(pango_script_iter_get_range, vFpppp)
 GO(pango_script_iter_new, pFpi)
 GO(pango_script_iter_next, iFp)
-//GO(pango_shape, 
-//GO(pango_shape_full, 
+GO(pango_shape, vFpipp)
+GO(pango_shape_full, vFpipipp)
 GO(pango_skip_space, iFp)
 GO(pango_split_file_list, pFp)
 GO(pango_stretch_get_type, iFv)
@@ -396,10 +396,10 @@ GO(pango_tab_array_get_type, iFv)
 GO(pango_tab_array_new, pFii)
 GO(pango_tab_array_new_with_positions, pFiiiippppppppppppppp) //vaarg
 GO(pango_tab_array_resize, vFpi)
-GO(pango_tab_array_set_tab, vFpiii)
+GO(pango_tab_array_set_tab, vFpiui)
 GO(pango_trim_string, pFp)
 GO(pango_underline_get_type, iFv)
-GO(pango_unichar_direction, iFu)
+GO(pango_unichar_direction, uFu)
 GO(pango_units_from_double, iFd)
 GO(pango_units_to_double, dFi)
 GO(pango_variant_get_type, pFv)
diff --git a/src/wrapped/wrappedpangocairo_private.h b/src/wrapped/wrappedpangocairo_private.h
index 946e195f..a39d0b9c 100755
--- a/src/wrapped/wrappedpangocairo_private.h
+++ b/src/wrapped/wrappedpangocairo_private.h
@@ -14,14 +14,14 @@ GO(pango_cairo_error_underline_path, vFpdddd)
 GO(pango_cairo_fc_font_get_type, iFv)
 GO(pango_cairo_fc_font_map_get_type, iFv)
 GO(pango_cairo_font_get_scaled_font, pFp)
-GO(pango_cairo_font_get_type, iFv)
+GO(pango_cairo_font_get_type, LFv)
 GO(pango_cairo_font_map_create_context, pFp)
 GO(pango_cairo_font_map_get_default, pFv)
-GO(pango_cairo_font_map_get_font_type, iFp)
+GO(pango_cairo_font_map_get_font_type, uFp)
 GO(pango_cairo_font_map_get_resolution, dFp)
 GO(pango_cairo_font_map_get_type, iFv)
 GO(pango_cairo_font_map_new, pFv)
-GO(pango_cairo_font_map_new_for_font_type, pFi)
+GO(pango_cairo_font_map_new_for_font_type, pFu)
 GO(pango_cairo_font_map_set_default, vFp)
 GO(pango_cairo_font_map_set_resolution, vFpd)
 GO(pango_cairo_glyph_string_path, vFppp)
diff --git a/src/wrapped/wrappedpangoft2_private.h b/src/wrapped/wrappedpangoft2_private.h
index 03f7b30d..0d12f7ff 100755
--- a/src/wrapped/wrappedpangoft2_private.h
+++ b/src/wrapped/wrappedpangoft2_private.h
@@ -39,7 +39,7 @@ GO(pango_ft2_font_get_kerning, iFpuu)
 GO(pango_ft2_font_get_type, iFv)
 GO(pango_ft2_font_map_create_context, pFp)
 GO(pango_ft2_font_map_for_display, pFv)
-GO(pango_ft2_font_map_get_type, iFv)
+GO(pango_ft2_font_map_get_type, LFv)
 GO(pango_ft2_font_map_new, pFv)
 //GOM(pango_ft2_font_map_set_default_substitute, vFEpBpB)
 GO(pango_ft2_font_map_set_resolution, vFpdd)