about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/libtools/signal32.c4
-rw-r--r--src/libtools/signals.c4
-rw-r--r--src/wrapped/wrappedlibdl_private.h10
-rw-r--r--src/wrapped/wrappedlibgl_private.h3
-rw-r--r--src/wrapped32/generated/converter32.c24
-rw-r--r--src/wrapped32/generated/converter32.h11
-rw-r--r--src/wrapped32/generated/functions_list.txt135
-rw-r--r--src/wrapped32/generated/wrappedcrashhandlerdefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedcrashhandlertypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedcrashhandlerundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedexpatdefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedexpattypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedexpatundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedfontconfigdefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedfontconfigtypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedfontconfigundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedfreetypedefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedfreetypetypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedfreetypeundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedldlinuxdefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedldlinuxtypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedldlinuxundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibasounddefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibasoundtypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibasoundundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibcdefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibctypes32.h68
-rw-r--r--src/wrapped32/generated/wrappedlibcundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibdldefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibdltypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibdlundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibgldefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibgltypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibgludefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibglundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibglutypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibgluundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibmdefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibmtypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibmundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibpthreaddefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibpthreadtypes32.h20
-rw-r--r--src/wrapped32/generated/wrappedlibpthreadundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibrtdefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibrttypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibrtundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibx11defs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibx11types32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibx11undefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxcursordefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxcursortypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxcursorundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxfixesdefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxfixestypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxfixesundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxrandrdefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxrandrtypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxrandrundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxrenderdefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxrendertypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxrenderundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxxf86vmdefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxxf86vmtypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedlibxxf86vmundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedopenaldefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedopenaltypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedopenalundefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedsdl1defs32.h6
-rw-r--r--src/wrapped32/generated/wrappedsdl1types32.h6
-rw-r--r--src/wrapped32/generated/wrappedsdl1undefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedsdl2defs32.h6
-rw-r--r--src/wrapped32/generated/wrappedsdl2types32.h6
-rw-r--r--src/wrapped32/generated/wrappedsdl2undefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedtcmallocminimaldefs32.h6
-rw-r--r--src/wrapped32/generated/wrappedtcmallocminimaltypes32.h6
-rw-r--r--src/wrapped32/generated/wrappedtcmallocminimalundefs32.h6
-rw-r--r--src/wrapped32/generated/wrapper32.c208
-rw-r--r--src/wrapped32/generated/wrapper32.h79
-rw-r--r--src/wrapped32/wrappedlib_init32.h10
-rwxr-xr-xsrc/wrapped32/wrappedlibc.c2
-rwxr-xr-xsrc/wrapped32/wrappedlibc_private.h240
81 files changed, 654 insertions, 566 deletions
diff --git a/src/libtools/signal32.c b/src/libtools/signal32.c
index 266128e2..8a6a1613 100644
--- a/src/libtools/signal32.c
+++ b/src/libtools/signal32.c
@@ -887,7 +887,7 @@ EXPORT int my32_setcontext(x64emu_t* emu, void* ucp)
     return R_EAX;
 }
 
-EXPORT int my32_makecontext(x64emu_t* emu, void* ucp, void* fnc, int32_t argc, int32_t* argv)
+EXPORT void my32_makecontext(x64emu_t* emu, void* ucp, void* fnc, int32_t argc, int32_t* argv)
 {
 //    printf_log(LOG_NONE, "Warning: call to unimplemented makecontext\n");
     i386_ucontext_t *u = (i386_ucontext_t*)ucp;
@@ -906,8 +906,6 @@ EXPORT int my32_makecontext(x64emu_t* emu, void* ucp, void* fnc, int32_t argc, i
     --esp;
     *esp = to_ptr(my_context->exit_bridge);
     u->uc_mcontext.gregs[I386_ESP] = (uintptr_t)esp;
-    
-    return 0;
 }
 
 EXPORT int my32_swapcontext(x64emu_t* emu, void* ucp1, void* ucp2)
diff --git a/src/libtools/signals.c b/src/libtools/signals.c
index ba9491a6..e7280663 100644
--- a/src/libtools/signals.c
+++ b/src/libtools/signals.c
@@ -2240,7 +2240,7 @@ EXPORT int my_setcontext(x64emu_t* emu, void* ucp)
     return R_EAX;
 }
 
