about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/wrapped/generated/functions_list.txt69
-rw-r--r--src/wrapped/generated/wrapper.c170
-rw-r--r--src/wrapped/generated/wrapper.h69
-rwxr-xr-xsrc/wrapped/wrappedgdkx112_private.h164
-rwxr-xr-xsrc/wrapped/wrappedgtkx112_private.h1150
5 files changed, 944 insertions, 678 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 4a500084..a1bb1d72 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -388,6 +388,7 @@
 #() vFpuW
 #() vFpuu
 #() vFpuU
+#() vFpuf
 #() vFpud
 #() vFpuL
 #() vFpup
@@ -397,6 +398,7 @@
 #() vFpUf
 #() vFpUp
 #() vFpff
+#() vFpdu
 #() vFpdd
 #() vFpll
 #() vFplp
@@ -526,6 +528,7 @@
 #() uFupu
 #() uFupp
 #() uFpii
+#() uFpiu
 #() uFpip
 #() uFpCi
 #() uFpWi
@@ -556,6 +559,8 @@
 #() dFddp
 #() dFpdd
 #() dFppi
+#() dFppu
+#() dFppd
 #() dFppp
 #() DFppi
 #() DFppp
@@ -786,7 +791,9 @@
 #() vFpuui
 #() vFpuuu
 #() vFpuup
+#() vFpufi
 #() vFpudd
+#() vFpupu
 #() vFpupp
 #() vFpUui
 #() vFpUuu
@@ -797,13 +804,16 @@
 #() vFpUpp
 #() vFpfff
 #() vFpdii
-#() vFpdip
+#() vFpdup
 #() vFpddi
+#() vFpddu
 #() vFpddd
 #() vFplll
 #() vFplpp
 #() vFpLii
+#() vFpLuu
 #() vFpLLL
+#() vFpLpp
 #() vFppii
 #() vFppiu
 #() vFppid
@@ -994,9 +1004,12 @@
 #() uFpuip
 #() uFpuuu
 #() uFpuup
+#() uFpupi
 #() uFpupu
+#() uFpupp
 #() uFppiu
 #() uFppip
+#() uFpplp
 #() uFppLp
 #() uFpppi
 #() uFpppu
@@ -1073,6 +1086,7 @@
 #() pFuuip
 #() pFuuuu
 #() pFullu
+#() pFupii
 #() pFuppp
 #() pFffff
 #() pFdipp
@@ -1253,6 +1267,7 @@
 #() vFupupp
 #() vFuplii
 #() vFuppip
+#() vFupppu
 #() vFupppp
 #() vFUUppp
 #() vFfffff
@@ -1270,6 +1285,7 @@
 #() vFpiipp
 #() vFpiIiI
 #() vFpiIII
+#() vFpiuuu
 #() vFpiUUp
 #() vFpilpp
 #() vFpipii
@@ -1281,6 +1297,7 @@
 #() vFpuupp
 #() vFpuUUu
 #() vFpuddd
+#() vFpupiu
 #() vFpupup
 #() vFpUuiu
 #() vFpUUuu
@@ -1288,6 +1305,7 @@
 #() vFpUUUu
 #() vFpUUUp
 #() vFpUppp
+#() vFpfffi
 #() vFpffff
 #() vFpdiII
 #() vFpddii
@@ -1306,6 +1324,7 @@
 #() vFppipi
 #() vFppipp
 #() vFppWui
+#() vFppuii
 #() vFppuui
 #() vFppuuu
 #() vFppuup
@@ -1506,6 +1525,7 @@
 #() pFuuiip
 #() pFuuupu
 #() pFuupuu
+#() pFudddp
 #() pFupLpl
 #() pFupLpL
 #() pFLuppp
@@ -1534,6 +1554,7 @@
 #() pFpupii
 #() pFpuppp
 #() pFpUdii
+#() pFpfffi
 #() pFpdddd
 #() pFplppp
 #() pFpLpii
@@ -1544,10 +1565,12 @@
 #() pFppipp
 #() pFppWpp
 #() pFppuii
+#() pFppuip
 #() pFppuuu
 #() pFppuup
 #() pFppupp
 #() pFppddi
+#() pFppddu
 #() pFppLii
 #() pFppLLp
 #() pFpppii
@@ -1653,6 +1676,7 @@
 #() vFuppppp
 #() vFffffff
 #() vFdddddd
+#() vFdddppp
 #() vFpiiiii
 #() vFpiiipp
 #() vFpiiuuu
@@ -1682,12 +1706,16 @@
 #() vFppiiii
 #() vFppiiip
 #() vFppiiui
+#() vFppiiuu
 #() vFppiipi
 #() vFppiipp
 #() vFppilpp
 #() vFppipLp
 #() vFppippi
 #() vFppippp
+#() vFppuiii
+#() vFppuiiu
+#() vFppuiip
 #() vFppuuuu
 #() vFppuUUU
 #() vFppupii
@@ -1747,6 +1775,7 @@
 #() iFpiiiip
 #() iFpiiipp
 #() iFpiiuii
+#() iFpiiuui
 #() iFpiipip
 #() iFpiippu
 #() iFpiippp
@@ -1814,6 +1843,7 @@
 #() uFEpCppp
 #() uFEpuppp
 #() uFupuufp
+#() uFpiuppu
 #() uFpippup
 #() uFpWuipp
 #() uFpWuuCp
@@ -1966,12 +1996,12 @@
 #() vFpiipCpp
 #() vFpiipppp
 #() vFpipipii
-#() vFpipppii
 #() vFpippppu
 #() vFpuuuuuu
 #() vFpuuUUuu
 #() vFpuupppp
 #() vFpupuuup
+#() vFpupppui
 #() vFpUiUiup
 #() vFpUUUUuu
 #() vFpddiidd
@@ -1989,6 +2019,8 @@
 #() vFppipipp
 #() vFppipppp
 #() vFppCuupp
+#() vFppuiiip
+#() vFppuupii
 #() vFppddddi
 #() vFppddpii
 #() vFppLpppi
@@ -1996,13 +2028,15 @@
 #() vFpppiiii
 #() vFpppiipi
 #() vFpppiipp
+#() vFpppiupi
 #() vFpppippi
 #() vFpppuuuu
 #() vFppppiii
 #() vFppppiip
+#() vFppppiui
 #() vFppppipi
 #() vFpppppip
-#() vFppppppi
+#() vFppppppu
 #() vFppppppp
 #() iFEpupppp
 #() iFEpUuppp
@@ -2071,7 +2105,8 @@
 #() iFppppdpi
 #() iFpppppip
 #() iFpppppup
-#() iFppppppi
+#() iFpppppLp
+#() iFppppppu
 #() iFppppppp
 #() uFEiipppp
 #() uFEpiippp
@@ -2116,6 +2151,7 @@
 #() pFppipipp
 #() pFppipLpp
 #() pFppuippp
+#() pFppuuupp
 #() pFppuuppp
 #() pFppliuip
 #() pFpplipup
@@ -2133,7 +2169,7 @@
 #() pFpppLLLi
 #() pFppppuuu
 #() pFpppppuu
-#() pFppppppi
+#() pFppppppu
 #() pFppppppp
 #() iWpiiuuuu
 #() iWpuiiiip
@@ -2192,6 +2228,7 @@
 #() vFppipppui
 #() vFppippppi
 #() vFppippppp
+#() vFppuuiiii
 #() vFpplppppi
 #() vFpplppppp
 #() vFpppipppu
@@ -2225,6 +2262,7 @@
 #() iFppiiiiiu
 #() iFppiiipip
 #() iFppIIIppp
+#() iFppuiiuuu
 #() iFppuuuuuu
 #() iFppuppppp
 #() iFpppiiipi
@@ -2319,12 +2357,18 @@
 #() vFpipppiipi
 #() vFppiiiiiii
 #() vFppiiiiipi
+#() vFppiiiiupi
 #() vFppiiipiii
 #() vFppiipiiii
+#() vFppiupiiii
 #() vFppippDpDC
 #() vFppipppiii
 #() vFppipppiip
 #() vFppuuiiiii
+#() vFppuuiiiiu
+#() vFppupppiii
+#() vFppupppiiu
+#() vFppupppiip
 #() vFppUUiUUUU
 #() vFppddddidd
 #() vFpplpppppi
@@ -2412,10 +2456,16 @@
 #() vFpuupuuuuuu
 #() vFppiiiiiiii
 #() vFppiiiiipip
+#() vFppiiiiupip
 #() vFppiipppiip
 #() vFppiippppii
 #() vFppipppiiii
+#() vFppuipppiip
+#() vFppuuuiiiii
 #() vFppuuuuiiuu
+#() vFppuuuuuuuu
+#() vFppuuppppii
+#() vFppupppiiii
 #() vFppdddddddd
 #() vFpppppppppp
 #() iFEpiiiiippp
@@ -2469,11 +2519,15 @@
 #() vFpupiiupupup
 #() vFppiiiiiiiii
 #() vFppiiiiipiii
+#() vFppiiiiupiii
 #() vFppiiiiddddi
 #() vFppiipppiiii
 #() vFppipppiiiii
 #() vFppipppuiiii
+#() vFppuuiiiiuii
+#() vFppuupppiiii
 #() vFppupipiuuuu
+#() vFppupppuiiii
 #() vFppppppppppp
 #() iFEpppipppppp
 #() iFEppppiiiiuu
@@ -2509,7 +2563,9 @@
 #() vFppiiiiddddii
 #() vFppiiuuuiupup
 #() vFppiipppiiiii
+#() vFppuupppiiiiu
 #() vFpppiiiiiiiii
+#() vFpppiiiiiiuii
 #() vFpppppppppppp
 #() iFEpppippppppp
 #() iFEppppiiiiuui
@@ -2534,7 +2590,9 @@
 #() vFpippppppppppp
 #() vFpuppppppppppp
 #() vFppiiiiiiiiiii
+#() vFppiiiiiiuiuii
 #() vFppiipppiiiiii
+#() vFppuupppuiiiii
 #() vFppppppppppppp
 #() iFddddpppddpppp
 #() iFpippuuuiipppp
@@ -2549,6 +2607,7 @@
 #() vFuffiiffiiffiip
 #() vFuddiiddiiddiip
 #() vFppiipppiiiiiii
+#() vFppuupppiiiiuii
 #() iFpipppppppppppp
 #() iFpppwwWWwwWWpuu
 #() pFppCpppwwwwwwWW
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index fd1fa9fc..23cc99b2 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -424,6 +424,7 @@ typedef void (*vFpuI_t)(void*, uint32_t, int64_t);
 typedef void (*vFpuW_t)(void*, uint32_t, uint16_t);
 typedef void (*vFpuu_t)(void*, uint32_t, uint32_t);
 typedef void (*vFpuU_t)(void*, uint32_t, uint64_t);
+typedef void (*vFpuf_t)(void*, uint32_t, float);
 typedef void (*vFpud_t)(void*, uint32_t, double);
 typedef void (*vFpuL_t)(void*, uint32_t, uintptr_t);
 typedef void (*vFpup_t)(void*, uint32_t, void*);
@@ -433,6 +434,7 @@ typedef void (*vFpUU_t)(void*, uint64_t, uint64_t);
 typedef void (*vFpUf_t)(void*, uint64_t, float);
 typedef void (*vFpUp_t)(void*, uint64_t, void*);
 typedef void (*vFpff_t)(void*, float, float);
+typedef void (*vFpdu_t)(void*, double, uint32_t);
 typedef void (*vFpdd_t)(void*, double, double);
 typedef void (*vFpll_t)(void*, intptr_t, intptr_t);
 typedef void (*vFplp_t)(void*, intptr_t, void*);
@@ -562,6 +564,7 @@ typedef uint32_t (*uFufp_t)(uint32_t, float, void*);
 typedef uint32_t (*uFupu_t)(uint32_t, void*, uint32_t);
 typedef uint32_t (*uFupp_t)(uint32_t, void*, void*);
 typedef uint32_t (*uFpii_t)(void*, int32_t, int32_t);
+typedef uint32_t (*uFpiu_t)(void*, int32_t, uint32_t);
 typedef uint32_t (*uFpip_t)(void*, int32_t, void*);
 typedef uint32_t (*uFpCi_t)(void*, uint8_t, int32_t);
 typedef uint32_t (*uFpWi_t)(void*, uint16_t, int32_t);
@@ -592,6 +595,8 @@ typedef double (*dFddd_t)(double, double, double);
 typedef double (*dFddp_t)(double, double, void*);
 typedef double (*dFpdd_t)(void*, double, double);
 typedef double (*dFppi_t)(void*, void*, int32_t);
+typedef double (*dFppu_t)(void*, void*, uint32_t);
+typedef double (*dFppd_t)(void*, void*, double);
 typedef double (*dFppp_t)(void*, void*, void*);
 typedef long double (*DFppi_t)(void*, void*, int32_t);
 typedef long double (*DFppp_t)(void*, void*, void*);
@@ -822,7 +827,9 @@ typedef void (*vFpuip_t)(void*, uint32_t, int32_t, void*);
 typedef void (*vFpuui_t)(void*, uint32_t, uint32_t, int32_t);
 typedef void (*vFpuuu_t)(void*, uint32_t, uint32_t, uint32_t);
 typedef void (*vFpuup_t)(void*, uint32_t, uint32_t, void*);
+typedef void (*vFpufi_t)(void*, uint32_t, float, int32_t);
 typedef void (*vFpudd_t)(void*, uint32_t, double, double);
+typedef void (*vFpupu_t)(void*, uint32_t, void*, uint32_t);
 typedef void (*vFpupp_t)(void*, uint32_t, void*, void*);
 typedef void (*vFpUui_t)(void*, uint64_t, uint32_t, int32_t);
 typedef void (*vFpUuu_t)(void*, uint64_t, uint32_t, uint32_t);
@@ -833,13 +840,16 @@ typedef void (*vFpUUp_t)(void*, uint64_t, uint64_t, void*);
 typedef void (*vFpUpp_t)(void*, uint64_t, void*, void*);
 typedef void (*vFpfff_t)(void*, float, float, float);
 typedef void (*vFpdii_t)(void*, double, int32_t, int32_t);
-typedef void (*vFpdip_t)(void*, double, int32_t, void*);
+typedef void (*vFpdup_t)(void*, double, uint32_t, void*);
 typedef void (*vFpddi_t)(void*, double, double, int32_t);
+typedef void (*vFpddu_t)(void*, double, double, uint32_t);
 typedef void (*vFpddd_t)(void*, double, double, double);
 typedef void (*vFplll_t)(void*, intptr_t, intptr_t, intptr_t);
 typedef void (*vFplpp_t)(void*, intptr_t, void*, void*);
 typedef void (*vFpLii_t)(void*, uintptr_t, int32_t, int32_t);
+typedef void (*vFpLuu_t)(void*, uintptr_t, uint32_t, uint32_t);
 typedef void (*vFpLLL_t)(void*, uintptr_t, uintptr_t, uintptr_t);
+typedef void (*vFpLpp_t)(void*, uintptr_t, void*, void*);
 typedef void (*vFppii_t)(void*, void*, int32_t, int32_t);
 typedef void (*vFppiu_t)(void*, void*, int32_t, uint32_t);
 typedef void (*vFppid_t)(void*, void*, int32_t, double);
@@ -1030,9 +1040,12 @@ typedef uint32_t (*uFpCCC_t)(void*, uint8_t, uint8_t, uint8_t);
 typedef uint32_t (*uFpuip_t)(void*, uint32_t, int32_t, void*);
 typedef uint32_t (*uFpuuu_t)(void*, uint32_t, uint32_t, uint32_t);
 typedef uint32_t (*uFpuup_t)(void*, uint32_t, uint32_t, void*);
+typedef uint32_t (*uFpupi_t)(void*, uint32_t, void*, int32_t);
 typedef uint32_t (*uFpupu_t)(void*, uint32_t, void*, uint32_t);
+typedef uint32_t (*uFpupp_t)(void*, uint32_t, void*, void*);
 typedef uint32_t (*uFppiu_t)(void*, void*, int32_t, uint32_t);
 typedef uint32_t (*uFppip_t)(void*, void*, int32_t, void*);
+typedef uint32_t (*uFpplp_t)(void*, void*, intptr_t, void*);
 typedef uint32_t (*uFppLp_t)(void*, void*, uintptr_t, void*);
 typedef uint32_t (*uFpppi_t)(void*, void*, void*, int32_t);
 typedef uint32_t (*uFpppu_t)(void*, void*, void*, uint32_t);
@@ -1109,6 +1122,7 @@ typedef void* (*pFuuii_t)(uint32_t, uint32_t, int32_t, int32_t);
 typedef void* (*pFuuip_t)(uint32_t, uint32_t, int32_t, void*);
 typedef void* (*pFuuuu_t)(uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFullu_t)(uint32_t, intptr_t, intptr_t, uint32_t);
+typedef void* (*pFupii_t)(uint32_t, void*, int32_t, int32_t);
 typedef void* (*pFuppp_t)(uint32_t, void*, void*, void*);
 typedef void* (*pFffff_t)(float, float, float, float);
 typedef void* (*pFdipp_t)(double, int32_t, void*, void*);
@@ -1289,6 +1303,7 @@ typedef void (*vFupupi_t)(uint32_t, void*, uint32_t, void*, int32_t);
 typedef void (*vFupupp_t)(uint32_t, void*, uint32_t, void*, void*);
 typedef void (*vFuplii_t)(uint32_t, void*, intptr_t, int32_t, int32_t);
 typedef void (*vFuppip_t)(uint32_t, void*, void*, int32_t, void*);
+typedef void (*vFupppu_t)(uint32_t, void*, void*, void*, uint32_t);
 typedef void (*vFupppp_t)(uint32_t, void*, void*, void*, void*);
 typedef void (*vFUUppp_t)(uint64_t, uint64_t, void*, void*, void*);
 typedef void (*vFfffff_t)(float, float, float, float, float);
@@ -1306,6 +1321,7 @@ 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);
 typedef void (*vFpiIII_t)(void*, int32_t, int64_t, int64_t, int64_t);
+typedef void (*vFpiuuu_t)(void*, int32_t, uint32_t, uint32_t, uint32_t);
 typedef void (*vFpiUUp_t)(void*, int32_t, uint64_t, uint64_t, void*);
 typedef void (*vFpilpp_t)(void*, int32_t, intptr_t, void*, void*);
 typedef void (*vFpipii_t)(void*, int32_t, void*, int32_t, int32_t);
@@ -1317,6 +1333,7 @@ typedef void (*vFpuuup_t)(void*, uint32_t, uint32_t, uint32_t, void*);
 typedef void (*vFpuupp_t)(void*, uint32_t, uint32_t, void*, void*);
 typedef void (*vFpuUUu_t)(void*, uint32_t, uint64_t, uint64_t, uint32_t);
 typedef void (*vFpuddd_t)(void*, uint32_t, double, double, double);
+typedef void (*vFpupiu_t)(void*, uint32_t, void*, int32_t, uint32_t);
 typedef void (*vFpupup_t)(void*, uint32_t, void*, uint32_t, void*);
 typedef void (*vFpUuiu_t)(void*, uint64_t, uint32_t, int32_t, uint32_t);
 typedef void (*vFpUUuu_t)(void*, uint64_t, uint64_t, uint32_t, uint32_t);
@@ -1324,6 +1341,7 @@ typedef void (*vFpUUup_t)(void*, uint64_t, uint64_t, uint32_t, void*);
 typedef void (*vFpUUUu_t)(void*, uint64_t, uint64_t, uint64_t, uint32_t);
 typedef void (*vFpUUUp_t)(void*, uint64_t, uint64_t, uint64_t, void*);
 typedef void (*vFpUppp_t)(void*, uint64_t, void*, void*, void*);
+typedef void (*vFpfffi_t)(void*, float, float, float, int32_t);
 typedef void (*vFpffff_t)(void*, float, float, float, float);
 typedef void (*vFpdiII_t)(void*, double, int32_t, int64_t, int64_t);
 typedef void (*vFpddii_t)(void*, double, double, int32_t, int32_t);
@@ -1342,6 +1360,7 @@ typedef void (*vFppidd_t)(void*, void*, int32_t, double, double);
 typedef void (*vFppipi_t)(void*, void*, int32_t, void*, int32_t);
 typedef void (*vFppipp_t)(void*, void*, int32_t, void*, void*);
 typedef void (*vFppWui_t)(void*, void*, uint16_t, uint32_t, int32_t);
+typedef void (*vFppuii_t)(void*, void*, uint32_t, int32_t, int32_t);
 typedef void (*vFppuui_t)(void*, void*, uint32_t, uint32_t, int32_t);
 typedef void (*vFppuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t);
 typedef void (*vFppuup_t)(void*, void*, uint32_t, uint32_t, void*);
@@ -1542,6 +1561,7 @@ typedef void* (*pFuiupp_t)(uint32_t, int32_t, uint32_t, void*, void*);
 typedef void* (*pFuuiip_t)(uint32_t, uint32_t, int32_t, int32_t, void*);
 typedef void* (*pFuuupu_t)(uint32_t, uint32_t, uint32_t, void*, uint32_t);
 typedef void* (*pFuupuu_t)(uint32_t, uint32_t, void*, uint32_t, uint32_t);
+typedef void* (*pFudddp_t)(uint32_t, double, double, double, void*);
 typedef void* (*pFupLpl_t)(uint32_t, void*, uintptr_t, void*, intptr_t);
 typedef void* (*pFupLpL_t)(uint32_t, void*, uintptr_t, void*, uintptr_t);
 typedef void* (*pFLuppp_t)(uintptr_t, uint32_t, void*, void*, void*);
@@ -1570,6 +1590,7 @@ typedef void* (*pFpuuup_t)(void*, uint32_t, uint32_t, uint32_t, void*);
 typedef void* (*pFpupii_t)(void*, uint32_t, void*, int32_t, int32_t);
 typedef void* (*pFpuppp_t)(void*, uint32_t, void*, void*, void*);
 typedef void* (*pFpUdii_t)(void*, uint64_t, double, int32_t, int32_t);
+typedef void* (*pFpfffi_t)(void*, float, float, float, int32_t);
 typedef void* (*pFpdddd_t)(void*, double, double, double, double);
 typedef void* (*pFplppp_t)(void*, intptr_t, void*, void*, void*);
 typedef void* (*pFpLpii_t)(void*, uintptr_t, void*, int32_t, int32_t);
@@ -1580,10 +1601,12 @@ typedef void* (*pFppipi_t)(void*, void*, int32_t, void*, int32_t);
 typedef void* (*pFppipp_t)(void*, void*, int32_t, void*, void*);
 typedef void* (*pFppWpp_t)(void*, void*, uint16_t, void*, void*);
 typedef void* (*pFppuii_t)(void*, void*, uint32_t, int32_t, int32_t);
+typedef void* (*pFppuip_t)(void*, void*, uint32_t, int32_t, void*);
 typedef void* (*pFppuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFppuup_t)(void*, void*, uint32_t, uint32_t, void*);
 typedef void* (*pFppupp_t)(void*, void*, uint32_t, void*, void*);
 typedef void* (*pFppddi_t)(void*, void*, double, double, int32_t);
+typedef void* (*pFppddu_t)(void*, void*, double, double, uint32_t);
 typedef void* (*pFppLii_t)(void*, void*, uintptr_t, int32_t, int32_t);
 typedef void* (*pFppLLp_t)(void*, void*, uintptr_t, uintptr_t, void*);
 typedef void* (*pFpppii_t)(void*, void*, void*, int32_t, int32_t);
@@ -1689,6 +1712,7 @@ typedef void (*vFuppppu_t)(uint32_t, void*, void*, void*, void*, uint32_t);
 typedef void (*vFuppppp_t)(uint32_t, void*, void*, void*, void*, void*);
 typedef void (*vFffffff_t)(float, float, float, float, float, float);
 typedef void (*vFdddddd_t)(double, double, double, double, double, double);
+typedef void (*vFdddppp_t)(double, double, double, void*, void*, void*);
 typedef void (*vFpiiiii_t)(void*, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFpiiipp_t)(void*, int32_t, int32_t, int32_t, void*, void*);
 typedef void (*vFpiiuuu_t)(void*, int32_t, int32_t, uint32_t, uint32_t, uint32_t);
@@ -1718,12 +1742,16 @@ typedef void (*vFpddddp_t)(void*, double, double, double, double, void*);
 typedef void (*vFppiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppiiip_t)(void*, void*, int32_t, int32_t, int32_t, void*);
 typedef void (*vFppiiui_t)(void*, void*, int32_t, int32_t, uint32_t, int32_t);
+typedef void (*vFppiiuu_t)(void*, void*, int32_t, int32_t, uint32_t, uint32_t);
 typedef void (*vFppiipi_t)(void*, void*, int32_t, int32_t, void*, int32_t);
 typedef void (*vFppiipp_t)(void*, void*, int32_t, int32_t, void*, void*);
 typedef void (*vFppilpp_t)(void*, void*, int32_t, intptr_t, void*, void*);
 typedef void (*vFppipLp_t)(void*, void*, int32_t, void*, uintptr_t, void*);
 typedef void (*vFppippi_t)(void*, void*, int32_t, void*, void*, int32_t);
 typedef void (*vFppippp_t)(void*, void*, int32_t, void*, void*, void*);
