Used wrapperhelper on wrapped libatk

4 files changed, 137 insertions, 103 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index f1417e05..4a500084 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -912,6 +912,7 @@
 #() iFpWWu
 #() iFpWpp
 #() iFpuwp
+#() iFpuii
 #() iFpuiL
 #() iFpuip
 #() iFpuui
@@ -1080,6 +1081,7 @@
 #() pFlfff
 #() pFLiip
 #() pFpiii
+#() pFpiiu
 #() pFpiip
 #() pFpiuu
 #() pFpiLi
@@ -1263,6 +1265,7 @@
 #() vFpiiip
 #() vFpiiII
 #() vFpiiuu
+#() vFpiiup
 #() vFpiiff
 #() vFpiipp
 #() vFpiIiI
@@ -1514,6 +1517,7 @@
 #() pFpiipp
 #() pFpiCCC
 #() pFpiuuu
+#() pFpiupp
 #() pFpipip
 #() pFpipup
 #() pFpippi
@@ -1739,8 +1743,10 @@
 #() iFlpippp
 #() iFLppipp
 #() iFpiiiii
+#() iFpiiiiu
 #() iFpiiiip
 #() iFpiiipp
+#() iFpiiuii
 #() iFpiipip
 #() iFpiippu
 #() iFpiippp
@@ -1961,6 +1967,7 @@
 #() vFpiipppp
 #() vFpipipii
 #() vFpipppii
+#() vFpippppu
 #() vFpuuuuuu
 #() vFpuuUUuu
 #() vFpuupppp
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 37741dc2..fd1fa9fc 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -948,6 +948,7 @@ typedef int32_t (*iFpCpp_t)(void*, uint8_t, void*, void*);
 typedef int32_t (*iFpWWu_t)(void*, uint16_t, uint16_t, uint32_t);
 typedef int32_t (*iFpWpp_t)(void*, uint16_t, void*, void*);
 typedef int32_t (*iFpuwp_t)(void*, uint32_t, int16_t, void*);
+typedef int32_t (*iFpuii_t)(void*, uint32_t, int32_t, int32_t);
 typedef int32_t (*iFpuiL_t)(void*, uint32_t, int32_t, uintptr_t);
 typedef int32_t (*iFpuip_t)(void*, uint32_t, int32_t, void*);
 typedef int32_t (*iFpuui_t)(void*, uint32_t, uint32_t, int32_t);
@@ -1116,6 +1117,7 @@ typedef void* (*pFDipp_t)(long double, int32_t, void*, void*);
 typedef void* (*pFlfff_t)(intptr_t, float, float, float);
 typedef void* (*pFLiip_t)(uintptr_t, int32_t, int32_t, void*);
 typedef void* (*pFpiii_t)(void*, int32_t, int32_t, int32_t);
+typedef void* (*pFpiiu_t)(void*, int32_t, int32_t, uint32_t);
 typedef void* (*pFpiip_t)(void*, int32_t, int32_t, void*);
 typedef void* (*pFpiuu_t)(void*, int32_t, uint32_t, uint32_t);
 typedef void* (*pFpiLi_t)(void*, int32_t, uintptr_t, int32_t);
@@ -1299,6 +1301,7 @@ typedef void (*vFpiiiu_t)(void*, int32_t, int32_t, int32_t, uint32_t);
 typedef void (*vFpiiip_t)(void*, int32_t, int32_t, int32_t, void*);
 typedef void (*vFpiiII_t)(void*, int32_t, int32_t, int64_t, int64_t);
 typedef void (*vFpiiuu_t)(void*, int32_t, int32_t, uint32_t, uint32_t);
+typedef void (*vFpiiup_t)(void*, int32_t, int32_t, uint32_t, void*);
 typedef void (*vFpiiff_t)(void*, int32_t, int32_t, float, float);
 typedef void (*vFpiipp_t)(void*, int32_t, int32_t, void*, void*);
 typedef void (*vFpiIiI_t)(void*, int32_t, int64_t, int32_t, int64_t);
@@ -1550,6 +1553,7 @@ typedef void* (*pFpiipi_t)(void*, int32_t, int32_t, void*, int32_t);
 typedef void* (*pFpiipp_t)(void*, int32_t, int32_t, void*, void*);
 typedef void* (*pFpiCCC_t)(void*, int32_t, uint8_t, uint8_t, uint8_t);
 typedef void* (*pFpiuuu_t)(void*, int32_t, uint32_t, uint32_t, uint32_t);
+typedef void* (*pFpiupp_t)(void*, int32_t, uint32_t, void*, void*);
 typedef void* (*pFpipip_t)(void*, int32_t, void*, int32_t, void*);
 typedef void* (*pFpipup_t)(void*, int32_t, void*, uint32_t, void*);
 typedef void* (*pFpippi_t)(void*, int32_t, void*, void*, int32_t);