-EXPORT int my_makecontext(x64emu_t* emu, void* ucp, void* fnc, int32_t argc, int64_t* argv)
+EXPORT void my_makecontext(x64emu_t* emu, void* ucp, void* fnc, int32_t argc, int64_t* argv)
 {
 //    printf_log(LOG_NONE, "Warning: call to unimplemented makecontext\n");
     x64_ucontext_t *u = (x64_ucontext_t*)ucp;
@@ -2276,8 +2276,6 @@ EXPORT int my_makecontext(x64emu_t* emu, void* ucp, void* fnc, int32_t argc, int
     --rsp;
     *rsp = my_context->exit_bridge;
     u->uc_mcontext.gregs[X64_RSP] = (uintptr_t)rsp;
-
-    return 0;
 }
 
 EXPORT int my_swapcontext(x64emu_t* emu, void* ucp1, void* ucp2)
diff --git a/src/wrapped/wrappedlibdl_private.h b/src/wrapped/wrappedlibdl_private.h
index c2106250..540ddf0f 100644
--- a/src/wrapped/wrappedlibdl_private.h
+++ b/src/wrapped/wrappedlibdl_private.h
@@ -1,13 +1,15 @@
-#if defined(GO) && defined(GOM) && defined(GO2) && defined(DATA)
+#if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
+#error Meh...
+#endif
 
 GOM(dladdr, iFEpp)
 GOM(dladdr1, iFEpppi)
 GOM(dlclose, iFEp)
 GOM(dlerror, pFEv)
 #ifdef STATICBUILD
-//DATAB(_dlfcn_hook, sizeof(void*))
+//DATAB(_dlfcn_hook, 8)
 #else
-DATAB(_dlfcn_hook, sizeof(void*))
+DATAB(_dlfcn_hook, 8)
 #endif
 GOM(dlinfo, iFEpip)
 GOM(dlmopen, pFEppi)
@@ -15,5 +17,3 @@ GOM(dlopen, pFEpi)
 GOM(dlsym, pFEpp)
 GOM(dlvsym, pFEppp)   // Weak
 GOM(_dl_find_object, iFEpp)
-
-#endif
diff --git a/src/wrapped/wrappedlibgl_private.h b/src/wrapped/wrappedlibgl_private.h
index f6d0d6f4..da4ca22d 100644
--- a/src/wrapped/wrappedlibgl_private.h
+++ b/src/wrapped/wrappedlibgl_private.h
@@ -1,6 +1,7 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
+
 //VERSION_1_0
 GO(glAccum, vFuf)
 GO(glAlphaFunc, vFuf)
diff --git a/src/wrapped32/generated/converter32.c b/src/wrapped32/generated/converter32.c
index 861db942..704e83fe 100644
--- a/src/wrapped32/generated/converter32.c
+++ b/src/wrapped32/generated/converter32.c
@@ -11,6 +11,17 @@ void to_struct_p(ptr_t d, const struct_p_t *src) {
 	*(ptr_t*)dest = to_ptrv(src->p0); dest += 4;
 }
 
+void from_struct_l(struct_l_t *dest, ptr_t s) {
+	if(!s) return;
+	uint8_t* src = (uint8_t*)from_ptrv(s);
+	dest->L0 = from_long(*(long_t*)src); src += 4;
+}
+void to_struct_l(ptr_t d, const struct_l_t *src) {
+	if (!src) return;
+	uint8_t* dest = (uint8_t*)from_ptrv(d);
+	*(long_t*)dest = to_long(src->L0); dest += 4;
+}
+
 void from_struct_L(struct_L_t *dest, ptr_t s) {
 	if(!s) return;
 	uint8_t* src = (uint8_t*)from_ptrv(s);
@@ -22,6 +33,19 @@ void to_struct_L(ptr_t d, const struct_L_t *src) {
 	*(ulong_t*)dest = to_ulong(src->L0); dest += 4;
 }
 
+void from_struct_ll(struct_ll_t *dest, ptr_t s) {
+	if(!s) return;
+	uint8_t* src = (uint8_t*)from_ptrv(s);
+	dest->L0 = from_long(*(long_t*)src); src += 4;
+	dest->L1 = from_long(*(long_t*)src); src += 4;
+}
+void to_struct_ll(ptr_t d, const struct_ll_t *src) {
+	if (!src) return;
+	uint8_t* dest = (uint8_t*)from_ptrv(d);
+	*(long_t*)dest = to_long(src->L0); dest += 4;
+	*(long_t*)dest = to_long(src->L1); dest += 4;
+}
+
 void from_struct_LL(struct_LL_t *dest, ptr_t s) {
 	if(!s) return;
 	uint8_t* src = (uint8_t*)from_ptrv(s);
diff --git a/src/wrapped32/generated/converter32.h b/src/wrapped32/generated/converter32.h
index d404397c..a4892ac0 100644
--- a/src/wrapped32/generated/converter32.h
+++ b/src/wrapped32/generated/converter32.h
@@ -9,11 +9,22 @@ typedef struct struct_p_s {
 } struct_p_t;
 void from_struct_p(struct_p_t *dest, ptr_t src);
 void to_struct_p(ptr_t dest, const struct_p_t *src);
+typedef struct struct_l_s {
+	long L0;
+} struct_l_t;
+void from_struct_l(struct_l_t *dest, ptr_t src);
+void to_struct_l(ptr_t dest, const struct_l_t *src);
 typedef struct struct_L_s {
 	unsigned long L0;
 } struct_L_t;
 void from_struct_L(struct_L_t *dest, ptr_t src);
 void to_struct_L(ptr_t dest, const struct_L_t *src);
+typedef struct struct_ll_s {
+	long L0;
+	long L1;
+} struct_ll_t;
+void from_struct_ll(struct_ll_t *dest, ptr_t src);
+void to_struct_ll(ptr_t dest, const struct_ll_t *src);
 typedef struct struct_LL_s {
 	unsigned long L0;
 	unsigned long L1;
diff --git a/src/wrapped32/generated/functions_list.txt b/src/wrapped32/generated/functions_list.txt
index 7356edb4..6698e485 100644
--- a/src/wrapped32/generated/functions_list.txt
+++ b/src/wrapped32/generated/functions_list.txt
@@ -22,6 +22,7 @@
 #() iFu -> iFu
 #() iFf -> iFf
 #() iFd -> iFd
+#() iFl -> iFl
 #() iFL -> iFL
 #() iFp -> iFp
 #() iFh -> iFh
@@ -36,12 +37,14 @@
 #() CFU -> CFU
 #() CFl -> CFl
 #() CFp -> CFp
+#() WFW -> WFW
 #() WFu -> WFu
 #() uFv -> uFv
 #() uFi -> uFi
 #() uFu -> uFu
 #() uFU -> uFU
 #() uFp -> uFp
+#() uFS -> uFS
 #() UFu -> UFu
 #() UFp -> UFp
 #() UFs -> UFs
@@ -51,6 +54,7 @@
 #() dFi -> dFi
 #() dFd -> dFd
 #() dFp -> dFp
+#() lFv -> lFv
 #() lFi -> lFi
 #() lFu -> lFu
 #() lFl -> lFl
@@ -73,8 +77,8 @@
 #() tFp -> tFp
 #() XFv -> XFv
 #() iFBp_ -> iFB
-#() LFrL_ -> LFB
-#() pFrL_ -> pFB
+#() LFrl_ -> LFB
+#() pFrl_ -> pFB
 #() vFbuuipWCCp_ -> vFB
 #() LFriiiiiiiiilt_ -> LFB
 #() pFriiiiiiiiilt_ -> pFB
@@ -129,13 +133,14 @@
 #() iFii -> iFii
 #() iFiI -> iFiI
 #() iFiu -> iFiu
+#() iFil -> iFil
 #() iFip -> iFip
-#() iFia -> iFia
 #() iFiS -> iFiS
 #() iFui -> iFui
 #() iFuu -> iFuu
+#() iFuL -> iFuL
 #() iFup -> iFup
-#() iFli -> iFli
+#() iFua -> iFua
 #() iFpi -> iFpi
 #() iFpu -> iFpu
 #() iFpl -> iFpl
@@ -159,16 +164,15 @@
 #() CFuU -> CFuU
 #() CFpi -> CFpi
 #() CFpp -> CFpp
-#() uFEu -> uFEu
 #() uFEp -> uFEp
-#() uFEV -> uFEV
+#() uFiS -> uFiS
 #() uFuu -> uFuu
 #() uFup -> uFup
+#() uFua -> uFua
+#() uFuS -> uFuS
 #() uFpi -> uFpi
 #() uFpu -> uFpu
 #() uFpp -> uFpp
-#() uFpa -> uFpa
-#() UFii -> UFii
 #() UFuu -> UFuu
 #() UFUU -> UFUU
 #() UFss -> UFss
@@ -182,15 +186,20 @@
 #() dFdd -> dFdd
 #() dFdD -> dFdD
 #() dFdp -> dFdp
-#() dFLL -> dFLL
+#() dFll -> dFll
 #() dFpp -> dFpp
+#() lFEV -> lFEV
 #() lFES -> lFES
+#() lFii -> lFii
 #() lFui -> lFui
 #() lFll -> lFll
+#() lFpi -> lFpi
 #() lFpl -> lFpl
+#() LFEL -> LFEL
 #() LFLi -> LFLi
 #() LFpL -> LFpL
 #() LFpp -> LFpp
+#() LFpa -> LFpa
 #() LFXi -> LFXi
 #() LFXL -> LFXL
 #() pFEv -> pFEv
@@ -218,11 +227,12 @@
 #() iFHBp_ -> iFHB
 #() fFpBp_ -> fFpB
 #() dFpBp_ -> dFpB
-#() pFrL_p -> pFBp
+#() pFrl_p -> pFBp
 #() iFuBLL_ -> iFuB
-#() iFprLL_ -> iFpB
+#() iFprll_ -> iFpB
 #() iFpbup_ -> iFpB
-#() iFBLL_p -> iFBp
+#() iFprLL_ -> iFpB
+#() iFBll_p -> iFBp
 #() iFrLL_BLL_ -> iFBB
 #() iFpruuipWCCp_ -> iFpB
 #() pFriiiiiiiiilt_p -> pFBp
@@ -306,27 +316,29 @@
 #() iFEpV -> iFEpV
 #() iFEhi -> iFEhi
 #() iFEhp -> iFEhp
-#() iFESp -> iFESp
 #() iFEXp -> iFEXp
 #() iFiii -> iFiii
 #() iFiiI -> iFiiI
-#() iFiiu -> iFiiu
+#() iFiil -> iFiil
 #() iFiip -> iFiip
 #() iFiiO -> iFiiO
 #() iFiII -> iFiII
 #() iFiuu -> iFiuu
 #() iFiup -> iFiup
+#() iFill -> iFill
+#() iFiLi -> iFiLi
 #() iFiLN -> iFiLN
+#() iFipi -> iFipi
 #() iFipu -> iFipu
 #() iFipL -> iFipL
 #() iFipp -> iFipp
-#() iFuii -> iFuii
 #() iFuip -> iFuip
 #() iFuui -> iFuui
 #() iFuuu -> iFuuu
 #() iFuup -> iFuup
-#() iFuLp -> iFuLp
+#() iFuLa -> iFuLa
 #() iFfff -> iFfff
+#() iFLLi -> iFLLi
 #() iFpii -> iFpii
 #() iFpiu -> iFpiu
 #() iFpip -> iFpip
@@ -374,6 +386,7 @@
 #() fFffp -> fFffp
 #() dFddd -> dFddd
 #() dFddp -> dFddp
+#() lFili -> lFili
 #() lFipL -> lFipL
 #() lFlpi -> lFlpi
 #() lFpLL -> lFpLL
@@ -403,7 +416,7 @@
 #() pFpiu -> pFpiu
 #() pFpiL -> pFpiL
 #() pFpiS -> pFpiS
-#() pFpuL -> pFpuL
+#() pFpII -> pFpII
 #() pFpup -> pFpup
 #() pFppu -> pFppu
 #() pFppL -> pFppL
@@ -416,7 +429,6 @@
 #() SFppS -> SFppS
 #() tFipu -> tFipu
 #() iFppbL_ -> iFppB
-#() iFpBp_i -> iFpBi
 #() iFpbL_p -> iFpBp
 #() iFBp_LL -> iFBLL
 #() iFBp_pi -> iFBpi
@@ -538,7 +550,7 @@
 #() iFEppL -> iFEppL
 #() iFEppp -> iFEppp
 #() iFEppV -> iFEppV
-#() iFEpOu -> iFEpOu
+#() iFEpON -> iFEpON
 #() iFEhup -> iFEhup
 #() iFESpp -> iFESpp
 #() iFESpV -> iFESpV
@@ -547,8 +559,9 @@
 #() iFiiiu -> iFiiiu
 #() iFiiip -> iFiiip
 #() iFiiiN -> iFiiiN
-#() iFiill -> iFiill
-#() iFiuui -> iFiuui
+#() iFiiII -> iFiiII
+#() iFiIIi -> iFiIIi
+#() iFilli -> iFilli
 #() iFipii -> iFipii
 #() iFipui -> iFipui
 #() iFipup -> iFipup
@@ -565,7 +578,7 @@
 #() iFppLi -> iFppLi
 #() iFpppi -> iFpppi
 #() iFpppp -> iFpppp
-#() iFhpiL -> iFhpiL
+#() iFSpiL -> iFSpiL
 #() iFXipi -> iFXipi
 #() iFXipp -> iFXipp
 #() iFXLii -> iFXLii
@@ -578,6 +591,7 @@
 #() uFpCCC -> uFpCCC
 #() uFppip -> uFppip
 #() lFEipi -> lFEipi
+#() lFEppL -> lFEppL
 #() lFiipL -> lFiipL
 #() lFipLi -> lFipLi
 #() lFipLl -> lFipLl
@@ -612,7 +626,7 @@
 #() IFpBp_ii -> IFpBii
 #() uFppiBp_ -> uFppiB
 #() UFpBp_ii -> UFpBii
-#() lFiibp_L -> lFiiBL
+#() lFiibl_L -> lFiiBL
 #() LFpbp_Lp -> LFpBLp
 #() iFEpprLL_ -> iFEppB
 #() vFXLrpLiL_L -> vFXLBL
@@ -622,6 +636,7 @@
 #() iFpruuipWCCp_buuipWCCp_i -> iFpBBi
 #() vFEuipp -> vFEuipp
 #() vFEpLLp -> vFEpLLp
+#() vFEppiV -> vFEppiV
 #() vFiiiii -> vFiiiii
 #() vFiiiiu -> vFiiiiu
 #() vFiiuii -> vFiiuii
@@ -718,10 +733,8 @@
 #() iFEipii -> iFEipii
 #() iFEpipp -> iFEpipp
 #() iFEpupu -> iFEpupu
-#() iFEpupV -> iFEpupV
 #() iFEpLpp -> iFEpLpp
 #() iFEpLpV -> iFEpLpV
-#() iFEppiV -> iFEppiV
 #() iFEpplp -> iFEpplp
 #() iFEpppi -> iFEpppi
 #() iFEpppp -> iFEpppp
@@ -737,7 +750,7 @@
 #() iFpLuLi -> iFpLuLi
 #() iFppiUi -> iFppiUi
 #() iFpppip -> iFpppip
-#() iFpppup -> iFpppup
+#() iFpppLp -> iFpppLp
 #() iFppppp -> iFppppp
 #() iFXiiip -> iFXiiip
 #() iFXpppp -> iFXpppp
@@ -832,7 +845,6 @@
 #() vFppupii -> vFppupii
 #() vFpppppp -> vFpppppp
 #() vFXLiiii -> vFXLiiii
-#() iFEuppup -> iFEuppup
 #() iFEuppLp -> iFEuppLp
 #() iFEpiLpp -> iFEpiLpp
 #() iFEpuuup -> iFEpuuup
@@ -840,7 +852,7 @@
 #() iFEpLlpp -> iFEpLlpp
 #() iFEppipp -> iFEppipp
 #() iFEppllp -> iFEppllp
-#() iFEpppup -> iFEpppup
+#() iFEpppLp -> iFEpppLp
 #() iFEXLilp -> iFEXLilp
 #() iFEXpiup -> iFEXpiup
 #() iFEXpppp -> iFEXpppp
@@ -912,18 +924,19 @@
 #() vFlliiiip -> vFlliiiip
 #() vFpipipiu -> vFpipipiu
 #() vFpddiidd -> vFpddiidd
-#() iFEpuiupV -> iFEpuiupV
 #() iFEpLiipV -> iFEpLiipV
+#() iFEpLiLpV -> iFEpLiLpV
 #() iFEXLpppp -> iFEXLpppp
 #() iFuiiiuup -> iFuiiiuup
 #() iFpWCiWCi -> iFpWCiWCi
-#() iFpupLpLi -> iFpupLpLi
+#() iFpupupui -> iFpupupui
 #() iFXiuLiii -> iFXiuLiii
 #() uFuippppp -> uFuippppp
 #() LFXLLppuu -> LFXLLppuu
 #() pFEpiiiiu -> pFEpiiiiu
 #() pFEpLiiii -> pFEpLiiii
 #() pFEpLiiiI -> pFEpLiiiI
+#() pFEpLiiil -> pFEpLiiil
 #() vFiiiiuuip -> vFiiiiuuip
 #() vFiilliilp -> vFiilliilp
 #() vFiupuiuup -> vFiupuiuup
@@ -1158,17 +1171,15 @@ wrappedlibc:
   - __close_nocancel
 - iFL:
 - iFp:
-  - getifaddrs
   - sysinfo
-- iFh:
-  - getwc
 - iFO:
-- uFu:
 - uFp:
-- uFV:
+- uFS:
+  - getwc
 - UFp:
 - lFp:
   - atol
+- lFV:
 - lFS:
   - ftell
 - LFL:
@@ -1190,11 +1201,16 @@ wrappedlibc:
   - localtime
 - pFS:
   - getmntent
+- iFbp_:
+  - getifaddrs
+- pFriiiiiiiiilt_:
+  - asctime
 - vFip:
 - vFpi:
 - vFpu:
 - iFip:
   - futimes
+- iFup:
   - getrlimit
   - setrlimit
 - iFpi:
@@ -1204,12 +1220,11 @@ wrappedlibc:
   - alphasort64
   - execvp
   - statvfs
+  - statvfs64
   - utimes
 - iFpV:
   - execl
   - execlp
-- iFSp:
-  - statvfs64
 - IFII:
 - UFUU:
 - pFip:
@@ -1220,6 +1235,7 @@ wrappedlibc:
   - gmtime_r
   - localtime_r
 - SFpp:
+- iFrLL_BLL_:
 - vFipV:
 - vFpup:
   - _ITM_addUserCommitAction
@@ -1230,68 +1246,63 @@ wrappedlibc:
 - iFiiN:
 - iFipp:
 - iFpLi:
-- iFppi:
-  - wcstol
-  - wcstoul
-- iFppL:
 - iFppp:
   - vswscanf
 - iFppV:
   - swscanf
-- iFpOu:
+- iFpON:
 - iFSpp:
 - iFSpV:
   - fscanf
-- KFppa:
-  - __strtold_l
-  - strtold_l
 - lFipi:
   - recvmsg
   - sendmsg
   - writev
 - lFipL:
-- lFppi:
-- LFppi:
+- lFppL:
 - pFpii:
+- pFpII:
 - pFppv:
   - __realpath_chk
+- KFpBp_a:
+  - __strtold_l
+  - strtold_l
+- lFpBp_i:
+  - wcstol
+- LFpBp_i:
+  - wcstoul
 - vFpLLp:
+- vFppiV:
 - iFivpV:
 - iFiiip:
 - iFipii:
 - iFippi:
   - utimensat
-- iFLLLL:
 - iFpipp:
-- iFpupV:
 - iFpLpp:
 - iFpLpV:
-- iFppiV:
 - iFpppp:
   - getaddrinfo
 - iFSvpp:
 - iFSvpV:
-- LFppiv:
-- iFuppup:
-  - getgrgid_r
+- LFpBp_iv:
 - iFuppLp:
+  - getgrgid_r
   - getpwuid_r
 - iFpvvpV:
 - iFpiLpp:
-- iFpppup:
+- iFpppLp:
   - getgrnam_r
   - getpwnam_r
 - pFpLLiN:
 - pFppLLp:
-- iFpuiupV:
 - iFpLvvpp:
 - iFpLiipV:
-- pFpLiiii:
+- iFpLiLpV:
 - pFpLiiiI:
+- pFpLiiil:
 - iFpippppp:
 - iFpLiLppp:
-- pFiiiiiiiiilt:
-  - asctime
 wrappedlibdl:
 - iFp:
   - dlclose
@@ -1495,6 +1506,8 @@ wrappedlibpthread:
   - pthread_kill@GLIBC_2.0
 - iFhp:
   - pthread_getattr_np
+- iFprLL_:
+  - sem_timedwait
 - vFppp:
   - _pthread_cleanup_push
   - _pthread_cleanup_push_defer
@@ -1502,8 +1515,6 @@ wrappedlibpthread:
   - sem_init
 - iFpup:
   - pthread_attr_setaffinity_np
-- iFpLL:
-  - sem_timedwait
 - iFppL:
   - pthread_attr_setstack
 - iFppp:
@@ -1515,10 +1526,10 @@ wrappedlibpthread:
   - pthread_setaffinity_np
 - pFpOM:
   - sem_open
-- iFppLL:
+- iFpprLL_:
   - pthread_cond_timedwait
   - pthread_cond_timedwait@GLIBC_2.0
-- iFhppp:
+- iFBh_ppp:
   - pthread_create
 wrappedlibrt:
 wrappedlibx11:
diff --git a/src/wrapped32/generated/wrappedcrashhandlerdefs32.h b/src/wrapped32/generated/wrappedcrashhandlerdefs32.h
index 83e132a1..120becb3 100644
--- a/src/wrapped32/generated/wrappedcrashhandlerdefs32.h
+++ b/src/wrapped32/generated/wrappedcrashhandlerdefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedcrashhandlerDEFS32_H_
 #define __wrappedcrashhandlerDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedcrashhandlertypes32.h b/src/wrapped32/generated/wrappedcrashhandlertypes32.h
index 5b75966f..905288e5 100644
--- a/src/wrapped32/generated/wrappedcrashhandlertypes32.h
+++ b/src/wrapped32/generated/wrappedcrashhandlertypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedcrashhandlerTYPES32_H_
 #define __wrappedcrashhandlerTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedcrashhandlerundefs32.h b/src/wrapped32/generated/wrappedcrashhandlerundefs32.h
index d70f6207..8e122843 100644
--- a/src/wrapped32/generated/wrappedcrashhandlerundefs32.h
+++ b/src/wrapped32/generated/wrappedcrashhandlerundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedcrashhandlerUNDEFS32_H_
 #define __wrappedcrashhandlerUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedexpatdefs32.h b/src/wrapped32/generated/wrappedexpatdefs32.h
index ba9ba295..af198fb7 100644
--- a/src/wrapped32/generated/wrappedexpatdefs32.h
+++ b/src/wrapped32/generated/wrappedexpatdefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedexpatDEFS32_H_
 #define __wrappedexpatDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedexpattypes32.h b/src/wrapped32/generated/wrappedexpattypes32.h
index edafb443..df0307a2 100644
--- a/src/wrapped32/generated/wrappedexpattypes32.h
+++ b/src/wrapped32/generated/wrappedexpattypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedexpatTYPES32_H_
 #define __wrappedexpatTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedexpatundefs32.h b/src/wrapped32/generated/wrappedexpatundefs32.h
index 62f20708..71e08a01 100644
--- a/src/wrapped32/generated/wrappedexpatundefs32.h
+++ b/src/wrapped32/generated/wrappedexpatundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedexpatUNDEFS32_H_
 #define __wrappedexpatUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedfontconfigdefs32.h b/src/wrapped32/generated/wrappedfontconfigdefs32.h
index 202c1c44..170be551 100644
--- a/src/wrapped32/generated/wrappedfontconfigdefs32.h
+++ b/src/wrapped32/generated/wrappedfontconfigdefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedfontconfigDEFS32_H_
 #define __wrappedfontconfigDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedfontconfigtypes32.h b/src/wrapped32/generated/wrappedfontconfigtypes32.h
index c1742c84..2bc134c0 100644
--- a/src/wrapped32/generated/wrappedfontconfigtypes32.h
+++ b/src/wrapped32/generated/wrappedfontconfigtypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedfontconfigTYPES32_H_
 #define __wrappedfontconfigTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedfontconfigundefs32.h b/src/wrapped32/generated/wrappedfontconfigundefs32.h
index 91b06d04..52ed712b 100644
--- a/src/wrapped32/generated/wrappedfontconfigundefs32.h
+++ b/src/wrapped32/generated/wrappedfontconfigundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedfontconfigUNDEFS32_H_
 #define __wrappedfontconfigUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedfreetypedefs32.h b/src/wrapped32/generated/wrappedfreetypedefs32.h
index 3aabf867..89510414 100644
--- a/src/wrapped32/generated/wrappedfreetypedefs32.h
+++ b/src/wrapped32/generated/wrappedfreetypedefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedfreetypeDEFS32_H_
 #define __wrappedfreetypeDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedfreetypetypes32.h b/src/wrapped32/generated/wrappedfreetypetypes32.h
index 7a4b4b49..41bd1dd5 100644
--- a/src/wrapped32/generated/wrappedfreetypetypes32.h
+++ b/src/wrapped32/generated/wrappedfreetypetypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedfreetypeTYPES32_H_
 #define __wrappedfreetypeTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedfreetypeundefs32.h b/src/wrapped32/generated/wrappedfreetypeundefs32.h
index f9454101..a37e684b 100644
--- a/src/wrapped32/generated/wrappedfreetypeundefs32.h
+++ b/src/wrapped32/generated/wrappedfreetypeundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedfreetypeUNDEFS32_H_
 #define __wrappedfreetypeUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedldlinuxdefs32.h b/src/wrapped32/generated/wrappedldlinuxdefs32.h
index 24962643..6c726b56 100644
--- a/src/wrapped32/generated/wrappedldlinuxdefs32.h
+++ b/src/wrapped32/generated/wrappedldlinuxdefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedldlinuxDEFS32_H_
 #define __wrappedldlinuxDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedldlinuxtypes32.h b/src/wrapped32/generated/wrappedldlinuxtypes32.h
index e010f126..66048730 100644
--- a/src/wrapped32/generated/wrappedldlinuxtypes32.h
+++ b/src/wrapped32/generated/wrappedldlinuxtypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedldlinuxTYPES32_H_
 #define __wrappedldlinuxTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedldlinuxundefs32.h b/src/wrapped32/generated/wrappedldlinuxundefs32.h
index 0ab4c7e3..20d6542b 100644
--- a/src/wrapped32/generated/wrappedldlinuxundefs32.h
+++ b/src/wrapped32/generated/wrappedldlinuxundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedldlinuxUNDEFS32_H_
 #define __wrappedldlinuxUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibasounddefs32.h b/src/wrapped32/generated/wrappedlibasounddefs32.h
index 4428c624..79a9382c 100644
--- a/src/wrapped32/generated/wrappedlibasounddefs32.h
+++ b/src/wrapped32/generated/wrappedlibasounddefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibasoundDEFS32_H_
 #define __wrappedlibasoundDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibasoundtypes32.h b/src/wrapped32/generated/wrappedlibasoundtypes32.h
index 5a73ae01..270de6b5 100644
--- a/src/wrapped32/generated/wrappedlibasoundtypes32.h
+++ b/src/wrapped32/generated/wrappedlibasoundtypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibasoundTYPES32_H_
 #define __wrappedlibasoundTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibasoundundefs32.h b/src/wrapped32/generated/wrappedlibasoundundefs32.h
index 24ad6bac..386c2078 100644
--- a/src/wrapped32/generated/wrappedlibasoundundefs32.h
+++ b/src/wrapped32/generated/wrappedlibasoundundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibasoundUNDEFS32_H_
 #define __wrappedlibasoundUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibcdefs32.h b/src/wrapped32/generated/wrappedlibcdefs32.h
index bcd18301..9a15408b 100644
--- a/src/wrapped32/generated/wrappedlibcdefs32.h
+++ b/src/wrapped32/generated/wrappedlibcdefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibcDEFS32_H_
 #define __wrappedlibcDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibctypes32.h b/src/wrapped32/generated/wrappedlibctypes32.h
index 96400d22..f0538b7d 100644
--- a/src/wrapped32/generated/wrappedlibctypes32.h
+++ b/src/wrapped32/generated/wrappedlibctypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibcTYPES32_H_
 #define __wrappedlibcTYPES32_H_
 
@@ -17,13 +17,12 @@ typedef int32_t (*iFv_t)(void);
 typedef int32_t (*iFi_t)(int32_t);
 typedef int32_t (*iFL_t)(uintptr_t);
 typedef int32_t (*iFp_t)(void*);
-typedef int32_t (*iFh_t)(uintptr_t);
 typedef int32_t (*iFO_t)(int32_t);
-typedef uint32_t (*uFu_t)(uint32_t);
 typedef uint32_t (*uFp_t)(void*);
-typedef uint32_t (*uFV_t)(...);
+typedef uint32_t (*uFS_t)(void*);
 typedef uint64_t (*UFp_t)(void*);
 typedef intptr_t (*lFp_t)(void*);
+typedef intptr_t (*lFV_t)(...);
 typedef intptr_t (*lFS_t)(void*);
 typedef uintptr_t (*LFL_t)(uintptr_t);
 typedef void* (*pFv_t)(void);
@@ -31,21 +30,24 @@ typedef void* (*pFu_t)(uint32_t);
 typedef void* (*pFL_t)(uintptr_t);
 typedef void* (*pFp_t)(void*);
 typedef void* (*pFS_t)(void*);
+typedef int32_t (*iFbp__t)(struct_p_t*);
+typedef void* (*pFriiiiiiiiilt__t)(struct_iiiiiiiiilt_t*);
 typedef void (*vFip_t)(int32_t, void*);
 typedef void (*vFpi_t)(void*, int32_t);
 typedef void (*vFpu_t)(void*, uint32_t);
 typedef int32_t (*iFip_t)(int32_t, void*);
+typedef int32_t (*iFup_t)(uint32_t, void*);
 typedef int32_t (*iFpi_t)(void*, int32_t);
 typedef int32_t (*iFpL_t)(void*, uintptr_t);
 typedef int32_t (*iFpp_t)(void*, void*);
 typedef int32_t (*iFpV_t)(void*, ...);
-typedef int32_t (*iFSp_t)(void*, void*);
 typedef int64_t (*IFII_t)(int64_t, int64_t);
 typedef uint64_t (*UFUU_t)(uint64_t, uint64_t);
 typedef void* (*pFip_t)(int32_t, void*);
 typedef void* (*pFpi_t)(void*, int32_t);
 typedef void* (*pFpp_t)(void*, void*);
 typedef void* (*SFpp_t)(void*, void*);
+typedef int32_t (*iFrLL_BLL__t)(struct_LL_t*, struct_LL_t*);
 typedef void (*vFipV_t)(int32_t, void*, ...);
 typedef void (*vFpup_t)(void*, uint32_t, void*);
 typedef void (*vFppu_t)(void*, void*, uint32_t);
@@ -55,57 +57,52 @@ typedef int32_t (*iFiip_t)(int32_t, int32_t, void*);
 typedef int32_t (*iFiiN_t)(int32_t, int32_t, ...);
 typedef int32_t (*iFipp_t)(int32_t, void*, void*);
 typedef int32_t (*iFpLi_t)(void*, uintptr_t, int32_t);
-typedef int32_t (*iFppi_t)(void*, void*, int32_t);
-typedef int32_t (*iFppL_t)(void*, void*, uintptr_t);
 typedef int32_t (*iFppp_t)(void*, void*, void*);
 typedef int32_t (*iFppV_t)(void*, void*, ...);
-typedef int32_t (*iFpOu_t)(void*, int32_t, uint32_t);
+typedef int32_t (*iFpON_t)(void*, int32_t, ...);
 typedef int32_t (*iFSpp_t)(void*, void*, void*);
 typedef int32_t (*iFSpV_t)(void*, void*, ...);
-typedef double (*KFppa_t)(void*, void*, void*);
 typedef intptr_t (*lFipi_t)(int32_t, void*, int32_t);
 typedef intptr_t (*lFipL_t)(int32_t, void*, uintptr_t);
-typedef intptr_t (*lFppi_t)(void*, void*, int32_t);
-typedef uintptr_t (*LFppi_t)(void*, void*, int32_t);
+typedef intptr_t (*lFppL_t)(void*, void*, uintptr_t);
 typedef void* (*pFpii_t)(void*, int32_t, int32_t);
+typedef void* (*pFpII_t)(void*, int64_t, int64_t);
 typedef void* (*pFppv_t)(void*, void*, void);
+typedef double (*KFpBp_a_t)(void*, struct_p_t*, void*);
+typedef intptr_t (*lFpBp_i_t)(void*, struct_p_t*, int32_t);
+typedef uintptr_t (*LFpBp_i_t)(void*, struct_p_t*, int32_t);
 typedef void (*vFpLLp_t)(void*, uintptr_t, uintptr_t, void*);
+typedef void (*vFppiV_t)(void*, void*, int32_t, ...);
 typedef int32_t (*iFivpV_t)(int32_t, void, void*, ...);
 typedef int32_t (*iFiiip_t)(int32_t, int32_t, int32_t, void*);
 typedef int32_t (*iFipii_t)(int32_t, void*, int32_t, int32_t);
 typedef int32_t (*iFippi_t)(int32_t, void*, void*, int32_t);
-typedef int32_t (*iFLLLL_t)(uintptr_t, uintptr_t, uintptr_t, uintptr_t);
 typedef int32_t (*iFpipp_t)(void*, int32_t, void*, void*);
-typedef int32_t (*iFpupV_t)(void*, uint32_t, void*, ...);
 typedef int32_t (*iFpLpp_t)(void*, uintptr_t, void*, void*);
 typedef int32_t (*iFpLpV_t)(void*, uintptr_t, void*, ...);
-typedef int32_t (*iFppiV_t)(void*, void*, int32_t, ...);
 typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
 typedef int32_t (*iFSvpp_t)(void*, void, void*, void*);
 typedef int32_t (*iFSvpV_t)(void*, void, void*, ...);
-typedef uintptr_t (*LFppiv_t)(void*, void*, int32_t, void);
-typedef int32_t (*iFuppup_t)(uint32_t, void*, void*, uint32_t, void*);
+typedef uintptr_t (*LFpBp_iv_t)(void*, struct_p_t*, int32_t, void);
 typedef int32_t (*iFuppLp_t)(uint32_t, void*, void*, uintptr_t, void*);
 typedef int32_t (*iFpvvpV_t)(void*, void, void, void*, ...);
 typedef int32_t (*iFpiLpp_t)(void*, int32_t, uintptr_t, void*, void*);
-typedef int32_t (*iFpppup_t)(void*, void*, void*, uint32_t, void*);
+typedef int32_t (*iFpppLp_t)(void*, void*, void*, uintptr_t, void*);
 typedef void* (*pFpLLiN_t)(void*, uintptr_t, uintptr_t, int32_t, ...);
 typedef void* (*pFppLLp_t)(void*, void*, uintptr_t, uintptr_t, void*);
-typedef int32_t (*iFpuiupV_t)(void*, uint32_t, int32_t, uint32_t, void*, ...);
 typedef int32_t (*iFpLvvpp_t)(void*, uintptr_t, void, void, void*, void*);
 typedef int32_t (*iFpLiipV_t)(void*, uintptr_t, int32_t, int32_t, void*, ...);
-typedef void* (*pFpLiiii_t)(void*, uintptr_t, int32_t, int32_t, int32_t, int32_t);
+typedef int32_t (*iFpLiLpV_t)(void*, uintptr_t, int32_t, uintptr_t, void*, ...);
 typedef void* (*pFpLiiiI_t)(void*, uintptr_t, int32_t, int32_t, int32_t, int64_t);
+typedef void* (*pFpLiiil_t)(void*, uintptr_t, int32_t, int32_t, int32_t, intptr_t);
 typedef int32_t (*iFpippppp_t)(void*, int32_t, void*, void*, void*, void*, void*);
 typedef int32_t (*iFpLiLppp_t)(void*, uintptr_t, int32_t, uintptr_t, void*, void*, void*);
-typedef void* (*pFiiiiiiiiilt_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, intptr_t, char*);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(freeaddrinfo, vFp_t) \
 	GO(__close_nocancel, iFi_t) \
-	GO(getifaddrs, iFp_t) \
 	GO(sysinfo, iFp_t) \
-	GO(getwc, iFh_t) \
+	GO(getwc, uFS_t) \
 	GO(atol, lFp_t) \
 	GO(ftell, lFS_t) \
 	GO(__ctype_b_loc, pFv_t) \
@@ -121,39 +118,40 @@ typedef void* (*pFiiiiiiiiilt_t)(int32_t, int32_t, int32_t, int32_t, int32_t, in
 	GO(gmtime, pFp_t) \
 	GO(localtime, pFp_t) \
 	GO(getmntent, pFS_t) \
+	GO(getifaddrs, iFbp__t) \
+	GO(asctime, pFriiiiiiiiilt__t) \
 	GO(futimes, iFip_t) \
-	GO(getrlimit, iFip_t) \
-	GO(setrlimit, iFip_t) \
+	GO(getrlimit, iFup_t) \
+	GO(setrlimit, iFup_t) \
 	GO(backtrace, iFpi_t) \
 	GO(alphasort64, iFpp_t) \
 	GO(execvp, iFpp_t) \
 	GO(statvfs, iFpp_t) \
+	GO(statvfs64, iFpp_t) \
 	GO(utimes, iFpp_t) \
 	GO(execl, iFpV_t) \
 	GO(execlp, iFpV_t) \
-	GO(statvfs64, iFSp_t) \
 	GO(signal, pFip_t) \
 	GO(backtrace_symbols, pFpi_t) \
 	GO(gmtime_r, pFpp_t) \
 	GO(localtime_r, pFpp_t) \
 	GO(_ITM_addUserCommitAction, vFpup_t) \
-	GO(wcstol, iFppi_t) \
-	GO(wcstoul, iFppi_t) \
 	GO(vswscanf, iFppp_t) \
 	GO(swscanf, iFppV_t) \
 	GO(fscanf, iFSpV_t) \
-	GO(__strtold_l, KFppa_t) \
-	GO(strtold_l, KFppa_t) \
 	GO(recvmsg, lFipi_t) \
 	GO(sendmsg, lFipi_t) \
 	GO(writev, lFipi_t) \
 	GO(__realpath_chk, pFppv_t) \
+	GO(__strtold_l, KFpBp_a_t) \
+	GO(strtold_l, KFpBp_a_t) \
+	GO(wcstol, lFpBp_i_t) \
+	GO(wcstoul, LFpBp_i_t) \
 	GO(utimensat, iFippi_t) \
 	GO(getaddrinfo, iFpppp_t) \
-	GO(getgrgid_r, iFuppup_t) \
+	GO(getgrgid_r, iFuppLp_t) \
 	GO(getpwuid_r, iFuppLp_t) \
-	GO(getgrnam_r, iFpppup_t) \
-	GO(getpwnam_r, iFpppup_t) \
-	GO(asctime, pFiiiiiiiiilt_t)
+	GO(getgrnam_r, iFpppLp_t) \
+	GO(getpwnam_r, iFpppLp_t)
 
 #endif // __wrappedlibcTYPES32_H_
diff --git a/src/wrapped32/generated/wrappedlibcundefs32.h b/src/wrapped32/generated/wrappedlibcundefs32.h
index 13e37512..a2a8943f 100644
--- a/src/wrapped32/generated/wrappedlibcundefs32.h
+++ b/src/wrapped32/generated/wrappedlibcundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibcUNDEFS32_H_
 #define __wrappedlibcUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibdldefs32.h b/src/wrapped32/generated/wrappedlibdldefs32.h
index a817cc31..d28fcd97 100644
--- a/src/wrapped32/generated/wrappedlibdldefs32.h
+++ b/src/wrapped32/generated/wrappedlibdldefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibdlDEFS32_H_
 #define __wrappedlibdlDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibdltypes32.h b/src/wrapped32/generated/wrappedlibdltypes32.h
index 6368b9a1..e3e738d1 100644
--- a/src/wrapped32/generated/wrappedlibdltypes32.h
+++ b/src/wrapped32/generated/wrappedlibdltypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibdlTYPES32_H_
 #define __wrappedlibdlTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibdlundefs32.h b/src/wrapped32/generated/wrappedlibdlundefs32.h
index 1a512d1a..f7d7a4d7 100644
--- a/src/wrapped32/generated/wrappedlibdlundefs32.h
+++ b/src/wrapped32/generated/wrappedlibdlundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibdlUNDEFS32_H_
 #define __wrappedlibdlUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibgldefs32.h b/src/wrapped32/generated/wrappedlibgldefs32.h
index 2e26ea18..6e6b748d 100644
--- a/src/wrapped32/generated/wrappedlibgldefs32.h
+++ b/src/wrapped32/generated/wrappedlibgldefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibglDEFS32_H_
 #define __wrappedlibglDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibgltypes32.h b/src/wrapped32/generated/wrappedlibgltypes32.h
index b063866a..74447a52 100644
--- a/src/wrapped32/generated/wrappedlibgltypes32.h
+++ b/src/wrapped32/generated/wrappedlibgltypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibglTYPES32_H_
 #define __wrappedlibglTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibgludefs32.h b/src/wrapped32/generated/wrappedlibgludefs32.h
index 05486964..75f7410f 100644
--- a/src/wrapped32/generated/wrappedlibgludefs32.h
+++ b/src/wrapped32/generated/wrappedlibgludefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibgluDEFS32_H_
 #define __wrappedlibgluDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibglundefs32.h b/src/wrapped32/generated/wrappedlibglundefs32.h
index 88cf8b32..6007d816 100644
--- a/src/wrapped32/generated/wrappedlibglundefs32.h
+++ b/src/wrapped32/generated/wrappedlibglundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibglUNDEFS32_H_
 #define __wrappedlibglUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibglutypes32.h b/src/wrapped32/generated/wrappedlibglutypes32.h
index b412c9bb..c73f16c2 100644
--- a/src/wrapped32/generated/wrappedlibglutypes32.h
+++ b/src/wrapped32/generated/wrappedlibglutypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibgluTYPES32_H_
 #define __wrappedlibgluTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibgluundefs32.h b/src/wrapped32/generated/wrappedlibgluundefs32.h
index 1019bb07..875c4685 100644
--- a/src/wrapped32/generated/wrappedlibgluundefs32.h
+++ b/src/wrapped32/generated/wrappedlibgluundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibgluUNDEFS32_H_
 #define __wrappedlibgluUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibmdefs32.h b/src/wrapped32/generated/wrappedlibmdefs32.h
index abfcbb76..278ad524 100644
--- a/src/wrapped32/generated/wrappedlibmdefs32.h
+++ b/src/wrapped32/generated/wrappedlibmdefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibmDEFS32_H_
 #define __wrappedlibmDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibmtypes32.h b/src/wrapped32/generated/wrappedlibmtypes32.h
index 589a2f45..6da7d5d9 100644
--- a/src/wrapped32/generated/wrappedlibmtypes32.h
+++ b/src/wrapped32/generated/wrappedlibmtypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibmTYPES32_H_
 #define __wrappedlibmTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibmundefs32.h b/src/wrapped32/generated/wrappedlibmundefs32.h
index f9a4b404..71687942 100644
--- a/src/wrapped32/generated/wrappedlibmundefs32.h
+++ b/src/wrapped32/generated/wrappedlibmundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibmUNDEFS32_H_
 #define __wrappedlibmUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibpthreaddefs32.h b/src/wrapped32/generated/wrappedlibpthreaddefs32.h
index 4192688c..4f9db3f6 100644
--- a/src/wrapped32/generated/wrappedlibpthreaddefs32.h
+++ b/src/wrapped32/generated/wrappedlibpthreaddefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibpthreadDEFS32_H_
 #define __wrappedlibpthreadDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibpthreadtypes32.h b/src/wrapped32/generated/wrappedlibpthreadtypes32.h
index 337454d7..88f78141 100644
--- a/src/wrapped32/generated/wrappedlibpthreadtypes32.h
+++ b/src/wrapped32/generated/wrappedlibpthreadtypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibpthreadTYPES32_H_
 #define __wrappedlibpthreadTYPES32_H_
 
@@ -21,16 +21,16 @@ typedef int32_t (*iFpL_t)(void*, uintptr_t);
 typedef int32_t (*iFpp_t)(void*, void*);
 typedef int32_t (*iFhi_t)(uintptr_t, int32_t);
 typedef int32_t (*iFhp_t)(uintptr_t, void*);
+typedef int32_t (*iFprLL__t)(void*, struct_LL_t*);
 typedef void (*vFppp_t)(void*, void*, void*);
 typedef int32_t (*iFpiu_t)(void*, int32_t, uint32_t);
 typedef int32_t (*iFpup_t)(void*, uint32_t, void*);
-typedef int32_t (*iFpLL_t)(void*, uintptr_t, uintptr_t);
 typedef int32_t (*iFppL_t)(void*, void*, uintptr_t);
 typedef int32_t (*iFppp_t)(void*, void*, void*);
 typedef int32_t (*iFhup_t)(uintptr_t, uint32_t, void*);
 typedef void* (*pFpOM_t)(void*, int32_t, ...);
-typedef int32_t (*iFppLL_t)(void*, void*, uintptr_t, uintptr_t);
-typedef int32_t (*iFhppp_t)(uintptr_t, void*, void*, void*);
+typedef int32_t (*iFpprLL__t)(void*, void*, struct_LL_t*);
+typedef int32_t (*iFBh_ppp_t)(struct_h_t*, void*, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(__pthread_initialize, vFv_t) \
@@ -99,11 +99,11 @@ typedef int32_t (*iFhppp_t)(uintptr_t, void*, void*, void*);
 	GO(sem_getvalue, iFpp_t) \
 	GO(pthread_kill@GLIBC_2.0, iFhi_t) \
 	GO(pthread_getattr_np, iFhp_t) \
+	GO(sem_timedwait, iFprLL__t) \
 	GO(_pthread_cleanup_push, vFppp_t) \
 	GO(_pthread_cleanup_push_defer, vFppp_t) \
 	GO(sem_init, iFpiu_t) \
 	GO(pthread_attr_setaffinity_np, iFpup_t) \
-	GO(sem_timedwait, iFpLL_t) \
 	GO(pthread_attr_setstack, iFppL_t) \
 	GO(__pthread_atfork, iFppp_t) \
 	GO(pthread_atfork, iFppp_t) \
@@ -111,8 +111,8 @@ typedef int32_t (*iFhppp_t)(uintptr_t, void*, void*, void*);
 	GO(pthread_getaffinity_np, iFhup_t) \
 	GO(pthread_setaffinity_np, iFhup_t) \
 	GO(sem_open, pFpOM_t) \
-	GO(pthread_cond_timedwait, iFppLL_t) \
-	GO(pthread_cond_timedwait@GLIBC_2.0, iFppLL_t) \
-	GO(pthread_create, iFhppp_t)
+	GO(pthread_cond_timedwait, iFpprLL__t) \
+	GO(pthread_cond_timedwait@GLIBC_2.0, iFpprLL__t) \
+	GO(pthread_create, iFBh_ppp_t)
 
 #endif // __wrappedlibpthreadTYPES32_H_
diff --git a/src/wrapped32/generated/wrappedlibpthreadundefs32.h b/src/wrapped32/generated/wrappedlibpthreadundefs32.h
index 687cec63..0dfc159f 100644
--- a/src/wrapped32/generated/wrappedlibpthreadundefs32.h
+++ b/src/wrapped32/generated/wrappedlibpthreadundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibpthreadUNDEFS32_H_
 #define __wrappedlibpthreadUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibrtdefs32.h b/src/wrapped32/generated/wrappedlibrtdefs32.h
index 5c2c26cb..f812f2e2 100644
--- a/src/wrapped32/generated/wrappedlibrtdefs32.h
+++ b/src/wrapped32/generated/wrappedlibrtdefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibrtDEFS32_H_
 #define __wrappedlibrtDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibrttypes32.h b/src/wrapped32/generated/wrappedlibrttypes32.h
index 41bb06d3..97842443 100644
--- a/src/wrapped32/generated/wrappedlibrttypes32.h
+++ b/src/wrapped32/generated/wrappedlibrttypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibrtTYPES32_H_
 #define __wrappedlibrtTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibrtundefs32.h b/src/wrapped32/generated/wrappedlibrtundefs32.h
index 13b52f67..c82749d3 100644
--- a/src/wrapped32/generated/wrappedlibrtundefs32.h
+++ b/src/wrapped32/generated/wrappedlibrtundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibrtUNDEFS32_H_
 #define __wrappedlibrtUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibx11defs32.h b/src/wrapped32/generated/wrappedlibx11defs32.h
index d5eb314a..8328f1dc 100644
--- a/src/wrapped32/generated/wrappedlibx11defs32.h
+++ b/src/wrapped32/generated/wrappedlibx11defs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibx11DEFS32_H_
 #define __wrappedlibx11DEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibx11types32.h b/src/wrapped32/generated/wrappedlibx11types32.h
index 7ca4ec08..7c5676ca 100644
--- a/src/wrapped32/generated/wrappedlibx11types32.h
+++ b/src/wrapped32/generated/wrappedlibx11types32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibx11TYPES32_H_
 #define __wrappedlibx11TYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibx11undefs32.h b/src/wrapped32/generated/wrappedlibx11undefs32.h
index f5ba8983..ae79adf8 100644
--- a/src/wrapped32/generated/wrappedlibx11undefs32.h
+++ b/src/wrapped32/generated/wrappedlibx11undefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibx11UNDEFS32_H_
 #define __wrappedlibx11UNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxcursordefs32.h b/src/wrapped32/generated/wrappedlibxcursordefs32.h
index afd46d1a..e822befd 100644
--- a/src/wrapped32/generated/wrappedlibxcursordefs32.h
+++ b/src/wrapped32/generated/wrappedlibxcursordefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxcursorDEFS32_H_
 #define __wrappedlibxcursorDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxcursortypes32.h b/src/wrapped32/generated/wrappedlibxcursortypes32.h
index c9179e88..b4161913 100644
--- a/src/wrapped32/generated/wrappedlibxcursortypes32.h
+++ b/src/wrapped32/generated/wrappedlibxcursortypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxcursorTYPES32_H_
 #define __wrappedlibxcursorTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxcursorundefs32.h b/src/wrapped32/generated/wrappedlibxcursorundefs32.h
index 8bd65e03..7ae3f43f 100644
--- a/src/wrapped32/generated/wrappedlibxcursorundefs32.h
+++ b/src/wrapped32/generated/wrappedlibxcursorundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxcursorUNDEFS32_H_
 #define __wrappedlibxcursorUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxfixesdefs32.h b/src/wrapped32/generated/wrappedlibxfixesdefs32.h
index e7ece16b..9216f73a 100644
--- a/src/wrapped32/generated/wrappedlibxfixesdefs32.h
+++ b/src/wrapped32/generated/wrappedlibxfixesdefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxfixesDEFS32_H_
 #define __wrappedlibxfixesDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxfixestypes32.h b/src/wrapped32/generated/wrappedlibxfixestypes32.h
index a2b4dd25..349ec13c 100644
--- a/src/wrapped32/generated/wrappedlibxfixestypes32.h
+++ b/src/wrapped32/generated/wrappedlibxfixestypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxfixesTYPES32_H_
 #define __wrappedlibxfixesTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxfixesundefs32.h b/src/wrapped32/generated/wrappedlibxfixesundefs32.h
index b9613b90..2cb82d4b 100644
--- a/src/wrapped32/generated/wrappedlibxfixesundefs32.h
+++ b/src/wrapped32/generated/wrappedlibxfixesundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxfixesUNDEFS32_H_
 #define __wrappedlibxfixesUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxrandrdefs32.h b/src/wrapped32/generated/wrappedlibxrandrdefs32.h
index a51005b5..6d811e63 100644
--- a/src/wrapped32/generated/wrappedlibxrandrdefs32.h
+++ b/src/wrapped32/generated/wrappedlibxrandrdefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxrandrDEFS32_H_
 #define __wrappedlibxrandrDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxrandrtypes32.h b/src/wrapped32/generated/wrappedlibxrandrtypes32.h
index 631a4713..a186e0e2 100644
--- a/src/wrapped32/generated/wrappedlibxrandrtypes32.h
+++ b/src/wrapped32/generated/wrappedlibxrandrtypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxrandrTYPES32_H_
 #define __wrappedlibxrandrTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxrandrundefs32.h b/src/wrapped32/generated/wrappedlibxrandrundefs32.h
index 66d2c7fe..9059dc7c 100644
--- a/src/wrapped32/generated/wrappedlibxrandrundefs32.h
+++ b/src/wrapped32/generated/wrappedlibxrandrundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxrandrUNDEFS32_H_
 #define __wrappedlibxrandrUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxrenderdefs32.h b/src/wrapped32/generated/wrappedlibxrenderdefs32.h
index 38dd55ec..d46f6fa8 100644
--- a/src/wrapped32/generated/wrappedlibxrenderdefs32.h
+++ b/src/wrapped32/generated/wrappedlibxrenderdefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxrenderDEFS32_H_
 #define __wrappedlibxrenderDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxrendertypes32.h b/src/wrapped32/generated/wrappedlibxrendertypes32.h
index 29429b11..f00ac8d4 100644
--- a/src/wrapped32/generated/wrappedlibxrendertypes32.h
+++ b/src/wrapped32/generated/wrappedlibxrendertypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxrenderTYPES32_H_
 #define __wrappedlibxrenderTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxrenderundefs32.h b/src/wrapped32/generated/wrappedlibxrenderundefs32.h
index fb47f598..ee386074 100644
--- a/src/wrapped32/generated/wrappedlibxrenderundefs32.h
+++ b/src/wrapped32/generated/wrappedlibxrenderundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxrenderUNDEFS32_H_
 #define __wrappedlibxrenderUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxxf86vmdefs32.h b/src/wrapped32/generated/wrappedlibxxf86vmdefs32.h
index 46833c92..a58bfacb 100644
--- a/src/wrapped32/generated/wrappedlibxxf86vmdefs32.h
+++ b/src/wrapped32/generated/wrappedlibxxf86vmdefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxxf86vmDEFS32_H_
 #define __wrappedlibxxf86vmDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxxf86vmtypes32.h b/src/wrapped32/generated/wrappedlibxxf86vmtypes32.h
index 54f3dd5c..8f3093e7 100644
--- a/src/wrapped32/generated/wrappedlibxxf86vmtypes32.h
+++ b/src/wrapped32/generated/wrappedlibxxf86vmtypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxxf86vmTYPES32_H_
 #define __wrappedlibxxf86vmTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedlibxxf86vmundefs32.h b/src/wrapped32/generated/wrappedlibxxf86vmundefs32.h
index 1e59efa1..cde7beca 100644
--- a/src/wrapped32/generated/wrappedlibxxf86vmundefs32.h
+++ b/src/wrapped32/generated/wrappedlibxxf86vmundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedlibxxf86vmUNDEFS32_H_
 #define __wrappedlibxxf86vmUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedopenaldefs32.h b/src/wrapped32/generated/wrappedopenaldefs32.h
index 980abd98..3a935606 100644
--- a/src/wrapped32/generated/wrappedopenaldefs32.h
+++ b/src/wrapped32/generated/wrappedopenaldefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedopenalDEFS32_H_
 #define __wrappedopenalDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedopenaltypes32.h b/src/wrapped32/generated/wrappedopenaltypes32.h
index f93c2d8e..7ebb6341 100644
--- a/src/wrapped32/generated/wrappedopenaltypes32.h
+++ b/src/wrapped32/generated/wrappedopenaltypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedopenalTYPES32_H_
 #define __wrappedopenalTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedopenalundefs32.h b/src/wrapped32/generated/wrappedopenalundefs32.h
index 600e6f9b..4d2b0c23 100644
--- a/src/wrapped32/generated/wrappedopenalundefs32.h
+++ b/src/wrapped32/generated/wrappedopenalundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedopenalUNDEFS32_H_
 #define __wrappedopenalUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedsdl1defs32.h b/src/wrapped32/generated/wrappedsdl1defs32.h
index 96f90f65..d02a8385 100644
--- a/src/wrapped32/generated/wrappedsdl1defs32.h
+++ b/src/wrapped32/generated/wrappedsdl1defs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedsdl1DEFS32_H_
 #define __wrappedsdl1DEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedsdl1types32.h b/src/wrapped32/generated/wrappedsdl1types32.h
index 97f17cf8..9f51a9db 100644
--- a/src/wrapped32/generated/wrappedsdl1types32.h
+++ b/src/wrapped32/generated/wrappedsdl1types32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedsdl1TYPES32_H_
 #define __wrappedsdl1TYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedsdl1undefs32.h b/src/wrapped32/generated/wrappedsdl1undefs32.h
index fdf25645..f08371b0 100644
--- a/src/wrapped32/generated/wrappedsdl1undefs32.h
+++ b/src/wrapped32/generated/wrappedsdl1undefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedsdl1UNDEFS32_H_
 #define __wrappedsdl1UNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedsdl2defs32.h b/src/wrapped32/generated/wrappedsdl2defs32.h
index b0899840..f029a366 100644
--- a/src/wrapped32/generated/wrappedsdl2defs32.h
+++ b/src/wrapped32/generated/wrappedsdl2defs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedsdl2DEFS32_H_
 #define __wrappedsdl2DEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedsdl2types32.h b/src/wrapped32/generated/wrappedsdl2types32.h
index 62213d84..76272d87 100644
--- a/src/wrapped32/generated/wrappedsdl2types32.h
+++ b/src/wrapped32/generated/wrappedsdl2types32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedsdl2TYPES32_H_
 #define __wrappedsdl2TYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedsdl2undefs32.h b/src/wrapped32/generated/wrappedsdl2undefs32.h
index 3bacf653..6a9a88b5 100644
--- a/src/wrapped32/generated/wrappedsdl2undefs32.h
+++ b/src/wrapped32/generated/wrappedsdl2undefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedsdl2UNDEFS32_H_
 #define __wrappedsdl2UNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedtcmallocminimaldefs32.h b/src/wrapped32/generated/wrappedtcmallocminimaldefs32.h
index 52e3ea68..4f69b008 100644
--- a/src/wrapped32/generated/wrappedtcmallocminimaldefs32.h
+++ b/src/wrapped32/generated/wrappedtcmallocminimaldefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedtcmallocminimalDEFS32_H_
 #define __wrappedtcmallocminimalDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrappedtcmallocminimaltypes32.h b/src/wrapped32/generated/wrappedtcmallocminimaltypes32.h
index ee34efa2..93898fa7 100644
--- a/src/wrapped32/generated/wrappedtcmallocminimaltypes32.h
+++ b/src/wrapped32/generated/wrappedtcmallocminimaltypes32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedtcmallocminimalTYPES32_H_
 #define __wrappedtcmallocminimalTYPES32_H_
 
diff --git a/src/wrapped32/generated/wrappedtcmallocminimalundefs32.h b/src/wrapped32/generated/wrappedtcmallocminimalundefs32.h
index 5c955240..c2b7d5ee 100644
--- a/src/wrapped32/generated/wrappedtcmallocminimalundefs32.h
+++ b/src/wrapped32/generated/wrappedtcmallocminimalundefs32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __wrappedtcmallocminimalUNDEFS32_H_
 #define __wrappedtcmallocminimalUNDEFS32_H_
 
diff --git a/src/wrapped32/generated/wrapper32.c b/src/wrapped32/generated/wrapper32.c
index a4b09ef0..7bd47850 100644
--- a/src/wrapped32/generated/wrapper32.c
+++ b/src/wrapped32/generated/wrapper32.c
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdint.h>
@@ -112,6 +112,7 @@ typedef int32_t (*iFI_t)(int64_t);
 typedef int32_t (*iFu_t)(uint32_t);
 typedef int32_t (*iFf_t)(float);
 typedef int32_t (*iFd_t)(double);
+typedef int32_t (*iFl_t)(intptr_t);
 typedef int32_t (*iFL_t)(uintptr_t);
 typedef int32_t (*iFp_t)(void*);
 typedef int32_t (*iFh_t)(uintptr_t);
@@ -126,12 +127,14 @@ typedef uint8_t (*CFu_t)(uint32_t);
 typedef uint8_t (*CFU_t)(uint64_t);
 typedef uint8_t (*CFl_t)(intptr_t);
 typedef uint8_t (*CFp_t)(void*);
+typedef uint16_t (*WFW_t)(uint16_t);
 typedef uint16_t (*WFu_t)(uint32_t);
 typedef uint32_t (*uFv_t)(void);
 typedef uint32_t (*uFi_t)(int32_t);
 typedef uint32_t (*uFu_t)(uint32_t);
 typedef uint32_t (*uFU_t)(uint64_t);
 typedef uint32_t (*uFp_t)(void*);
+typedef uint32_t (*uFS_t)(void*);
 typedef uint64_t (*UFu_t)(uint32_t);
 typedef uint64_t (*UFp_t)(void*);
 typedef uint64_t (*UFs_t)(void*);
@@ -141,6 +144,7 @@ typedef double (*dFv_t)(void);
 typedef double (*dFi_t)(int32_t);
 typedef double (*dFd_t)(double);
 typedef double (*dFp_t)(void*);
+typedef intptr_t (*lFv_t)(void);
 typedef intptr_t (*lFi_t)(int32_t);
 typedef intptr_t (*lFu_t)(uint32_t);
 typedef intptr_t (*lFl_t)(intptr_t);
@@ -163,8 +167,8 @@ typedef char* (*tFu_t)(uint32_t);
 typedef char* (*tFp_t)(void*);
 typedef void* (*XFv_t)(void);
 typedef int32_t (*iFBp__t)(struct_p_t*);
-typedef uintptr_t (*LFrL__t)(struct_L_t*);
-typedef void* (*pFrL__t)(struct_L_t*);
+typedef uintptr_t (*LFrl__t)(struct_l_t*);
+typedef void* (*pFrl__t)(struct_l_t*);
 typedef void (*vFbuuipWCCp__t)(struct_uuipWCCp_t*);
 typedef uintptr_t (*LFriiiiiiiiilt__t)(struct_iiiiiiiiilt_t*);
 typedef void* (*pFriiiiiiiiilt__t)(struct_iiiiiiiiilt_t*);
@@ -219,13 +223,14 @@ typedef int32_t (*iFEX_t)(x64emu_t*, void*);
 typedef int32_t (*iFii_t)(int32_t, int32_t);
 typedef int32_t (*iFiI_t)(int32_t, int64_t);
 typedef int32_t (*iFiu_t)(int32_t, uint32_t);
+typedef int32_t (*iFil_t)(int32_t, intptr_t);
 typedef int32_t (*iFip_t)(int32_t, void*);
-typedef int32_t (*iFia_t)(int32_t, void*);
 typedef int32_t (*iFiS_t)(int32_t, void*);
 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);
 typedef int32_t (*iFup_t)(uint32_t, void*);
-typedef int32_t (*iFli_t)(intptr_t, int32_t);
+typedef int32_t (*iFua_t)(uint32_t, void*);
 typedef int32_t (*iFpi_t)(void*, int32_t);
 typedef int32_t (*iFpu_t)(void*, uint32_t);
 typedef int32_t (*iFpl_t)(void*, intptr_t);
@@ -249,16 +254,15 @@ typedef uint8_t (*CFuu_t)(uint32_t, uint32_t);
 typedef uint8_t (*CFuU_t)(uint32_t, uint64_t);
 typedef uint8_t (*CFpi_t)(void*, int32_t);
 typedef uint8_t (*CFpp_t)(void*, void*);
-typedef uint32_t (*uFEu_t)(x64emu_t*, uint32_t);
 typedef uint32_t (*uFEp_t)(x64emu_t*, void*);
-typedef uint32_t (*uFEV_t)(x64emu_t*, void*);
+typedef uint32_t (*uFiS_t)(int32_t, void*);
 typedef uint32_t (*uFuu_t)(uint32_t, uint32_t);
 typedef uint32_t (*uFup_t)(uint32_t, void*);
+typedef uint32_t (*uFua_t)(uint32_t, void*);
+typedef uint32_t (*uFuS_t)(uint32_t, void*);
 typedef uint32_t (*uFpi_t)(void*, int32_t);
 typedef uint32_t (*uFpu_t)(void*, uint32_t);
 typedef uint32_t (*uFpp_t)(void*, void*);
-typedef uint32_t (*uFpa_t)(void*, void*);
-typedef uint64_t (*UFii_t)(int32_t, int32_t);
 typedef uint64_t (*UFuu_t)(uint32_t, uint32_t);
 typedef uint64_t (*UFUU_t)(uint64_t, uint64_t);
 typedef uint64_t (*UFss_t)(void*, void*);
@@ -272,15 +276,20 @@ typedef double (*dFdi_t)(double, int32_t);
 typedef double (*dFdd_t)(double, double);
 typedef double (*dFdD_t)(double, long double);
 typedef double (*dFdp_t)(double, void*);
-typedef double (*dFLL_t)(uintptr_t, uintptr_t);
+typedef double (*dFll_t)(intptr_t, intptr_t);
 typedef double (*dFpp_t)(void*, void*);
+typedef intptr_t (*lFEV_t)(x64emu_t*, void*);
 typedef intptr_t (*lFES_t)(x64emu_t*, void*);
+typedef intptr_t (*lFii_t)(int32_t, int32_t);
 typedef intptr_t (*lFui_t)(uint32_t, int32_t);
 typedef intptr_t (*lFll_t)(intptr_t, intptr_t);
+typedef intptr_t (*lFpi_t)(void*, int32_t);
 typedef intptr_t (*lFpl_t)(void*, intptr_t);
+typedef uintptr_t (*LFEL_t)(x64emu_t*, uintptr_t);
 typedef uintptr_t (*LFLi_t)(uintptr_t, int32_t);
 typedef uintptr_t (*LFpL_t)(void*, uintptr_t);
 typedef uintptr_t (*LFpp_t)(void*, void*);
+typedef uintptr_t (*LFpa_t)(void*, void*);
 typedef uintptr_t (*LFXi_t)(void*, int32_t);
 typedef uintptr_t (*LFXL_t)(void*, uintptr_t);
 typedef void* (*pFEv_t)(x64emu_t*);
@@ -308,11 +317,12 @@ typedef int32_t (*iFpBL__t)(void*, struct_L_t*);
 typedef int32_t (*iFHBp__t)(uintptr_t, struct_p_t*);
 typedef float (*fFpBp__t)(void*, struct_p_t*);
 typedef double (*dFpBp__t)(void*, struct_p_t*);
-typedef void* (*pFrL_p_t)(struct_L_t*, void*);
+typedef void* (*pFrl_p_t)(struct_l_t*, void*);
 typedef int32_t (*iFuBLL__t)(uint32_t, struct_LL_t*);
-typedef int32_t (*iFprLL__t)(void*, struct_LL_t*);
+typedef int32_t (*iFprll__t)(void*, struct_ll_t*);
 typedef int32_t (*iFpbup__t)(void*, struct_up_t*);
-typedef int32_t (*iFBLL_p_t)(struct_LL_t*, void*);
+typedef int32_t (*iFprLL__t)(void*, struct_LL_t*);
+typedef int32_t (*iFBll_p_t)(struct_ll_t*, void*);
 typedef int32_t (*iFrLL_BLL__t)(struct_LL_t*, struct_LL_t*);
 typedef int32_t (*iFpruuipWCCp__t)(void*, struct_uuipWCCp_t*);
 typedef void* (*pFriiiiiiiiilt_p_t)(struct_iiiiiiiiilt_t*, void*);
@@ -396,27 +406,29 @@ typedef int32_t (*iFEpp_t)(x64emu_t*, void*, void*);
 typedef int32_t (*iFEpV_t)(x64emu_t*, void*, void*);
 typedef int32_t (*iFEhi_t)(x64emu_t*, uintptr_t, int32_t);
 typedef int32_t (*iFEhp_t)(x64emu_t*, uintptr_t, void*);
-typedef int32_t (*iFESp_t)(x64emu_t*, void*, void*);
 typedef int32_t (*iFEXp_t)(x64emu_t*, void*, void*);
 typedef int32_t (*iFiii_t)(int32_t, int32_t, int32_t);
 typedef int32_t (*iFiiI_t)(int32_t, int32_t, int64_t);
-typedef int32_t (*iFiiu_t)(int32_t, int32_t, uint32_t);
+typedef int32_t (*iFiil_t)(int32_t, int32_t, intptr_t);
 typedef int32_t (*iFiip_t)(int32_t, int32_t, void*);
 typedef int32_t (*iFiiO_t)(int32_t, int32_t, int32_t);
 typedef int32_t (*iFiII_t)(int32_t, int64_t, int64_t);
 typedef int32_t (*iFiuu_t)(int32_t, uint32_t, uint32_t);
 typedef int32_t (*iFiup_t)(int32_t, uint32_t, void*);
+typedef int32_t (*iFill_t)(int32_t, intptr_t, intptr_t);
+typedef int32_t (*iFiLi_t)(int32_t, uintptr_t, int32_t);
 typedef int32_t (*iFiLN_t)(int32_t, uintptr_t, ...);
+typedef int32_t (*iFipi_t)(int32_t, void*, int32_t);
 typedef int32_t (*iFipu_t)(int32_t, void*, uint32_t);
 typedef int32_t (*iFipL_t)(int32_t, void*, uintptr_t);
 typedef int32_t (*iFipp_t)(int32_t, void*, void*);
-typedef int32_t (*iFuii_t)(uint32_t, int32_t, int32_t);
 typedef int32_t (*iFuip_t)(uint32_t, int32_t, void*);
 typedef int32_t (*iFuui_t)(uint32_t, uint32_t, int32_t);
 typedef int32_t (*iFuuu_t)(uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFuup_t)(uint32_t, uint32_t, void*);
-typedef int32_t (*iFuLp_t)(uint32_t, uintptr_t, void*);
+typedef int32_t (*iFuLa_t)(uint32_t, uintptr_t, void*);
 typedef int32_t (*iFfff_t)(float, float, float);
+typedef int32_t (*iFLLi_t)(uintptr_t, uintptr_t, int32_t);
 typedef int32_t (*iFpii_t)(void*, int32_t, int32_t);
 typedef int32_t (*iFpiu_t)(void*, int32_t, uint32_t);
 typedef int32_t (*iFpip_t)(void*, int32_t, void*);
@@ -464,6 +476,7 @@ typedef float (*fFfff_t)(float, float, float);
 typedef float (*fFffp_t)(float, float, void*);
 typedef double (*dFddd_t)(double, double, double);
 typedef double (*dFddp_t)(double, double, void*);
+typedef intptr_t (*lFili_t)(int32_t, intptr_t, int32_t);
 typedef intptr_t (*lFipL_t)(int32_t, void*, uintptr_t);
 typedef intptr_t (*lFlpi_t)(intptr_t, void*, int32_t);
 typedef intptr_t (*lFpLL_t)(void*, uintptr_t, uintptr_t);
@@ -493,7 +506,7 @@ typedef void* (*pFpii_t)(void*, int32_t, int32_t);
 typedef void* (*pFpiu_t)(void*, int32_t, uint32_t);
 typedef void* (*pFpiL_t)(void*, int32_t, uintptr_t);
 typedef void* (*pFpiS_t)(void*, int32_t, void*);
-typedef void* (*pFpuL_t)(void*, uint32_t, uintptr_t);
+typedef void* (*pFpII_t)(void*, int64_t, int64_t);
 typedef void* (*pFpup_t)(void*, uint32_t, void*);
 typedef void* (*pFppu_t)(void*, void*, uint32_t);
 typedef void* (*pFppL_t)(void*, void*, uintptr_t);
@@ -506,7 +519,6 @@ typedef void* (*SFEpp_t)(x64emu_t*, void*, void*);
 typedef void* (*SFppS_t)(void*, void*, void*);
 typedef char* (*tFipu_t)(int32_t, void*, uint32_t);
 typedef int32_t (*iFppbL__t)(void*, void*, struct_L_t*);
-typedef int32_t (*iFpBp_i_t)(void*, struct_p_t*, int32_t);
 typedef int32_t (*iFpbL_p_t)(void*, struct_L_t*, void*);
 typedef int32_t (*iFBp_LL_t)(struct_p_t*, uintptr_t, uintptr_t);
 typedef int32_t (*iFBp_pi_t)(struct_p_t*, void*, int32_t);
@@ -628,7 +640,7 @@ typedef int32_t (*iFEppu_t)(x64emu_t*, void*, void*, uint32_t);
 typedef int32_t (*iFEppL_t)(x64emu_t*, void*, void*, uintptr_t);
 typedef int32_t (*iFEppp_t)(x64emu_t*, void*, void*, void*);
 typedef int32_t (*iFEppV_t)(x64emu_t*, void*, void*, void*);
-typedef int32_t (*iFEpOu_t)(x64emu_t*, void*, int32_t, uint32_t);
+typedef int32_t (*iFEpON_t)(x64emu_t*, void*, int32_t, ...);
 typedef int32_t (*iFEhup_t)(x64emu_t*, uintptr_t, uint32_t, void*);
 typedef int32_t (*iFESpp_t)(x64emu_t*, void*, void*, void*);
 typedef int32_t (*iFESpV_t)(x64emu_t*, void*, void*, void*);
@@ -637,8 +649,9 @@ typedef int32_t (*iFEXLp_t)(x64emu_t*, void*, uintptr_t, void*);
 typedef int32_t (*iFiiiu_t)(int32_t, int32_t, int32_t, uint32_t);
 typedef int32_t (*iFiiip_t)(int32_t, int32_t, int32_t, void*);
 typedef int32_t (*iFiiiN_t)(int32_t, int32_t, int32_t, ...);
-typedef int32_t (*iFiill_t)(int32_t, int32_t, intptr_t, intptr_t);
-typedef int32_t (*iFiuui_t)(int32_t, uint32_t, uint32_t, int32_t);
+typedef int32_t (*iFiiII_t)(int32_t, int32_t, int64_t, int64_t);
+typedef int32_t (*iFiIIi_t)(int32_t, int64_t, int64_t, int32_t);
+typedef int32_t (*iFilli_t)(int32_t, intptr_t, intptr_t, int32_t);
 typedef int32_t (*iFipii_t)(int32_t, void*, int32_t, int32_t);
 typedef int32_t (*iFipui_t)(int32_t, void*, uint32_t, int32_t);
 typedef int32_t (*iFipup_t)(int32_t, void*, uint32_t, void*);
@@ -655,7 +668,7 @@ typedef int32_t (*iFppui_t)(void*, void*, uint32_t, int32_t);
 typedef int32_t (*iFppLi_t)(void*, void*, uintptr_t, int32_t);
 typedef int32_t (*iFpppi_t)(void*, void*, void*, int32_t);
 typedef int32_t (*iFpppp_t)(void*, void*, void*, void*);
-typedef int32_t (*iFhpiL_t)(uintptr_t, void*, int32_t, uintptr_t);
+typedef int32_t (*iFSpiL_t)(void*, void*, int32_t, uintptr_t);
 typedef int32_t (*iFXipi_t)(void*, int32_t, void*, int32_t);
 typedef int32_t (*iFXipp_t)(void*, int32_t, void*, void*);
 typedef int32_t (*iFXLii_t)(void*, uintptr_t, int32_t, int32_t);
@@ -668,6 +681,7 @@ typedef uint32_t (*uFuuuu_t)(uint32_t, uint32_t, uint32_t, uint32_t);
 typedef uint32_t (*uFpCCC_t)(void*, uint8_t, uint8_t, uint8_t);
 typedef uint32_t (*uFppip_t)(void*, void*, int32_t, void*);
 typedef intptr_t (*lFEipi_t)(x64emu_t*, int32_t, void*, int32_t);
+typedef intptr_t (*lFEppL_t)(x64emu_t*, void*, void*, uintptr_t);
 typedef intptr_t (*lFiipL_t)(int32_t, int32_t, void*, uintptr_t);
 typedef intptr_t (*lFipLi_t)(int32_t, void*, uintptr_t, int32_t);
 typedef intptr_t (*lFipLl_t)(int32_t, void*, uintptr_t, intptr_t);
@@ -702,7 +716,7 @@ typedef int32_t (*iFBp_pui_t)(struct_p_t*, void*, uint32_t, int32_t);
 typedef int64_t (*IFpBp_ii_t)(void*, struct_p_t*, int32_t, int32_t);
 typedef uint32_t (*uFppiBp__t)(void*, void*, int32_t, struct_p_t*);
 typedef uint64_t (*UFpBp_ii_t)(void*, struct_p_t*, int32_t, int32_t);
-typedef intptr_t (*lFiibp_L_t)(int32_t, int32_t, struct_p_t*, uintptr_t);
+typedef intptr_t (*lFiibl_L_t)(int32_t, int32_t, struct_l_t*, uintptr_t);
 typedef uintptr_t (*LFpbp_Lp_t)(void*, struct_p_t*, uintptr_t, void*);
 typedef int32_t (*iFEpprLL__t)(x64emu_t*, void*, void*, struct_LL_t*);
 typedef void (*vFXLrpLiL_L_t)(void*, uintptr_t, struct_pLiL_t*, uintptr_t);
@@ -712,6 +726,7 @@ typedef uintptr_t (*LFpLpriiiiiiiiilt__t)(void*, uintptr_t, void*, struct_iiiiii
 typedef int32_t (*iFpruuipWCCp_buuipWCCp_i_t)(void*, struct_uuipWCCp_t*, struct_uuipWCCp_t*, int32_t);
 typedef void (*vFEuipp_t)(x64emu_t*, uint32_t, int32_t, void*, void*);
 typedef void (*vFEpLLp_t)(x64emu_t*, void*, uintptr_t, uintptr_t, void*);
+typedef void (*vFEppiV_t)(x64emu_t*, void*, void*, int32_t, void*);
 typedef void (*vFiiiii_t)(int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFiiiiu_t)(int32_t, int32_t, int32_t, int32_t, uint32_t);
 typedef void (*vFiiuii_t)(int32_t, int32_t, uint32_t, int32_t, int32_t);
@@ -808,10 +823,8 @@ typedef int32_t (*iFEiiip_t)(x64emu_t*, int32_t, int32_t, int32_t, void*);
 typedef int32_t (*iFEipii_t)(x64emu_t*, int32_t, void*, int32_t, int32_t);
 typedef int32_t (*iFEpipp_t)(x64emu_t*, void*, int32_t, void*, void*);
 typedef int32_t (*iFEpupu_t)(x64emu_t*, void*, uint32_t, void*, uint32_t);
-typedef int32_t (*iFEpupV_t)(x64emu_t*, void*, uint32_t, void*, void*);
 typedef int32_t (*iFEpLpp_t)(x64emu_t*, void*, uintptr_t, void*, void*);
 typedef int32_t (*iFEpLpV_t)(x64emu_t*, void*, uintptr_t, void*, void*);
-typedef int32_t (*iFEppiV_t)(x64emu_t*, void*, void*, int32_t, void*);
 typedef int32_t (*iFEpplp_t)(x64emu_t*, void*, void*, intptr_t, void*);
 typedef int32_t (*iFEpppi_t)(x64emu_t*, void*, void*, void*, int32_t);
 typedef int32_t (*iFEpppp_t)(x64emu_t*, void*, void*, void*, void*);
@@ -827,7 +840,7 @@ typedef int32_t (*iFpCCCC_t)(void*, uint8_t, uint8_t, uint8_t, uint8_t);
 typedef int32_t (*iFpLuLi_t)(void*, uintptr_t, uint32_t, uintptr_t, int32_t);
 typedef int32_t (*iFppiUi_t)(void*, void*, int32_t, uint64_t, int32_t);
 typedef int32_t (*iFpppip_t)(void*, void*, void*, int32_t, void*);
-typedef int32_t (*iFpppup_t)(void*, void*, void*, uint32_t, void*);
+typedef int32_t (*iFpppLp_t)(void*, void*, void*, uintptr_t, void*);
 typedef int32_t (*iFppppp_t)(void*, void*, void*, void*, void*);
 typedef int32_t (*iFXiiip_t)(void*, int32_t, int32_t, int32_t, void*);
 typedef int32_t (*iFXpppp_t)(void*, void*, void*, void*, void*);
@@ -922,7 +935,6 @@ typedef void (*vFpdddii_t)(void*, double, double, double, int32_t, int32_t);
 typedef void (*vFppupii_t)(void*, void*, uint32_t, void*, int32_t, int32_t);
 typedef void (*vFpppppp_t)(void*, void*, void*, void*, void*, void*);
 typedef void (*vFXLiiii_t)(void*, uintptr_t, int32_t, int32_t, int32_t, int32_t);
-typedef int32_t (*iFEuppup_t)(x64emu_t*, uint32_t, void*, void*, uint32_t, void*);
 typedef int32_t (*iFEuppLp_t)(x64emu_t*, uint32_t, void*, void*, uintptr_t, void*);
 typedef int32_t (*iFEpiLpp_t)(x64emu_t*, void*, int32_t, uintptr_t, void*, void*);
 typedef int32_t (*iFEpuuup_t)(x64emu_t*, void*, uint32_t, uint32_t, uint32_t, void*);
@@ -930,7 +942,7 @@ typedef int32_t (*iFEplluu_t)(x64emu_t*, void*, intptr_t, intptr_t, uint32_t, ui
 typedef int32_t (*iFEpLlpp_t)(x64emu_t*, void*, uintptr_t, intptr_t, void*, void*);
 typedef int32_t (*iFEppipp_t)(x64emu_t*, void*, void*, int32_t, void*, void*);
 typedef int32_t (*iFEppllp_t)(x64emu_t*, void*, void*, intptr_t, intptr_t, void*);
-typedef int32_t (*iFEpppup_t)(x64emu_t*, void*, void*, void*, uint32_t, void*);
+typedef int32_t (*iFEpppLp_t)(x64emu_t*, void*, void*, void*, uintptr_t, void*);
 typedef int32_t (*iFEXLilp_t)(x64emu_t*, void*, uintptr_t, int32_t, intptr_t, void*);
 typedef int32_t (*iFEXpiup_t)(x64emu_t*, void*, void*, int32_t, uint32_t, void*);
 typedef int32_t (*iFEXpppp_t)(x64emu_t*, void*, void*, void*, void*, void*);
@@ -1002,18 +1014,19 @@ typedef void (*vFudddddd_t)(uint32_t, double, double, double, double, double, do
 typedef void (*vFlliiiip_t)(intptr_t, intptr_t, int32_t, int32_t, int32_t, int32_t, void*);
 typedef void (*vFpipipiu_t)(void*, int32_t, void*, int32_t, void*, int32_t, uint32_t);
 typedef void (*vFpddiidd_t)(void*, double, double, int32_t, int32_t, double, double);
-typedef int32_t (*iFEpuiupV_t)(x64emu_t*, void*, uint32_t, int32_t, uint32_t, void*, void*);
 typedef int32_t (*iFEpLiipV_t)(x64emu_t*, void*, uintptr_t, int32_t, int32_t, void*, void*);
+typedef int32_t (*iFEpLiLpV_t)(x64emu_t*, void*, uintptr_t, int32_t, uintptr_t, void*, void*);
 typedef int32_t (*iFEXLpppp_t)(x64emu_t*, void*, uintptr_t, void*, void*, void*, void*);
 typedef int32_t (*iFuiiiuup_t)(uint32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t, void*);
 typedef int32_t (*iFpWCiWCi_t)(void*, uint16_t, uint8_t, int32_t, uint16_t, uint8_t, int32_t);
-typedef int32_t (*iFpupLpLi_t)(void*, uint32_t, void*, uintptr_t, void*, uintptr_t, int32_t);
+typedef int32_t (*iFpupupui_t)(void*, uint32_t, void*, uint32_t, void*, uint32_t, int32_t);
 typedef int32_t (*iFXiuLiii_t)(void*, int32_t, uint32_t, uintptr_t, int32_t, int32_t, int32_t);
 typedef uint32_t (*uFuippppp_t)(uint32_t, int32_t, void*, void*, void*, void*, void*);
 typedef uintptr_t (*LFXLLppuu_t)(void*, uintptr_t, uintptr_t, void*, void*, uint32_t, uint32_t);
 typedef void* (*pFEpiiiiu_t)(x64emu_t*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t);
 typedef void* (*pFEpLiiii_t)(x64emu_t*, void*, uintptr_t, int32_t, int32_t, int32_t, int32_t);
 typedef void* (*pFEpLiiiI_t)(x64emu_t*, void*, uintptr_t, int32_t, int32_t, int32_t, int64_t);
+typedef void* (*pFEpLiiil_t)(x64emu_t*, void*, uintptr_t, int32_t, int32_t, int32_t, intptr_t);
 typedef void (*vFiiiiuuip_t)(int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t, int32_t, void*);
 typedef void (*vFiilliilp_t)(int32_t, int32_t, intptr_t, intptr_t, int32_t, int32_t, intptr_t, void*);
 typedef void (*vFiupuiuup_t)(int32_t, uint32_t, void*, uint32_t, int32_t, uint32_t, uint32_t, void*);
@@ -1189,6 +1202,7 @@ void iFI_32(x64emu_t *emu, uintptr_t fcn) { iFI_t fn = (iFI_t)fcn; R_EAX = fn(fr
 void iFu_32(x64emu_t *emu, uintptr_t fcn) { iFu_t fn = (iFu_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4)); }
 void iFf_32(x64emu_t *emu, uintptr_t fcn) { iFf_t fn = (iFf_t)fcn; R_EAX = fn(from_ptri(float, R_ESP + 4)); }
 void iFd_32(x64emu_t *emu, uintptr_t fcn) { iFd_t fn = (iFd_t)fcn; R_EAX = fn(from_ptri(double, R_ESP + 4)); }
+void iFl_32(x64emu_t *emu, uintptr_t fcn) { iFl_t fn = (iFl_t)fcn; R_EAX = fn(to_long(from_ptri(long_t, R_ESP + 4))); }
 void iFL_32(x64emu_t *emu, uintptr_t fcn) { iFL_t fn = (iFL_t)fcn; R_EAX = fn(to_ulong(from_ptri(ulong_t, R_ESP + 4))); }
 void iFp_32(x64emu_t *emu, uintptr_t fcn) { iFp_t fn = (iFp_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4)); }
 void iFh_32(x64emu_t *emu, uintptr_t fcn) { iFh_t fn = (iFh_t)fcn; R_EAX = fn(from_hash(from_ptri(ptr_t, R_ESP + 4))); }
@@ -1203,12 +1217,14 @@ void CFu_32(x64emu_t *emu, uintptr_t fcn) { CFu_t fn = (CFu_t)fcn; R_EAX = (unsi
 void CFU_32(x64emu_t *emu, uintptr_t fcn) { CFU_t fn = (CFU_t)fcn; R_EAX = (unsigned char)fn(from_ptri(uint64_t, R_ESP + 4)); }
 void CFl_32(x64emu_t *emu, uintptr_t fcn) { CFl_t fn = (CFl_t)fcn; R_EAX = (unsigned char)fn(to_long(from_ptri(long_t, R_ESP + 4))); }
 void CFp_32(x64emu_t *emu, uintptr_t fcn) { CFp_t fn = (CFp_t)fcn; R_EAX = (unsigned char)fn(from_ptriv(R_ESP + 4)); }
+void WFW_32(x64emu_t *emu, uintptr_t fcn) { WFW_t fn = (WFW_t)fcn; R_EAX = (unsigned short)fn(from_ptri(uint16_t, R_ESP + 4)); }
 void WFu_32(x64emu_t *emu, uintptr_t fcn) { WFu_t fn = (WFu_t)fcn; R_EAX = (unsigned short)fn(from_ptri(uint32_t, R_ESP + 4)); }
 void uFv_32(x64emu_t *emu, uintptr_t fcn) { uFv_t fn = (uFv_t)fcn; R_EAX = (uint32_t)fn(); }
 void uFi_32(x64emu_t *emu, uintptr_t fcn) { uFi_t fn = (uFi_t)fcn; R_EAX = (uint32_t)fn(from_ptri(int32_t, R_ESP + 4)); }
 void uFu_32(x64emu_t *emu, uintptr_t fcn) { uFu_t fn = (uFu_t)fcn; R_EAX = (uint32_t)fn(from_ptri(uint32_t, R_ESP + 4)); }
 void uFU_32(x64emu_t *emu, uintptr_t fcn) { uFU_t fn = (uFU_t)fcn; R_EAX = (uint32_t)fn(from_ptri(uint64_t, R_ESP + 4)); }
 void uFp_32(x64emu_t *emu, uintptr_t fcn) { uFp_t fn = (uFp_t)fcn; R_EAX = (uint32_t)fn(from_ptriv(R_ESP + 4)); }
+void uFS_32(x64emu_t *emu, uintptr_t fcn) { uFS_t fn = (uFS_t)fcn; R_EAX = (uint32_t)fn(io_convert32(from_ptriv(R_ESP + 4))); }
 void UFu_32(x64emu_t *emu, uintptr_t fcn) { UFu_t fn = (UFu_t)fcn; ui64_t r; r.u = (uint64_t)fn(from_ptri(uint32_t, R_ESP + 4)); R_EAX = r.d[0]; R_EDX = r.d[1]; }
 void UFp_32(x64emu_t *emu, uintptr_t fcn) { UFp_t fn = (UFp_t)fcn; ui64_t r; r.u = (uint64_t)fn(from_ptriv(R_ESP + 4)); R_EAX = r.d[0]; R_EDX = r.d[1]; }
 void UFs_32(x64emu_t *emu, uintptr_t fcn) { UFs_t fn = (UFs_t)fcn; ui64_t r; r.u = (uint64_t)fn(from_ptrv(R_ESP + 4)); R_EAX = r.d[0]; R_EDX = r.d[1]; }
@@ -1218,6 +1234,7 @@ void dFv_32(x64emu_t *emu, uintptr_t fcn) { dFv_t fn = (dFv_t)fcn; double db = f
 void dFi_32(x64emu_t *emu, uintptr_t fcn) { dFi_t fn = (dFi_t)fcn; double db = fn(from_ptri(int32_t, R_ESP + 4)); fpu_do_push(emu); ST0val = db; }
 void dFd_32(x64emu_t *emu, uintptr_t fcn) { dFd_t fn = (dFd_t)fcn; double db = fn(from_ptri(double, R_ESP + 4)); fpu_do_push(emu); ST0val = db; }
 void dFp_32(x64emu_t *emu, uintptr_t fcn) { dFp_t fn = (dFp_t)fcn; double db = fn(from_ptriv(R_ESP + 4)); fpu_do_push(emu); ST0val = db; }
+void lFv_32(x64emu_t *emu, uintptr_t fcn) { lFv_t fn = (lFv_t)fcn; R_EAX = to_long(fn()); }
 void lFi_32(x64emu_t *emu, uintptr_t fcn) { lFi_t fn = (lFi_t)fcn; R_EAX = to_long(fn(from_ptri(int32_t, R_ESP + 4))); }
 void lFu_32(x64emu_t *emu, uintptr_t fcn) { lFu_t fn = (lFu_t)fcn; R_EAX = to_long(fn(from_ptri(uint32_t, R_ESP + 4))); }
 void lFl_32(x64emu_t *emu, uintptr_t fcn) { lFl_t fn = (lFl_t)fcn; R_EAX = to_long(fn(to_long(from_ptri(long_t, R_ESP + 4)))); }
@@ -1240,11 +1257,11 @@ void tFu_32(x64emu_t *emu, uintptr_t fcn) { tFu_t fn = (tFu_t)fcn; R_EAX = to_cs
 void tFp_32(x64emu_t *emu, uintptr_t fcn) { tFp_t fn = (tFp_t)fcn; R_EAX = to_cstring(fn(from_ptriv(R_ESP + 4))); }
 void XFv_32(x64emu_t *emu, uintptr_t fcn) { XFv_t fn = (XFv_t)fcn; R_EAX = to_ptrv(FindDisplay(fn())); }
 void iFBp__32(x64emu_t *emu, uintptr_t fcn) { iFBp__t fn = (iFBp__t)fcn; struct_p_t arg_4={0}; R_EAX = fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 4)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 4))), &arg_4); }
-void LFrL__32(x64emu_t *emu, uintptr_t fcn) { LFrL__t fn = (LFrL__t)fcn; struct_L_t arg_4={0}; from_struct_L(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); R_EAX = to_ulong(fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL)); }
-void pFrL__32(x64emu_t *emu, uintptr_t fcn) { pFrL__t fn = (pFrL__t)fcn; struct_L_t arg_4={0}; from_struct_L(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); R_EAX = to_ptrv(fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL)); }
-void vFbuuipWCCp__32(x64emu_t *emu, uintptr_t fcn) { vFbuuipWCCp__t fn = (vFbuuipWCCp__t)fcn; struct_uuipWCCp_t arg_4={0}; from_struct_uuipWCCp(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 4)))) to_struct_uuipWCCp(*(ptr_t*)(from_ptr((R_ESP + 4))), &arg_4); }
-void LFriiiiiiiiilt__32(x64emu_t *emu, uintptr_t fcn) { LFriiiiiiiiilt__t fn = (LFriiiiiiiiilt__t)fcn; struct_iiiiiiiiilt_t arg_4={0}; from_struct_iiiiiiiiilt(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); R_EAX = to_ulong(fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL)); }
-void pFriiiiiiiiilt__32(x64emu_t *emu, uintptr_t fcn) { pFriiiiiiiiilt__t fn = (pFriiiiiiiiilt__t)fcn; struct_iiiiiiiiilt_t arg_4={0}; from_struct_iiiiiiiiilt(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); R_EAX = to_ptrv(fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL)); }
+void LFrl__32(x64emu_t *emu, uintptr_t fcn) { LFrl__t fn = (LFrl__t)fcn; struct_l_t arg_4={0}; if (*(ptr_t*)(from_ptr((R_ESP + 4)))) from_struct_l(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); R_EAX = to_ulong(fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL)); }
+void pFrl__32(x64emu_t *emu, uintptr_t fcn) { pFrl__t fn = (pFrl__t)fcn; struct_l_t arg_4={0}; if (*(ptr_t*)(from_ptr((R_ESP + 4)))) from_struct_l(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); R_EAX = to_ptrv(fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL)); }
+void vFbuuipWCCp__32(x64emu_t *emu, uintptr_t fcn) { vFbuuipWCCp__t fn = (vFbuuipWCCp__t)fcn; struct_uuipWCCp_t arg_4={0}; if (*(ptr_t*)(from_ptr((R_ESP + 4)))) from_struct_uuipWCCp(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 4)))) to_struct_uuipWCCp(*(ptr_t*)(from_ptr((R_ESP + 4))), &arg_4); }
+void LFriiiiiiiiilt__32(x64emu_t *emu, uintptr_t fcn) { LFriiiiiiiiilt__t fn = (LFriiiiiiiiilt__t)fcn; struct_iiiiiiiiilt_t arg_4={0}; if (*(ptr_t*)(from_ptr((R_ESP + 4)))) from_struct_iiiiiiiiilt(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); R_EAX = to_ulong(fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL)); }
+void pFriiiiiiiiilt__32(x64emu_t *emu, uintptr_t fcn) { pFriiiiiiiiilt__t fn = (pFriiiiiiiiilt__t)fcn; struct_iiiiiiiiilt_t arg_4={0}; if (*(ptr_t*)(from_ptr((R_ESP + 4)))) from_struct_iiiiiiiiilt(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); R_EAX = to_ptrv(fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL)); }
 void vFEv_32(x64emu_t *emu, uintptr_t fcn) { vFEv_t fn = (vFEv_t)fcn; fn(emu); }
 void vFEp_32(x64emu_t *emu, uintptr_t fcn) { vFEp_t fn = (vFEp_t)fcn; fn(emu, from_ptriv(R_ESP + 4)); }
 void vFcc_32(x64emu_t *emu, uintptr_t fcn) { vFcc_t fn = (vFcc_t)fcn; fn(from_ptri(int8_t, R_ESP + 4), from_ptri(int8_t, R_ESP + 8)); }
