about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/wrapped/generated/functions_list.txt21
-rw-r--r--src/wrapped/generated/wrapper.c62
-rw-r--r--src/wrapped/generated/wrapper.h21
-rwxr-xr-xsrc/wrapped/wrappedsdl2_private.h174
-rwxr-xr-xsrc/wrapped/wrappedsdl2image_private.h8
-rwxr-xr-xsrc/wrapped/wrappedsdl2mixer_private.h14
-rwxr-xr-xsrc/wrapped/wrappedsdl2net_private.h2
-rwxr-xr-xsrc/wrapped/wrappedsdl2ttf_private.h12
8 files changed, 145 insertions, 169 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 2e98bfb8..fefb3307 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -171,7 +171,6 @@
 #() iFiL
 #() iFip
 #() iFiS
-#() iFIi
 #() iFui
 #() iFuu
 #() iFuL
@@ -238,14 +237,12 @@
 #() fFfi
 #() fFff
 #() fFfD
-#() fFfl
 #() fFfp
 #() fFpp
 #() dFid
 #() dFdi
 #() dFdd
 #() dFdD
-#() dFdl
 #() dFdp
 #() dFll
 #() dFpi
@@ -288,7 +285,7 @@
 #() pFUU
 #() pFdi
 #() pFdd
-#() pFlp
+#() pFli
 #() pFLi
 #() pFLC
 #() pFLu
@@ -460,6 +457,7 @@
 #() iFuLL
 #() iFuLp
 #() iFupi
+#() iFupu
 #() iFupL
 #() iFupp
 #() iFfff
@@ -620,7 +618,6 @@
 #() pFipi
 #() pFipL
 #() pFipp
-#() pFIpi
 #() pFCuW
 #() pFWWW
 #() pFuip
@@ -633,7 +630,6 @@
 #() pFupl
 #() pFupL
 #() pFupp
-#() pFUpi
 #() pFdip
 #() pFdUU
 #() pFddd
@@ -883,7 +879,6 @@
 #() iFiipp
 #() iFiWii
 #() iFiuwp
-#() iFiuii
 #() iFiuup
 #() iFiupp
 #() iFilli
@@ -1413,6 +1408,7 @@
 #() iFpiipp
 #() iFpiIip
 #() iFpiuwp
+#() iFpiuuu
 #() iFpiUUU
 #() iFpipii
 #() iFpipiu
@@ -1772,11 +1768,10 @@
 #() iFEpuppp
 #() iFEpUppp
 #() iFEppppp
-#() iFiiiiii
 #() iFiiiiip
 #() iFiiiipp
 #() iFiiiuwp
-#() iFiuiipi
+#() iFiWiipi
 #() iFiLpppi
 #() iFipiipi
 #() iFipipip
@@ -1785,7 +1780,6 @@
 #() iFipuppp
 #() iFipppLp
 #() iFippppp
-#() iFuppppp
 #() iFdipppL
 #() iFDipppL
 #() iFlpippp
@@ -1863,7 +1857,9 @@
 #() uFEiuppp
 #() uFEpCppp
 #() uFEpuppp
+#() uFuuuuuu
 #() uFupuufp
+#() uFuppppp
 #() uFpiuppu
 #() uFpippup
 #() uFpWuipp
@@ -1906,8 +1902,8 @@
 #() pFEppApp
 #() pFiiiiii
 #() pFiiiiid
-#() pFiCiiCi
 #() pFipippp
+#() pFWCiWCi
 #() pFuuipip
 #() pFuuuuii
 #() pFuuuuuu
@@ -2090,7 +2086,6 @@
 #() iFpWppppp
 #() iFpuiCuCp
 #() iFpuiuupp
-#() iFpuuiuui
 #() iFpupiLpL
 #() iFpupuuui
 #() iFpupupui
@@ -2128,7 +2123,7 @@
 #() iFppppiii
 #() iFppppilp
 #() iFppppipp
-#() iFppppdpi
+#() iFppppdpu
 #() iFpppppip
 #() iFpppppup
 #() iFpppppLp
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 48a00eb9..4f51b0bf 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -207,7 +207,6 @@ typedef int32_t (*iFil_t)(int32_t, intptr_t);
 typedef int32_t (*iFiL_t)(int32_t, uintptr_t);
 typedef int32_t (*iFip_t)(int32_t, void*);
 typedef int32_t (*iFiS_t)(int32_t, void*);
-typedef int32_t (*iFIi_t)(int64_t, int32_t);
 typedef int32_t (*iFui_t)(uint32_t, int32_t);
 typedef int32_t (*iFuu_t)(uint32_t, uint32_t);
 typedef int32_t (*iFuL_t)(uint32_t, uintptr_t);
@@ -274,14 +273,12 @@ typedef float (*fFif_t)(int32_t, float);
 typedef float (*fFfi_t)(float, int32_t);
 typedef float (*fFff_t)(float, float);
 typedef float (*fFfD_t)(float, long double);
-typedef float (*fFfl_t)(float, intptr_t);
 typedef float (*fFfp_t)(float, void*);
 typedef float (*fFpp_t)(void*, void*);
 typedef double (*dFid_t)(int32_t, double);
 typedef double (*dFdi_t)(double, int32_t);
 typedef double (*dFdd_t)(double, double);
 typedef double (*dFdD_t)(double, long double);
-typedef double (*dFdl_t)(double, intptr_t);
 typedef double (*dFdp_t)(double, void*);
 typedef double (*dFll_t)(intptr_t, intptr_t);
 typedef double (*dFpi_t)(void*, int32_t);
@@ -324,7 +321,7 @@ typedef void* (*pFup_t)(uint32_t, void*);
 typedef void* (*pFUU_t)(uint64_t, uint64_t);
 typedef void* (*pFdi_t)(double, int32_t);
 typedef void* (*pFdd_t)(double, double);
-typedef void* (*pFlp_t)(intptr_t, void*);
+typedef void* (*pFli_t)(intptr_t, int32_t);
 typedef void* (*pFLi_t)(uintptr_t, int32_t);
 typedef void* (*pFLC_t)(uintptr_t, uint8_t);
 typedef void* (*pFLu_t)(uintptr_t, uint32_t);
@@ -496,6 +493,7 @@ typedef int32_t (*iFuup_t)(uint32_t, uint32_t, void*);
 typedef int32_t (*iFuLL_t)(uint32_t, uintptr_t, uintptr_t);
 typedef int32_t (*iFuLp_t)(uint32_t, uintptr_t, void*);
 typedef int32_t (*iFupi_t)(uint32_t, void*, int32_t);
+typedef int32_t (*iFupu_t)(uint32_t, void*, uint32_t);
 typedef int32_t (*iFupL_t)(uint32_t, void*, uintptr_t);
 typedef int32_t (*iFupp_t)(uint32_t, void*, void*);
 typedef int32_t (*iFfff_t)(float, float, float);
@@ -656,7 +654,6 @@ typedef void* (*pFiLL_t)(int32_t, uintptr_t, uintptr_t);
 typedef void* (*pFipi_t)(int32_t, void*, int32_t);
 typedef void* (*pFipL_t)(int32_t, void*, uintptr_t);
 typedef void* (*pFipp_t)(int32_t, void*, void*);
-typedef void* (*pFIpi_t)(int64_t, void*, int32_t);
 typedef void* (*pFCuW_t)(uint8_t, uint32_t, uint16_t);
 typedef void* (*pFWWW_t)(uint16_t, uint16_t, uint16_t);
 typedef void* (*pFuip_t)(uint32_t, int32_t, void*);
@@ -669,7 +666,6 @@ typedef void* (*pFupi_t)(uint32_t, void*, int32_t);
 typedef void* (*pFupl_t)(uint32_t, void*, intptr_t);
 typedef void* (*pFupL_t)(uint32_t, void*, uintptr_t);
 typedef void* (*pFupp_t)(uint32_t, void*, void*);
-typedef void* (*pFUpi_t)(uint64_t, void*, int32_t);
 typedef void* (*pFdip_t)(double, int32_t, void*);
 typedef void* (*pFdUU_t)(double, uint64_t, uint64_t);
 typedef void* (*pFddd_t)(double, double, double);
@@ -919,7 +915,6 @@ typedef int32_t (*iFiipi_t)(int32_t, int32_t, void*, int32_t);
 typedef int32_t (*iFiipp_t)(int32_t, int32_t, void*, void*);
 typedef int32_t (*iFiWii_t)(int32_t, uint16_t, int32_t, int32_t);
 typedef int32_t (*iFiuwp_t)(int32_t, uint32_t, int16_t, void*);
-typedef int32_t (*iFiuii_t)(int32_t, uint32_t, int32_t, int32_t);
 typedef int32_t (*iFiuup_t)(int32_t, uint32_t, uint32_t, void*);
 typedef int32_t (*iFiupp_t)(int32_t, uint32_t, void*, void*);
 typedef int32_t (*iFilli_t)(int32_t, intptr_t, intptr_t, int32_t);
@@ -1449,6 +1444,7 @@ typedef int32_t (*iFpiipi_t)(void*, int32_t, int32_t, void*, int32_t);
 typedef int32_t (*iFpiipp_t)(void*, int32_t, int32_t, void*, void*);
 typedef int32_t (*iFpiIip_t)(void*, int32_t, int64_t, int32_t, void*);
 typedef int32_t (*iFpiuwp_t)(void*, int32_t, uint32_t, int16_t, void*);
+typedef int32_t (*iFpiuuu_t)(void*, int32_t, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFpiUUU_t)(void*, int32_t, uint64_t, uint64_t, uint64_t);
 typedef int32_t (*iFpipii_t)(void*, int32_t, void*, int32_t, int32_t);
 typedef int32_t (*iFpipiu_t)(void*, int32_t, void*, int32_t, uint32_t);
@@ -1808,11 +1804,10 @@ typedef int32_t (*iFEpIppp_t)(x64emu_t*, void*, int64_t, void*, void*, void*);
 typedef int32_t (*iFEpuppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*);
 typedef int32_t (*iFEpUppp_t)(x64emu_t*, void*, uint64_t, void*, void*, void*);
 typedef int32_t (*iFEppppp_t)(x64emu_t*, void*, void*, void*, void*, void*);