+typedef void (*vFppuiii_t)(void*, void*, uint32_t, int32_t, int32_t, int32_t);
+typedef void (*vFppuiiu_t)(void*, void*, uint32_t, int32_t, int32_t, uint32_t);
+typedef void (*vFppuiip_t)(void*, void*, uint32_t, int32_t, int32_t, void*);
 typedef void (*vFppuuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void (*vFppuUUU_t)(void*, void*, uint32_t, uint64_t, uint64_t, uint64_t);
 typedef void (*vFppupii_t)(void*, void*, uint32_t, void*, int32_t, int32_t);
@@ -1783,6 +1811,7 @@ typedef int32_t (*iFpiiiiu_t)(void*, int32_t, int32_t, int32_t, int32_t, uint32_
 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 (*iFpiiuui_t)(void*, int32_t, int32_t, uint32_t, uint32_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*);
@@ -1850,6 +1879,7 @@ typedef uint32_t (*uFEiuppp_t)(x64emu_t*, int32_t, uint32_t, void*, void*, void*
 typedef uint32_t (*uFEpCppp_t)(x64emu_t*, void*, uint8_t, void*, void*, void*);
 typedef uint32_t (*uFEpuppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*);
 typedef uint32_t (*uFupuufp_t)(uint32_t, void*, uint32_t, uint32_t, float, void*);
+typedef uint32_t (*uFpiuppu_t)(void*, int32_t, uint32_t, void*, void*, uint32_t);
 typedef uint32_t (*uFpippup_t)(void*, int32_t, void*, void*, uint32_t, void*);
 typedef uint32_t (*uFpWuipp_t)(void*, uint16_t, uint32_t, int32_t, void*, void*);
 typedef uint32_t (*uFpWuuCp_t)(void*, uint16_t, uint32_t, uint32_t, uint8_t, void*);
@@ -2002,12 +2032,12 @@ typedef void (*vFpiiliip_t)(void*, int32_t, int32_t, intptr_t, int32_t, int32_t,
 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*);
 typedef void (*vFpupuuup_t)(void*, uint32_t, void*, uint32_t, uint32_t, uint32_t, void*);
+typedef void (*vFpupppui_t)(void*, uint32_t, void*, void*, void*, uint32_t, int32_t);
 typedef void (*vFpUiUiup_t)(void*, uint64_t, int32_t, uint64_t, int32_t, uint32_t, void*);
 typedef void (*vFpUUUUuu_t)(void*, uint64_t, uint64_t, uint64_t, uint64_t, uint32_t, uint32_t);
 typedef void (*vFpddiidd_t)(void*, double, double, int32_t, int32_t, double, double);
@@ -2025,6 +2055,8 @@ typedef void (*vFppipiip_t)(void*, void*, int32_t, void*, int32_t, int32_t, void
 typedef void (*vFppipipp_t)(void*, void*, int32_t, void*, int32_t, void*, void*);
 typedef void (*vFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*);
 typedef void (*vFppCuupp_t)(void*, void*, uint8_t, uint32_t, uint32_t, void*, void*);
+typedef void (*vFppuiiip_t)(void*, void*, uint32_t, int32_t, int32_t, int32_t, void*);
+typedef void (*vFppuupii_t)(void*, void*, uint32_t, uint32_t, void*, int32_t, int32_t);
 typedef void (*vFppddddi_t)(void*, void*, double, double, double, double, int32_t);
 typedef void (*vFppddpii_t)(void*, void*, double, double, void*, int32_t, int32_t);
 typedef void (*vFppLpppi_t)(void*, void*, uintptr_t, void*, void*, void*, int32_t);
@@ -2032,13 +2064,15 @@ typedef void (*vFppLpppp_t)(void*, void*, uintptr_t, void*, void*, void*, void*)
 typedef void (*vFpppiiii_t)(void*, void*, void*, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFpppiipi_t)(void*, void*, void*, int32_t, int32_t, void*, int32_t);
 typedef void (*vFpppiipp_t)(void*, void*, void*, int32_t, int32_t, void*, void*);
+typedef void (*vFpppiupi_t)(void*, void*, void*, int32_t, uint32_t, void*, int32_t);
 typedef void (*vFpppippi_t)(void*, void*, void*, int32_t, void*, void*, int32_t);
 typedef void (*vFpppuuuu_t)(void*, void*, void*, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void (*vFppppiii_t)(void*, void*, void*, void*, int32_t, int32_t, int32_t);
 typedef void (*vFppppiip_t)(void*, void*, void*, void*, int32_t, int32_t, void*);
+typedef void (*vFppppiui_t)(void*, void*, void*, void*, int32_t, uint32_t, int32_t);
 typedef void (*vFppppipi_t)(void*, void*, void*, void*, int32_t, void*, int32_t);
 typedef void (*vFpppppip_t)(void*, void*, void*, void*, void*, int32_t, void*);
-typedef void (*vFppppppi_t)(void*, void*, void*, void*, void*, void*, int32_t);
+typedef void (*vFppppppu_t)(void*, void*, void*, void*, void*, void*, uint32_t);
 typedef void (*vFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFEpupppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*, void*);
 typedef int32_t (*iFEpUuppp_t)(x64emu_t*, void*, uint64_t, uint32_t, void*, void*, void*);
@@ -2107,7 +2141,8 @@ typedef int32_t (*iFppppipp_t)(void*, void*, void*, void*, int32_t, void*, void*
 typedef int32_t (*iFppppdpi_t)(void*, void*, void*, void*, double, void*, int32_t);
 typedef int32_t (*iFpppppip_t)(void*, void*, void*, void*, void*, int32_t, void*);
 typedef int32_t (*iFpppppup_t)(void*, void*, void*, void*, void*, uint32_t, void*);
-typedef int32_t (*iFppppppi_t)(void*, void*, void*, void*, void*, void*, int32_t);
+typedef int32_t (*iFpppppLp_t)(void*, void*, void*, void*, void*, uintptr_t, void*);
+typedef int32_t (*iFppppppu_t)(void*, void*, void*, void*, void*, void*, uint32_t);
 typedef int32_t (*iFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFEiipppp_t)(x64emu_t*, int32_t, int32_t, void*, void*, void*, void*);
 typedef uint32_t (*uFEpiippp_t)(x64emu_t*, void*, int32_t, int32_t, void*, void*, void*);
@@ -2152,6 +2187,7 @@ typedef void* (*pFppiiCCC_t)(void*, void*, int32_t, int32_t, uint8_t, uint8_t, u
 typedef void* (*pFppipipp_t)(void*, void*, int32_t, void*, int32_t, void*, void*);
 typedef void* (*pFppipLpp_t)(void*, void*, int32_t, void*, uintptr_t, void*, void*);
 typedef void* (*pFppuippp_t)(void*, void*, uint32_t, int32_t, void*, void*, void*);
+typedef void* (*pFppuuupp_t)(void*, void*, uint32_t, uint32_t, uint32_t, void*, void*);
 typedef void* (*pFppuuppp_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*);
 typedef void* (*pFppliuip_t)(void*, void*, intptr_t, int32_t, uint32_t, int32_t, void*);
 typedef void* (*pFpplipup_t)(void*, void*, intptr_t, int32_t, void*, uint32_t, void*);
@@ -2169,7 +2205,7 @@ typedef void* (*pFpppllli_t)(void*, void*, void*, intptr_t, intptr_t, intptr_t,
 typedef void* (*pFpppLLLi_t)(void*, void*, void*, uintptr_t, uintptr_t, uintptr_t, int32_t);
 typedef void* (*pFppppuuu_t)(void*, void*, void*, void*, uint32_t, uint32_t, uint32_t);
 typedef void* (*pFpppppuu_t)(void*, void*, void*, void*, void*, uint32_t, uint32_t);
-typedef void* (*pFppppppi_t)(void*, void*, void*, void*, void*, void*, int32_t);
+typedef void* (*pFppppppu_t)(void*, void*, void*, void*, void*, void*, uint32_t);
 typedef void* (*pFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iWpiiuuuu_t)(void*, int32_t, int32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iWpuiiiip_t)(void*, uint32_t, int32_t, int32_t, int32_t, int32_t, void*);
@@ -2228,6 +2264,7 @@ typedef void (*vFppipipiu_t)(void*, void*, int32_t, void*, int32_t, void*, int32
 typedef void (*vFppipppui_t)(void*, void*, int32_t, void*, void*, void*, uint32_t, int32_t);
 typedef void (*vFppippppi_t)(void*, void*, int32_t, void*, void*, void*, void*, int32_t);
 typedef void (*vFppippppp_t)(void*, void*, int32_t, void*, void*, void*, void*, void*);
+typedef void (*vFppuuiiii_t)(void*, void*, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFpplppppi_t)(void*, void*, intptr_t, void*, void*, void*, void*, int32_t);
 typedef void (*vFpplppppp_t)(void*, void*, intptr_t, void*, void*, void*, void*, void*);
 typedef void (*vFpppipppu_t)(void*, void*, void*, int32_t, void*, void*, void*, uint32_t);
@@ -2261,6 +2298,7 @@ typedef int32_t (*iFpLpipppp_t)(void*, uintptr_t, void*, int32_t, void*, void*,
 typedef int32_t (*iFppiiiiiu_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t);
 typedef int32_t (*iFppiiipip_t)(void*, void*, int32_t, int32_t, int32_t, void*, int32_t, void*);
 typedef int32_t (*iFppIIIppp_t)(void*, void*, int64_t, int64_t, int64_t, void*, void*, void*);
+typedef int32_t (*iFppuiiuuu_t)(void*, void*, uint32_t, int32_t, int32_t, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFppuuuuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef int32_t (*iFppuppppp_t)(void*, void*, uint32_t, void*, void*, void*, void*, void*);
 typedef int32_t (*iFpppiiipi_t)(void*, void*, void*, int32_t, int32_t, int32_t, void*, int32_t);
@@ -2355,12 +2393,18 @@ typedef void (*vFpipiuiipp_t)(void*, int32_t, void*, int32_t, uint32_t, int32_t,
 typedef void (*vFpipppiipi_t)(void*, int32_t, void*, void*, void*, int32_t, int32_t, void*, int32_t);
 typedef void (*vFppiiiiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppiiiiipi_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, void*, int32_t);
+typedef void (*vFppiiiiupi_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, void*, int32_t);
 typedef void (*vFppiiipiii_t)(void*, void*, int32_t, int32_t, int32_t, void*, int32_t, int32_t, int32_t);
 typedef void (*vFppiipiiii_t)(void*, void*, int32_t, int32_t, void*, int32_t, int32_t, int32_t, int32_t);
+typedef void (*vFppiupiiii_t)(void*, void*, int32_t, uint32_t, void*, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppippDpDC_t)(void*, void*, int32_t, void*, void*, long double, void*, long double, uint8_t);
 typedef void (*vFppipppiii_t)(void*, void*, int32_t, void*, void*, void*, int32_t, int32_t, int32_t);
 typedef void (*vFppipppiip_t)(void*, void*, int32_t, void*, void*, void*, int32_t, int32_t, void*);
 typedef void (*vFppuuiiiii_t)(void*, void*, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
+typedef void (*vFppuuiiiiu_t)(void*, void*, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t, uint32_t);
+typedef void (*vFppupppiii_t)(void*, void*, uint32_t, void*, void*, void*, int32_t, int32_t, int32_t);
+typedef void (*vFppupppiiu_t)(void*, void*, uint32_t, void*, void*, void*, int32_t, int32_t, uint32_t);
+typedef void (*vFppupppiip_t)(void*, void*, uint32_t, void*, void*, void*, int32_t, int32_t, void*);
 typedef void (*vFppUUiUUUU_t)(void*, void*, uint64_t, uint64_t, int32_t, uint64_t, uint64_t, uint64_t, uint64_t);
 typedef void (*vFppddddidd_t)(void*, void*, double, double, double, double, int32_t, double, double);
 typedef void (*vFpplpppppi_t)(void*, void*, intptr_t, void*, void*, void*, void*, void*, int32_t);
@@ -2448,10 +2492,16 @@ typedef void (*vFpiuippppip_t)(void*, int32_t, uint32_t, int32_t, void*, void*,
 typedef void (*vFpuupuuuuuu_t)(void*, uint32_t, uint32_t, void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void (*vFppiiiiiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppiiiiipip_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, void*, int32_t, void*);
+typedef void (*vFppiiiiupip_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, void*, int32_t, void*);
 typedef void (*vFppiipppiip_t)(void*, void*, int32_t, int32_t, void*, void*, void*, int32_t, int32_t, void*);
 typedef void (*vFppiippppii_t)(void*, void*, int32_t, int32_t, void*, void*, void*, void*, int32_t, int32_t);
 typedef void (*vFppipppiiii_t)(void*, void*, int32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t);
+typedef void (*vFppuipppiip_t)(void*, void*, uint32_t, int32_t, void*, void*, void*, int32_t, int32_t, void*);
+typedef void (*vFppuuuiiiii_t)(void*, void*, uint32_t, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppuuuuiiuu_t)(void*, void*, uint32_t, uint32_t, uint32_t, uint32_t, int32_t, int32_t, uint32_t, uint32_t);
+typedef void (*vFppuuuuuuuu_t)(void*, void*, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
+typedef void (*vFppuuppppii_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*, void*, int32_t, int32_t);
+typedef void (*vFppupppiiii_t)(void*, void*, uint32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppdddddddd_t)(void*, void*, double, double, double, double, double, double, double, double);
 typedef void (*vFpppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFEpiiiiippp_t)(x64emu_t*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, void*, void*, void*);
@@ -2505,11 +2555,15 @@ typedef void (*vFpipppiiiipi_t)(void*, int32_t, void*, void*, void*, int32_t, in
 typedef void (*vFpupiiupupup_t)(void*, uint32_t, void*, int32_t, int32_t, uint32_t, void*, uint32_t, void*, uint32_t, void*);
 typedef void (*vFppiiiiiiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppiiiiipiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, void*, int32_t, int32_t, int32_t);
+typedef void (*vFppiiiiupiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, void*, int32_t, int32_t, int32_t);
 typedef void (*vFppiiiiddddi_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, double, double, double, double, int32_t);
 typedef void (*vFppiipppiiii_t)(void*, void*, int32_t, int32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppipppiiiii_t)(void*, void*, int32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppipppuiiii_t)(void*, void*, int32_t, void*, void*, void*, uint32_t, int32_t, int32_t, int32_t, int32_t);
+typedef void (*vFppuuiiiiuii_t)(void*, void*, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, int32_t, int32_t);
+typedef void (*vFppuupppiiii_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppupipiuuuu_t)(void*, void*, uint32_t, void*, int32_t, void*, int32_t, uint32_t, uint32_t, uint32_t, uint32_t);
+typedef void (*vFppupppuiiii_t)(void*, void*, uint32_t, void*, void*, void*, uint32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFEpppipppppp_t)(x64emu_t*, void*, void*, void*, int32_t, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFEppppiiiiuu_t)(x64emu_t*, void*, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t);
@@ -2545,7 +2599,9 @@ typedef void (*vFpippppiiiipi_t)(void*, int32_t, void*, void*, void*, void*, int
 typedef void (*vFppiiiiddddii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, double, double, double, double, int32_t, int32_t);
 typedef void (*vFppiiuuuiupup_t)(void*, void*, int32_t, int32_t, uint32_t, uint32_t, uint32_t, int32_t, uint32_t, void*, uint32_t, void*);
 typedef void (*vFppiipppiiiii_t)(void*, void*, int32_t, int32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t);
+typedef void (*vFppuupppiiiiu_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t);
 typedef void (*vFpppiiiiiiiii_t)(void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
+typedef void (*vFpppiiiiiiuii_t)(void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, int32_t, int32_t);
 typedef void (*vFpppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFEpppippppppp_t)(x64emu_t*, void*, void*, void*, int32_t, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFEppppiiiiuui_t)(x64emu_t*, void*, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t, int32_t);
@@ -2570,7 +2626,9 @@ typedef void (*vFpipppiiiiiiuu_t)(void*, int32_t, void*, void*, void*, int32_t,
 typedef void (*vFpippppppppppp_t)(void*, int32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void (*vFpuppppppppppp_t)(void*, uint32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void (*vFppiiiiiiiiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
+typedef void (*vFppiiiiiiuiuii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, int32_t, uint32_t, int32_t, int32_t);
 typedef void (*vFppiipppiiiiii_t)(void*, void*, int32_t, int32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
+typedef void (*vFppuupppuiiiii_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*, uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFddddpppddpppp_t)(double, double, double, double, void*, void*, void*, double, double, void*, void*, void*, void*);
 typedef int32_t (*iFpippuuuiipppp_t)(void*, int32_t, void*, void*, uint32_t, uint32_t, uint32_t, int32_t, int32_t, void*, void*, void*, void*);
@@ -2585,6 +2643,7 @@ typedef void (*vFippppppppppppp_t)(int32_t, void*, void*, void*, void*, void*, v
 typedef void (*vFuffiiffiiffiip_t)(uint32_t, float, float, int32_t, int32_t, float, float, int32_t, int32_t, float, float, int32_t, int32_t, void*);
 typedef void (*vFuddiiddiiddiip_t)(uint32_t, double, double, int32_t, int32_t, double, double, int32_t, int32_t, double, double, int32_t, int32_t, void*);
 typedef void (*vFppiipppiiiiiii_t)(void*, void*, int32_t, int32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
+typedef void (*vFppuupppiiiiuii_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_t, int32_t, int32_t);
 typedef int32_t (*iFpipppppppppppp_t)(void*, int32_t, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef int32_t (*iFpppwwWWwwWWpuu_t)(void*, void*, void*, int16_t, int16_t, uint16_t, uint16_t, int16_t, int16_t, uint16_t, uint16_t, void*, uint32_t, uint32_t);
 typedef void* (*pFppCpppwwwwwwWW_t)(void*, void*, uint8_t, void*, void*, void*, int16_t, int16_t, int16_t, int16_t, int16_t, int16_t, uint16_t, uint16_t);
@@ -3035,6 +3094,7 @@ void vFpuI(x64emu_t *emu, uintptr_t fcn) { vFpuI_t fn = (vFpuI_t)fcn; fn((void*)
 void vFpuW(x64emu_t *emu, uintptr_t fcn) { vFpuW_t fn = (vFpuW_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint16_t)R_RDX); }
 void vFpuu(x64emu_t *emu, uintptr_t fcn) { vFpuu_t fn = (vFpuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX); }
 void vFpuU(x64emu_t *emu, uintptr_t fcn) { vFpuU_t fn = (vFpuU_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint64_t)R_RDX); }
+void vFpuf(x64emu_t *emu, uintptr_t fcn) { vFpuf_t fn = (vFpuf_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].f[0]); }
 void vFpud(x64emu_t *emu, uintptr_t fcn) { vFpud_t fn = (vFpud_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].d[0]); }
 void vFpuL(x64emu_t *emu, uintptr_t fcn) { vFpuL_t fn = (vFpuL_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX); }
 void vFpup(x64emu_t *emu, uintptr_t fcn) { vFpup_t fn = (vFpup_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); }
@@ -3044,6 +3104,7 @@ void vFpUU(x64emu_t *emu, uintptr_t fcn) { vFpUU_t fn = (vFpUU_t)fcn; fn((void*)
 void vFpUf(x64emu_t *emu, uintptr_t fcn) { vFpUf_t fn = (vFpUf_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, emu->xmm[0].f[0]); }
 void vFpUp(x64emu_t *emu, uintptr_t fcn) { vFpUp_t fn = (vFpUp_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX); }
 void vFpff(x64emu_t *emu, uintptr_t fcn) { vFpff_t fn = (vFpff_t)fcn; fn((void*)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0]); }
+void vFpdu(x64emu_t *emu, uintptr_t fcn) { vFpdu_t fn = (vFpdu_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], (uint32_t)R_RSI); }
 void vFpdd(x64emu_t *emu, uintptr_t fcn) { vFpdd_t fn = (vFpdd_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void vFpll(x64emu_t *emu, uintptr_t fcn) { vFpll_t fn = (vFpll_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
 void vFplp(x64emu_t *emu, uintptr_t fcn) { vFplp_t fn = (vFplp_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX); }
@@ -3173,6 +3234,7 @@ void uFufp(x64emu_t *emu, uintptr_t fcn) { uFufp_t fn = (uFufp_t)fcn; R_RAX=(uin
 void uFupu(x64emu_t *emu, uintptr_t fcn) { uFupu_t fn = (uFupu_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX); }
 void uFupp(x64emu_t *emu, uintptr_t fcn) { uFupp_t fn = (uFupp_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void uFpii(x64emu_t *emu, uintptr_t fcn) { uFpii_t fn = (uFpii_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX); }
+void uFpiu(x64emu_t *emu, uintptr_t fcn) { uFpiu_t fn = (uFpiu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX); }
 void uFpip(x64emu_t *emu, uintptr_t fcn) { uFpip_t fn = (uFpip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
 void uFpCi(x64emu_t *emu, uintptr_t fcn) { uFpCi_t fn = (uFpCi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (int32_t)R_RDX); }
 void uFpWi(x64emu_t *emu, uintptr_t fcn) { uFpWi_t fn = (uFpWi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (int32_t)R_RDX); }
@@ -3203,6 +3265,8 @@ void dFddd(x64emu_t *emu, uintptr_t fcn) { dFddd_t fn = (dFddd_t)fcn; emu->xmm[0
 void dFddp(x64emu_t *emu, uintptr_t fcn) { dFddp_t fn = (dFddp_t)fcn; emu->xmm[0].d[0]=fn(emu->xmm[0].d[0], emu->xmm[1].d[0], (void*)R_RDI); }
 void dFpdd(x64emu_t *emu, uintptr_t fcn) { dFpdd_t fn = (dFpdd_t)fcn; emu->xmm[0].d[0]=fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void dFppi(x64emu_t *emu, uintptr_t fcn) { dFppi_t fn = (dFppi_t)fcn; emu->xmm[0].d[0]=fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX); }
+void dFppu(x64emu_t *emu, uintptr_t fcn) { dFppu_t fn = (dFppu_t)fcn; emu->xmm[0].d[0]=fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX); }
+void dFppd(x64emu_t *emu, uintptr_t fcn) { dFppd_t fn = (dFppd_t)fcn; emu->xmm[0].d[0]=fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0]); }
 void dFppp(x64emu_t *emu, uintptr_t fcn) { dFppp_t fn = (dFppp_t)fcn; emu->xmm[0].d[0]=fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void DFppi(x64emu_t *emu, uintptr_t fcn) { DFppi_t fn = (DFppi_t)fcn; long double ld=fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX); fpu_do_push(emu); ST0val = ld; }
 void DFppp(x64emu_t *emu, uintptr_t fcn) { DFppp_t fn = (DFppp_t)fcn; long double ld=fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); fpu_do_push(emu); ST0val = ld; }
@@ -3433,7 +3497,9 @@ void vFpuip(x64emu_t *emu, uintptr_t fcn) { vFpuip_t fn = (vFpuip_t)fcn; fn((voi
 void vFpuui(x64emu_t *emu, uintptr_t fcn) { vFpuui_t fn = (vFpuui_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX); }
 void vFpuuu(x64emu_t *emu, uintptr_t fcn) { vFpuuu_t fn = (vFpuuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void vFpuup(x64emu_t *emu, uintptr_t fcn) { vFpuup_t fn = (vFpuup_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
+void vFpufi(x64emu_t *emu, uintptr_t fcn) { vFpufi_t fn = (vFpufi_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].f[0], (int32_t)R_RDX); }
 void vFpudd(x64emu_t *emu, uintptr_t fcn) { vFpudd_t fn = (vFpudd_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
+void vFpupu(x64emu_t *emu, uintptr_t fcn) { vFpupu_t fn = (vFpupu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void vFpupp(x64emu_t *emu, uintptr_t fcn) { vFpupp_t fn = (vFpupp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void vFpUui(x64emu_t *emu, uintptr_t fcn) { vFpUui_t fn = (vFpUui_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX); }
 void vFpUuu(x64emu_t *emu, uintptr_t fcn) { vFpUuu_t fn = (vFpUuu_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
@@ -3444,13 +3510,16 @@ void vFpUUp(x64emu_t *emu, uintptr_t fcn) { vFpUUp_t fn = (vFpUUp_t)fcn; fn((voi
 void vFpUpp(x64emu_t *emu, uintptr_t fcn) { vFpUpp_t fn = (vFpUpp_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void vFpfff(x64emu_t *emu, uintptr_t fcn) { vFpfff_t fn = (vFpfff_t)fcn; fn((void*)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
 void vFpdii(x64emu_t *emu, uintptr_t fcn) { vFpdii_t fn = (vFpdii_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], (int32_t)R_RSI, (int32_t)R_RDX); }
-void vFpdip(x64emu_t *emu, uintptr_t fcn) { vFpdip_t fn = (vFpdip_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], (int32_t)R_RSI, (void*)R_RDX); }
+void vFpdup(x64emu_t *emu, uintptr_t fcn) { vFpdup_t fn = (vFpdup_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], (uint32_t)R_RSI, (void*)R_RDX); }
 void vFpddi(x64emu_t *emu, uintptr_t fcn) { vFpddi_t fn = (vFpddi_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (int32_t)R_RSI); }
+void vFpddu(x64emu_t *emu, uintptr_t fcn) { vFpddu_t fn = (vFpddu_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (uint32_t)R_RSI); }
 void vFpddd(x64emu_t *emu, uintptr_t fcn) { vFpddd_t fn = (vFpddd_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0]); }
 void vFplll(x64emu_t *emu, uintptr_t fcn) { vFplll_t fn = (vFplll_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX); }
 void vFplpp(x64emu_t *emu, uintptr_t fcn) { vFplpp_t fn = (vFplpp_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void vFpLii(x64emu_t *emu, uintptr_t fcn) { vFpLii_t fn = (vFpLii_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
+void vFpLuu(x64emu_t *emu, uintptr_t fcn) { vFpLuu_t fn = (vFpLuu_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void vFpLLL(x64emu_t *emu, uintptr_t fcn) { vFpLLL_t fn = (vFpLLL_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
+void vFpLpp(x64emu_t *emu, uintptr_t fcn) { vFpLpp_t fn = (vFpLpp_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void vFppii(x64emu_t *emu, uintptr_t fcn) { vFppii_t fn = (vFppii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void vFppiu(x64emu_t *emu, uintptr_t fcn) { vFppiu_t fn = (vFppiu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX); }
 void vFppid(x64emu_t *emu, uintptr_t fcn) { vFppid_t fn = (vFppid_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, emu->xmm[0].d[0]); }
@@ -3641,9 +3710,12 @@ void uFpCCC(x64emu_t *emu, uintptr_t fcn) { uFpCCC_t fn = (uFpCCC_t)fcn; R_RAX=(
 void uFpuip(x64emu_t *emu, uintptr_t fcn) { uFpuip_t fn = (uFpuip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void uFpuuu(x64emu_t *emu, uintptr_t fcn) { uFpuuu_t fn = (uFpuuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void uFpuup(x64emu_t *emu, uintptr_t fcn) { uFpuup_t fn = (uFpuup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
+void uFpupi(x64emu_t *emu, uintptr_t fcn) { uFpupi_t fn = (uFpupi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void uFpupu(x64emu_t *emu, uintptr_t fcn) { uFpupu_t fn = (uFpupu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
+void uFpupp(x64emu_t *emu, uintptr_t fcn) { uFpupp_t fn = (uFpupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void uFppiu(x64emu_t *emu, uintptr_t fcn) { uFppiu_t fn = (uFppiu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX); }
 void uFppip(x64emu_t *emu, uintptr_t fcn) { uFppip_t fn = (uFppip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
+void uFpplp(x64emu_t *emu, uintptr_t fcn) { uFpplp_t fn = (uFpplp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX); }
 void uFppLp(x64emu_t *emu, uintptr_t fcn) { uFppLp_t fn = (uFppLp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void uFpppi(x64emu_t *emu, uintptr_t fcn) { uFpppi_t fn = (uFpppi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void uFpppu(x64emu_t *emu, uintptr_t fcn) { uFpppu_t fn = (uFpppu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
@@ -3720,6 +3792,7 @@ void pFuuii(x64emu_t *emu, uintptr_t fcn) { pFuuii_t fn = (pFuuii_t)fcn; R_RAX=(
 void pFuuip(x64emu_t *emu, uintptr_t fcn) { pFuuip_t fn = (pFuuip_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void pFuuuu(x64emu_t *emu, uintptr_t fcn) { pFuuuu_t fn = (pFuuuu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void pFullu(x64emu_t *emu, uintptr_t fcn) { pFullu_t fn = (pFullu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uint32_t)R_RCX); }
+void pFupii(x64emu_t *emu, uintptr_t fcn) { pFupii_t fn = (pFupii_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void pFuppp(x64emu_t *emu, uintptr_t fcn) { pFuppp_t fn = (pFuppp_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void pFffff(x64emu_t *emu, uintptr_t fcn) { pFffff_t fn = (pFffff_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0]); }
 void pFdipp(x64emu_t *emu, uintptr_t fcn) { pFdipp_t fn = (pFdipp_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
@@ -3900,6 +3973,7 @@ void vFupupi(x64emu_t *emu, uintptr_t fcn) { vFupupi_t fn = (vFupupi_t)fcn; fn((
 void vFupupp(x64emu_t *emu, uintptr_t fcn) { vFupupp_t fn = (vFupupp_t)fcn; fn((uint32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFuplii(x64emu_t *emu, uintptr_t fcn) { vFuplii_t fn = (vFuplii_t)fcn; fn((uint32_t)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void vFuppip(x64emu_t *emu, uintptr_t fcn) { vFuppip_t fn = (vFuppip_t)fcn; fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
+void vFupppu(x64emu_t *emu, uintptr_t fcn) { vFupppu_t fn = (vFupppu_t)fcn; fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void vFupppp(x64emu_t *emu, uintptr_t fcn) { vFupppp_t fn = (vFupppp_t)fcn; fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFUUppp(x64emu_t *emu, uintptr_t fcn) { vFUUppp_t fn = (vFUUppp_t)fcn; fn((uint64_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFfffff(x64emu_t *emu, uintptr_t fcn) { vFfffff_t fn = (vFfffff_t)fcn; fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0], emu->xmm[4].f[0]); }
@@ -3917,6 +3991,7 @@ void vFpiiff(x64emu_t *emu, uintptr_t fcn) { vFpiiff_t fn = (vFpiiff_t)fcn; fn((
 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); }
 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, (int64_t)R_RCX, (int64_t)R_R8); }
+void vFpiuuu(x64emu_t *emu, uintptr_t fcn) { vFpiuuu_t fn = (vFpiuuu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void vFpiUUp(x64emu_t *emu, uintptr_t fcn) { vFpiUUp_t fn = (vFpiUUp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (void*)R_R8); }
 void vFpilpp(x64emu_t *emu, uintptr_t fcn) { vFpilpp_t fn = (vFpilpp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFpipii(x64emu_t *emu, uintptr_t fcn) { vFpipii_t fn = (vFpipii_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
@@ -3928,6 +4003,7 @@ void vFpuuup(x64emu_t *emu, uintptr_t fcn) { vFpuuup_t fn = (vFpuuup_t)fcn; fn((
 void vFpuupp(x64emu_t *emu, uintptr_t fcn) { vFpuupp_t fn = (vFpuupp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFpuUUu(x64emu_t *emu, uintptr_t fcn) { vFpuUUu_t fn = (vFpuUUu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint32_t)R_R8); }
 void vFpuddd(x64emu_t *emu, uintptr_t fcn) { vFpuddd_t fn = (vFpuddd_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0]); }
+void vFpupiu(x64emu_t *emu, uintptr_t fcn) { vFpupiu_t fn = (vFpupiu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); }
 void vFpupup(x64emu_t *emu, uintptr_t fcn) { vFpupup_t fn = (vFpupup_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void vFpUuiu(x64emu_t *emu, uintptr_t fcn) { vFpUuiu_t fn = (vFpUuiu_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); }
 void vFpUUuu(x64emu_t *emu, uintptr_t fcn) { vFpUUuu_t fn = (vFpUUuu_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
@@ -3935,6 +4011,7 @@ void vFpUUup(x64emu_t *emu, uintptr_t fcn) { vFpUUup_t fn = (vFpUUup_t)fcn; fn((
 void vFpUUUu(x64emu_t *emu, uintptr_t fcn) { vFpUUUu_t fn = (vFpUUUu_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint32_t)R_R8); }
 void vFpUUUp(x64emu_t *emu, uintptr_t fcn) { vFpUUUp_t fn = (vFpUUUp_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (void*)R_R8); }
 void vFpUppp(x64emu_t *emu, uintptr_t fcn) { vFpUppp_t fn = (vFpUppp_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void vFpfffi(x64emu_t *emu, uintptr_t fcn) { vFpfffi_t fn = (vFpfffi_t)fcn; fn((void*)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], (int32_t)R_RSI); }
 void vFpffff(x64emu_t *emu, uintptr_t fcn) { vFpffff_t fn = (vFpffff_t)fcn; fn((void*)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0]); }
 void vFpdiII(x64emu_t *emu, uintptr_t fcn) { vFpdiII_t fn = (vFpdiII_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], (int32_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
 void vFpddii(x64emu_t *emu, uintptr_t fcn) { vFpddii_t fn = (vFpddii_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (int32_t)R_RSI, (int32_t)R_RDX); }
@@ -3953,6 +4030,7 @@ void vFppidd(x64emu_t *emu, uintptr_t fcn) { vFppidd_t fn = (vFppidd_t)fcn; fn((
 void vFppipi(x64emu_t *emu, uintptr_t fcn) { vFppipi_t fn = (vFppipi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void vFppipp(x64emu_t *emu, uintptr_t fcn) { vFppipp_t fn = (vFppipp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFppWui(x64emu_t *emu, uintptr_t fcn) { vFppWui_t fn = (vFppWui_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint16_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8); }
+void vFppuii(x64emu_t *emu, uintptr_t fcn) { vFppuii_t fn = (vFppuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void vFppuui(x64emu_t *emu, uintptr_t fcn) { vFppuui_t fn = (vFppuui_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8); }
 void vFppuuu(x64emu_t *emu, uintptr_t fcn) { vFppuuu_t fn = (vFppuuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void vFppuup(x64emu_t *emu, uintptr_t fcn) { vFppuup_t fn = (vFppuup_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
@@ -4153,6 +4231,7 @@ void pFuiupp(x64emu_t *emu, uintptr_t fcn) { pFuiupp_t fn = (pFuiupp_t)fcn; R_RA
 void pFuuiip(x64emu_t *emu, uintptr_t fcn) { pFuuiip_t fn = (pFuuiip_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void pFuuupu(x64emu_t *emu, uintptr_t fcn) { pFuuupu_t fn = (pFuuupu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void pFuupuu(x64emu_t *emu, uintptr_t fcn) { pFuupuu_t fn = (pFuupuu_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
+void pFudddp(x64emu_t *emu, uintptr_t fcn) { pFudddp_t fn = (pFudddp_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], (void*)R_RSI); }
 void pFupLpl(x64emu_t *emu, uintptr_t fcn) { pFupLpl_t fn = (pFupLpl_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (intptr_t)R_R8); }
 void pFupLpL(x64emu_t *emu, uintptr_t fcn) { pFupLpL_t fn = (pFupLpL_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void pFLuppp(x64emu_t *emu, uintptr_t fcn) { pFLuppp_t fn = (pFLuppp_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -4181,6 +4260,7 @@ void pFpuuup(x64emu_t *emu, uintptr_t fcn) { pFpuuup_t fn = (pFpuuup_t)fcn; R_RA
 void pFpupii(x64emu_t *emu, uintptr_t fcn) { pFpupii_t fn = (pFpupii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void pFpuppp(x64emu_t *emu, uintptr_t fcn) { pFpuppp_t fn = (pFpuppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFpUdii(x64emu_t *emu, uintptr_t fcn) { pFpUdii_t fn = (pFpUdii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint64_t)R_RSI, emu->xmm[0].d[0], (int32_t)R_RDX, (int32_t)R_RCX); }
+void pFpfffi(x64emu_t *emu, uintptr_t fcn) { pFpfffi_t fn = (pFpfffi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], (int32_t)R_RSI); }
 void pFpdddd(x64emu_t *emu, uintptr_t fcn) { pFpdddd_t fn = (pFpdddd_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0]); }
 void pFplppp(x64emu_t *emu, uintptr_t fcn) { pFplppp_t fn = (pFplppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFpLpii(x64emu_t *emu, uintptr_t fcn) { pFpLpii_t fn = (pFpLpii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
@@ -4191,10 +4271,12 @@ void pFppipi(x64emu_t *emu, uintptr_t fcn) { pFppipi_t fn = (pFppipi_t)fcn; R_RA
 void pFppipp(x64emu_t *emu, uintptr_t fcn) { pFppipp_t fn = (pFppipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFppWpp(x64emu_t *emu, uintptr_t fcn) { pFppWpp_t fn = (pFppWpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint16_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFppuii(x64emu_t *emu, uintptr_t fcn) { pFppuii_t fn = (pFppuii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
+void pFppuip(x64emu_t *emu, uintptr_t fcn) { pFppuip_t fn = (pFppuip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void pFppuuu(x64emu_t *emu, uintptr_t fcn) { pFppuuu_t fn = (pFppuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void pFppuup(x64emu_t *emu, uintptr_t fcn) { pFppuup_t fn = (pFppuup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void pFppupp(x64emu_t *emu, uintptr_t fcn) { pFppupp_t fn = (pFppupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFppddi(x64emu_t *emu, uintptr_t fcn) { pFppddi_t fn = (pFppddi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], (int32_t)R_RDX); }
+void pFppddu(x64emu_t *emu, uintptr_t fcn) { pFppddu_t fn = (pFppddu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], (uint32_t)R_RDX); }
 void pFppLii(x64emu_t *emu, uintptr_t fcn) { pFppLii_t fn = (pFppLii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void pFppLLp(x64emu_t *emu, uintptr_t fcn) { pFppLLp_t fn = (pFppLLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
 void pFpppii(x64emu_t *emu, uintptr_t fcn) { pFpppii_t fn = (pFpppii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
@@ -4300,6 +4382,7 @@ void vFuppppu(x64emu_t *emu, uintptr_t fcn) { vFuppppu_t fn = (vFuppppu_t)fcn; f
 void vFuppppp(x64emu_t *emu, uintptr_t fcn) { vFuppppp_t fn = (vFuppppp_t)fcn; fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFffffff(x64emu_t *emu, uintptr_t fcn) { vFffffff_t fn = (vFffffff_t)fcn; fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0], emu->xmm[3].f[0], emu->xmm[4].f[0], emu->xmm[5].f[0]); }
 void vFdddddd(x64emu_t *emu, uintptr_t fcn) { vFdddddd_t fn = (vFdddddd_t)fcn; fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], emu->xmm[4].d[0], emu->xmm[5].d[0]); }
+void vFdddppp(x64emu_t *emu, uintptr_t fcn) { vFdddppp_t fn = (vFdddppp_t)fcn; fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], (void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void vFpiiiii(x64emu_t *emu, uintptr_t fcn) { vFpiiiii_t fn = (vFpiiiii_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void vFpiiipp(x64emu_t *emu, uintptr_t fcn) { vFpiiipp_t fn = (vFpiiipp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFpiiuuu(x64emu_t *emu, uintptr_t fcn) { vFpiiuuu_t fn = (vFpiiuuu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
@@ -4329,12 +4412,16 @@ void vFpddddp(x64emu_t *emu, uintptr_t fcn) { vFpddddp_t fn = (vFpddddp_t)fcn; f
 void vFppiiii(x64emu_t *emu, uintptr_t fcn) { vFppiiii_t fn = (vFppiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void vFppiiip(x64emu_t *emu, uintptr_t fcn) { vFppiiip_t fn = (vFppiiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9); }
 void vFppiiui(x64emu_t *emu, uintptr_t fcn) { vFppiiui_t fn = (vFppiiui_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9); }
+void vFppiiuu(x64emu_t *emu, uintptr_t fcn) { vFppiiuu_t fn = (vFppiiuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void vFppiipi(x64emu_t *emu, uintptr_t fcn) { vFppiipi_t fn = (vFppiipi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void vFppiipp(x64emu_t *emu, uintptr_t fcn) { vFppiipp_t fn = (vFppiipp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFppilpp(x64emu_t *emu, uintptr_t fcn) { vFppilpp_t fn = (vFppilpp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFppipLp(x64emu_t *emu, uintptr_t fcn) { vFppipLp_t fn = (vFppipLp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9); }
 void vFppippi(x64emu_t *emu, uintptr_t fcn) { vFppippi_t fn = (vFppippi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void vFppippp(x64emu_t *emu, uintptr_t fcn) { vFppippp_t fn = (vFppippp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
+void vFppuiii(x64emu_t *emu, uintptr_t fcn) { vFppuiii_t fn = (vFppuiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
+void vFppuiiu(x64emu_t *emu, uintptr_t fcn) { vFppuiiu_t fn = (vFppuiiu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9); }
+void vFppuiip(x64emu_t *emu, uintptr_t fcn) { vFppuiip_t fn = (vFppuiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9); }
 void vFppuuuu(x64emu_t *emu, uintptr_t fcn) { vFppuuuu_t fn = (vFppuuuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void vFppuUUU(x64emu_t *emu, uintptr_t fcn) { vFppuUUU_t fn = (vFppuUUU_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint64_t)R_R9); }
 void vFppupii(x64emu_t *emu, uintptr_t fcn) { vFppupii_t fn = (vFppupii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
@@ -4394,6 +4481,7 @@ void iFpiiiiu(x64emu_t *emu, uintptr_t fcn) { iFpiiiiu_t fn = (iFpiiiiu_t)fcn; R
 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 iFpiiuui(x64emu_t *emu, uintptr_t fcn) { iFpiiuui_t fn = (iFpiiuui_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (uint32_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); }
@@ -4461,6 +4549,7 @@ void uFEiuppp(x64emu_t *emu, uintptr_t fcn) { uFEiuppp_t fn = (uFEiuppp_t)fcn; R
 void uFEpCppp(x64emu_t *emu, uintptr_t fcn) { uFEpCppp_t fn = (uFEpCppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFEpuppp(x64emu_t *emu, uintptr_t fcn) { uFEpuppp_t fn = (uFEpuppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFupuufp(x64emu_t *emu, uintptr_t fcn) { uFupuufp_t fn = (uFupuufp_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, emu->xmm[0].f[0], (void*)R_R8); }
+void uFpiuppu(x64emu_t *emu, uintptr_t fcn) { uFpiuppu_t fn = (uFpiuppu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 void uFpippup(x64emu_t *emu, uintptr_t fcn) { uFpippup_t fn = (uFpippup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
 void uFpWuipp(x64emu_t *emu, uintptr_t fcn) { uFpWuipp_t fn = (uFpWuipp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFpWuuCp(x64emu_t *emu, uintptr_t fcn) { uFpWuuCp_t fn = (uFpWuuCp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint8_t)R_R8, (void*)R_R9); }
@@ -4613,12 +4702,12 @@ void vFpiiliip(x64emu_t *emu, uintptr_t fcn) { vFpiiliip_t fn = (vFpiiliip_t)fcn
 void vFpiipCpp(x64emu_t *emu, uintptr_t fcn) { vFpiipCpp_t fn = (vFpiipCpp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uint8_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 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)); }
 void vFpupuuup(x64emu_t *emu, uintptr_t fcn) { vFpupuuup_t fn = (vFpupuuup_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
+void vFpupppui(x64emu_t *emu, uintptr_t fcn) { vFpupppui_t fn = (vFpupppui_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void vFpUiUiup(x64emu_t *emu, uintptr_t fcn) { vFpUiUiup_t fn = (vFpUiUiup_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (int32_t)R_RDX, (uint64_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
 void vFpUUUUuu(x64emu_t *emu, uintptr_t fcn) { vFpUUUUuu_t fn = (vFpUUUUuu_t)fcn; fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void vFpddiidd(x64emu_t *emu, uintptr_t fcn) { vFpddiidd_t fn = (vFpddiidd_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (int32_t)R_RSI, (int32_t)R_RDX, emu->xmm[2].d[0], emu->xmm[3].d[0]); }
@@ -4636,6 +4725,8 @@ void vFppipiip(x64emu_t *emu, uintptr_t fcn) { vFppipiip_t fn = (vFppipiip_t)fcn
 void vFppipipp(x64emu_t *emu, uintptr_t fcn) { vFppipipp_t fn = (vFppipipp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFppipppp(x64emu_t *emu, uintptr_t fcn) { vFppipppp_t fn = (vFppipppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFppCuupp(x64emu_t *emu, uintptr_t fcn) { vFppCuupp_t fn = (vFppCuupp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint8_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void vFppuiiip(x64emu_t *emu, uintptr_t fcn) { vFppuiiip_t fn = (vFppuiiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
+void vFppuupii(x64emu_t *emu, uintptr_t fcn) { vFppuupii_t fn = (vFppuupii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void vFppddddi(x64emu_t *emu, uintptr_t fcn) { vFppddddi_t fn = (vFppddddi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], (int32_t)R_RDX); }
 void vFppddpii(x64emu_t *emu, uintptr_t fcn) { vFppddpii_t fn = (vFppddpii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void vFppLpppi(x64emu_t *emu, uintptr_t fcn) { vFppLpppi_t fn = (vFppLpppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
@@ -4643,13 +4734,15 @@ void vFppLpppp(x64emu_t *emu, uintptr_t fcn) { vFppLpppp_t fn = (vFppLpppp_t)fcn
 void vFpppiiii(x64emu_t *emu, uintptr_t fcn) { vFpppiiii_t fn = (vFpppiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void vFpppiipi(x64emu_t *emu, uintptr_t fcn) { vFpppiipi_t fn = (vFpppiipi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
 void vFpppiipp(x64emu_t *emu, uintptr_t fcn) { vFpppiipp_t fn = (vFpppiipp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void vFpppiupi(x64emu_t *emu, uintptr_t fcn) { vFpppiupi_t fn = (vFpppiupi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
 void vFpppippi(x64emu_t *emu, uintptr_t fcn) { vFpppippi_t fn = (vFpppippi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
 void vFpppuuuu(x64emu_t *emu, uintptr_t fcn) { vFpppuuuu_t fn = (vFpppuuuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void vFppppiii(x64emu_t *emu, uintptr_t fcn) { vFppppiii_t fn = (vFppppiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void vFppppiip(x64emu_t *emu, uintptr_t fcn) { vFppppiip_t fn = (vFppppiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
+void vFppppiui(x64emu_t *emu, uintptr_t fcn) { vFppppiui_t fn = (vFppppiui_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void vFppppipi(x64emu_t *emu, uintptr_t fcn) { vFppppipi_t fn = (vFppppipi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
 void vFpppppip(x64emu_t *emu, uintptr_t fcn) { vFpppppip_t fn = (vFpppppip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
-void vFppppppi(x64emu_t *emu, uintptr_t fcn) { vFppppppi_t fn = (vFppppppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
+void vFppppppu(x64emu_t *emu, uintptr_t fcn) { vFppppppu_t fn = (vFppppppu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void vFppppppp(x64emu_t *emu, uintptr_t fcn) { vFppppppp_t fn = (vFppppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFEpupppp(x64emu_t *emu, uintptr_t fcn) { iFEpupppp_t fn = (iFEpupppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void iFEpUuppp(x64emu_t *emu, uintptr_t fcn) { iFEpUuppp_t fn = (iFEpUuppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (uint64_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -4718,7 +4811,8 @@ void iFppppipp(x64emu_t *emu, uintptr_t fcn) { iFppppipp_t fn = (iFppppipp_t)fcn
 void iFppppdpi(x64emu_t *emu, uintptr_t fcn) { iFppppdpi_t fn = (iFppppdpi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, emu->xmm[0].d[0], (void*)R_R8, (int32_t)R_R9); }
 void iFpppppip(x64emu_t *emu, uintptr_t fcn) { iFpppppip_t fn = (iFpppppip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpppppup(x64emu_t *emu, uintptr_t fcn) { iFpppppup_t fn = (iFpppppup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
-void iFppppppi(x64emu_t *emu, uintptr_t fcn) { iFppppppi_t fn = (iFppppppi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
+void iFpppppLp(x64emu_t *emu, uintptr_t fcn) { iFpppppLp_t fn = (iFpppppLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8)); }
+void iFppppppu(x64emu_t *emu, uintptr_t fcn) { iFppppppu_t fn = (iFppppppu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void iFppppppp(x64emu_t *emu, uintptr_t fcn) { iFppppppp_t fn = (iFppppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFEiipppp(x64emu_t *emu, uintptr_t fcn) { uFEiipppp_t fn = (uFEiipppp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFEpiippp(x64emu_t *emu, uintptr_t fcn) { uFEpiippp_t fn = (uFEpiippp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -4763,6 +4857,7 @@ void pFppiiCCC(x64emu_t *emu, uintptr_t fcn) { pFppiiCCC_t fn = (pFppiiCCC_t)fcn
 void pFppipipp(x64emu_t *emu, uintptr_t fcn) { pFppipipp_t fn = (pFppipipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFppipLpp(x64emu_t *emu, uintptr_t fcn) { pFppipLpp_t fn = (pFppipLpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFppuippp(x64emu_t *emu, uintptr_t fcn) { pFppuippp_t fn = (pFppuippp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void pFppuuupp(x64emu_t *emu, uintptr_t fcn) { pFppuuupp_t fn = (pFppuuupp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFppuuppp(x64emu_t *emu, uintptr_t fcn) { pFppuuppp_t fn = (pFppuuppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFppliuip(x64emu_t *emu, uintptr_t fcn) { pFppliuip_t fn = (pFppliuip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
 void pFpplipup(x64emu_t *emu, uintptr_t fcn) { pFpplipup_t fn = (pFpplipup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
@@ -4780,7 +4875,7 @@ void pFpppllli(x64emu_t *emu, uintptr_t fcn) { pFpppllli_t fn = (pFpppllli_t)fcn
 void pFpppLLLi(x64emu_t *emu, uintptr_t fcn) { pFpppLLLi_t fn = (pFpppLLLi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9, *(int32_t*)(R_RSP + 8)); }
 void pFppppuuu(x64emu_t *emu, uintptr_t fcn) { pFppppuuu_t fn = (pFppppuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void pFpppppuu(x64emu_t *emu, uintptr_t fcn) { pFpppppuu_t fn = (pFpppppuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
-void pFppppppi(x64emu_t *emu, uintptr_t fcn) { pFppppppi_t fn = (pFppppppi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
+void pFppppppu(x64emu_t *emu, uintptr_t fcn) { pFppppppu_t fn = (pFppppppu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8)); }
 void pFppppppp(x64emu_t *emu, uintptr_t fcn) { pFppppppp_t fn = (pFppppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iWpiiuuuu(x64emu_t *emu, uintptr_t fcn) { iWpiiuuuu_t fn = (iWpiiuuuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (int32_t)R_RDX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48), *(uint32_t*)(R_RSP + 56)); }
 void iWpuiiiip(x64emu_t *emu, uintptr_t fcn) { iWpuiiiip_t fn = (iWpuiiiip_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (uint32_t)R_RDX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(void**)(R_RSP + 56)); }
@@ -4839,6 +4934,7 @@ void vFppipipiu(x64emu_t *emu, uintptr_t fcn) { vFppipipiu_t fn = (vFppipipiu_t)
 void vFppipppui(x64emu_t *emu, uintptr_t fcn) { vFppipppui_t fn = (vFppipppui_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void vFppippppi(x64emu_t *emu, uintptr_t fcn) { vFppippppi_t fn = (vFppippppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void vFppippppp(x64emu_t *emu, uintptr_t fcn) { vFppippppp_t fn = (vFppippppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void vFppuuiiii(x64emu_t *emu, uintptr_t fcn) { vFppuuiiii_t fn = (vFppuuiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void vFpplppppi(x64emu_t *emu, uintptr_t fcn) { vFpplppppi_t fn = (vFpplppppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void vFpplppppp(x64emu_t *emu, uintptr_t fcn) { vFpplppppp_t fn = (vFpplppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFpppipppu(x64emu_t *emu, uintptr_t fcn) { vFpppipppu_t fn = (vFpppipppu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
@@ -4872,6 +4968,7 @@ void iFpLpipppp(x64emu_t *emu, uintptr_t fcn) { iFpLpipppp_t fn = (iFpLpipppp_t)
 void iFppiiiiiu(x64emu_t *emu, uintptr_t fcn) { iFppiiiiiu_t fn = (iFppiiiiiu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFppiiipip(x64emu_t *emu, uintptr_t fcn) { iFppiiipip_t fn = (iFppiiipip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFppIIIppp(x64emu_t *emu, uintptr_t fcn) { iFppIIIppp_t fn = (iFppIIIppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void iFppuiiuuu(x64emu_t *emu, uintptr_t fcn) { iFppuiiuuu_t fn = (iFppuiiuuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFppuuuuuu(x64emu_t *emu, uintptr_t fcn) { iFppuuuuuu_t fn = (iFppuuuuuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFppuppppp(x64emu_t *emu, uintptr_t fcn) { iFppuppppp_t fn = (iFppuppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpppiiipi(x64emu_t *emu, uintptr_t fcn) { iFpppiiipi_t fn = (iFpppiiipi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
@@ -4966,12 +5063,18 @@ void vFpipiuiipp(x64emu_t *emu, uintptr_t fcn) { vFpipiuiipp_t fn = (vFpipiuiipp
 void vFpipppiipi(x64emu_t *emu, uintptr_t fcn) { vFpipppiipi_t fn = (vFpipppiipi_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**)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void vFppiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiiii_t fn = (vFppiiiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void vFppiiiiipi(x64emu_t *emu, uintptr_t fcn) { vFppiiiiipi_t fn = (vFppiiiiipi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
+void vFppiiiiupi(x64emu_t *emu, uintptr_t fcn) { vFppiiiiupi_t fn = (vFppiiiiupi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void vFppiiipiii(x64emu_t *emu, uintptr_t fcn) { vFppiiipiii_t fn = (vFppiiipiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void vFppiipiiii(x64emu_t *emu, uintptr_t fcn) { vFppiipiiii_t fn = (vFppiipiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
+void vFppiupiiii(x64emu_t *emu, uintptr_t fcn) { vFppiupiiii_t fn = (vFppiupiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void vFppippDpDC(x64emu_t *emu, uintptr_t fcn) { vFppippDpDC_t fn = (vFppippDpDC_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, LD2localLD((void*)(R_RSP + 8)), (void*)R_R9, LD2localLD((void*)(R_RSP + 24)), *(uint8_t*)(R_RSP + 40)); }
 void vFppipppiii(x64emu_t *emu, uintptr_t fcn) { vFppipppiii_t fn = (vFppipppiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
 void vFppipppiip(x64emu_t *emu, uintptr_t fcn) { vFppipppiip_t fn = (vFppipppiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void vFppuuiiiii(x64emu_t *emu, uintptr_t fcn) { vFppuuiiiii_t fn = (vFppuuiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
+void vFppuuiiiiu(x64emu_t *emu, uintptr_t fcn) { vFppuuiiiiu_t fn = (vFppuuiiiiu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24)); }
+void vFppupppiii(x64emu_t *emu, uintptr_t fcn) { vFppupppiii_t fn = (vFppupppiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
+void vFppupppiiu(x64emu_t *emu, uintptr_t fcn) { vFppupppiiu_t fn = (vFppupppiiu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24)); }
+void vFppupppiip(x64emu_t *emu, uintptr_t fcn) { vFppupppiip_t fn = (vFppupppiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void vFppUUiUUUU(x64emu_t *emu, uintptr_t fcn) { vFppUUiUUUU_t fn = (vFppUUiUUUU_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX, (int32_t)R_R8, (uint64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16), *(uint64_t*)(R_RSP + 24)); }
 void vFppddddidd(x64emu_t *emu, uintptr_t fcn) { vFppddddidd_t fn = (vFppddddidd_t)fcn; fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], (int32_t)R_RDX, emu->xmm[4].d[0], emu->xmm[5].d[0]); }
 void vFpplpppppi(x64emu_t *emu, uintptr_t fcn) { vFpplpppppi_t fn = (vFpplpppppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
@@ -5059,10 +5162,16 @@ void vFpiuippppip(x64emu_t *emu, uintptr_t fcn) { vFpiuippppip_t fn = (vFpiuippp
 void vFpuupuuuuuu(x64emu_t *emu, uintptr_t fcn) { vFpuupuuuuuu_t fn = (vFpuupuuuuuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32)); }
 void vFppiiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiiiii_t fn = (vFppiiiiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
 void vFppiiiiipip(x64emu_t *emu, uintptr_t fcn) { vFppiiiiipip_t fn = (vFppiiiiipip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
+void vFppiiiiupip(x64emu_t *emu, uintptr_t fcn) { vFppiiiiupip_t fn = (vFppiiiiupip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void vFppiipppiip(x64emu_t *emu, uintptr_t fcn) { vFppiipppiip_t fn = (vFppiipppiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void vFppiippppii(x64emu_t *emu, uintptr_t fcn) { vFppiippppii_t fn = (vFppiippppii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
 void vFppipppiiii(x64emu_t *emu, uintptr_t fcn) { vFppipppiiii_t fn = (vFppipppiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
+void vFppuipppiip(x64emu_t *emu, uintptr_t fcn) { vFppuipppiip_t fn = (vFppuipppiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
+void vFppuuuiiiii(x64emu_t *emu, uintptr_t fcn) { vFppuuuiiiii_t fn = (vFppuuuiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
 void vFppuuuuiiuu(x64emu_t *emu, uintptr_t fcn) { vFppuuuuiiuu_t fn = (vFppuuuuiiuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32)); }
+void vFppuuuuuuuu(x64emu_t *emu, uintptr_t fcn) { vFppuuuuuuuu_t fn = (vFppuuuuuuuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32)); }
+void vFppuuppppii(x64emu_t *emu, uintptr_t fcn) { vFppuuppppii_t fn = (vFppuuppppii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
+void vFppupppiiii(x64emu_t *emu, uintptr_t fcn) { vFppupppiiii_t fn = (vFppupppiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
 void vFppdddddddd(x64emu_t *emu, uintptr_t fcn) { vFppdddddddd_t fn = (vFppdddddddd_t)fcn; fn((void*)R_RDI, (void*)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], emu->xmm[4].d[0], emu->xmm[5].d[0], emu->xmm[6].d[0], emu->xmm[7].d[0]); }
 void vFpppppppppp(x64emu_t *emu, uintptr_t fcn) { vFpppppppppp_t fn = (vFpppppppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void iFEpiiiiippp(x64emu_t *emu, uintptr_t fcn) { iFEpiiiiippp_t fn = (iFEpiiiiippp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
@@ -5116,11 +5225,15 @@ void vFpipppiiiipi(x64emu_t *emu, uintptr_t fcn) { vFpipppiiiipi_t fn = (vFpippp
 void vFpupiiupupup(x64emu_t *emu, uintptr_t fcn) { vFpupiiupupup_t fn = (vFpupiiupupup_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(uint32_t*)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void vFppiiiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiiiiii_t fn = (vFppiiiiiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); }
 void vFppiiiiipiii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiipiii_t fn = (vFppiiiiipiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); }
+void vFppiiiiupiii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiupiii_t fn = (vFppiiiiupiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); }
 void vFppiiiiddddi(x64emu_t *emu, uintptr_t fcn) { vFppiiiiddddi_t fn = (vFppiiiiddddi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], *(int32_t*)(R_RSP + 8)); }
 void vFppiipppiiii(x64emu_t *emu, uintptr_t fcn) { vFppiipppiiii_t fn = (vFppiipppiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); }
 void vFppipppiiiii(x64emu_t *emu, uintptr_t fcn) { vFppipppiiiii_t fn = (vFppipppiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); }
 void vFppipppuiiii(x64emu_t *emu, uintptr_t fcn) { vFppipppuiiii_t fn = (vFppipppuiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); }
+void vFppuuiiiiuii(x64emu_t *emu, uintptr_t fcn) { vFppuuiiiiuii_t fn = (vFppuuiiiiuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); }
+void vFppuupppiiii(x64emu_t *emu, uintptr_t fcn) { vFppuupppiiii_t fn = (vFppuupppiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); }
 void vFppupipiuuuu(x64emu_t *emu, uintptr_t fcn) { vFppupipiuuuu_t fn = (vFppupipiuuuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40)); }
+void vFppupppuiiii(x64emu_t *emu, uintptr_t fcn) { vFppupppuiiii_t fn = (vFppupppuiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); }
 void vFppppppppppp(x64emu_t *emu, uintptr_t fcn) { vFppppppppppp_t fn = (vFppppppppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void iFEpppipppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppipppppp_t fn = (iFEpppipppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void iFEppppiiiiuu(x64emu_t *emu, uintptr_t fcn) { iFEppppiiiiuu_t fn = (iFEppppiiiiuu_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32)); }
@@ -5156,7 +5269,9 @@ void vFpippppiiiipi(x64emu_t *emu, uintptr_t fcn) { vFpippppiiiipi_t fn = (vFpip
 void vFppiiiiddddii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiddddii_t fn = (vFppiiiiddddii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
 void vFppiiuuuiupup(x64emu_t *emu, uintptr_t fcn) { vFppiiuuuiupup_t fn = (vFppiiuuuiupup_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(void**)(R_RSP + 48)); }
 void vFppiipppiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiipppiiiii_t fn = (vFppiipppiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48)); }
+void vFppuupppiiiiu(x64emu_t *emu, uintptr_t fcn) { vFppuupppiiiiu_t fn = (vFppuupppiiiiu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48)); }
 void vFpppiiiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFpppiiiiiiiii_t fn = (vFpppiiiiiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48)); }
+void vFpppiiiiiiuii(x64emu_t *emu, uintptr_t fcn) { vFpppiiiiiiuii_t fn = (vFpppiiiiiiuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48)); }
 void vFpppppppppppp(x64emu_t *emu, uintptr_t fcn) { vFpppppppppppp_t fn = (vFpppppppppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); }
 void iFEpppippppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppippppppp_t fn = (iFEpppippppppp_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void iFEppppiiiiuui(x64emu_t *emu, uintptr_t fcn) { iFEppppiiiiuui_t fn = (iFEppppiiiiuui_t)fcn; R_RAX=(int32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40)); }
@@ -5181,7 +5296,9 @@ void vFpipppiiiiiiuu(x64emu_t *emu, uintptr_t fcn) { vFpipppiiiiiiuu_t fn = (vFp
 void vFpippppppppppp(x64emu_t *emu, uintptr_t fcn) { vFpippppppppppp_t fn = (vFpippppppppppp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void vFpuppppppppppp(x64emu_t *emu, uintptr_t fcn) { vFpuppppppppppp_t fn = (vFpuppppppppppp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void vFppiiiiiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiiiiiiii_t fn = (vFppiiiiiiiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56)); }
+void vFppiiiiiiuiuii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiiiuiuii_t fn = (vFppiiiiiiuiuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56)); }
 void vFppiipppiiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiipppiiiiii_t fn = (vFppiipppiiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56)); }
+void vFppuupppuiiiii(x64emu_t *emu, uintptr_t fcn) { vFppuupppuiiiii_t fn = (vFppuupppuiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56)); }
 void vFppppppppppppp(x64emu_t *emu, uintptr_t fcn) { vFppppppppppppp_t fn = (vFppppppppppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void iFddddpppddpppp(x64emu_t *emu, uintptr_t fcn) { iFddddpppddpppp_t fn = (iFddddpppddpppp_t)fcn; R_RAX=(int32_t)fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, emu->xmm[4].d[0], emu->xmm[5].d[0], (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFpippuuuiipppp(x64emu_t *emu, uintptr_t fcn) { iFpippuuuiipppp_t fn = (iFpippuuuiipppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
@@ -5196,6 +5313,7 @@ void vFippppppppppppp(x64emu_t *emu, uintptr_t fcn) { vFippppppppppppp_t fn = (v
 void vFuffiiffiiffiip(x64emu_t *emu, uintptr_t fcn) { vFuffiiffiiffiip_t fn = (vFuffiiffiiffiip_t)fcn; fn((uint32_t)R_RDI, emu->xmm[0].f[0], emu->xmm[1].f[0], (int32_t)R_RSI, (int32_t)R_RDX, emu->xmm[2].f[0], emu->xmm[3].f[0], (int32_t)R_RCX, (int32_t)R_R8, emu->xmm[4].f[0], emu->xmm[5].f[0], (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFuddiiddiiddiip(x64emu_t *emu, uintptr_t fcn) { vFuddiiddiiddiip_t fn = (vFuddiiddiiddiip_t)fcn; fn((uint32_t)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (int32_t)R_RSI, (int32_t)R_RDX, emu->xmm[2].d[0], emu->xmm[3].d[0], (int32_t)R_RCX, (int32_t)R_R8, emu->xmm[4].d[0], emu->xmm[5].d[0], (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFppiipppiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiipppiiiiiii_t fn = (vFppiipppiiiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56), *(int32_t*)(R_RSP + 64)); }
+void vFppuupppiiiiuii(x64emu_t *emu, uintptr_t fcn) { vFppuupppiiiiuii_t fn = (vFppuupppiiiiuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32), *(int32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48), *(int32_t*)(R_RSP + 56), *(int32_t*)(R_RSP + 64)); }
 void iFpipppppppppppp(x64emu_t *emu, uintptr_t fcn) { iFpipppppppppppp_t fn = (iFpipppppppppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56), *(void**)(R_RSP + 64)); }
 void iFpppwwWWwwWWpuu(x64emu_t *emu, uintptr_t fcn) { iFpppwwWWwwWWpuu_t fn = (iFpppwwWWwwWWpuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int16_t)R_RCX, (int16_t)R_R8, (uint16_t)R_R9, *(uint16_t*)(R_RSP + 8), *(int16_t*)(R_RSP + 16), *(int16_t*)(R_RSP + 24), *(uint16_t*)(R_RSP + 32), *(uint16_t*)(R_RSP + 40), *(void**)(R_RSP + 48), *(uint32_t*)(R_RSP + 56), *(uint32_t*)(R_RSP + 64)); }
 void pFppCpppwwwwwwWW(x64emu_t *emu, uintptr_t fcn) { pFppCpppwwwwwwWW_t fn = (pFppCpppwwwwwwWW_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint8_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int16_t*)(R_RSP + 8), *(int16_t*)(R_RSP + 16), *(int16_t*)(R_RSP + 24), *(int16_t*)(R_RSP + 32), *(int16_t*)(R_RSP + 40), *(int16_t*)(R_RSP + 48), *(uint16_t*)(R_RSP + 56), *(uint16_t*)(R_RSP + 64)); }
@@ -5598,6 +5716,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpuW) return 1;
 	if (fun == &vFpuu) return 1;
 	if (fun == &vFpuU) return 1;
+	if (fun == &vFpuf) return 2;
 	if (fun == &vFpud) return 2;
 	if (fun == &vFpuL) return 1;
 	if (fun == &vFpup) return 1;
@@ -5607,6 +5726,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpUf) return 2;
 	if (fun == &vFpUp) return 1;
 	if (fun == &vFpff) return 3;
+	if (fun == &vFpdu) return 2;
 	if (fun == &vFpdd) return 3;
 	if (fun == &vFpll) return 1;
 	if (fun == &vFplp) return 1;
@@ -5712,6 +5832,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFupu) return 1;
 	if (fun == &uFupp) return 1;
 	if (fun == &uFpii) return 1;
+	if (fun == &uFpiu) return 1;
 	if (fun == &uFpip) return 1;
 	if (fun == &uFpCi) return 1;
 	if (fun == &uFpWi) return 1;
@@ -5742,6 +5863,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &dFddp) return -3;
 	if (fun == &dFpdd) return -3;
 	if (fun == &dFppi) return -1;
+	if (fun == &dFppu) return -1;
+	if (fun == &dFppd) return -2;
 	if (fun == &dFppp) return -1;
 	if (fun == &lFili) return 1;
 	if (fun == &lFilL) return 1;
@@ -5929,7 +6052,9 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpuui) return 1;
 	if (fun == &vFpuuu) return 1;
 	if (fun == &vFpuup) return 1;
+	if (fun == &vFpufi) return 2;
 	if (fun == &vFpudd) return 3;
+	if (fun == &vFpupu) return 1;
 	if (fun == &vFpupp) return 1;
 	if (fun == &vFpUui) return 1;
 	if (fun == &vFpUuu) return 1;
@@ -5940,13 +6065,16 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpUpp) return 1;
 	if (fun == &vFpfff) return 4;
 	if (fun == &vFpdii) return 2;
-	if (fun == &vFpdip) return 2;
+	if (fun == &vFpdup) return 2;
 	if (fun == &vFpddi) return 3;
+	if (fun == &vFpddu) return 3;
 	if (fun == &vFpddd) return 4;
 	if (fun == &vFplll) return 1;
 	if (fun == &vFplpp) return 1;
 	if (fun == &vFpLii) return 1;
+	if (fun == &vFpLuu) return 1;
 	if (fun == &vFpLLL) return 1;
+	if (fun == &vFpLpp) return 1;
 	if (fun == &vFppii) return 1;
 	if (fun == &vFppiu) return 1;
 	if (fun == &vFppid) return 2;
@@ -6103,9 +6231,12 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpuip) return 1;
 	if (fun == &uFpuuu) return 1;
 	if (fun == &uFpuup) return 1;
+	if (fun == &uFpupi) return 1;
 	if (fun == &uFpupu) return 1;
+	if (fun == &uFpupp) return 1;
 	if (fun == &uFppiu) return 1;
 	if (fun == &uFppip) return 1;
+	if (fun == &uFpplp) return 1;
 	if (fun == &uFppLp) return 1;
 	if (fun == &uFpppi) return 1;
 	if (fun == &uFpppu) return 1;
@@ -6167,6 +6298,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFuuip) return 1;
 	if (fun == &pFuuuu) return 1;
 	if (fun == &pFullu) return 1;
+	if (fun == &pFupii) return 1;
 	if (fun == &pFuppp) return 1;
 	if (fun == &pFffff) return 5;
 	if (fun == &pFdipp) return 2;
@@ -6314,6 +6446,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFupupp) return 1;
 	if (fun == &vFuplii) return 1;
 	if (fun == &vFuppip) return 1;
+	if (fun == &vFupppu) return 1;
 	if (fun == &vFupppp) return 1;
 	if (fun == &vFUUppp) return 1;
 	if (fun == &vFfffff) return 6;
@@ -6331,6 +6464,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpiipp) return 1;
 	if (fun == &vFpiIiI) return 1;
 	if (fun == &vFpiIII) return 1;
+	if (fun == &vFpiuuu) return 1;
 	if (fun == &vFpiUUp) return 1;
 	if (fun == &vFpilpp) return 1;
 	if (fun == &vFpipii) return 1;
@@ -6342,6 +6476,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpuupp) return 1;
 	if (fun == &vFpuUUu) return 1;
 	if (fun == &vFpuddd) return 4;
+	if (fun == &vFpupiu) return 1;
 	if (fun == &vFpupup) return 1;
 	if (fun == &vFpUuiu) return 1;
 	if (fun == &vFpUUuu) return 1;
@@ -6349,6 +6484,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpUUUu) return 1;
 	if (fun == &vFpUUUp) return 1;
 	if (fun == &vFpUppp) return 1;
+	if (fun == &vFpfffi) return 4;
 	if (fun == &vFpffff) return 5;
 	if (fun == &vFpdiII) return 2;
 	if (fun == &vFpddii) return 3;
@@ -6367,6 +6503,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFppipi) return 1;
 	if (fun == &vFppipp) return 1;
 	if (fun == &vFppWui) return 1;
+	if (fun == &vFppuii) return 1;
 	if (fun == &vFppuui) return 1;
 	if (fun == &vFppuuu) return 1;
 	if (fun == &vFppuup) return 1;
@@ -6524,6 +6661,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFuuiip) return 1;
 	if (fun == &pFuuupu) return 1;
 	if (fun == &pFuupuu) return 1;
+	if (fun == &pFudddp) return 4;
 	if (fun == &pFupLpl) return 1;
 	if (fun == &pFupLpL) return 1;
 	if (fun == &pFLuppp) return 1;
@@ -6552,6 +6690,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpupii) return 1;
 	if (fun == &pFpuppp) return 1;
 	if (fun == &pFpUdii) return 2;
+	if (fun == &pFpfffi) return 4;
 	if (fun == &pFpdddd) return 5;
 	if (fun == &pFplppp) return 1;
 	if (fun == &pFpLpii) return 1;
@@ -6562,10 +6701,12 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFppipp) return 1;
 	if (fun == &pFppWpp) return 1;
 	if (fun == &pFppuii) return 1;
+	if (fun == &pFppuip) return 1;
 	if (fun == &pFppuuu) return 1;
 	if (fun == &pFppuup) return 1;
 	if (fun == &pFppupp) return 1;
 	if (fun == &pFppddi) return 3;
+	if (fun == &pFppddu) return 3;
 	if (fun == &pFppLii) return 1;
 	if (fun == &pFppLLp) return 1;
 	if (fun == &pFpppii) return 1;
@@ -6645,6 +6786,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFuppppp) return 1;
 	if (fun == &vFffffff) return 7;
 	if (fun == &vFdddddd) return 7;
+	if (fun == &vFdddppp) return 4;
 	if (fun == &vFpiiiii) return 1;
 	if (fun == &vFpiiipp) return 1;
 	if (fun == &vFpiiuuu) return 1;
@@ -6673,12 +6815,16 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFppiiii) return 1;
 	if (fun == &vFppiiip) return 1;
 	if (fun == &vFppiiui) return 1;
+	if (fun == &vFppiiuu) return 1;
 	if (fun == &vFppiipi) return 1;
 	if (fun == &vFppiipp) return 1;
 	if (fun == &vFppilpp) return 1;
 	if (fun == &vFppipLp) return 1;
 	if (fun == &vFppippi) return 1;
 	if (fun == &vFppippp) return 1;
+	if (fun == &vFppuiii) return 1;
+	if (fun == &vFppuiiu) return 1;
+	if (fun == &vFppuiip) return 1;
 	if (fun == &vFppuuuu) return 1;
 	if (fun == &vFppuUUU) return 1;
 	if (fun == &vFppupii) return 1;
@@ -6724,6 +6870,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpiiiip) return 1;
 	if (fun == &iFpiiipp) return 1;
 	if (fun == &iFpiiuii) return 1;
+	if (fun == &iFpiiuui) return 1;
 	if (fun == &iFpiipip) return 1;
 	if (fun == &iFpiippu) return 1;
 	if (fun == &iFpiippp) return 1;
@@ -6787,6 +6934,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpppppL) return 1;
 	if (fun == &iFpppppp) return 1;
 	if (fun == &uFupuufp) return 2;
+	if (fun == &uFpiuppu) return 1;
 	if (fun == &uFpippup) return 1;
 	if (fun == &uFpWuipp) return 1;
 	if (fun == &uFpWuuCp) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index d15408f5..a18be2cb 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -425,6 +425,7 @@ void vFpuI(x64emu_t *emu, uintptr_t fnc);
 void vFpuW(x64emu_t *emu, uintptr_t fnc);
 void vFpuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuU(x64emu_t *emu, uintptr_t fnc);
+void vFpuf(x64emu_t *emu, uintptr_t fnc);
 void vFpud(x64emu_t *emu, uintptr_t fnc);
 void vFpuL(x64emu_t *emu, uintptr_t fnc);
 void vFpup(x64emu_t *emu, uintptr_t fnc);
@@ -434,6 +435,7 @@ void vFpUU(x64emu_t *emu, uintptr_t fnc);
 void vFpUf(x64emu_t *emu, uintptr_t fnc);
 void vFpUp(x64emu_t *emu, uintptr_t fnc);
 void vFpff(x64emu_t *emu, uintptr_t fnc);
+void vFpdu(x64emu_t *emu, uintptr_t fnc);
 void vFpdd(x64emu_t *emu, uintptr_t fnc);
 void vFpll(x64emu_t *emu, uintptr_t fnc);
 void vFplp(x64emu_t *emu, uintptr_t fnc);
@@ -563,6 +565,7 @@ void uFufp(x64emu_t *emu, uintptr_t fnc);
 void uFupu(x64emu_t *emu, uintptr_t fnc);
 void uFupp(x64emu_t *emu, uintptr_t fnc);
 void uFpii(x64emu_t *emu, uintptr_t fnc);
+void uFpiu(x64emu_t *emu, uintptr_t fnc);
 void uFpip(x64emu_t *emu, uintptr_t fnc);
 void uFpCi(x64emu_t *emu, uintptr_t fnc);
 void uFpWi(x64emu_t *emu, uintptr_t fnc);
@@ -593,6 +596,8 @@ void dFddd(x64emu_t *emu, uintptr_t fnc);
 void dFddp(x64emu_t *emu, uintptr_t fnc);
 void dFpdd(x64emu_t *emu, uintptr_t fnc);
 void dFppi(x64emu_t *emu, uintptr_t fnc);
+void dFppu(x64emu_t *emu, uintptr_t fnc);
+void dFppd(x64emu_t *emu, uintptr_t fnc);
 void dFppp(x64emu_t *emu, uintptr_t fnc);
 void DFppi(x64emu_t *emu, uintptr_t fnc);
 void DFppp(x64emu_t *emu, uintptr_t fnc);
@@ -823,7 +828,9 @@ void vFpuip(x64emu_t *emu, uintptr_t fnc);
 void vFpuui(x64emu_t *emu, uintptr_t fnc);
 void vFpuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuup(x64emu_t *emu, uintptr_t fnc);
+void vFpufi(x64emu_t *emu, uintptr_t fnc);
 void vFpudd(x64emu_t *emu, uintptr_t fnc);
+void vFpupu(x64emu_t *emu, uintptr_t fnc);
 void vFpupp(x64emu_t *emu, uintptr_t fnc);
 void vFpUui(x64emu_t *emu, uintptr_t fnc);
 void vFpUuu(x64emu_t *emu, uintptr_t fnc);
@@ -834,13 +841,16 @@ void vFpUUp(x64emu_t *emu, uintptr_t fnc);
 void vFpUpp(x64emu_t *emu, uintptr_t fnc);
 void vFpfff(x64emu_t *emu, uintptr_t fnc);
 void vFpdii(x64emu_t *emu, uintptr_t fnc);
-void vFpdip(x64emu_t *emu, uintptr_t fnc);
+void vFpdup(x64emu_t *emu, uintptr_t fnc);
 void vFpddi(x64emu_t *emu, uintptr_t fnc);
+void vFpddu(x64emu_t *emu, uintptr_t fnc);
 void vFpddd(x64emu_t *emu, uintptr_t fnc);
 void vFplll(x64emu_t *emu, uintptr_t fnc);
 void vFplpp(x64emu_t *emu, uintptr_t fnc);
 void vFpLii(x64emu_t *emu, uintptr_t fnc);
+void vFpLuu(x64emu_t *emu, uintptr_t fnc);
 void vFpLLL(x64emu_t *emu, uintptr_t fnc);
+void vFpLpp(x64emu_t *emu, uintptr_t fnc);
 void vFppii(x64emu_t *emu, uintptr_t fnc);
 void vFppiu(x64emu_t *emu, uintptr_t fnc);
 void vFppid(x64emu_t *emu, uintptr_t fnc);
@@ -1031,9 +1041,12 @@ void uFpCCC(x64emu_t *emu, uintptr_t fnc);
 void uFpuip(x64emu_t *emu, uintptr_t fnc);
 void uFpuuu(x64emu_t *emu, uintptr_t fnc);
 void uFpuup(x64emu_t *emu, uintptr_t fnc);
+void uFpupi(x64emu_t *emu, uintptr_t fnc);
 void uFpupu(x64emu_t *emu, uintptr_t fnc);
+void uFpupp(x64emu_t *emu, uintptr_t fnc);
 void uFppiu(x64emu_t *emu, uintptr_t fnc);
 void uFppip(x64emu_t *emu, uintptr_t fnc);
+void uFpplp(x64emu_t *emu, uintptr_t fnc);
 void uFppLp(x64emu_t *emu, uintptr_t fnc);
 void uFpppi(x64emu_t *emu, uintptr_t fnc);
 void uFpppu(x64emu_t *emu, uintptr_t fnc);
@@ -1110,6 +1123,7 @@ void pFuuii(x64emu_t *emu, uintptr_t fnc);
 void pFuuip(x64emu_t *emu, uintptr_t fnc);
 void pFuuuu(x64emu_t *emu, uintptr_t fnc);
 void pFullu(x64emu_t *emu, uintptr_t fnc);
+void pFupii(x64emu_t *emu, uintptr_t fnc);
 void pFuppp(x64emu_t *emu, uintptr_t fnc);
 void pFffff(x64emu_t *emu, uintptr_t fnc);
 void pFdipp(x64emu_t *emu, uintptr_t fnc);
@@ -1290,6 +1304,7 @@ void vFupupi(x64emu_t *emu, uintptr_t fnc);
 void vFupupp(x64emu_t *emu, uintptr_t fnc);
 void vFuplii(x64emu_t *emu, uintptr_t fnc);
 void vFuppip(x64emu_t *emu, uintptr_t fnc);
+void vFupppu(x64emu_t *emu, uintptr_t fnc);
 void vFupppp(x64emu_t *emu, uintptr_t fnc);
 void vFUUppp(x64emu_t *emu, uintptr_t fnc);
 void vFfffff(x64emu_t *emu, uintptr_t fnc);
@@ -1307,6 +1322,7 @@ void vFpiiff(x64emu_t *emu, uintptr_t fnc);
 void vFpiipp(x64emu_t *emu, uintptr_t fnc);
 void vFpiIiI(x64emu_t *emu, uintptr_t fnc);
 void vFpiIII(x64emu_t *emu, uintptr_t fnc);
+void vFpiuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpiUUp(x64emu_t *emu, uintptr_t fnc);
 void vFpilpp(x64emu_t *emu, uintptr_t fnc);
 void vFpipii(x64emu_t *emu, uintptr_t fnc);
@@ -1318,6 +1334,7 @@ void vFpuuup(x64emu_t *emu, uintptr_t fnc);
 void vFpuupp(x64emu_t *emu, uintptr_t fnc);
 void vFpuUUu(x64emu_t *emu, uintptr_t fnc);
 void vFpuddd(x64emu_t *emu, uintptr_t fnc);
+void vFpupiu(x64emu_t *emu, uintptr_t fnc);
 void vFpupup(x64emu_t *emu, uintptr_t fnc);
 void vFpUuiu(x64emu_t *emu, uintptr_t fnc);
 void vFpUUuu(x64emu_t *emu, uintptr_t fnc);
@@ -1325,6 +1342,7 @@ void vFpUUup(x64emu_t *emu, uintptr_t fnc);
 void vFpUUUu(x64emu_t *emu, uintptr_t fnc);
 void vFpUUUp(x64emu_t *emu, uintptr_t fnc);
 void vFpUppp(x64emu_t *emu, uintptr_t fnc);
+void vFpfffi(x64emu_t *emu, uintptr_t fnc);
 void vFpffff(x64emu_t *emu, uintptr_t fnc);
 void vFpdiII(x64emu_t *emu, uintptr_t fnc);
 void vFpddii(x64emu_t *emu, uintptr_t fnc);
@@ -1343,6 +1361,7 @@ void vFppidd(x64emu_t *emu, uintptr_t fnc);
 void vFppipi(x64emu_t *emu, uintptr_t fnc);
 void vFppipp(x64emu_t *emu, uintptr_t fnc);
 void vFppWui(x64emu_t *emu, uintptr_t fnc);
+void vFppuii(x64emu_t *emu, uintptr_t fnc);
 void vFppuui(x64emu_t *emu, uintptr_t fnc);
 void vFppuuu(x64emu_t *emu, uintptr_t fnc);
 void vFppuup(x64emu_t *emu, uintptr_t fnc);
@@ -1543,6 +1562,7 @@ void pFuiupp(x64emu_t *emu, uintptr_t fnc);
 void pFuuiip(x64emu_t *emu, uintptr_t fnc);
 void pFuuupu(x64emu_t *emu, uintptr_t fnc);
 void pFuupuu(x64emu_t *emu, uintptr_t fnc);
+void pFudddp(x64emu_t *emu, uintptr_t fnc);
 void pFupLpl(x64emu_t *emu, uintptr_t fnc);
 void pFupLpL(x64emu_t *emu, uintptr_t fnc);
 void pFLuppp(x64emu_t *emu, uintptr_t fnc);
@@ -1571,6 +1591,7 @@ void pFpuuup(x64emu_t *emu, uintptr_t fnc);
 void pFpupii(x64emu_t *emu, uintptr_t fnc);
 void pFpuppp(x64emu_t *emu, uintptr_t fnc);
 void pFpUdii(x64emu_t *emu, uintptr_t fnc);
+void pFpfffi(x64emu_t *emu, uintptr_t fnc);
 void pFpdddd(x64emu_t *emu, uintptr_t fnc);
 void pFplppp(x64emu_t *emu, uintptr_t fnc);
 void pFpLpii(x64emu_t *emu, uintptr_t fnc);
@@ -1581,10 +1602,12 @@ void pFppipi(x64emu_t *emu, uintptr_t fnc);
 void pFppipp(x64emu_t *emu, uintptr_t fnc);
 void pFppWpp(x64emu_t *emu, uintptr_t fnc);
 void pFppuii(x64emu_t *emu, uintptr_t fnc);
+void pFppuip(x64emu_t *emu, uintptr_t fnc);
 void pFppuuu(x64emu_t *emu, uintptr_t fnc);
 void pFppuup(x64emu_t *emu, uintptr_t fnc);
 void pFppupp(x64emu_t *emu, uintptr_t fnc);
 void pFppddi(x64emu_t *emu, uintptr_t fnc);
+void pFppddu(x64emu_t *emu, uintptr_t fnc);
 void pFppLii(x64emu_t *emu, uintptr_t fnc);
 void pFppLLp(x64emu_t *emu, uintptr_t fnc);
 void pFpppii(x64emu_t *emu, uintptr_t fnc);
@@ -1690,6 +1713,7 @@ void vFuppppu(x64emu_t *emu, uintptr_t fnc);
 void vFuppppp(x64emu_t *emu, uintptr_t fnc);
 void vFffffff(x64emu_t *emu, uintptr_t fnc);
 void vFdddddd(x64emu_t *emu, uintptr_t fnc);
+void vFdddppp(x64emu_t *emu, uintptr_t fnc);
 void vFpiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFpiiipp(x64emu_t *emu, uintptr_t fnc);
 void vFpiiuuu(x64emu_t *emu, uintptr_t fnc);
@@ -1719,12 +1743,16 @@ void vFpddddp(x64emu_t *emu, uintptr_t fnc);
 void vFppiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiip(x64emu_t *emu, uintptr_t fnc);
 void vFppiiui(x64emu_t *emu, uintptr_t fnc);
+void vFppiiuu(x64emu_t *emu, uintptr_t fnc);
 void vFppiipi(x64emu_t *emu, uintptr_t fnc);
 void vFppiipp(x64emu_t *emu, uintptr_t fnc);
 void vFppilpp(x64emu_t *emu, uintptr_t fnc);
 void vFppipLp(x64emu_t *emu, uintptr_t fnc);
 void vFppippi(x64emu_t *emu, uintptr_t fnc);
 void vFppippp(x64emu_t *emu, uintptr_t fnc);
+void vFppuiii(x64emu_t *emu, uintptr_t fnc);
+void vFppuiiu(x64emu_t *emu, uintptr_t fnc);
+void vFppuiip(x64emu_t *emu, uintptr_t fnc);
 void vFppuuuu(x64emu_t *emu, uintptr_t fnc);
 void vFppuUUU(x64emu_t *emu, uintptr_t fnc);
 void vFppupii(x64emu_t *emu, uintptr_t fnc);
@@ -1784,6 +1812,7 @@ 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 iFpiiuui(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);
@@ -1851,6 +1880,7 @@ void uFEiuppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpCppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpuppp(x64emu_t *emu, uintptr_t fnc);
 void uFupuufp(x64emu_t *emu, uintptr_t fnc);
+void uFpiuppu(x64emu_t *emu, uintptr_t fnc);
 void uFpippup(x64emu_t *emu, uintptr_t fnc);
 void uFpWuipp(x64emu_t *emu, uintptr_t fnc);
 void uFpWuuCp(x64emu_t *emu, uintptr_t fnc);
@@ -2003,12 +2033,12 @@ void vFpiiliip(x64emu_t *emu, uintptr_t fnc);
 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);
 void vFpupuuup(x64emu_t *emu, uintptr_t fnc);
+void vFpupppui(x64emu_t *emu, uintptr_t fnc);
 void vFpUiUiup(x64emu_t *emu, uintptr_t fnc);
 void vFpUUUUuu(x64emu_t *emu, uintptr_t fnc);
 void vFpddiidd(x64emu_t *emu, uintptr_t fnc);
@@ -2026,6 +2056,8 @@ void vFppipiip(x64emu_t *emu, uintptr_t fnc);
 void vFppipipp(x64emu_t *emu, uintptr_t fnc);
 void vFppipppp(x64emu_t *emu, uintptr_t fnc);
 void vFppCuupp(x64emu_t *emu, uintptr_t fnc);
+void vFppuiiip(x64emu_t *emu, uintptr_t fnc);
+void vFppuupii(x64emu_t *emu, uintptr_t fnc);
 void vFppddddi(x64emu_t *emu, uintptr_t fnc);
 void vFppddpii(x64emu_t *emu, uintptr_t fnc);
 void vFppLpppi(x64emu_t *emu, uintptr_t fnc);
@@ -2033,13 +2065,15 @@ void vFppLpppp(x64emu_t *emu, uintptr_t fnc);
 void vFpppiiii(x64emu_t *emu, uintptr_t fnc);
 void vFpppiipi(x64emu_t *emu, uintptr_t fnc);
 void vFpppiipp(x64emu_t *emu, uintptr_t fnc);
+void vFpppiupi(x64emu_t *emu, uintptr_t fnc);
 void vFpppippi(x64emu_t *emu, uintptr_t fnc);
 void vFpppuuuu(x64emu_t *emu, uintptr_t fnc);
 void vFppppiii(x64emu_t *emu, uintptr_t fnc);
 void vFppppiip(x64emu_t *emu, uintptr_t fnc);
+void vFppppiui(x64emu_t *emu, uintptr_t fnc);
 void vFppppipi(x64emu_t *emu, uintptr_t fnc);
 void vFpppppip(x64emu_t *emu, uintptr_t fnc);
-void vFppppppi(x64emu_t *emu, uintptr_t fnc);
+void vFppppppu(x64emu_t *emu, uintptr_t fnc);
 void vFppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpupppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpUuppp(x64emu_t *emu, uintptr_t fnc);
@@ -2108,7 +2142,8 @@ void iFppppipp(x64emu_t *emu, uintptr_t fnc);
 void iFppppdpi(x64emu_t *emu, uintptr_t fnc);
 void iFpppppip(x64emu_t *emu, uintptr_t fnc);
 void iFpppppup(x64emu_t *emu, uintptr_t fnc);
-void iFppppppi(x64emu_t *emu, uintptr_t fnc);
+void iFpppppLp(x64emu_t *emu, uintptr_t fnc);
+void iFppppppu(x64emu_t *emu, uintptr_t fnc);
 void iFppppppp(x64emu_t *emu, uintptr_t fnc);
 void uFEiipppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpiippp(x64emu_t *emu, uintptr_t fnc);
@@ -2153,6 +2188,7 @@ void pFppiiCCC(x64emu_t *emu, uintptr_t fnc);
 void pFppipipp(x64emu_t *emu, uintptr_t fnc);
 void pFppipLpp(x64emu_t *emu, uintptr_t fnc);
 void pFppuippp(x64emu_t *emu, uintptr_t fnc);
+void pFppuuupp(x64emu_t *emu, uintptr_t fnc);
 void pFppuuppp(x64emu_t *emu, uintptr_t fnc);
 void pFppliuip(x64emu_t *emu, uintptr_t fnc);
 void pFpplipup(x64emu_t *emu, uintptr_t fnc);
@@ -2170,7 +2206,7 @@ void pFpppllli(x64emu_t *emu, uintptr_t fnc);
 void pFpppLLLi(x64emu_t *emu, uintptr_t fnc);
 void pFppppuuu(x64emu_t *emu, uintptr_t fnc);
 void pFpppppuu(x64emu_t *emu, uintptr_t fnc);
-void pFppppppi(x64emu_t *emu, uintptr_t fnc);
+void pFppppppu(x64emu_t *emu, uintptr_t fnc);
 void pFppppppp(x64emu_t *emu, uintptr_t fnc);
 void iWpiiuuuu(x64emu_t *emu, uintptr_t fnc);
 void iWpuiiiip(x64emu_t *emu, uintptr_t fnc);
@@ -2229,6 +2265,7 @@ void vFppipipiu(x64emu_t *emu, uintptr_t fnc);
 void vFppipppui(x64emu_t *emu, uintptr_t fnc);
 void vFppippppi(x64emu_t *emu, uintptr_t fnc);
 void vFppippppp(x64emu_t *emu, uintptr_t fnc);
+void vFppuuiiii(x64emu_t *emu, uintptr_t fnc);
 void vFpplppppi(x64emu_t *emu, uintptr_t fnc);
 void vFpplppppp(x64emu_t *emu, uintptr_t fnc);
 void vFpppipppu(x64emu_t *emu, uintptr_t fnc);
@@ -2262,6 +2299,7 @@ void iFpLpipppp(x64emu_t *emu, uintptr_t fnc);
 void iFppiiiiiu(x64emu_t *emu, uintptr_t fnc);
 void iFppiiipip(x64emu_t *emu, uintptr_t fnc);
 void iFppIIIppp(x64emu_t *emu, uintptr_t fnc);
+void iFppuiiuuu(x64emu_t *emu, uintptr_t fnc);
 void iFppuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void iFppuppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiipi(x64emu_t *emu, uintptr_t fnc);
@@ -2356,12 +2394,18 @@ void vFpipiuiipp(x64emu_t *emu, uintptr_t fnc);
 void vFpipppiipi(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiipi(x64emu_t *emu, uintptr_t fnc);
+void vFppiiiiupi(x64emu_t *emu, uintptr_t fnc);
 void vFppiiipiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiipiiii(x64emu_t *emu, uintptr_t fnc);
+void vFppiupiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppippDpDC(x64emu_t *emu, uintptr_t fnc);
 void vFppipppiii(x64emu_t *emu, uintptr_t fnc);
 void vFppipppiip(x64emu_t *emu, uintptr_t fnc);
 void vFppuuiiiii(x64emu_t *emu, uintptr_t fnc);
+void vFppuuiiiiu(x64emu_t *emu, uintptr_t fnc);
+void vFppupppiii(x64emu_t *emu, uintptr_t fnc);
+void vFppupppiiu(x64emu_t *emu, uintptr_t fnc);
+void vFppupppiip(x64emu_t *emu, uintptr_t fnc);
 void vFppUUiUUUU(x64emu_t *emu, uintptr_t fnc);
 void vFppddddidd(x64emu_t *emu, uintptr_t fnc);
 void vFpplpppppi(x64emu_t *emu, uintptr_t fnc);
@@ -2449,10 +2493,16 @@ void vFpiuippppip(x64emu_t *emu, uintptr_t fnc);
 void vFpuupuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiipip(x64emu_t *emu, uintptr_t fnc);
+void vFppiiiiupip(x64emu_t *emu, uintptr_t fnc);
 void vFppiipppiip(x64emu_t *emu, uintptr_t fnc);
 void vFppiippppii(x64emu_t *emu, uintptr_t fnc);
 void vFppipppiiii(x64emu_t *emu, uintptr_t fnc);
+void vFppuipppiip(x64emu_t *emu, uintptr_t fnc);
+void vFppuuuiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppuuuuiiuu(x64emu_t *emu, uintptr_t fnc);
+void vFppuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
+void vFppuuppppii(x64emu_t *emu, uintptr_t fnc);
+void vFppupppiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppdddddddd(x64emu_t *emu, uintptr_t fnc);
 void vFpppppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpiiiiippp(x64emu_t *emu, uintptr_t fnc);
@@ -2506,11 +2556,15 @@ void vFpipppiiiipi(x64emu_t *emu, uintptr_t fnc);
 void vFpupiiupupup(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiipiii(x64emu_t *emu, uintptr_t fnc);
+void vFppiiiiupiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiddddi(x64emu_t *emu, uintptr_t fnc);
 void vFppiipppiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppipppiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppipppuiiii(x64emu_t *emu, uintptr_t fnc);
+void vFppuuiiiiuii(x64emu_t *emu, uintptr_t fnc);
+void vFppuupppiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppupipiuuuu(x64emu_t *emu, uintptr_t fnc);
+void vFppupppuiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpppipppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEppppiiiiuu(x64emu_t *emu, uintptr_t fnc);
@@ -2546,7 +2600,9 @@ void vFpippppiiiipi(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiddddii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiuuuiupup(x64emu_t *emu, uintptr_t fnc);
 void vFppiipppiiiii(x64emu_t *emu, uintptr_t fnc);
+void vFppuupppiiiiu(x64emu_t *emu, uintptr_t fnc);
 void vFpppiiiiiiiii(x64emu_t *emu, uintptr_t fnc);
+void vFpppiiiiiiuii(x64emu_t *emu, uintptr_t fnc);
 void vFpppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpppippppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEppppiiiiuui(x64emu_t *emu, uintptr_t fnc);
@@ -2571,7 +2627,9 @@ void vFpipppiiiiiiuu(x64emu_t *emu, uintptr_t fnc);
 void vFpippppppppppp(x64emu_t *emu, uintptr_t fnc);
 void vFpuppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiiiiiiiii(x64emu_t *emu, uintptr_t fnc);
+void vFppiiiiiiuiuii(x64emu_t *emu, uintptr_t fnc);
 void vFppiipppiiiiii(x64emu_t *emu, uintptr_t fnc);
+void vFppuupppuiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFddddpppddpppp(x64emu_t *emu, uintptr_t fnc);
 void iFpippuuuiipppp(x64emu_t *emu, uintptr_t fnc);
@@ -2586,6 +2644,7 @@ void vFippppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void vFuffiiffiiffiip(x64emu_t *emu, uintptr_t fnc);
 void vFuddiiddiiddiip(x64emu_t *emu, uintptr_t fnc);
 void vFppiipppiiiiiii(x64emu_t *emu, uintptr_t fnc);
+void vFppuupppiiiiuii(x64emu_t *emu, uintptr_t fnc);
 void iFpipppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpppwwWWwwWWpuu(x64emu_t *emu, uintptr_t fnc);
 void pFppCpppwwwwwwWW(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedgdkx112_private.h b/src/wrapped/wrappedgdkx112_private.h
index 1c0400a0..f9c4d6b6 100755
--- a/src/wrapped/wrappedgdkx112_private.h
+++ b/src/wrapped/wrappedgdkx112_private.h
@@ -3,15 +3,15 @@
 #endif
 
 //GOM(gdk_add_client_message_filter, vFpBp)
-//GO(gdk_add_option_entries_libgtk_only, 
+GO(gdk_add_option_entries_libgtk_only, vFp)
 //GO(gdk_app_launch_context_get_type, 
-//GO(gdk_app_launch_context_new, 
-//GO(gdk_app_launch_context_set_desktop, 
+GO(gdk_app_launch_context_new, pFv)
+GO(gdk_app_launch_context_set_desktop, vFpi)
 //GO(gdk_app_launch_context_set_display, 
-//GO(gdk_app_launch_context_set_icon, 
-//GO(gdk_app_launch_context_set_icon_name, 
-//GO(gdk_app_launch_context_set_screen, 
-//GO(gdk_app_launch_context_set_timestamp, 
+GO(gdk_app_launch_context_set_icon, vFpp)
+GO(gdk_app_launch_context_set_icon_name, vFpp)
+GO(gdk_app_launch_context_set_screen, vFpp)
+GO(gdk_app_launch_context_set_timestamp, vFpu)
 GO(gdk_atom_intern, pFpi)
 GO(gdk_atom_intern_static_string, pFp)
 GO(gdk_atom_name, pFp)
@@ -28,10 +28,10 @@ GO(gdk_cairo_set_source_pixbuf, vFppdd)
 GO(gdk_cairo_set_source_pixmap, vFppdd)
 GO(gdk_cairo_set_source_window, vFppdd)
 //GO(gdk_cap_style_get_type, 
-//GO(gdk_char_height, 
+GO(gdk_char_height, iFpC)
 //GO(gdk_char_measure, 
 //GO(gdk_char_width, 
-//GO(gdk_char_width_wc, 
+GO(gdk_char_width_wc, iFpu)
 GO(gdk_color_alloc, iFpp)
 GO(gdk_color_black, iFpp)
 GO(gdk_color_change, iFpp)
@@ -73,23 +73,23 @@ GO(gdk_cursor_ref, pFp)
 GO(gdk_cursor_type_get_type, LFv)
 GO(gdk_cursor_unref, vFp)
 GO(gdk_device_free_history, vFpi)
-GO(gdk_device_get_axis, iFppip)
-GO(gdk_device_get_axis_use, iFpu)
+GO(gdk_device_get_axis, iFppup)
+GO(gdk_device_get_axis_use, uFpu)
 GO(gdk_device_get_core_pointer, pFv)
 GO(gdk_device_get_has_cursor, iFp)
 GO(gdk_device_get_history, iFppuupp)
 GO(gdk_device_get_key, vFpupp)
-GO(gdk_device_get_mode, iFp)
+GO(gdk_device_get_mode, uFp)
 GO(gdk_device_get_name, pFp)
 GO(gdk_device_get_n_axes, iFp)
 GO(gdk_device_get_n_keys, iFp)
-GO(gdk_device_get_source, iFp)
+GO(gdk_device_get_source, uFp)
 GO(gdk_device_get_state, vFpppp)
 GO(gdk_device_get_type, LFv)
-GO(gdk_device_set_axis_use, vFpui)
-GO(gdk_device_set_key, vFpuui)
-GO(gdk_device_set_mode, iFpi)
-GO(gdk_device_set_source, vFpi)
+GO(gdk_device_set_axis_use, vFpuu)
+GO(gdk_device_set_key, vFpuuu)
+GO(gdk_device_set_mode, iFpu)
+GO(gdk_device_set_source, vFpu)
 GO(gdk_devices_list, pFv)
 //GOM(gdk_display_add_client_message_filter, vFEpppp)
 GO(gdk_display_beep, vFp)
@@ -141,8 +141,8 @@ GO(gdk_drag_action_get_type, LFv)
 GO(gdk_drag_begin, pFpp)
 GO(gdk_drag_context_get_actions, iFp)
 GO(gdk_drag_context_get_dest_window, pFp)
-GO(gdk_drag_context_get_protocol, iFp)
-GO(gdk_drag_context_get_selected_action, iFp)
+GO(gdk_drag_context_get_protocol, uFp)
+GO(gdk_drag_context_get_selected_action, uFp)
 GO(gdk_drag_context_get_source_window, pFp)
 GO(gdk_drag_context_get_suggested_action, iFp)
 GO(gdk_drag_context_get_type, LFv)
@@ -154,12 +154,12 @@ GO(gdk_drag_drop, vFpu)
 GO(gdk_drag_drop_succeeded, iFp)
 GO(gdk_drag_find_window, vFppiipp)
 GO(gdk_drag_find_window_for_screen, vFpppiipp)
-GO(gdk_drag_get_protocol, pFpp)
+GO(gdk_drag_get_protocol, uFup)
 GO(gdk_drag_get_protocol_for_display, pFppp)
 GO(gdk_drag_get_selection, pFp)
-GO(gdk_drag_motion, iFppiiiiiu)
+GO(gdk_drag_motion, iFppuiiuuu)
 GO(gdk_drag_protocol_get_type, LFv)
-GO(gdk_drag_status, vFpiu)
+GO(gdk_drag_status, vFpuu)
 GO(gdk_drawable_copy_to_image, pFppiiiiii)
 GO(gdk_drawable_get_clip_region, pFp)
 GO(gdk_drawable_get_colormap, pFp)
@@ -180,22 +180,22 @@ GO(gdk_draw_arc, vFppiiiiiii)
 GO(gdk_draw_drawable, vFpppiiiiii)
 GO(gdk_draw_glyphs, vFpppiip)
 GO(gdk_draw_glyphs_transformed, vFppppiip)
-GO(gdk_draw_gray_image, vFppiiiiipi)
+GO(gdk_draw_gray_image, vFppiiiiupi)
 GO(gdk_draw_image, vFpppiiiiii)
-GO(gdk_draw_indexed_image, vFppiiiiipip)
+GO(gdk_draw_indexed_image, vFppiiiiupip)
 GO(gdk_draw_layout, vFppiip)
 GO(gdk_draw_layout_line, vFppiip)
 GO(gdk_draw_layout_line_with_colors, vFppiippp)
 GO(gdk_draw_layout_with_colors, vFppiippp)
 GO(gdk_draw_line, vFppiiii)
 GO(gdk_draw_lines, vFpppi)
-GO(gdk_draw_pixbuf, vFpppiiiiiiiii)
+GO(gdk_draw_pixbuf, vFpppiiiiiiuii)
 GO(gdk_draw_point, vFppii)
 GO(gdk_draw_points, vFpppi)
 GO(gdk_draw_polygon, vFppipi)
 GO(gdk_draw_rectangle, vFppiiiii)
 GO(gdk_draw_rgb_32_image, vFppiiiiipi)
-GO(gdk_draw_rgb_32_image_dithalign, vFppiiiiipiii)
+GO(gdk_draw_rgb_32_image_dithalign, vFppiiiiupiii)
 GO(gdk_draw_rgb_image, vFppiiiiipi)
 GO(gdk_draw_rgb_image_dithalign, vFppiiiiipiii)
 GO(gdk_draw_segments, vFpppi)
@@ -210,7 +210,7 @@ GO(gdk_error_trap_push, vFv)
 GO(gdk_event_copy, pFp)
 GO(gdk_event_free, vFp)
 GO(gdk_event_get, pFv)
-GO(gdk_event_get_axis, iFpip)
+GO(gdk_event_get_axis, iFpup)
 GO(gdk_event_get_coords, iFppp)
 GO(gdk_event_get_graphics_expose, pFp)
 GO(gdk_event_get_root_coords, iFppp)
@@ -224,7 +224,7 @@ GO(gdk_event_new, pFi)
 GO(gdk_event_peek, pFv)
 GO(gdk_event_put, vFp)
 GO(gdk_event_request_motions, vFp)
-GO(gdk_event_send_client_message, iFpp)
+GO(gdk_event_send_client_message, iFpu)
 GO(gdk_event_send_client_message_for_display, iFppp)
 GO(gdk_event_send_clientmessage_toall, vFp)
 GO(gdk_event_set_screen, vFpp)
@@ -236,19 +236,19 @@ GO(gdk_exit, vFi)
 //GO(gdk_fill_rule_get_type, 
 //GO(gdk_filter_return_get_type, 
 GO(gdk_flush, vFv)
-//GO(gdk_font_equal, 
-//GO(gdk_font_from_description, 
+GO(gdk_font_equal, iFpp)
+GO(gdk_font_from_description, pFp)
 //GO(gdk_font_from_description_for_display, 
 //GO(gdk_font_get_display, 
 GO(gdk_font_get_type, LFv)
-//GO(gdk_font_id, 
+GO(gdk_font_id, iFp)
 //GO(gdk_font_load, 
 //GO(gdk_font_load_for_display, 
-//GO(gdk_font_ref, 
-//GO(gdk_fontset_load, 
+GO(gdk_font_ref, pFp)
+GO(gdk_fontset_load, pFp)
 //GO(gdk_fontset_load_for_display, 
 //GO(gdk_font_type_get_type, 
-//GO(gdk_font_unref, 
+GO(gdk_font_unref, vFp)
 GO(gdk_free_compound_text, vFp)
 GO(gdk_free_text_list, vFp)
 GO(gdk_function_get_type, LFv)
@@ -269,15 +269,15 @@ GO(gdk_gc_set_clip_region, vFpp)
 GO(gdk_gc_set_colormap, vFpp)
 GO(gdk_gc_set_dashes, vFpipi)
 GO(gdk_gc_set_exposures, vFpi)
-GO(gdk_gc_set_fill, vFpi)
+GO(gdk_gc_set_fill, vFpu)
 GO(gdk_gc_set_font, vFpp)
 GO(gdk_gc_set_foreground, vFpp)
-GO(gdk_gc_set_function,vFpi) 
-GO(gdk_gc_set_line_attributes, vFpiiii)
+GO(gdk_gc_set_function, vFpu)
+GO(gdk_gc_set_line_attributes, vFpiuuu)
 GO(gdk_gc_set_rgb_bg_color, vFpp)
 GO(gdk_gc_set_rgb_fg_color, vFpp)
 GO(gdk_gc_set_stipple, vFpp)
-GO(gdk_gc_set_subwindow, vFpi)
+GO(gdk_gc_set_subwindow, vFpu)
 GO(gdk_gc_set_tile, vFpp)
 GO(gdk_gc_set_ts_origin, vFpii)
 GO(gdk_gc_set_values, vFppu)
@@ -293,19 +293,19 @@ GO(gdk_grab_status_get_type, LFv)
 GO(gdk_gravity_get_type, LFv)
 GO(gdk_image_get, pFpiiii)
 GO(gdk_image_get_bits_per_pixel, WFp)
-GO(gdk_image_get_byte_order, iFp)
+GO(gdk_image_get_byte_order, uFp)
 GO(gdk_image_get_bytes_per_line, WFp)
 GO(gdk_image_get_bytes_per_pixel, WFp)
 GO(gdk_image_get_colormap, pFp)
 GO(gdk_image_get_depth, WFp)
 GO(gdk_image_get_height, iFp)
-GO(gdk_image_get_image_type, iFp)
+GO(gdk_image_get_image_type, uFp)
 GO(gdk_image_get_pixel, uFpii)
 GO(gdk_image_get_pixels, pFp)
 GO(gdk_image_get_type, LFv)
 GO(gdk_image_get_visual, pFp)
 GO(gdk_image_get_width, iFp)
-GO(gdk_image_new, pFipii)
+GO(gdk_image_new, pFupii)
 GO(gdk_image_new_bitmap, pFppii)
 GO(gdk_image_put_pixel, vFpiiu)
 GO(gdk_image_ref, pFp)
@@ -319,10 +319,10 @@ GOM(gdk_input_add_full, iFEiippp)
 GO(gdk_input_condition_get_type, LFv)
 GO(gdk_input_mode_get_type, LFv)
 GO(gdk_input_remove, vFi)
-GO(gdk_input_set_extension_events, vFpii)
+GO(gdk_input_set_extension_events, vFpiu)
 GO(gdk_input_source_get_type, LFv)
 GO(gdk_join_style_get_type, LFv)
-GO(gdk_keyboard_grab, iFpiu)
+GO(gdk_keyboard_grab, uFpiu)
 //GO(gdk_keyboard_grab_info_libgtk_only, 
 GO(gdk_keyboard_ungrab, vFu)
 GO(gdk_keymap_add_virtual_modifiers, vFpp)
@@ -347,7 +347,7 @@ GO(gdk_keyval_to_unicode, uFu)
 GO(gdk_keyval_to_upper, uFu)
 GO(gdk_line_style_get_type, LFv)
 GO(gdk_list_visuals, pFv)
-//GO(gdk_mbstowcs, 
+GO(gdk_mbstowcs, iFppi)
 GO(gdk_modifier_type_get_type, LFv)
 GO(gdk_net_wm_supports, iFp)
 GO(gdk_notify_startup_complete, vFv)
@@ -372,16 +372,16 @@ GO(gdk_pango_renderer_get_type, LFv)
 GO(gdk_pango_renderer_new, pFp)
 GO(gdk_pango_renderer_set_drawable, vFpp)
 GO(gdk_pango_renderer_set_gc, vFpp)
-GO(gdk_pango_renderer_set_override_color, vFpip)
-GO(gdk_pango_renderer_set_stipple, vFpip)
+GO(gdk_pango_renderer_set_override_color, vFpup)
+GO(gdk_pango_renderer_set_stipple, vFpup)
 GO(gdk_parse_args, vFpp)
 GO(gdk_pixbuf_get_from_drawable, pFpppiiiiii)
 GO(gdk_pixbuf_get_from_image, pFpppiiiiii)
 GO(gdk_pixbuf_render_pixmap_and_mask, vFpppi)
 GO(gdk_pixbuf_render_pixmap_and_mask_for_colormap, vFppppi)
 GO(gdk_pixbuf_render_threshold_alpha, vFppiiiiiii)
-GO(gdk_pixbuf_render_to_drawable, vFpppiiiiiiiii)
-GO(gdk_pixbuf_render_to_drawable_alpha, vFppiiiiiiiiiii)
+GO(gdk_pixbuf_render_to_drawable, vFpppiiiiiiuii)
+GO(gdk_pixbuf_render_to_drawable_alpha, vFppiiiiiiuiuii)
 GO(gdk_pixmap_colormap_create_from_xpm, pFppppp)
 GO(gdk_pixmap_colormap_create_from_xpm_d, pFppppp)
 GO(gdk_pixmap_create_from_data, pFppiiipp)
@@ -389,19 +389,19 @@ GO(gdk_pixmap_create_from_xpm, pFpppp)
 GO(gdk_pixmap_create_from_xpm_d, pFpppp)
 GO(gdk_pixmap_foreign_new, pFp)
 GO(gdk_pixmap_foreign_new_for_display, pFpp)
-GO(gdk_pixmap_foreign_new_for_screen, pFppiii)
+GO(gdk_pixmap_foreign_new_for_screen, pFpuiii)
 GO(gdk_pixmap_get_size, vFppp)
 GO(gdk_pixmap_get_type, LFv)
 GO(gdk_pixmap_impl_x11_get_type, LFv)
-GO(gdk_pixmap_lookup, pFp)
+GO(gdk_pixmap_lookup, pFu)
 GO(gdk_pixmap_lookup_for_display, pFpp)
 GO(gdk_pixmap_new, pFpiii)
-GO(gdk_pointer_grab, iFpiippu)
+GO(gdk_pointer_grab, uFpiuppu)
 //GO(gdk_pointer_grab_info_libgtk_only, 
 GO(gdk_pointer_is_grabbed, iFv)
 GO(gdk_pointer_ungrab, vFu)
 //GO(gdk_pre_parse_libgtk_only, 
-GO(gdk_property_change, vFpppiipi)
+GO(gdk_property_change, vFpppiupi)
 GO(gdk_property_delete, vFpp)
 GO(gdk_property_get, iFpppLLipppp)
 GO(gdk_property_state_get_type, LFv)
@@ -412,7 +412,7 @@ GO(gdk_rectangle_get_type, LFv)
 GO(gdk_rectangle_intersect, iFppp)
 GO(gdk_rectangle_union, vFppp)
 GO(gdk_region_copy, pFp)
-GO(gdk_region_destroy, vFpp)
+GO(gdk_region_destroy, vFp)
 GO(gdk_region_empty, iFp)
 GO(gdk_region_equal, iFpp)
 GO(gdk_region_get_clipbox, vFpp)
@@ -421,10 +421,10 @@ GO(gdk_region_intersect, vFpp)
 GO(gdk_region_new, pFv)
 GO(gdk_region_offset, vFpii)
 GO(gdk_region_point_in, iFpii)
-GO(gdk_region_polygon, pFpii)
+GO(gdk_region_polygon, pFpiu)
 GO(gdk_region_rectangle, pFp)
 GO(gdk_region_rect_equal, iFpp)
-GO(gdk_region_rect_in, iFpp)
+GO(gdk_region_rect_in, uFpp)
 GO(gdk_region_shrink, vFpii)
 //GOM(gdk_region_spans_intersect_foreach, vFppiiBp)
 GO(gdk_region_subtract, vFpp)
@@ -494,7 +494,7 @@ GO(gdk_selection_owner_get_for_display, pFpp)
 GO(gdk_selection_owner_set, iFppui)
 GO(gdk_selection_owner_set_for_display, iFpppui)
 GO(gdk_selection_property_get, iFpppp)
-GO(gdk_selection_send_notify, vFppppu)
+GO(gdk_selection_send_notify, vFupppu)
 GO(gdk_selection_send_notify_for_display, vFpppppu)
 GO(gdk_set_double_click_time, vFu)
 GO(gdk_set_locale, pFv)
@@ -509,27 +509,27 @@ GO(gdk_spawn_command_line_on_screen, iFppp)
 //GOM(gdk_spawn_on_screen, iFEppppipppp)
 //GOM(gdk_spawn_on_screen_with_pipes, iFEppppippppppp)
 GO(gdk_status_get_type, LFv)
-//GO(gdk_string_extents, 
-//GO(gdk_string_height, 
+GO(gdk_string_extents, vFppppppp)
+GO(gdk_string_height, iFpp)
 //GO(gdk_string_measure, 
 GO(gdk_string_to_compound_text, iFppppp)
 GO(gdk_string_to_compound_text_for_display, iFpppppp)
 //GO(gdk_string_width, 
 //GO(gdk_subwindow_mode_get_type, 
 //GO(gdk_synthesize_window_state, 
-//GO(gdk_test_render_sync, 
-//GO(gdk_test_simulate_button, 
+GO(gdk_test_render_sync, vFp)
+GO(gdk_test_simulate_button, iFpiiuui)
 //GO(gdk_test_simulate_key, 
-//GO(gdk_text_extents, 
-//GO(gdk_text_extents_wc, 
-//GO(gdk_text_height, 
+GO(gdk_text_extents, vFppippppp)
+GO(gdk_text_extents_wc, vFppippppp)
+GO(gdk_text_height, iFppi)
 //GO(gdk_text_measure, 
 GO(gdk_text_property_to_text_list, iFpipip)
 GO(gdk_text_property_to_text_list_for_display, iFppipip)
 GO(gdk_text_property_to_utf8_list, iFpipip)
 //GO(gdk_text_property_to_utf8_list_for_display, 
 //GO(gdk_text_width, 
-//GO(gdk_text_width_wc, 
+GO(gdk_text_width_wc, iFppi)
 //GOM(gdk_threads_add_idle, uFEpp)
 //GOM(gdk_threads_add_idle_full, uFEippp)
 //GOM(gdk_threads_add_timeout, uFEupp)
@@ -547,13 +547,13 @@ GO(gdk_utf8_to_string_target, pFp)
 GO(gdk_visibility_state_get_type, LFv)
 GO(gdk_visual_get_best, pFv)
 GO(gdk_visual_get_best_depth, iFv)
-GO(gdk_visual_get_best_type, iFv)
-GO(gdk_visual_get_best_with_both, pFii)
+GO(gdk_visual_get_best_type, uFv)
+GO(gdk_visual_get_best_with_both, pFiu)
 GO(gdk_visual_get_best_with_depth, pFi)
-GO(gdk_visual_get_best_with_type, pFi)
+GO(gdk_visual_get_best_with_type, pFu)
 GO(gdk_visual_get_bits_per_rgb, iFp)
 GO(gdk_visual_get_blue_pixel_details, vFpppp)
-GO(gdk_visual_get_byte_order, iFp)
+GO(gdk_visual_get_byte_order, uFp)
 GO(gdk_visual_get_colormap_size, iFp)
 GO(gdk_visual_get_depth, iFp)
 GO(gdk_visual_get_green_pixel_details, vFpppp)
@@ -561,9 +561,9 @@ GO(gdk_visual_get_red_pixel_details, vFpppp)
 GO(gdk_visual_get_screen, pFp)
 GO(gdk_visual_get_system, pFv)
 GO(gdk_visual_get_type, LFv)
-GO(gdk_visual_get_visual_type, iFp)
+GO(gdk_visual_get_visual_type, uFp)
 GO(gdk_visual_type_get_type, LFv)
-//GO(gdk_wcstombs, 
+GO(gdk_wcstombs, pFp)
 GOM(gdk_window_add_filter, vFEppp)
 GO(gdk_window_at_pointer, pFpp)
 //GO(gdk_window_attributes_type_get_type, 
@@ -580,7 +580,7 @@ GO(gdk_window_configure_finished, vFp)
 GO(gdk_window_constrain_size, vFpuiipp)
 GO(gdk_window_coords_from_parent, vFpddpp)
 GO(gdk_window_coords_to_parent, vFpddpp)
-GO(gdk_window_create_similar_surface, pFpiii)
+GO(gdk_window_create_similar_surface, pFpuii)
 GO(gdk_window_deiconify, vFp)
 GO(gdk_window_destroy, vFp)
 //GO(gdk_window_destroy_notify, 
@@ -606,7 +606,7 @@ GO(gdk_window_get_deskrelative_origin, iFppp)
 GO(gdk_window_get_display, pFp)
 GO(gdk_window_get_effective_parent, pFp)
 GO(gdk_window_get_effective_toplevel, pFp)
-GO(gdk_window_get_events, vFpi)
+GO(gdk_window_get_events, uFp)
 GO(gdk_window_get_focus_on_map, iFp)
 GO(gdk_window_get_frame_extents, vFpp)
 GO(gdk_window_get_geometry, vFpppppp)
@@ -621,15 +621,15 @@ GO(gdk_window_get_position, vFppp)
 GO(gdk_window_get_root_coords, vFpiipp)
 GO(gdk_window_get_root_origin, vFppp)
 GO(gdk_window_get_screen, pFp)
-GO(gdk_window_get_state, iFp)
+GO(gdk_window_get_state, uFp)
 GO(gdk_window_get_toplevel, pFp)
 GO(gdk_window_get_toplevels, pFp)
-GO(gdk_window_get_type_hint, iFp)
+GO(gdk_window_get_type_hint, uFp)
 GO(gdk_window_get_update_area, pFp)
 GO(gdk_window_get_user_data, vFpp)
 GO(gdk_window_get_visual, pFp)
 GO(gdk_window_get_width, iFp)
-GO(gdk_window_get_window_type, iFp)
+GO(gdk_window_get_window_type, uFp)
 GO(gdk_window_has_native, iFp)
 GO(gdk_window_hide, vFp)
 GO(gdk_window_hints_get_type, LFv)
@@ -646,7 +646,7 @@ GO(gdk_window_is_input_only, iFp)
 GO(gdk_window_is_shaped, iFp)
 GO(gdk_window_is_viewable, iFp)
 GO(gdk_window_is_visible, iFp)
-GO(gdk_window_lookup, pFp)
+GO(gdk_window_lookup, pFu)
 GO(gdk_window_lookup_for_display, pFpp)
 GO(gdk_window_lower, vFp)
 GO(gdk_window_maximize, vFp)
@@ -677,11 +677,11 @@ GO(gdk_window_set_child_shapes, vFp)
 GO(gdk_window_set_composited, vFpi)
 GO(gdk_window_set_cursor, vFpp)
 GO(gdk_window_set_debug_updates, vFi)
-GO(gdk_window_set_decorations, vFpp)
-GO(gdk_window_set_events, vFpp)
+GO(gdk_window_set_decorations, vFpu)
+GO(gdk_window_set_events, vFpu)
 GO(gdk_window_set_focus_on_map, vFpi)
 GO(gdk_window_set_functions, vFpu)
-GO(gdk_window_set_geometry_hints, vFppi)
+GO(gdk_window_set_geometry_hints, vFppu)
 GO(gdk_window_set_group, vFpp)
 GO(gdk_window_set_hints, vFpiiiiiii)
 GO(gdk_window_set_icon, vFpppp)
@@ -690,7 +690,7 @@ GO(gdk_window_set_icon_name, vFpp)
 GO(gdk_window_set_keep_above, vFpi)
 GO(gdk_window_set_keep_below, vFpi)
 GO(gdk_window_set_modal_hint, iFp)
-GO(gdk_window_set_opacity, vFpi)
+GO(gdk_window_set_opacity, vFpd)
 GO(gdk_window_set_override_redirect, vFpi)
 GO(gdk_window_set_role, vFpp)
 GO(gdk_window_set_skip_pager_hint, vFpi)
@@ -699,7 +699,7 @@ GO(gdk_window_set_startup_id, vFpp)
 GO(gdk_window_set_static_gravities, iFpi)
 GO(gdk_window_set_title, vFpp)
 GO(gdk_window_set_transient_for, vFpp)
-GO(gdk_window_set_type_hint, vFpi)
+GO(gdk_window_set_type_hint, vFpu)
 GO(gdk_window_set_urgency_hint, vFpi)
 GO(gdk_window_set_user_data, vFpp)
 GO(gdk_window_shape_combine_mask, vFppii)
@@ -789,4 +789,4 @@ GO(dummy_set_child_property, vFppupp)       // to get vFppupp for gtkclass.c
 GO2(gdk_pixmap_ref, pFp, g_object_ref)
 GO2(gdk_pixmap_unref, vFp, g_object_unref)
 GO2(gdk_bitmap_ref, pFp, g_object_ref)
-GO2(gdk_bitmap_unref, vFp, g_object_unref)
\ No newline at end of file
+GO2(gdk_bitmap_unref, vFp, g_object_unref)
diff --git a/src/wrapped/wrappedgtkx112_private.h b/src/wrapped/wrappedgtkx112_private.h
index 3006882b..ea9c9df9 100755
--- a/src/wrapped/wrappedgtkx112_private.h
+++ b/src/wrapped/wrappedgtkx112_private.h
@@ -2,14 +2,14 @@
 #error meh!
 #endif
 
-//GO(gtk_about_dialog_get_artists, 
+GO(gtk_about_dialog_get_artists, pFp)
 //GO(gtk_about_dialog_get_authors, 
 //GO(gtk_about_dialog_get_comments, 
 //GO(gtk_about_dialog_get_copyright, 
 //GO(gtk_about_dialog_get_documenters, 
 //GO(gtk_about_dialog_get_license, 
-//GO(gtk_about_dialog_get_logo, 
-//GO(gtk_about_dialog_get_logo_icon_name, 
+GO(gtk_about_dialog_get_logo, pFp)
+GO(gtk_about_dialog_get_logo_icon_name, pFp)
 //GO(gtk_about_dialog_get_name, 
 //GO(gtk_about_dialog_get_program_name, 
 //GO(gtk_about_dialog_get_translator_credits, 
@@ -17,17 +17,17 @@ GO(gtk_about_dialog_get_type, LFv)
 //GO(gtk_about_dialog_get_version, 
 //GO(gtk_about_dialog_get_website, 
 //GO(gtk_about_dialog_get_website_label, 
-//GO(gtk_about_dialog_get_wrap_license, 
-//GO(gtk_about_dialog_new, 
-//GO(gtk_about_dialog_set_artists, 
+GO(gtk_about_dialog_get_wrap_license, iFp)
+GO(gtk_about_dialog_new, pFv)
+GO(gtk_about_dialog_set_artists, vFpp)
 //GO(gtk_about_dialog_set_authors, 
 //GO(gtk_about_dialog_set_comments, 
 //GO(gtk_about_dialog_set_copyright, 
 //GO(gtk_about_dialog_set_documenters, 
 //GO(gtk_about_dialog_set_email_hook, 
 //GO(gtk_about_dialog_set_license, 
-//GO(gtk_about_dialog_set_logo, 
-//GO(gtk_about_dialog_set_logo_icon_name, 
+GO(gtk_about_dialog_set_logo, vFpp)
+GO(gtk_about_dialog_set_logo_icon_name, vFpp)
 //GO(gtk_about_dialog_set_name, 
 //GO(gtk_about_dialog_set_program_name, 
 //GO(gtk_about_dialog_set_translator_credits, 
@@ -35,13 +35,13 @@ GO(gtk_about_dialog_get_type, LFv)
 //GO(gtk_about_dialog_set_version, 
 //GO(gtk_about_dialog_set_website, 
 //GO(gtk_about_dialog_set_website_label, 
-//GO(gtk_about_dialog_set_wrap_license, 
+GO(gtk_about_dialog_set_wrap_license, vFpi)
 GO(gtk_accelerator_get_default_mod_mask, uFv)
-GO(gtk_accelerator_get_label, pFui)
+GO(gtk_accelerator_get_label, pFuu)
 GO(gtk_accelerator_name, pFui)
 GO(gtk_accelerator_parse, vFppp)
 GO(gtk_accelerator_set_default_mod_mask, vFu)
-GO(gtk_accelerator_valid, iFui)
+GO(gtk_accelerator_valid, iFuu)
 GO(gtk_accel_flags_get_type, LFv)
 GO(gtk_accel_group_activate, iFpppui)
 GO(gtk_accel_group_connect, vFpuiip)  // Closure probably needs wrapping when not null
@@ -56,7 +56,7 @@ GO(gtk_accel_group_get_type, LFv)
 GO(gtk_accel_group_lock, vFp)
 GO(gtk_accel_group_new, pFv)
 GO(gtk_accel_group_query, pFpuip)
-GO(gtk_accel_groups_activate, iFpui)
+GO(gtk_accel_groups_activate, iFpuu)
 GO(gtk_accel_groups_from_object, pFp)
 GO(gtk_accel_group_unlock, vFp)
 //GO(gtk_accel_label_get_accel_widget, 
@@ -66,31 +66,31 @@ GO(gtk_accel_label_get_type, LFv)
 //GO(gtk_accel_label_refetch, 
 //GO(gtk_accel_label_set_accel_closure, 
 //GO(gtk_accel_label_set_accel_widget, 
-//GO(gtk_accel_map_add_entry, 
-//GO(gtk_accel_map_add_filter, 
-//GO(gtk_accel_map_change_entry, 
+GO(gtk_accel_map_add_entry, vFpuu)
+GO(gtk_accel_map_add_filter, vFp)
+GO(gtk_accel_map_change_entry, iFpuui)
 //GO(gtk_accel_map_foreach, 
 //GO(gtk_accel_map_foreach_unfiltered, 
-//GO(gtk_accel_map_get, 
+GO(gtk_accel_map_get, pFv)
 GO(gtk_accel_map_get_type, LFv)
 //GO(gtk_accel_map_load, 
 //GO(gtk_accel_map_load_fd, 
 //GO(gtk_accel_map_load_scanner, 
 //GO(gtk_accel_map_lock_path, 
-//GO(gtk_accel_map_lookup_entry, 
+GO(gtk_accel_map_lookup_entry, iFpp)
 //GO(gtk_accel_map_save, 
 //GO(gtk_accel_map_save_fd, 
 //GO(gtk_accel_map_unlock_path, 
-//GO(gtk_accessible_connect_widget_destroyed, 
+GO(gtk_accessible_connect_widget_destroyed, vFp)
 GO(gtk_accessible_get_type, LFv)
-//GO(gtk_accessible_get_widget, 
-//GO(gtk_accessible_set_widget, 
+GO(gtk_accessible_get_widget, pFp)
+GO(gtk_accessible_set_widget, vFpp)
 GO(gtk_action_activate, vFp)
 GO(gtk_action_block_activate, vFp)
 GO(gtk_action_block_activate_from, vFpp)
 GO(gtk_action_connect_accelerator, vFp)
 GO(gtk_action_connect_proxy, vFpp)
-GO(gtk_action_create_icon, pFpi)
+GO(gtk_action_create_icon, pFpu)
 GO(gtk_action_create_menu, pFp)
 GO(gtk_action_create_menu_item, pFp)
 GO(gtk_action_create_tool_item, pFp)
@@ -153,12 +153,12 @@ GO(gtk_action_set_visible_horizontal, vFpi)
 GO(gtk_action_set_visible_vertical, vFpi)
 GO(gtk_action_unblock_activate, vFp)
 GO(gtk_action_unblock_activate_from, vFpp)
-//GO(gtk_activatable_do_set_related_action, 
-//GO(gtk_activatable_get_related_action, 
+GO(gtk_activatable_do_set_related_action, vFpp)
+GO(gtk_activatable_get_related_action, pFp)
 GO(gtk_activatable_get_type, LFv)
-//GO(gtk_activatable_get_use_action_appearance, 
+GO(gtk_activatable_get_use_action_appearance, iFp)
 //GO(gtk_activatable_set_related_action, 
-//GO(gtk_activatable_set_use_action_appearance, 
+GO(gtk_activatable_set_use_action_appearance, vFpi)
 //GO(gtk_activatable_sync_action_properties, 
 GO(gtk_adjustment_changed, vFp)
 GO(gtk_adjustment_clamp_page, vFpdd)
@@ -187,49 +187,49 @@ GO(gtk_alternative_dialog_button_order, iFp)
 GO(gtk_anchor_type_get_type, LFv)
 GO(gtk_arg_flags_get_type, LFv)
 GO(gtk_arrow_get_type, LFv)
-GO(gtk_arrow_new, pFii)
+GO(gtk_arrow_new, pFuu)
 GO(gtk_arrow_placement_get_type, LFv)
-GO(gtk_arrow_set, vFpii)
+GO(gtk_arrow_set, vFpuu)
 GO(gtk_arrow_type_get_type, LFv)
 GO(gtk_aspect_frame_get_type, LFv)
-//GO(gtk_aspect_frame_new, 
-//GO(gtk_aspect_frame_set, 
+GO(gtk_aspect_frame_new, pFpfffi)
+GO(gtk_aspect_frame_set, vFpfffi)
 //GO(gtk_assistant_add_action_widget, 
-//GO(gtk_assistant_append_page, 
-//GO(gtk_assistant_commit, 
+GO(gtk_assistant_append_page, iFpp)
+GO(gtk_assistant_commit, vFp)
 //GO(gtk_assistant_get_current_page, 
-//GO(gtk_assistant_get_n_pages, 
-//GO(gtk_assistant_get_nth_page, 
-//GO(gtk_assistant_get_page_complete, 
+GO(gtk_assistant_get_n_pages, iFp)
+GO(gtk_assistant_get_nth_page, pFpi)
+GO(gtk_assistant_get_page_complete, iFpp)
 //GO(gtk_assistant_get_page_header_image, 
-//GO(gtk_assistant_get_page_side_image, 
-//GO(gtk_assistant_get_page_title, 
-//GO(gtk_assistant_get_page_type, 
+GO(gtk_assistant_get_page_side_image, pFpp)
+GO(gtk_assistant_get_page_title, pFpp)
+GO(gtk_assistant_get_page_type, uFpp)
 GO(gtk_assistant_get_type, LFv)
-//GO(gtk_assistant_insert_page, 
+GO(gtk_assistant_insert_page, iFppi)
 //GO(gtk_assistant_new, 
 GO(gtk_assistant_page_type_get_type, LFv)
 //GO(gtk_assistant_prepend_page, 
-//GO(gtk_assistant_remove_action_widget, 
-//GO(gtk_assistant_set_current_page, 
+GO(gtk_assistant_remove_action_widget, vFpp)
+GO(gtk_assistant_set_current_page, vFpi)
 //GO(gtk_assistant_set_forward_page_func, 
-//GO(gtk_assistant_set_page_complete, 
+GO(gtk_assistant_set_page_complete, vFppi)
 //GO(gtk_assistant_set_page_header_image, 
-//GO(gtk_assistant_set_page_side_image, 
-//GO(gtk_assistant_set_page_title, 
-//GO(gtk_assistant_set_page_type, 
+GO(gtk_assistant_set_page_side_image, vFppp)
+GO(gtk_assistant_set_page_title, vFppp)
+GO(gtk_assistant_set_page_type, vFppu)
 //GO(gtk_assistant_update_buttons_state, 
 GO(gtk_attach_options_get_type, LFv)
 GOM(gtk_binding_entry_add_signal, vFEpuipuV)   //vaarg
 GO(gtk_binding_entry_add_signall, vFpuipp)
 GO(gtk_binding_entry_clear, vFpui)
-GO(gtk_binding_entry_remove, vFpui)
+GO(gtk_binding_entry_remove, vFpuu)
 GO(gtk_binding_entry_skip, vFpui)
 GO(gtk_binding_parse_binding, uFp)
-GO(gtk_bindings_activate, iFpui)
+GO(gtk_bindings_activate, iFpuu)
 GO(gtk_bindings_activate_event, iFpp)
-GO(gtk_binding_set_activate, iFpuip)
-GO(gtk_binding_set_add_path, vFpipi)
+GO(gtk_binding_set_activate, iFpuup)
+GO(gtk_binding_set_add_path, vFpupu)
 GO(gtk_binding_set_by_class, pFp)
 GO(gtk_binding_set_find, pFp)
 GO(gtk_binding_set_new, pFp)
@@ -248,7 +248,7 @@ GO(gtk_box_pack_start, vFppiiu)
 GO(gtk_box_pack_start_defaults, vFpp)
 GO(gtk_box_query_child_packing, vFpppppp)
 GO(gtk_box_reorder_child, vFppi)
-GO(gtk_box_set_child_packing, vFppiiui)
+GO(gtk_box_set_child_packing, vFppiiuu)
 GO(gtk_box_set_homogeneous, vFpi)
 GO(gtk_box_set_spacing, vFpi)
 GO(gtk_buildable_add_child, vFpppp)
@@ -263,7 +263,7 @@ GO(gtk_buildable_parser_finished, vFpp)
 GO(gtk_buildable_set_buildable_property, vFpppp)
 GO(gtk_buildable_set_name, vFpp)
 GO(gtk_builder_add_from_file, uFppp)
-GO(gtk_builder_add_from_string, iFppLp)
+GO(gtk_builder_add_from_string, uFppLp)
 GO(gtk_builder_add_objects_from_file, uFpppp)
 GO(gtk_builder_add_objects_from_string, uFppLpp)
 GOM(gtk_builder_connect_signals, vFEpp)
@@ -274,21 +274,21 @@ GO(gtk_builder_get_object, pFpp)
 GO(gtk_builder_get_objects, pFp)
 GO(gtk_builder_get_translation_domain, pFp)
 GO(gtk_builder_get_type, LFv)
-GO(gtk_builder_get_type_from_name, iFpp)
+GO(gtk_builder_get_type_from_name, LFpp)
 GO(gtk_builder_new, pFv)
 GO(gtk_builder_set_translation_domain, vFpp)
 GO(gtk_builder_value_from_string, iFppppp)
-GO(gtk_builder_value_from_string_type, iFpippp)
+GO(gtk_builder_value_from_string_type, iFpLppp)
 GO(gtk_button_action_get_type, LFv)
 GO(gtk_button_box_get_child_ipadding, vFppp)
 GO(gtk_button_box_get_child_secondary, iFpp)
 GO(gtk_button_box_get_child_size, vFppp)
-GO(gtk_button_box_get_layout, iFp)
+GO(gtk_button_box_get_layout, uFp)
 GO(gtk_button_box_get_type, LFv)
 GO(gtk_button_box_set_child_ipadding, vFpii)
 GO(gtk_button_box_set_child_secondary, vFppi)
 GO(gtk_button_box_set_child_size, vFpii)
-GO(gtk_button_box_set_layout, vFpi)
+GO(gtk_button_box_set_layout, vFpu)
 GO(gtk_button_box_style_get_type, LFv)
 GO(gtk_button_clicked, vFp)
 GO(gtk_button_enter, vFp)
@@ -296,9 +296,9 @@ GO(gtk_button_get_alignment, vFppp)
 GO(gtk_button_get_event_window, pFp)
 GO(gtk_button_get_focus_on_click, iFp)
 GO(gtk_button_get_image, pFp)
-GO(gtk_button_get_image_position, iFp)
+GO(gtk_button_get_image_position, uFp)
 GO(gtk_button_get_label, pFp)
-GO(gtk_button_get_relief, iFp)
+GO(gtk_button_get_relief, uFp)
 GO(gtk_button_get_type, LFv)
 GO(gtk_button_get_use_stock, iFp)
 GO(gtk_button_get_use_underline, iFp)
@@ -312,9 +312,9 @@ GO(gtk_button_released, vFp)
 GO(gtk_button_set_alignment, vFpff)
 GO(gtk_button_set_focus_on_click, vFpi)
 GO(gtk_button_set_image, vFpp)
-GO(gtk_button_set_image_position, vFpi)
+GO(gtk_button_set_image_position, vFpu)
 GO(gtk_button_set_label, vFpp)
-GO(gtk_button_set_relief, vFpi)
+GO(gtk_button_set_relief, vFpu)
 GO(gtk_button_set_use_stock, vFpi)
 GO(gtk_button_set_use_underline, vFpi)
 GO(gtk_buttons_type_get_type, LFv)
@@ -339,8 +339,8 @@ GO(gtk_calendar_get_type, LFv)
 //GO(gtk_calendar_unmark_day, 
 //GO(gtk_cell_editable_editing_done, 
 GO(gtk_cell_editable_get_type, LFv)
-//GO(gtk_cell_editable_remove_widget, 
-//GO(gtk_cell_editable_start_editing, 
+GO(gtk_cell_editable_remove_widget, vFp)
+GO(gtk_cell_editable_start_editing, vFpp)
 GO(gtk_cell_layout_add_attribute, vFpppi)
 GO(gtk_cell_layout_clear, vFp)
 GO(gtk_cell_layout_clear_attributes, vFpp)
@@ -354,7 +354,7 @@ GOM(gtk_cell_layout_set_cell_data_func, vFEppppp)
 GO(gtk_cell_renderer_accel_get_type, LFv)
 GO(gtk_cell_renderer_accel_mode_get_type, LFv)
 GO(gtk_cell_renderer_accel_new, pFv)
-GO(gtk_cell_renderer_activate, iFppppppi)
+GO(gtk_cell_renderer_activate, iFppppppu)
 GO(gtk_cell_renderer_combo_get_type, LFv)
 GO(gtk_cell_renderer_combo_new, pFv)
 GO(gtk_cell_renderer_editing_canceled, vFp)
@@ -370,7 +370,7 @@ GO(gtk_cell_renderer_pixbuf_get_type, LFv)
 GO(gtk_cell_renderer_pixbuf_new, pFv)
 GO(gtk_cell_renderer_progress_get_type, LFv)
 GO(gtk_cell_renderer_progress_new, pFv)
-GO(gtk_cell_renderer_render, vFppppppi)
+GO(gtk_cell_renderer_render, vFppppppu)
 GO(gtk_cell_renderer_set_alignment, vFpff)
 GO(gtk_cell_renderer_set_fixed_size, vFpii)
 GO(gtk_cell_renderer_set_padding, vFpii)
@@ -380,7 +380,7 @@ GO(gtk_cell_renderer_spin_get_type, LFv)
 GO(gtk_cell_renderer_spinner_get_type, LFv)
 GO(gtk_cell_renderer_spinner_new, pFv)
 GO(gtk_cell_renderer_spin_new, pFv)
-GO(gtk_cell_renderer_start_editing, pFppppppi)
+GO(gtk_cell_renderer_start_editing, pFppppppu)
 GO(gtk_cell_renderer_state_get_type, LFv)
 GO(gtk_cell_renderer_stop_editing, vFpi)
 GO(gtk_cell_renderer_text_get_type, LFv)
@@ -395,18 +395,18 @@ GO(gtk_cell_renderer_toggle_set_activatable, vFpi)
 GO(gtk_cell_renderer_toggle_set_active, vFpi)
 GO(gtk_cell_renderer_toggle_set_radio, vFpi)
 GO(gtk_cell_type_get_type, LFv)
-//GO(gtk_cell_view_get_cell_renderers, 
-//GO(gtk_cell_view_get_displayed_row, 
-//GO(gtk_cell_view_get_model, 
-//GO(gtk_cell_view_get_size_of_row, 
+GO(gtk_cell_view_get_cell_renderers, pFp)
+GO(gtk_cell_view_get_displayed_row, pFp)
+GO(gtk_cell_view_get_model, pFp)
+GO(gtk_cell_view_get_size_of_row, iFppp)
 GO(gtk_cell_view_get_type, LFv)
 //GO(gtk_cell_view_new, 
 //GO(gtk_cell_view_new_with_markup, 
-//GO(gtk_cell_view_new_with_pixbuf, 
+GO(gtk_cell_view_new_with_pixbuf, pFp)
 //GO(gtk_cell_view_new_with_text, 
-//GO(gtk_cell_view_set_background_color, 
-//GO(gtk_cell_view_set_displayed_row, 
-//GO(gtk_cell_view_set_model, 
+GO(gtk_cell_view_set_background_color, vFpp)
+GO(gtk_cell_view_set_displayed_row, vFpp)
+GO(gtk_cell_view_set_model, vFpp)
 GO(gtk_check_button_get_type, LFv)
 GO(gtk_check_button_new, pFv)
 GO(gtk_check_button_new_with_label, pFp)
@@ -436,7 +436,7 @@ GOM(gtk_clipboard_request_contents, vFEpppp)
 //GOM(gtk_clipboard_request_targets, vFEppp)
 GOM(gtk_clipboard_request_text, vFEppp)
 //GOM(gtk_clipboard_request_uris, vFEppp)
-GO(gtk_clipboard_set_can_store, vFppp)
+GO(gtk_clipboard_set_can_store, vFppi)
 GO(gtk_clipboard_set_image, vFpp)
 GO(gtk_clipboard_set_text, vFppi)
 GOM(gtk_clipboard_set_with_data, iFEppuppp)
@@ -563,7 +563,7 @@ GO(gtk_color_selection_set_has_opacity_control, vFpi)
 GO(gtk_color_selection_set_has_palette, vFpi)
 GO(gtk_color_selection_set_previous_alpha, vFpW)
 GO(gtk_color_selection_set_previous_color, vFpp)
-GO(gtk_color_selection_set_update_policy, vFpi)
+GO(gtk_color_selection_set_update_policy, vFpu)
 GO(gtk_combo_box_append_text, vFpp)
 GO(gtk_combo_box_entry_get_text_column, iFp)
 GO(gtk_combo_box_entry_get_type, LFv)
@@ -575,7 +575,7 @@ GO(gtk_combo_box_get_active, iFp)
 GO(gtk_combo_box_get_active_iter, iFpp)
 GO(gtk_combo_box_get_active_text, pFp)
 GO(gtk_combo_box_get_add_tearoffs, iFp)
-GO(gtk_combo_box_get_button_sensitivity, iFp)
+GO(gtk_combo_box_get_button_sensitivity, uFp)
 GO(gtk_combo_box_get_column_span_column, iFp)
 GO(gtk_combo_box_get_entry_text_column, iFp)
 GO(gtk_combo_box_get_focus_on_click, iFp)
@@ -600,7 +600,7 @@ GO(gtk_combo_box_remove_text, vFpi)
 GO(gtk_combo_box_set_active, vFpi)
 GO(gtk_combo_box_set_active_iter, vFpp)
 GO(gtk_combo_box_set_add_tearoffs, vFpi)
-GO(gtk_combo_box_set_button_sensitivity, vFpi)
+GO(gtk_combo_box_set_button_sensitivity, vFpu)
 GO(gtk_combo_box_set_column_span_column, vFpi)
 GO(gtk_combo_box_set_entry_text_column, vFpi)
 GO(gtk_combo_box_set_focus_on_click, vFpi)
@@ -610,13 +610,13 @@ GO(gtk_combo_box_set_row_span_column, vFpi)
 GO(gtk_combo_box_set_title, vFpp)
 GO(gtk_combo_box_set_wrap_width, vFpi)
 //GO(gtk_combo_box_text_append_text, 
-//GO(gtk_combo_box_text_get_active_text, 
+GO(gtk_combo_box_text_get_active_text, pFp)
 GO(gtk_combo_box_text_get_type, LFv)
-//GO(gtk_combo_box_text_insert_text, 
+GO(gtk_combo_box_text_insert_text, vFpip)
 //GO(gtk_combo_box_text_new, 
 //GO(gtk_combo_box_text_new_with_entry, 
-//GO(gtk_combo_box_text_prepend_text, 
-//GO(gtk_combo_box_text_remove, 
+GO(gtk_combo_box_text_prepend_text, vFpp)
+GO(gtk_combo_box_text_remove, vFpi)
 GO(gtk_combo_disable_activate, vFp)
 GO(gtk_combo_get_type, LFv)
 GO(gtk_combo_new, pFv)
@@ -635,7 +635,7 @@ GO(gtk_container_child_get_property, vFpppp)
 //GO2(gtk_container_child_set, vFpppV, gtk_container_child_set_valist)
 GO(gtk_container_child_set_property, vFpppp)
 //GO(gtk_container_child_set_valist, vFpppA)
-GO(gtk_container_child_type, iFp)
+GO(gtk_container_child_type, LFp)
 GO(gtk_container_class_find_child_property, pFpp)
 GO(gtk_container_class_install_child_property, vFpup)
 GO(gtk_container_class_list_child_properties, pFpp)
@@ -648,7 +648,7 @@ GO(gtk_container_get_focus_chain, iFpp)
 GO(gtk_container_get_focus_child, pFp)
 GO(gtk_container_get_focus_hadjustment, pFp)
 GO(gtk_container_get_focus_vadjustment, pFp)
-GO(gtk_container_get_resize_mode, iFp)
+GO(gtk_container_get_resize_mode, uFp)
 GO(gtk_container_get_type, LFv)
 GO(gtk_container_propagate_expose, vFppp)
 GO(gtk_container_remove, vFpp)
@@ -658,8 +658,8 @@ GO(gtk_container_set_focus_chain, vFpp)
 GO(gtk_container_set_focus_child, vFpp)
 GO(gtk_container_set_focus_hadjustment, vFpp)
 GO(gtk_container_set_focus_vadjustment, vFpp)
-GO(gtk_container_set_reallocate_redraws, vFpp)
-GO(gtk_container_set_resize_mode, vFpi)
+GO(gtk_container_set_reallocate_redraws, vFpi)
+GO(gtk_container_set_resize_mode, vFpu)
 GO(gtk_container_unset_focus_chain, vFp)
 GO(gtk_corner_type_get_type, LFv)
 //GO(gtk_ctree_collapse, 
@@ -687,8 +687,8 @@ GO(gtk_ctree_get_type, LFv)
 //GO(gtk_ctree_last, 
 GO(gtk_ctree_line_style_get_type, LFv)
 //GO(gtk_ctree_move, 
-//GO(gtk_ctree_new, 
-//GO(gtk_ctree_new_with_titles, 
+GO(gtk_ctree_new, pFii)
+GO(gtk_ctree_new_with_titles, pFiip)
 //GO(gtk_ctree_node_get_cell_style, 
 //GO(gtk_ctree_node_get_cell_type, 
 //GO(gtk_ctree_node_get_pixmap, 
@@ -738,7 +738,7 @@ GO(gtk_curve_get_type, LFv)
 GO(gtk_curve_get_vector, vFpip)
 GO(gtk_curve_new, pFv)
 GO(gtk_curve_reset, vFp)
-GO(gtk_curve_set_curve_type, vFpi)
+GO(gtk_curve_set_curve_type, vFpu)
 GO(gtk_curve_set_gamma, vFpf)
 GO(gtk_curve_set_range, vFpffff)
 GO(gtk_curve_set_vector, vFpip)
@@ -772,7 +772,7 @@ GO(gtk_dialog_set_has_separator, vFpi)
 GO(gtk_dialog_set_response_sensitive, vFpii)
 GO(gtk_direction_type_get_type, LFv)
 GO(gtk_disable_setlocale, vFv)
-GO(gtk_drag_begin, pFppiip)
+GO(gtk_drag_begin, pFppuip)
 GO(gtk_drag_check_threshold, iFpiiii)
 GO(gtk_drag_dest_add_image_targets, vFp)
 GO(gtk_drag_dest_add_text_targets, vFp)
@@ -780,8 +780,8 @@ GO(gtk_drag_dest_add_uri_targets, vFp)
 GO(gtk_drag_dest_find_target, pFppp)
 GO(gtk_drag_dest_get_target_list, pFp)
 GO(gtk_drag_dest_get_track_motion, iFp)
-GO(gtk_drag_dest_set, vFpipii)
-GO(gtk_drag_dest_set_proxy, vFppii)
+GO(gtk_drag_dest_set, vFpupiu)
+GO(gtk_drag_dest_set_proxy, vFppui)
 GO(gtk_drag_dest_set_target_list, vFpp)
 GO(gtk_drag_dest_set_track_motion, vFpi)
 GO(gtk_drag_dest_unset, vFp)
@@ -801,7 +801,7 @@ GO(gtk_drag_source_add_image_targets, vFp)
 GO(gtk_drag_source_add_text_targets, vFp)
 GO(gtk_drag_source_add_uri_targets, vFp)
 GO(gtk_drag_source_get_target_list, pFp)
-GO(gtk_drag_source_set, vFpipii)
+GO(gtk_drag_source_set, vFpupiu)
 GO(gtk_drag_source_set_icon, vFpppp)
 GO(gtk_drag_source_set_icon_name, vFpp)
 GO(gtk_drag_source_set_icon_pixbuf, vFpp)
@@ -809,31 +809,31 @@ GO(gtk_drag_source_set_icon_stock, vFpp)
 GO(gtk_drag_source_set_target_list, vFpp)
 GO(gtk_drag_source_unset, vFp)
 GO(gtk_drag_unhighlight, vFp)
-GO(gtk_draw_arrow, vFppiiiiiiii)
+GO(gtk_draw_arrow, vFppuuuiiiii)
 GO(gtk_draw_box, vFppiiiiii)
-GO(gtk_draw_box_gap, vFppiiiiiiiii)
+GO(gtk_draw_box_gap, vFppuuiiiiuii)
 GO(gtk_draw_check, vFppiiiiii)
 GO(gtk_draw_diamond, vFppiiiiii)
-GO(gtk_draw_expander, vFppiiii)
-GO(gtk_draw_extension, vFppiiiiiii)
+GO(gtk_draw_expander, vFppuiiu)
+GO(gtk_draw_extension, vFppuuiiiiu)
 GO(gtk_draw_flat_box, vFppiiiiii)
 GO(gtk_draw_focus, vFppiiii)
-GO(gtk_draw_handle, vFppiiiiiii)
+GO(gtk_draw_handle, vFppuuiiiiu)
 GO(gtk_draw_hline, vFppiiii)
 GO(gtk_drawing_area_get_type, LFv)
 GO(gtk_drawing_area_new, pFv)
 GO(gtk_drawing_area_size, vFpii)
-GO(gtk_draw_insertion_cursor, vFppppiii)
-GO(gtk_draw_layout, vFppiiiip)
+GO(gtk_draw_insertion_cursor, vFppppiui)
+GO(gtk_draw_layout, vFppuiiip)
 GO(gtk_draw_option, vFppiiiiii)
-GO(gtk_draw_polygon, vFppiipii)
-GO(gtk_draw_resize_grip, vFppiiiiii)
+GO(gtk_draw_polygon, vFppuupii)
+GO(gtk_draw_resize_grip, vFppuuiiii)
 GO(gtk_draw_shadow, vFppiiiiii)
 GO(gtk_draw_shadow_gap, vFppiiiiiiiii)
 GO(gtk_draw_slider, vFppiiiiiii)
-GO(gtk_draw_string, vFppiiip)
-GO(gtk_draw_tab, vFppiiiiii)
-GO(gtk_draw_vline, vFppiiii)
+GO(gtk_draw_string, vFppuiip)
+GO(gtk_draw_tab, vFppuuiiii)
+GO(gtk_draw_vline, vFppuiii)
 GO(gtk_editable_copy_clipboard, vFp)
 GO(gtk_editable_cut_clipboard, vFp)
 GO(gtk_editable_delete_selection, vFp)
@@ -849,113 +849,113 @@ GO(gtk_editable_select_region, vFpii)
 GO(gtk_editable_set_editable, vFpi)
 GO(gtk_editable_set_position, vFpi)
 GO(gtk_entry_append_text, vFpp)
-//GO(gtk_entry_buffer_delete_text, 
-//GO(gtk_entry_buffer_emit_deleted_text, 
-//GO(gtk_entry_buffer_emit_inserted_text, 
-//GO(gtk_entry_buffer_get_bytes, 
-//GO(gtk_entry_buffer_get_length, 
-//GO(gtk_entry_buffer_get_max_length, 
-//GO(gtk_entry_buffer_get_text, 
+GO(gtk_entry_buffer_delete_text, uFpui)
+GO(gtk_entry_buffer_emit_deleted_text, vFpuu)
+GO(gtk_entry_buffer_emit_inserted_text, vFpupu)
+GO(gtk_entry_buffer_get_bytes, LFp)
+GO(gtk_entry_buffer_get_length, uFp)
+GO(gtk_entry_buffer_get_max_length, iFp)
+GO(gtk_entry_buffer_get_text, pFp)
 GO(gtk_entry_buffer_get_type, LFv)
-//GO(gtk_entry_buffer_insert_text, 
-//GO(gtk_entry_buffer_new, 
-//GO(gtk_entry_buffer_set_max_length, 
-//GO(gtk_entry_buffer_set_text, 
+GO(gtk_entry_buffer_insert_text, uFpupi)
+GO(gtk_entry_buffer_new, pFpi)
+GO(gtk_entry_buffer_set_max_length, vFpi)
+GO(gtk_entry_buffer_set_text, vFppi)
 //GO(gtk_entry_completion_complete, 
 //GO(gtk_entry_completion_delete_action, 
-//GO(gtk_entry_completion_get_completion_prefix, 
-//GO(gtk_entry_completion_get_entry, 
+GO(gtk_entry_completion_get_completion_prefix, pFp)
+GO(gtk_entry_completion_get_entry, pFp)
 //GO(gtk_entry_completion_get_inline_completion, 
 //GO(gtk_entry_completion_get_inline_selection, 
 //GO(gtk_entry_completion_get_minimum_key_length, 
-//GO(gtk_entry_completion_get_model, 
+GO(gtk_entry_completion_get_model, pFp)
 //GO(gtk_entry_completion_get_popup_completion, 
 //GO(gtk_entry_completion_get_popup_set_width, 
-//GO(gtk_entry_completion_get_popup_single_match, 
-//GO(gtk_entry_completion_get_text_column, 
+GO(gtk_entry_completion_get_popup_single_match, iFp)
+GO(gtk_entry_completion_get_text_column, iFp)
 GO(gtk_entry_completion_get_type, LFv)
-//GO(gtk_entry_completion_insert_action_markup, 
+GO(gtk_entry_completion_insert_action_markup, vFpip)
 //GO(gtk_entry_completion_insert_action_text, 
-//GO(gtk_entry_completion_insert_prefix, 
-//GO(gtk_entry_completion_new, 
+GO(gtk_entry_completion_insert_prefix, vFp)
+GO(gtk_entry_completion_new, pFv)
 //GO(gtk_entry_completion_set_inline_completion, 
 //GO(gtk_entry_completion_set_inline_selection, 
 //GO(gtk_entry_completion_set_match_func, 
 //GO(gtk_entry_completion_set_minimum_key_length, 
-//GO(gtk_entry_completion_set_model, 
+GO(gtk_entry_completion_set_model, vFpp)
 //GO(gtk_entry_completion_set_popup_completion, 
 //GO(gtk_entry_completion_set_popup_set_width, 
-//GO(gtk_entry_completion_set_popup_single_match, 
-//GO(gtk_entry_completion_set_text_column, 
+GO(gtk_entry_completion_set_popup_single_match, vFpi)
+GO(gtk_entry_completion_set_text_column, vFpi)
 GO(gtk_entry_get_activates_default, iFp)
 GO(gtk_entry_get_alignment, fFp)
-//GO(gtk_entry_get_buffer, 
-//GO(gtk_entry_get_completion, 
-//GO(gtk_entry_get_current_icon_drag_source, 
-//GO(gtk_entry_get_cursor_hadjustment, 
+GO(gtk_entry_get_buffer, pFp)
+GO(gtk_entry_get_completion, pFp)
+GO(gtk_entry_get_current_icon_drag_source, iFp)
+GO(gtk_entry_get_cursor_hadjustment, pFp)
 GO(gtk_entry_get_has_frame, iFp)
 //GO(gtk_entry_get_icon_activatable, 
-//GO(gtk_entry_get_icon_at_pos, 
-//GO(gtk_entry_get_icon_gicon, 
-//GO(gtk_entry_get_icon_name, 
-//GO(gtk_entry_get_icon_pixbuf, 
-//GO(gtk_entry_get_icon_sensitive, 
+GO(gtk_entry_get_icon_at_pos, iFpii)
+GO(gtk_entry_get_icon_gicon, pFpu)
+GO(gtk_entry_get_icon_name, pFpu)
+GO(gtk_entry_get_icon_pixbuf, pFpu)
+GO(gtk_entry_get_icon_sensitive, iFpu)
 //GO(gtk_entry_get_icon_stock, 
-//GO(gtk_entry_get_icon_storage_type, 
-//GO(gtk_entry_get_icon_tooltip_markup, 
+GO(gtk_entry_get_icon_storage_type, uFpu)
+GO(gtk_entry_get_icon_tooltip_markup, pFpu)
 //GO(gtk_entry_get_icon_tooltip_text, 
-//GO(gtk_entry_get_icon_window, 
+GO(gtk_entry_get_icon_window, pFpu)
 GO(gtk_entry_get_inner_border, pFp)
-//GO(gtk_entry_get_invisible_char, 
+GO(gtk_entry_get_invisible_char, uFp)
 GO(gtk_entry_get_layout, pFp)
 GO(gtk_entry_get_layout_offsets, vFppp)
 //GO(gtk_entry_get_max_length, 
 GO(gtk_entry_get_overwrite_mode, iFp)
 //GO(gtk_entry_get_progress_fraction, 
-//GO(gtk_entry_get_progress_pulse_step, 
+GO(gtk_entry_get_progress_pulse_step, dFp)
 GO(gtk_entry_get_text, pFp)
 GO(gtk_entry_get_text_length, WFp)
-//GO(gtk_entry_get_text_window, 
+GO(gtk_entry_get_text_window, pFp)
 GO(gtk_entry_get_type, LFv)
 //GO(gtk_entry_get_visibility, 
 GO(gtk_entry_get_width_chars, iFp)
 GO(gtk_entry_icon_position_get_type, LFv)
-//GO(gtk_entry_im_context_filter_keypress, 
+GO(gtk_entry_im_context_filter_keypress, iFpp)
 //GO(gtk_entry_layout_index_to_text_index, 
 GO(gtk_entry_new, pFv)
 GO(gtk_entry_new_with_buffer, pFp)
 GO(gtk_entry_new_with_max_length, pFi)
 GO(gtk_entry_prepend_text, vFpp)
 //GO(gtk_entry_progress_pulse, 
-//GO(gtk_entry_reset_im_context, 
+GO(gtk_entry_reset_im_context, vFp)
 GO(gtk_entry_select_region, vFpii)
 GO(gtk_entry_set_activates_default, vFpi)
 GO(gtk_entry_set_alignment, vFpf)
 GO(gtk_entry_set_buffer, vFpp)
-//GO(gtk_entry_set_completion, 
-//GO(gtk_entry_set_cursor_hadjustment, 
+GO(gtk_entry_set_completion, vFpp)
+GO(gtk_entry_set_cursor_hadjustment, vFpp)
 GO(gtk_entry_set_editable, vFpi)
 GO(gtk_entry_set_has_frame, vFpi)
 //GO(gtk_entry_set_icon_activatable, 
-//GO(gtk_entry_set_icon_drag_source, 
-//GO(gtk_entry_set_icon_from_gicon, 
+GO(gtk_entry_set_icon_drag_source, vFpupu)
+GO(gtk_entry_set_icon_from_gicon, vFpup)
 //GO(gtk_entry_set_icon_from_icon_name, 
-//GO(gtk_entry_set_icon_from_pixbuf, 
+GO(gtk_entry_set_icon_from_pixbuf, vFpup)
 //GO(gtk_entry_set_icon_from_stock, 
-//GO(gtk_entry_set_icon_sensitive, 
-//GO(gtk_entry_set_icon_tooltip_markup, 
+GO(gtk_entry_set_icon_sensitive, vFpui)
+GO(gtk_entry_set_icon_tooltip_markup, vFpup)
 //GO(gtk_entry_set_icon_tooltip_text, 
 GO(gtk_entry_set_inner_border, vFpp)
-GO(gtk_entry_set_invisible_char, vFp)
+GO(gtk_entry_set_invisible_char, vFpu)
 GO(gtk_entry_set_max_length, vFpi)
 GO(gtk_entry_set_overwrite_mode, vFpi)
 GO(gtk_entry_set_position, vFpi)
 //GO(gtk_entry_set_progress_fraction, 
-//GO(gtk_entry_set_progress_pulse_step, 
+GO(gtk_entry_set_progress_pulse_step, vFpd)
 GO(gtk_entry_set_text, vFpp)
 GO(gtk_entry_set_visibility, vFpi)
 GO(gtk_entry_set_width_chars, uFp)
-//GO(gtk_entry_text_index_to_layout_index, 
+GO(gtk_entry_text_index_to_layout_index, iFpi)
 //GO(gtk_entry_unset_invisible_char, 
 GOM(gtk_enumerate_printers, vFEpppi)
 GO(gtk_event_box_get_above_child, iFp)
@@ -993,8 +993,8 @@ GO(gtk_file_chooser_button_get_focus_on_click, iFp)
 GO(gtk_file_chooser_button_get_title, pFp)
 GO(gtk_file_chooser_button_get_type, LFv)
 GO(gtk_file_chooser_button_get_width_chars, iFp)
-GO(gtk_file_chooser_button_new, pFpi)
-GO(gtk_file_chooser_button_new_with_backend, pFpip)
+GO(gtk_file_chooser_button_new, pFpu)
+GO(gtk_file_chooser_button_new_with_backend, pFpup)
 GO(gtk_file_chooser_button_new_with_dialog, pFp)
 GO(gtk_file_chooser_button_set_focus_on_click, vFpi)
 GO(gtk_file_chooser_button_set_title, vFpp)
@@ -1005,7 +1005,7 @@ GO(gtk_file_chooser_dialog_new, pFppipipipipipipip)  // vaargs (so pFppipV) with
 GO(gtk_file_chooser_dialog_new_with_backend, pFppippipipipipipip)   // same but pFppippV
 GO(gtk_file_chooser_error_get_type, LFv)
 GO(gtk_file_chooser_error_quark, pFv)
-GO(gtk_file_chooser_get_action, iFp)
+GO(gtk_file_chooser_get_action, uFp)
 GO(gtk_file_chooser_get_create_folders, iFp)
 GO(gtk_file_chooser_get_current_folder, pFp)
 GO(gtk_file_chooser_get_current_folder_file, pFp)
@@ -1039,7 +1039,7 @@ GO(gtk_file_chooser_select_all, vFp)
 GO(gtk_file_chooser_select_file, iFppp)
 GO(gtk_file_chooser_select_filename, iFpp)
 GO(gtk_file_chooser_select_uri, iFpp)
-GO(gtk_file_chooser_set_action, vFpi)
+GO(gtk_file_chooser_set_action, vFpu)
 GO(gtk_file_chooser_set_create_folders, vFpi)
 GO(gtk_file_chooser_set_current_folder, iFpp)
 GO(gtk_file_chooser_set_current_folder_file, iFppp)
@@ -1062,8 +1062,8 @@ GO(gtk_file_chooser_unselect_file, vFpp)
 GO(gtk_file_chooser_unselect_filename, vFpp)
 GO(gtk_file_chooser_unselect_uri, vFpp)
 GO(gtk_file_chooser_widget_get_type, LFv)
-GO(gtk_file_chooser_widget_new, pFi)
-GO(gtk_file_chooser_widget_new_with_backend, pFip)
+GO(gtk_file_chooser_widget_new, pFu)
+GO(gtk_file_chooser_widget_new_with_backend, pFup)
 GOM(gtk_file_filter_add_custom, vFEpuppp)
 //GO(gtk_file_filter_add_mime_type, vFpp)
 GO(gtk_file_filter_add_pattern, vFpp)
@@ -1071,7 +1071,7 @@ GO(gtk_file_filter_add_pixbuf_formats, vFp)
 GO(gtk_file_filter_filter, iFpp)
 GO(gtk_file_filter_flags_get_type, LFv)
 GO(gtk_file_filter_get_name, pFp)
-GO(gtk_file_filter_get_needed, iFp)
+GO(gtk_file_filter_get_needed, uFp)
 GO(gtk_file_filter_get_type, LFv)
 GO(gtk_file_filter_new, pFv)
 GO(gtk_file_filter_set_name, vFpp)
@@ -1115,7 +1115,7 @@ GO(gtk_font_selection_dialog_get_ok_button, pFp)
 GO(gtk_font_selection_dialog_get_preview_text, pFp)
 GO(gtk_font_selection_dialog_get_type, LFv)
 GO(gtk_font_selection_dialog_new, pFp)
-GO(gtk_font_selection_dialog_set_font_name, vFpp)
+GO(gtk_font_selection_dialog_set_font_name, iFpp)
 GO(gtk_font_selection_dialog_set_preview_text, vFpp)
 GO(gtk_font_selection_get_face, pFp)
 GO(gtk_font_selection_get_face_list, pFp)
@@ -1135,13 +1135,13 @@ GO(gtk_font_selection_set_preview_text, vFpp)
 GO(gtk_frame_get_label, pFp)
 GO(gtk_frame_get_label_align, vFppp)
 GO(gtk_frame_get_label_widget, pFp)
-GO(gtk_frame_get_shadow_type, iFp)
+GO(gtk_frame_get_shadow_type, uFp)
 GO(gtk_frame_get_type, LFv)
 GO(gtk_frame_new, pFp)
 GO(gtk_frame_set_label, vFpp)
 GO(gtk_frame_set_label_align, vFpff)
 GO(gtk_frame_set_label_widget, vFpp)
-GO(gtk_frame_set_shadow_type, vFpi)
+GO(gtk_frame_set_shadow_type, vFpu)
 GO(gtk_gamma_curve_get_type, LFv)
 GO(gtk_gamma_curve_new, pFv)
 GO(gtk_gc_get, pFippu)
@@ -1157,13 +1157,13 @@ GO(gtk_grab_get_current, pFv)
 GO(gtk_grab_remove, vFp)
 GO(gtk_handle_box_get_child_detached, iFp)
 GO(gtk_handle_box_get_handle_position, iFp)
-GO(gtk_handle_box_get_shadow_type, iFp)
-GO(gtk_handle_box_get_snap_edge, iFp)
+GO(gtk_handle_box_get_shadow_type, uFp)
+GO(gtk_handle_box_get_snap_edge, uFp)
 GO(gtk_handle_box_get_type, LFv)
 GO(gtk_handle_box_new, pFv)
 GO(gtk_handle_box_set_handle_position, vFpi)
-GO(gtk_handle_box_set_shadow_type, vFpi)
-GO(gtk_handle_box_set_snap_edge, vFpi)
+GO(gtk_handle_box_set_shadow_type, vFpu)
+GO(gtk_handle_box_set_snap_edge, vFpu)
 GO(gtk_hbox_get_type, LFv)
 GO(gtk_hbox_new, pFii)
 GO(gtk_hbutton_box_get_layout_default, iFv)
@@ -1183,13 +1183,13 @@ GO(gtk_hscrollbar_get_type, LFv)
 GO(gtk_hscrollbar_new, pFp)
 GO(gtk_hseparator_get_type, LFv)
 GO(gtk_hseparator_new, pFv)
-//GO(gtk_hsv_get_color, 
-//GO(gtk_hsv_get_metrics, 
+GO(gtk_hsv_get_color, vFpppp)
+GO(gtk_hsv_get_metrics, vFppp)
 GO(gtk_hsv_get_type, LFv)
-//GO(gtk_hsv_is_adjusting, 
+GO(gtk_hsv_is_adjusting, iFp)
 //GO(gtk_hsv_new, 
-//GO(gtk_hsv_set_color, 
-//GO(gtk_hsv_set_metrics, 
+GO(gtk_hsv_set_color, vFpddd)
+GO(gtk_hsv_set_metrics, vFpii)
 //GO(gtk_hsv_to_rgb, 
 GO(gtk_icon_factory_add, vFppp)
 GO(gtk_icon_factory_add_default, vFp)
@@ -1209,7 +1209,7 @@ GO(gtk_icon_info_get_filename, pFp)
 GO(gtk_icon_info_get_type, LFv)
 GO(gtk_icon_info_load_icon, pFpp)
 GO(gtk_icon_info_new_for_pixbuf, pFpp)
-GO(gtk_icon_info_set_raw_coordinates, vFpp)
+GO(gtk_icon_info_set_raw_coordinates, vFpi)
 GO(gtk_icon_lookup_flags_get_type, LFv)
 GO(gtk_icon_set_add_source, vFpp)
 GO(gtk_icon_set_copy, pFp)
@@ -1218,36 +1218,36 @@ GO(gtk_icon_set_get_type, LFv)
 GO(gtk_icon_set_new, pFv)
 GO(gtk_icon_set_new_from_pixbuf, pFp)
 GO(gtk_icon_set_ref, pFp)
-GO(gtk_icon_set_render_icon, pFppipipp)
+GO(gtk_icon_set_render_icon, pFppuuupp)
 GO(gtk_icon_set_unref, vFp)
-GO(gtk_icon_size_from_name, iFp)
-GO(gtk_icon_size_get_name, pFi)
+GO(gtk_icon_size_from_name, uFp)
+GO(gtk_icon_size_get_name, pFu)
 GO(gtk_icon_size_get_type, LFv)
-GO(gtk_icon_size_lookup, iFipp)
-GO(gtk_icon_size_lookup_for_settings, iFpipp)
-GO(gtk_icon_size_register, iFpii)
-GO(gtk_icon_size_register_alias, vFpi)
+GO(gtk_icon_size_lookup, iFupp)
+GO(gtk_icon_size_lookup_for_settings, iFpupp)
+GO(gtk_icon_size_register, uFpii)
+GO(gtk_icon_size_register_alias, vFpu)
 GO(gtk_icon_source_copy, pFp)
 GO(gtk_icon_source_free, vFp)
-GO(gtk_icon_source_get_direction, iFp)
+GO(gtk_icon_source_get_direction, uFp)
 GO(gtk_icon_source_get_direction_wildcarded, iFp)
 GO(gtk_icon_source_get_filename, pFp)
 GO(gtk_icon_source_get_icon_name, pFp)
 GO(gtk_icon_source_get_pixbuf, pFp)
-GO(gtk_icon_source_get_size, iFp)
+GO(gtk_icon_source_get_size, uFp)
 GO(gtk_icon_source_get_size_wildcarded, iFp)
-GO(gtk_icon_source_get_state, iFp)
+GO(gtk_icon_source_get_state, uFp)
 GO(gtk_icon_source_get_state_wildcarded, iFp)
 GO(gtk_icon_source_get_type, LFv)
 GO(gtk_icon_source_new, pFv)
-GO(gtk_icon_source_set_direction, vFpi)
+GO(gtk_icon_source_set_direction, vFpu)
 GO(gtk_icon_source_set_direction_wildcarded, vFpi)
 GO(gtk_icon_source_set_filename, vFpp)
 GO(gtk_icon_source_set_icon_name, vFpp)
 GO(gtk_icon_source_set_pixbuf, vFpp)
-GO(gtk_icon_source_set_size, vFpi)
+GO(gtk_icon_source_set_size, vFpu)
 GO(gtk_icon_source_set_size_wildcarded, vFpi)
-GO(gtk_icon_source_set_state, vFpi)
+GO(gtk_icon_source_set_state, vFpu)
 GO(gtk_icon_source_set_state_wildcarded, vFpi)
 GO(gtk_icon_theme_add_builtin_icon, vFpip)
 GO(gtk_icon_theme_append_search_path, vFpp)
@@ -1275,8 +1275,8 @@ GO(gtk_icon_theme_set_search_path, vFppi)
 GO(gtk_icon_view_convert_widget_to_bin_window_coords, vFpiipp)
 GO(gtk_icon_view_create_drag_icon, pFpp)
 GO(gtk_icon_view_drop_position_get_type, LFv)
-GO(gtk_icon_view_enable_model_drag_dest, vFppii)
-GO(gtk_icon_view_enable_model_drag_source, vFpipii)
+GO(gtk_icon_view_enable_model_drag_dest, vFppiu)
+GO(gtk_icon_view_enable_model_drag_source, vFpupiu)
 GO(gtk_icon_view_get_columns, iFp)
 GO(gtk_icon_view_get_column_spacing, iFp)
 GO(gtk_icon_view_get_cursor, iFppp)
@@ -1284,7 +1284,7 @@ GO(gtk_icon_view_get_dest_item_at_pos, iFpiipp)
 GO(gtk_icon_view_get_drag_dest_item, vFppp)
 GO(gtk_icon_view_get_item_at_pos, iFpiipp)
 GO(gtk_icon_view_get_item_column, iFpp)
-GO(gtk_icon_view_get_item_orientation, iFp)
+GO(gtk_icon_view_get_item_orientation, uFp)
 GO(gtk_icon_view_get_item_padding, iFp)
 GO(gtk_icon_view_get_item_row, iFpp)
 GO(gtk_icon_view_get_item_width, iFp)
@@ -1297,7 +1297,7 @@ GO(gtk_icon_view_get_pixbuf_column, iFp)
 GO(gtk_icon_view_get_reorderable, iFp)
 GO(gtk_icon_view_get_row_spacing, iFp)
 GO(gtk_icon_view_get_selected_items, pFp)
-GO(gtk_icon_view_get_selection_mode, iFp)
+GO(gtk_icon_view_get_selection_mode, uFp)
 GO(gtk_icon_view_get_spacing, iFp)
 GO(gtk_icon_view_get_text_column, iFp)
 GO(gtk_icon_view_get_tooltip_column, iFp)
@@ -1315,8 +1315,8 @@ GO(gtk_icon_view_select_path, vFpp)
 GO(gtk_icon_view_set_columns, vFpi)
 GO(gtk_icon_view_set_column_spacing, vFpi)
 GO(gtk_icon_view_set_cursor, vFpppi)
-GO(gtk_icon_view_set_drag_dest_item, vFppi)
-GO(gtk_icon_view_set_item_orientation, vFpi)
+GO(gtk_icon_view_set_drag_dest_item, vFppu)
+GO(gtk_icon_view_set_item_orientation, vFpu)
 GO(gtk_icon_view_set_item_padding, vFpi)
 GO(gtk_icon_view_set_item_width, vFpi)
 GO(gtk_icon_view_set_margin, vFpi)
@@ -1326,7 +1326,7 @@ GO(gtk_icon_view_set_orientation, vFpi)
 GO(gtk_icon_view_set_pixbuf_column, vFpi)
 GO(gtk_icon_view_set_reorderable, vFpi)
 GO(gtk_icon_view_set_row_spacing, vFpi)
-GO(gtk_icon_view_set_selection_mode, vFpi)
+GO(gtk_icon_view_set_selection_mode, vFpu)
 GO(gtk_icon_view_set_spacing, vFpi)
 GO(gtk_icon_view_set_text_column, vFpi)
 GO(gtk_icon_view_set_tooltip_cell, vFpppp)
@@ -1353,7 +1353,7 @@ GO(gtk_image_get_pixbuf, pFp)
 GO(gtk_image_get_pixel_size, iFp)
 GO(gtk_image_get_pixmap, vFppp)
 GO(gtk_image_get_stock, vFppp)
-GO(gtk_image_get_storage_type, iFp)
+GO(gtk_image_get_storage_type, uFp)
 GO(gtk_image_get_type, LFv)
 GO(gtk_image_menu_item_get_always_show_image, iFp)
 GO(gtk_image_menu_item_get_image, pFp)
@@ -1370,19 +1370,19 @@ GO(gtk_image_menu_item_set_use_stock, vFpi)
 GO(gtk_image_new, pFv)
 GO(gtk_image_new_from_animation, pFp)
 GO(gtk_image_new_from_file, pFp)
-GO(gtk_image_new_from_gicon, pFpi)
-GO(gtk_image_new_from_icon_name, pFpi)
-GO(gtk_image_new_from_icon_set, pFpi)
+GO(gtk_image_new_from_gicon, pFpu)
+GO(gtk_image_new_from_icon_name, pFpu)
+GO(gtk_image_new_from_icon_set, pFpu)
 GO(gtk_image_new_from_image, pFpp)
 GO(gtk_image_new_from_pixbuf, pFp)
 GO(gtk_image_new_from_pixmap, pFpp)
 GO(gtk_image_new_from_stock, pFpi)
 GO(gtk_image_set, vFppp)
 GO(gtk_image_set_from_animation, vFpp)
-GO(gtk_image_set_from_file, vFppp)
-GO(gtk_image_set_from_gicon, vFppi)
-GO(gtk_image_set_from_icon_name, vFppi)
-GO(gtk_image_set_from_icon_set, vFppi)
+GO(gtk_image_set_from_file, vFpp)
+GO(gtk_image_set_from_gicon, vFppu)
+GO(gtk_image_set_from_icon_name, vFppu)
+GO(gtk_image_set_from_icon_set, vFppu)
 GO(gtk_image_set_from_image, vFppp)
 GO(gtk_image_set_from_pixbuf, vFpp)
 GO(gtk_image_set_from_pixmap, vFppp)
@@ -1411,19 +1411,19 @@ GO(gtk_im_multicontext_new, pFv)
 GO(gtk_im_multicontext_set_context_id, vFpp)
 GO(gtk_im_preedit_style_get_type, LFv)
 GO(gtk_im_status_style_get_type, LFv)
-//GO(gtk_info_bar_add_action_widget, 
-//GO(gtk_info_bar_add_button, 
+GO(gtk_info_bar_add_action_widget, vFppi)
+GO(gtk_info_bar_add_button, pFppi)
 //GO(gtk_info_bar_add_buttons, 
 //GO(gtk_info_bar_get_action_area, 
-//GO(gtk_info_bar_get_content_area, 
-//GO(gtk_info_bar_get_message_type, 
+GO(gtk_info_bar_get_content_area, pFp)
+GO(gtk_info_bar_get_message_type, uFp)
 GO(gtk_info_bar_get_type, LFv)
 //GO(gtk_info_bar_new, 
 //GO(gtk_info_bar_new_with_buttons, 
-//GO(gtk_info_bar_response, 
+GO(gtk_info_bar_response, vFpi)
 //GO(gtk_info_bar_set_default_response, 
-//GO(gtk_info_bar_set_message_type, 
-//GO(gtk_info_bar_set_response_sensitive, 
+GO(gtk_info_bar_set_message_type, vFpu)
+GO(gtk_info_bar_set_response_sensitive, vFpii)
 GOM(gtk_init, vFEpp)
 //GO(gtk_init_add, 
 GOM(gtk_init_check, iFEpp)
@@ -1432,13 +1432,13 @@ GOM(gtk_input_add_full, uFEiipppp)
 GO(gtk_input_dialog_get_type, LFv)
 GO(gtk_input_dialog_new, pFv)
 GO(gtk_input_remove, vFu)
-//GO(gtk_invisible_get_screen, 
+GO(gtk_invisible_get_screen, pFp)
 GO(gtk_invisible_get_type, LFv)
 //GO(gtk_invisible_new, 
-//GO(gtk_invisible_new_for_screen, 
-//GO(gtk_invisible_set_screen, 
+GO(gtk_invisible_new_for_screen, pFp)
+GO(gtk_invisible_set_screen, vFpp)
 //GO(gtk_item_deselect, 
-//GO(gtk_item_factories_path_delete, 
+GO(gtk_item_factories_path_delete, vFpp)
 //GO(gtk_item_factory_add_foreign, 
 //GO(gtk_item_factory_construct, 
 //GO(gtk_item_factory_create_item, 
@@ -1456,15 +1456,15 @@ GO(gtk_item_factory_get_type, LFv)
 //GO(gtk_item_factory_get_widget, 
 //GO(gtk_item_factory_get_widget_by_action, 
 //GO(gtk_item_factory_new, 
-//GO(gtk_item_factory_path_from_widget, 
+GO(gtk_item_factory_path_from_widget, pFp)
 //GO(gtk_item_factory_popup, 
 //GO(gtk_item_factory_popup_data, 
-//GO(gtk_item_factory_popup_data_from_widget, 
+GO(gtk_item_factory_popup_data_from_widget, pFp)
 //GO(gtk_item_factory_popup_with_data, 
 //GO(gtk_item_factory_set_translate_func, 
 GO(gtk_item_get_type, LFv)
 //GO(gtk_item_select, 
-//GO(gtk_item_toggle, 
+GO(gtk_item_toggle, vFp)
 GO(gtk_justification_get_type, LFv)
 //GOM(gtk_key_snooper_install, uFEBp)
 GO(gtk_key_snooper_remove, vFu)
@@ -1472,13 +1472,13 @@ GO(gtk_label_get, vFpp)
 GO(gtk_label_get_angle, dFp)
 GO(gtk_label_get_attributes, pFp)
 GO(gtk_label_get_current_uri, pFp)
-GO(gtk_label_get_ellipsize, iFp)
-GO(gtk_label_get_justify, iFp)
+GO(gtk_label_get_ellipsize, uFp)
+GO(gtk_label_get_justify, uFp)
 GO(gtk_label_get_label, pFp)
 GO(gtk_label_get_layout, pFp)
 GO(gtk_label_get_layout_offsets, vFppp)
 GO(gtk_label_get_line_wrap, iFp)
-GO(gtk_label_get_line_wrap_mode, iFp)
+GO(gtk_label_get_line_wrap_mode, uFp)
 GO(gtk_label_get_max_width_chars, iFp)
 GO(gtk_label_get_mnemonic_keyval, uFp)
 GO(gtk_label_get_mnemonic_widget, pFp)
@@ -1497,11 +1497,11 @@ GO(gtk_label_parse_uline, uFpp)
 GO(gtk_label_select_region, vFpii)
 GO(gtk_label_set_angle, vFpd)
 GO(gtk_label_set_attributes, vFpp)
-GO(gtk_label_set_ellipsize, vFpi)
-GO(gtk_label_set_justify, vFpi)
+GO(gtk_label_set_ellipsize, vFpu)
+GO(gtk_label_set_justify, vFpu)
 GO(gtk_label_set_label, vFpp)
 GO(gtk_label_set_line_wrap, vFpi)
-GO(gtk_label_set_line_wrap_mode, vFpi)
+GO(gtk_label_set_line_wrap_mode, vFpu)
 GO(gtk_label_set_markup, vFpp)
 GO(gtk_label_set_markup_with_mnemonic, vFpp)
 GO(gtk_label_set_max_width_chars, vFpi)
@@ -1525,7 +1525,7 @@ GO(gtk_layout_move, vFppii)
 GO(gtk_layout_new, pFpp)
 GO(gtk_layout_put, vFppii)
 GO(gtk_layout_set_hadjustment, vFpp)
-GO(gtk_layout_set_size, vFpii)
+GO(gtk_layout_set_size, vFpuu)
 GO(gtk_layout_set_vadjustment, vFpp)
 GO(gtk_layout_thaw, vFp)
 GO(gtk_link_button_get_type, LFv)
@@ -1541,7 +1541,7 @@ GO(gtk_list_child_position, iFpp)
 GO(gtk_list_clear_items, vFpii)
 GO(gtk_list_end_drag_selection, vFp)
 GO(gtk_list_end_selection, vFp)
-GO(gtk_list_extend_selection, vFpifi)
+GO(gtk_list_extend_selection, vFpufi)
 GO(gtk_list_get_type, LFv)
 GO(gtk_list_insert_items, vFppi)
 GO(gtk_list_item_deselect, vFp)
@@ -1554,11 +1554,11 @@ GO(gtk_list_prepend_items, vFpp)
 GO(gtk_list_remove_items, vFpp)
 GO(gtk_list_remove_items_no_unref, vFpp)
 GO(gtk_list_scroll_horizontal, vFpif)
-GO(gtk_list_scroll_vertical, vFpif)
+GO(gtk_list_scroll_vertical, vFpuf)
 GO(gtk_list_select_all, vFp)
 GO(gtk_list_select_child, vFpp)
 GO(gtk_list_select_item, vFpi)
-GO(gtk_list_set_selection_mode, vFpi)
+GO(gtk_list_set_selection_mode, vFpu)
 GO(gtk_list_start_selection, vFp)
 GO(gtk_list_store_append, vFpp)
 GO(gtk_list_store_clear, vFp)
@@ -1624,11 +1624,11 @@ GO(gtk_main_quit, vFv)
 GO(gtk_match_type_get_type, LFv)
 GO(gtk_menu_attach, vFppuuuu)
 GOM(gtk_menu_attach_to_widget, vFEppp)
-GO(gtk_menu_bar_get_child_pack_direction, iFp)
+GO(gtk_menu_bar_get_child_pack_direction, uFp)
 GO(gtk_menu_bar_get_pack_direction, iFp)
 GO(gtk_menu_bar_get_type, LFv)
 GO(gtk_menu_bar_new, pFv)
-GO(gtk_menu_bar_set_child_pack_direction, vFpi)
+GO(gtk_menu_bar_set_child_pack_direction, vFpu)
 GO(gtk_menu_bar_set_pack_direction, vFpi)
 GO(gtk_menu_detach, vFp)
 GO(gtk_menu_direction_type_get_type, LFv)
@@ -1649,11 +1649,11 @@ GO(gtk_menu_item_get_label, pFp)
 GO(gtk_menu_item_get_right_justified, iFp)
 GO(gtk_menu_item_get_submenu, pFp)
 GO(gtk_menu_item_get_type, LFv)
-GO(gtk_menu_item_get_use_underline, vFpi)
+GO(gtk_menu_item_get_use_underline, iFp)
 GO(gtk_menu_item_new, pFv)
 GO(gtk_menu_item_new_with_label, pFp)
 GO(gtk_menu_item_new_with_mnemonic, pFp)
-GO(gtk_menu_item_remove_submenu, pFp)
+GO(gtk_menu_item_remove_submenu, vFp)
 GO(gtk_menu_item_select, vFp)
 GO(gtk_menu_item_set_accel_path, vFpp)
 GO(gtk_menu_item_set_label, vFpp)
@@ -1675,7 +1675,7 @@ GO(gtk_menu_set_reserve_toggle_size, vFpi)
 GO(gtk_menu_set_screen, vFpp)
 GO(gtk_menu_set_tearoff_state, vFpi)
 GO(gtk_menu_set_title, vFpp)
-//GO(gtk_menu_shell_activate_item, 
+GO(gtk_menu_shell_activate_item, vFppi)
 GO(gtk_menu_shell_append, vFpp)
 //GO(gtk_menu_shell_cancel, 
 //GO(gtk_menu_shell_deactivate, 
@@ -1721,7 +1721,7 @@ GO(gtk_mount_operation_set_screen, vFpp)
 GO(gtk_movement_step_get_type, LFv)
 GO(gtk_notebook_append_page, iFppp)
 GO(gtk_notebook_append_page_menu, iFpppp)
-GO(gtk_notebook_get_action_widget, pFpi)
+GO(gtk_notebook_get_action_widget, pFpu)
 GO(gtk_notebook_get_current_page, iFp)
 GO(gtk_notebook_get_group, pFp)
 GO(gtk_notebook_get_group_id, iFp)
@@ -1737,7 +1737,7 @@ GO(gtk_notebook_get_tab_detachable, iFpp)
 GO(gtk_notebook_get_tab_hborder, WFp)
 GO(gtk_notebook_get_tab_label, pFpp)
 GO(gtk_notebook_get_tab_label_text, pFpp)
-GO(gtk_notebook_get_tab_pos, iFp)
+GO(gtk_notebook_get_tab_pos, uFp)
 GO(gtk_notebook_get_tab_reorderable, iFpp)
 GO(gtk_notebook_get_tab_vborder, WFp)
 GO(gtk_notebook_get_type, LFv)
@@ -1754,7 +1754,7 @@ GO(gtk_notebook_prev_page, vFp)
 GO(gtk_notebook_query_tab_label_packing, vFppppp)
 GO(gtk_notebook_remove_page, vFpi)
 GO(gtk_notebook_reorder_child, vFppi)
-GO(gtk_notebook_set_action_widget, vFppi)
+GO(gtk_notebook_set_action_widget, vFppu)
 GO(gtk_notebook_set_current_page, vFpi)
 GO(gtk_notebook_set_group, vFpp)
 GO(gtk_notebook_set_group_id, vFpi)
@@ -1769,20 +1769,20 @@ GO(gtk_notebook_set_tab_border, vFpu)
 GO(gtk_notebook_set_tab_detachable, vFppi)
 GO(gtk_notebook_set_tab_hborder, vFpu)
 GO(gtk_notebook_set_tab_label, vFppp)
-GO(gtk_notebook_set_tab_label_packing, vFppiii)
+GO(gtk_notebook_set_tab_label_packing, vFppiiu)
 GO(gtk_notebook_set_tab_label_text, vFppp)
-GO(gtk_notebook_set_tab_pos, vFpi)
+GO(gtk_notebook_set_tab_pos, vFpu)
 GO(gtk_notebook_set_tab_reorderable, vFppi)
 GO(gtk_notebook_set_tab_vborder, vFpu)
 //GOM(gtk_notebook_set_window_creation_hook, pFEppp)
 GO(gtk_notebook_tab_get_type, LFv)
 GO(gtk_number_up_layout_get_type, LFv)
-GO(gtk_object_add_arg_type, vFpiuu)
+GO(gtk_object_add_arg_type, vFpLuu)
 GO(gtk_object_destroy, vFp)
 GO(gtk_object_flags_get_type, LFv)
 GO(gtk_object_get, vFppppppppppp)   // vaarg
 GO(gtk_object_get_data, pFpp)
-GO(gtk_object_get_data_by_id, pFpp)
+GO(gtk_object_get_data_by_id, pFpu)
 GO(gtk_object_get_type, LFv)
 GO(gtk_object_get_user_data, pFp)
 GO(gtk_object_new, pFppppppppppp)   //vaarg
@@ -1790,10 +1790,10 @@ GO(gtk_object_ref, pFp)
 GO(gtk_object_remove_data, vFpp)
 GO(gtk_object_remove_data_by_id, vFpp)
 GO(gtk_object_remove_no_notify, vFpp)
-GO(gtk_object_remove_no_notify_by_id, vFpp)
+GO(gtk_object_remove_no_notify_by_id, vFpu)
 GO(gtk_object_set, vFppppppppppp)   //vaarg
 GO(gtk_object_set_data, vFppp)
-GO(gtk_object_set_data_by_id, vFppp)
+GO(gtk_object_set_data_by_id, vFpup)
 //GOM(gtk_object_set_data_by_id_full, vFEpppp)
 GOM(gtk_object_set_data_full, vFEpppp)
 GO(gtk_object_set_user_data, vFpp)
@@ -1815,19 +1815,19 @@ GO(gtk_option_menu_new, pFv)
 GO(gtk_option_menu_remove_menu, vFp)
 GO(gtk_option_menu_set_history, vFpu)
 GO(gtk_option_menu_set_menu, vFpp)
-GO(gtk_orientable_get_orientation, iFp)
+GO(gtk_orientable_get_orientation, uFp)
 GO(gtk_orientable_get_type, LFv)
-GO(gtk_orientable_set_orientation, vFpi)
+GO(gtk_orientable_set_orientation, vFpu)
 GO(gtk_orientation_get_type, LFv)
 GO(gtk_pack_direction_get_type, LFv)
 GO(gtk_pack_type_get_type, LFv)
 GO(gtk_page_orientation_get_type, LFv)
 GO(gtk_page_set_get_type, LFv)
-//GO(gtk_page_setup_copy, 
+GO(gtk_page_setup_copy, pFp)
 GO(gtk_page_setup_get_bottom_margin, dFpi)
 GO(gtk_page_setup_get_left_margin, dFpi)
-//GO(gtk_page_setup_get_orientation, 
-GO(gtk_page_setup_get_page_height, dFpi)
+GO(gtk_page_setup_get_orientation, uFp)
+GO(gtk_page_setup_get_page_height, dFpu)
 GO(gtk_page_setup_get_page_width, dFpi)
 GO(gtk_page_setup_get_paper_height, dFpi)
 GO(gtk_page_setup_get_paper_size, pFp)
@@ -1836,54 +1836,54 @@ GO(gtk_page_setup_get_right_margin, dFpi)
 GO(gtk_page_setup_get_top_margin, dFpi)
 GO(gtk_page_setup_get_type, LFv)
 //GO(gtk_page_setup_load_file, 
-//GO(gtk_page_setup_load_key_file, 
+GO(gtk_page_setup_load_key_file, iFpppp)
 GO(gtk_page_setup_new, pFv)
-//GO(gtk_page_setup_new_from_file, 
-//GO(gtk_page_setup_new_from_key_file, 
+GO(gtk_page_setup_new_from_file, pFpp)
+GO(gtk_page_setup_new_from_key_file, pFppp)
 //GO(gtk_page_setup_set_bottom_margin, 
 //GO(gtk_page_setup_set_left_margin, 
-//GO(gtk_page_setup_set_orientation, 
+GO(gtk_page_setup_set_orientation, vFpu)
 GO(gtk_page_setup_set_paper_size, vFpp)
-//GO(gtk_page_setup_set_paper_size_and_default_margins, 
-//GO(gtk_page_setup_set_right_margin, 
+GO(gtk_page_setup_set_paper_size_and_default_margins, vFpp)
+GO(gtk_page_setup_set_right_margin, vFpdu)
 //GO(gtk_page_setup_set_top_margin, 
-//GO(gtk_page_setup_to_file, 
-//GO(gtk_page_setup_to_key_file, 
+GO(gtk_page_setup_to_file, iFppp)
+GO(gtk_page_setup_to_key_file, vFppp)
 //GO(gtk_page_setup_unix_dialog_get_page_setup, 
 //GO(gtk_page_setup_unix_dialog_get_print_settings, 
 GO(gtk_page_setup_unix_dialog_get_type, LFv)
 //GO(gtk_page_setup_unix_dialog_new, 
 //GO(gtk_page_setup_unix_dialog_set_page_setup, 
 //GO(gtk_page_setup_unix_dialog_set_print_settings, 
-GO(gtk_paint_arrow, vFppiipppiiiiii)
+GO(gtk_paint_arrow, vFppuupppuiiiii)
 GO(gtk_paint_box, vFppiipppiiii)
-GO(gtk_paint_box_gap, vFppiipppiiiiiii)
+GO(gtk_paint_box_gap, vFppuupppiiiiuii)
 GO(gtk_paint_check, vFppiipppiiii)
 GO(gtk_paint_diamond, vFppiipppiiii)
-GO(gtk_paint_expander, vFppipppiii)
-GO(gtk_paint_extension, vFppiipppiiiii)
+GO(gtk_paint_expander, vFppupppiiu)
+GO(gtk_paint_extension, vFppuupppiiiiu)
 GO(gtk_paint_flat_box, vFppiipppiiii)
-GO(gtk_paint_focus, vFppipppiiii)
-GO(gtk_paint_handle, vFppiipppiiiii)
+GO(gtk_paint_focus, vFppupppiiii)
+GO(gtk_paint_handle, vFppuupppiiiiu)
 GO(gtk_paint_hline, vFppipppiii)
-GO(gtk_paint_layout, vFppiipppiip)
+GO(gtk_paint_layout, vFppuipppiip)
 GO(gtk_paint_option, vFppiipppiiii)
-GO(gtk_paint_polygon, vFppiippppii)
-GO(gtk_paint_resize_grip, vFppipppiiiii)
+GO(gtk_paint_polygon, vFppuuppppii)
+GO(gtk_paint_resize_grip, vFppupppuiiii)
 GO(gtk_paint_shadow, vFppiipppiiii)
 GO(gtk_paint_shadow_gap, vFppiipppiiiiiii)
 GO(gtk_paint_slider, vFppiipppiiiii)
-GO(gtk_paint_spinner, vFppipppuiiii)
-GO(gtk_paint_string, vFppipppiip)
-GO(gtk_paint_tab, vFppiipppiiii)
-GO(gtk_paint_vline, vFppipppiii)
+GO(gtk_paint_spinner, vFppupppuiiii)
+GO(gtk_paint_string, vFppupppiip)
+GO(gtk_paint_tab, vFppuupppiiii)
+GO(gtk_paint_vline, vFppupppiii)
 GO(gtk_paned_add1, vFpp)
 GO(gtk_paned_add2, vFpp)
 GO(gtk_paned_compute_position, vFpiii)
 GO(gtk_paned_get_child1, pFp)
 GO(gtk_paned_get_child2, pFp)
 GO(gtk_paned_get_handle_window, pFp)
-GO(gtk_paned_get_position, pFp)
+GO(gtk_paned_get_position, iFp)
 GO(gtk_paned_get_type, LFv)
 GO(gtk_paned_pack1, vFppii)
 GO(gtk_paned_pack2, vFppii)
@@ -1893,7 +1893,7 @@ GO(gtk_paper_size_free, vFp)
 GO(gtk_paper_size_get_default, pFv)
 GO(gtk_paper_size_get_default_bottom_margin, dFpi)
 GO(gtk_paper_size_get_default_left_margin, dFpi)
-GO(gtk_paper_size_get_default_right_margin, dFpi)
+GO(gtk_paper_size_get_default_right_margin, dFpu)
 GO(gtk_paper_size_get_default_top_margin, dFpi)
 GO(gtk_paper_size_get_display_name, pFp)
 GO(gtk_paper_size_get_height, dFpi)
@@ -1905,10 +1905,10 @@ GO(gtk_paper_size_get_width, dFpi)
 GO(gtk_paper_size_is_custom, iFp)
 GO(gtk_paper_size_is_equal, iFpp)
 GO(gtk_paper_size_new, pFp)
-GO(gtk_paper_size_new_custom, pFppddi)
+GO(gtk_paper_size_new_custom, pFppddu)
 GO(gtk_paper_size_new_from_key_file, pFppp)
 GO(gtk_paper_size_new_from_ppd, pFppdd)
-GO(gtk_paper_size_set_size, vFpddi)
+GO(gtk_paper_size_set_size, vFpddu)
 GO(gtk_paper_size_to_key_file, vFppp)
 GO(gtk_parse_args, iFpp)
 GO(gtk_path_bar_get_type, LFv)
@@ -1919,31 +1919,31 @@ GO(gtk_pixmap_get_type, LFv)
 GO(gtk_pixmap_new, pFpp)
 GO(gtk_pixmap_set, vFppp)
 GO(gtk_pixmap_set_build_insensitive, vFpi)
-GO(gtk_plug_construct, vFpp)
+GO(gtk_plug_construct, vFpu)
 GO(gtk_plug_construct_for_display, vFppp)
 GO(gtk_plug_get_embedded, iFp)
-GO(gtk_plug_get_id, pFp)
+GO(gtk_plug_get_id, uFp)
 GO(gtk_plug_get_socket_window, pFp)
 GO(gtk_plug_get_type, LFv)
-GO(gtk_plug_new, pFp)
+GO(gtk_plug_new, pFu)
 GO(gtk_plug_new_for_display, pFpp)
 GO(gtk_policy_type_get_type, LFv)
 GO(gtk_position_type_get_type, LFv)
-//GO(gtk_preview_draw_row, 
-//GO(gtk_preview_get_cmap, 
-//GO(gtk_preview_get_info, 
+GO(gtk_preview_draw_row, vFppiii)
+GO(gtk_preview_get_cmap, pFv)
+GO(gtk_preview_get_info, pFv)
 GO(gtk_preview_get_type, LFv)
-//GO(gtk_preview_get_visual, 
-//GO(gtk_preview_new, 
-//GO(gtk_preview_put, 
-//GO(gtk_preview_reset, 
-//GO(gtk_preview_set_color_cube, 
-//GO(gtk_preview_set_dither, 
-//GO(gtk_preview_set_expand, 
-//GO(gtk_preview_set_gamma, 
+GO(gtk_preview_get_visual, pFv)
+GO(gtk_preview_new, pFu)
+GO(gtk_preview_put, vFpppiiiiii)
+GO(gtk_preview_reset, vFv)
+GO(gtk_preview_set_color_cube, vFuuuu)
+GO(gtk_preview_set_dither, vFpu)
+GO(gtk_preview_set_expand, vFpi)
+GO(gtk_preview_set_gamma, vFd)
 //GO(gtk_preview_set_install_cmap, 
-//GO(gtk_preview_set_reserved, 
-//GO(gtk_preview_size, 
+GO(gtk_preview_set_reserved, vFi)
+GO(gtk_preview_size, vFpii)
 GO(gtk_preview_type_get_type, LFv)
 //GO(gtk_preview_uninit, 
 //GO(gtk_print_backend_add_printer, 
@@ -1959,18 +1959,18 @@ GO(gtk_print_backend_get_type, LFv)
 //GO(gtk_print_backend_set_list_done, 
 //GO(gtk_print_backend_set_password, 
 GO(gtk_print_capabilities_get_type, LFv)
-//GO(gtk_print_context_create_pango_context, 
-//GO(gtk_print_context_create_pango_layout, 
-//GO(gtk_print_context_get_cairo_context, 
+GO(gtk_print_context_create_pango_context, pFp)
+GO(gtk_print_context_create_pango_layout, pFp)
+GO(gtk_print_context_get_cairo_context, pFp)
 //GO(gtk_print_context_get_dpi_x, 
-//GO(gtk_print_context_get_dpi_y, 
-//GO(gtk_print_context_get_hard_margins, 
+GO(gtk_print_context_get_dpi_y, dFp)
+GO(gtk_print_context_get_hard_margins, iFppppp)
 //GO(gtk_print_context_get_height, 
-//GO(gtk_print_context_get_page_setup, 
-//GO(gtk_print_context_get_pango_fontmap, 
+GO(gtk_print_context_get_page_setup, pFp)
+GO(gtk_print_context_get_pango_fontmap, pFp)
 GO(gtk_print_context_get_type, LFv)
 //GO(gtk_print_context_get_width, 
-//GO(gtk_print_context_set_cairo_context, 
+GO(gtk_print_context_set_cairo_context, vFppdd)
 GO(gtk_print_duplex_get_type, LFv)
 //GO(gtk_printer_accepts_pdf, 
 //GO(gtk_printer_accepts_ps, 
@@ -2052,118 +2052,118 @@ GO(gtk_print_job_set_source_file, vFppp)
 GO(gtk_print_operation_action_get_type, LFv)
 //GO(gtk_print_operation_cancel, 
 //GO(gtk_print_operation_draw_page_finish, 
-//GO(gtk_print_operation_get_default_page_setup, 
-//GO(gtk_print_operation_get_embed_page_setup, 
-//GO(gtk_print_operation_get_error, 
+GO(gtk_print_operation_get_default_page_setup, pFp)
+GO(gtk_print_operation_get_embed_page_setup, iFp)
+GO(gtk_print_operation_get_error, vFpp)
 //GO(gtk_print_operation_get_has_selection, 
-//GO(gtk_print_operation_get_n_pages_to_print, 
-//GO(gtk_print_operation_get_print_settings, 
-//GO(gtk_print_operation_get_status, 
-//GO(gtk_print_operation_get_status_string, 
+GO(gtk_print_operation_get_n_pages_to_print, iFp)
+GO(gtk_print_operation_get_print_settings, pFp)
+GO(gtk_print_operation_get_status, uFp)
+GO(gtk_print_operation_get_status_string, pFp)
 //GO(gtk_print_operation_get_support_selection, 
 GO(gtk_print_operation_get_type, LFv)
 //GO(gtk_print_operation_is_finished, 
-//GO(gtk_print_operation_new, 
-//GO(gtk_print_operation_preview_end_preview, 
+GO(gtk_print_operation_new, pFv)
+GO(gtk_print_operation_preview_end_preview, vFp)
 GO(gtk_print_operation_preview_get_type, LFv)
-//GO(gtk_print_operation_preview_is_selected, 
-//GO(gtk_print_operation_preview_render_page, 
+GO(gtk_print_operation_preview_is_selected, iFpi)
+GO(gtk_print_operation_preview_render_page, vFpi)
 GO(gtk_print_operation_result_get_type, LFv)
-//GO(gtk_print_operation_run, 
+GO(gtk_print_operation_run, uFpupp)
 //GO(gtk_print_operation_set_allow_async, 
-//GO(gtk_print_operation_set_current_page, 
-//GO(gtk_print_operation_set_custom_tab_label, 
-//GO(gtk_print_operation_set_default_page_setup, 
-//GO(gtk_print_operation_set_defer_drawing, 
-//GO(gtk_print_operation_set_embed_page_setup, 
+GO(gtk_print_operation_set_current_page, vFpi)
+GO(gtk_print_operation_set_custom_tab_label, vFpp)
+GO(gtk_print_operation_set_default_page_setup, vFpp)
+GO(gtk_print_operation_set_defer_drawing, vFp)
+GO(gtk_print_operation_set_embed_page_setup, vFpi)
 //GO(gtk_print_operation_set_export_filename, 
 //GO(gtk_print_operation_set_has_selection, 
 //GO(gtk_print_operation_set_job_name, 
 //GO(gtk_print_operation_set_n_pages, 
-//GO(gtk_print_operation_set_print_settings, 
+GO(gtk_print_operation_set_print_settings, vFpp)
 //GO(gtk_print_operation_set_show_progress, 
 //GO(gtk_print_operation_set_support_selection, 
 //GO(gtk_print_operation_set_track_print_status, 
-//GO(gtk_print_operation_set_unit, 
+GO(gtk_print_operation_set_unit, vFpu)
 //GO(gtk_print_operation_set_use_full_page, 
 GO(gtk_print_pages_get_type, LFv)
 GO(gtk_print_quality_get_type, LFv)
-//GO(gtk_print_run_page_setup_dialog, 
+GO(gtk_print_run_page_setup_dialog, pFppp)
 //GO(gtk_print_run_page_setup_dialog_async, 
 GO(gtk_print_settings_copy, pFp)
 //GO(gtk_print_settings_foreach, 
-//GO(gtk_print_settings_get, 
-//GO(gtk_print_settings_get_bool, 
+GO(gtk_print_settings_get, pFpp)
+GO(gtk_print_settings_get_bool, iFpp)
 //GO(gtk_print_settings_get_collate, 
 //GO(gtk_print_settings_get_default_source, 
 //GO(gtk_print_settings_get_dither, 
-//GO(gtk_print_settings_get_double, 
-//GO(gtk_print_settings_get_double_with_default, 
-//GO(gtk_print_settings_get_duplex, 
+GO(gtk_print_settings_get_double, dFpp)
+GO(gtk_print_settings_get_double_with_default, dFppd)
+GO(gtk_print_settings_get_duplex, uFp)
 //GO(gtk_print_settings_get_finishings, 
-//GO(gtk_print_settings_get_int, 
-//GO(gtk_print_settings_get_int_with_default, 
-//GO(gtk_print_settings_get_length, 
+GO(gtk_print_settings_get_int, iFpp)
+GO(gtk_print_settings_get_int_with_default, iFppi)
+GO(gtk_print_settings_get_length, dFppu)
 //GO(gtk_print_settings_get_media_type, 
 //GO(gtk_print_settings_get_n_copies, 
 //GO(gtk_print_settings_get_number_up, 
-//GO(gtk_print_settings_get_number_up_layout, 
-GO(gtk_print_settings_get_orientation, iFp)
-//GO(gtk_print_settings_get_output_bin, 
+GO(gtk_print_settings_get_number_up_layout, uFp)
+GO(gtk_print_settings_get_orientation, uFp)
+GO(gtk_print_settings_get_output_bin, pFp)
 GO(gtk_print_settings_get_page_ranges, pFpp)
-//GO(gtk_print_settings_get_page_set, 
-//GO(gtk_print_settings_get_paper_height, 
-//GO(gtk_print_settings_get_paper_size, 
+GO(gtk_print_settings_get_page_set, uFp)
+GO(gtk_print_settings_get_paper_height, dFpu)
+GO(gtk_print_settings_get_paper_size, pFp)
 //GO(gtk_print_settings_get_paper_width, 
 GO(gtk_print_settings_get_printer, pFp)
 //GO(gtk_print_settings_get_printer_lpi, 
-GO(gtk_print_settings_get_print_pages, iFp)
-//GO(gtk_print_settings_get_quality, 
+GO(gtk_print_settings_get_print_pages, uFp)
+GO(gtk_print_settings_get_quality, uFp)
 GO(gtk_print_settings_get_resolution, iFp)
 //GO(gtk_print_settings_get_resolution_x, 
-//GO(gtk_print_settings_get_resolution_y, 
-//GO(gtk_print_settings_get_reverse, 
-//GO(gtk_print_settings_get_scale, 
+GO(gtk_print_settings_get_resolution_y, iFp)
+GO(gtk_print_settings_get_reverse, iFp)
+GO(gtk_print_settings_get_scale, dFp)
 GO(gtk_print_settings_get_type, LFv)
 //GO(gtk_print_settings_get_use_color, 
 //GO(gtk_print_settings_has_key, 
 //GO(gtk_print_settings_load_file, 
-//GO(gtk_print_settings_load_key_file, 
+GO(gtk_print_settings_load_key_file, iFpppp)
 GO(gtk_print_settings_new, pFv)
-//GO(gtk_print_settings_new_from_file, 
-//GO(gtk_print_settings_new_from_key_file, 
+GO(gtk_print_settings_new_from_file, pFpp)
+GO(gtk_print_settings_new_from_key_file, pFppp)
 GO(gtk_print_settings_set, vFppp)
-//GO(gtk_print_settings_set_bool, 
+GO(gtk_print_settings_set_bool, vFppi)
 GO(gtk_print_settings_set_collate, vFpi)
 //GO(gtk_print_settings_set_default_source, 
 //GO(gtk_print_settings_set_dither, 
-//GO(gtk_print_settings_set_double, 
-//GO(gtk_print_settings_set_duplex, 
+GO(gtk_print_settings_set_double, vFppd)
+GO(gtk_print_settings_set_duplex, vFpu)
 //GO(gtk_print_settings_set_finishings, 
-//GO(gtk_print_settings_set_int, 
-//GO(gtk_print_settings_set_length, 
+GO(gtk_print_settings_set_int, vFppi)
+GO(gtk_print_settings_set_length, vFppdu)
 //GO(gtk_print_settings_set_media_type, 
 GO(gtk_print_settings_set_n_copies, vFpi)
 //GO(gtk_print_settings_set_number_up, 
-//GO(gtk_print_settings_set_number_up_layout, 
-GO(gtk_print_settings_set_orientation, vFpi)
-//GO(gtk_print_settings_set_output_bin, 
-//GO(gtk_print_settings_set_page_ranges, 
-//GO(gtk_print_settings_set_page_set, 
-//GO(gtk_print_settings_set_paper_height, 
-//GO(gtk_print_settings_set_paper_size, 
+GO(gtk_print_settings_set_number_up_layout, vFpu)
+GO(gtk_print_settings_set_orientation, vFpu)
+GO(gtk_print_settings_set_output_bin, vFpp)
+GO(gtk_print_settings_set_page_ranges, vFppi)
+GO(gtk_print_settings_set_page_set, vFpu)
+GO(gtk_print_settings_set_paper_height, vFpdu)
+GO(gtk_print_settings_set_paper_size, vFpp)
 //GO(gtk_print_settings_set_paper_width, 
 GO(gtk_print_settings_set_printer, vFpp)
 //GO(gtk_print_settings_set_printer_lpi, 
-//GO(gtk_print_settings_set_print_pages, 
-//GO(gtk_print_settings_set_quality, 
-//GO(gtk_print_settings_set_resolution, 
-//GO(gtk_print_settings_set_resolution_xy, 
-//GO(gtk_print_settings_set_reverse, 
-//GO(gtk_print_settings_set_scale, 
+GO(gtk_print_settings_set_print_pages, vFpu)
+GO(gtk_print_settings_set_quality, vFpu)
+GO(gtk_print_settings_set_resolution, vFpi)
+GO(gtk_print_settings_set_resolution_xy, vFpii)
+GO(gtk_print_settings_set_reverse, vFpi)
+GO(gtk_print_settings_set_scale, vFpd)
 //GO(gtk_print_settings_set_use_color, 
-//GO(gtk_print_settings_to_file, 
-//GO(gtk_print_settings_to_key_file, 
+GO(gtk_print_settings_to_file, iFppp)
+GO(gtk_print_settings_to_key_file, vFppp)
 //GO(gtk_print_settings_unset, 
 GO(gtk_print_status_get_type, LFv)
 //GO(gtk_print_unix_dialog_add_custom_tab, 
@@ -2186,10 +2186,10 @@ GO(gtk_print_unix_dialog_set_manual_capabilities, vFpi)
 GO(gtk_print_unix_dialog_set_settings, vFpp)
 GO(gtk_print_unix_dialog_set_support_selection, vFpi)
 GO(gtk_private_flags_get_type, LFv)
-GO(gtk_progress_bar_get_ellipsize, iFp)
+GO(gtk_progress_bar_get_ellipsize, uFp)
 GO(gtk_progress_bar_get_fraction, dFp)
-GO(gtk_progress_bar_get_orientation, iFp)
-GO(gtk_progress_bar_get_pulse_step, fFp)
+GO(gtk_progress_bar_get_orientation, uFp)
+GO(gtk_progress_bar_get_pulse_step, dFp)
 GO(gtk_progress_bar_get_text, pFp)
 GO(gtk_progress_bar_get_type, LFv)
 GO(gtk_progress_bar_new, pFv)
@@ -2198,11 +2198,11 @@ GO(gtk_progress_bar_orientation_get_type, LFv)
 GO(gtk_progress_bar_pulse, vFp)
 GO(gtk_progress_bar_set_activity_blocks, vFpu)
 GO(gtk_progress_bar_set_activity_step, vFpu)
-GO(gtk_progress_bar_set_bar_style, vFpi)
+GO(gtk_progress_bar_set_bar_style, vFpu)
 GO(gtk_progress_bar_set_discrete_blocks, vFpu)
-GO(gtk_progress_bar_set_ellipsize, vFpi)
+GO(gtk_progress_bar_set_ellipsize, vFpu)
 GO(gtk_progress_bar_set_fraction, vFpd)
-GO(gtk_progress_bar_set_orientation, vFpi)
+GO(gtk_progress_bar_set_orientation, vFpu)
 GO(gtk_progress_bar_set_pulse_step, vFpd)
 GO(gtk_progress_bar_set_text, vFpp)
 GO(gtk_progress_bar_style_get_type, LFv)
@@ -2271,8 +2271,8 @@ GO(gtk_range_get_show_fill_level, iFp)
 GO(gtk_range_get_slider_range, vFppp)
 GO(gtk_range_get_slider_size_fixed, iFp)
 GO(gtk_range_get_type, LFv)
-GO(gtk_range_get_update_policy, iFp)
-GO(gtk_range_get_upper_stepper_sensitivity, iFp)
+GO(gtk_range_get_update_policy, uFp)
+GO(gtk_range_get_upper_stepper_sensitivity, uFp)
 GO(gtk_range_get_value, dFp)
 GO(gtk_range_set_adjustment, vFpp)
 GO(gtk_range_set_fill_level, vFpd)
@@ -2286,8 +2286,8 @@ GO(gtk_range_set_restrict_to_fill_level, vFpi)
 GO(gtk_range_set_round_digits, vFpi)
 GO(gtk_range_set_show_fill_level, vFpi)
 GO(gtk_range_set_slider_size_fixed, vFpi)
-GO(gtk_range_set_update_policy, vFpi)
-GO(gtk_range_set_upper_stepper_sensitivity, vFpi)
+GO(gtk_range_set_update_policy, vFpu)
+GO(gtk_range_set_upper_stepper_sensitivity, vFpu)
 GO(gtk_range_set_value, vFpd)
 GO(gtk_rc_add_class_style, vFpp)
 GO(gtk_rc_add_default_file, vFp)
@@ -2301,7 +2301,7 @@ GO(gtk_rc_get_im_module_file, pFv)
 GO(gtk_rc_get_im_module_path, pFv)
 GO(gtk_rc_get_module_dir, pFv)
 GO(gtk_rc_get_style, pFp)
-GO(gtk_rc_get_style_by_paths, pFpppi)
+GO(gtk_rc_get_style_by_paths, pFpppL)
 GO(gtk_rc_get_theme_dir, pFv)
 GO(gtk_rc_parse, vFp)
 GO(gtk_rc_parse_color, uFpp)
@@ -2325,33 +2325,33 @@ GO(gtk_rc_style_new, pFv)
 GO(gtk_rc_style_ref, vFp)
 GO(gtk_rc_style_unref, vFp)
 GO(gtk_rc_token_type_get_type, LFv)
-//GO(gtk_recent_action_get_show_numbers, 
+GO(gtk_recent_action_get_show_numbers, iFp)
 GO(gtk_recent_action_get_type, LFv)
-//GO(gtk_recent_action_new, 
-//GO(gtk_recent_action_new_for_manager, 
-//GO(gtk_recent_action_set_show_numbers, 
+GO(gtk_recent_action_new, pFpppp)
+GO(gtk_recent_action_new_for_manager, pFppppp)
+GO(gtk_recent_action_set_show_numbers, vFpi)
 //GO(gtk_recent_chooser_add_filter, 
 GO(gtk_recent_chooser_dialog_get_type, LFv)
 //GO(gtk_recent_chooser_dialog_new, 
 //GO(gtk_recent_chooser_dialog_new_for_manager, 
 GO(gtk_recent_chooser_error_get_type, LFv)
-//GO(gtk_recent_chooser_error_quark, 
-//GO(gtk_recent_chooser_get_current_item, 
-//GO(gtk_recent_chooser_get_current_uri, 
-//GO(gtk_recent_chooser_get_filter, 
-//GO(gtk_recent_chooser_get_items, 
-//GO(gtk_recent_chooser_get_limit, 
+GO(gtk_recent_chooser_error_quark, uFv)
+GO(gtk_recent_chooser_get_current_item, pFp)
+GO(gtk_recent_chooser_get_current_uri, pFp)
+GO(gtk_recent_chooser_get_filter, pFp)
+GO(gtk_recent_chooser_get_items, pFp)
+GO(gtk_recent_chooser_get_limit, iFp)
 //GO(gtk_recent_chooser_get_local_only, 
 //GO(gtk_recent_chooser_get_select_multiple, 
-//GO(gtk_recent_chooser_get_show_icons, 
+GO(gtk_recent_chooser_get_show_icons, iFp)
 //GO(gtk_recent_chooser_get_show_not_found, 
 //GO(gtk_recent_chooser_get_show_numbers, 
 //GO(gtk_recent_chooser_get_show_private, 
 //GO(gtk_recent_chooser_get_show_tips, 
-//GO(gtk_recent_chooser_get_sort_type, 
+GO(gtk_recent_chooser_get_sort_type, uFp)
 GO(gtk_recent_chooser_get_type, LFv)
-//GO(gtk_recent_chooser_get_uris, 
-//GO(gtk_recent_chooser_list_filters, 
+GO(gtk_recent_chooser_get_uris, pFpp)
+GO(gtk_recent_chooser_list_filters, pFp)
 //GO(gtk_recent_chooser_menu_get_show_numbers, 
 GO(gtk_recent_chooser_menu_get_type, LFv)
 //GO(gtk_recent_chooser_menu_new, 
@@ -2359,24 +2359,24 @@ GO(gtk_recent_chooser_menu_get_type, LFv)
 //GO(gtk_recent_chooser_menu_set_show_numbers, 
 //GO(gtk_recent_chooser_remove_filter, 
 //GO(gtk_recent_chooser_select_all, 
-//GO(gtk_recent_chooser_select_uri, 
+GO(gtk_recent_chooser_select_uri, iFppp)
 //GO(gtk_recent_chooser_set_current_uri, 
-//GO(gtk_recent_chooser_set_filter, 
-//GO(gtk_recent_chooser_set_limit, 
+GO(gtk_recent_chooser_set_filter, vFpp)
+GO(gtk_recent_chooser_set_limit, vFpi)
 //GO(gtk_recent_chooser_set_local_only, 
 //GO(gtk_recent_chooser_set_select_multiple, 
-//GO(gtk_recent_chooser_set_show_icons, 
+GO(gtk_recent_chooser_set_show_icons, vFpi)
 //GO(gtk_recent_chooser_set_show_not_found, 
 //GO(gtk_recent_chooser_set_show_numbers, 
 //GO(gtk_recent_chooser_set_show_private, 
 //GO(gtk_recent_chooser_set_show_tips, 
 //GO(gtk_recent_chooser_set_sort_func, 
-//GO(gtk_recent_chooser_set_sort_type, 
-//GO(gtk_recent_chooser_unselect_all, 
-//GO(gtk_recent_chooser_unselect_uri, 
+GO(gtk_recent_chooser_set_sort_type, vFpu)
+GO(gtk_recent_chooser_unselect_all, vFp)
+GO(gtk_recent_chooser_unselect_uri, vFpp)
 GO(gtk_recent_chooser_widget_get_type, LFv)
 //GO(gtk_recent_chooser_widget_new, 
-//GO(gtk_recent_chooser_widget_new_for_manager, 
+GO(gtk_recent_chooser_widget_new_for_manager, pFp)
 GO(gtk_recent_filter_add_age, vFpi)
 GO(gtk_recent_filter_add_application, vFpp)
 //GOM(gtk_recent_filter_add_custom, vFEpippp)
@@ -2387,7 +2387,7 @@ GO(gtk_recent_filter_add_pixbuf_formats, vFp)
 GO(gtk_recent_filter_filter, iFpp)
 GO(gtk_recent_filter_flags_get_type, LFv)
 GO(gtk_recent_filter_get_name, pFp)
-GO(gtk_recent_filter_get_needed, iFp)
+GO(gtk_recent_filter_get_needed, uFp)
 GO(gtk_recent_filter_get_type, LFv)
 GO(gtk_recent_filter_new, pFv)
 GO(gtk_recent_filter_set_name, vFpp)
@@ -2439,52 +2439,52 @@ GO(gtk_requisition_free, vFp)
 GO(gtk_requisition_get_type, LFv)
 GO(gtk_resize_mode_get_type, LFv)
 GO(gtk_response_type_get_type, LFv)
-//GO(gtk_rgb_to_hsv, 
-//GO(gtk_ruler_draw_pos, 
+GO(gtk_rgb_to_hsv, vFdddppp)
+GO(gtk_ruler_draw_pos, vFp)
 //GO(gtk_ruler_draw_ticks, 
-//GO(gtk_ruler_get_metric, 
-//GO(gtk_ruler_get_range, 
+GO(gtk_ruler_get_metric, uFp)
+GO(gtk_ruler_get_range, vFppppp)
 GO(gtk_ruler_get_type, LFv)
-//GO(gtk_ruler_set_metric, 
-//GO(gtk_ruler_set_range, 
-GO(gtk_scale_add_mark, vFpdip)
-//GO(gtk_scale_button_get_adjustment, 
+GO(gtk_ruler_set_metric, vFpu)
+GO(gtk_ruler_set_range, vFpdddd)
+GO(gtk_scale_add_mark, vFpdup)
+GO(gtk_scale_button_get_adjustment, pFp)
 //GO(gtk_scale_button_get_minus_button, 
-//GO(gtk_scale_button_get_orientation, 
+GO(gtk_scale_button_get_orientation, uFp)
 //GO(gtk_scale_button_get_plus_button, 
-//GO(gtk_scale_button_get_popup, 
+GO(gtk_scale_button_get_popup, pFp)
 GO(gtk_scale_button_get_type, LFv)
-//GO(gtk_scale_button_get_value, 
-//GO(gtk_scale_button_new, 
-//GO(gtk_scale_button_set_adjustment, 
-//GO(gtk_scale_button_set_icons, 
-//GO(gtk_scale_button_set_orientation, 
-//GO(gtk_scale_button_set_value, 
+GO(gtk_scale_button_get_value, dFp)
+GO(gtk_scale_button_new, pFudddp)
+GO(gtk_scale_button_set_adjustment, vFpp)
+GO(gtk_scale_button_set_icons, vFpp)
+GO(gtk_scale_button_set_orientation, vFpu)
+GO(gtk_scale_button_set_value, vFpd)
 GO(gtk_scale_clear_marks, vFp)
 GO(gtk_scale_get_digits, iFp)
 GO(gtk_scale_get_draw_value, iFp)
 GO(gtk_scale_get_layout, pFp)
 GO(gtk_scale_get_layout_offsets, vFppp)
 GO(gtk_scale_get_type, LFv)
-GO(gtk_scale_get_value_pos, iFp)
+GO(gtk_scale_get_value_pos, uFp)
 GO(gtk_scale_set_digits, vFpi)
 GO(gtk_scale_set_draw_value, vFpi)
-GO(gtk_scale_set_value_pos, vFpi)
+GO(gtk_scale_set_value_pos, vFpu)
 GO(gtk_scrollbar_get_type, LFv)
 GO(gtk_scrolled_window_add_with_viewport, vFpp)
 GO(gtk_scrolled_window_get_hadjustment, pFp)
 GO(gtk_scrolled_window_get_hscrollbar, pFp)
-GO(gtk_scrolled_window_get_placement, iFp)
+GO(gtk_scrolled_window_get_placement, uFp)
 GO(gtk_scrolled_window_get_policy, vFppp)
-GO(gtk_scrolled_window_get_shadow_type, iFp)
+GO(gtk_scrolled_window_get_shadow_type, uFp)
 GO(gtk_scrolled_window_get_type, LFv)
 GO(gtk_scrolled_window_get_vadjustment, pFp)
 GO(gtk_scrolled_window_get_vscrollbar, pFp)
 GO(gtk_scrolled_window_new, pFpp)
 GO(gtk_scrolled_window_set_hadjustment, vFpp)
-GO(gtk_scrolled_window_set_placement, vFpi)
-GO(gtk_scrolled_window_set_policy, vFpii)
-GO(gtk_scrolled_window_set_shadow_type, vFpi)
+GO(gtk_scrolled_window_set_placement, vFpu)
+GO(gtk_scrolled_window_set_policy, vFpuu)
+GO(gtk_scrolled_window_set_shadow_type, vFpu)
 GO(gtk_scrolled_window_set_vadjustment, vFpp)
 GO(gtk_scrolled_window_unset_placement, vFp)
 GO(gtk_scroll_step_get_type, LFv)
@@ -2548,7 +2548,7 @@ GOM(gtk_signal_connect_full, LFEppppppii)
 //GO(gtk_signal_connect_while_alive, 
 //GO(gtk_signal_emit, 
 //GO(gtk_signal_emit_by_name, 
-//GO(gtk_signal_emit_stop_by_name, 
+GO(gtk_signal_emit_stop_by_name, vFpp)
 //GO(gtk_signal_emitv, 
 //GO(gtk_signal_emitv_by_name, 
 //GO(gtk_signal_new, 
@@ -2556,14 +2556,14 @@ GOM(gtk_signal_connect_full, LFEppppppii)
 GO(gtk_signal_run_type_get_type, LFv)
 GO(gtk_size_group_add_widget, vFpp)
 GO(gtk_size_group_get_ignore_hidden, iFp)
-GO(gtk_size_group_get_mode, iFp)
+GO(gtk_size_group_get_mode, uFp)
 GO(gtk_size_group_get_type, LFv)
 GO(gtk_size_group_get_widgets, pFp)
 GO(gtk_size_group_mode_get_type, LFv)
-GO(gtk_size_group_new, pFi)
+GO(gtk_size_group_new, pFu)
 GO(gtk_size_group_remove_widget, vFpp)
 GO(gtk_size_group_set_ignore_hidden, vFpi)
-GO(gtk_size_group_set_mode, vFpi)
+GO(gtk_size_group_set_mode, vFpu)
 GO(gtk_socket_add_id, vFpp)
 GO(gtk_socket_get_id, pFp)
 GO(gtk_socket_get_plug_window, pFp)
@@ -2579,7 +2579,7 @@ GO(gtk_spin_button_get_numeric, iFp)
 GO(gtk_spin_button_get_range, vFppp)
 GO(gtk_spin_button_get_snap_to_ticks, iFp)
 GO(gtk_spin_button_get_type, LFv)
-GO(gtk_spin_button_get_update_policy, iFp)
+GO(gtk_spin_button_get_update_policy, uFp)
 GO(gtk_spin_button_get_value, dFp)
 GO(gtk_spin_button_get_value_as_int, iFp)
 GO(gtk_spin_button_get_wrap, iFp)
@@ -2591,10 +2591,10 @@ GO(gtk_spin_button_set_increments, vFpdd)
 GO(gtk_spin_button_set_numeric, vFpi)
 GO(gtk_spin_button_set_range, vFpdd)
 GO(gtk_spin_button_set_snap_to_ticks, vFpi)
-GO(gtk_spin_button_set_update_policy, vFpi)
+GO(gtk_spin_button_set_update_policy, vFpu)
 GO(gtk_spin_button_set_value, vFpd)
 GO(gtk_spin_button_set_wrap, vFpi)
-GO(gtk_spin_button_spin, vFpid)
+GO(gtk_spin_button_spin, vFpud)
 GO(gtk_spin_button_update, vFp)
 GO(gtk_spin_button_update_policy_get_type, LFv)
 GO(gtk_spinner_get_type, LFv)
@@ -2622,7 +2622,7 @@ GO(gtk_status_icon_get_pixbuf, pFp)
 GO(gtk_status_icon_get_screen, pFp)
 GO(gtk_status_icon_get_size, iFp)
 GO(gtk_status_icon_get_stock, pFp)
-GO(gtk_status_icon_get_storage_type, iFp)
+GO(gtk_status_icon_get_storage_type, uFp)
 GO(gtk_status_icon_get_title, pFp)
 GO(gtk_status_icon_get_tooltip_markup, pFp)
 GO(gtk_status_icon_get_tooltip_text, pFp)
@@ -2658,26 +2658,26 @@ GO(gtk_stock_item_free, vFp)
 GO(gtk_stock_list_ids, pFv)
 GO(gtk_stock_lookup, iFpp)
 GOM(gtk_stock_set_translate_func, vFEpppp)
-GO(gtk_style_apply_default_background, vFppiipiiii)
+GO(gtk_style_apply_default_background, vFppiupiiii)
 GO(gtk_style_attach, pFpp)
 GO(gtk_style_copy, pFp)
 GO(gtk_style_detach, vFp)
 GO(gtk_style_get, vFpippppppppppp)  //vaarg, wrap with gtk_style_get_valist?
 GO(gtk_style_get_font, pFp)
-GO(gtk_style_get_style_property, vFpipp)
+GO(gtk_style_get_style_property, vFpLpp)
 GO(gtk_style_get_type, LFv)
 //GO(gtk_style_get_valist, vFpipp)    
 GO(gtk_style_lookup_color, iFppp)
 GO(gtk_style_lookup_icon_set, pFpp)
 GO(gtk_style_new, pFv)
 GO(gtk_style_ref, pFp)
-GO(gtk_style_render_icon, pFppiiipp)
-GO(gtk_style_set_background, vFppi)
+GO(gtk_style_render_icon, pFppuuupp)
+GO(gtk_style_set_background, vFppu)
 GO(gtk_style_set_font, vFpp)
 GO(gtk_style_unref, vFp)
 GO(gtk_submenu_direction_get_type, LFv)
 GO(gtk_submenu_placement_get_type, LFv)
-GO(gtk_table_attach, vFppuuuuiiuu)
+GO(gtk_table_attach, vFppuuuuuuuu)
 GO(gtk_table_attach_defaults, vFppuuuu)
 GO(gtk_table_get_col_spacing, uFpu)
 GO(gtk_table_get_default_col_spacing, uFp)
@@ -2704,7 +2704,7 @@ GO(gtk_target_list_find, iFppp)
 GO(gtk_target_list_get_type, LFv)
 GO(gtk_target_list_new, pFpu)
 GO(gtk_target_list_ref, pFp)
-GO(gtk_target_list_remove, iFppp)
+GO(gtk_target_list_remove, vFpp)
 GO(gtk_target_list_unref, vFp)
 GO(gtk_targets_include_image, iFpii)
 GO(gtk_targets_include_rich_text, iFpip)
@@ -2714,22 +2714,22 @@ GO(gtk_target_table_free, vFpi)
 GO(gtk_target_table_new_from_list, pFpp)
 GO(gtk_tearoff_menu_item_get_type, LFv)
 GO(gtk_tearoff_menu_item_new, pFv)
-//GO(gtk_test_create_simple_window, 
+GO(gtk_test_create_simple_window, pFpp)
 //GO(gtk_test_create_widget, 
 //GO(gtk_test_display_button_window, 
-//GO(gtk_test_find_label, 
-//GO(gtk_test_find_sibling, 
-//GO(gtk_test_find_widget, 
+GO(gtk_test_find_label, pFpp)
+GO(gtk_test_find_sibling, pFpL)
+GO(gtk_test_find_widget, pFppL)
 //GO(gtk_test_init, 
-//GO(gtk_test_list_all_types, 
+GO(gtk_test_list_all_types, pFp)
 //GO(gtk_test_register_all_types, 
-//GO(gtk_test_slider_get_value, 
-//GO(gtk_test_slider_set_perc, 
-//GO(gtk_test_spin_button_click, 
-//GO(gtk_test_text_get, 
-//GO(gtk_test_text_set, 
+GO(gtk_test_slider_get_value, dFp)
+GO(gtk_test_slider_set_perc, vFpd)
+GO(gtk_test_spin_button_click, iFpui)
+GO(gtk_test_text_get, pFp)
+GO(gtk_test_text_set, vFpp)
 //GO(gtk_test_widget_click, 
-//GO(gtk_test_widget_send_key, 
+GO(gtk_test_widget_send_key, iFpuu)
 GO(gtk_text_anchored_child_set_layout, vFpp)
 GO(gtk_text_attributes_copy, pFp)
 GO(gtk_text_attributes_copy_values, vFpp)
@@ -2754,7 +2754,7 @@ GO(gtk_text_buffer_delete_interactive, iFpppi)
 GO(gtk_text_buffer_delete_mark, vFpp)
 GO(gtk_text_buffer_delete_mark_by_name, vFpp)
 GO(gtk_text_buffer_delete_selection, iFpii)
-GO(gtk_text_buffer_deserialize, iFpppppup)
+GO(gtk_text_buffer_deserialize, iFpppppLp)
 GO(gtk_text_buffer_deserialize_get_can_create_tags, iFpp)
 GO(gtk_text_buffer_deserialize_set_can_create_tags, vFppi)
 GO(gtk_text_buffer_end_user_action, vFp)
@@ -2867,7 +2867,7 @@ GO(gtk_text_iter_forward_lines, iFpi)
 GO(gtk_text_iter_forward_search, iFppuppp)
 GO(gtk_text_iter_forward_sentence_end, iFp)
 GO(gtk_text_iter_forward_sentence_ends, iFpi)
-GO(gtk_text_iter_forward_to_end, iFp)
+GO(gtk_text_iter_forward_to_end, vFp)
 GO(gtk_text_iter_forward_to_line_end, iFp)
 GO(gtk_text_iter_forward_to_tag_toggle, iFpp)
 GO(gtk_text_iter_forward_visible_cursor_position, iFp)
@@ -2994,14 +2994,14 @@ GO(gtk_text_tag_table_new, pFv)
 GO(gtk_text_tag_table_remove, vFpp)
 GO(gtk_text_thaw, vFp)
 GO(gtk_text_view_add_child_at_anchor, vFppp)
-GO(gtk_text_view_add_child_in_window, vFppiii)
+GO(gtk_text_view_add_child_in_window, vFppuii)
 GO(gtk_text_view_backward_display_line, iFpp)
 GO(gtk_text_view_backward_display_line_start, iFpp)
 GO(gtk_text_view_buffer_to_window_coords, vFpiiipp)
 GO(gtk_text_view_forward_display_line, iFpp)
 GO(gtk_text_view_forward_display_line_end, iFpp)
 GO(gtk_text_view_get_accepts_tab, iFp)
-GO(gtk_text_view_get_border_window_size, iFpi)
+GO(gtk_text_view_get_border_window_size, iFpu)
 GO(gtk_text_view_get_buffer, pFp)
 GO(gtk_text_view_get_cursor_visible, iFp)
 GO(gtk_text_view_get_default_attributes, pFp)
@@ -3011,7 +3011,7 @@ GO(gtk_text_view_get_indent, iFp)
 GO(gtk_text_view_get_iter_at_location, vFppii)
 GO(gtk_text_view_get_iter_at_position, vFpppii)
 GO(gtk_text_view_get_iter_location, vFppp)
-GO(gtk_text_view_get_justification, iFp)
+GO(gtk_text_view_get_justification, uFp)
 GO(gtk_text_view_get_left_margin, iFp)
 GO(gtk_text_view_get_line_at_y, vFppip)
 GO(gtk_text_view_get_line_yrange, vFpppp)
@@ -3024,9 +3024,9 @@ GO(gtk_text_view_get_tabs, pFp)
 GO(gtk_text_view_get_type, LFv)
 GO(gtk_text_view_get_vadjustment, pFp)
 GO(gtk_text_view_get_visible_rect, vFpp)
-GO(gtk_text_view_get_window, pFpi)
-GO(gtk_text_view_get_window_type, iFpp)
-GO(gtk_text_view_get_wrap_mode, iFp)
+GO(gtk_text_view_get_window, pFpu)
+GO(gtk_text_view_get_window_type, uFpp)
+GO(gtk_text_view_get_wrap_mode, uFp)
 GO(gtk_text_view_im_context_filter_keypress, iFpp)
 GO(gtk_text_view_move_child, vFppii)
 GO(gtk_text_view_move_mark_onscreen, iFpp)
@@ -3039,12 +3039,12 @@ GO(gtk_text_view_scroll_mark_onscreen, vFpp)
 GO(gtk_text_view_scroll_to_iter, iFppdidd)
 GO(gtk_text_view_scroll_to_mark, vFppdidd)
 GO(gtk_text_view_set_accepts_tab, vFpi)
-GO(gtk_text_view_set_border_window_size, vFpii)
+GO(gtk_text_view_set_border_window_size, vFpui)
 GO(gtk_text_view_set_buffer, vFpp)
 GO(gtk_text_view_set_cursor_visible, vFpi)
 GO(gtk_text_view_set_editable, vFpi)
 GO(gtk_text_view_set_indent, vFpi)
-GO(gtk_text_view_set_justification, vFpi)
+GO(gtk_text_view_set_justification, vFpu)
 GO(gtk_text_view_set_left_margin, vFpi)
 GO(gtk_text_view_set_overwrite, vFpi)
 GO(gtk_text_view_set_pixels_above_lines, vFpi)
@@ -3052,9 +3052,9 @@ GO(gtk_text_view_set_pixels_below_lines, vFpi)
 GO(gtk_text_view_set_pixels_inside_wrap, vFpi)
 GO(gtk_text_view_set_right_margin, vFpi)
 GO(gtk_text_view_set_tabs, vFpp)
-GO(gtk_text_view_set_wrap_mode, vFpi)
+GO(gtk_text_view_set_wrap_mode, vFpu)
 GO(gtk_text_view_starts_display_line, iFpp)
-GO(gtk_text_view_window_to_buffer_coords, vFpiiipp)
+GO(gtk_text_view_window_to_buffer_coords, vFpuiipp)
 GO(gtk_text_window_type_get_type, LFv)
 //GO(gtk_theme_engine_create_rc_style, 
 //GO(gtk_theme_engine_get, 
@@ -3063,18 +3063,18 @@ GOM(gtk_timeout_add, uFEupp)
 //GOM(gtk_timeout_add_full, uFuBppB)
 GO(gtk_timeout_remove, vFu)
 GO(gtk_tips_query_get_type, LFv)
-//GO(gtk_tips_query_new, 
-//GO(gtk_tips_query_set_caller, 
-//GO(gtk_tips_query_set_labels, 
+GO(gtk_tips_query_new, pFv)
+GO(gtk_tips_query_set_caller, vFpp)
+GO(gtk_tips_query_set_labels, vFppp)
 //GO(gtk_tips_query_start_query, 
-//GO(gtk_tips_query_stop_query, 
+GO(gtk_tips_query_stop_query, vFp)
 //GO(gtk_toggle_action_get_active, 
-//GO(gtk_toggle_action_get_draw_as_radio, 
+GO(gtk_toggle_action_get_draw_as_radio, iFp)
 GO(gtk_toggle_action_get_type, LFv)
-//GO(gtk_toggle_action_new, 
+GO(gtk_toggle_action_new, pFpppp)
 //GO(gtk_toggle_action_set_active, 
-//GO(gtk_toggle_action_set_draw_as_radio, 
-//GO(gtk_toggle_action_toggled, 
+GO(gtk_toggle_action_set_draw_as_radio, vFpi)
+GO(gtk_toggle_action_toggled, vFp)
 GO(gtk_toggle_button_get_active, iFp)
 GO(gtk_toggle_button_get_inconsistent, iFp)
 GO(gtk_toggle_button_get_mode, iFp)
@@ -3097,14 +3097,14 @@ GO(gtk_toolbar_append_space, vFp)
 GO(gtk_toolbar_append_widget, vFpppp)
 GO(gtk_toolbar_child_type_get_type, LFv)
 GO(gtk_toolbar_get_drop_index, iFpii)
-GO(gtk_toolbar_get_icon_size, iFp)
+GO(gtk_toolbar_get_icon_size, uFp)
 GO(gtk_toolbar_get_item_index, iFpp)
 GO(gtk_toolbar_get_n_items, iFp)
 GO(gtk_toolbar_get_nth_item, pFpi)
-GO(gtk_toolbar_get_orientation, iFp)
-GO(gtk_toolbar_get_relief_style, iFp)
+GO(gtk_toolbar_get_orientation, uFp)
+GO(gtk_toolbar_get_relief_style, uFp)
 GO(gtk_toolbar_get_show_arrow, iFp)
-GO(gtk_toolbar_get_style, iFp)
+GO(gtk_toolbar_get_style, uFp)
 GO(gtk_toolbar_get_tooltips, iFp)
 GO(gtk_toolbar_get_type, LFv)
 GO(gtk_toolbar_insert, vFppi)
@@ -3120,10 +3120,10 @@ GO(gtk_toolbar_prepend_space, vFp)
 GO(gtk_toolbar_prepend_widget, vFpppp)
 GO(gtk_toolbar_remove_space, vFpi)
 GO(gtk_toolbar_set_drop_highlight_item, vFppi)
-GO(gtk_toolbar_set_icon_size, vFpi)
-GO(gtk_toolbar_set_orientation, vFpi)
+GO(gtk_toolbar_set_icon_size, vFpu)
+GO(gtk_toolbar_set_orientation, vFpu)
 GO(gtk_toolbar_set_show_arrow, vFpi)
-GO(gtk_toolbar_set_style, vFpi)
+GO(gtk_toolbar_set_style, vFpu)
 GO(gtk_toolbar_set_tooltips, vFpi)
 GO(gtk_toolbar_space_style_get_type, LFv)
 GO(gtk_toolbar_style_get_type, LFv)
@@ -3144,100 +3144,100 @@ GO(gtk_tool_button_set_label, vFpp)
 GO(gtk_tool_button_set_label_widget, vFpp)
 GO(gtk_tool_button_set_stock_id, vFpp)
 GO(gtk_tool_button_set_use_underline, vFpi)
-//GO(gtk_tool_item_get_ellipsize_mode, 
+GO(gtk_tool_item_get_ellipsize_mode, uFp)
 //GO(gtk_tool_item_get_expand, 
 //GO(gtk_tool_item_get_homogeneous, 
-//GO(gtk_tool_item_get_icon_size, 
+GO(gtk_tool_item_get_icon_size, uFp)
 //GO(gtk_tool_item_get_is_important, 
 //GO(gtk_tool_item_get_orientation, 
-//GO(gtk_tool_item_get_proxy_menu_item, 
-//GO(gtk_tool_item_get_relief_style, 
-//GO(gtk_tool_item_get_text_alignment, 
-//GO(gtk_tool_item_get_text_orientation, 
-//GO(gtk_tool_item_get_text_size_group, 
-//GO(gtk_tool_item_get_toolbar_style, 
+GO(gtk_tool_item_get_proxy_menu_item, pFpp)
+GO(gtk_tool_item_get_relief_style, uFp)
+GO(gtk_tool_item_get_text_alignment, fFp)
+GO(gtk_tool_item_get_text_orientation, uFp)
+GO(gtk_tool_item_get_text_size_group, pFp)
+GO(gtk_tool_item_get_toolbar_style, uFp)
 GO(gtk_tool_item_get_type, LFv)
 //GO(gtk_tool_item_get_use_drag_window, 
 //GO(gtk_tool_item_get_visible_horizontal, 
 //GO(gtk_tool_item_get_visible_vertical, 
-//GO(gtk_tool_item_group_get_collapsed, 
-//GO(gtk_tool_item_group_get_drop_item, 
-//GO(gtk_tool_item_group_get_ellipsize, 
-//GO(gtk_tool_item_group_get_header_relief, 
-//GO(gtk_tool_item_group_get_item_position, 
-//GO(gtk_tool_item_group_get_label, 
-//GO(gtk_tool_item_group_get_label_widget, 
-//GO(gtk_tool_item_group_get_n_items, 
-//GO(gtk_tool_item_group_get_nth_item, 
+GO(gtk_tool_item_group_get_collapsed, iFp)
+GO(gtk_tool_item_group_get_drop_item, pFpii)
+GO(gtk_tool_item_group_get_ellipsize, uFp)
+GO(gtk_tool_item_group_get_header_relief, uFp)
+GO(gtk_tool_item_group_get_item_position, iFpp)
+GO(gtk_tool_item_group_get_label, pFp)
+GO(gtk_tool_item_group_get_label_widget, pFp)
+GO(gtk_tool_item_group_get_n_items, uFp)
+GO(gtk_tool_item_group_get_nth_item, pFpu)
 GO(gtk_tool_item_group_get_type, LFv)
 //GO(gtk_tool_item_group_insert, 
 //GO(gtk_tool_item_group_new, 
-//GO(gtk_tool_item_group_set_collapsed, 
-//GO(gtk_tool_item_group_set_ellipsize, 
-//GO(gtk_tool_item_group_set_header_relief, 
-//GO(gtk_tool_item_group_set_item_position, 
-//GO(gtk_tool_item_group_set_label, 
-//GO(gtk_tool_item_group_set_label_widget, 
+GO(gtk_tool_item_group_set_collapsed, vFpi)
+GO(gtk_tool_item_group_set_ellipsize, vFpu)
+GO(gtk_tool_item_group_set_header_relief, vFpu)
+GO(gtk_tool_item_group_set_item_position, vFppi)
+GO(gtk_tool_item_group_set_label, vFpp)
+GO(gtk_tool_item_group_set_label_widget, vFpp)
 //GO(gtk_tool_item_new, 
 //GO(gtk_tool_item_rebuild_menu, 
-//GO(gtk_tool_item_retrieve_proxy_menu_item, 
+GO(gtk_tool_item_retrieve_proxy_menu_item, pFp)
 //GO(gtk_tool_item_set_expand, 
 //GO(gtk_tool_item_set_homogeneous, 
-//GO(gtk_tool_item_set_is_important, 
-//GO(gtk_tool_item_set_proxy_menu_item, 
-//GO(gtk_tool_item_set_tooltip, 
-//GO(gtk_tool_item_set_tooltip_markup, 
+GO(gtk_tool_item_set_is_important, vFpi)
+GO(gtk_tool_item_set_proxy_menu_item, vFppp)
+GO(gtk_tool_item_set_tooltip, vFpppp)
+GO(gtk_tool_item_set_tooltip_markup, vFpp)
 //GO(gtk_tool_item_set_tooltip_text, 
 //GO(gtk_tool_item_set_use_drag_window, 
 //GO(gtk_tool_item_set_visible_horizontal, 
 //GO(gtk_tool_item_set_visible_vertical, 
-//GO(gtk_tool_item_toolbar_reconfigured, 
-//GO(gtk_tool_palette_add_drag_dest, 
+GO(gtk_tool_item_toolbar_reconfigured, vFp)
+GO(gtk_tool_palette_add_drag_dest, vFppuuu)
 GO(gtk_tool_palette_drag_targets_get_type, LFv)
 //GO(gtk_tool_palette_get_drag_item, 
-//GO(gtk_tool_palette_get_drag_target_group, 
+GO(gtk_tool_palette_get_drag_target_group, pFv)
 //GO(gtk_tool_palette_get_drag_target_item, 
-//GO(gtk_tool_palette_get_drop_group, 
-//GO(gtk_tool_palette_get_drop_item, 
+GO(gtk_tool_palette_get_drop_group, pFpii)
+GO(gtk_tool_palette_get_drop_item, pFpii)
 //GO(gtk_tool_palette_get_exclusive, 
-//GO(gtk_tool_palette_get_expand, 
-//GO(gtk_tool_palette_get_group_position, 
+GO(gtk_tool_palette_get_expand, iFpp)
+GO(gtk_tool_palette_get_group_position, iFpp)
 //GO(gtk_tool_palette_get_hadjustment, 
-//GO(gtk_tool_palette_get_icon_size, 
-//GO(gtk_tool_palette_get_style, 
+GO(gtk_tool_palette_get_icon_size, uFp)
+GO(gtk_tool_palette_get_style, uFp)
 GO(gtk_tool_palette_get_type, LFv)
-//GO(gtk_tool_palette_get_vadjustment, 
+GO(gtk_tool_palette_get_vadjustment, pFp)
 //GO(gtk_tool_palette_new, 
-//GO(gtk_tool_palette_set_drag_source, 
+GO(gtk_tool_palette_set_drag_source, vFpu)
 //GO(gtk_tool_palette_set_exclusive, 
-//GO(gtk_tool_palette_set_expand, 
-//GO(gtk_tool_palette_set_group_position, 
-//GO(gtk_tool_palette_set_icon_size, 
-//GO(gtk_tool_palette_set_style, 
+GO(gtk_tool_palette_set_expand, vFppi)
+GO(gtk_tool_palette_set_group_position, vFppi)
+GO(gtk_tool_palette_set_icon_size, vFpu)
+GO(gtk_tool_palette_set_style, vFpu)
 //GO(gtk_tool_palette_unset_icon_size, 
-//GO(gtk_tool_palette_unset_style, 
-//GO(gtk_tool_shell_get_ellipsize_mode, 
-//GO(gtk_tool_shell_get_icon_size, 
+GO(gtk_tool_palette_unset_style, vFp)
+GO(gtk_tool_shell_get_ellipsize_mode, uFp)
+GO(gtk_tool_shell_get_icon_size, uFp)
 //GO(gtk_tool_shell_get_orientation, 
-//GO(gtk_tool_shell_get_relief_style, 
-//GO(gtk_tool_shell_get_style, 
-//GO(gtk_tool_shell_get_text_alignment, 
-//GO(gtk_tool_shell_get_text_orientation, 
-//GO(gtk_tool_shell_get_text_size_group, 
+GO(gtk_tool_shell_get_relief_style, uFp)
+GO(gtk_tool_shell_get_style, uFp)
+GO(gtk_tool_shell_get_text_alignment, fFp)
+GO(gtk_tool_shell_get_text_orientation, uFp)
+GO(gtk_tool_shell_get_text_size_group, pFp)
 GO(gtk_tool_shell_get_type, LFv)
-//GO(gtk_tool_shell_rebuild_menu, 
+GO(gtk_tool_shell_rebuild_menu, vFp)
 GO(gtk_tooltip_get_type, LFv)
 GO(gtk_tooltips_data_get, pFp)
 GO(gtk_tooltips_disable, vFp)
 GO(gtk_tooltips_enable, vFp)
-//GO(gtk_tooltip_set_custom, 
-//GO(gtk_tooltip_set_icon, 
-//GO(gtk_tooltip_set_icon_from_gicon, 
-//GO(gtk_tooltip_set_icon_from_icon_name, 
+GO(gtk_tooltip_set_custom, vFpp)
+GO(gtk_tooltip_set_icon, vFpp)
+GO(gtk_tooltip_set_icon_from_gicon, vFppu)
+GO(gtk_tooltip_set_icon_from_icon_name, vFppu)
 //GO(gtk_tooltip_set_icon_from_stock, 
 //GO(gtk_tooltip_set_markup, 
-//GO(gtk_tooltip_set_text, 
-//GO(gtk_tooltip_set_tip_area, 
+GO(gtk_tooltip_set_text, vFpp)
+GO(gtk_tooltip_set_tip_area, vFpp)
 GO(gtk_tooltips_force_window, vFp)
 GO(gtk_tooltips_get_info_from_tip_window, iFppp)
 GO(gtk_tooltips_get_type, LFv)
@@ -3252,7 +3252,7 @@ GO(gtk_tray_icon_get_type, LFv)
 //GO(gtk_tree_drag_dest_drag_data_received, 
 GO(gtk_tree_drag_dest_get_type, LFv)
 //GO(gtk_tree_drag_dest_row_drop_possible, 
-//GO(gtk_tree_drag_source_drag_data_delete, 
+GO(gtk_tree_drag_source_drag_data_delete, iFpp)
 //GO(gtk_tree_drag_source_drag_data_get, 
 GO(gtk_tree_drag_source_get_type, LFv)
 //GO(gtk_tree_drag_source_row_draggable, 
@@ -3271,23 +3271,23 @@ GO(gtk_tree_item_get_type, LFv)
 GO(gtk_tree_iter_copy, pFp)
 GO(gtk_tree_iter_free, vFp)
 GO(gtk_tree_iter_get_type, LFv)
-//GO(gtk_tree_model_filter_clear_cache, 
-//GO(gtk_tree_model_filter_convert_child_iter_to_iter, 
+GO(gtk_tree_model_filter_clear_cache, vFp)
+GO(gtk_tree_model_filter_convert_child_iter_to_iter, iFppp)
 //GO(gtk_tree_model_filter_convert_child_path_to_path, 
-//GO(gtk_tree_model_filter_convert_iter_to_child_iter, 
-//GO(gtk_tree_model_filter_convert_path_to_child_path, 
-//GO(gtk_tree_model_filter_get_model, 
+GO(gtk_tree_model_filter_convert_iter_to_child_iter, vFppp)
+GO(gtk_tree_model_filter_convert_path_to_child_path, pFpp)
+GO(gtk_tree_model_filter_get_model, pFp)
 GO(gtk_tree_model_filter_get_type, LFv)
-//GO(gtk_tree_model_filter_new, 
+GO(gtk_tree_model_filter_new, pFpp)
 //GO(gtk_tree_model_filter_refilter, 
 //GO(gtk_tree_model_filter_set_modify_func, 
-//GO(gtk_tree_model_filter_set_visible_column, 
+GO(gtk_tree_model_filter_set_visible_column, vFpi)
 //GO(gtk_tree_model_filter_set_visible_func, 
 GO(gtk_tree_model_flags_get_type, LFv)
 GOM(gtk_tree_model_foreach, vFEppp)
 GOM(gtk_tree_model_get, vFEppV)
-GO(gtk_tree_model_get_column_type, iFpi)
-GO(gtk_tree_model_get_flags, iFp)
+GO(gtk_tree_model_get_column_type, LFpi)
+GO(gtk_tree_model_get_flags, uFp)
 GO(gtk_tree_model_get_iter, iFppp)
 GO(gtk_tree_model_get_iter_first, iFpp)
 GO(gtk_tree_model_get_iter_from_string, iFppp)
@@ -3317,7 +3317,7 @@ GO(gtk_tree_model_rows_reordered, vFpppp)
 //GO(gtk_tree_model_sort_get_model, 
 GO(gtk_tree_model_sort_get_type, LFv)
 //GO(gtk_tree_model_sort_iter_is_valid, 
-//GO(gtk_tree_model_sort_new_with_model, 
+GO(gtk_tree_model_sort_new_with_model, pFp)
 //GO(gtk_tree_model_sort_reset_default_sort_func, 
 GO(gtk_tree_model_unref_node, vFpp)
 //GO(gtk_tree_new, 
@@ -3386,7 +3386,7 @@ GO(gtk_tree_sortable_get_sort_column_id, iFppp)
 GO(gtk_tree_sortable_get_type, LFv)
 GO(gtk_tree_sortable_has_default_sort_func, iFp)
 GOM(gtk_tree_sortable_set_default_sort_func, vFEpppp)
-GO(gtk_tree_sortable_set_sort_column_id, vFpii)
+GO(gtk_tree_sortable_set_sort_column_id, vFpiu)
 GOM(gtk_tree_sortable_set_sort_func, vFEpippp)
 GO(gtk_tree_sortable_sort_column_changed, vFp)
 GO(gtk_tree_store_append, vFppp)
@@ -3436,10 +3436,10 @@ GO(gtk_tree_view_column_get_max_width, iFp)
 GO(gtk_tree_view_column_get_min_width, iFp)
 GO(gtk_tree_view_column_get_reorderable, iFp)
 GO(gtk_tree_view_column_get_resizable, iFp)
-GO(gtk_tree_view_column_get_sizing, iFp)
+GO(gtk_tree_view_column_get_sizing, uFp)
 GO(gtk_tree_view_column_get_sort_column_id, iFp)
 GO(gtk_tree_view_column_get_sort_indicator, iFp)
-GO(gtk_tree_view_column_get_sort_order, iFp)
+GO(gtk_tree_view_column_get_sort_order, uFp)
 GO(gtk_tree_view_column_get_spacing, iFp)
 GO(gtk_tree_view_column_get_title, pFp)
 GO(gtk_tree_view_column_get_tree_view, pFp)
@@ -3463,10 +3463,10 @@ GO(gtk_tree_view_column_set_max_width, vFpi)
 GO(gtk_tree_view_column_set_min_width, vFpi)
 GO(gtk_tree_view_column_set_reorderable, vFpi)
 GO(gtk_tree_view_column_set_resizable, vFpi)
-GO(gtk_tree_view_column_set_sizing, vFpi)
-GO(gtk_tree_view_column_set_sort_column_id, iFp)
+GO(gtk_tree_view_column_set_sizing, vFpu)
+GO(gtk_tree_view_column_set_sort_column_id, vFpi)
 GO(gtk_tree_view_column_set_sort_indicator, vFpi)
-GO(gtk_tree_view_column_set_sort_order, vFpi)
+GO(gtk_tree_view_column_set_sort_order, vFpu)
 GO(gtk_tree_view_column_set_spacing, vFpi)
 GO(gtk_tree_view_column_set_title, vFpp)
 GO(gtk_tree_view_column_set_visible, vFpi)
@@ -3481,7 +3481,7 @@ GO(gtk_tree_view_convert_widget_to_tree_coords, vFpiipp)
 GO(gtk_tree_view_create_row_drag_icon, pFpp)
 GO(gtk_tree_view_drop_position_get_type, LFv)
 GO(gtk_tree_view_enable_model_drag_dest, vFppiu)
-GO(gtk_tree_view_enable_model_drag_source, vFpipiu)
+GO(gtk_tree_view_enable_model_drag_source, vFpupiu)
 GO(gtk_tree_view_expand_all, vFp)
 GO(gtk_tree_view_expand_row, iFppi)
 GO(gtk_tree_view_expand_to_path, vFpp)
@@ -3497,7 +3497,7 @@ GO(gtk_tree_view_get_enable_search, iFp)
 GO(gtk_tree_view_get_enable_tree_lines, iFp)
 GO(gtk_tree_view_get_expander_column, pFp)
 GO(gtk_tree_view_get_fixed_height_mode, iFp)
-GO(gtk_tree_view_get_grid_lines, iFp)
+GO(gtk_tree_view_get_grid_lines, uFp)
 GO(gtk_tree_view_get_hadjustment, pFp)
 GO(gtk_tree_view_get_headers_clickable, iFp)
 GO(gtk_tree_view_get_headers_visible, iFp)
@@ -3533,7 +3533,7 @@ GO(gtk_tree_view_move_column_after, vFppp)
 GO(gtk_tree_view_new, pFv)
 GO(gtk_tree_view_new_with_model, pFp)
 GO(gtk_tree_view_remove_column, iFpp)
-GO(gtk_tree_view_row_activated, vFp)
+GO(gtk_tree_view_row_activated, vFppp)
 GO(gtk_tree_view_row_expanded, iFpp)
 GO(gtk_tree_view_scroll_to_cell, vFpppiff)
 GO(gtk_tree_view_scroll_to_point, vFpii)
@@ -3541,12 +3541,12 @@ GO(gtk_tree_view_scroll_to_point, vFpii)
 GO(gtk_tree_view_set_cursor, vFpppi)
 GO(gtk_tree_view_set_cursor_on_cell, vFppppi)
 //GOM(gtk_tree_view_set_destroy_count_func, vFEpBpB)
-GO(gtk_tree_view_set_drag_dest_row, vFppi)
+GO(gtk_tree_view_set_drag_dest_row, vFppu)
 GO(gtk_tree_view_set_enable_search, vFpi)
 GO(gtk_tree_view_set_enable_tree_lines, vFpi)
 GO(gtk_tree_view_set_expander_column, vFpp)
 GO(gtk_tree_view_set_fixed_height_mode, vFpi)
-GO(gtk_tree_view_set_grid_lines, vFpi)
+GO(gtk_tree_view_set_grid_lines, vFpu)
 GO(gtk_tree_view_set_hadjustment, vFpp)
 GO(gtk_tree_view_set_headers_clickable, vFpi)
 GO(gtk_tree_view_set_headers_visible, vFpi)
@@ -3573,22 +3573,22 @@ GO(gtk_tree_view_unset_rows_drag_source, vFp)
 GO(gtk_tree_view_widget_to_tree_coords, vFpiipp)
 GO(gtk_true, iFv)
 GOM(gtk_type_class, pFEi)
-GO(gtk_type_enum_find_value, pFip)
-GO(gtk_type_enum_get_values, pFi)
-GO(gtk_type_flags_find_value, pFip)
-GO(gtk_type_flags_get_values, pFi)
-GO(gtk_type_init, vFi)
-GO(gtk_type_new, pFi)
+GO(gtk_type_enum_find_value, pFLp)
+GO(gtk_type_enum_get_values, pFL)
+GO(gtk_type_flags_find_value, pFLp)
+GO(gtk_type_flags_get_values, pFL)
+GO(gtk_type_init, vFu)
+GO(gtk_type_new, pFL)
 GOM(gtk_type_unique, iFEpp)
-GO(gtk_ui_manager_add_ui, vFpipppii)
+GO(gtk_ui_manager_add_ui, vFpupppui)
 GO(gtk_ui_manager_add_ui_from_file, uFppp)
-GO(gtk_ui_manager_add_ui_from_string, uFppLp)
+GO(gtk_ui_manager_add_ui_from_string, uFpplp)
 GO(gtk_ui_manager_ensure_update, vFp)
 GO(gtk_ui_manager_get_accel_group, pFp)
 GO(gtk_ui_manager_get_action, pFpp)
 GO(gtk_ui_manager_get_action_groups, pFp)
 GO(gtk_ui_manager_get_add_tearoffs, iFp)
-GO(gtk_ui_manager_get_toplevels, pFpi)
+GO(gtk_ui_manager_get_toplevels, pFpu)
 GO(gtk_ui_manager_get_type, LFv)
 GO(gtk_ui_manager_get_ui, pFp)
 GO(gtk_ui_manager_get_widget, pFpp)
@@ -3607,17 +3607,17 @@ GO(gtk_vbutton_box_get_layout_default, iFv)
 GO(gtk_vbutton_box_get_spacing_default, iFv)
 GO(gtk_vbutton_box_get_type, LFv)
 GO(gtk_vbutton_box_new, pFv)
-GO(gtk_vbutton_box_set_layout_default, vFi)
+GO(gtk_vbutton_box_set_layout_default, vFu)
 GO(gtk_vbutton_box_set_spacing_default, vFi)
 GO(gtk_viewport_get_bin_window, pFp)
 GO(gtk_viewport_get_hadjustment, pFp)
-GO(gtk_viewport_get_shadow_type, iFp)
+GO(gtk_viewport_get_shadow_type, uFp)
 GO(gtk_viewport_get_type, LFv)
 GO(gtk_viewport_get_vadjustment, pFp)
 GO(gtk_viewport_get_view_window, pFp)
 GO(gtk_viewport_new, pFpp)
 GO(gtk_viewport_set_hadjustment, vFpp)
-GO(gtk_viewport_set_shadow_type, vFpi)
+GO(gtk_viewport_set_shadow_type, vFpu)
 GO(gtk_viewport_set_vadjustment, vFpp)
 GO(gtk_visibility_get_type, LFv)
 GO(gtk_volume_button_get_type, LFv)
@@ -3658,7 +3658,7 @@ GO(gtk_widget_freeze_child_notify, vFp)
 GO(gtk_widget_get_accessible, pFp)
 GO(gtk_widget_get_action, pFp)
 GO(gtk_widget_get_allocation, vFpp)
-GO(gtk_widget_get_ancestor, pFpi)
+GO(gtk_widget_get_ancestor, pFpL)
 GO(gtk_widget_get_app_paintable, iFp)
 GO(gtk_widget_get_can_default, iFp)
 GO(gtk_widget_get_can_focus, iFp)
@@ -3668,14 +3668,14 @@ GO(gtk_widget_get_clipboard, pFpp)
 GO(gtk_widget_get_colormap, pFp)
 GO(gtk_widget_get_composite_name, pFp)
 GO(gtk_widget_get_default_colormap, pFv)
-GO(gtk_widget_get_default_direction, iFv)
+GO(gtk_widget_get_default_direction, uFv)
 GO(gtk_widget_get_default_style, pFv)
 GO(gtk_widget_get_default_visual, pFv)
-GO(gtk_widget_get_direction, iFp)
+GO(gtk_widget_get_direction, uFp)
 GO(gtk_widget_get_display, pFp)
 GO(gtk_widget_get_double_buffered, iFp)
 GO(gtk_widget_get_events, iFp)
-GO(gtk_widget_get_extension_events, iFp)
+GO(gtk_widget_get_extension_events, uFp)
 GO(gtk_widget_get_has_tooltip, iFp)
 GO(gtk_widget_get_has_window, iFp)
 GO(gtk_widget_get_mapped, iFp)
@@ -3695,7 +3695,7 @@ GO(gtk_widget_get_sensitive, iFp)
 GO(gtk_widget_get_settings, pFp)
 GO(gtk_widget_get_size_request, vFppp)
 GO(gtk_widget_get_snapshot, pFpp)
-GO(gtk_widget_get_state, iFp)
+GO(gtk_widget_get_state, uFp)
 GO(gtk_widget_get_style, pFp)
 GO(gtk_widget_get_tooltip_markup, pFp)
 GO(gtk_widget_get_tooltip_text, pFp)
@@ -3724,12 +3724,12 @@ GO(gtk_widget_is_drawable, iFp)
 GO(gtk_widget_is_focus, iFp)
 GO(gtk_widget_is_sensitive, iFp)
 GO(gtk_widget_is_toplevel, iFp)
-GO(gtk_widget_keynav_failed, iFpi)
+GO(gtk_widget_keynav_failed, iFpu)
 GO(gtk_widget_list_accel_closures, pFp)
 GO(gtk_widget_list_mnemonic_labels, pFp)
 GO(gtk_widget_map, vFp)
 GO(gtk_widget_mnemonic_activate, iFpi)
-GO(gtk_widget_modify_base, vFpip)
+GO(gtk_widget_modify_base, vFpup)
 GO(gtk_widget_modify_bg, vFpip)
 GO(gtk_widget_modify_cursor, vFppp)
 GO(gtk_widget_modify_fg, vFpip)
@@ -3753,7 +3753,7 @@ GO(gtk_widget_ref, pFp)
 GO(gtk_widget_region_intersect, pFpp)
 GO(gtk_widget_remove_accelerator, iFppui)
 GO(gtk_widget_remove_mnemonic_label, vFpp)
-GO(gtk_widget_render_icon, pFppip)
+GO(gtk_widget_render_icon, pFppup)
 GO(gtk_widget_reparent, vFpp)
 GO(gtk_widget_reset_rc_styles, vFp)
 GO(gtk_widget_reset_shapes, vFp)
@@ -3769,11 +3769,11 @@ GO(gtk_widget_set_child_visible, vFpi)
 GO(gtk_widget_set_colormap, vFpp)
 GO(gtk_widget_set_composite_name, vFpp)
 GO(gtk_widget_set_default_colormap, vFp)
-GO(gtk_widget_set_default_direction, vFi)
-GO(gtk_widget_set_direction, vFpi)
+GO(gtk_widget_set_default_direction, vFu)
+GO(gtk_widget_set_direction, vFpu)
 GO(gtk_widget_set_double_buffered, vFpi)
 GO(gtk_widget_set_events, vFpi)
-GO(gtk_widget_set_extension_events, vFpi)
+GO(gtk_widget_set_extension_events, vFpu)
 GO(gtk_widget_set_has_tooltip, vFpi)
 GO(gtk_widget_set_has_window, vFpi)
 GO(gtk_widget_set_mapped, vFpi)
@@ -3787,7 +3787,7 @@ GO(gtk_widget_set_redraw_on_allocate, vFpi)
 GO(gtk_widget_set_scroll_adjustments, iFppp)
 GO(gtk_widget_set_sensitive, vFpi)
 GO(gtk_widget_set_size_request, vFpii)
-GO(gtk_widget_set_state, vFpi)
+GO(gtk_widget_set_state, vFpu)
 GO(gtk_widget_set_style, vFpp)
 GO(gtk_widget_set_tooltip_markup, vFpp)
 GO(gtk_widget_set_tooltip_text, vFpp)
@@ -3834,13 +3834,13 @@ GO(gtk_window_get_destroy_with_parent, iFp)
 GO(gtk_window_get_focus, pFp)
 GO(gtk_window_get_focus_on_map, iFp)
 GO(gtk_window_get_frame_dimensions, vFppppp)
-GO(gtk_window_get_gravity, iFp)
+GO(gtk_window_get_gravity, uFp)
 GO(gtk_window_get_group, pFp)
 GO(gtk_window_get_has_frame, iFp)
 GO(gtk_window_get_icon, pFp)
 GO(gtk_window_get_icon_list, pFp)
 GO(gtk_window_get_icon_name, pFp)
-GO(gtk_window_get_mnemonic_modifier, iFp)
+GO(gtk_window_get_mnemonic_modifier, uFp)
 GO(gtk_window_get_mnemonics_visible, iFp)
 GO(gtk_window_get_modal, iFp)
 GO(gtk_window_get_opacity, dFp)
@@ -3854,7 +3854,7 @@ GO(gtk_window_get_skip_taskbar_hint, iFp)
 GO(gtk_window_get_title, pFp)
 GO(gtk_window_get_transient_for, pFp)
 GO(gtk_window_get_type, LFv)
-GO(gtk_window_get_type_hint, iFp)
+GO(gtk_window_get_type_hint, uFp)
 GO(gtk_window_get_urgency_hint, iFp)
 GO(gtk_window_get_window_type, uFp)
 GO(gtk_window_group_add_window, vFpp)
@@ -3871,7 +3871,7 @@ GO(gtk_window_list_toplevels, pFv)
 GO(gtk_window_maximize, vFp)
 GO(gtk_window_mnemonic_activate, iFpui)
 GO(gtk_window_move, vFpii)
-GO(gtk_window_new, pFi)
+GO(gtk_window_new, pFu)
 GO(gtk_window_parse_geometry, iFpp)
 GO(gtk_window_position_get_type, LFv)
 GO(gtk_window_present, vFp)
@@ -3896,8 +3896,8 @@ GO(gtk_window_set_destroy_with_parent, vFpi)
 GO(gtk_window_set_focus, vFpp)
 GO(gtk_window_set_focus_on_map, vFpi)
 GO(gtk_window_set_frame_dimensions, vFpiiii)
-GO(gtk_window_set_geometry_hints, vFpppi)
-GO(gtk_window_set_gravity, vFpi)
+GO(gtk_window_set_geometry_hints, vFpppu)
+GO(gtk_window_set_gravity, vFpu)
 GO(gtk_window_set_has_frame, vFpi)
 GO(gtk_window_set_icon, vFpp)
 GO(gtk_window_set_icon_from_file, iFppp)
@@ -3905,12 +3905,12 @@ GO(gtk_window_set_icon_list, vFpp)
 GO(gtk_window_set_icon_name, vFpp)
 GO(gtk_window_set_keep_above, vFpi)
 GO(gtk_window_set_keep_below, vFpi)
-GO(gtk_window_set_mnemonic_modifier, vFpi)
+GO(gtk_window_set_mnemonic_modifier, vFpu)
 GO(gtk_window_set_mnemonics_visible, vFpi)
 GO(gtk_window_set_modal, vFpi)
 GO(gtk_window_set_opacity, vFpd)
 GO(gtk_window_set_policy, vFpiii)
-GO(gtk_window_set_position, vFpi)
+GO(gtk_window_set_position, vFpu)
 GO(gtk_window_set_resizable, vFpi)
 GO(gtk_window_set_role, vFpp)
 GO(gtk_window_set_screen, vFpp)
@@ -3919,7 +3919,7 @@ GO(gtk_window_set_skip_taskbar_hint, vFpi)
 GO(gtk_window_set_startup_id, vFpp)
 GO(gtk_window_set_title, vFpp)
 GO(gtk_window_set_transient_for, vFpp)
-GO(gtk_window_set_type_hint, vFpi)
+GO(gtk_window_set_type_hint, vFpu)
 GO(gtk_window_set_urgency_hint, vFpi)
 GO(gtk_window_set_wmclass, vFppp)
 GO(gtk_window_stick, vFp)