@@ -1296,13 +1313,14 @@ void iFEX_32(x64emu_t *emu, uintptr_t fcn) { iFEX_t fn = (iFEX_t)fcn; R_EAX = fn
 void iFii_32(x64emu_t *emu, uintptr_t fcn) { iFii_t fn = (iFii_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8)); }
 void iFiI_32(x64emu_t *emu, uintptr_t fcn) { iFiI_t fn = (iFiI_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int64_t, R_ESP + 8)); }
 void iFiu_32(x64emu_t *emu, uintptr_t fcn) { iFiu_t fn = (iFiu_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(uint32_t, R_ESP + 8)); }
+void iFil_32(x64emu_t *emu, uintptr_t fcn) { iFil_t fn = (iFil_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), to_long(from_ptri(long_t, R_ESP + 8))); }
 void iFip_32(x64emu_t *emu, uintptr_t fcn) { iFip_t fn = (iFip_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8)); }
-void iFia_32(x64emu_t *emu, uintptr_t fcn) { iFia_t fn = (iFia_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_locale(from_ptri(ptr_t, R_ESP + 8))); }
 void iFiS_32(x64emu_t *emu, uintptr_t fcn) { iFiS_t fn = (iFiS_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), io_convert32(from_ptriv(R_ESP + 8))); }
 void iFui_32(x64emu_t *emu, uintptr_t fcn) { iFui_t fn = (iFui_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8)); }
 void iFuu_32(x64emu_t *emu, uintptr_t fcn) { iFuu_t fn = (iFuu_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(uint32_t, R_ESP + 8)); }