-typedef int32_t (*iFiiiiii_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef int32_t (*iFiiiiip_t)(int32_t, int32_t, int32_t, int32_t, int32_t, void*);
 typedef int32_t (*iFiiiipp_t)(int32_t, int32_t, int32_t, int32_t, void*, void*);
 typedef int32_t (*iFiiiuwp_t)(int32_t, int32_t, int32_t, uint32_t, int16_t, void*);
-typedef int32_t (*iFiuiipi_t)(int32_t, uint32_t, int32_t, int32_t, void*, int32_t);
+typedef int32_t (*iFiWiipi_t)(int32_t, uint16_t, int32_t, int32_t, void*, int32_t);
 typedef int32_t (*iFiLpppi_t)(int32_t, uintptr_t, void*, void*, void*, int32_t);
 typedef int32_t (*iFipiipi_t)(int32_t, void*, int32_t, int32_t, void*, int32_t);
 typedef int32_t (*iFipipip_t)(int32_t, void*, int32_t, void*, int32_t, void*);
@@ -1821,7 +1816,6 @@ typedef int32_t (*iFipupup_t)(int32_t, void*, uint32_t, void*, uint32_t, void*);
 typedef int32_t (*iFipuppp_t)(int32_t, void*, uint32_t, void*, void*, void*);
 typedef int32_t (*iFipppLp_t)(int32_t, void*, void*, void*, uintptr_t, void*);
 typedef int32_t (*iFippppp_t)(int32_t, void*, void*, void*, void*, void*);
-typedef int32_t (*iFuppppp_t)(uint32_t, void*, void*, void*, void*, void*);
 typedef int32_t (*iFdipppL_t)(double, int32_t, void*, void*, void*, uintptr_t);
 typedef int32_t (*iFDipppL_t)(long double, int32_t, void*, void*, void*, uintptr_t);
 typedef int32_t (*iFlpippp_t)(intptr_t, void*, int32_t, void*, void*, void*);
@@ -1899,7 +1893,9 @@ typedef uint32_t (*uFEiippp_t)(x64emu_t*, int32_t, int32_t, void*, void*, void*)
 typedef uint32_t (*uFEiuppp_t)(x64emu_t*, int32_t, uint32_t, void*, void*, void*);
 typedef uint32_t (*uFEpCppp_t)(x64emu_t*, void*, uint8_t, void*, void*, void*);
 typedef uint32_t (*uFEpuppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*);
+typedef uint32_t (*uFuuuuuu_t)(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef uint32_t (*uFupuufp_t)(uint32_t, void*, uint32_t, uint32_t, float, void*);
+typedef uint32_t (*uFuppppp_t)(uint32_t, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFpiuppu_t)(void*, int32_t, uint32_t, void*, void*, uint32_t);
 typedef uint32_t (*uFpippup_t)(void*, int32_t, void*, void*, uint32_t, void*);
 typedef uint32_t (*uFpWuipp_t)(void*, uint16_t, uint32_t, int32_t, void*, void*);
@@ -1942,8 +1938,8 @@ typedef void* (*pFEppppV_t)(x64emu_t*, void*, void*, void*, void*, void*);
 typedef void* (*pFEppApp_t)(x64emu_t*, void*, void*, void*, void*, void*);
 typedef void* (*pFiiiiii_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void* (*pFiiiiid_t)(int32_t, int32_t, int32_t, int32_t, int32_t, double);
-typedef void* (*pFiCiiCi_t)(int32_t, uint8_t, int32_t, int32_t, uint8_t, int32_t);
 typedef void* (*pFipippp_t)(int32_t, void*, int32_t, void*, void*, void*);
+typedef void* (*pFWCiWCi_t)(uint16_t, uint8_t, int32_t, uint16_t, uint8_t, int32_t);
 typedef void* (*pFuuipip_t)(uint32_t, uint32_t, int32_t, void*, int32_t, void*);
 typedef void* (*pFuuuuii_t)(uint32_t, uint32_t, uint32_t, uint32_t, int32_t, int32_t);
 typedef void* (*pFuuuuuu_t)(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
@@ -2126,7 +2122,6 @@ typedef int32_t (*iFpWppppW_t)(void*, uint16_t, void*, void*, void*, void*, uint
 typedef int32_t (*iFpWppppp_t)(void*, uint16_t, void*, void*, void*, void*, void*);
 typedef int32_t (*iFpuiCuCp_t)(void*, uint32_t, int32_t, uint8_t, uint32_t, uint8_t, void*);
 typedef int32_t (*iFpuiuupp_t)(void*, uint32_t, int32_t, uint32_t, uint32_t, void*, void*);
-typedef int32_t (*iFpuuiuui_t)(void*, uint32_t, uint32_t, int32_t, uint32_t, uint32_t, int32_t);
 typedef int32_t (*iFpupiLpL_t)(void*, uint32_t, void*, int32_t, uintptr_t, void*, uintptr_t);
 typedef int32_t (*iFpupuuui_t)(void*, uint32_t, void*, uint32_t, uint32_t, uint32_t, int32_t);
 typedef int32_t (*iFpupupui_t)(void*, uint32_t, void*, uint32_t, void*, uint32_t, int32_t);
@@ -2164,7 +2159,7 @@ typedef int32_t (*iFpppuiii_t)(void*, void*, void*, uint32_t, int32_t, int32_t,
 typedef int32_t (*iFppppiii_t)(void*, void*, void*, void*, int32_t, int32_t, int32_t);
 typedef int32_t (*iFppppilp_t)(void*, void*, void*, void*, int32_t, intptr_t, void*);
 typedef int32_t (*iFppppipp_t)(void*, void*, void*, void*, int32_t, void*, void*);
-typedef int32_t (*iFppppdpi_t)(void*, void*, void*, void*, double, void*, int32_t);
+typedef int32_t (*iFppppdpu_t)(void*, void*, void*, void*, double, void*, uint32_t);
 typedef int32_t (*iFpppppip_t)(void*, void*, void*, void*, void*, int32_t, void*);
 typedef int32_t (*iFpppppup_t)(void*, void*, void*, void*, void*, uint32_t, void*);
 typedef int32_t (*iFpppppLp_t)(void*, void*, void*, void*, void*, uintptr_t, void*);
@@ -2905,7 +2900,6 @@ void iFil(x64emu_t *emu, uintptr_t fcn) { iFil_t fn = (iFil_t)fcn; R_RAX=(int32_
 void iFiL(x64emu_t *emu, uintptr_t fcn) { iFiL_t fn = (iFiL_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uintptr_t)R_RSI); }
 void iFip(x64emu_t *emu, uintptr_t fcn) { iFip_t fn = (iFip_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI); }
 void iFiS(x64emu_t *emu, uintptr_t fcn) { iFiS_t fn = (iFiS_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, io_convert((void*)R_RSI)); }
-void iFIi(x64emu_t *emu, uintptr_t fcn) { iFIi_t fn = (iFIi_t)fcn; R_RAX=(int32_t)fn((int64_t)R_RDI, (int32_t)R_RSI); }
 void iFui(x64emu_t *emu, uintptr_t fcn) { iFui_t fn = (iFui_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI); }
 void iFuu(x64emu_t *emu, uintptr_t fcn) { iFuu_t fn = (iFuu_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI); }
 void iFuL(x64emu_t *emu, uintptr_t fcn) { iFuL_t fn = (iFuL_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (uintptr_t)R_RSI); }
@@ -2972,14 +2966,12 @@ void fFif(x64emu_t *emu, uintptr_t fcn) { fFif_t fn = (fFif_t)fcn; emu->xmm[0].f
 void fFfi(x64emu_t *emu, uintptr_t fcn) { fFfi_t fn = (fFfi_t)fcn; emu->xmm[0].f[0]=fn(emu->xmm[0].f[0], (int32_t)R_RDI); }
 void fFff(x64emu_t *emu, uintptr_t fcn) { fFff_t fn = (fFff_t)fcn; emu->xmm[0].f[0]=fn(emu->xmm[0].f[0], emu->xmm[1].f[0]); }
 void fFfD(x64emu_t *emu, uintptr_t fcn) { fFfD_t fn = (fFfD_t)fcn; emu->xmm[0].f[0]=fn(emu->xmm[0].f[0], LD2localLD((void*)(R_RSP + 8))); }
-void fFfl(x64emu_t *emu, uintptr_t fcn) { fFfl_t fn = (fFfl_t)fcn; emu->xmm[0].f[0]=fn(emu->xmm[0].f[0], (intptr_t)R_RDI); }
 void fFfp(x64emu_t *emu, uintptr_t fcn) { fFfp_t fn = (fFfp_t)fcn; emu->xmm[0].f[0]=fn(emu->xmm[0].f[0], (void*)R_RDI); }
 void fFpp(x64emu_t *emu, uintptr_t fcn) { fFpp_t fn = (fFpp_t)fcn; emu->xmm[0].f[0]=fn((void*)R_RDI, (void*)R_RSI); }
 void dFid(x64emu_t *emu, uintptr_t fcn) { dFid_t fn = (dFid_t)fcn; emu->xmm[0].d[0]=fn((int32_t)R_RDI, emu->xmm[0].d[0]); }
 void dFdi(x64emu_t *emu, uintptr_t fcn) { dFdi_t fn = (dFdi_t)fcn; emu->xmm[0].d[0]=fn(emu->xmm[0].d[0], (int32_t)R_RDI); }
 void dFdd(x64emu_t *emu, uintptr_t fcn) { dFdd_t fn = (dFdd_t)fcn; emu->xmm[0].d[0]=fn(emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void dFdD(x64emu_t *emu, uintptr_t fcn) { dFdD_t fn = (dFdD_t)fcn; emu->xmm[0].d[0]=fn(emu->xmm[0].d[0], LD2localLD((void*)(R_RSP + 8))); }
-void dFdl(x64emu_t *emu, uintptr_t fcn) { dFdl_t fn = (dFdl_t)fcn; emu->xmm[0].d[0]=fn(emu->xmm[0].d[0], (intptr_t)R_RDI); }
 void dFdp(x64emu_t *emu, uintptr_t fcn) { dFdp_t fn = (dFdp_t)fcn; emu->xmm[0].d[0]=fn(emu->xmm[0].d[0], (void*)R_RDI); }
 void dFll(x64emu_t *emu, uintptr_t fcn) { dFll_t fn = (dFll_t)fcn; emu->xmm[0].d[0]=fn((intptr_t)R_RDI, (intptr_t)R_RSI); }
 void dFpi(x64emu_t *emu, uintptr_t fcn) { dFpi_t fn = (dFpi_t)fcn; emu->xmm[0].d[0]=fn((void*)R_RDI, (int32_t)R_RSI); }
@@ -3022,7 +3014,7 @@ void pFup(x64emu_t *emu, uintptr_t fcn) { pFup_t fn = (pFup_t)fcn; R_RAX=(uintpt
 void pFUU(x64emu_t *emu, uintptr_t fcn) { pFUU_t fn = (pFUU_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI); }
 void pFdi(x64emu_t *emu, uintptr_t fcn) { pFdi_t fn = (pFdi_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (int32_t)R_RDI); }
 void pFdd(x64emu_t *emu, uintptr_t fcn) { pFdd_t fn = (pFdd_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], emu->xmm[1].d[0]); }
-void pFlp(x64emu_t *emu, uintptr_t fcn) { pFlp_t fn = (pFlp_t)fcn; R_RAX=(uintptr_t)fn((intptr_t)R_RDI, (void*)R_RSI); }
+void pFli(x64emu_t *emu, uintptr_t fcn) { pFli_t fn = (pFli_t)fcn; R_RAX=(uintptr_t)fn((intptr_t)R_RDI, (int32_t)R_RSI); }
 void pFLi(x64emu_t *emu, uintptr_t fcn) { pFLi_t fn = (pFLi_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (int32_t)R_RSI); }
 void pFLC(x64emu_t *emu, uintptr_t fcn) { pFLC_t fn = (pFLC_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uint8_t)R_RSI); }
 void pFLu(x64emu_t *emu, uintptr_t fcn) { pFLu_t fn = (pFLu_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uint32_t)R_RSI); }
@@ -3194,6 +3186,7 @@ void iFuup(x64emu_t *emu, uintptr_t fcn) { iFuup_t fn = (iFuup_t)fcn; R_RAX=(int
 void iFuLL(x64emu_t *emu, uintptr_t fcn) { iFuLL_t fn = (iFuLL_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX); }
 void iFuLp(x64emu_t *emu, uintptr_t fcn) { iFuLp_t fn = (iFuLp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void iFupi(x64emu_t *emu, uintptr_t fcn) { iFupi_t fn = (iFupi_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
+void iFupu(x64emu_t *emu, uintptr_t fcn) { iFupu_t fn = (iFupu_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX); }
 void iFupL(x64emu_t *emu, uintptr_t fcn) { iFupL_t fn = (iFupL_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void iFupp(x64emu_t *emu, uintptr_t fcn) { iFupp_t fn = (iFupp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void iFfff(x64emu_t *emu, uintptr_t fcn) { iFfff_t fn = (iFfff_t)fcn; R_RAX=(int32_t)fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
@@ -3354,7 +3347,6 @@ void pFiLL(x64emu_t *emu, uintptr_t fcn) { pFiLL_t fn = (pFiLL_t)fcn; R_RAX=(uin
 void pFipi(x64emu_t *emu, uintptr_t fcn) { pFipi_t fn = (pFipi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
 void pFipL(x64emu_t *emu, uintptr_t fcn) { pFipL_t fn = (pFipL_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void pFipp(x64emu_t *emu, uintptr_t fcn) { pFipp_t fn = (pFipp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
-void pFIpi(x64emu_t *emu, uintptr_t fcn) { pFIpi_t fn = (pFIpi_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
 void pFCuW(x64emu_t *emu, uintptr_t fcn) { pFCuW_t fn = (pFCuW_t)fcn; R_RAX=(uintptr_t)fn((uint8_t)R_RDI, (uint32_t)R_RSI, (uint16_t)R_RDX); }
 void pFWWW(x64emu_t *emu, uintptr_t fcn) { pFWWW_t fn = (pFWWW_t)fcn; R_RAX=(uintptr_t)fn((uint16_t)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX); }
 void pFuip(x64emu_t *emu, uintptr_t fcn) { pFuip_t fn = (pFuip_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
@@ -3367,7 +3359,6 @@ void pFupi(x64emu_t *emu, uintptr_t fcn) { pFupi_t fn = (pFupi_t)fcn; R_RAX=(uin
 void pFupl(x64emu_t *emu, uintptr_t fcn) { pFupl_t fn = (pFupl_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (intptr_t)R_RDX); }
 void pFupL(x64emu_t *emu, uintptr_t fcn) { pFupL_t fn = (pFupL_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void pFupp(x64emu_t *emu, uintptr_t fcn) { pFupp_t fn = (pFupp_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
-void pFUpi(x64emu_t *emu, uintptr_t fcn) { pFUpi_t fn = (pFUpi_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
 void pFdip(x64emu_t *emu, uintptr_t fcn) { pFdip_t fn = (pFdip_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (int32_t)R_RDI, (void*)R_RSI); }
 void pFdUU(x64emu_t *emu, uintptr_t fcn) { pFdUU_t fn = (pFdUU_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (uint64_t)R_RDI, (uint64_t)R_RSI); }
 void pFddd(x64emu_t *emu, uintptr_t fcn) { pFddd_t fn = (pFddd_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0]); }
@@ -3617,7 +3608,6 @@ void iFiipi(x64emu_t *emu, uintptr_t fcn) { iFiipi_t fn = (iFiipi_t)fcn; R_RAX=(
 void iFiipp(x64emu_t *emu, uintptr_t fcn) { iFiipp_t fn = (iFiipp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFiWii(x64emu_t *emu, uintptr_t fcn) { iFiWii_t fn = (iFiWii_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint16_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void iFiuwp(x64emu_t *emu, uintptr_t fcn) { iFiuwp_t fn = (iFiuwp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (int16_t)R_RDX, (void*)R_RCX); }
-void iFiuii(x64emu_t *emu, uintptr_t fcn) { iFiuii_t fn = (iFiuii_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void iFiuup(x64emu_t *emu, uintptr_t fcn) { iFiuup_t fn = (iFiuup_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void iFiupp(x64emu_t *emu, uintptr_t fcn) { iFiupp_t fn = (iFiupp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFilli(x64emu_t *emu, uintptr_t fcn) { iFilli_t fn = (iFilli_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX); }
@@ -4147,6 +4137,7 @@ void iFpiipi(x64emu_t *emu, uintptr_t fcn) { iFpiipi_t fn = (iFpiipi_t)fcn; R_RA
 void iFpiipp(x64emu_t *emu, uintptr_t fcn) { iFpiipp_t fn = (iFpiipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpiIip(x64emu_t *emu, uintptr_t fcn) { iFpiIip_t fn = (iFpiIip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int64_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void iFpiuwp(x64emu_t *emu, uintptr_t fcn) { iFpiuwp_t fn = (iFpiuwp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (int16_t)R_RCX, (void*)R_R8); }
+void iFpiuuu(x64emu_t *emu, uintptr_t fcn) { iFpiuuu_t fn = (iFpiuuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void iFpiUUU(x64emu_t *emu, uintptr_t fcn) { iFpiUUU_t fn = (iFpiUUU_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8); }
 void iFpipii(x64emu_t *emu, uintptr_t fcn) { iFpipii_t fn = (iFpipii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void iFpipiu(x64emu_t *emu, uintptr_t fcn) { iFpipiu_t fn = (iFpipiu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); }
@@ -4506,11 +4497,10 @@ void iFEpIppp(x64emu_t *emu, uintptr_t fcn) { iFEpIppp_t fn = (iFEpIppp_t)fcn; R
 void iFEpuppp(x64emu_t *emu, uintptr_t fcn) { iFEpuppp_t fn = (iFEpuppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFEpUppp(x64emu_t *emu, uintptr_t fcn) { iFEpUppp_t fn = (iFEpUppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFEppppp(x64emu_t *emu, uintptr_t fcn) { iFEppppp_t fn = (iFEppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
-void iFiiiiii(x64emu_t *emu, uintptr_t fcn) { iFiiiiii_t fn = (iFiiiiii_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void iFiiiiip(x64emu_t *emu, uintptr_t fcn) { iFiiiiip_t fn = (iFiiiiip_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9); }
 void iFiiiipp(x64emu_t *emu, uintptr_t fcn) { iFiiiipp_t fn = (iFiiiipp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFiiiuwp(x64emu_t *emu, uintptr_t fcn) { iFiiiuwp_t fn = (iFiiiuwp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (int16_t)R_R8, (void*)R_R9); }
-void iFiuiipi(x64emu_t *emu, uintptr_t fcn) { iFiuiipi_t fn = (iFiuiipi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9); }
+void iFiWiipi(x64emu_t *emu, uintptr_t fcn) { iFiWiipi_t fn = (iFiWiipi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint16_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void iFiLpppi(x64emu_t *emu, uintptr_t fcn) { iFiLpppi_t fn = (iFiLpppi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void iFipiipi(x64emu_t *emu, uintptr_t fcn) { iFipiipi_t fn = (iFipiipi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void iFipipip(x64emu_t *emu, uintptr_t fcn) { iFipipip_t fn = (iFipipip_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9); }
@@ -4519,7 +4509,6 @@ void iFipupup(x64emu_t *emu, uintptr_t fcn) { iFipupup_t fn = (iFipupup_t)fcn; R
 void iFipuppp(x64emu_t *emu, uintptr_t fcn) { iFipuppp_t fn = (iFipuppp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFipppLp(x64emu_t *emu, uintptr_t fcn) { iFipppLp_t fn = (iFipppLp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9); }
 void iFippppp(x64emu_t *emu, uintptr_t fcn) { iFippppp_t fn = (iFippppp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
-void iFuppppp(x64emu_t *emu, uintptr_t fcn) { iFuppppp_t fn = (iFuppppp_t)fcn; R_RAX=(int32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFdipppL(x64emu_t *emu, uintptr_t fcn) { iFdipppL_t fn = (iFdipppL_t)fcn; R_RAX=(int32_t)fn(emu->xmm[0].d[0], (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void iFDipppL(x64emu_t *emu, uintptr_t fcn) { iFDipppL_t fn = (iFDipppL_t)fcn; R_RAX=(int32_t)fn(LD2localLD((void*)(R_RSP + 8)), (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void iFlpippp(x64emu_t *emu, uintptr_t fcn) { iFlpippp_t fn = (iFlpippp_t)fcn; R_RAX=(int32_t)fn((intptr_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -4597,7 +4586,9 @@ void uFEiippp(x64emu_t *emu, uintptr_t fcn) { uFEiippp_t fn = (uFEiippp_t)fcn; R
 void uFEiuppp(x64emu_t *emu, uintptr_t fcn) { uFEiuppp_t fn = (uFEiuppp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFEpCppp(x64emu_t *emu, uintptr_t fcn) { uFEpCppp_t fn = (uFEpCppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFEpuppp(x64emu_t *emu, uintptr_t fcn) { uFEpuppp_t fn = (uFEpuppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void uFuuuuuu(x64emu_t *emu, uintptr_t fcn) { uFuuuuuu_t fn = (uFuuuuuu_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void uFupuufp(x64emu_t *emu, uintptr_t fcn) { uFupuufp_t fn = (uFupuufp_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, emu->xmm[0].f[0], (void*)R_R8); }
+void uFuppppp(x64emu_t *emu, uintptr_t fcn) { uFuppppp_t fn = (uFuppppp_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFpiuppu(x64emu_t *emu, uintptr_t fcn) { uFpiuppu_t fn = (uFpiuppu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 void uFpippup(x64emu_t *emu, uintptr_t fcn) { uFpippup_t fn = (uFpippup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
 void uFpWuipp(x64emu_t *emu, uintptr_t fcn) { uFpWuipp_t fn = (uFpWuipp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -4640,8 +4631,8 @@ void pFEppppV(x64emu_t *emu, uintptr_t fcn) { pFEppppV_t fn = (pFEppppV_t)fcn; R
 void pFEppApp(x64emu_t *emu, uintptr_t fcn) { pFEppApp_t fn = (pFEppApp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFiiiiii(x64emu_t *emu, uintptr_t fcn) { pFiiiiii_t fn = (pFiiiiii_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void pFiiiiid(x64emu_t *emu, uintptr_t fcn) { pFiiiiid_t fn = (pFiiiiid_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, emu->xmm[0].d[0]); }
-void pFiCiiCi(x64emu_t *emu, uintptr_t fcn) { pFiCiiCi_t fn = (pFiCiiCi_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (uint8_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint8_t)R_R8, (int32_t)R_R9); }
 void pFipippp(x64emu_t *emu, uintptr_t fcn) { pFipippp_t fn = (pFipippp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
+void pFWCiWCi(x64emu_t *emu, uintptr_t fcn) { pFWCiWCi_t fn = (pFWCiWCi_t)fcn; R_RAX=(uintptr_t)fn((uint16_t)R_RDI, (uint8_t)R_RSI, (int32_t)R_RDX, (uint16_t)R_RCX, (uint8_t)R_R8, (int32_t)R_R9); }
 void pFuuipip(x64emu_t *emu, uintptr_t fcn) { pFuuipip_t fn = (pFuuipip_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9); }
 void pFuuuuii(x64emu_t *emu, uintptr_t fcn) { pFuuuuii_t fn = (pFuuuuii_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void pFuuuuuu(x64emu_t *emu, uintptr_t fcn) { pFuuuuuu_t fn = (pFuuuuuu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
@@ -4824,7 +4815,6 @@ void iFpWppppW(x64emu_t *emu, uintptr_t fcn) { iFpWppppW_t fn = (iFpWppppW_t)fcn
 void iFpWppppp(x64emu_t *emu, uintptr_t fcn) { iFpWppppp_t fn = (iFpWppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpuiCuCp(x64emu_t *emu, uintptr_t fcn) { iFpuiCuCp_t fn = (iFpuiCuCp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (uint8_t)R_RCX, (uint32_t)R_R8, (uint8_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpuiuupp(x64emu_t *emu, uintptr_t fcn) { iFpuiuupp_t fn = (iFpuiuupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
-void iFpuuiuui(x64emu_t *emu, uintptr_t fcn) { iFpuuiuui_t fn = (iFpuuiuui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFpupiLpL(x64emu_t *emu, uintptr_t fcn) { iFpupiLpL_t fn = (iFpupiLpL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8)); }
 void iFpupuuui(x64emu_t *emu, uintptr_t fcn) { iFpupuuui_t fn = (iFpupuuui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFpupupui(x64emu_t *emu, uintptr_t fcn) { iFpupupui_t fn = (iFpupupui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
@@ -4862,7 +4852,7 @@ void iFpppuiii(x64emu_t *emu, uintptr_t fcn) { iFpppuiii_t fn = (iFpppuiii_t)fcn
 void iFppppiii(x64emu_t *emu, uintptr_t fcn) { iFppppiii_t fn = (iFppppiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void iFppppilp(x64emu_t *emu, uintptr_t fcn) { iFppppilp_t fn = (iFppppilp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (intptr_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFppppipp(x64emu_t *emu, uintptr_t fcn) { iFppppipp_t fn = (iFppppipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
-void iFppppdpi(x64emu_t *emu, uintptr_t fcn) { iFppppdpi_t fn = (iFppppdpi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, emu->xmm[0].d[0], (void*)R_R8, (int32_t)R_R9); }
+void iFppppdpu(x64emu_t *emu, uintptr_t fcn) { iFppppdpu_t fn = (iFppppdpu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, emu->xmm[0].d[0], (void*)R_R8, (uint32_t)R_R9); }
 void iFpppppip(x64emu_t *emu, uintptr_t fcn) { iFpppppip_t fn = (iFpppppip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpppppup(x64emu_t *emu, uintptr_t fcn) { iFpppppup_t fn = (iFpppppup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpppppLp(x64emu_t *emu, uintptr_t fcn) { iFpppppLp_t fn = (iFpppppLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8)); }
@@ -5590,7 +5580,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFil) return 1;
 	if (fun == &iFiL) return 1;
 	if (fun == &iFip) return 1;
-	if (fun == &iFIi) return 1;
 	if (fun == &iFui) return 1;
 	if (fun == &iFuu) return 1;
 	if (fun == &iFuL) return 1;
@@ -5650,13 +5639,11 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &fFif) return -2;
 	if (fun == &fFfi) return -2;
 	if (fun == &fFff) return -3;
-	if (fun == &fFfl) return -2;
 	if (fun == &fFfp) return -2;
 	if (fun == &fFpp) return -1;
 	if (fun == &dFid) return -2;
 	if (fun == &dFdi) return -2;
 	if (fun == &dFdd) return -3;
-	if (fun == &dFdl) return -2;
 	if (fun == &dFdp) return -2;
 	if (fun == &dFll) return -1;
 	if (fun == &dFpi) return -1;
@@ -5690,7 +5677,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFUU) return 1;
 	if (fun == &pFdi) return 2;
 	if (fun == &pFdd) return 3;
-	if (fun == &pFlp) return 1;
+	if (fun == &pFli) return 1;
 	if (fun == &pFLi) return 1;
 	if (fun == &pFLC) return 1;
 	if (fun == &pFLu) return 1;
@@ -5828,6 +5815,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFuLL) return 1;
 	if (fun == &iFuLp) return 1;
 	if (fun == &iFupi) return 1;
+	if (fun == &iFupu) return 1;
 	if (fun == &iFupL) return 1;
 	if (fun == &iFupp) return 1;
 	if (fun == &iFfff) return 4;
@@ -5966,7 +5954,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFipi) return 1;
 	if (fun == &pFipL) return 1;
 	if (fun == &pFipp) return 1;
-	if (fun == &pFIpi) return 1;
 	if (fun == &pFCuW) return 1;
 	if (fun == &pFWWW) return 1;
 	if (fun == &pFuip) return 1;
@@ -5979,7 +5966,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFupl) return 1;
 	if (fun == &pFupL) return 1;
 	if (fun == &pFupp) return 1;
-	if (fun == &pFUpi) return 1;
 	if (fun == &pFdip) return 2;
 	if (fun == &pFdUU) return 2;
 	if (fun == &pFddd) return 4;
@@ -6176,7 +6162,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFiipp) return 1;
 	if (fun == &iFiWii) return 1;
 	if (fun == &iFiuwp) return 1;
-	if (fun == &iFiuii) return 1;
 	if (fun == &iFiuup) return 1;
 	if (fun == &iFiupp) return 1;
 	if (fun == &iFilli) return 1;
@@ -6624,6 +6609,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpiipp) return 1;
 	if (fun == &iFpiIip) return 1;
 	if (fun == &iFpiuwp) return 1;
+	if (fun == &iFpiuuu) return 1;
 	if (fun == &iFpiUUU) return 1;
 	if (fun == &iFpipii) return 1;
 	if (fun == &iFpipiu) return 1;
@@ -6924,11 +6910,10 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpppppL) return 1;
 	if (fun == &vFpppppp) return 1;
 	if (fun == &cFppLppi) return 1;
-	if (fun == &iFiiiiii) return 1;
 	if (fun == &iFiiiiip) return 1;
 	if (fun == &iFiiiipp) return 1;
 	if (fun == &iFiiiuwp) return 1;
-	if (fun == &iFiuiipi) return 1;
+	if (fun == &iFiWiipi) return 1;
 	if (fun == &iFiLpppi) return 1;
 	if (fun == &iFipiipi) return 1;
 	if (fun == &iFipipip) return 1;
@@ -6937,7 +6922,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFipuppp) return 1;
 	if (fun == &iFipppLp) return 1;
 	if (fun == &iFippppp) return 1;
-	if (fun == &iFuppppp) return 1;
 	if (fun == &iFdipppL) return 2;
 	if (fun == &iFlpippp) return 1;
 	if (fun == &iFLppipp) return 1;
@@ -7010,7 +6994,9 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpppppi) return 1;
 	if (fun == &iFpppppL) return 1;
 	if (fun == &iFpppppp) return 1;
+	if (fun == &uFuuuuuu) return 1;
 	if (fun == &uFupuufp) return 2;
+	if (fun == &uFuppppp) return 1;
 	if (fun == &uFpiuppu) return 1;
 	if (fun == &uFpippup) return 1;
 	if (fun == &uFpWuipp) return 1;
@@ -7036,8 +7022,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &LFpLLLLL) return 1;
 	if (fun == &pFiiiiii) return 1;
 	if (fun == &pFiiiiid) return 2;
-	if (fun == &pFiCiiCi) return 1;
 	if (fun == &pFipippp) return 1;
+	if (fun == &pFWCiWCi) return 1;
 	if (fun == &pFuuipip) return 1;
 	if (fun == &pFuuuuii) return 1;
 	if (fun == &pFuuuuuu) return 1;
@@ -7092,7 +7078,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpdddddd) return 7;
 	if (fun == &vFppddddi) return 5;
 	if (fun == &vFppddpii) return 3;
-	if (fun == &iFppppdpi) return 2;
+	if (fun == &iFppppdpu) return 2;
 	if (fun == &pFifffppp) return 4;
 	if (fun == &pFfiiiiid) return 3;
 	if (fun == &pFdiiiIiI) return 2;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index e8598e79..c61e03f1 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -208,7 +208,6 @@ void iFil(x64emu_t *emu, uintptr_t fnc);
 void iFiL(x64emu_t *emu, uintptr_t fnc);
 void iFip(x64emu_t *emu, uintptr_t fnc);
 void iFiS(x64emu_t *emu, uintptr_t fnc);
-void iFIi(x64emu_t *emu, uintptr_t fnc);
 void iFui(x64emu_t *emu, uintptr_t fnc);
 void iFuu(x64emu_t *emu, uintptr_t fnc);
 void iFuL(x64emu_t *emu, uintptr_t fnc);
@@ -275,14 +274,12 @@ void fFif(x64emu_t *emu, uintptr_t fnc);
 void fFfi(x64emu_t *emu, uintptr_t fnc);
 void fFff(x64emu_t *emu, uintptr_t fnc);
 void fFfD(x64emu_t *emu, uintptr_t fnc);
-void fFfl(x64emu_t *emu, uintptr_t fnc);
 void fFfp(x64emu_t *emu, uintptr_t fnc);
 void fFpp(x64emu_t *emu, uintptr_t fnc);
 void dFid(x64emu_t *emu, uintptr_t fnc);
 void dFdi(x64emu_t *emu, uintptr_t fnc);
 void dFdd(x64emu_t *emu, uintptr_t fnc);
 void dFdD(x64emu_t *emu, uintptr_t fnc);
-void dFdl(x64emu_t *emu, uintptr_t fnc);
 void dFdp(x64emu_t *emu, uintptr_t fnc);
 void dFll(x64emu_t *emu, uintptr_t fnc);
 void dFpi(x64emu_t *emu, uintptr_t fnc);
@@ -325,7 +322,7 @@ void pFup(x64emu_t *emu, uintptr_t fnc);
 void pFUU(x64emu_t *emu, uintptr_t fnc);
 void pFdi(x64emu_t *emu, uintptr_t fnc);
 void pFdd(x64emu_t *emu, uintptr_t fnc);
-void pFlp(x64emu_t *emu, uintptr_t fnc);
+void pFli(x64emu_t *emu, uintptr_t fnc);
 void pFLi(x64emu_t *emu, uintptr_t fnc);
 void pFLC(x64emu_t *emu, uintptr_t fnc);
 void pFLu(x64emu_t *emu, uintptr_t fnc);
@@ -497,6 +494,7 @@ void iFuup(x64emu_t *emu, uintptr_t fnc);
 void iFuLL(x64emu_t *emu, uintptr_t fnc);
 void iFuLp(x64emu_t *emu, uintptr_t fnc);
 void iFupi(x64emu_t *emu, uintptr_t fnc);
+void iFupu(x64emu_t *emu, uintptr_t fnc);
 void iFupL(x64emu_t *emu, uintptr_t fnc);
 void iFupp(x64emu_t *emu, uintptr_t fnc);
 void iFfff(x64emu_t *emu, uintptr_t fnc);
@@ -657,7 +655,6 @@ void pFiLL(x64emu_t *emu, uintptr_t fnc);
 void pFipi(x64emu_t *emu, uintptr_t fnc);
 void pFipL(x64emu_t *emu, uintptr_t fnc);
 void pFipp(x64emu_t *emu, uintptr_t fnc);
-void pFIpi(x64emu_t *emu, uintptr_t fnc);
 void pFCuW(x64emu_t *emu, uintptr_t fnc);
 void pFWWW(x64emu_t *emu, uintptr_t fnc);
 void pFuip(x64emu_t *emu, uintptr_t fnc);
@@ -670,7 +667,6 @@ void pFupi(x64emu_t *emu, uintptr_t fnc);
 void pFupl(x64emu_t *emu, uintptr_t fnc);
 void pFupL(x64emu_t *emu, uintptr_t fnc);
 void pFupp(x64emu_t *emu, uintptr_t fnc);
-void pFUpi(x64emu_t *emu, uintptr_t fnc);
 void pFdip(x64emu_t *emu, uintptr_t fnc);
 void pFdUU(x64emu_t *emu, uintptr_t fnc);
 void pFddd(x64emu_t *emu, uintptr_t fnc);
@@ -920,7 +916,6 @@ void iFiipi(x64emu_t *emu, uintptr_t fnc);
 void iFiipp(x64emu_t *emu, uintptr_t fnc);
 void iFiWii(x64emu_t *emu, uintptr_t fnc);
 void iFiuwp(x64emu_t *emu, uintptr_t fnc);
-void iFiuii(x64emu_t *emu, uintptr_t fnc);
 void iFiuup(x64emu_t *emu, uintptr_t fnc);
 void iFiupp(x64emu_t *emu, uintptr_t fnc);
 void iFilli(x64emu_t *emu, uintptr_t fnc);
@@ -1450,6 +1445,7 @@ void iFpiipi(x64emu_t *emu, uintptr_t fnc);
 void iFpiipp(x64emu_t *emu, uintptr_t fnc);
 void iFpiIip(x64emu_t *emu, uintptr_t fnc);
 void iFpiuwp(x64emu_t *emu, uintptr_t fnc);
+void iFpiuuu(x64emu_t *emu, uintptr_t fnc);
 void iFpiUUU(x64emu_t *emu, uintptr_t fnc);
 void iFpipii(x64emu_t *emu, uintptr_t fnc);
 void iFpipiu(x64emu_t *emu, uintptr_t fnc);
@@ -1809,11 +1805,10 @@ void iFEpIppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpuppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpUppp(x64emu_t *emu, uintptr_t fnc);
 void iFEppppp(x64emu_t *emu, uintptr_t fnc);
-void iFiiiiii(x64emu_t *emu, uintptr_t fnc);
 void iFiiiiip(x64emu_t *emu, uintptr_t fnc);
 void iFiiiipp(x64emu_t *emu, uintptr_t fnc);
 void iFiiiuwp(x64emu_t *emu, uintptr_t fnc);
-void iFiuiipi(x64emu_t *emu, uintptr_t fnc);
+void iFiWiipi(x64emu_t *emu, uintptr_t fnc);
 void iFiLpppi(x64emu_t *emu, uintptr_t fnc);
 void iFipiipi(x64emu_t *emu, uintptr_t fnc);
 void iFipipip(x64emu_t *emu, uintptr_t fnc);
@@ -1822,7 +1817,6 @@ void iFipupup(x64emu_t *emu, uintptr_t fnc);
 void iFipuppp(x64emu_t *emu, uintptr_t fnc);
 void iFipppLp(x64emu_t *emu, uintptr_t fnc);
 void iFippppp(x64emu_t *emu, uintptr_t fnc);
-void iFuppppp(x64emu_t *emu, uintptr_t fnc);
 void iFdipppL(x64emu_t *emu, uintptr_t fnc);
 void iFDipppL(x64emu_t *emu, uintptr_t fnc);
 void iFlpippp(x64emu_t *emu, uintptr_t fnc);
@@ -1900,7 +1894,9 @@ void uFEiippp(x64emu_t *emu, uintptr_t fnc);
 void uFEiuppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpCppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpuppp(x64emu_t *emu, uintptr_t fnc);
+void uFuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void uFupuufp(x64emu_t *emu, uintptr_t fnc);
+void uFuppppp(x64emu_t *emu, uintptr_t fnc);
 void uFpiuppu(x64emu_t *emu, uintptr_t fnc);
 void uFpippup(x64emu_t *emu, uintptr_t fnc);
 void uFpWuipp(x64emu_t *emu, uintptr_t fnc);
@@ -1943,8 +1939,8 @@ void pFEppppV(x64emu_t *emu, uintptr_t fnc);
 void pFEppApp(x64emu_t *emu, uintptr_t fnc);
 void pFiiiiii(x64emu_t *emu, uintptr_t fnc);
 void pFiiiiid(x64emu_t *emu, uintptr_t fnc);
-void pFiCiiCi(x64emu_t *emu, uintptr_t fnc);
 void pFipippp(x64emu_t *emu, uintptr_t fnc);
+void pFWCiWCi(x64emu_t *emu, uintptr_t fnc);
 void pFuuipip(x64emu_t *emu, uintptr_t fnc);
 void pFuuuuii(x64emu_t *emu, uintptr_t fnc);
 void pFuuuuuu(x64emu_t *emu, uintptr_t fnc);
@@ -2127,7 +2123,6 @@ void iFpWppppW(x64emu_t *emu, uintptr_t fnc);
 void iFpWppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuiCuCp(x64emu_t *emu, uintptr_t fnc);
 void iFpuiuupp(x64emu_t *emu, uintptr_t fnc);
-void iFpuuiuui(x64emu_t *emu, uintptr_t fnc);
 void iFpupiLpL(x64emu_t *emu, uintptr_t fnc);
 void iFpupuuui(x64emu_t *emu, uintptr_t fnc);
 void iFpupupui(x64emu_t *emu, uintptr_t fnc);
@@ -2165,7 +2160,7 @@ void iFpppuiii(x64emu_t *emu, uintptr_t fnc);
 void iFppppiii(x64emu_t *emu, uintptr_t fnc);
 void iFppppilp(x64emu_t *emu, uintptr_t fnc);
 void iFppppipp(x64emu_t *emu, uintptr_t fnc);
-void iFppppdpi(x64emu_t *emu, uintptr_t fnc);
+void iFppppdpu(x64emu_t *emu, uintptr_t fnc);
 void iFpppppip(x64emu_t *emu, uintptr_t fnc);
 void iFpppppup(x64emu_t *emu, uintptr_t fnc);
 void iFpppppLp(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedsdl2_private.h b/src/wrapped/wrappedsdl2_private.h
index 7670c4a5..6696fab3 100755
--- a/src/wrapped/wrappedsdl2_private.h
+++ b/src/wrapped/wrappedsdl2_private.h
@@ -24,14 +24,14 @@ GO(SDL_atanf, fFf)
 GO(SDL_atof, dFp)
 GO(SDL_atoi, iFp)
 GO(SDL_AtomicAdd, iFpi)
-GO(SDL_AtomicCAS, iFpii)
-GO(SDL_AtomicCASPtr, iFppp)
+GO(SDL_AtomicCAS, uFpii)
+GO(SDL_AtomicCASPtr, uFppp)
 GO(SDL_AtomicGet, iFp)
 GO(SDL_AtomicGetPtr, pFp)
 GO(SDL_AtomicLock, vFp)
 GO(SDL_AtomicSet, iFpi)
 GO(SDL_AtomicSetPtr, pFpp)
-GO(SDL_AtomicTryLock, iFp)
+GO(SDL_AtomicTryLock, uFp)
 GO(SDL_AtomicUnlock, vFp)
 GO(SDL_AudioInit, iFp)
 GO(SDL_AudioQuit, vFv)
@@ -40,18 +40,18 @@ GO(SDL_AudioStreamClear, vFp)
 GO(SDL_AudioStreamFlush, iFp)
 GO(SDL_AudioStreamGet, iFppi)
 GO(SDL_AudioStreamPut, iFppi)
-GO(SDL_BuildAudioCVT, iFpuuiuui)
+GO(SDL_BuildAudioCVT, iFpWCiWCi)
 GO(SDL_CalculateGammaRamp, vFfp)
-GO(SDL_calloc, pFuu)
-GO(SDL_CaptureMouse, iFi)
+GO(SDL_calloc, pFLL)
+GO(SDL_CaptureMouse, iFu)
 GO(SDL_ceil, dFd)
 GO(SDL_ceilf, fFf)
 GO(SDL_ClearError, vFv)
 GO(SDL_ClearHints, vFv)
 GO(SDL_ClearQueuedAudio, vFu)
 GO(SDL_CloseAudio, vFv)
-GO(SDL_CloseAudioDevice, vFi)
-GO(SDL_ComposeCustomBlendMode, iFiiiiii)
+GO(SDL_CloseAudioDevice, vFu)
+GO(SDL_ComposeCustomBlendMode, uFuuuuuu)
 GO(SDL_CondBroadcast, iFp)
 GO(SDL_CondSignal, iFp)
 GO(SDL_CondWait, iFpp)
@@ -99,8 +99,8 @@ GO(SDL_DisableScreenSaver, vFv)
 GO(SDL_DuplicateSurface, pFp)
 GOM(SDL_DYNAPI_entry, iFEupu)
 GO(SDL_EnableScreenSaver, vFv)
-GO(SDL_EnclosePoints, iFpipp)
-GO(SDL_Error, iFi)
+GO(SDL_EnclosePoints, uFpipp)
+GO(SDL_Error, iFu)
 GO(SDL_EventState, CFui)
 GO(SDL_exp, dFd)
 GO(SDL_expf, fFf)
@@ -130,12 +130,12 @@ GO(SDL_GameControllerEventState, iFi)
 GO(SDL_GameControllerFromInstanceID, pFi)
 GO(SDL_GameControllerFromPlayerIndex, pFi)
 GO(SDL_GameControllerGetAttached, iFp)
-GO(SDL_GameControllerGetAxis, iFpi)
-GO(SDL_GameControllerGetAxisFromString, uFp)
+GO(SDL_GameControllerGetAxis, wFpi)
+GO(SDL_GameControllerGetAxisFromString, iFp)
 GO(SDL_GameControllerGetBindForAxis, HFpi)
 GO(SDL_GameControllerGetBindForButton, HFpi)
-GO(SDL_GameControllerGetButton, uFpi)
-GO(SDL_GameControllerGetButtonFromString, uFp)
+GO(SDL_GameControllerGetButton, CFpi)
+GO(SDL_GameControllerGetButtonFromString, iFp)
 GO(SDL_GameControllerGetJoystick, pFp)
 GO(SDL_GameControllerGetNumTouchpads, iFp)
 GO(SDL_GameControllerGetNumTouchpadFingers, iFpi)
@@ -144,15 +144,15 @@ GO(SDL_GameControllerGetProduct, WFp)
 GO(SDL_GameControllerGetProductVersion, WFp)
 GO(SDL_GameControllerGetSensorData, iFpipi)
 GO(SDL_GameControllerGetSerial, pFp)
-GO(SDL_GameControllerGetStringForAxis, pFp)
-GO(SDL_GameControllerGetStringForButton, pFu)
+GO(SDL_GameControllerGetStringForAxis, pFi)
+GO(SDL_GameControllerGetStringForButton, pFi)
 GO(SDL_GameControllerGetTouchpadFinger, iFpiipppp)
-GO(SDL_GameControllerGetType, iFp)
+GO(SDL_GameControllerGetType, uFp)
 GO(SDL_GameControllerGetVendor, WFp)
-GO(SDL_GameControllerHasButton, iFpi)
+GO(SDL_GameControllerHasButton, uFpi)
 GO(SDL_GameControllerHasLED, iFp)
 GO(SDL_GameControllerHasSensor, iFpi)
-GO(SDL_GameControllerIsSensorEnabled, iFpi)
+GO(SDL_GameControllerIsSensorEnabled, uFpi)
 GO(SDL_GameControllerMapping, pFp)
 GO(SDL_GameControllerMappingForDeviceIndex, pFi)
 GO(SDL_GameControllerMappingForGUID, pFpp)
@@ -165,16 +165,16 @@ GO(SDL_GameControllerRumble, iFpWWu)
 GO(SDL_GameControllerRumbleTriggers, iFpWWu)
 GO(SDL_GameControllerSetLED, iFpCCC)
 GO(SDL_GameControllerSetPlayerIndex, vFpi)
-GO(SDL_GameControllerSetSensorEnabled, iFpii)
-GO(SDL_GameControllerTypeForIndex, iFi)
+GO(SDL_GameControllerSetSensorEnabled, iFpiu)
+GO(SDL_GameControllerTypeForIndex, uFi)
 GO(SDL_GameControllerUpdate, vFv)
 // SDL_GetAssertionHandler
 GO(SDL_GetAssertionReport, pFv)
 GO(SDL_GetAudioDeviceName, pFii)
-GO(SDL_GetAudioDeviceStatus, iFi)
+GO(SDL_GetAudioDeviceStatus, uFu)
 GO(SDL_GetAudioDriver, pFi)
 GO(SDL_GetAudioDeviceSpec, iFiip)
-GO(SDL_GetAudioStatus, iFv)
+GO(SDL_GetAudioStatus, uFv)
 GOM(SDL_GetBasePath, pFEv)
 GO(SDL_GetClipboardText, pFv)
 GO(SDL_GetClipRect, vFpp)
@@ -193,7 +193,7 @@ GO(SDL_GetDisplayBounds, iFip)
 GO(SDL_GetDisplayDPI, iFippp)
 GO(SDL_GetDisplayMode, iFiip)
 GO(SDL_GetDisplayName, pFi)
-GO(SDL_GetDisplayOrientation, iFi)
+GO(SDL_GetDisplayOrientation, uFi)
 GO(SDL_GetDisplayUsableBounds, iFip)
 GO(SDL_getenv, pFp)
 GO(SDL_GetError, pFv)
@@ -201,15 +201,15 @@ GOM(SDL_GetEventFilter, iFEpp)
 GO(SDL_GetGlobalMouseState, uFpp)
 GO(SDL_GetGrabbedWindow, pFv)
 GO(SDL_GetHint, pFp)
-GO(SDL_GetHintBoolean, iFpi)
+GO(SDL_GetHintBoolean, uFpu)
 GOM(SDL_GetJoystickGUIDInfo, vFGppp)
 GO(SDL_GetKeyboardFocus, pFv)
 GO(SDL_GetKeyboardState, pFp)
-GO(SDL_GetKeyFromName, pFp)
-GO(SDL_GetKeyFromScancode, uFu)
-GO(SDL_GetKeyName, pFu)
-GO(SDL_GetMemoryFunctions, iFpi)
-GO(SDL_GetModState, pFv)
+GO(SDL_GetKeyFromName, iFp)
+GO(SDL_GetKeyFromScancode, iFu)
+GO(SDL_GetKeyName, pFi)
+GO(SDL_GetMemoryFunctions, vFpppp)
+GO(SDL_GetModState, uFv)
 GO(SDL_GetMouseFocus, pFv)
 GO(SDL_GetMouseState, uFpp)
 GO(SDL_GetNumAllocations, iFv)
@@ -222,13 +222,13 @@ GO(SDL_GetNumTouchFingers, iFu)
 GO(SDL_GetNumVideoDisplays, iFv)
 GO(SDL_GetNumVideoDrivers, iFv)
 GO(SDL_GetPerformanceCounter, UFv)
-GO(SDL_GetPerformanceFrequency, UFv)
+GO(SDL_GetPerformanceFrequency, LFv)
 GO(SDL_GetPixelFormatName, pFu)
 GO(SDL_GetPlatform, pFv)
-GO(SDL_GetPowerInfo, iFpp)
+GO(SDL_GetPowerInfo, uFpp)
 GO(SDL_GetPreferredLocales, pFv)
 GO(SDL_GetPrefPath, pFpp)
-GO(SDL_GetQueuedAudioSize, uFi)
+GO(SDL_GetQueuedAudioSize, uFu)
 GO(SDL_GetRelativeMouseMode, iFv)
 GO(SDL_GetRelativeMouseState, uFpp)
 GO(SDL_GetRenderDrawBlendMode, iFpp)
@@ -242,8 +242,8 @@ GO(SDL_GetRevision, pFv)
 GO(SDL_GetRevisionNumber, iFv)
 GO(SDL_GetRGB, vFupppp)
 GO(SDL_GetRGBA, vFuppppp)
-GO(SDL_GetScancodeFromKey, uFu)
-GO(SDL_GetScancodeFromName, iFp)
+GO(SDL_GetScancodeFromKey, uFi)
+GO(SDL_GetScancodeFromName, uFp)
 GO(SDL_GetScancodeName, pFu)
 GO(SDL_GetShapedWindowMode, iFpp)
 GO(SDL_GetSurfaceAlphaMod, iFpp)
@@ -256,9 +256,9 @@ GO(SDL_GetTextureColorMod, iFpppp)
 GO(SDL_GetThreadID, LFp)
 GO(SDL_GetThreadName, pFp)
 GO(SDL_GetTicks, uFv)
-GO(SDL_GetTouchDevice, uFi)
-GO(SDL_GetTouchDeviceType, iFi)
-GO(SDL_GetTouchFinger, pFui)
+GO(SDL_GetTouchDevice, lFi)
+GO(SDL_GetTouchDeviceType, iFl)
+GO(SDL_GetTouchFinger, pFli)
 GO(SDL_GetVersion, vFp)
 GO(SDL_GetVideoDriver, pFi)
 GO(SDL_GetWindowBordersSize, iFppppp)
@@ -280,8 +280,8 @@ GO(SDL_GetWindowSize, vFppp)
 GO(SDL_GetWindowSurface, pFp)
 GO(SDL_GetWindowTitle, pFp)
 GO(SDL_GetWindowWMInfo, iFpp)
-GO(SDL_GetYUVConversionMode, iFv)
-GO(SDL_GetYUVConversionModeForResolution, iFii)
+GO(SDL_GetYUVConversionMode, uFv)
+GO(SDL_GetYUVConversionModeForResolution, uFii)
 GO(SDL_GL_BindTexture, iFppp)
 GO(SDL_GL_CreateContext, pFp)
 GO(SDL_GL_DeleteContext, vFp)
@@ -333,10 +333,10 @@ GOM(SDL_HasAVX, iFv)
 GOM(SDL_HasAVX2, iFv)
 GOM(SDL_HasAVX512F, iFv)
 GO(SDL_HasClipboardText, iFv)
-GO(SDL_HasColorKey, iFv)
-GO(SDL_HasEvent, iFv)
-GO(SDL_HasEvents, iFv)
-GO(SDL_HasIntersection, iFpp)
+GO(SDL_HasColorKey, uFp)
+GO(SDL_HasEvent, uFu)
+GO(SDL_HasEvents, uFuu)
+GO(SDL_HasIntersection, uFpp)
 GOM(SDL_HasMMX, iFv)
 GOM(SDL_HasNEON, iFv)
 GOM(SDL_HasRDTSC, iFv)
@@ -353,15 +353,15 @@ GO(SDL_iconv_open, pFpp)
 GO(SDL_iconv_string, pFpppL)
 GO(SDL_Init, iFu)
 GO(SDL_InitSubSystem, iFu)
-GO(SDL_IntersectRect, iFppp)
-GO(SDL_IntersectRectAndLine, iFppppp)
+GO(SDL_IntersectRect, uFppp)
+GO(SDL_IntersectRectAndLine, uFppppp)
 GO(SDL_isdigit, iFi)
-GO(SDL_IsGameController, iFi)
-GO(SDL_IsScreenKeyboardShown, iFp)
+GO(SDL_IsGameController, uFi)
+GO(SDL_IsScreenKeyboardShown, uFp)
 GO(SDL_IsScreenSaverEnabled, iFv)
-GO(SDL_IsShapedWindow, iFp)
+GO(SDL_IsShapedWindow, uFp)
 GO(SDL_isspace, iFi)
-GO(SDL_IsTablet, iFv)
+GO(SDL_IsTablet, uFv)
 GO(SDL_IsTextInputActive, iFv)
 GO(SDL_itoa, pFipi)
 GO(SDL_JoystickClose, vFp)
@@ -369,8 +369,8 @@ GO(SDL_JoystickCurrentPowerLevel, iFp)
 GO(SDL_JoystickEventState, iFi)
 GO(SDL_JoystickFromInstanceID, pFi)
 GO(SDL_JoystickGetAttached, iFp)
-GO(SDL_JoystickGetAxis, iFpi)
-GO(SDL_JoystickGetAxisInitialState, iFpip)
+GO(SDL_JoystickGetAxis, wFpi)
+GO(SDL_JoystickGetAxisInitialState, uFpip)
 GO(SDL_JoystickGetBall, iFpipp)
 GO(SDL_JoystickGetButton, CFpi)
 GO(SDL_JoystickGetDeviceGUID, HFi)  // return a struct that is "uint8_t data[16]"
@@ -378,7 +378,7 @@ GO(SDL_JoystickGetDeviceInstanceID, iFi)
 GO(SDL_JoystickGetDevicePlayerIndex, iFi)
 GO(SDL_JoystickGetDeviceProduct, WFi)
 GO(SDL_JoystickGetDeviceProductVersion, WFi)
-GO(SDL_JoystickGetDeviceType, iFi)
+GO(SDL_JoystickGetDeviceType, uFi)
 GO(SDL_JoystickGetDeviceVendor, WFi)
 GO(SDL_JoystickGetGUID, HFp)
 GO(SDL_JoystickGetGUIDFromString, HFp)
@@ -387,7 +387,7 @@ GO(SDL_JoystickGetHat, CFpi)
 GO(SDL_JoystickGetPlayerIndex, iFp)
 GO(SDL_JoystickGetProduct, WFp)
 GO(SDL_JoystickGetProductVersion, WFp)
-GO(SDL_JoystickGetType, iFp)
+GO(SDL_JoystickGetType, uFp)
 GO(SDL_JoystickGetVendor, WFp)
 GO(SDL_JoystickInstanceID, iFp)
 GO(SDL_JoystickIsHaptic, iFp)
@@ -400,8 +400,8 @@ GO(SDL_JoystickNumHats, iFp)
 GO(SDL_JoystickOpen, pFi)
 GO(SDL_JoystickRumble, iFpWWu)
 GO(SDL_JoystickUpdate, vFv)
-GO(SDL_LinuxSetThreadPriority, iFIi)
-GO(SDL_lltoa, pFIpi)
+GO(SDL_LinuxSetThreadPriority, iFli)
+GO(SDL_lltoa, pFlpi)
 GOM(SDL_LoadBMP_RW, pFEpi)
 GO(SDL_LoadDollarTemplates, iFip)
 GO(SDL_LoadFile, pFpp)
@@ -424,7 +424,7 @@ GOM(SDL_LogDebug, vFEipV)
 GOM(SDL_LogError, vFEipV)
 GO(SDL_logf, fFf)
 GOM(SDL_LogGetOutputFunction, vFEpp)
-GO(SDL_LogGetPriority, iFi)
+GO(SDL_LogGetPriority, uFi)
 GOM(SDL_LogInfo, vFEipV)
 GO2(SDL_LogMessage, vFiupV, SDL_LogMessageV)
 GO(SDL_LogMessageV, vFiupV)
@@ -436,32 +436,32 @@ GOM(SDL_LogVerbose, vFEipV)
 GOM(SDL_LogWarn, vFEipV)
 GO(SDL_LowerBlit, iFpppp)
 GO(SDL_LowerBlitScaled, iFpppp)
-GO(SDL_ltoa, pFlp)
-GO(SDL_malloc, pFu)
+GO(SDL_ltoa, pFlpi)
+GO(SDL_malloc, pFL)
 GO(SDL_MapRGB, uFpCCC)
 GO(SDL_MapRGBA, uFpCCCC)
 GO(SDL_MasksToPixelFormatEnum, uFiuuuu)
 GO(SDL_MaximizeWindow, vFp)
-GO(SDL_memcmp, iFppu)
+GO(SDL_memcmp, iFppL)
 GO(SDL_memcpy, pFppu)
 GO(SDL_memmove, pFppu)
 GO(SDL_MemoryBarrierAcquireFunction, vFv)
 GO(SDL_MemoryBarrierReleaseFunction, vFv)
-GO(SDL_memset, pFpiu)
+GO(SDL_memset, pFpiL)
 GO(SDL_MinimizeWindow, vFp)
 GO(SDL_MixAudio, vFppui)
 GO(SDL_MixAudioFormat, vFppWui)
 GO(SDL_MouseIsHaptic, iFv)
-GO(SDL_NewAudioStream, pFiCiiCi)
+GO(SDL_NewAudioStream, pFWCiWCi)
 GO(SDL_NumHaptics, iFv)
 GO(SDL_NumJoysticks, iFv)
 GO(SDL_NumSensors, iFv)
 GOM(SDL_OpenAudio, iFEpp)
 GOM(SDL_OpenAudioDevice, iFEpippi)
 GO(SDL_PauseAudio, vFi)
-GO(SDL_PauseAudioDevice, vFii)
-GO(SDL_PeepEvents, iFpiiuu)
-GO(SDL_PixelFormatEnumToMasks, iFuppppp)
+GO(SDL_PauseAudioDevice, vFui)
+GO(SDL_PeepEvents, iFpiuuu)
+GO(SDL_PixelFormatEnumToMasks, uFuppppp)
 GO(SDL_PollEvent, iFp)
 GO(SDL_pow, dFdd)
 GO(SDL_powf, fFff)
@@ -469,7 +469,7 @@ GO(SDL_PumpEvents, vFv)
 GO(SDL_PushEvent, iFp)
 GO2(SDL_qsort, vFEpuup, my_qsort)
 GO(SDL_QueryTexture, iFppppp)
-GO(SDL_QueueAudio, iFipu)
+GO(SDL_QueueAudio, iFupu)
 GO(SDL_Quit, vFv)
 GO(SDL_QuitSubSystem, vFu)
 GO(SDL_RaiseWindow, vFp)
@@ -480,13 +480,13 @@ GOM(SDL_ReadLE16, uFEp)
 GOM(SDL_ReadLE32, uFEp)
 GOM(SDL_ReadLE64, UFEp)
 GOM(SDL_ReadU8, uFEp)
-GO(SDL_realloc, pFpu)
-GO(SDL_RecordGesture, iFi)
+GO(SDL_realloc, pFpL)
+GO(SDL_RecordGesture, iFl)
 GO(SDL_RegisterEvents, uFi)
 GOM(SDL_RemoveTimer, iFEp)
 GO(SDL_RenderClear, iFp)
 GO(SDL_RenderCopy, iFpppp)
-GO(SDL_RenderCopyEx, iFppppdpi)
+GO(SDL_RenderCopyEx, iFppppdpu)
 // SDL_RenderCopyExF
 // SDL_RenderCopyF
 GO(SDL_RenderDrawLine, iFpiiii)
@@ -513,11 +513,11 @@ GO(SDL_RenderGetLogicalSize, vFppp)
 // SDL_RenderGetMetalLayer
 GO(SDL_RenderGetScale, vFppp)
 GO(SDL_RenderGetViewport, vFpp)
-GO(SDL_RenderIsClipEnabled, iFp)
+GO(SDL_RenderIsClipEnabled, uFp)
 GO(SDL_RenderPresent, vFp)
 GO(SDL_RenderReadPixels, iFppupi)
 GO(SDL_RenderSetClipRect, iFpp)
-GO(SDL_RenderSetIntegerScale, iFpi)
+GO(SDL_RenderSetIntegerScale, iFpu)
 GO(SDL_RenderSetLogicalSize, iFpii)
 GO(SDL_RenderSetScale, iFpff)
 GO(SDL_RenderSetViewport, iFpp)
@@ -533,8 +533,8 @@ GOM(SDL_RWFromMem, pFEpi)
 GOM(SDL_SaveAllDollarTemplates, iFEp)
 GOM(SDL_SaveBMP_RW, iFEppi)
 GOM(SDL_SaveDollarTemplate, iFEip)
-GO(SDL_scalbn, dFdl)
-GO(SDL_scalbnf, fFfl)
+GO(SDL_scalbn, dFdi)
+GO(SDL_scalbnf, fFfi)
 GO(SDL_SemPost, iFp)
 GO(SDL_SemTryWait, iFp)
 GO(SDL_SemValue, uFp)
@@ -555,17 +555,17 @@ GO(SDL_SemWaitTimeout, iFpu)
 // SDL_SensorUpdate
 // SDL_SetAssertionHandler
 GO(SDL_SetClipboardText, iFp)
-GO(SDL_SetClipRect, iFpp)
+GO(SDL_SetClipRect, uFpp)
 GO(SDL_SetColorKey, iFpiu)
 GO(SDL_SetCursor, vFp)
 GO(SDL_setenv, iFppi)
 GO(SDL_SetError, iFppppp)    // it use ..., so putarbitrary  4 args
 GOM(SDL_SetEventFilter, vFEpp)
-GO(SDL_SetHint, iFpp)
-GO(SDL_SetHintWithPriority, iFppi)
+GO(SDL_SetHint, uFpp)
+GO(SDL_SetHintWithPriority, uFppu)
 GO(SDL_SetMainReady, vFv)
 // SDL_SetMemoryFunctions
-GO(SDL_SetModState, vFi)
+GO(SDL_SetModState, vFu)
 GO(SDL_SetPaletteColors, iFppii)
 // SDL_SetPixelFormatPalette
 GO(SDL_SetRelativeMouseMode, iFi)
@@ -623,24 +623,24 @@ GO(SDL_strcasecmp, iFpp)
 GO(SDL_strchr, pFpi)
 GO(SDL_strcmp, iFpp)
 GO(SDL_strdup, pFp)
-GO(SDL_strlcat, uFppu)
+GO(SDL_strlcat, LFppL)
 GO(SDL_strlcpy, uFppu)
 GO(SDL_strlen, uFp)
 GO(SDL_strlwr, pFp)
-GO(SDL_strncasecmp, iFppu)
+GO(SDL_strncasecmp, iFppL)
 GO(SDL_strncmp, iFppu)
 GO(SDL_strrchr, pFpi)
 GO(SDL_strrev, pFp)
 GO(SDL_strstr, pFpp)
 GO(SDL_strtod, dFpp)
-GO(SDL_strtol, iFppi)
-GO(SDL_strtoll, IFppi)
-GO(SDL_strtoul, uFppi)
-GO(SDL_strtoull, UFppi)
+GO(SDL_strtol, lFppi)
+GO(SDL_strtoll, lFppi)
+GO(SDL_strtoul, LFppi)
+GO(SDL_strtoull, LFppi)
 GO(SDL_strupr, pFp)
 GO(SDL_tan, dFd)
 GO(SDL_tanf, fFf)
-GO(SDL_ThreadID, uFv)
+GO(SDL_ThreadID, LFv)
 GO(SDL_TLSCreate, uFv)
 GO(SDL_TLSGet, pFu)
 GOM(SDL_TLSSet, iFEupp)
@@ -648,8 +648,8 @@ GO(SDL_tolower, iFi)
 GO(SDL_toupper, iFi)
 GO(SDL_TryLockMutex, iFp)
 GO(SDL_uitoa, pFupi)
-GO(SDL_ulltoa, pFUpi)
-GO(SDL_ultoa, pFupi)
+GO(SDL_ulltoa, pFLpi)
+GO(SDL_ultoa, pFLpi)
 GO(SDL_UnionRect, vFppp)
 GOM(SDL_UnloadObject, vFEp)
 GO(SDL_UnlockAudio, vFv)
@@ -686,7 +686,7 @@ GO(SDL_WasInit, uFu)
 // SDL_wcsdup
 // SDL_wcslcat
 // SDL_wcslcpy
-GO(SDL_wcslen, uFp)
+GO(SDL_wcslen, LFp)
 GOM(SDL_WriteBE16, uFEpW)
 GOM(SDL_WriteBE32, uFEpu)
 GOM(SDL_WriteBE64, uFEpU)
diff --git a/src/wrapped/wrappedsdl2image_private.h b/src/wrapped/wrappedsdl2image_private.h
index 7c4af99d..fac78787 100755
--- a/src/wrapped/wrappedsdl2image_private.h
+++ b/src/wrapped/wrappedsdl2image_private.h
@@ -1,4 +1,6 @@
-#if defined(GO) && defined(GOM) && defined(GO2) && defined(DATA)
+#if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
+#error Meh!
+#endif
 
 DATA(__data_start, 4)
 DATA(_edata, 4)
@@ -55,7 +57,7 @@ GOM(IMG_LoadTextureTyped_RW, pFEppip)
 // IMG_QuitWEBP
 // IMG_SaveJPG
 // IMG_SaveJPG_RW
-GO(IMG_SavePNG, iFppi)
+GO(IMG_SavePNG, iFpp)
 GOM(IMG_SavePNG_RW, iFEppi)
 // _init
 DATA(nsvg__colors, 4)
@@ -65,5 +67,3 @@ DATA(nsvg__colors, 4)
 // nsvgParse
 // nsvg__parseXML
 // nsvgRasterize
-
-#endif
\ No newline at end of file
diff --git a/src/wrapped/wrappedsdl2mixer_private.h b/src/wrapped/wrappedsdl2mixer_private.h
index db332fe7..796e691f 100755
--- a/src/wrapped/wrappedsdl2mixer_private.h
+++ b/src/wrapped/wrappedsdl2mixer_private.h
@@ -17,15 +17,15 @@ GO(Mix_FadeInMusicPos,iFpiid)
 GO(Mix_FadeOutChannel,iFii)
 GO(Mix_FadeOutGroup,iFii)
 GO(Mix_FadeOutMusic,iFi)
-GO(Mix_FadingChannel,iFi)
-GO(Mix_FadingMusic,iFv)
+GO(Mix_FadingChannel, uFi)
+GO(Mix_FadingMusic, uFv)
 GO(Mix_FreeChunk,vFp)
 GO(Mix_FreeMusic,vFp)
 GO(Mix_GetChunk,pFi)
 GO(Mix_GetChunkDecoder,pFi)
 GO(Mix_GetMusicDecoder,pFi)
 GO(Mix_GetMusicHookData,pFv)
-GO(Mix_GetMusicType,iFp)
+GO(Mix_GetMusicType, uFp)
 GO(Mix_GetNumChunkDecoders,iFv)
 GO(Mix_GetNumMusicDecoders,iFv)
 GO(Mix_GetSoundFonts,pFv)
@@ -48,8 +48,8 @@ GO(Mix_LoadMUS,pFp)
 GOM(Mix_LoadMUSType_RW,pFEpii)
 GOM(Mix_LoadMUS_RW,pFEpi)
 GOM(Mix_LoadWAV_RW,pFEpi)
-GO(Mix_OpenAudio,iFiuii)
-GO(Mix_OpenAudioDevice, iFiuiipi)
+GO(Mix_OpenAudio, iFiWii)
+GO(Mix_OpenAudioDevice, iFiWiipi)
 GO(Mix_Pause,vFi)
 GO(Mix_PauseMusic,vFv)
 GO(Mix_Paused,iFi)
@@ -67,10 +67,10 @@ GO(Mix_ReserveChannels,iFi)
 GO(Mix_Resume,vFi)
 GO(Mix_ResumeMusic,vFv)
 GO(Mix_RewindMusic,vFv)
-GO(Mix_SetDistance,iFiu)
+GO(Mix_SetDistance, iFiC)
 GO(Mix_SetMusicCMD,iFp)
 GO(Mix_SetMusicPosition,iFd)
-GO(Mix_SetPanning,iFiuu)
+GO(Mix_SetPanning, iFiCC)
 GO(Mix_SetPosition,iFiwC)
 GOM(MinorityMix_SetPosition, iFEiw)
 GOM(Mix_SetPostMix,vFEpp)
diff --git a/src/wrapped/wrappedsdl2net_private.h b/src/wrapped/wrappedsdl2net_private.h
index 6986d4da..29bcd057 100755
--- a/src/wrapped/wrappedsdl2net_private.h
+++ b/src/wrapped/wrappedsdl2net_private.h
@@ -42,4 +42,4 @@ GO(SDLNet_UDP_SetPacketLoss, vFpi)
 GO(SDLNet_UDP_Unbind, vFpi)
 GO(SDLNet_Write16, vFWp)
 GO(SDLNet_Write32, vFup)
-GO(SDLNet_version, pFv)
\ No newline at end of file
+GO(SDLNet_version, pFv)
diff --git a/src/wrapped/wrappedsdl2ttf_private.h b/src/wrapped/wrappedsdl2ttf_private.h
index cb080166..0da91344 100755
--- a/src/wrapped/wrappedsdl2ttf_private.h
+++ b/src/wrapped/wrappedsdl2ttf_private.h
@@ -2,27 +2,27 @@
 #error Meh!
 #endif
 
-GO(TTF_ByteSwappedUNICODE, vFi)
+GO(TTF_ByteSwappedUNICODE, vFu)
 GO(TTF_CloseFont, vFp)
 GO(TTF_FontAscent, iFp)
 GO(TTF_FontDescent, iFp)
 GO(TTF_FontFaceFamilyName, pFp)
 GO(TTF_FontFaceIsFixedWidth, iFp)
-GO(TTF_FontFaces, iFp)
+GO(TTF_FontFaces, lFp)
 GO(TTF_FontFaceStyleName, pFp)
 GO(TTF_FontHeight, iFp)
 GO(TTF_FontLineSkip, iFp)
 GO(TTF_GetFontHinting, iFp)
 GO(TTF_GetFontKerning, iFp)
-GO(TTF_GetFontKerningSize, iFp)
+GO(TTF_GetFontKerningSize, iFpii)
 GO(TTF_GetFontOutline, iFp)
 GO(TTF_GetFontStyle, iFp)
-GO(TTF_GlyphIsProvided, iFpu)
-GO(TTF_GlyphMetrics, iFpuppppp)
+GO(TTF_GlyphIsProvided, iFpW)
+GO(TTF_GlyphMetrics, iFpWppppp)
 GO(TTF_Init, iFv)
 GO(TTF_Linked_Version, pFv)
 GO(TTF_OpenFont, pFpi)
-GO(TTF_OpenFontIndex, pFpii)
+GO(TTF_OpenFontIndex, pFpil)
 GOM(TTF_OpenFontIndexRW, pFEpiii)
 GOM(TTF_OpenFontRW, pFEpii)
 GO(TTF_Quit, vFv)