@@ -1775,8 +1779,10 @@ typedef int32_t (*iFDipppL_t)(long double, int32_t, void*, void*, void*, uintptr
 typedef int32_t (*iFlpippp_t)(intptr_t, void*, int32_t, void*, void*, void*);
 typedef int32_t (*iFLppipp_t)(uintptr_t, void*, void*, int32_t, void*, void*);
 typedef int32_t (*iFpiiiii_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t);
+typedef int32_t (*iFpiiiiu_t)(void*, int32_t, int32_t, int32_t, int32_t, uint32_t);
 typedef int32_t (*iFpiiiip_t)(void*, int32_t, int32_t, int32_t, int32_t, void*);
 typedef int32_t (*iFpiiipp_t)(void*, int32_t, int32_t, int32_t, void*, void*);
+typedef int32_t (*iFpiiuii_t)(void*, int32_t, int32_t, uint32_t, int32_t, int32_t);
 typedef int32_t (*iFpiipip_t)(void*, int32_t, int32_t, void*, int32_t, void*);
 typedef int32_t (*iFpiippu_t)(void*, int32_t, int32_t, void*, void*, uint32_t);
 typedef int32_t (*iFpiippp_t)(void*, int32_t, int32_t, void*, void*, void*);
@@ -1997,6 +2003,7 @@ typedef void (*vFpiipCpp_t)(void*, int32_t, int32_t, void*, uint8_t, void*, void
 typedef void (*vFpiipppp_t)(void*, int32_t, int32_t, void*, void*, void*, void*);
 typedef void (*vFpipipii_t)(void*, int32_t, void*, int32_t, void*, int32_t, int32_t);
 typedef void (*vFpipppii_t)(void*, int32_t, void*, void*, void*, int32_t, int32_t);
+typedef void (*vFpippppu_t)(void*, int32_t, void*, void*, void*, void*, uint32_t);
 typedef void (*vFpuuuuuu_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void (*vFpuuUUuu_t)(void*, uint32_t, uint32_t, uint64_t, uint64_t, uint32_t, uint32_t);
 typedef void (*vFpuupppp_t)(void*, uint32_t, uint32_t, void*, void*, void*, void*);
@@ -3552,6 +3559,7 @@ void iFpCpp(x64emu_t *emu, uintptr_t fcn) { iFpCpp_t fn = (iFpCpp_t)fcn; R_RAX=(
 void iFpWWu(x64emu_t *emu, uintptr_t fcn) { iFpWWu_t fn = (iFpWWu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX, (uint32_t)R_RCX); }
 void iFpWpp(x64emu_t *emu, uintptr_t fcn) { iFpWpp_t fn = (iFpWpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFpuwp(x64emu_t *emu, uintptr_t fcn) { iFpuwp_t fn = (iFpuwp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int16_t)R_RDX, (void*)R_RCX); }
+void iFpuii(x64emu_t *emu, uintptr_t fcn) { iFpuii_t fn = (iFpuii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void iFpuiL(x64emu_t *emu, uintptr_t fcn) { iFpuiL_t fn = (iFpuiL_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX); }
 void iFpuip(x64emu_t *emu, uintptr_t fcn) { iFpuip_t fn = (iFpuip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void iFpuui(x64emu_t *emu, uintptr_t fcn) { iFpuui_t fn = (iFpuui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX); }
@@ -3720,6 +3728,7 @@ void pFDipp(x64emu_t *emu, uintptr_t fcn) { pFDipp_t fn = (pFDipp_t)fcn; R_RAX=(
 void pFlfff(x64emu_t *emu, uintptr_t fcn) { pFlfff_t fn = (pFlfff_t)fcn; R_RAX=(uintptr_t)fn((intptr_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
 void pFLiip(x64emu_t *emu, uintptr_t fcn) { pFLiip_t fn = (pFLiip_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void pFpiii(x64emu_t *emu, uintptr_t fcn) { pFpiii_t fn = (pFpiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
+void pFpiiu(x64emu_t *emu, uintptr_t fcn) { pFpiiu_t fn = (pFpiiu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX); }
 void pFpiip(x64emu_t *emu, uintptr_t fcn) { pFpiip_t fn = (pFpiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void pFpiuu(x64emu_t *emu, uintptr_t fcn) { pFpiuu_t fn = (pFpiuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void pFpiLi(x64emu_t *emu, uintptr_t fcn) { pFpiLi_t fn = (pFpiLi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX); }
@@ -3903,6 +3912,7 @@ void vFpiiiu(x64emu_t *emu, uintptr_t fcn) { vFpiiiu_t fn = (vFpiiiu_t)fcn; fn((
 void vFpiiip(x64emu_t *emu, uintptr_t fcn) { vFpiiip_t fn = (vFpiiip_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void vFpiiII(x64emu_t *emu, uintptr_t fcn) { vFpiiII_t fn = (vFpiiII_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8); }
 void vFpiiuu(x64emu_t *emu, uintptr_t fcn) { vFpiiuu_t fn = (vFpiiuu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
+void vFpiiup(x64emu_t *emu, uintptr_t fcn) { vFpiiup_t fn = (vFpiiup_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void vFpiiff(x64emu_t *emu, uintptr_t fcn) { vFpiiff_t fn = (vFpiiff_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, emu->xmm[0].f[0], emu->xmm[1].f[0]); }
 void vFpiipp(x64emu_t *emu, uintptr_t fcn) { vFpiipp_t fn = (vFpiipp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFpiIiI(x64emu_t *emu, uintptr_t fcn) { vFpiIiI_t fn = (vFpiIiI_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int64_t)R_RDX, (int32_t)R_RCX, (int64_t)R_R8); }
@@ -4154,6 +4164,7 @@ void pFpiipi(x64emu_t *emu, uintptr_t fcn) { pFpiipi_t fn = (pFpiipi_t)fcn; R_RA
 void pFpiipp(x64emu_t *emu, uintptr_t fcn) { pFpiipp_t fn = (pFpiipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFpiCCC(x64emu_t *emu, uintptr_t fcn) { pFpiCCC_t fn = (pFpiCCC_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX, (uint8_t)R_R8); }
 void pFpiuuu(x64emu_t *emu, uintptr_t fcn) { pFpiuuu_t fn = (pFpiuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
+void pFpiupp(x64emu_t *emu, uintptr_t fcn) { pFpiupp_t fn = (pFpiupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFpipip(x64emu_t *emu, uintptr_t fcn) { pFpipip_t fn = (pFpipip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void pFpipup(x64emu_t *emu, uintptr_t fcn) { pFpipup_t fn = (pFpipup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void pFpippi(x64emu_t *emu, uintptr_t fcn) { pFpippi_t fn = (pFpippi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
@@ -4379,8 +4390,10 @@ void iFDipppL(x64emu_t *emu, uintptr_t fcn) { iFDipppL_t fn = (iFDipppL_t)fcn; R
 void iFlpippp(x64emu_t *emu, uintptr_t fcn) { iFlpippp_t fn = (iFlpippp_t)fcn; R_RAX=(int32_t)fn((intptr_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFLppipp(x64emu_t *emu, uintptr_t fcn) { iFLppipp_t fn = (iFLppipp_t)fcn; R_RAX=(int32_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFpiiiii(x64emu_t *emu, uintptr_t fcn) { iFpiiiii_t fn = (iFpiiiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
+void iFpiiiiu(x64emu_t *emu, uintptr_t fcn) { iFpiiiiu_t fn = (iFpiiiiu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9); }
 void iFpiiiip(x64emu_t *emu, uintptr_t fcn) { iFpiiiip_t fn = (iFpiiiip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9); }
 void iFpiiipp(x64emu_t *emu, uintptr_t fcn) { iFpiiipp_t fn = (iFpiiipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
+void iFpiiuii(x64emu_t *emu, uintptr_t fcn) { iFpiiuii_t fn = (iFpiiuii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void iFpiipip(x64emu_t *emu, uintptr_t fcn) { iFpiipip_t fn = (iFpiipip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9); }
 void iFpiippu(x64emu_t *emu, uintptr_t fcn) { iFpiippu_t fn = (iFpiippu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 void iFpiippp(x64emu_t *emu, uintptr_t fcn) { iFpiippp_t fn = (iFpiippp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -4601,6 +4614,7 @@ void vFpiipCpp(x64emu_t *emu, uintptr_t fcn) { vFpiipCpp_t fn = (vFpiipCpp_t)fcn
 void vFpiipppp(x64emu_t *emu, uintptr_t fcn) { vFpiipppp_t fn = (vFpiipppp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFpipipii(x64emu_t *emu, uintptr_t fcn) { vFpipipii_t fn = (vFpipipii_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void vFpipppii(x64emu_t *emu, uintptr_t fcn) { vFpipppii_t fn = (vFpipppii_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
+void vFpippppu(x64emu_t *emu, uintptr_t fcn) { vFpippppu_t fn = (vFpippppu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void vFpuuuuuu(x64emu_t *emu, uintptr_t fcn) { vFpuuuuuu_t fn = (vFpuuuuuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void vFpuuUUuu(x64emu_t *emu, uintptr_t fcn) { vFpuuUUuu_t fn = (vFpuuUUuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void vFpuupppp(x64emu_t *emu, uintptr_t fcn) { vFpuupppp_t fn = (vFpuupppp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
@@ -6015,6 +6029,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpWWu) return 1;
 	if (fun == &iFpWpp) return 1;
 	if (fun == &iFpuwp) return 1;
+	if (fun == &iFpuii) return 1;
 	if (fun == &iFpuiL) return 1;
 	if (fun == &iFpuip) return 1;
 	if (fun == &iFpuui) return 1;
@@ -6159,6 +6174,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFlfff) return 4;
 	if (fun == &pFLiip) return 1;
 	if (fun == &pFpiii) return 1;
+	if (fun == &pFpiiu) return 1;
 	if (fun == &pFpiip) return 1;
 	if (fun == &pFpiuu) return 1;
 	if (fun == &pFpiLi) return 1;
@@ -6310,6 +6326,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpiiip) return 1;
 	if (fun == &vFpiiII) return 1;
 	if (fun == &vFpiiuu) return 1;
+	if (fun == &vFpiiup) return 1;
 	if (fun == &vFpiiff) return 3;
 	if (fun == &vFpiipp) return 1;
 	if (fun == &vFpiIiI) return 1;
@@ -6518,6 +6535,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpiipp) return 1;
 	if (fun == &pFpiCCC) return 1;
 	if (fun == &pFpiuuu) return 1;
+	if (fun == &pFpiupp) return 1;
 	if (fun == &pFpipip) return 1;
 	if (fun == &pFpipup) return 1;
 	if (fun == &pFpippi) return 1;
@@ -6702,8 +6720,10 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFlpippp) return 1;
 	if (fun == &iFLppipp) return 1;
 	if (fun == &iFpiiiii) return 1;
+	if (fun == &iFpiiiiu) return 1;
 	if (fun == &iFpiiiip) return 1;
 	if (fun == &iFpiiipp) return 1;
+	if (fun == &iFpiiuii) return 1;
 	if (fun == &iFpiipip) return 1;
 	if (fun == &iFpiippu) return 1;
 	if (fun == &iFpiippp) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 3ac88ac1..d15408f5 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -949,6 +949,7 @@ void iFpCpp(x64emu_t *emu, uintptr_t fnc);
 void iFpWWu(x64emu_t *emu, uintptr_t fnc);
 void iFpWpp(x64emu_t *emu, uintptr_t fnc);
 void iFpuwp(x64emu_t *emu, uintptr_t fnc);
+void iFpuii(x64emu_t *emu, uintptr_t fnc);
 void iFpuiL(x64emu_t *emu, uintptr_t fnc);
 void iFpuip(x64emu_t *emu, uintptr_t fnc);
 void iFpuui(x64emu_t *emu, uintptr_t fnc);
@@ -1117,6 +1118,7 @@ void pFDipp(x64emu_t *emu, uintptr_t fnc);
 void pFlfff(x64emu_t *emu, uintptr_t fnc);
 void pFLiip(x64emu_t *emu, uintptr_t fnc);
 void pFpiii(x64emu_t *emu, uintptr_t fnc);
+void pFpiiu(x64emu_t *emu, uintptr_t fnc);
 void pFpiip(x64emu_t *emu, uintptr_t fnc);
 void pFpiuu(x64emu_t *emu, uintptr_t fnc);
 void pFpiLi(x64emu_t *emu, uintptr_t fnc);
@@ -1300,6 +1302,7 @@ void vFpiiiu(x64emu_t *emu, uintptr_t fnc);
 void vFpiiip(x64emu_t *emu, uintptr_t fnc);
 void vFpiiII(x64emu_t *emu, uintptr_t fnc);
 void vFpiiuu(x64emu_t *emu, uintptr_t fnc);
+void vFpiiup(x64emu_t *emu, uintptr_t fnc);
 void vFpiiff(x64emu_t *emu, uintptr_t fnc);
 void vFpiipp(x64emu_t *emu, uintptr_t fnc);
 void vFpiIiI(x64emu_t *emu, uintptr_t fnc);
@@ -1551,6 +1554,7 @@ void pFpiipi(x64emu_t *emu, uintptr_t fnc);
 void pFpiipp(x64emu_t *emu, uintptr_t fnc);
 void pFpiCCC(x64emu_t *emu, uintptr_t fnc);
 void pFpiuuu(x64emu_t *emu, uintptr_t fnc);
+void pFpiupp(x64emu_t *emu, uintptr_t fnc);
 void pFpipip(x64emu_t *emu, uintptr_t fnc);
 void pFpipup(x64emu_t *emu, uintptr_t fnc);
 void pFpippi(x64emu_t *emu, uintptr_t fnc);
@@ -1776,8 +1780,10 @@ void iFDipppL(x64emu_t *emu, uintptr_t fnc);
 void iFlpippp(x64emu_t *emu, uintptr_t fnc);
 void iFLppipp(x64emu_t *emu, uintptr_t fnc);
 void iFpiiiii(x64emu_t *emu, uintptr_t fnc);
+void iFpiiiiu(x64emu_t *emu, uintptr_t fnc);
 void iFpiiiip(x64emu_t *emu, uintptr_t fnc);
 void iFpiiipp(x64emu_t *emu, uintptr_t fnc);
+void iFpiiuii(x64emu_t *emu, uintptr_t fnc);
 void iFpiipip(x64emu_t *emu, uintptr_t fnc);
 void iFpiippu(x64emu_t *emu, uintptr_t fnc);
 void iFpiippp(x64emu_t *emu, uintptr_t fnc);
@@ -1998,6 +2004,7 @@ void vFpiipCpp(x64emu_t *emu, uintptr_t fnc);
 void vFpiipppp(x64emu_t *emu, uintptr_t fnc);
 void vFpipipii(x64emu_t *emu, uintptr_t fnc);
 void vFpipppii(x64emu_t *emu, uintptr_t fnc);
+void vFpippppu(x64emu_t *emu, uintptr_t fnc);
 void vFpuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuuUUuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuupppp(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedatk_private.h b/src/wrapped/wrappedatk_private.h
index 0275583e..ec081087 100755
--- a/src/wrapped/wrappedatk_private.h
+++ b/src/wrapped/wrappedatk_private.h
@@ -9,7 +9,7 @@ GO(atk_action_get_localized_name, pFpi)
 GO(atk_action_get_n_actions, iFp)
 GO(atk_action_get_name, pFpi)
 GO(atk_action_get_type, LFv)
-GO(atk_action_set_description, pFpi)
+GO(atk_action_set_description, iFpip)
 GOM(atk_add_focus_tracker, uFEp)
 GOM(atk_add_global_event_listener, uFEpp)
 GOM(atk_add_key_event_listener, uFEpp)
@@ -17,41 +17,41 @@ GO(atk_attribute_set_free, vFp)
 //GOM(atk_component_add_focus_handler, uFpp)
 GO(atk_component_contains, iFpiii)
 GO(atk_component_get_alpha, dFp)
-GO(atk_component_get_extents, vFpppppi)
-GO(atk_component_get_layer, iFp)
+GO(atk_component_get_extents, vFpppppu)
+GO(atk_component_get_layer, uFp)
 GO(atk_component_get_mdi_zorder, iFp)
-GO(atk_component_get_position, vFpppi)
+GO(atk_component_get_position, vFpppu)
 GO(atk_component_get_size, vFppp)
 GO(atk_component_get_type, LFv)
 GO(atk_component_grab_focus, iFp)
-GO(atk_component_ref_accessible_at_point, pFpiii)
+GO(atk_component_ref_accessible_at_point, pFpiiu)
 GO(atk_component_remove_focus_handler, vFpu)
-GO(atk_component_scroll_to_point, iFpiii)
-GO(atk_component_set_extents, iFpiiiii)
-GO(atk_component_set_position, iFpiii)
+GO(atk_component_scroll_to_point, iFpuii)
+GO(atk_component_set_extents, iFpiiiiu)
+GO(atk_component_set_position, iFpiiu)
 GO(atk_component_set_size, iFpii)
 GO(atk_coord_type_get_type, LFv)
-//GO(atk_document_get_attributes, 
-//GO(atk_document_get_attribute_value, 
-//GO(atk_document_get_document, 
+GO(atk_document_get_attributes, pFp)
+GO(atk_document_get_attribute_value, pFpp)
+GO(atk_document_get_document, pFp)
 //GO(atk_document_get_document_type, 
-//GO(atk_document_get_locale, 
+GO(atk_document_get_locale, pFp)
 GO(atk_document_get_type, LFv)
-//GO(atk_document_set_attribute_value, 
+GO(atk_document_set_attribute_value, iFppp)
 //GO(atk_editable_text_copy_text, 
 //GO(atk_editable_text_cut_text, 
-//GO(atk_editable_text_delete_text, 
-//GO(atk_editable_text_get_type, 
-//GO(atk_editable_text_insert_text, 
-//GO(atk_editable_text_paste_text, 
-//GO(atk_editable_text_set_run_attributes, 
-//GO(atk_editable_text_set_text_contents, 
+GO(atk_editable_text_delete_text, vFpii)
+GO(atk_editable_text_get_type, LFv)
+GO(atk_editable_text_insert_text, vFppip)
+GO(atk_editable_text_paste_text, vFpi)
+GO(atk_editable_text_set_run_attributes, iFppii)
+GO(atk_editable_text_set_text_contents, vFpp)
 GOM(atk_focus_tracker_init, vFEp)
 GO(atk_focus_tracker_notify, vFp)
 //GO(atk_get_binary_age, 
 GO(atk_get_default_registry, pFv)
 GO(atk_get_focus_object, pFv)
-//GO(atk_get_interface_age, 
+GO(atk_get_interface_age, uFv)
 //GO(atk_get_major_version, 
 //GO(atk_get_micro_version, 
 //GO(atk_get_minor_version, 
@@ -60,30 +60,30 @@ GO(atk_get_toolkit_name, pFv)
 GO(atk_get_toolkit_version, pFv)
 GO(atk_get_version, pFv)
 //GO(atk_gobject_accessible_for_object, 
-//GO(atk_gobject_accessible_get_object, 
+GO(atk_gobject_accessible_get_object, pFp)
 //GO(atk_gobject_accessible_get_type, 
 //GO(atk_hyperlink_get_end_index, 
-//GO(atk_hyperlink_get_n_anchors, 
-//GO(atk_hyperlink_get_object, 
+GO(atk_hyperlink_get_n_anchors, iFp)
+GO(atk_hyperlink_get_object, pFpi)
 GO(atk_hyperlink_get_start_index, iFp)
 GO(atk_hyperlink_get_type, LFv)
-//GO(atk_hyperlink_get_uri, 
-//GO(atk_hyperlink_impl_get_hyperlink, 
+GO(atk_hyperlink_get_uri, pFpi)
+GO(atk_hyperlink_impl_get_hyperlink, pFp)
 GO(atk_hyperlink_impl_get_type, LFv)
 //GO(atk_hyperlink_is_inline, 
-//GO(atk_hyperlink_is_selected_link, 
+GO(atk_hyperlink_is_selected_link, iFp)
 //GO(atk_hyperlink_is_valid, 
 //GO(atk_hyperlink_state_flags_get_type, 
 GO(atk_hypertext_get_link, pFpi)
-//GO(atk_hypertext_get_link_index, 
+GO(atk_hypertext_get_link_index, iFpi)
 GO(atk_hypertext_get_n_links, iFp)
 GO(atk_hypertext_get_type, LFv)
 //GO(atk_image_get_image_description, 
-//GO(atk_image_get_image_locale, 
-//GO(atk_image_get_image_position, 
-//GO(atk_image_get_image_size, 
+GO(atk_image_get_image_locale, pFp)
+GO(atk_image_get_image_position, vFpppu)
+GO(atk_image_get_image_size, vFppp)
 GO(atk_image_get_type, LFv)
-//GO(atk_image_set_image_description, 
+GO(atk_image_set_image_description, iFpp)
 GO(atk_implementor_get_type, LFv)
 GO(atk_implementor_ref_accessible, pFp)
 GO(atk_key_event_type_get_type, LFv)
@@ -98,73 +98,73 @@ GO(atk_misc_threads_enter, vFp)
 GO(atk_misc_threads_leave, vFp)
 DATA(atk_misc_instance, sizeof(void*))
 //GO(atk_no_op_object_factory_get_type, 
-//GO(atk_no_op_object_factory_new, 
+GO(atk_no_op_object_factory_new, pFv)
 GO(atk_no_op_object_get_type, LFv)
-GO(atk_no_op_object_new, pFv)
+GO(atk_no_op_object_new, pFp)
 GO(atk_object_add_relationship, iFpip)
 //GOM(atk_object_connect_property_change_handler, uFEpp)
-//GO(atk_object_factory_create_accessible, 
-GO(atk_object_factory_get_accessible_type, iFp)
+GO(atk_object_factory_create_accessible, pFpp)
+GO(atk_object_factory_get_accessible_type, LFp)
 GO(atk_object_factory_get_type, LFv)
 //GO(atk_object_factory_invalidate, 
 GO(atk_object_get_attributes, pFp)
 GO(atk_object_get_description, pFp)
 GO(atk_object_get_index_in_parent, iFp)
-GO(atk_object_get_layer, iFp)
+GO(atk_object_get_layer, uFp)
 GO(atk_object_get_mdi_zorder, iFp)
 GO(atk_object_get_n_accessible_children, iFp)
 GO(atk_object_get_name, pFp)
 GO(atk_object_get_object_locale, pFp)
 GO(atk_object_get_parent, pFp)
-GO(atk_object_get_role, iFp)
+GO(atk_object_get_role, uFp)
 GO(atk_object_get_type, LFv)
 GO(atk_object_initialize, vFpp)
-GO(atk_object_notify_state_change, vFpii)
+GO(atk_object_notify_state_change, vFpLi)
 GO(atk_object_ref_accessible_child, pFpi)
 GO(atk_object_ref_relation_set, pFp)
 GO(atk_object_ref_state_set, pFp)
 GO(atk_object_remove_property_change_handler, vFpu)
-GO(atk_object_remove_relationship, iFpip)
+GO(atk_object_remove_relationship, iFpup)
 GO(atk_object_set_description, vFpp)
 GO(atk_object_set_name, vFpp)
 GO(atk_object_set_parent, vFpp)
-GO(atk_object_set_role, vFpi)
-//GO(atk_plug_get_id, 
+GO(atk_object_set_role, vFpu)
+GO(atk_plug_get_id, pFp)
 //GO(atk_plug_get_type, 
 //GO(atk_plug_new, 
 //GO(atk_rectangle_get_type, 
-GO(atk_registry_get_factory, pFpi)
-GO(atk_registry_get_factory_type, iFpi)
+GO(atk_registry_get_factory, pFpL)
+GO(atk_registry_get_factory_type, LFpL)
 //GO(atk_registry_get_type, 
-GO(atk_registry_set_factory_type, vFpii)
-//GO(atk_relation_add_target, 
-//GO(atk_relation_get_relation_type, 
-//GO(atk_relation_get_target, 
+GO(atk_registry_set_factory_type, vFpLL)
+GO(atk_relation_add_target, vFpp)
+GO(atk_relation_get_relation_type, uFp)
+GO(atk_relation_get_target, pFp)
 //GO(atk_relation_get_type, 
-//GO(atk_relation_new, 
-//GO(atk_relation_remove_target, 
-//GO(atk_relation_set_add, 
-GO(atk_relation_set_add_relation_by_type, vFpip)
-GO(atk_relation_set_contains, iFpi)
-//GO(atk_relation_set_contains_target, 
-//GO(atk_relation_set_get_n_relations, 
-//GO(atk_relation_set_get_relation, 
-//GO(atk_relation_set_get_relation_by_type, 
+GO(atk_relation_new, pFpiu)
+GO(atk_relation_remove_target, iFpp)
+GO(atk_relation_set_add, vFpp)
+GO(atk_relation_set_add_relation_by_type, vFpup)
+GO(atk_relation_set_contains, iFpu)
+GO(atk_relation_set_contains_target, iFpup)
+GO(atk_relation_set_get_n_relations, iFp)
+GO(atk_relation_set_get_relation, pFpi)
+GO(atk_relation_set_get_relation_by_type, pFpu)
 //GO(atk_relation_set_get_type, 
 GO(atk_relation_set_new, pFv)
 //GO(atk_relation_set_remove, 
-//GO(atk_relation_type_for_name, 
-GO(atk_relation_type_get_name, pFi)
+GO(atk_relation_type_for_name, uFp)
+GO(atk_relation_type_get_name, pFu)
 GO(atk_relation_type_get_type, LFv)
 //GO(atk_relation_type_register, 
 GO(atk_remove_focus_tracker, vFu)
 GO(atk_remove_global_event_listener, vFu)
 GO(atk_remove_key_event_listener, vFu)
 GO(atk_role_for_name, iFp)
-GO(atk_role_get_localized_name, pFp)
+GO(atk_role_get_localized_name, pFu)
 GO(atk_role_get_name, pFp)
 GO(atk_role_get_type, LFv)
-GO(atk_role_register, iFp)
+GO(atk_role_register, uFp)
 GO(atk_selection_add_selection, iFpi)
 GO(atk_selection_clear_selection, iFp)
 GO(atk_selection_get_selection_count, iFp)
@@ -173,31 +173,31 @@ GO(atk_selection_is_child_selected, iFpi)
 GO(atk_selection_ref_selection, pFpi)
 GO(atk_selection_remove_selection, iFpi)
 GO(atk_selection_select_all_selection, iFp)
-//GO(atk_socket_embed, 
-//GO(atk_socket_get_type, 
-//GO(atk_socket_is_occupied, 
-//GO(atk_socket_new, 
+GO(atk_socket_embed, vFpp)
+GO(atk_socket_get_type, iFv)
+GO(atk_socket_is_occupied, iFp)
+GO(atk_socket_new, pFv)
 GO(atk_state_set_add_state, iFpi)
-//GO(atk_state_set_add_states, 
+GO(atk_state_set_add_states, vFppi)
 //GO(atk_state_set_and_sets, 
 //GO(atk_state_set_clear_states, 
 GO(atk_state_set_contains_state, iFpi)
-//GO(atk_state_set_contains_states, 
+GO(atk_state_set_contains_states, iFppi)
 //GO(atk_state_set_get_type, 
-//GO(atk_state_set_is_empty, 
-//GO(atk_state_set_new, 
+GO(atk_state_set_is_empty, iFp)
+GO(atk_state_set_new, pFv)
 //GO(atk_state_set_or_sets, 
-//GO(atk_state_set_remove_state, 
-//GO(atk_state_set_xor_sets, 
-GO(atk_state_type_for_name, iFp)
-GO(atk_state_type_get_name, pFi)
+GO(atk_state_set_remove_state, iFpu)
+GO(atk_state_set_xor_sets, pFpp)
+GO(atk_state_type_for_name, uFp)
+GO(atk_state_type_get_name, pFu)
 GO(atk_state_type_get_type, LFv)
 //GO(atk_state_type_register, 
-//GO(atk_streamable_content_get_mime_type, 
-//GO(atk_streamable_content_get_n_mime_types, 
+GO(atk_streamable_content_get_mime_type, pFpi)
+GO(atk_streamable_content_get_n_mime_types, iFp)
 //GO(atk_streamable_content_get_stream, 
 //GO(atk_streamable_content_get_type, 
-//GO(atk_streamable_content_get_uri, 
+GO(atk_streamable_content_get_uri, pFpp)
 //GO(atk_table_add_column_selection, 
 //GO(atk_table_add_row_selection, 
 GO(atk_table_get_caption, pFp)
@@ -208,61 +208,61 @@ GO(atk_table_get_column_extent_at, iFpii)
 //GO(atk_table_get_index_at, 
 GO(atk_table_get_n_columns, iFp)
 GO(atk_table_get_n_rows, iFp)
-//GO(atk_table_get_row_at_index, 
+GO(atk_table_get_row_at_index, iFpi)
 GO(atk_table_get_row_description, pFpi)
 GO(atk_table_get_row_extent_at, iFpii)
-//GO(atk_table_get_row_header, 
+GO(atk_table_get_row_header, pFpi)
 //GO(atk_table_get_selected_columns, 
-//GO(atk_table_get_selected_rows, 
-//GO(atk_table_get_summary, 
+GO(atk_table_get_selected_rows, iFpp)
+GO(atk_table_get_summary, pFp)
 GO(atk_table_get_type, LFv)
 //GO(atk_table_is_column_selected, 
 //GO(atk_table_is_row_selected, 
-//GO(atk_table_is_selected, 
-//GO(atk_table_ref_at, 
-//GO(atk_table_remove_column_selection, 
+GO(atk_table_is_selected, iFpii)
+GO(atk_table_ref_at, pFpii)
+GO(atk_table_remove_column_selection, iFpi)
 //GO(atk_table_remove_row_selection, 
 //GO(atk_table_set_caption, 
 //GO(atk_table_set_column_description, 
 //GO(atk_table_set_column_header, 
-//GO(atk_table_set_row_description, 
-//GO(atk_table_set_row_header, 
-//GO(atk_table_set_summary, 
-//GO(atk_text_add_selection, 
-//GO(atk_text_attribute_for_name, 
-GO(atk_text_attribute_get_name, pFi)
+GO(atk_table_set_row_description, vFpip)
+GO(atk_table_set_row_header, vFpip)
+GO(atk_table_set_summary, vFpp)
+GO(atk_text_add_selection, iFpii)
+GO(atk_text_attribute_for_name, uFp)
+GO(atk_text_attribute_get_name, pFu)
 //GO(atk_text_attribute_get_type, 
-//GO(atk_text_attribute_get_value, 
+GO(atk_text_attribute_get_value, pFui)
 //GO(atk_text_attribute_register, 
 //GO(atk_text_boundary_get_type, 
 //GO(atk_text_clip_type_get_type, 
-//GO(atk_text_free_ranges, 
-//GO(atk_text_get_bounded_ranges, 
+GO(atk_text_free_ranges, vFp)
+GO(atk_text_get_bounded_ranges, pFppuuu)
 GO(atk_text_get_caret_offset, iFp)
-//GO(atk_text_get_character_at_offset, 
+GO(atk_text_get_character_at_offset, uFpi)
 GO(atk_text_get_character_count, iFp)
-//GO(atk_text_get_character_extents, 
-//GO(atk_text_get_default_attributes, 
-//GO(atk_text_get_n_selections, 
-//GO(atk_text_get_offset_at_point, 
-//GO(atk_text_get_range_extents, 
+GO(atk_text_get_character_extents, vFpippppu)
+GO(atk_text_get_default_attributes, pFp)
+GO(atk_text_get_n_selections, iFp)
+GO(atk_text_get_offset_at_point, iFpiiu)
+GO(atk_text_get_range_extents, vFpiiup)
 GO(atk_text_get_run_attributes, pFpipp)
 GO(atk_text_get_selection, pFpipp)
 GO(atk_text_get_text, pFpii)
 //GO(atk_text_get_text_after_offset, 
 //GO(atk_text_get_text_at_offset, 
-//GO(atk_text_get_text_before_offset, 
+GO(atk_text_get_text_before_offset, pFpiupp)
 GO(atk_text_get_type, LFv)
 GO(atk_text_range_get_type, LFv)
 //GO(atk_text_remove_selection, 
-GO(atk_text_scroll_substring_to_point, iFpiiiii)
-//GO(atk_text_set_caret_offset, 
-//GO(atk_text_set_selection, 
+GO(atk_text_scroll_substring_to_point, iFpiiuii)
+GO(atk_text_set_caret_offset, iFpi)
+GO(atk_text_set_selection, iFpiii)
 GO(atk_util_get_type, LFv)
 GO(atk_value_get_current_value, vFpp)
 GO(atk_value_get_maximum_value, vFpp)
-//GO(atk_value_get_minimum_increment, 
+GO(atk_value_get_minimum_increment, vFpp)
 GO(atk_value_get_minimum_value, vFpp)
 GO(atk_value_get_type, LFv)
-//GO(atk_value_set_current_value, 
+GO(atk_value_set_current_value, iFpp)
 GO(atk_window_get_type, LFv)