+void iFuL_32(x64emu_t *emu, uintptr_t fcn) { iFuL_t fn = (iFuL_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8))); }
 void iFup_32(x64emu_t *emu, uintptr_t fcn) { iFup_t fn = (iFup_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), from_ptriv(R_ESP + 8)); }
-void iFli_32(x64emu_t *emu, uintptr_t fcn) { iFli_t fn = (iFli_t)fcn; R_EAX = fn(to_long(from_ptri(long_t, R_ESP + 4)), from_ptri(int32_t, R_ESP + 8)); }
+void iFua_32(x64emu_t *emu, uintptr_t fcn) { iFua_t fn = (iFua_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), from_locale(from_ptri(ptr_t, R_ESP + 8))); }
 void iFpi_32(x64emu_t *emu, uintptr_t fcn) { iFpi_t fn = (iFpi_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8)); }
 void iFpu_32(x64emu_t *emu, uintptr_t fcn) { iFpu_t fn = (iFpu_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptri(uint32_t, R_ESP + 8)); }
 void iFpl_32(x64emu_t *emu, uintptr_t fcn) { iFpl_t fn = (iFpl_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), to_long(from_ptri(long_t, R_ESP + 8))); }
@@ -1326,16 +1344,15 @@ void CFuu_32(x64emu_t *emu, uintptr_t fcn) { CFuu_t fn = (CFuu_t)fcn; R_EAX = (u
 void CFuU_32(x64emu_t *emu, uintptr_t fcn) { CFuU_t fn = (CFuU_t)fcn; R_EAX = (unsigned char)fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(uint64_t, R_ESP + 8)); }
 void CFpi_32(x64emu_t *emu, uintptr_t fcn) { CFpi_t fn = (CFpi_t)fcn; R_EAX = (unsigned char)fn(from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8)); }
 void CFpp_32(x64emu_t *emu, uintptr_t fcn) { CFpp_t fn = (CFpp_t)fcn; R_EAX = (unsigned char)fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8)); }
-void uFEu_32(x64emu_t *emu, uintptr_t fcn) { uFEu_t fn = (uFEu_t)fcn; R_EAX = (uint32_t)fn(emu, from_ptri(uint32_t, R_ESP + 4)); }
 void uFEp_32(x64emu_t *emu, uintptr_t fcn) { uFEp_t fn = (uFEp_t)fcn; R_EAX = (uint32_t)fn(emu, from_ptriv(R_ESP + 4)); }
-void uFEV_32(x64emu_t *emu, uintptr_t fcn) { uFEV_t fn = (uFEV_t)fcn; R_EAX = (uint32_t)fn(emu, from_ptrv(R_ESP + 4)); }
+void uFiS_32(x64emu_t *emu, uintptr_t fcn) { uFiS_t fn = (uFiS_t)fcn; R_EAX = (uint32_t)fn(from_ptri(int32_t, R_ESP + 4), io_convert32(from_ptriv(R_ESP + 8))); }
 void uFuu_32(x64emu_t *emu, uintptr_t fcn) { uFuu_t fn = (uFuu_t)fcn; R_EAX = (uint32_t)fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(uint32_t, R_ESP + 8)); }
 void uFup_32(x64emu_t *emu, uintptr_t fcn) { uFup_t fn = (uFup_t)fcn; R_EAX = (uint32_t)fn(from_ptri(uint32_t, R_ESP + 4), from_ptriv(R_ESP + 8)); }
+void uFua_32(x64emu_t *emu, uintptr_t fcn) { uFua_t fn = (uFua_t)fcn; R_EAX = (uint32_t)fn(from_ptri(uint32_t, R_ESP + 4), from_locale(from_ptri(ptr_t, R_ESP + 8))); }
+void uFuS_32(x64emu_t *emu, uintptr_t fcn) { uFuS_t fn = (uFuS_t)fcn; R_EAX = (uint32_t)fn(from_ptri(uint32_t, R_ESP + 4), io_convert32(from_ptriv(R_ESP + 8))); }
 void uFpi_32(x64emu_t *emu, uintptr_t fcn) { uFpi_t fn = (uFpi_t)fcn; R_EAX = (uint32_t)fn(from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8)); }
 void uFpu_32(x64emu_t *emu, uintptr_t fcn) { uFpu_t fn = (uFpu_t)fcn; R_EAX = (uint32_t)fn(from_ptriv(R_ESP + 4), from_ptri(uint32_t, R_ESP + 8)); }
 void uFpp_32(x64emu_t *emu, uintptr_t fcn) { uFpp_t fn = (uFpp_t)fcn; R_EAX = (uint32_t)fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8)); }
-void uFpa_32(x64emu_t *emu, uintptr_t fcn) { uFpa_t fn = (uFpa_t)fcn; R_EAX = (uint32_t)fn(from_ptriv(R_ESP + 4), from_locale(from_ptri(ptr_t, R_ESP + 8))); }
-void UFii_32(x64emu_t *emu, uintptr_t fcn) { UFii_t fn = (UFii_t)fcn; ui64_t r; r.u = (uint64_t)fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8)); R_EAX = r.d[0]; R_EDX = r.d[1]; }
 void UFuu_32(x64emu_t *emu, uintptr_t fcn) { UFuu_t fn = (UFuu_t)fcn; ui64_t r; r.u = (uint64_t)fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(uint32_t, R_ESP + 8)); R_EAX = r.d[0]; R_EDX = r.d[1]; }
 void UFUU_32(x64emu_t *emu, uintptr_t fcn) { UFUU_t fn = (UFUU_t)fcn; ui64_t r; r.u = (uint64_t)fn(from_ptri(uint64_t, R_ESP + 4), from_ptri(uint64_t, R_ESP + 12)); R_EAX = r.d[0]; R_EDX = r.d[1]; }
 void UFss_32(x64emu_t *emu, uintptr_t fcn) { UFss_t fn = (UFss_t)fcn; ui64_t r; r.u = (uint64_t)fn(from_ptrv(R_ESP + 4), from_ptrv(R_ESP + 4)); R_EAX = r.d[0]; R_EDX = r.d[1]; }
@@ -1349,15 +1366,20 @@ void dFdi_32(x64emu_t *emu, uintptr_t fcn) { dFdi_t fn = (dFdi_t)fcn; double db
 void dFdd_32(x64emu_t *emu, uintptr_t fcn) { dFdd_t fn = (dFdd_t)fcn; double db = fn(from_ptri(double, R_ESP + 4), from_ptri(double, R_ESP + 12)); fpu_do_push(emu); ST0val = db; }
 void dFdD_32(x64emu_t *emu, uintptr_t fcn) { dFdD_t fn = (dFdD_t)fcn; double db = fn(from_ptri(double, R_ESP + 4), LD2localLD(from_ptrv(R_ESP + 12))); fpu_do_push(emu); ST0val = db; }
 void dFdp_32(x64emu_t *emu, uintptr_t fcn) { dFdp_t fn = (dFdp_t)fcn; double db = fn(from_ptri(double, R_ESP + 4), from_ptriv(R_ESP + 12)); fpu_do_push(emu); ST0val = db; }
-void dFLL_32(x64emu_t *emu, uintptr_t fcn) { dFLL_t fn = (dFLL_t)fcn; double db = fn(to_ulong(from_ptri(ulong_t, R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8))); fpu_do_push(emu); ST0val = db; }
+void dFll_32(x64emu_t *emu, uintptr_t fcn) { dFll_t fn = (dFll_t)fcn; double db = fn(to_long(from_ptri(long_t, R_ESP + 4)), to_long(from_ptri(long_t, R_ESP + 8))); fpu_do_push(emu); ST0val = db; }
 void dFpp_32(x64emu_t *emu, uintptr_t fcn) { dFpp_t fn = (dFpp_t)fcn; double db = fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8)); fpu_do_push(emu); ST0val = db; }
+void lFEV_32(x64emu_t *emu, uintptr_t fcn) { lFEV_t fn = (lFEV_t)fcn; R_EAX = to_long(fn(emu, from_ptrv(R_ESP + 4))); }
 void lFES_32(x64emu_t *emu, uintptr_t fcn) { lFES_t fn = (lFES_t)fcn; R_EAX = to_long(fn(emu, io_convert32(from_ptriv(R_ESP + 4)))); }
+void lFii_32(x64emu_t *emu, uintptr_t fcn) { lFii_t fn = (lFii_t)fcn; R_EAX = to_long(fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8))); }
 void lFui_32(x64emu_t *emu, uintptr_t fcn) { lFui_t fn = (lFui_t)fcn; R_EAX = to_long(fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8))); }
 void lFll_32(x64emu_t *emu, uintptr_t fcn) { lFll_t fn = (lFll_t)fcn; R_EAX = to_long(fn(to_long(from_ptri(long_t, R_ESP + 4)), to_long(from_ptri(long_t, R_ESP + 8)))); }
+void lFpi_32(x64emu_t *emu, uintptr_t fcn) { lFpi_t fn = (lFpi_t)fcn; R_EAX = to_long(fn(from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8))); }
 void lFpl_32(x64emu_t *emu, uintptr_t fcn) { lFpl_t fn = (lFpl_t)fcn; R_EAX = to_long(fn(from_ptriv(R_ESP + 4), to_long(from_ptri(long_t, R_ESP + 8)))); }
+void LFEL_32(x64emu_t *emu, uintptr_t fcn) { LFEL_t fn = (LFEL_t)fcn; R_EAX = to_ulong(fn(emu, to_ulong(from_ptri(ulong_t, R_ESP + 4)))); }
 void LFLi_32(x64emu_t *emu, uintptr_t fcn) { LFLi_t fn = (LFLi_t)fcn; R_EAX = to_ulong(fn(to_ulong(from_ptri(ulong_t, R_ESP + 4)), from_ptri(int32_t, R_ESP + 8))); }
 void LFpL_32(x64emu_t *emu, uintptr_t fcn) { LFpL_t fn = (LFpL_t)fcn; R_EAX = to_ulong(fn(from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)))); }
 void LFpp_32(x64emu_t *emu, uintptr_t fcn) { LFpp_t fn = (LFpp_t)fcn; R_EAX = to_ulong(fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8))); }
+void LFpa_32(x64emu_t *emu, uintptr_t fcn) { LFpa_t fn = (LFpa_t)fcn; R_EAX = to_ulong(fn(from_ptriv(R_ESP + 4), from_locale(from_ptri(ptr_t, R_ESP + 8)))); }
 void LFXi_32(x64emu_t *emu, uintptr_t fcn) { LFXi_t fn = (LFXi_t)fcn; R_EAX = to_ulong(fn(getDisplay(from_ptriv(R_ESP + 4)), from_ptri(int32_t, R_ESP + 8))); }
 void LFXL_32(x64emu_t *emu, uintptr_t fcn) { LFXL_t fn = (LFXL_t)fcn; R_EAX = to_ulong(fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)))); }
 void pFEv_32(x64emu_t *emu, uintptr_t fcn) { pFEv_t fn = (pFEv_t)fcn; R_EAX = to_ptrv(fn(emu)); }
@@ -1379,20 +1401,21 @@ void SFip_32(x64emu_t *emu, uintptr_t fcn) { SFip_t fn = (SFip_t)fcn; R_EAX = to
 void SFpp_32(x64emu_t *emu, uintptr_t fcn) { SFpp_t fn = (SFpp_t)fcn; R_EAX = to_ptrv(io_convert_from(fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8)))); }
 void tFip_32(x64emu_t *emu, uintptr_t fcn) { tFip_t fn = (tFip_t)fcn; R_EAX = to_cstring(fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8))); }
 void tFpL_32(x64emu_t *emu, uintptr_t fcn) { tFpL_t fn = (tFpL_t)fcn; R_EAX = to_cstring(fn(from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)))); }
-void iFEbp__32(x64emu_t *emu, uintptr_t fcn) { iFEbp__t fn = (iFEbp__t)fcn; struct_p_t arg_4={0}; from_struct_p(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); R_EAX = fn(emu, *(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 4)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 4))), &arg_4); }
+void iFEbp__32(x64emu_t *emu, uintptr_t fcn) { iFEbp__t fn = (iFEbp__t)fcn; struct_p_t arg_4={0}; if (*(ptr_t*)(from_ptr((R_ESP + 4)))) from_struct_p(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); R_EAX = fn(emu, *(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 4)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 4))), &arg_4); }
 void iFiBp__32(x64emu_t *emu, uintptr_t fcn) { iFiBp__t fn = (iFiBp__t)fcn; struct_p_t arg_8={0}; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
 void iFpBL__32(x64emu_t *emu, uintptr_t fcn) { iFpBL__t fn = (iFpBL__t)fcn; struct_L_t arg_8={0}; R_EAX = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_L(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
 void iFHBp__32(x64emu_t *emu, uintptr_t fcn) { iFHBp__t fn = (iFHBp__t)fcn; struct_p_t arg_8={0}; R_EAX = fn(from_hash_d(from_ptri(ptr_t, R_ESP + 4)), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
 void fFpBp__32(x64emu_t *emu, uintptr_t fcn) { fFpBp__t fn = (fFpBp__t)fcn; struct_p_t arg_8={0}; float fl = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); fpu_do_push(emu); ST0val = fl; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
 void dFpBp__32(x64emu_t *emu, uintptr_t fcn) { dFpBp__t fn = (dFpBp__t)fcn; struct_p_t arg_8={0}; double db = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); fpu_do_push(emu); ST0val = db; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
-void pFrL_p_32(x64emu_t *emu, uintptr_t fcn) { pFrL_p_t fn = (pFrL_p_t)fcn; struct_L_t arg_4={0}; from_struct_L(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); R_EAX = to_ptrv(fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL, from_ptriv(R_ESP + 8))); }
+void pFrl_p_32(x64emu_t *emu, uintptr_t fcn) { pFrl_p_t fn = (pFrl_p_t)fcn; struct_l_t arg_4={0}; if (*(ptr_t*)(from_ptr((R_ESP + 4)))) from_struct_l(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); R_EAX = to_ptrv(fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL, from_ptriv(R_ESP + 8))); }
 void iFuBLL__32(x64emu_t *emu, uintptr_t fcn) { iFuBLL__t fn = (iFuBLL__t)fcn; struct_LL_t arg_8={0}; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_LL(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
-void iFprLL__32(x64emu_t *emu, uintptr_t fcn) { iFprLL__t fn = (iFprLL__t)fcn; struct_LL_t arg_8={0}; from_struct_LL(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); R_EAX = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); }
-void iFpbup__32(x64emu_t *emu, uintptr_t fcn) { iFpbup__t fn = (iFpbup__t)fcn; struct_up_t arg_8={0}; from_struct_up(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); R_EAX = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_up(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
-void iFBLL_p_32(x64emu_t *emu, uintptr_t fcn) { iFBLL_p_t fn = (iFBLL_p_t)fcn; struct_LL_t arg_4={0}; R_EAX = fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL, from_ptriv(R_ESP + 8)); if (*(ptr_t*)(from_ptr((R_ESP + 4)))) to_struct_LL(*(ptr_t*)(from_ptr((R_ESP + 4))), &arg_4); }
-void iFrLL_BLL__32(x64emu_t *emu, uintptr_t fcn) { iFrLL_BLL__t fn = (iFrLL_BLL__t)fcn; struct_LL_t arg_4={0}; from_struct_LL(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); struct_LL_t arg_8={0}; R_EAX = fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL, *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_LL(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
-void iFpruuipWCCp__32(x64emu_t *emu, uintptr_t fcn) { iFpruuipWCCp__t fn = (iFpruuipWCCp__t)fcn; struct_uuipWCCp_t arg_8={0}; from_struct_uuipWCCp(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); R_EAX = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); }
-void pFriiiiiiiiilt_p_32(x64emu_t *emu, uintptr_t fcn) { pFriiiiiiiiilt_p_t fn = (pFriiiiiiiiilt_p_t)fcn; struct_iiiiiiiiilt_t arg_4={0}; from_struct_iiiiiiiiilt(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); R_EAX = to_ptrv(fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL, from_ptriv(R_ESP + 8))); }
+void iFprll__32(x64emu_t *emu, uintptr_t fcn) { iFprll__t fn = (iFprll__t)fcn; struct_ll_t arg_8={0}; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) from_struct_ll(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); R_EAX = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); }
+void iFpbup__32(x64emu_t *emu, uintptr_t fcn) { iFpbup__t fn = (iFpbup__t)fcn; struct_up_t arg_8={0}; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) from_struct_up(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); R_EAX = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_up(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
+void iFprLL__32(x64emu_t *emu, uintptr_t fcn) { iFprLL__t fn = (iFprLL__t)fcn; struct_LL_t arg_8={0}; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) from_struct_LL(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); R_EAX = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); }
+void iFBll_p_32(x64emu_t *emu, uintptr_t fcn) { iFBll_p_t fn = (iFBll_p_t)fcn; struct_ll_t arg_4={0}; R_EAX = fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL, from_ptriv(R_ESP + 8)); if (*(ptr_t*)(from_ptr((R_ESP + 4)))) to_struct_ll(*(ptr_t*)(from_ptr((R_ESP + 4))), &arg_4); }
+void iFrLL_BLL__32(x64emu_t *emu, uintptr_t fcn) { iFrLL_BLL__t fn = (iFrLL_BLL__t)fcn; struct_LL_t arg_4={0}; if (*(ptr_t*)(from_ptr((R_ESP + 4)))) from_struct_LL(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); struct_LL_t arg_8={0}; R_EAX = fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL, *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_LL(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
+void iFpruuipWCCp__32(x64emu_t *emu, uintptr_t fcn) { iFpruuipWCCp__t fn = (iFpruuipWCCp__t)fcn; struct_uuipWCCp_t arg_8={0}; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) from_struct_uuipWCCp(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); R_EAX = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); }
+void pFriiiiiiiiilt_p_32(x64emu_t *emu, uintptr_t fcn) { pFriiiiiiiiilt_p_t fn = (pFriiiiiiiiilt_p_t)fcn; struct_iiiiiiiiilt_t arg_4={0}; if (*(ptr_t*)(from_ptr((R_ESP + 4)))) from_struct_iiiiiiiiilt(&arg_4, *(ptr_t*)(from_ptr((R_ESP + 4)))); R_EAX = to_ptrv(fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL, from_ptriv(R_ESP + 8))); }
 void iFiBLLLLLLLLLLLLLLLLLL__32(x64emu_t *emu, uintptr_t fcn) { iFiBLLLLLLLLLLLLLLLLLL__t fn = (iFiBLLLLLLLLLLLLLLLLLL__t)fcn; struct_LLLLLLLLLLLLLLLLLL_t arg_8={0}; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_LLLLLLLLLLLLLLLLLL(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
 void vFEip_32(x64emu_t *emu, uintptr_t fcn) { vFEip_t fn = (vFEip_t)fcn; fn(emu, from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8)); }
 void vFEpi_32(x64emu_t *emu, uintptr_t fcn) { vFEpi_t fn = (vFEpi_t)fcn; fn(emu, from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8)); }
@@ -1473,27 +1496,29 @@ void iFEpp_32(x64emu_t *emu, uintptr_t fcn) { iFEpp_t fn = (iFEpp_t)fcn; R_EAX =
 void iFEpV_32(x64emu_t *emu, uintptr_t fcn) { iFEpV_t fn = (iFEpV_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptrv(R_ESP + 8)); }
 void iFEhi_32(x64emu_t *emu, uintptr_t fcn) { iFEhi_t fn = (iFEhi_t)fcn; R_EAX = fn(emu, from_hash(from_ptri(ptr_t, R_ESP + 4)), from_ptri(int32_t, R_ESP + 8)); }
 void iFEhp_32(x64emu_t *emu, uintptr_t fcn) { iFEhp_t fn = (iFEhp_t)fcn; R_EAX = fn(emu, from_hash(from_ptri(ptr_t, R_ESP + 4)), from_ptriv(R_ESP + 8)); }
-void iFESp_32(x64emu_t *emu, uintptr_t fcn) { iFESp_t fn = (iFESp_t)fcn; R_EAX = fn(emu, io_convert32(from_ptriv(R_ESP + 4)), from_ptriv(R_ESP + 8)); }
 void iFEXp_32(x64emu_t *emu, uintptr_t fcn) { iFEXp_t fn = (iFEXp_t)fcn; R_EAX = fn(emu, getDisplay(from_ptriv(R_ESP + 4)), from_ptriv(R_ESP + 8)); }
 void iFiii_32(x64emu_t *emu, uintptr_t fcn) { iFiii_t fn = (iFiii_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12)); }
 void iFiiI_32(x64emu_t *emu, uintptr_t fcn) { iFiiI_t fn = (iFiiI_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int64_t, R_ESP + 12)); }
-void iFiiu_32(x64emu_t *emu, uintptr_t fcn) { iFiiu_t fn = (iFiiu_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(uint32_t, R_ESP + 12)); }
+void iFiil_32(x64emu_t *emu, uintptr_t fcn) { iFiil_t fn = (iFiil_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), to_long(from_ptri(long_t, R_ESP + 12))); }
 void iFiip_32(x64emu_t *emu, uintptr_t fcn) { iFiip_t fn = (iFiip_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptriv(R_ESP + 12)); }
 void iFiiO_32(x64emu_t *emu, uintptr_t fcn) { iFiiO_t fn = (iFiiO_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), of_convert32(from_ptri(int32_t, R_ESP + 12))); }
 void iFiII_32(x64emu_t *emu, uintptr_t fcn) { iFiII_t fn = (iFiII_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int64_t, R_ESP + 8), from_ptri(int64_t, R_ESP + 16)); }
 void iFiuu_32(x64emu_t *emu, uintptr_t fcn) { iFiuu_t fn = (iFiuu_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptri(uint32_t, R_ESP + 12)); }
 void iFiup_32(x64emu_t *emu, uintptr_t fcn) { iFiup_t fn = (iFiup_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptriv(R_ESP + 12)); }
+void iFill_32(x64emu_t *emu, uintptr_t fcn) { iFill_t fn = (iFill_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), to_long(from_ptri(long_t, R_ESP + 8)), to_long(from_ptri(long_t, R_ESP + 12))); }
+void iFiLi_32(x64emu_t *emu, uintptr_t fcn) { iFiLi_t fn = (iFiLi_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptri(int32_t, R_ESP + 12)); }
 void iFiLN_32(x64emu_t *emu, uintptr_t fcn) { iFiLN_t fn = (iFiLN_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptriv(R_ESP + 12)); }
+void iFipi_32(x64emu_t *emu, uintptr_t fcn) { iFipi_t fn = (iFipi_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12)); }
 void iFipu_32(x64emu_t *emu, uintptr_t fcn) { iFipu_t fn = (iFipu_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(uint32_t, R_ESP + 12)); }
 void iFipL_32(x64emu_t *emu, uintptr_t fcn) { iFipL_t fn = (iFipL_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), to_ulong(from_ptri(ulong_t, R_ESP + 12))); }
 void iFipp_32(x64emu_t *emu, uintptr_t fcn) { iFipp_t fn = (iFipp_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12)); }
-void iFuii_32(x64emu_t *emu, uintptr_t fcn) { iFuii_t fn = (iFuii_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12)); }
 void iFuip_32(x64emu_t *emu, uintptr_t fcn) { iFuip_t fn = (iFuip_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptriv(R_ESP + 12)); }
 void iFuui_32(x64emu_t *emu, uintptr_t fcn) { iFuui_t fn = (iFuui_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12)); }
 void iFuuu_32(x64emu_t *emu, uintptr_t fcn) { iFuuu_t fn = (iFuuu_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptri(uint32_t, R_ESP + 12)); }
 void iFuup_32(x64emu_t *emu, uintptr_t fcn) { iFuup_t fn = (iFuup_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptriv(R_ESP + 12)); }
-void iFuLp_32(x64emu_t *emu, uintptr_t fcn) { iFuLp_t fn = (iFuLp_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptriv(R_ESP + 12)); }
+void iFuLa_32(x64emu_t *emu, uintptr_t fcn) { iFuLa_t fn = (iFuLa_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_locale(from_ptri(ptr_t, R_ESP + 12))); }
 void iFfff_32(x64emu_t *emu, uintptr_t fcn) { iFfff_t fn = (iFfff_t)fcn; R_EAX = fn(from_ptri(float, R_ESP + 4), from_ptri(float, R_ESP + 8), from_ptri(float, R_ESP + 12)); }
+void iFLLi_32(x64emu_t *emu, uintptr_t fcn) { iFLLi_t fn = (iFLLi_t)fcn; R_EAX = fn(to_ulong(from_ptri(ulong_t, R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptri(int32_t, R_ESP + 12)); }
 void iFpii_32(x64emu_t *emu, uintptr_t fcn) { iFpii_t fn = (iFpii_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12)); }
 void iFpiu_32(x64emu_t *emu, uintptr_t fcn) { iFpiu_t fn = (iFpiu_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(uint32_t, R_ESP + 12)); }
 void iFpip_32(x64emu_t *emu, uintptr_t fcn) { iFpip_t fn = (iFpip_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptriv(R_ESP + 12)); }
@@ -1541,6 +1566,7 @@ void fFfff_32(x64emu_t *emu, uintptr_t fcn) { fFfff_t fn = (fFfff_t)fcn; float f
 void fFffp_32(x64emu_t *emu, uintptr_t fcn) { fFffp_t fn = (fFffp_t)fcn; float fl = fn(from_ptri(float, R_ESP + 4), from_ptri(float, R_ESP + 8), from_ptriv(R_ESP + 12)); fpu_do_push(emu); ST0val = fl; }
 void dFddd_32(x64emu_t *emu, uintptr_t fcn) { dFddd_t fn = (dFddd_t)fcn; double db = fn(from_ptri(double, R_ESP + 4), from_ptri(double, R_ESP + 12), from_ptri(double, R_ESP + 20)); fpu_do_push(emu); ST0val = db; }
 void dFddp_32(x64emu_t *emu, uintptr_t fcn) { dFddp_t fn = (dFddp_t)fcn; double db = fn(from_ptri(double, R_ESP + 4), from_ptri(double, R_ESP + 12), from_ptriv(R_ESP + 20)); fpu_do_push(emu); ST0val = db; }
+void lFili_32(x64emu_t *emu, uintptr_t fcn) { lFili_t fn = (lFili_t)fcn; R_EAX = to_long(fn(from_ptri(int32_t, R_ESP + 4), to_long(from_ptri(long_t, R_ESP + 8)), from_ptri(int32_t, R_ESP + 12))); }
 void lFipL_32(x64emu_t *emu, uintptr_t fcn) { lFipL_t fn = (lFipL_t)fcn; R_EAX = to_long(fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), to_ulong(from_ptri(ulong_t, R_ESP + 12)))); }
 void lFlpi_32(x64emu_t *emu, uintptr_t fcn) { lFlpi_t fn = (lFlpi_t)fcn; R_EAX = to_long(fn(to_long(from_ptri(long_t, R_ESP + 4)), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12))); }
 void lFpLL_32(x64emu_t *emu, uintptr_t fcn) { lFpLL_t fn = (lFpLL_t)fcn; R_EAX = to_long(fn(from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), to_ulong(from_ptri(ulong_t, R_ESP + 12)))); }
@@ -1570,7 +1596,7 @@ void pFpii_32(x64emu_t *emu, uintptr_t fcn) { pFpii_t fn = (pFpii_t)fcn; R_EAX =
 void pFpiu_32(x64emu_t *emu, uintptr_t fcn) { pFpiu_t fn = (pFpiu_t)fcn; R_EAX = to_ptrv(fn(from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(uint32_t, R_ESP + 12))); }
 void pFpiL_32(x64emu_t *emu, uintptr_t fcn) { pFpiL_t fn = (pFpiL_t)fcn; R_EAX = to_ptrv(fn(from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8), to_ulong(from_ptri(ulong_t, R_ESP + 12)))); }
 void pFpiS_32(x64emu_t *emu, uintptr_t fcn) { pFpiS_t fn = (pFpiS_t)fcn; R_EAX = to_ptrv(fn(from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8), io_convert32(from_ptriv(R_ESP + 12)))); }
-void pFpuL_32(x64emu_t *emu, uintptr_t fcn) { pFpuL_t fn = (pFpuL_t)fcn; R_EAX = to_ptrv(fn(from_ptriv(R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), to_ulong(from_ptri(ulong_t, R_ESP + 12)))); }
+void pFpII_32(x64emu_t *emu, uintptr_t fcn) { pFpII_t fn = (pFpII_t)fcn; R_EAX = to_ptrv(fn(from_ptriv(R_ESP + 4), from_ptri(int64_t, R_ESP + 8), from_ptri(int64_t, R_ESP + 16))); }
 void pFpup_32(x64emu_t *emu, uintptr_t fcn) { pFpup_t fn = (pFpup_t)fcn; R_EAX = to_ptrv(fn(from_ptriv(R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptriv(R_ESP + 12))); }
 void pFppu_32(x64emu_t *emu, uintptr_t fcn) { pFppu_t fn = (pFppu_t)fcn; R_EAX = to_ptrv(fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(uint32_t, R_ESP + 12))); }
 void pFppL_32(x64emu_t *emu, uintptr_t fcn) { pFppL_t fn = (pFppL_t)fcn; R_EAX = to_ptrv(fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), to_ulong(from_ptri(ulong_t, R_ESP + 12)))); }
@@ -1582,9 +1608,8 @@ void aFipa_32(x64emu_t *emu, uintptr_t fcn) { aFipa_t fn = (aFipa_t)fcn; R_EAX =
 void SFEpp_32(x64emu_t *emu, uintptr_t fcn) { SFEpp_t fn = (SFEpp_t)fcn; R_EAX = to_ptrv(io_convert_from(fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8)))); }
 void SFppS_32(x64emu_t *emu, uintptr_t fcn) { SFppS_t fn = (SFppS_t)fcn; R_EAX = to_ptrv(io_convert_from(fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), io_convert32(from_ptriv(R_ESP + 12))))); }
 void tFipu_32(x64emu_t *emu, uintptr_t fcn) { tFipu_t fn = (tFipu_t)fcn; R_EAX = to_cstring(fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(uint32_t, R_ESP + 12))); }
-void iFppbL__32(x64emu_t *emu, uintptr_t fcn) { iFppbL__t fn = (iFppbL__t)fcn; struct_L_t arg_12={0}; from_struct_L(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_L(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
-void iFpBp_i_32(x64emu_t *emu, uintptr_t fcn) { iFpBp_i_t fn = (iFpBp_i_t)fcn; struct_p_t arg_8={0}; R_EAX = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, from_ptri(int32_t, R_ESP + 12)); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
-void iFpbL_p_32(x64emu_t *emu, uintptr_t fcn) { iFpbL_p_t fn = (iFpbL_p_t)fcn; struct_L_t arg_8={0}; from_struct_L(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); R_EAX = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, from_ptriv(R_ESP + 12)); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_L(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
+void iFppbL__32(x64emu_t *emu, uintptr_t fcn) { iFppbL__t fn = (iFppbL__t)fcn; struct_L_t arg_12={0}; if (*(ptr_t*)(from_ptr((R_ESP + 12)))) from_struct_L(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_L(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
+void iFpbL_p_32(x64emu_t *emu, uintptr_t fcn) { iFpbL_p_t fn = (iFpbL_p_t)fcn; struct_L_t arg_8={0}; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) from_struct_L(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); R_EAX = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, from_ptriv(R_ESP + 12)); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_L(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
 void iFBp_LL_32(x64emu_t *emu, uintptr_t fcn) { iFBp_LL_t fn = (iFBp_LL_t)fcn; struct_p_t arg_4={0}; R_EAX = fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL, to_ulong(from_ptri(ulong_t, R_ESP + 8)), to_ulong(from_ptri(ulong_t, R_ESP + 12))); if (*(ptr_t*)(from_ptr((R_ESP + 4)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 4))), &arg_4); }
 void iFBp_pi_32(x64emu_t *emu, uintptr_t fcn) { iFBp_pi_t fn = (iFBp_pi_t)fcn; struct_p_t arg_4={0}; R_EAX = fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL, from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12)); if (*(ptr_t*)(from_ptr((R_ESP + 4)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 4))), &arg_4); }
 void IFpBp_i_32(x64emu_t *emu, uintptr_t fcn) { IFpBp_i_t fn = (IFpBp_i_t)fcn; struct_p_t arg_8={0}; ui64_t r; r.i = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, from_ptri(int32_t, R_ESP + 12)); R_EAX = r.d[0]; R_EDX = r.d[1]; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
@@ -1595,12 +1620,12 @@ void dFpBp_i_32(x64emu_t *emu, uintptr_t fcn) { dFpBp_i_t fn = (dFpBp_i_t)fcn; s
 void dFpBp_a_32(x64emu_t *emu, uintptr_t fcn) { dFpBp_a_t fn = (dFpBp_a_t)fcn; struct_p_t arg_8={0}; double db = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, from_locale(from_ptri(ptr_t, R_ESP + 12))); fpu_do_push(emu); ST0val = db; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
 void lFpBp_i_32(x64emu_t *emu, uintptr_t fcn) { lFpBp_i_t fn = (lFpBp_i_t)fcn; struct_p_t arg_8={0}; R_EAX = to_long(fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, from_ptri(int32_t, R_ESP + 12))); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
 void LFpBp_i_32(x64emu_t *emu, uintptr_t fcn) { LFpBp_i_t fn = (LFpBp_i_t)fcn; struct_p_t arg_8={0}; R_EAX = to_ulong(fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, from_ptri(int32_t, R_ESP + 12))); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
-void pFppbp__32(x64emu_t *emu, uintptr_t fcn) { pFppbp__t fn = (pFppbp__t)fcn; struct_p_t arg_12={0}; from_struct_p(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = to_ptrv(fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL)); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
-void vFXLrpLiL__32(x64emu_t *emu, uintptr_t fcn) { vFXLrpLiL__t fn = (vFXLrpLiL__t)fcn; struct_pLiL_t arg_12={0}; from_struct_pLiL(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL); }
-void vFXLbpLiL__32(x64emu_t *emu, uintptr_t fcn) { vFXLbpLiL__t fn = (vFXLbpLiL__t)fcn; struct_pLiL_t arg_12={0}; from_struct_pLiL(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_pLiL(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
-void iFXLbLWWWcc__32(x64emu_t *emu, uintptr_t fcn) { iFXLbLWWWcc__t fn = (iFXLbLWWWcc__t)fcn; struct_LWWWcc_t arg_12={0}; from_struct_LWWWcc(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_LWWWcc(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
-void iFirLLLL_BLLLL__32(x64emu_t *emu, uintptr_t fcn) { iFirLLLL_BLLLL__t fn = (iFirLLLL_BLLLL__t)fcn; struct_LLLL_t arg_8={0}; from_struct_LLLL(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); struct_LLLL_t arg_12={0}; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_LLLL(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
-void pFppriiiiiiiiilt__32(x64emu_t *emu, uintptr_t fcn) { pFppriiiiiiiiilt__t fn = (pFppriiiiiiiiilt__t)fcn; struct_iiiiiiiiilt_t arg_12={0}; from_struct_iiiiiiiiilt(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = to_ptrv(fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL)); }
+void pFppbp__32(x64emu_t *emu, uintptr_t fcn) { pFppbp__t fn = (pFppbp__t)fcn; struct_p_t arg_12={0}; if (*(ptr_t*)(from_ptr((R_ESP + 12)))) from_struct_p(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = to_ptrv(fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL)); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
+void vFXLrpLiL__32(x64emu_t *emu, uintptr_t fcn) { vFXLrpLiL__t fn = (vFXLrpLiL__t)fcn; struct_pLiL_t arg_12={0}; if (*(ptr_t*)(from_ptr((R_ESP + 12)))) from_struct_pLiL(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL); }
+void vFXLbpLiL__32(x64emu_t *emu, uintptr_t fcn) { vFXLbpLiL__t fn = (vFXLbpLiL__t)fcn; struct_pLiL_t arg_12={0}; if (*(ptr_t*)(from_ptr((R_ESP + 12)))) from_struct_pLiL(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_pLiL(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
+void iFXLbLWWWcc__32(x64emu_t *emu, uintptr_t fcn) { iFXLbLWWWcc__t fn = (iFXLbLWWWcc__t)fcn; struct_LWWWcc_t arg_12={0}; if (*(ptr_t*)(from_ptr((R_ESP + 12)))) from_struct_LWWWcc(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_LWWWcc(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
+void iFirLLLL_BLLLL__32(x64emu_t *emu, uintptr_t fcn) { iFirLLLL_BLLLL__t fn = (iFirLLLL_BLLLL__t)fcn; struct_LLLL_t arg_8={0}; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) from_struct_LLLL(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); struct_LLLL_t arg_12={0}; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_LLLL(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
+void pFppriiiiiiiiilt__32(x64emu_t *emu, uintptr_t fcn) { pFppriiiiiiiiilt__t fn = (pFppriiiiiiiiilt__t)fcn; struct_iiiiiiiiilt_t arg_12={0}; if (*(ptr_t*)(from_ptr((R_ESP + 12)))) from_struct_iiiiiiiiilt(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = to_ptrv(fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL)); }
 void vFEipp_32(x64emu_t *emu, uintptr_t fcn) { vFEipp_t fn = (vFEipp_t)fcn; fn(emu, from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12)); }
 void vFEipV_32(x64emu_t *emu, uintptr_t fcn) { vFEipV_t fn = (vFEipV_t)fcn; fn(emu, from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptrv(R_ESP + 12)); }
 void vFEpup_32(x64emu_t *emu, uintptr_t fcn) { vFEpup_t fn = (vFEpup_t)fcn; fn(emu, from_ptriv(R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptriv(R_ESP + 12)); }
@@ -1705,7 +1730,7 @@ void iFEppu_32(x64emu_t *emu, uintptr_t fcn) { iFEppu_t fn = (iFEppu_t)fcn; R_EA
 void iFEppL_32(x64emu_t *emu, uintptr_t fcn) { iFEppL_t fn = (iFEppL_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), to_ulong(from_ptri(ulong_t, R_ESP + 12))); }
 void iFEppp_32(x64emu_t *emu, uintptr_t fcn) { iFEppp_t fn = (iFEppp_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12)); }
 void iFEppV_32(x64emu_t *emu, uintptr_t fcn) { iFEppV_t fn = (iFEppV_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptrv(R_ESP + 12)); }
-void iFEpOu_32(x64emu_t *emu, uintptr_t fcn) { iFEpOu_t fn = (iFEpOu_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), of_convert32(from_ptri(int32_t, R_ESP + 8)), from_ptri(uint32_t, R_ESP + 12)); }
+void iFEpON_32(x64emu_t *emu, uintptr_t fcn) { iFEpON_t fn = (iFEpON_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), of_convert32(from_ptri(int32_t, R_ESP + 8)), from_ptriv(R_ESP + 12)); }
 void iFEhup_32(x64emu_t *emu, uintptr_t fcn) { iFEhup_t fn = (iFEhup_t)fcn; R_EAX = fn(emu, from_hash(from_ptri(ptr_t, R_ESP + 4)), from_ptri(uint32_t, R_ESP + 8), from_ptriv(R_ESP + 12)); }
 void iFESpp_32(x64emu_t *emu, uintptr_t fcn) { iFESpp_t fn = (iFESpp_t)fcn; R_EAX = fn(emu, io_convert32(from_ptriv(R_ESP + 4)), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12)); }
 void iFESpV_32(x64emu_t *emu, uintptr_t fcn) { iFESpV_t fn = (iFESpV_t)fcn; R_EAX = fn(emu, io_convert32(from_ptriv(R_ESP + 4)), from_ptriv(R_ESP + 8), from_ptrv(R_ESP + 12)); }
@@ -1714,8 +1739,9 @@ void iFEXLp_32(x64emu_t *emu, uintptr_t fcn) { iFEXLp_t fn = (iFEXLp_t)fcn; R_EA
 void iFiiiu_32(x64emu_t *emu, uintptr_t fcn) { iFiiiu_t fn = (iFiiiu_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptri(uint32_t, R_ESP + 16)); }
 void iFiiip_32(x64emu_t *emu, uintptr_t fcn) { iFiiip_t fn = (iFiiip_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptriv(R_ESP + 16)); }
 void iFiiiN_32(x64emu_t *emu, uintptr_t fcn) { iFiiiN_t fn = (iFiiiN_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptriv(R_ESP + 16)); }
-void iFiill_32(x64emu_t *emu, uintptr_t fcn) { iFiill_t fn = (iFiill_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), to_long(from_ptri(long_t, R_ESP + 12)), to_long(from_ptri(long_t, R_ESP + 16))); }
-void iFiuui_32(x64emu_t *emu, uintptr_t fcn) { iFiuui_t fn = (iFiuui_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptri(uint32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16)); }
+void iFiiII_32(x64emu_t *emu, uintptr_t fcn) { iFiiII_t fn = (iFiiII_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int64_t, R_ESP + 12), from_ptri(int64_t, R_ESP + 20)); }
+void iFiIIi_32(x64emu_t *emu, uintptr_t fcn) { iFiIIi_t fn = (iFiIIi_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int64_t, R_ESP + 8), from_ptri(int64_t, R_ESP + 16), from_ptri(int32_t, R_ESP + 24)); }
+void iFilli_32(x64emu_t *emu, uintptr_t fcn) { iFilli_t fn = (iFilli_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), to_long(from_ptri(long_t, R_ESP + 8)), to_long(from_ptri(long_t, R_ESP + 12)), from_ptri(int32_t, R_ESP + 16)); }
 void iFipii_32(x64emu_t *emu, uintptr_t fcn) { iFipii_t fn = (iFipii_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16)); }
 void iFipui_32(x64emu_t *emu, uintptr_t fcn) { iFipui_t fn = (iFipui_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(uint32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16)); }
 void iFipup_32(x64emu_t *emu, uintptr_t fcn) { iFipup_t fn = (iFipup_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(uint32_t, R_ESP + 12), from_ptriv(R_ESP + 16)); }
@@ -1732,7 +1758,7 @@ void iFppui_32(x64emu_t *emu, uintptr_t fcn) { iFppui_t fn = (iFppui_t)fcn; R_EA
 void iFppLi_32(x64emu_t *emu, uintptr_t fcn) { iFppLi_t fn = (iFppLi_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), to_ulong(from_ptri(ulong_t, R_ESP + 12)), from_ptri(int32_t, R_ESP + 16)); }
 void iFpppi_32(x64emu_t *emu, uintptr_t fcn) { iFpppi_t fn = (iFpppi_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptri(int32_t, R_ESP + 16)); }
 void iFpppp_32(x64emu_t *emu, uintptr_t fcn) { iFpppp_t fn = (iFpppp_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16)); }
-void iFhpiL_32(x64emu_t *emu, uintptr_t fcn) { iFhpiL_t fn = (iFhpiL_t)fcn; R_EAX = fn(from_hash(from_ptri(ptr_t, R_ESP + 4)), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12), to_ulong(from_ptri(ulong_t, R_ESP + 16))); }
+void iFSpiL_32(x64emu_t *emu, uintptr_t fcn) { iFSpiL_t fn = (iFSpiL_t)fcn; R_EAX = fn(io_convert32(from_ptriv(R_ESP + 4)), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12), to_ulong(from_ptri(ulong_t, R_ESP + 16))); }
 void iFXipi_32(x64emu_t *emu, uintptr_t fcn) { iFXipi_t fn = (iFXipi_t)fcn; R_EAX = fn(getDisplay(from_ptriv(R_ESP + 4)), from_ptri(int32_t, R_ESP + 8), from_ptriv(R_ESP + 12), from_ptri(int32_t, R_ESP + 16)); }
 void iFXipp_32(x64emu_t *emu, uintptr_t fcn) { iFXipp_t fn = (iFXipp_t)fcn; R_EAX = fn(getDisplay(from_ptriv(R_ESP + 4)), from_ptri(int32_t, R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16)); }
 void iFXLii_32(x64emu_t *emu, uintptr_t fcn) { iFXLii_t fn = (iFXLii_t)fcn; R_EAX = fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16)); }
@@ -1745,6 +1771,7 @@ void uFuuuu_32(x64emu_t *emu, uintptr_t fcn) { uFuuuu_t fn = (uFuuuu_t)fcn; R_EA
 void uFpCCC_32(x64emu_t *emu, uintptr_t fcn) { uFpCCC_t fn = (uFpCCC_t)fcn; R_EAX = (uint32_t)fn(from_ptriv(R_ESP + 4), from_ptri(uint8_t, R_ESP + 8), from_ptri(uint8_t, R_ESP + 12), from_ptri(uint8_t, R_ESP + 16)); }
 void uFppip_32(x64emu_t *emu, uintptr_t fcn) { uFppip_t fn = (uFppip_t)fcn; R_EAX = (uint32_t)fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptriv(R_ESP + 16)); }
 void lFEipi_32(x64emu_t *emu, uintptr_t fcn) { lFEipi_t fn = (lFEipi_t)fcn; R_EAX = to_long(fn(emu, from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12))); }
+void lFEppL_32(x64emu_t *emu, uintptr_t fcn) { lFEppL_t fn = (lFEppL_t)fcn; R_EAX = to_long(fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), to_ulong(from_ptri(ulong_t, R_ESP + 12)))); }
 void lFiipL_32(x64emu_t *emu, uintptr_t fcn) { lFiipL_t fn = (lFiipL_t)fcn; R_EAX = to_long(fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptriv(R_ESP + 12), to_ulong(from_ptri(ulong_t, R_ESP + 16)))); }
 void lFipLi_32(x64emu_t *emu, uintptr_t fcn) { lFipLi_t fn = (lFipLi_t)fcn; R_EAX = to_long(fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), to_ulong(from_ptri(ulong_t, R_ESP + 12)), from_ptri(int32_t, R_ESP + 16))); }
 void lFipLl_32(x64emu_t *emu, uintptr_t fcn) { lFipLl_t fn = (lFipLl_t)fcn; R_EAX = to_long(fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), to_ulong(from_ptri(ulong_t, R_ESP + 12)), to_long(from_ptri(long_t, R_ESP + 16)))); }
@@ -1774,21 +1801,22 @@ void pFXiii_32(x64emu_t *emu, uintptr_t fcn) { pFXiii_t fn = (pFXiii_t)fcn; R_EA
 void pFXLLp_32(x64emu_t *emu, uintptr_t fcn) { pFXLLp_t fn = (pFXLLp_t)fcn; R_EAX = to_ptrv(fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), to_ulong(from_ptri(ulong_t, R_ESP + 12)), from_ptriv(R_ESP + 16))); }
 void pFXppi_32(x64emu_t *emu, uintptr_t fcn) { pFXppi_t fn = (pFXppi_t)fcn; R_EAX = to_ptrv(fn(getDisplay(from_ptriv(R_ESP + 4)), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptri(int32_t, R_ESP + 16))); }
 void pFXppp_32(x64emu_t *emu, uintptr_t fcn) { pFXppp_t fn = (pFXppp_t)fcn; R_EAX = to_ptrv(fn(getDisplay(from_ptriv(R_ESP + 4)), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16))); }
-void iFppbp_p_32(x64emu_t *emu, uintptr_t fcn) { iFppbp_p_t fn = (iFppbp_p_t)fcn; struct_p_t arg_12={0}; from_struct_p(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL, from_ptriv(R_ESP + 16)); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
+void iFppbp_p_32(x64emu_t *emu, uintptr_t fcn) { iFppbp_p_t fn = (iFppbp_p_t)fcn; struct_p_t arg_12={0}; if (*(ptr_t*)(from_ptr((R_ESP + 12)))) from_struct_p(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL, from_ptriv(R_ESP + 16)); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
 void iFBp_pui_32(x64emu_t *emu, uintptr_t fcn) { iFBp_pui_t fn = (iFBp_pui_t)fcn; struct_p_t arg_4={0}; R_EAX = fn(*(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL, from_ptriv(R_ESP + 8), from_ptri(uint32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16)); if (*(ptr_t*)(from_ptr((R_ESP + 4)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 4))), &arg_4); }
 void IFpBp_ii_32(x64emu_t *emu, uintptr_t fcn) { IFpBp_ii_t fn = (IFpBp_ii_t)fcn; struct_p_t arg_8={0}; ui64_t r; r.i = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16)); R_EAX = r.d[0]; R_EDX = r.d[1]; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
 void uFppiBp__32(x64emu_t *emu, uintptr_t fcn) { uFppiBp__t fn = (uFppiBp__t)fcn; struct_p_t arg_16={0}; R_EAX = (uint32_t)fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12), *(ptr_t*)(from_ptr((R_ESP + 16))) ? &arg_16 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 16)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 16))), &arg_16); }
 void UFpBp_ii_32(x64emu_t *emu, uintptr_t fcn) { UFpBp_ii_t fn = (UFpBp_ii_t)fcn; struct_p_t arg_8={0}; ui64_t r; r.u = (uint64_t)fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16)); R_EAX = r.d[0]; R_EDX = r.d[1]; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
-void lFiibp_L_32(x64emu_t *emu, uintptr_t fcn) { lFiibp_L_t fn = (lFiibp_L_t)fcn; struct_p_t arg_12={0}; from_struct_p(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = to_long(fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL, to_ulong(from_ptri(ulong_t, R_ESP + 16)))); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
-void LFpbp_Lp_32(x64emu_t *emu, uintptr_t fcn) { LFpbp_Lp_t fn = (LFpbp_Lp_t)fcn; struct_p_t arg_8={0}; from_struct_p(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); R_EAX = to_ulong(fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, to_ulong(from_ptri(ulong_t, R_ESP + 12)), from_ptriv(R_ESP + 16))); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
-void iFEpprLL__32(x64emu_t *emu, uintptr_t fcn) { iFEpprLL__t fn = (iFEpprLL__t)fcn; struct_LL_t arg_12={0}; from_struct_LL(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL); }
-void vFXLrpLiL_L_32(x64emu_t *emu, uintptr_t fcn) { vFXLrpLiL_L_t fn = (vFXLrpLiL_L_t)fcn; struct_pLiL_t arg_12={0}; from_struct_pLiL(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL, to_ulong(from_ptri(ulong_t, R_ESP + 16))); }
-void iFuirLL_BLL__32(x64emu_t *emu, uintptr_t fcn) { iFuirLL_BLL__t fn = (iFuirLL_BLL__t)fcn; struct_LL_t arg_12={0}; from_struct_LL(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); struct_LL_t arg_16={0}; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL, *(ptr_t*)(from_ptr((R_ESP + 16))) ? &arg_16 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 16)))) to_struct_LL(*(ptr_t*)(from_ptr((R_ESP + 16))), &arg_16); }
+void lFiibl_L_32(x64emu_t *emu, uintptr_t fcn) { lFiibl_L_t fn = (lFiibl_L_t)fcn; struct_l_t arg_12={0}; if (*(ptr_t*)(from_ptr((R_ESP + 12)))) from_struct_l(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = to_long(fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL, to_ulong(from_ptri(ulong_t, R_ESP + 16)))); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_l(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
+void LFpbp_Lp_32(x64emu_t *emu, uintptr_t fcn) { LFpbp_Lp_t fn = (LFpbp_Lp_t)fcn; struct_p_t arg_8={0}; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) from_struct_p(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); R_EAX = to_ulong(fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, to_ulong(from_ptri(ulong_t, R_ESP + 12)), from_ptriv(R_ESP + 16))); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
+void iFEpprLL__32(x64emu_t *emu, uintptr_t fcn) { iFEpprLL__t fn = (iFEpprLL__t)fcn; struct_LL_t arg_12={0}; if (*(ptr_t*)(from_ptr((R_ESP + 12)))) from_struct_LL(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL); }
+void vFXLrpLiL_L_32(x64emu_t *emu, uintptr_t fcn) { vFXLrpLiL_L_t fn = (vFXLrpLiL_L_t)fcn; struct_pLiL_t arg_12={0}; if (*(ptr_t*)(from_ptr((R_ESP + 12)))) from_struct_pLiL(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL, to_ulong(from_ptri(ulong_t, R_ESP + 16))); }
+void iFuirLL_BLL__32(x64emu_t *emu, uintptr_t fcn) { iFuirLL_BLL__t fn = (iFuirLL_BLL__t)fcn; struct_LL_t arg_12={0}; if (*(ptr_t*)(from_ptr((R_ESP + 12)))) from_struct_LL(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); struct_LL_t arg_16={0}; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL, *(ptr_t*)(from_ptr((R_ESP + 16))) ? &arg_16 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 16)))) to_struct_LL(*(ptr_t*)(from_ptr((R_ESP + 16))), &arg_16); }
 void iFXLpBLWWWcc__32(x64emu_t *emu, uintptr_t fcn) { iFXLpBLWWWcc__t fn = (iFXLpBLWWWcc__t)fcn; struct_LWWWcc_t arg_16={0}; R_EAX = fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptriv(R_ESP + 12), *(ptr_t*)(from_ptr((R_ESP + 16))) ? &arg_16 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 16)))) to_struct_LWWWcc(*(ptr_t*)(from_ptr((R_ESP + 16))), &arg_16); }
-void LFpLpriiiiiiiiilt__32(x64emu_t *emu, uintptr_t fcn) { LFpLpriiiiiiiiilt__t fn = (LFpLpriiiiiiiiilt__t)fcn; struct_iiiiiiiiilt_t arg_16={0}; from_struct_iiiiiiiiilt(&arg_16, *(ptr_t*)(from_ptr((R_ESP + 16)))); R_EAX = to_ulong(fn(from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptriv(R_ESP + 12), *(ptr_t*)(from_ptr((R_ESP + 16))) ? &arg_16 : NULL)); }
-void iFpruuipWCCp_buuipWCCp_i_32(x64emu_t *emu, uintptr_t fcn) { iFpruuipWCCp_buuipWCCp_i_t fn = (iFpruuipWCCp_buuipWCCp_i_t)fcn; struct_uuipWCCp_t arg_8={0}; from_struct_uuipWCCp(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); struct_uuipWCCp_t arg_12={0}; from_struct_uuipWCCp(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL, from_ptri(int32_t, R_ESP + 16)); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_uuipWCCp(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
+void LFpLpriiiiiiiiilt__32(x64emu_t *emu, uintptr_t fcn) { LFpLpriiiiiiiiilt__t fn = (LFpLpriiiiiiiiilt__t)fcn; struct_iiiiiiiiilt_t arg_16={0}; if (*(ptr_t*)(from_ptr((R_ESP + 16)))) from_struct_iiiiiiiiilt(&arg_16, *(ptr_t*)(from_ptr((R_ESP + 16)))); R_EAX = to_ulong(fn(from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptriv(R_ESP + 12), *(ptr_t*)(from_ptr((R_ESP + 16))) ? &arg_16 : NULL)); }
+void iFpruuipWCCp_buuipWCCp_i_32(x64emu_t *emu, uintptr_t fcn) { iFpruuipWCCp_buuipWCCp_i_t fn = (iFpruuipWCCp_buuipWCCp_i_t)fcn; struct_uuipWCCp_t arg_8={0}; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) from_struct_uuipWCCp(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); struct_uuipWCCp_t arg_12={0}; if (*(ptr_t*)(from_ptr((R_ESP + 12)))) from_struct_uuipWCCp(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); R_EAX = fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL, from_ptri(int32_t, R_ESP + 16)); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_uuipWCCp(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); }
 void vFEuipp_32(x64emu_t *emu, uintptr_t fcn) { vFEuipp_t fn = (vFEuipp_t)fcn; fn(emu, from_ptri(uint32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16)); }
 void vFEpLLp_32(x64emu_t *emu, uintptr_t fcn) { vFEpLLp_t fn = (vFEpLLp_t)fcn; fn(emu, from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), to_ulong(from_ptri(ulong_t, R_ESP + 12)), from_ptriv(R_ESP + 16)); }
+void vFEppiV_32(x64emu_t *emu, uintptr_t fcn) { vFEppiV_t fn = (vFEppiV_t)fcn; fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptrv(R_ESP + 16)); }
 void vFiiiii_32(x64emu_t *emu, uintptr_t fcn) { vFiiiii_t fn = (vFiiiii_t)fcn; fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptri(int32_t, R_ESP + 20)); }
 void vFiiiiu_32(x64emu_t *emu, uintptr_t fcn) { vFiiiiu_t fn = (vFiiiiu_t)fcn; fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptri(uint32_t, R_ESP + 20)); }
 void vFiiuii_32(x64emu_t *emu, uintptr_t fcn) { vFiiuii_t fn = (vFiiuii_t)fcn; fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(uint32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptri(int32_t, R_ESP + 20)); }
@@ -1885,10 +1913,8 @@ void iFEiiip_32(x64emu_t *emu, uintptr_t fcn) { iFEiiip_t fn = (iFEiiip_t)fcn; R
 void iFEipii_32(x64emu_t *emu, uintptr_t fcn) { iFEipii_t fn = (iFEipii_t)fcn; R_EAX = fn(emu, from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16)); }
 void iFEpipp_32(x64emu_t *emu, uintptr_t fcn) { iFEpipp_t fn = (iFEpipp_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16)); }
 void iFEpupu_32(x64emu_t *emu, uintptr_t fcn) { iFEpupu_t fn = (iFEpupu_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptriv(R_ESP + 12), from_ptri(uint32_t, R_ESP + 16)); }
-void iFEpupV_32(x64emu_t *emu, uintptr_t fcn) { iFEpupV_t fn = (iFEpupV_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptriv(R_ESP + 12), from_ptrv(R_ESP + 16)); }
 void iFEpLpp_32(x64emu_t *emu, uintptr_t fcn) { iFEpLpp_t fn = (iFEpLpp_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16)); }
 void iFEpLpV_32(x64emu_t *emu, uintptr_t fcn) { iFEpLpV_t fn = (iFEpLpV_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptriv(R_ESP + 12), from_ptrv(R_ESP + 16)); }
-void iFEppiV_32(x64emu_t *emu, uintptr_t fcn) { iFEppiV_t fn = (iFEppiV_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptrv(R_ESP + 16)); }
 void iFEpplp_32(x64emu_t *emu, uintptr_t fcn) { iFEpplp_t fn = (iFEpplp_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), to_long(from_ptri(long_t, R_ESP + 12)), from_ptriv(R_ESP + 16)); }
 void iFEpppi_32(x64emu_t *emu, uintptr_t fcn) { iFEpppi_t fn = (iFEpppi_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptri(int32_t, R_ESP + 16)); }
 void iFEpppp_32(x64emu_t *emu, uintptr_t fcn) { iFEpppp_t fn = (iFEpppp_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16)); }
@@ -1904,7 +1930,7 @@ void iFpCCCC_32(x64emu_t *emu, uintptr_t fcn) { iFpCCCC_t fn = (iFpCCCC_t)fcn; R
 void iFpLuLi_32(x64emu_t *emu, uintptr_t fcn) { iFpLuLi_t fn = (iFpLuLi_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptri(uint32_t, R_ESP + 12), to_ulong(from_ptri(ulong_t, R_ESP + 16)), from_ptri(int32_t, R_ESP + 20)); }
 void iFppiUi_32(x64emu_t *emu, uintptr_t fcn) { iFppiUi_t fn = (iFppiUi_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptri(uint64_t, R_ESP + 16), from_ptri(int32_t, R_ESP + 24)); }
 void iFpppip_32(x64emu_t *emu, uintptr_t fcn) { iFpppip_t fn = (iFpppip_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptriv(R_ESP + 20)); }
-void iFpppup_32(x64emu_t *emu, uintptr_t fcn) { iFpppup_t fn = (iFpppup_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptri(uint32_t, R_ESP + 16), from_ptriv(R_ESP + 20)); }
+void iFpppLp_32(x64emu_t *emu, uintptr_t fcn) { iFpppLp_t fn = (iFpppLp_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), to_ulong(from_ptri(ulong_t, R_ESP + 16)), from_ptriv(R_ESP + 20)); }
 void iFppppp_32(x64emu_t *emu, uintptr_t fcn) { iFppppp_t fn = (iFppppp_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16), from_ptriv(R_ESP + 20)); }
 void iFXiiip_32(x64emu_t *emu, uintptr_t fcn) { iFXiiip_t fn = (iFXiiip_t)fcn; R_EAX = fn(getDisplay(from_ptriv(R_ESP + 4)), from_ptri(int32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptriv(R_ESP + 20)); }
 void iFXpppp_32(x64emu_t *emu, uintptr_t fcn) { iFXpppp_t fn = (iFXpppp_t)fcn; R_EAX = fn(getDisplay(from_ptriv(R_ESP + 4)), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16), from_ptriv(R_ESP + 20)); }
@@ -1926,11 +1952,11 @@ void pFppuup_32(x64emu_t *emu, uintptr_t fcn) { pFppuup_t fn = (pFppuup_t)fcn; R
 void pFppupp_32(x64emu_t *emu, uintptr_t fcn) { pFppupp_t fn = (pFppupp_t)fcn; R_EAX = to_ptrv(fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(uint32_t, R_ESP + 12), from_ptriv(R_ESP + 16), from_ptriv(R_ESP + 20))); }
 void pFXpipi_32(x64emu_t *emu, uintptr_t fcn) { pFXpipi_t fn = (pFXpipi_t)fcn; R_EAX = to_ptrv(fn(getDisplay(from_ptriv(R_ESP + 4)), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptriv(R_ESP + 16), from_ptri(int32_t, R_ESP + 20))); }
 void iFEBh_ppp_32(x64emu_t *emu, uintptr_t fcn) { iFEBh_ppp_t fn = (iFEBh_ppp_t)fcn; struct_h_t arg_4={0}; R_EAX = fn(emu, *(ptr_t*)(from_ptr((R_ESP + 4))) ? &arg_4 : NULL, from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16)); if (*(ptr_t*)(from_ptr((R_ESP + 4)))) to_struct_h(*(ptr_t*)(from_ptr((R_ESP + 4))), &arg_4); }
-void LFpbp_LLp_32(x64emu_t *emu, uintptr_t fcn) { LFpbp_LLp_t fn = (LFpbp_LLp_t)fcn; struct_p_t arg_8={0}; from_struct_p(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); R_EAX = to_ulong(fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, to_ulong(from_ptri(ulong_t, R_ESP + 12)), to_ulong(from_ptri(ulong_t, R_ESP + 16)), from_ptriv(R_ESP + 20))); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
+void LFpbp_LLp_32(x64emu_t *emu, uintptr_t fcn) { LFpbp_LLp_t fn = (LFpbp_LLp_t)fcn; struct_p_t arg_8={0}; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) from_struct_p(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); R_EAX = to_ulong(fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, to_ulong(from_ptri(ulong_t, R_ESP + 12)), to_ulong(from_ptri(ulong_t, R_ESP + 16)), from_ptriv(R_ESP + 20))); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
 void LFpBp_LLp_32(x64emu_t *emu, uintptr_t fcn) { LFpBp_LLp_t fn = (LFpBp_LLp_t)fcn; struct_p_t arg_8={0}; R_EAX = to_ulong(fn(from_ptriv(R_ESP + 4), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, to_ulong(from_ptri(ulong_t, R_ESP + 12)), to_ulong(from_ptri(ulong_t, R_ESP + 16)), from_ptriv(R_ESP + 20))); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); }
-void iFippprLL__32(x64emu_t *emu, uintptr_t fcn) { iFippprLL__t fn = (iFippprLL__t)fcn; struct_LL_t arg_20={0}; from_struct_LL(&arg_20, *(ptr_t*)(from_ptr((R_ESP + 20)))); R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16), *(ptr_t*)(from_ptr((R_ESP + 20))) ? &arg_20 : NULL); }
-void LFLbp_bL_bp_bL__32(x64emu_t *emu, uintptr_t fcn) { LFLbp_bL_bp_bL__t fn = (LFLbp_bL_bp_bL__t)fcn; struct_p_t arg_8={0}; from_struct_p(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); struct_L_t arg_12={0}; from_struct_L(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); struct_p_t arg_16={0}; from_struct_p(&arg_16, *(ptr_t*)(from_ptr((R_ESP + 16)))); struct_L_t arg_20={0}; from_struct_L(&arg_20, *(ptr_t*)(from_ptr((R_ESP + 20)))); R_EAX = to_ulong(fn(to_ulong(from_ptri(ulong_t, R_ESP + 4)), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL, *(ptr_t*)(from_ptr((R_ESP + 16))) ? &arg_16 : NULL, *(ptr_t*)(from_ptr((R_ESP + 20))) ? &arg_20 : NULL)); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_L(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); if (*(ptr_t*)(from_ptr((R_ESP + 16)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 16))), &arg_16); if (*(ptr_t*)(from_ptr((R_ESP + 20)))) to_struct_L(*(ptr_t*)(from_ptr((R_ESP + 20))), &arg_20); }
-void LFpLpriiiiiiiiilt_a_32(x64emu_t *emu, uintptr_t fcn) { LFpLpriiiiiiiiilt_a_t fn = (LFpLpriiiiiiiiilt_a_t)fcn; struct_iiiiiiiiilt_t arg_16={0}; from_struct_iiiiiiiiilt(&arg_16, *(ptr_t*)(from_ptr((R_ESP + 16)))); R_EAX = to_ulong(fn(from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptriv(R_ESP + 12), *(ptr_t*)(from_ptr((R_ESP + 16))) ? &arg_16 : NULL, from_locale(from_ptri(ptr_t, R_ESP + 20)))); }
+void iFippprLL__32(x64emu_t *emu, uintptr_t fcn) { iFippprLL__t fn = (iFippprLL__t)fcn; struct_LL_t arg_20={0}; if (*(ptr_t*)(from_ptr((R_ESP + 20)))) from_struct_LL(&arg_20, *(ptr_t*)(from_ptr((R_ESP + 20)))); R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16), *(ptr_t*)(from_ptr((R_ESP + 20))) ? &arg_20 : NULL); }
+void LFLbp_bL_bp_bL__32(x64emu_t *emu, uintptr_t fcn) { LFLbp_bL_bp_bL__t fn = (LFLbp_bL_bp_bL__t)fcn; struct_p_t arg_8={0}; if (*(ptr_t*)(from_ptr((R_ESP + 8)))) from_struct_p(&arg_8, *(ptr_t*)(from_ptr((R_ESP + 8)))); struct_L_t arg_12={0}; if (*(ptr_t*)(from_ptr((R_ESP + 12)))) from_struct_L(&arg_12, *(ptr_t*)(from_ptr((R_ESP + 12)))); struct_p_t arg_16={0}; if (*(ptr_t*)(from_ptr((R_ESP + 16)))) from_struct_p(&arg_16, *(ptr_t*)(from_ptr((R_ESP + 16)))); struct_L_t arg_20={0}; if (*(ptr_t*)(from_ptr((R_ESP + 20)))) from_struct_L(&arg_20, *(ptr_t*)(from_ptr((R_ESP + 20)))); R_EAX = to_ulong(fn(to_ulong(from_ptri(ulong_t, R_ESP + 4)), *(ptr_t*)(from_ptr((R_ESP + 8))) ? &arg_8 : NULL, *(ptr_t*)(from_ptr((R_ESP + 12))) ? &arg_12 : NULL, *(ptr_t*)(from_ptr((R_ESP + 16))) ? &arg_16 : NULL, *(ptr_t*)(from_ptr((R_ESP + 20))) ? &arg_20 : NULL)); if (*(ptr_t*)(from_ptr((R_ESP + 8)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 8))), &arg_8); if (*(ptr_t*)(from_ptr((R_ESP + 12)))) to_struct_L(*(ptr_t*)(from_ptr((R_ESP + 12))), &arg_12); if (*(ptr_t*)(from_ptr((R_ESP + 16)))) to_struct_p(*(ptr_t*)(from_ptr((R_ESP + 16))), &arg_16); if (*(ptr_t*)(from_ptr((R_ESP + 20)))) to_struct_L(*(ptr_t*)(from_ptr((R_ESP + 20))), &arg_20); }
+void LFpLpriiiiiiiiilt_a_32(x64emu_t *emu, uintptr_t fcn) { LFpLpriiiiiiiiilt_a_t fn = (LFpLpriiiiiiiiilt_a_t)fcn; struct_iiiiiiiiilt_t arg_16={0}; if (*(ptr_t*)(from_ptr((R_ESP + 16)))) from_struct_iiiiiiiiilt(&arg_16, *(ptr_t*)(from_ptr((R_ESP + 16)))); R_EAX = to_ulong(fn(from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptriv(R_ESP + 12), *(ptr_t*)(from_ptr((R_ESP + 16))) ? &arg_16 : NULL, from_locale(from_ptri(ptr_t, R_ESP + 20)))); }
 void iFXLpBLWWWcc_BLWWWcc__32(x64emu_t *emu, uintptr_t fcn) { iFXLpBLWWWcc_BLWWWcc__t fn = (iFXLpBLWWWcc_BLWWWcc__t)fcn; struct_LWWWcc_t arg_16={0}; struct_LWWWcc_t arg_20={0}; R_EAX = fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptriv(R_ESP + 12), *(ptr_t*)(from_ptr((R_ESP + 16))) ? &arg_16 : NULL, *(ptr_t*)(from_ptr((R_ESP + 20))) ? &arg_20 : NULL); if (*(ptr_t*)(from_ptr((R_ESP + 16)))) to_struct_LWWWcc(*(ptr_t*)(from_ptr((R_ESP + 16))), &arg_16); if (*(ptr_t*)(from_ptr((R_ESP + 20)))) to_struct_LWWWcc(*(ptr_t*)(from_ptr((R_ESP + 20))), &arg_20); }
 void vFEiiipp_32(x64emu_t *emu, uintptr_t fcn) { vFEiiipp_t fn = (vFEiiipp_t)fcn; fn(emu, from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptriv(R_ESP + 16), from_ptriv(R_ESP + 20)); }
 void vFiiiiii_32(x64emu_t *emu, uintptr_t fcn) { vFiiiiii_t fn = (vFiiiiii_t)fcn; fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptri(int32_t, R_ESP + 20), from_ptri(int32_t, R_ESP + 24)); }
@@ -1999,7 +2025,6 @@ void vFpdddii_32(x64emu_t *emu, uintptr_t fcn) { vFpdddii_t fn = (vFpdddii_t)fcn
 void vFppupii_32(x64emu_t *emu, uintptr_t fcn) { vFppupii_t fn = (vFppupii_t)fcn; fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(uint32_t, R_ESP + 12), from_ptriv(R_ESP + 16), from_ptri(int32_t, R_ESP + 20), from_ptri(int32_t, R_ESP + 24)); }
 void vFpppppp_32(x64emu_t *emu, uintptr_t fcn) { vFpppppp_t fn = (vFpppppp_t)fcn; fn(from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16), from_ptriv(R_ESP + 20), from_ptriv(R_ESP + 24)); }
 void vFXLiiii_32(x64emu_t *emu, uintptr_t fcn) { vFXLiiii_t fn = (vFXLiiii_t)fcn; fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptri(int32_t, R_ESP + 20), from_ptri(int32_t, R_ESP + 24)); }
-void iFEuppup_32(x64emu_t *emu, uintptr_t fcn) { iFEuppup_t fn = (iFEuppup_t)fcn; R_EAX = fn(emu, from_ptri(uint32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptri(uint32_t, R_ESP + 16), from_ptriv(R_ESP + 20)); }
 void iFEuppLp_32(x64emu_t *emu, uintptr_t fcn) { iFEuppLp_t fn = (iFEuppLp_t)fcn; R_EAX = fn(emu, from_ptri(uint32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), to_ulong(from_ptri(ulong_t, R_ESP + 16)), from_ptriv(R_ESP + 20)); }
 void iFEpiLpp_32(x64emu_t *emu, uintptr_t fcn) { iFEpiLpp_t fn = (iFEpiLpp_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8), to_ulong(from_ptri(ulong_t, R_ESP + 12)), from_ptriv(R_ESP + 16), from_ptriv(R_ESP + 20)); }
 void iFEpuuup_32(x64emu_t *emu, uintptr_t fcn) { iFEpuuup_t fn = (iFEpuuup_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptri(uint32_t, R_ESP + 12), from_ptri(uint32_t, R_ESP + 16), from_ptriv(R_ESP + 20)); }
@@ -2007,7 +2032,7 @@ void iFEplluu_32(x64emu_t *emu, uintptr_t fcn) { iFEplluu_t fn = (iFEplluu_t)fcn
 void iFEpLlpp_32(x64emu_t *emu, uintptr_t fcn) { iFEpLlpp_t fn = (iFEpLlpp_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), to_long(from_ptri(long_t, R_ESP + 12)), from_ptriv(R_ESP + 16), from_ptriv(R_ESP + 20)); }
 void iFEppipp_32(x64emu_t *emu, uintptr_t fcn) { iFEppipp_t fn = (iFEppipp_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptriv(R_ESP + 16), from_ptriv(R_ESP + 20)); }
 void iFEppllp_32(x64emu_t *emu, uintptr_t fcn) { iFEppllp_t fn = (iFEppllp_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), to_long(from_ptri(long_t, R_ESP + 12)), to_long(from_ptri(long_t, R_ESP + 16)), from_ptriv(R_ESP + 20)); }
-void iFEpppup_32(x64emu_t *emu, uintptr_t fcn) { iFEpppup_t fn = (iFEpppup_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptri(uint32_t, R_ESP + 16), from_ptriv(R_ESP + 20)); }
+void iFEpppLp_32(x64emu_t *emu, uintptr_t fcn) { iFEpppLp_t fn = (iFEpppLp_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), to_ulong(from_ptri(ulong_t, R_ESP + 16)), from_ptriv(R_ESP + 20)); }
 void iFEXLilp_32(x64emu_t *emu, uintptr_t fcn) { iFEXLilp_t fn = (iFEXLilp_t)fcn; R_EAX = fn(emu, getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptri(int32_t, R_ESP + 12), to_long(from_ptri(long_t, R_ESP + 16)), from_ptriv(R_ESP + 20)); }
 void iFEXpiup_32(x64emu_t *emu, uintptr_t fcn) { iFEXpiup_t fn = (iFEXpiup_t)fcn; R_EAX = fn(emu, getDisplay(from_ptriv(R_ESP + 4)), from_ptriv(R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptri(uint32_t, R_ESP + 16), from_ptriv(R_ESP + 20)); }
 void iFEXpppp_32(x64emu_t *emu, uintptr_t fcn) { iFEXpppp_t fn = (iFEXpppp_t)fcn; R_EAX = fn(emu, getDisplay(from_ptriv(R_ESP + 4)), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16), from_ptriv(R_ESP + 20)); }
@@ -2079,18 +2104,19 @@ void vFudddddd_32(x64emu_t *emu, uintptr_t fcn) { vFudddddd_t fn = (vFudddddd_t)
 void vFlliiiip_32(x64emu_t *emu, uintptr_t fcn) { vFlliiiip_t fn = (vFlliiiip_t)fcn; fn(to_long(from_ptri(long_t, R_ESP + 4)), to_long(from_ptri(long_t, R_ESP + 8)), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptri(int32_t, R_ESP + 20), from_ptri(int32_t, R_ESP + 24), from_ptriv(R_ESP + 28)); }
 void vFpipipiu_32(x64emu_t *emu, uintptr_t fcn) { vFpipipiu_t fn = (vFpipipiu_t)fcn; fn(from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptriv(R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptriv(R_ESP + 20), from_ptri(int32_t, R_ESP + 24), from_ptri(uint32_t, R_ESP + 28)); }
 void vFpddiidd_32(x64emu_t *emu, uintptr_t fcn) { vFpddiidd_t fn = (vFpddiidd_t)fcn; fn(from_ptriv(R_ESP + 4), from_ptri(double, R_ESP + 8), from_ptri(double, R_ESP + 16), from_ptri(int32_t, R_ESP + 24), from_ptri(int32_t, R_ESP + 28), from_ptri(double, R_ESP + 32), from_ptri(double, R_ESP + 40)); }
-void iFEpuiupV_32(x64emu_t *emu, uintptr_t fcn) { iFEpuiupV_t fn = (iFEpuiupV_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptri(uint32_t, R_ESP + 16), from_ptriv(R_ESP + 20), from_ptrv(R_ESP + 24)); }
 void iFEpLiipV_32(x64emu_t *emu, uintptr_t fcn) { iFEpLiipV_t fn = (iFEpLiipV_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptriv(R_ESP + 20), from_ptrv(R_ESP + 24)); }
+void iFEpLiLpV_32(x64emu_t *emu, uintptr_t fcn) { iFEpLiLpV_t fn = (iFEpLiLpV_t)fcn; R_EAX = fn(emu, from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptri(int32_t, R_ESP + 12), to_ulong(from_ptri(ulong_t, R_ESP + 16)), from_ptriv(R_ESP + 20), from_ptrv(R_ESP + 24)); }
 void iFEXLpppp_32(x64emu_t *emu, uintptr_t fcn) { iFEXLpppp_t fn = (iFEXLpppp_t)fcn; R_EAX = fn(emu, getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16), from_ptriv(R_ESP + 20), from_ptriv(R_ESP + 24)); }
 void iFuiiiuup_32(x64emu_t *emu, uintptr_t fcn) { iFuiiiuup_t fn = (iFuiiiuup_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptri(uint32_t, R_ESP + 20), from_ptri(uint32_t, R_ESP + 24), from_ptriv(R_ESP + 28)); }
 void iFpWCiWCi_32(x64emu_t *emu, uintptr_t fcn) { iFpWCiWCi_t fn = (iFpWCiWCi_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptri(uint16_t, R_ESP + 8), from_ptri(uint8_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptri(uint16_t, R_ESP + 20), from_ptri(uint8_t, R_ESP + 24), from_ptri(int32_t, R_ESP + 28)); }
-void iFpupLpLi_32(x64emu_t *emu, uintptr_t fcn) { iFpupLpLi_t fn = (iFpupLpLi_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptriv(R_ESP + 12), to_ulong(from_ptri(ulong_t, R_ESP + 16)), from_ptriv(R_ESP + 20), to_ulong(from_ptri(ulong_t, R_ESP + 24)), from_ptri(int32_t, R_ESP + 28)); }
+void iFpupupui_32(x64emu_t *emu, uintptr_t fcn) { iFpupupui_t fn = (iFpupupui_t)fcn; R_EAX = fn(from_ptriv(R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptriv(R_ESP + 12), from_ptri(uint32_t, R_ESP + 16), from_ptriv(R_ESP + 20), from_ptri(uint32_t, R_ESP + 24), from_ptri(int32_t, R_ESP + 28)); }
 void iFXiuLiii_32(x64emu_t *emu, uintptr_t fcn) { iFXiuLiii_t fn = (iFXiuLiii_t)fcn; R_EAX = fn(getDisplay(from_ptriv(R_ESP + 4)), from_ptri(int32_t, R_ESP + 8), from_ptri(uint32_t, R_ESP + 12), to_ulong(from_ptri(ulong_t, R_ESP + 16)), from_ptri(int32_t, R_ESP + 20), from_ptri(int32_t, R_ESP + 24), from_ptri(int32_t, R_ESP + 28)); }
 void uFuippppp_32(x64emu_t *emu, uintptr_t fcn) { uFuippppp_t fn = (uFuippppp_t)fcn; R_EAX = (uint32_t)fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16), from_ptriv(R_ESP + 20), from_ptriv(R_ESP + 24), from_ptriv(R_ESP + 28)); }
 void LFXLLppuu_32(x64emu_t *emu, uintptr_t fcn) { LFXLLppuu_t fn = (LFXLLppuu_t)fcn; R_EAX = to_ulong(fn(getDisplay(from_ptriv(R_ESP + 4)), to_ulong(from_ptri(ulong_t, R_ESP + 8)), to_ulong(from_ptri(ulong_t, R_ESP + 12)), from_ptriv(R_ESP + 16), from_ptriv(R_ESP + 20), from_ptri(uint32_t, R_ESP + 24), from_ptri(uint32_t, R_ESP + 28))); }
 void pFEpiiiiu_32(x64emu_t *emu, uintptr_t fcn) { pFEpiiiiu_t fn = (pFEpiiiiu_t)fcn; R_EAX = to_ptrv(fn(emu, from_ptriv(R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptri(int32_t, R_ESP + 20), from_ptri(uint32_t, R_ESP + 24))); }
 void pFEpLiiii_32(x64emu_t *emu, uintptr_t fcn) { pFEpLiiii_t fn = (pFEpLiiii_t)fcn; R_EAX = to_ptrv(fn(emu, from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptri(int32_t, R_ESP + 20), from_ptri(int32_t, R_ESP + 24))); }
 void pFEpLiiiI_32(x64emu_t *emu, uintptr_t fcn) { pFEpLiiiI_t fn = (pFEpLiiiI_t)fcn; R_EAX = to_ptrv(fn(emu, from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptri(int32_t, R_ESP + 20), from_ptri(int64_t, R_ESP + 24))); }
+void pFEpLiiil_32(x64emu_t *emu, uintptr_t fcn) { pFEpLiiil_t fn = (pFEpLiiil_t)fcn; R_EAX = to_ptrv(fn(emu, from_ptriv(R_ESP + 4), to_ulong(from_ptri(ulong_t, R_ESP + 8)), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptri(int32_t, R_ESP + 20), to_long(from_ptri(long_t, R_ESP + 24)))); }
 void vFiiiiuuip_32(x64emu_t *emu, uintptr_t fcn) { vFiiiiuuip_t fn = (vFiiiiuuip_t)fcn; fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(int32_t, R_ESP + 12), from_ptri(int32_t, R_ESP + 16), from_ptri(uint32_t, R_ESP + 20), from_ptri(uint32_t, R_ESP + 24), from_ptri(int32_t, R_ESP + 28), from_ptriv(R_ESP + 32)); }
 void vFiilliilp_32(x64emu_t *emu, uintptr_t fcn) { vFiilliilp_t fn = (vFiilliilp_t)fcn; fn(from_ptri(int32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), to_long(from_ptri(long_t, R_ESP + 12)), to_long(from_ptri(long_t, R_ESP + 16)), from_ptri(int32_t, R_ESP + 20), from_ptri(int32_t, R_ESP + 24), to_long(from_ptri(long_t, R_ESP + 28)), from_ptriv(R_ESP + 32)); }
 void vFiupuiuup_32(x64emu_t *emu, uintptr_t fcn) { vFiupuiuup_t fn = (vFiupuiuup_t)fcn; fn(from_ptri(int32_t, R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptriv(R_ESP + 12), from_ptri(uint32_t, R_ESP + 16), from_ptri(int32_t, R_ESP + 20), from_ptri(uint32_t, R_ESP + 24), from_ptri(uint32_t, R_ESP + 28), from_ptriv(R_ESP + 32)); }
@@ -2270,7 +2296,7 @@ int isRetX87Wrapper32(wrapper_t fun) {
 	if (fun == &dFdd_32) return 1;
 	if (fun == &dFdD_32) return 1;
 	if (fun == &dFdp_32) return 1;
-	if (fun == &dFLL_32) return 1;
+	if (fun == &dFll_32) return 1;
 	if (fun == &dFpp_32) return 1;
 	if (fun == &fFpBp__32) return 1;
 	if (fun == &dFpBp__32) return 1;
diff --git a/src/wrapped32/generated/wrapper32.h b/src/wrapped32/generated/wrapper32.h
index 3c07cad3..43a607e7 100644
--- a/src/wrapped32/generated/wrapper32.h
+++ b/src/wrapped32/generated/wrapper32.h
@@ -1,6 +1,6 @@
-/******************************************************************
- * File automatically generated by rebuild_wrappers_32.py (v0.0.1.1) *
- ******************************************************************/
+/*********************************************************************
+ * File automatically generated by rebuild_wrappers_32.py (v0.0.2.2) *
+ *********************************************************************/
 #ifndef __WRAPPER32_H_
 #define __WRAPPER32_H_
 #include <stdint.h>
@@ -63,6 +63,7 @@ void iFI_32(x64emu_t *emu, uintptr_t fnc);
 void iFu_32(x64emu_t *emu, uintptr_t fnc);
 void iFf_32(x64emu_t *emu, uintptr_t fnc);
 void iFd_32(x64emu_t *emu, uintptr_t fnc);
+void iFl_32(x64emu_t *emu, uintptr_t fnc);
 void iFL_32(x64emu_t *emu, uintptr_t fnc);
 void iFp_32(x64emu_t *emu, uintptr_t fnc);
 void iFh_32(x64emu_t *emu, uintptr_t fnc);
@@ -77,12 +78,14 @@ void CFu_32(x64emu_t *emu, uintptr_t fnc);
 void CFU_32(x64emu_t *emu, uintptr_t fnc);
 void CFl_32(x64emu_t *emu, uintptr_t fnc);
 void CFp_32(x64emu_t *emu, uintptr_t fnc);
+void WFW_32(x64emu_t *emu, uintptr_t fnc);
 void WFu_32(x64emu_t *emu, uintptr_t fnc);
 void uFv_32(x64emu_t *emu, uintptr_t fnc);
 void uFi_32(x64emu_t *emu, uintptr_t fnc);
 void uFu_32(x64emu_t *emu, uintptr_t fnc);
 void uFU_32(x64emu_t *emu, uintptr_t fnc);
 void uFp_32(x64emu_t *emu, uintptr_t fnc);
+void uFS_32(x64emu_t *emu, uintptr_t fnc);
 void UFu_32(x64emu_t *emu, uintptr_t fnc);
 void UFp_32(x64emu_t *emu, uintptr_t fnc);
 void UFs_32(x64emu_t *emu, uintptr_t fnc);
@@ -92,6 +95,7 @@ void dFv_32(x64emu_t *emu, uintptr_t fnc);
 void dFi_32(x64emu_t *emu, uintptr_t fnc);
 void dFd_32(x64emu_t *emu, uintptr_t fnc);
 void dFp_32(x64emu_t *emu, uintptr_t fnc);
+void lFv_32(x64emu_t *emu, uintptr_t fnc);
 void lFi_32(x64emu_t *emu, uintptr_t fnc);
 void lFu_32(x64emu_t *emu, uintptr_t fnc);
 void lFl_32(x64emu_t *emu, uintptr_t fnc);
@@ -114,8 +118,8 @@ void tFu_32(x64emu_t *emu, uintptr_t fnc);
 void tFp_32(x64emu_t *emu, uintptr_t fnc);
 void XFv_32(x64emu_t *emu, uintptr_t fnc);
 void iFBp__32(x64emu_t *emu, uintptr_t fnc);
-void LFrL__32(x64emu_t *emu, uintptr_t fnc);
-void pFrL__32(x64emu_t *emu, uintptr_t fnc);
+void LFrl__32(x64emu_t *emu, uintptr_t fnc);
+void pFrl__32(x64emu_t *emu, uintptr_t fnc);
 void vFbuuipWCCp__32(x64emu_t *emu, uintptr_t fnc);
 void LFriiiiiiiiilt__32(x64emu_t *emu, uintptr_t fnc);
 void pFriiiiiiiiilt__32(x64emu_t *emu, uintptr_t fnc);
@@ -170,13 +174,14 @@ void iFEX_32(x64emu_t *emu, uintptr_t fnc);
 void iFii_32(x64emu_t *emu, uintptr_t fnc);
 void iFiI_32(x64emu_t *emu, uintptr_t fnc);
 void iFiu_32(x64emu_t *emu, uintptr_t fnc);
+void iFil_32(x64emu_t *emu, uintptr_t fnc);
 void iFip_32(x64emu_t *emu, uintptr_t fnc);
-void iFia_32(x64emu_t *emu, uintptr_t fnc);
 void iFiS_32(x64emu_t *emu, uintptr_t fnc);
 void iFui_32(x64emu_t *emu, uintptr_t fnc);
 void iFuu_32(x64emu_t *emu, uintptr_t fnc);
+void iFuL_32(x64emu_t *emu, uintptr_t fnc);
 void iFup_32(x64emu_t *emu, uintptr_t fnc);
-void iFli_32(x64emu_t *emu, uintptr_t fnc);
+void iFua_32(x64emu_t *emu, uintptr_t fnc);
 void iFpi_32(x64emu_t *emu, uintptr_t fnc);
 void iFpu_32(x64emu_t *emu, uintptr_t fnc);
 void iFpl_32(x64emu_t *emu, uintptr_t fnc);
@@ -200,16 +205,15 @@ void CFuu_32(x64emu_t *emu, uintptr_t fnc);
 void CFuU_32(x64emu_t *emu, uintptr_t fnc);
 void CFpi_32(x64emu_t *emu, uintptr_t fnc);
 void CFpp_32(x64emu_t *emu, uintptr_t fnc);
-void uFEu_32(x64emu_t *emu, uintptr_t fnc);
 void uFEp_32(x64emu_t *emu, uintptr_t fnc);
-void uFEV_32(x64emu_t *emu, uintptr_t fnc);
+void uFiS_32(x64emu_t *emu, uintptr_t fnc);
 void uFuu_32(x64emu_t *emu, uintptr_t fnc);
 void uFup_32(x64emu_t *emu, uintptr_t fnc);
+void uFua_32(x64emu_t *emu, uintptr_t fnc);
+void uFuS_32(x64emu_t *emu, uintptr_t fnc);
 void uFpi_32(x64emu_t *emu, uintptr_t fnc);
 void uFpu_32(x64emu_t *emu, uintptr_t fnc);
 void uFpp_32(x64emu_t *emu, uintptr_t fnc);
-void uFpa_32(x64emu_t *emu, uintptr_t fnc);
-void UFii_32(x64emu_t *emu, uintptr_t fnc);
 void UFuu_32(x64emu_t *emu, uintptr_t fnc);
 void UFUU_32(x64emu_t *emu, uintptr_t fnc);
 void UFss_32(x64emu_t *emu, uintptr_t fnc);
@@ -223,15 +227,20 @@ void dFdi_32(x64emu_t *emu, uintptr_t fnc);
 void dFdd_32(x64emu_t *emu, uintptr_t fnc);
 void dFdD_32(x64emu_t *emu, uintptr_t fnc);
 void dFdp_32(x64emu_t *emu, uintptr_t fnc);
-void dFLL_32(x64emu_t *emu, uintptr_t fnc);
+void dFll_32(x64emu_t *emu, uintptr_t fnc);
 void dFpp_32(x64emu_t *emu, uintptr_t fnc);
+void lFEV_32(x64emu_t *emu, uintptr_t fnc);
 void lFES_32(x64emu_t *emu, uintptr_t fnc);
+void lFii_32(x64emu_t *emu, uintptr_t fnc);
 void lFui_32(x64emu_t *emu, uintptr_t fnc);
 void lFll_32(x64emu_t *emu, uintptr_t fnc);
+void lFpi_32(x64emu_t *emu, uintptr_t fnc);
 void lFpl_32(x64emu_t *emu, uintptr_t fnc);
+void LFEL_32(x64emu_t *emu, uintptr_t fnc);
 void LFLi_32(x64emu_t *emu, uintptr_t fnc);
 void LFpL_32(x64emu_t *emu, uintptr_t fnc);
 void LFpp_32(x64emu_t *emu, uintptr_t fnc);
+void LFpa_32(x64emu_t *emu, uintptr_t fnc);
 void LFXi_32(x64emu_t *emu, uintptr_t fnc);
 void LFXL_32(x64emu_t *emu, uintptr_t fnc);
 void pFEv_32(x64emu_t *emu, uintptr_t fnc);
@@ -259,11 +268,12 @@ void iFpBL__32(x64emu_t *emu, uintptr_t fnc);
 void iFHBp__32(x64emu_t *emu, uintptr_t fnc);
 void fFpBp__32(x64emu_t *emu, uintptr_t fnc);
 void dFpBp__32(x64emu_t *emu, uintptr_t fnc);
-void pFrL_p_32(x64emu_t *emu, uintptr_t fnc);
+void pFrl_p_32(x64emu_t *emu, uintptr_t fnc);
 void iFuBLL__32(x64emu_t *emu, uintptr_t fnc);
-void iFprLL__32(x64emu_t *emu, uintptr_t fnc);
+void iFprll__32(x64emu_t *emu, uintptr_t fnc);
 void iFpbup__32(x64emu_t *emu, uintptr_t fnc);
-void iFBLL_p_32(x64emu_t *emu, uintptr_t fnc);
+void iFprLL__32(x64emu_t *emu, uintptr_t fnc);
+void iFBll_p_32(x64emu_t *emu, uintptr_t fnc);
 void iFrLL_BLL__32(x64emu_t *emu, uintptr_t fnc);
 void iFpruuipWCCp__32(x64emu_t *emu, uintptr_t fnc);
 void pFriiiiiiiiilt_p_32(x64emu_t *emu, uintptr_t fnc);
@@ -347,27 +357,29 @@ void iFEpp_32(x64emu_t *emu, uintptr_t fnc);
 void iFEpV_32(x64emu_t *emu, uintptr_t fnc);
 void iFEhi_32(x64emu_t *emu, uintptr_t fnc);
 void iFEhp_32(x64emu_t *emu, uintptr_t fnc);
-void iFESp_32(x64emu_t *emu, uintptr_t fnc);
 void iFEXp_32(x64emu_t *emu, uintptr_t fnc);
 void iFiii_32(x64emu_t *emu, uintptr_t fnc);
 void iFiiI_32(x64emu_t *emu, uintptr_t fnc);
-void iFiiu_32(x64emu_t *emu, uintptr_t fnc);
+void iFiil_32(x64emu_t *emu, uintptr_t fnc);
 void iFiip_32(x64emu_t *emu, uintptr_t fnc);
 void iFiiO_32(x64emu_t *emu, uintptr_t fnc);
 void iFiII_32(x64emu_t *emu, uintptr_t fnc);
 void iFiuu_32(x64emu_t *emu, uintptr_t fnc);
 void iFiup_32(x64emu_t *emu, uintptr_t fnc);
+void iFill_32(x64emu_t *emu, uintptr_t fnc);
+void iFiLi_32(x64emu_t *emu, uintptr_t fnc);
 void iFiLN_32(x64emu_t *emu, uintptr_t fnc);
+void iFipi_32(x64emu_t *emu, uintptr_t fnc);
 void iFipu_32(x64emu_t *emu, uintptr_t fnc);
 void iFipL_32(x64emu_t *emu, uintptr_t fnc);
 void iFipp_32(x64emu_t *emu, uintptr_t fnc);
-void iFuii_32(x64emu_t *emu, uintptr_t fnc);
 void iFuip_32(x64emu_t *emu, uintptr_t fnc);
 void iFuui_32(x64emu_t *emu, uintptr_t fnc);
 void iFuuu_32(x64emu_t *emu, uintptr_t fnc);
 void iFuup_32(x64emu_t *emu, uintptr_t fnc);
-void iFuLp_32(x64emu_t *emu, uintptr_t fnc);
+void iFuLa_32(x64emu_t *emu, uintptr_t fnc);
 void iFfff_32(x64emu_t *emu, uintptr_t fnc);
+void iFLLi_32(x64emu_t *emu, uintptr_t fnc);
 void iFpii_32(x64emu_t *emu, uintptr_t fnc);
 void iFpiu_32(x64emu_t *emu, uintptr_t fnc);
 void iFpip_32(x64emu_t *emu, uintptr_t fnc);
@@ -415,6 +427,7 @@ void fFfff_32(x64emu_t *emu, uintptr_t fnc);
 void fFffp_32(x64emu_t *emu, uintptr_t fnc);
 void dFddd_32(x64emu_t *emu, uintptr_t fnc);
 void dFddp_32(x64emu_t *emu, uintptr_t fnc);
+void lFili_32(x64emu_t *emu, uintptr_t fnc);
 void lFipL_32(x64emu_t *emu, uintptr_t fnc);
 void lFlpi_32(x64emu_t *emu, uintptr_t fnc);
 void lFpLL_32(x64emu_t *emu, uintptr_t fnc);
@@ -444,7 +457,7 @@ void pFpii_32(x64emu_t *emu, uintptr_t fnc);
 void pFpiu_32(x64emu_t *emu, uintptr_t fnc);
 void pFpiL_32(x64emu_t *emu, uintptr_t fnc);
 void pFpiS_32(x64emu_t *emu, uintptr_t fnc);
-void pFpuL_32(x64emu_t *emu, uintptr_t fnc);
+void pFpII_32(x64emu_t *emu, uintptr_t fnc);
 void pFpup_32(x64emu_t *emu, uintptr_t fnc);
 void pFppu_32(x64emu_t *emu, uintptr_t fnc);
 void pFppL_32(x64emu_t *emu, uintptr_t fnc);
@@ -457,7 +470,6 @@ void SFEpp_32(x64emu_t *emu, uintptr_t fnc);
 void SFppS_32(x64emu_t *emu, uintptr_t fnc);
 void tFipu_32(x64emu_t *emu, uintptr_t fnc);
 void iFppbL__32(x64emu_t *emu, uintptr_t fnc);
-void iFpBp_i_32(x64emu_t *emu, uintptr_t fnc);
 void iFpbL_p_32(x64emu_t *emu, uintptr_t fnc);
 void iFBp_LL_32(x64emu_t *emu, uintptr_t fnc);
 void iFBp_pi_32(x64emu_t *emu, uintptr_t fnc);
@@ -579,7 +591,7 @@ void iFEppu_32(x64emu_t *emu, uintptr_t fnc);
 void iFEppL_32(x64emu_t *emu, uintptr_t fnc);
 void iFEppp_32(x64emu_t *emu, uintptr_t fnc);
 void iFEppV_32(x64emu_t *emu, uintptr_t fnc);
-void iFEpOu_32(x64emu_t *emu, uintptr_t fnc);
+void iFEpON_32(x64emu_t *emu, uintptr_t fnc);
 void iFEhup_32(x64emu_t *emu, uintptr_t fnc);
 void iFESpp_32(x64emu_t *emu, uintptr_t fnc);
 void iFESpV_32(x64emu_t *emu, uintptr_t fnc);
@@ -588,8 +600,9 @@ void iFEXLp_32(x64emu_t *emu, uintptr_t fnc);
 void iFiiiu_32(x64emu_t *emu, uintptr_t fnc);
 void iFiiip_32(x64emu_t *emu, uintptr_t fnc);
 void iFiiiN_32(x64emu_t *emu, uintptr_t fnc);
-void iFiill_32(x64emu_t *emu, uintptr_t fnc);
-void iFiuui_32(x64emu_t *emu, uintptr_t fnc);
+void iFiiII_32(x64emu_t *emu, uintptr_t fnc);
+void iFiIIi_32(x64emu_t *emu, uintptr_t fnc);
+void iFilli_32(x64emu_t *emu, uintptr_t fnc);
 void iFipii_32(x64emu_t *emu, uintptr_t fnc);
 void iFipui_32(x64emu_t *emu, uintptr_t fnc);
 void iFipup_32(x64emu_t *emu, uintptr_t fnc);
@@ -606,7 +619,7 @@ void iFppui_32(x64emu_t *emu, uintptr_t fnc);
 void iFppLi_32(x64emu_t *emu, uintptr_t fnc);
 void iFpppi_32(x64emu_t *emu, uintptr_t fnc);
 void iFpppp_32(x64emu_t *emu, uintptr_t fnc);
-void iFhpiL_32(x64emu_t *emu, uintptr_t fnc);
+void iFSpiL_32(x64emu_t *emu, uintptr_t fnc);
 void iFXipi_32(x64emu_t *emu, uintptr_t fnc);
 void iFXipp_32(x64emu_t *emu, uintptr_t fnc);
 void iFXLii_32(x64emu_t *emu, uintptr_t fnc);
@@ -619,6 +632,7 @@ void uFuuuu_32(x64emu_t *emu, uintptr_t fnc);
 void uFpCCC_32(x64emu_t *emu, uintptr_t fnc);
 void uFppip_32(x64emu_t *emu, uintptr_t fnc);
 void lFEipi_32(x64emu_t *emu, uintptr_t fnc);
+void lFEppL_32(x64emu_t *emu, uintptr_t fnc);
 void lFiipL_32(x64emu_t *emu, uintptr_t fnc);
 void lFipLi_32(x64emu_t *emu, uintptr_t fnc);
 void lFipLl_32(x64emu_t *emu, uintptr_t fnc);
@@ -653,7 +667,7 @@ void iFBp_pui_32(x64emu_t *emu, uintptr_t fnc);
 void IFpBp_ii_32(x64emu_t *emu, uintptr_t fnc);
 void uFppiBp__32(x64emu_t *emu, uintptr_t fnc);
 void UFpBp_ii_32(x64emu_t *emu, uintptr_t fnc);
-void lFiibp_L_32(x64emu_t *emu, uintptr_t fnc);
+void lFiibl_L_32(x64emu_t *emu, uintptr_t fnc);
 void LFpbp_Lp_32(x64emu_t *emu, uintptr_t fnc);
 void iFEpprLL__32(x64emu_t *emu, uintptr_t fnc);
 void vFXLrpLiL_L_32(x64emu_t *emu, uintptr_t fnc);
@@ -663,6 +677,7 @@ void LFpLpriiiiiiiiilt__32(x64emu_t *emu, uintptr_t fnc);
 void iFpruuipWCCp_buuipWCCp_i_32(x64emu_t *emu, uintptr_t fnc);
 void vFEuipp_32(x64emu_t *emu, uintptr_t fnc);
 void vFEpLLp_32(x64emu_t *emu, uintptr_t fnc);
+void vFEppiV_32(x64emu_t *emu, uintptr_t fnc);
 void vFiiiii_32(x64emu_t *emu, uintptr_t fnc);
 void vFiiiiu_32(x64emu_t *emu, uintptr_t fnc);
 void vFiiuii_32(x64emu_t *emu, uintptr_t fnc);
@@ -759,10 +774,8 @@ void iFEiiip_32(x64emu_t *emu, uintptr_t fnc);
 void iFEipii_32(x64emu_t *emu, uintptr_t fnc);
 void iFEpipp_32(x64emu_t *emu, uintptr_t fnc);
 void iFEpupu_32(x64emu_t *emu, uintptr_t fnc);
-void iFEpupV_32(x64emu_t *emu, uintptr_t fnc);
 void iFEpLpp_32(x64emu_t *emu, uintptr_t fnc);
 void iFEpLpV_32(x64emu_t *emu, uintptr_t fnc);
-void iFEppiV_32(x64emu_t *emu, uintptr_t fnc);
 void iFEpplp_32(x64emu_t *emu, uintptr_t fnc);
 void iFEpppi_32(x64emu_t *emu, uintptr_t fnc);
 void iFEpppp_32(x64emu_t *emu, uintptr_t fnc);
@@ -778,7 +791,7 @@ void iFpCCCC_32(x64emu_t *emu, uintptr_t fnc);
 void iFpLuLi_32(x64emu_t *emu, uintptr_t fnc);
 void iFppiUi_32(x64emu_t *emu, uintptr_t fnc);
 void iFpppip_32(x64emu_t *emu, uintptr_t fnc);
-void iFpppup_32(x64emu_t *emu, uintptr_t fnc);
+void iFpppLp_32(x64emu_t *emu, uintptr_t fnc);
 void iFppppp_32(x64emu_t *emu, uintptr_t fnc);
 void iFXiiip_32(x64emu_t *emu, uintptr_t fnc);
 void iFXpppp_32(x64emu_t *emu, uintptr_t fnc);
@@ -873,7 +886,6 @@ void vFpdddii_32(x64emu_t *emu, uintptr_t fnc);
 void vFppupii_32(x64emu_t *emu, uintptr_t fnc);
 void vFpppppp_32(x64emu_t *emu, uintptr_t fnc);
 void vFXLiiii_32(x64emu_t *emu, uintptr_t fnc);
-void iFEuppup_32(x64emu_t *emu, uintptr_t fnc);
 void iFEuppLp_32(x64emu_t *emu, uintptr_t fnc);
 void iFEpiLpp_32(x64emu_t *emu, uintptr_t fnc);
 void iFEpuuup_32(x64emu_t *emu, uintptr_t fnc);
@@ -881,7 +893,7 @@ void iFEplluu_32(x64emu_t *emu, uintptr_t fnc);
 void iFEpLlpp_32(x64emu_t *emu, uintptr_t fnc);
 void iFEppipp_32(x64emu_t *emu, uintptr_t fnc);
 void iFEppllp_32(x64emu_t *emu, uintptr_t fnc);
-void iFEpppup_32(x64emu_t *emu, uintptr_t fnc);
+void iFEpppLp_32(x64emu_t *emu, uintptr_t fnc);
 void iFEXLilp_32(x64emu_t *emu, uintptr_t fnc);
 void iFEXpiup_32(x64emu_t *emu, uintptr_t fnc);
 void iFEXpppp_32(x64emu_t *emu, uintptr_t fnc);
@@ -953,18 +965,19 @@ void vFudddddd_32(x64emu_t *emu, uintptr_t fnc);
 void vFlliiiip_32(x64emu_t *emu, uintptr_t fnc);
 void vFpipipiu_32(x64emu_t *emu, uintptr_t fnc);
 void vFpddiidd_32(x64emu_t *emu, uintptr_t fnc);
-void iFEpuiupV_32(x64emu_t *emu, uintptr_t fnc);
 void iFEpLiipV_32(x64emu_t *emu, uintptr_t fnc);
+void iFEpLiLpV_32(x64emu_t *emu, uintptr_t fnc);
 void iFEXLpppp_32(x64emu_t *emu, uintptr_t fnc);
 void iFuiiiuup_32(x64emu_t *emu, uintptr_t fnc);
 void iFpWCiWCi_32(x64emu_t *emu, uintptr_t fnc);
-void iFpupLpLi_32(x64emu_t *emu, uintptr_t fnc);
+void iFpupupui_32(x64emu_t *emu, uintptr_t fnc);
 void iFXiuLiii_32(x64emu_t *emu, uintptr_t fnc);
 void uFuippppp_32(x64emu_t *emu, uintptr_t fnc);
 void LFXLLppuu_32(x64emu_t *emu, uintptr_t fnc);
 void pFEpiiiiu_32(x64emu_t *emu, uintptr_t fnc);
 void pFEpLiiii_32(x64emu_t *emu, uintptr_t fnc);
 void pFEpLiiiI_32(x64emu_t *emu, uintptr_t fnc);
+void pFEpLiiil_32(x64emu_t *emu, uintptr_t fnc);
 void vFiiiiuuip_32(x64emu_t *emu, uintptr_t fnc);
 void vFiilliilp_32(x64emu_t *emu, uintptr_t fnc);
 void vFiupuiuup_32(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped32/wrappedlib_init32.h b/src/wrapped32/wrappedlib_init32.h
index 463acfe8..0f91ee94 100644
--- a/src/wrapped32/wrappedlib_init32.h
+++ b/src/wrapped32/wrappedlib_init32.h
@@ -30,6 +30,8 @@
 #define GOWM(N, W)
 // regular symbol mapped to itself, that returns a structure
 #define GOS(N, W)
+// weak symbol mapped to itself, that returns a structure
+#define GOWS(N, W)
 // symbol mapped to another one
 #define GO2(N, W, O)
 // weak symbol mapped to another one
@@ -74,19 +76,24 @@ static const map_onesymbol_t MAPNAME(mysymbolmap)[] = {
 };
 #undef GOM
 #undef GOWM
-#undef GOS
 #define GOM(N, W)
 #define GOWM(N, W)
+#undef GOS
+#undef GOWS
 #ifdef STATICBUILD
 #define GOS(N, W) {#N, W##_32, 0, &my32_##N},
+#define GOWS(N, W) {#N, W##_32, 1, &my32_##N},
 #else
 #define GOS(N, W) {#N, W##_32, 0},
+#define GOWS(N, W) {#N, W##_32, 1},
 #endif
 static const map_onesymbol_t MAPNAME(stsymbolmap)[] = {
     #include PRIVATE(LIBNAME)
 };
 #undef GOS
+#undef GOWS
 #define GOS(N, W)
+#define GOWS(N, W)
 #undef GO2
 #undef GOW2
 #ifdef STATICBUILD
@@ -140,6 +147,7 @@ static const map_onedata_t MAPNAME(mydatamap)[] = {
 #undef GOWM
 #undef GO2
 #undef GOS
+#undef GOWS
 #undef DATA
 #undef DATAV
 #undef DATAB
diff --git a/src/wrapped32/wrappedlibc.c b/src/wrapped32/wrappedlibc.c
index 58fff5bf..1c533b53 100755
--- a/src/wrapped32/wrappedlibc.c
+++ b/src/wrapped32/wrappedlibc.c
@@ -516,7 +516,7 @@ int EXPORT my32_atexit(x64emu_t* emu, void *p)
 
 int my32_getcontext(x64emu_t* emu, void* ucp);
 int my32_setcontext(x64emu_t* emu, void* ucp);
-int my32_makecontext(x64emu_t* emu, void* ucp, void* fnc, int32_t argc, void* argv);
+void my32_makecontext(x64emu_t* emu, void* ucp, void* fnc, int32_t argc, void* argv);
 int my32_swapcontext(x64emu_t* emu, void* ucp1, void* ucp2);
 
 // All signal and context functions defined in signals.c
diff --git a/src/wrapped32/wrappedlibc_private.h b/src/wrapped32/wrappedlibc_private.h
index d729ea02..c1cedbb1 100755
--- a/src/wrapped32/wrappedlibc_private.h
+++ b/src/wrapped32/wrappedlibc_private.h
@@ -2,7 +2,7 @@
 #error Meh...
 #endif
 
-// FILE* is h (because stdin/stdout/stderr might be 64bits, maybe other special file can be too)
+// FILE* is S
 // locale_t needs special handling, with to_locale / from_locale (and is a / A)
 // struct utimbuf is: LL
 // struct timespec is: LL
@@ -45,7 +45,7 @@ GOW(access, iFpi)
 // __aeabi_memset4
 // __aeabi_memset8
 //DATAV(__after_morecore_hook, 4)
-GO(alarm, iFu)
+GO(alarm, uFu)
 //GO2(aligned_alloc, pFuu, memalign)
 GO(alphasort, iFpp)
 GOM(alphasort64, iFEpp)
@@ -111,7 +111,7 @@ GOW(bind_textdomain_codeset, pFpp)
 // __bsd_getpgrp
 // bsd_signal   // Weak
 GOM(bsearch, pFEppLLp) //%%
-GOW(btowc, iFi)
+GOW(btowc, uFi)
 GOW(bzero, vFpL)
 GO(__bzero, vFpL)
 GOW(calloc, pFLL)
@@ -153,7 +153,7 @@ GO(clearerr, vFS)
 // clntudp_bufcreate
 // clntudp_create
 // clntunix_create
-GO(clock, LFv)
+GO(clock, lFv)
 // clone    // Weak
 // __clone
 GOW(close, iFi)
@@ -172,8 +172,8 @@ GOW(__connect, iFipu)
 //GO(creat64, iFpu)
 // create_module    // Weak
 //GO(ctermid, pFp)
-GO(ctime, pFrL_)
-GO(ctime_r, pFrL_p)
+GO(ctime, pFrl_)
+GO(ctime_r, pFrl_p)
 DATAM(__ctype_b, 4)
 GOM(__ctype_b_loc, pFEv)
 GOW(__ctype_get_mb_cur_max, LFv)
@@ -205,12 +205,12 @@ DATAV(daylight, 4)
 // des_setparity
 GOW(dgettext, pFpp)
 GO(__dgettext, pFpp)
-GO(difftime, dFLL)
+GO(difftime, dFll)
 //GO(dirfd, iFp)
 GO(dirname, pFp)
 GOS(div, pFpii) //%%,noE
 // _dl_addr
-GO2(dl_iterate_phdr, iFEpp, my_dl_iterate_phdr) //%%
+GOW2(dl_iterate_phdr, iFEpp, my_dl_iterate_phdr) //%%
 // _dl_mcount_wrapper
 // _dl_mcount_wrapper_check
 // _dl_open_hook    // type B
@@ -325,7 +325,7 @@ GOW(fflush, iFS)
 //GO(fflush_unlocked, iFS)
 GO(ffs, iFi)
 // __ffs
-GOW(ffsl, iFi)
+GOW(ffsl, iFl)
 GO(ffsll, iFI)
 GOW(fgetc, iFS)
 GOW(fgetc_unlocked, iFS)
@@ -370,7 +370,7 @@ GOWM(fopen64, SFEpp)         //%%
 GOWM(fork, iFEv)             //%%
 GOM(__fork, iFEv)           //%%
 // __fortify_fail
-GOW(fpathconf, iFii)
+GOW(fpathconf, lFii)
 //GO(__fpending, uFp)
 GOM(fprintf, iFESpV) //%%
 GOM(__fprintf_chk, iFESvpV) //%%
@@ -380,7 +380,7 @@ GOW(fputc, iFiS)
 //GO(fputc_unlocked, iFip)
 GOW(fputs, iFpS)    // Weak
 //GO(fputs_unlocked, iFpp)
-GO(fputwc, iFiS)
+GO(fputwc, uFiS)
 //GO(fputwc_unlocked, iFip)
 //GO(fputws, iFpp)
 //GO(fputws_unlocked, iFpp)
@@ -420,7 +420,7 @@ GO(ftello, lFS)
 GO(ftello64, IFS)
 //GO(ftime, iFp)
 GO(ftok, iFpi)
-GOW(ftruncate, iFiu)
+GOW(ftruncate, iFil)
 GOW(ftruncate64, iFiI)
 //GOW(ftrylockfile, iFp)
 //GOM(fts_children, pFEpi) //%%
@@ -476,21 +476,21 @@ GOW(getcwd, tFpL)
 //GO(getdomainname, iFpu)
 // __getdomainname_chk
 GOW(getdtablesize, iFv)
-GOW(getegid, iFv)
+GOW(getegid, uFv)
 GO(getenv, tFp)
-GOW(geteuid, pFv)
+GOW(geteuid, uFv)
 // getfsent
 // getfsfile
 // getfsspec
-GOW(getgid, iFv)
+GOW(getgid, uFv)
 //GO(getgrent, pFv)
 // getgrent_r
 //GO(getgrgid, pFu)
-GOM(getgrgid_r, iFEuppup)
+GOM(getgrgid_r, iFEuppLp)
 //GO(getgrnam, pFp)
-GOM(getgrnam_r, iFEpppup)
+GOM(getgrnam_r, iFEpppLp)
 //GO(getgrouplist, iFpipp)
-GOW(getgroups, iFiu)
+GOW(getgroups, iFip)
 // __getgroups_chk
 //GO(gethostbyaddr, pFpui)
 //GO(gethostbyaddr_r, iFpuippupp)
@@ -510,14 +510,14 @@ GOM(getifaddrs, iFEbp_)
 //GOW(getline, iFppp)
 GO(getloadavg, iFpi)
 GO(getlogin, pFv)
-GO(getlogin_r, iFpu)
+GO(getlogin_r, iFpL)
 // __getlogin_r_chk
 GOM(getmntent, pFES)
 // __getmntent_r
 //GOW(getmntent_r, pFpppi)
 // getmsg
 // get_myaddress
-GO(getnameinfo, iFpupLpLi)
+GO(getnameinfo, iFpupupui)
 // getnetbyaddr
 // getnetbyaddr_r
 // getnetbyname
@@ -536,15 +536,15 @@ GOW(getpagesize, iFv)
 GO(__getpagesize, iFv)
 //GO(getpass, pFp)
 GOW(getpeername, iFipp)
-GOW(getpgid, uFu)
+GOW(getpgid, iFi)
 // __getpgid
 GO(getpgrp, iFv)
 // get_phys_pages   // Weak
-GO(getpid, uFv)
+GO(getpid, iFv)
 GO(__getpid, uFv)
 // getpmsg
-GOW(getppid, uFv)
-GO(getpriority, iFii)
+GOW(getppid, iFv)
+GO(getpriority, iFuu)
 //GOM(getrandom, iFEpuu)          //%%
 GOM(getprotobyname, pFEp)
 //GO(getprotobyname_r, iFpppup)
@@ -558,13 +558,13 @@ GOW(getpt, iFv)
 //GO(getpwent, pFv)
 // getpwent_r
 GOM(getpwnam, pFEp)
-GOM(getpwnam_r, iFEpppup)
+GOM(getpwnam_r, iFEpppLp)
 GOM(getpwuid, pFEu)
 GOM(getpwuid_r, iFEuppLp)
 //GOW(getresgid, iFppp)
 GOW(getresuid, iFppp)
-GOM(getrlimit, iFEip)
-GO(getrlimit64, iFip)
+GOM(getrlimit, iFEup)
+GO(getrlimit64, iFup)
 // getrpcbyname
 // getrpcbyname_r
 // getrpcbynumber
@@ -582,7 +582,7 @@ GOW(getrusage, iFiBLLLLLLLLLLLLLLLLLL_)
 //GO(getservbyport_r, iFipppup)
 // getservent
 //GO(getservent_r, iFppup)
-GO(getsid, uFu)
+GO(getsid, iFi)
 GOW(getsockname, iFipp)
 GOW(getsockopt, iFiiipp)
 // getsourcefilter
@@ -592,7 +592,7 @@ GOW(getsockopt, iFiiipp)
 // getspnam_r
 // getsubopt
 GOW(gettext, pFp)
-GOW(gettimeofday, iFBLL_p)
+GOW(gettimeofday, iFBll_p)
 //GO(__gettimeofday, iFpp)
 // getttyent
 // getttynam
@@ -610,9 +610,9 @@ GOW(getuid, uFv)
 // getutxid
 // getutxline
 // getw
-GO2(getwc, iFh, fgetwc)
-GO(getwchar, iFv)
-GO(getwchar_unlocked, iFv)
+GO2(getwc, uFS, fgetwc)
+GO(getwchar, uFv)
+GO(getwchar_unlocked, uFv)
 //GOW(getwc_unlocked, iFp)
 //GO(getwd, pFp)
 // __getwd_chk
@@ -626,7 +626,7 @@ GOM(gmtime, pFEp)
 //GO(__gmtime_r, pFpp)
 GOWM(gmtime_r, pFEpp)
 GO(gnu_dev_major, uFU)
-GO(gnu_dev_makedev, UFii)       // dev_t seems to be a u64
+GO(gnu_dev_makedev, UFuu)
 GO(gnu_dev_minor, uFU)
 GOW(gnu_get_libc_release, pFv)
 GOW(gnu_get_libc_version, pFv)
@@ -651,17 +651,17 @@ GOM(__h_errno_location, pFEv)
 // hsearch_r
 //GO(hstrerror, pFi)
 GO(htonl, uFu)
-GO(htons, uFu)
+GO(htons, WFW)
 GO(iconv, LFLbp_bL_bp_bL_)
 //GO(iconv_canonicalize, pFp)
-GO(iconv_close, iFL)
+GO(iconv_close, iFp)
 GO(iconv_open, pFpp)
 //GO(if_freenameindex, vFp)
 //GO(if_indextoname, pFup)
 //GO(if_nameindex, pFv)
 //GO(if_nametoindex, uFp)
 // imaxabs  // Weak
-GOW(imaxdiv, IFII)
+GOWS(imaxdiv, pFpII) //%%
 //DATA(in6addr_any, 16)  // type R
 //DATA(in6addr_loopback, 16) // type R
 // inb  // Weak
@@ -788,7 +788,7 @@ GO(_IO_getc, iFS)
 //GO(_IO_marker_difference, iFpp)
 //GO(_IO_padn, iFpii)
 //GO(_IO_peekc_locked, iFp)
-GOW(ioperm, iFuui)
+GOW(ioperm, iFLLi)
 GOW(iopl, iFi)
 // _IO_popen
 // _IO_printf
@@ -910,46 +910,46 @@ GO(isspace, iFi)
 GO(isupper, iFi)
 // __isupper_l
 // isupper_l    // Weak
-GOW(iswalnum, iFi)
+GOW(iswalnum, iFu)
 // __iswalnum_l
-//GOW(iswalnum_l, iFip)
-GOW(iswalpha, iFi)
+//GOW(iswalnum_l, iFua)
+GOW(iswalpha, iFu)
 // __iswalpha_l
-//GOW(iswalpha_l, iFip)
-GOW(iswblank, iFi)
+//GOW(iswalpha_l, iFua)
+GOW(iswblank, iFu)
 // __iswblank_l
-GOW(iswblank_l, iFip)
-GOW(iswcntrl, iFi)
+GOW(iswblank_l, iFua)
+GOW(iswcntrl, iFu)
 // __iswcntrl_l
-GOW(iswcntrl_l, iFip)
-GOW(iswctype, iFiu)
+GOW(iswcntrl_l, iFua)
+GOW(iswctype, iFuL)
 // __iswctype
-GO(__iswctype_l, iFuLp)
+GO(__iswctype_l, iFuLa)
 // iswctype_l   // Weak
-GOW(iswdigit, iFi)
+GOW(iswdigit, iFu)
 // __iswdigit_l
-//GOW(iswdigit_l, iFip)
-GOW(iswgraph, iFi)
+//GOW(iswdigit_l, iFua)
+GOW(iswgraph, iFu)
 // __iswgraph_l
-//GOW(iswgraph_l, iFip)
-GOW(iswlower, iFi)
+//GOW(iswgraph_l, iFua)
+GOW(iswlower, iFu)
 // __iswlower_l
-//GOW(iswlower_l, iFip)
-GOW(iswprint, iFi)
+//GOW(iswlower_l, iFua)
+GOW(iswprint, iFu)
 // __iswprint_l
-//GOW(iswprint_l, iFip)
-GOW(iswpunct, iFi)
+//GOW(iswprint_l, iFua)
+GOW(iswpunct, iFu)
 // __iswpunct_l
-//GOW(iswpunct_l, iFip)
-GOW(iswspace, iFi)
+//GOW(iswpunct_l, iFua)
+GOW(iswspace, iFu)
 // __iswspace_l
-//GOW(iswspace_l, iFip)
-GOW(iswupper, iFi)
+//GOW(iswspace_l, iFua)
+GOW(iswupper, iFu)
 // __iswupper_l
-//GOW(iswupper_l, iFip)
-GOW(iswxdigit, iFi)
+//GOW(iswupper_l, iFua)
+GOW(iswxdigit, iFu)
 // __iswxdigit_l
-//GOW(iswxdigit_l, iFip)
+//GOW(iswxdigit_l, iFua)
 GO(isxdigit, iFi)
 // __isxdigit_l
 // isxdigit_l   // Weak
@@ -969,11 +969,11 @@ GO(jrand48, lFp)
 // key_secretkey_is_set
 // key_setnet
 // key_setsecret
-GOW(kill, iFli)
+GOW(kill, iFii)
 GO(killpg, iFii)
 // klogctl
 // l64a
-GO(labs, iFi)
+GO(labs, lFl)
 // lchmod
 GOW(lchown, iFpuu)
 // lckpwdf  // Weak
@@ -1035,17 +1035,17 @@ GOW(listen, iFii)
 GOWM(localeconv, pFEv)
 GOM(localtime, pFEp)
 GOWM(localtime_r, pFEpp)
-GO(lockf, iFiiu)
+GO(lockf, iFiil)
 GO(lockf64, iFiiI)
 // locs // type B
 GOM(longjmp, vFEpi)         //%%
 GOM(_longjmp, vFEpi)        //%%
 GOM(__longjmp_chk, vFEpi)   //%%
-GO(lrand48, iFv)
+GO(lrand48, lFv)
 // lrand48_r
 //GO(lremovexattr, iFpp)
 //GOM(lsearch, pFEpppLp)      //%%
-GOW(lseek, iFiii)
+GOW(lseek, lFili)
 // __lseek  // Weak
 GOW(lseek64, IFiIi)
 //GO(lsetxattr, iFpppui)
@@ -1053,7 +1053,7 @@ GOW(lseek64, IFiIi)
 GOM(__lxstat, iFEipp)       //%%
 GOM(__lxstat64, iFEipp)     //%%
 GO(madvise, iFpLi)
-GOM(makecontext, iFEppiV)   //%%
+GOWM(makecontext, vFEppiV)   //%%
 //GOW(mallinfo, pFv)
 GOM(malloc, pFL)            //%%,noE
 // malloc_get_state // Weak
@@ -1061,7 +1061,7 @@ GOM(malloc, pFL)            //%%,noE
 //DATAV(__malloc_initialize_hook, 4)
 // malloc_set_state // Weak
 // malloc_stats // Weak
-GOW(malloc_trim, iFu)
+GOW(malloc_trim, iFL)
 GOW(malloc_usable_size, LFp)
 GOW(mallopt, iFii)  // Weak
 // mallwatch    // type B
@@ -1116,7 +1116,7 @@ GO(mkstemp64, iFp)
 GO(mktime, LFriiiiiiiiilt_)
 GO(mlock, iFpL)
 //GO(mlockall, iFi)
-GOM(mmap, pFEpLiiii)    //%%
+GOM(mmap, pFEpLiiil)    //%%
 GOM(mmap64, pFEpLiiiI)  //%%
 // modf // Weak
 // modff    // Weak
@@ -1125,7 +1125,7 @@ GOM(mmap64, pFEpLiiiI)  //%%
 // monstartup   // Weak
 // __monstartup
 //DATA(__morecore, 4)
-GOW(mount, iFpppup)
+GOW(mount, iFpppLp)
 // mprobe
 GOM(mprotect, iFEpLi)   //%%
 // mrand48
@@ -1178,7 +1178,7 @@ GO(__nl_langinfo_l, pFia)
 // __nss_passwd_lookup2
 // __nss_services_lookup2
 GOW(ntohl, uFu)
-GOW(ntohs, uFu)
+GOW(ntohs, WFW)
 // ntp_adjtime  // Weak
 // ntp_gettime
 // _null_auth   // type B
@@ -1197,10 +1197,10 @@ GOW(ntohs, uFu)
 // __obstack_vprintf_chk
 //GOWM(on_exit, iFEpp)  //%%
 //GO2(__on_exit, iFEpp, my_on_exit)   //%%
-GOWM(open, iFEpOu)    //%%
-//GOWM(__open, iFEpOu)  //%%
+GOWM(open, iFEpON)    //%%
+//GOWM(__open, iFEpON)  //%%
 //GO(__open_2, iFpO)
-GOWM(open64, iFEpOu)  //%%
+GOWM(open64, iFEpON)  //%%
 // __open64 // Weak
 //GO(__open64_2, iFpO)
 //GOW(openat, iFipON)
@@ -1222,7 +1222,7 @@ GO(openlog, vFpii)
 //GO(__overflow, iFpi)
 //GO(parse_printf_format, uFpup)
 // passwd2des
-GOW(pathconf, iFpi)
+GOW(pathconf, lFpi)
 GOW(pause, iFv)
 GO(pclose, iFS)
 GO(perror, vFp)
@@ -1239,9 +1239,9 @@ GOW(pipe, iFp)
 GOW(poll, iFpLi)    // poll have an array of struct as 1st argument
 GO(__poll, iFpLi)
 GO(popen, SFpp)
-GO(posix_fadvise, iFiuui)
-GO(posix_fadvise64, iFiuui)
-GO(posix_fallocate, iFiii)
+GO(posix_fadvise, iFilli)
+GO(posix_fadvise64, iFiIIi)
+GO(posix_fallocate, iFill)
 GO(posix_fallocate64, iFiII)
 // posix_madvise
 GOW(posix_memalign, iFBp_LL)
@@ -1292,7 +1292,7 @@ DATAM(program_invocation_short_name, 4)
 //GO(ptsname, pFi)
 //GOW(ptsname_r, iFipu)
 // __ptsname_r_chk
-GOW(putc, iFip)
+GOW(putc, iFiS)
 GO(putchar, iFi)
 GO(putchar_unlocked, iFi)
 //GO(putc_unlocked, iFip)
@@ -1306,9 +1306,9 @@ GOW(puts, iFp)
 //GOW(pututline, pFp)
 // pututxline
 // putw
-GO(putwc, iFiS)
+GO(putwc, uFiS)
 // putwchar
-GO(putwchar_unlocked, iFi)
+GO(putwchar_unlocked, uFi)
 //GO(putwc_unlocked, iFip)
 // pvalloc  // Weak
 // pwrite   // Weak
@@ -1334,7 +1334,7 @@ GOM(qsort, vFEpLLp) //%%
 //GO(quotactl, iFipip)
 GO(raise, iFi)
 GO(rand, iFv)
-GOW(random, iFv)
+GOW(random, lFv)
 //GOW(random_r, iFpp)
 //GO(rand_r, iFp)
 //GOW(rawmemchr, pFpi)
@@ -1350,7 +1350,7 @@ GOWM(readdir, pFEp)  //%%
 GO(readdir64, pFp)  // check if alignement is correct
 // readdir64_r
 //GOM(readdir_r, iFEppp)  //%% should also be weak
-GOM(readlink, iFEppL) //%%
+GOM(readlink, lFEppL) //%%
 //GOM(readlinkat, iFEippL)
 // __readlinkat_chk
 // __readlink_chk
@@ -1390,7 +1390,7 @@ GO(rename, iFpp)
 //GOW(re_search, iFppiiip)
 //GOW(re_search_2, iFppipiiipi)
 // re_set_registers // Weak
-GOW(re_set_syntax, uFu)
+GOW(re_set_syntax, LFL)
 // _res_hconf   // type B
 //GO(__res_iclose, vFpi)
 GO(__res_init, iFv)
@@ -1459,12 +1459,12 @@ GO(secure_getenv, pFp)
 GOW(select, iFippprLL_)
 GO(__select, iFippprLL_)
 GO(semctl, iFiiiN)
-GOW(semget, iFuii)
+GOW(semget, iFiii)
 GOW(semop, iFipL)
 //GO(semtimedop, iFipup)
 GOW(send, lFipLi)
 // __send   // Weak
-GO(sendfile, lFiibp_L)
+GO(sendfile, lFiibl_L)
 GO(sendfile64, lFiipL)
 GOWM(sendmsg, lFEipi)
 //GOM(__sendmmsg, iFEipuu)    //%% actual __sendmmsg is glibc 2.14+. The syscall is Linux 3.0+, so use syscall...
@@ -1499,18 +1499,18 @@ GOW(setmntent, SFpp)
 // __setmntent
 // setnetent
 // setnetgrent
-GOW(setpgid, iFuu)
+GOW(setpgid, iFii)
 // __setpgid
 GO(setpgrp, iFv)
-GO(setpriority, iFiii)
+GO(setpriority, iFuui)
 GO(setprotoent, vFi)
 GO(setpwent, vFv)
 GOW(setregid, iFuu)
 GOW(setresgid, iFuuu)
 GOW(setresuid, iFuuu)
 GOW(setreuid, iFuu)
-GOM(setrlimit, iFEip)
-GO(setrlimit64, iFip)
+GOM(setrlimit, iFEup)
+GO(setrlimit64, iFup)
 // setrpcent
 // setservent
 GOW(setsid, iFv)
@@ -1525,14 +1525,14 @@ GOW(setuid, iFu)
 // setusershell
 GOW(setutent, vFv)
 // setutxent
-GOW(setvbuf, iFhpiL)
+GOW(setvbuf, iFSpiL)
 //GO(setxattr, iFpppui)
 // sgetspent
 // sgetspent_r  // Weak
 GOW(shmat, pFipi)
 //GOW(shmctl, iFiip)
 GOW(shmdt, iFp)
-GOW(shmget, iFuui)
+GOW(shmget, iFiLi)
 GOW(shutdown, iFii)
 GOWM(sigaction, iFEipp)    //%%
 //GOWM(__sigaction, iFEipp)  //%%
@@ -1587,7 +1587,7 @@ GOM(sprintf, iFEppV) //%%
 GOM(__sprintf_chk, iFEpvvpV) //%%
 // sprofil  // Weak
 GOW(srand, vFu)
-GO(srand48, vFi)
+GO(srand48, vFl)
 // srand48_r    // Weak
 GOW(srandom, vFu)
 //GOW(srandom_r, iFup)
@@ -1601,7 +1601,7 @@ GOWM(statfs, iFpp)  //%%,noE
 // __statfs
 GOWM(statfs64, iFpp)     //%%,noE
 GOM(statvfs, iFEpp)
-GOWM(statvfs64, iFESp)
+GOWM(statvfs64, iFEpp)
 DATAM(stderr, 4)
 DATAM(stdin, 4)
 DATAM(stdout, 4)
@@ -1758,15 +1758,15 @@ GO(__strxfrm_l, LFppLa)
 GOM(swapcontext, iFEpp) //%%
 // swapoff  // Weak
 // swapon   // Weak
-GOM(swprintf, iFEpupV) //%%
-GOM(__swprintf_chk, iFEpuiupV) //%%
+GOM(swprintf, iFEpLpV) //%%
+GOM(__swprintf_chk, iFEpLiLpV) //%%
 GOM(swscanf, iFEppV)
 GOW(symlink, iFpp)
 //GO(symlinkat, iFpip)
 GO(sync, vFv)
 GO(syncfs, iFi)
 // sync_file_range
-GOM(syscall, uFEV) //%%
+GOM(syscall, lFEV) //%%
 GOW(sysconf, lFi)
 GO(__sysconf, lFi)
 // sysctl   // Weak
@@ -1800,7 +1800,7 @@ GO(tcsetpgrp, iFii)
 //GO(tempnam, pFpp)
 //GOW(textdomain, pFp)
 // tfind    // Weak
-GO(time, LFrL_)
+GO(time, LFrl_)
 GO(timegm, LFriiiiiiiiilt_)
 // timelocal    // Weak
 GO(timerfd_create, iFii)
@@ -1827,12 +1827,12 @@ GO(toupper, iFi)
 // __towctrans
 // __towctrans_l
 // towctrans_l  // Weak
-GO(towlower, iFi)
-GO(__towlower_l, iFia)
-GOW(towlower_l, iFia)
-GO(towupper, iFi)
-GO(__towupper_l, iFia)
-GOW(towupper_l, iFia)
+GO(towlower, uFu)
+GO(__towlower_l, uFua)
+GOW(towlower_l, uFua)
+GO(towupper, uFu)
+GO(__towupper_l, uFua)
+GOW(towupper_l, uFua)
 // tr_break
 //GOW(truncate, iFpu)
 GO(truncate64, iFSU)
@@ -1855,7 +1855,7 @@ GOW(umask, uFu)
 GOWM(uname, iFp) //%%,noE
 //GO(__underflow, iFp)
 GOW(ungetc, iFiS)
-GO(ungetwc, iFiS)
+GO(ungetwc, uFuS)
 GOW(unlink, iFp)
 //GO(unlinkat, iFipi)
 GO(unlockpt, iFi)
@@ -1869,7 +1869,7 @@ GO(__uselocale, aFa)
 // user2netname
 GO(usleep, iFu)
 // ustat
-GO(utime, iFprLL_)
+GO(utime, iFprll_)
 GOM(utimensat, iFippi)  //%noE
 GOWM(utimes, iFEpp)
 //GOW(utmpname, iFp)
@@ -1922,7 +1922,7 @@ GOW(wait, iFp)
 //GOW(wait3, iFpip)
 //GOW(wait4, iFipip)
 GOW(waitid, iFuupi) // might need to wrap "p", it's a siginfo_t *
-GOW(waitpid, lFlpi)
+GOW(waitpid, iFipi)
 GOW(__waitpid, lFlpi)
 //GO(warn, vFppppppppp)
 //GO(warnx, vFppppppppp)
@@ -1978,7 +1978,7 @@ GO(wcstof, fFpBp_)
 // wcstof_l // Weak
 // wcstoimax
 //GO(wcstok, pFppp)
-GOM(wcstol, iFpBp_i)    //%noE
+GOM(wcstol, lFpBp_i)    //%noE
 //GO(wcstold, DFpp)
 // __wcstold_internal
 // __wcstold_l
@@ -1993,7 +1993,7 @@ GO(wcstoll, IFpBp_i)
 GO(wcstombs, LFppL)
 // __wcstombs_chk
 // wcstoq   // Weak
-GOM(wcstoul, iFpBp_i)    //%noE
+GOM(wcstoul, LFpBp_i)    //%noE
 //GO(__wcstoul_internal, LFppii)
 GO(wcstoull, UFpBp_i)
 // __wcstoul_l
@@ -2008,17 +2008,17 @@ GO(wcstoull, UFpBp_i)
 //GO(wcsxfrm, uFppu)
 //GOW(wcsxfrm_l, uFppup)
 GO(__wcsxfrm_l, LFppLa)
-GO(wctob, iFi)
+GO(wctob, iFu)
 //GO(wctomb, iFpi)
 //GO(__wctomb_chk, iFpuL)
 // wctrans  // Weak
 // __wctrans_l
 // wctrans_l    // Weak
 //GOW(wctype, uFp)
-GO(__wctype_l, uFpa)
-GOW(wctype_l, uFpa)
+GO(__wctype_l, LFpa)
+GOW(wctype_l, LFpa)
 //GO(wcwidth, iFu)
-GOW(wmemchr, pFpuL)
+GOW(wmemchr, pFpiL)
 GO(wmemcmp, iFppL)
 GOW(wmemcpy, pFppL)
 GO(__wmemcpy_chk, pFppLL)
@@ -2026,7 +2026,7 @@ GOW(wmemmove, pFppL)
 // __wmemmove_chk
 // wmempcpy // Weak
 // __wmempcpy_chk
-GO(wmemset, pFpuL)
+GO(wmemset, pFpiL)
 // __wmemset_chk
 //GO(wordexp, iFppi)
 //GO(wordfree, vFp)
@@ -2060,7 +2060,7 @@ GO(xdr_bool, iFpp)
 // xdr_free
 // xdr_getcredres
 // xdr_hyper
-//GO(xdr_int, iFpp)
+GO(xdr_int, iFpp)
 // xdr_int16_t
 // xdr_int32_t
 // xdr_int64_t
@@ -2127,7 +2127,7 @@ GOM(_Jv_RegisterClasses, vFv)   //%%,noE dummy
 
 GOM(__fdelt_chk, LFL) //%%,noE
 
-GOM(getauxval, uFEu)  //%% implemented since glibc 2.16
+GOM(getauxval, LFEL)  //%% implemented since glibc 2.16
 
 //GOM(prlimit64, lFpupp)       //%%,noE
 //GO(process_vm_readv, lFipLpLL)
@@ -2156,9 +2156,9 @@ GOM(__udivdi3, UFUU)        //%%,noE
 GOM(__divdi3, IFII)         //%%,noE
 //GOM(__poll_chk, iFpuii)     //%%,noE
 
-GO(fallocate64, iFiill)
+GO(fallocate64, iFiiII)
 
-//DATAM(__libc_stack_end, sizeof(void*))
+//DATAM(__libc_stack_end, 4)
 
 //DATAM(___brk_addr, 4)
 //DATA(__libc_enable_secure, 4)