Used wrapperhelper on wrapped gtk3 and gdk3

author: ptitSeb <sebastien.chev@gmail.com> 2023-04-24 19:21:25 +0200
committer: ptitSeb <sebastien.chev@gmail.com> 2023-04-24 19:21:25 +0200
commit: 6bfeb156551ce98d4feafb6fe764bbe4fd1cab03 (patch)
tree: 216ea24dfb064d532b136f818118716696980d41 /src
parent: 69eb071fab2ee0e429a01e2915881c872aae6a6c (diff)
download: box64-6bfeb156551ce98d4feafb6fe764bbe4fd1cab03.tar.gz
box64-6bfeb156551ce98d4feafb6fe764bbe4fd1cab03.zip
5 files changed, 787 insertions, 773 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index dbbc9fea..6beac2c9 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -383,6 +383,7 @@
 #() vFpiu
 #() vFpif
 #() vFpid
+#() vFpiL
 #() vFpip
 #() vFpui
 #() vFpuI
@@ -440,6 +441,7 @@
 #() iFiiO
 #() iFiCC
 #() iFiuu
+#() iFiup
 #() iFill
 #() iFiLi
 #() iFiLp
@@ -794,12 +796,12 @@
 #() vFpiUU
 #() vFpifi
 #() vFpipi
+#() vFpipu
 #() vFpipp
 #() vFpIdi
 #() vFpCuW
 #() vFpuii
 #() vFpuip
-#() vFpuui
 #() vFpuuu
 #() vFpuup
 #() vFpufi
@@ -816,7 +818,6 @@
 #() vFpfff
 #() vFpdii
 #() vFpdup
-#() vFpddi
 #() vFpddu
 #() vFpddd
 #() vFplll
@@ -1309,7 +1310,6 @@
 #() vFpiUUp
 #() vFpilpp
 #() vFpipii
-#() vFpipiu
 #() vFpippi
 #() vFpuiip
 #() vFpuipp
@@ -1358,6 +1358,7 @@
 #() vFppLpL
 #() vFpppii
 #() vFpppip
+#() vFpppui
 #() vFpppuu
 #() vFpppup
 #() vFpppdd
@@ -1443,6 +1444,7 @@
 #() iFpulup
 #() iFpulpp
 #() iFpupiU
+#() iFpupuu
 #() iFpupup
 #() iFpuppp
 #() iFpUiUi
@@ -1598,6 +1600,7 @@
 #() pFpLLLp
 #() pFpLpii
 #() pFppiii
+#() pFppiiu
 #() pFppiip
 #() pFppiup
 #() pFppipi
@@ -1608,7 +1611,6 @@
 #() pFppuuu
 #() pFppuup
 #() pFppupp
-#() pFppddi
 #() pFppddu
 #() pFppLii
 #() pFpppii
@@ -1744,7 +1746,6 @@
 #() vFpddddp
 #() vFppiiii
 #() vFppiiip
-#() vFppiiui
 #() vFppiiuu
 #() vFppiipi
 #() vFppiipp
@@ -1768,9 +1769,11 @@
 #() vFppLppp
 #() vFpppiii
 #() vFpppiip
+#() vFpppiui
 #() vFpppiff
 #() vFpppipu
 #() vFpppuii
+#() vFpppuuu
 #() vFppppii
 #() vFpppppi
 #() vFpppppu
@@ -1814,7 +1817,6 @@
 #() iFpiiuui
 #() iFpiiupp
 #() iFpiipip
-#() iFpiippu
 #() iFpiippp
 #() iFpiCCpu
 #() iFpiuuup
@@ -2076,8 +2078,8 @@
 #() vFppCuupp
 #() vFppuiiip
 #() vFppuupii
-#() vFppddddi
-#() vFppddpii
+#() vFppddddu
+#() vFppddpiu
 #() vFppLpppi
 #() vFppLpppp
 #() vFpppiiii
@@ -2086,7 +2088,6 @@
 #() vFpppiupi
 #() vFpppippi
 #() vFpppuuuu
-#() vFppppiii
 #() vFppppiip
 #() vFppppiui
 #() vFppppipi
@@ -2165,7 +2166,6 @@
 #() iFppppipp
 #() iFppppdpu
 #() iFpppppip
-#() iFpppppup
 #() iFpppppLp
 #() iFppppppu
 #() iFppppppp
@@ -2295,9 +2295,12 @@
 #() vFppippppi
 #() vFppippppp
 #() vFppuuiiii
+#() vFppuppiii
+#() vFppuppiiu
 #() vFpplppppi
 #() vFpplppppp
 #() vFpppipppu
+#() vFpppuiiii
 #() vFppppiipi
 #() vFpppppuuu
 #() vFpppppppp
@@ -2318,6 +2321,7 @@
 #() iFpuiipppp
 #() iFpuippLpp
 #() iFpuuiiiii
+#() iFpuuipppp
 #() iFpuuupupu
 #() iFpuupuupp
 #() iFpupppWWu
@@ -2330,7 +2334,6 @@
 #() iFpLpipppp
 #() iFpLppLpip
 #() iFpLpppppp
-#() iFppiiiiiu
 #() iFppiiipip
 #() iFppIIIppp
 #() iFppuiiuuu
@@ -2429,18 +2432,19 @@
 #() vFppiiiiipi
 #() vFppiiiiupi
 #() vFppiiipiii
-#() vFppiipiiii
 #() vFppiupiiii
 #() vFppippDpDC
 #() vFppipppiii
 #() vFppipppiip
+#() vFppuippiip
 #() vFppuuiiiii
 #() vFppuuiiiiu
+#() vFppuppiiii
 #() vFppupppiii
 #() vFppupppiiu
 #() vFppupppiip
 #() vFppUUiUUUU
-#() vFppddddidd
+#() vFppddddudd
 #() vFpplpppppi
 #() vFpppiiiiii
 #() vFppppipiip
@@ -2533,14 +2537,13 @@
 #() vFppiiiiiiii
 #() vFppiiiiipip
 #() vFppiiiiupip
-#() vFppiipppiip
 #() vFppiippppii
-#() vFppipppiiii
 #() vFppuipppiip
 #() vFppuuuiiiii
-#() vFppuuuuiiuu
 #() vFppuuuuuuuu
+#() vFppuuppiiii
 #() vFppuuppppii
+#() vFppuppuiiii
 #() vFppupppiiii
 #() vFppdddddddd
 #() vFpppppppppp
@@ -2598,9 +2601,8 @@
 #() vFppiiiiupiii
 #() vFppiiiiddddi
 #() vFppiipppiiii
-#() vFppipppiiiii
-#() vFppipppuiiii
 #() vFppuuiiiiuii
+#() vFppuuppiiiiu
 #() vFppuupppiiii
 #() vFppupipiuuuu
 #() vFppupppuiiii
@@ -2641,6 +2643,7 @@
 #() vFppiiiiddddii
 #() vFppiiuuuiupup
 #() vFppiipppiiiii
+#() vFppuuppuiiiii
 #() vFppuupppiiiiu
 #() vFpppiiiiiiiii
 #() vFpppiiiiiiuii
@@ -2670,7 +2673,7 @@
 #() vFpuppppppppppp
 #() vFppiiiiiiiiiii
 #() vFppiiiiiiuiuii
-#() vFppiipppiiiiii
+#() vFppuuppiiiiuii
 #() vFppuupppuiiiii
 #() vFppppppppppppp
 #() iFddddpppddpppp
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 72d49a3b..baf8c9e1 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -419,6 +419,7 @@ typedef void (*vFpiC_t)(void*, int32_t, uint8_t);
 typedef void (*vFpiu_t)(void*, int32_t, uint32_t);
 typedef void (*vFpif_t)(void*, int32_t, float);
 typedef void (*vFpid_t)(void*, int32_t, double);
+typedef void (*vFpiL_t)(void*, int32_t, uintptr_t);
 typedef void (*vFpip_t)(void*, int32_t, void*);
 typedef void (*vFpui_t)(void*, uint32_t, int32_t);
 typedef void (*vFpuI_t)(void*, uint32_t, int64_t);
@@ -476,6 +477,7 @@ typedef int32_t (*iFiip_t)(int32_t, int32_t, void*);
 typedef int32_t (*iFiiO_t)(int32_t, int32_t, int32_t);
 typedef int32_t (*iFiCC_t)(int32_t, uint8_t, uint8_t);
 typedef int32_t (*iFiuu_t)(int32_t, uint32_t, uint32_t);
+typedef int32_t (*iFiup_t)(int32_t, uint32_t, void*);
 typedef int32_t (*iFill_t)(int32_t, intptr_t, intptr_t);
 typedef int32_t (*iFiLi_t)(int32_t, uintptr_t, int32_t);
 typedef int32_t (*iFiLp_t)(int32_t, uintptr_t, void*);
@@ -830,12 +832,12 @@ typedef void (*vFpiUu_t)(void*, int32_t, uint64_t, uint32_t);
 typedef void (*vFpiUU_t)(void*, int32_t, uint64_t, uint64_t);
 typedef void (*vFpifi_t)(void*, int32_t, float, int32_t);
 typedef void (*vFpipi_t)(void*, int32_t, void*, int32_t);
+typedef void (*vFpipu_t)(void*, int32_t, void*, uint32_t);
 typedef void (*vFpipp_t)(void*, int32_t, void*, void*);
 typedef void (*vFpIdi_t)(void*, int64_t, double, int32_t);
 typedef void (*vFpCuW_t)(void*, uint8_t, uint32_t, uint16_t);
 typedef void (*vFpuii_t)(void*, uint32_t, int32_t, int32_t);
 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);
@@ -852,7 +854,6 @@ 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 (*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);
@@ -1345,7 +1346,6 @@ 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);
-typedef void (*vFpipiu_t)(void*, int32_t, void*, int32_t, uint32_t);
 typedef void (*vFpippi_t)(void*, int32_t, void*, void*, int32_t);
 typedef void (*vFpuiip_t)(void*, uint32_t, int32_t, int32_t, void*);
 typedef void (*vFpuipp_t)(void*, uint32_t, int32_t, void*, void*);
@@ -1394,6 +1394,7 @@ typedef void (*vFppddp_t)(void*, void*, double, double, void*);
 typedef void (*vFppLpL_t)(void*, void*, uintptr_t, void*, uintptr_t);
 typedef void (*vFpppii_t)(void*, void*, void*, int32_t, int32_t);
 typedef void (*vFpppip_t)(void*, void*, void*, int32_t, void*);
+typedef void (*vFpppui_t)(void*, void*, void*, uint32_t, int32_t);
 typedef void (*vFpppuu_t)(void*, void*, void*, uint32_t, uint32_t);
 typedef void (*vFpppup_t)(void*, void*, void*, uint32_t, void*);
 typedef void (*vFpppdd_t)(void*, void*, void*, double, double);
@@ -1479,6 +1480,7 @@ typedef int32_t (*iFpuuLL_t)(void*, uint32_t, uint32_t, uintptr_t, uintptr_t);
 typedef int32_t (*iFpulup_t)(void*, uint32_t, intptr_t, uint32_t, void*);
 typedef int32_t (*iFpulpp_t)(void*, uint32_t, intptr_t, void*, void*);
 typedef int32_t (*iFpupiU_t)(void*, uint32_t, void*, int32_t, uint64_t);
+typedef int32_t (*iFpupuu_t)(void*, uint32_t, void*, uint32_t, uint32_t);
 typedef int32_t (*iFpupup_t)(void*, uint32_t, void*, uint32_t, void*);
 typedef int32_t (*iFpuppp_t)(void*, uint32_t, void*, void*, void*);
 typedef int32_t (*iFpUiUi_t)(void*, uint64_t, int32_t, uint64_t, int32_t);
@@ -1634,6 +1636,7 @@ typedef void* (*pFpLiii_t)(void*, uintptr_t, int32_t, int32_t, int32_t);
 typedef void* (*pFpLLLp_t)(void*, uintptr_t, uintptr_t, uintptr_t, void*);
 typedef void* (*pFpLpii_t)(void*, uintptr_t, void*, int32_t, int32_t);
 typedef void* (*pFppiii_t)(void*, void*, int32_t, int32_t, int32_t);
+typedef void* (*pFppiiu_t)(void*, void*, int32_t, int32_t, uint32_t);
 typedef void* (*pFppiip_t)(void*, void*, int32_t, int32_t, void*);
 typedef void* (*pFppiup_t)(void*, void*, int32_t, uint32_t, void*);
 typedef void* (*pFppipi_t)(void*, void*, int32_t, void*, int32_t);
@@ -1644,7 +1647,6 @@ 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* (*pFpppii_t)(void*, void*, void*, int32_t, int32_t);
@@ -1780,7 +1782,6 @@ typedef void (*vFpddddd_t)(void*, double, double, double, double, double);
 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*);
@@ -1804,9 +1805,11 @@ typedef void (*vFppLppi_t)(void*, void*, uintptr_t, void*, void*, int32_t);
 typedef void (*vFppLppp_t)(void*, void*, uintptr_t, void*, void*, void*);
 typedef void (*vFpppiii_t)(void*, void*, void*, int32_t, int32_t, int32_t);
 typedef void (*vFpppiip_t)(void*, void*, void*, int32_t, int32_t, void*);
+typedef void (*vFpppiui_t)(void*, void*, void*, int32_t, uint32_t, int32_t);
 typedef void (*vFpppiff_t)(void*, void*, void*, int32_t, float, float);
 typedef void (*vFpppipu_t)(void*, void*, void*, int32_t, void*, uint32_t);
 typedef void (*vFpppuii_t)(void*, void*, void*, uint32_t, int32_t, int32_t);
+typedef void (*vFpppuuu_t)(void*, void*, void*, uint32_t, uint32_t, uint32_t);
 typedef void (*vFppppii_t)(void*, void*, void*, void*, int32_t, int32_t);
 typedef void (*vFpppppi_t)(void*, void*, void*, void*, void*, int32_t);
 typedef void (*vFpppppu_t)(void*, void*, void*, void*, void*, uint32_t);
@@ -1850,7 +1853,6 @@ typedef int32_t (*iFpiiuii_t)(void*, int32_t, int32_t, uint32_t, int32_t, int32_
 typedef int32_t (*iFpiiuui_t)(void*, int32_t, int32_t, uint32_t, uint32_t, int32_t);
 typedef int32_t (*iFpiiupp_t)(void*, int32_t, int32_t, uint32_t, void*, void*);
 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*);
 typedef int32_t (*iFpiCCpu_t)(void*, int32_t, uint8_t, uint8_t, void*, uint32_t);
 typedef int32_t (*iFpiuuup_t)(void*, int32_t, uint32_t, uint32_t, uint32_t, void*);
@@ -2112,8 +2114,8 @@ 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 (*vFppddddu_t)(void*, void*, double, double, double, double, uint32_t);
+typedef void (*vFppddpiu_t)(void*, void*, double, double, void*, int32_t, uint32_t);
 typedef void (*vFppLpppi_t)(void*, void*, uintptr_t, void*, void*, void*, int32_t);
 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);
@@ -2122,7 +2124,6 @@ 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);
@@ -2201,7 +2202,6 @@ typedef int32_t (*iFppppilp_t)(void*, void*, void*, void*, int32_t, intptr_t, vo
 typedef int32_t (*iFppppipp_t)(void*, void*, void*, void*, int32_t, void*, void*);
 typedef int32_t (*iFppppdpu_t)(void*, void*, void*, void*, double, void*, uint32_t);
 typedef int32_t (*iFpppppip_t)(void*, void*, void*, void*, void*, int32_t, void*);
-typedef int32_t (*iFpppppup_t)(void*, void*, void*, void*, void*, uint32_t, void*);
 typedef int32_t (*iFpppppLp_t)(void*, void*, void*, void*, void*, uintptr_t, void*);
 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*);
@@ -2331,9 +2331,12 @@ typedef void (*vFppipppui_t)(void*, void*, int32_t, void*, void*, void*, uint32_
 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 (*vFppuppiii_t)(void*, void*, uint32_t, void*, void*, int32_t, int32_t, int32_t);
+typedef void (*vFppuppiiu_t)(void*, void*, uint32_t, void*, void*, int32_t, int32_t, uint32_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);
+typedef void (*vFpppuiiii_t)(void*, void*, void*, uint32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppppiipi_t)(void*, void*, void*, void*, int32_t, int32_t, void*, int32_t);
 typedef void (*vFpppppuuu_t)(void*, void*, void*, void*, void*, uint32_t, uint32_t, uint32_t);
 typedef void (*vFpppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*);
@@ -2354,6 +2357,7 @@ typedef int32_t (*iFpWWipppp_t)(void*, uint16_t, uint16_t, int32_t, void*, void*
 typedef int32_t (*iFpuiipppp_t)(void*, uint32_t, int32_t, int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFpuippLpp_t)(void*, uint32_t, int32_t, void*, void*, uintptr_t, void*, void*);
 typedef int32_t (*iFpuuiiiii_t)(void*, uint32_t, uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
+typedef int32_t (*iFpuuipppp_t)(void*, uint32_t, uint32_t, int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFpuuupupu_t)(void*, uint32_t, uint32_t, uint32_t, void*, uint32_t, void*, uint32_t);
 typedef int32_t (*iFpuupuupp_t)(void*, uint32_t, uint32_t, void*, uint32_t, uint32_t, void*, void*);
 typedef int32_t (*iFpupppWWu_t)(void*, uint32_t, void*, void*, void*, uint16_t, uint16_t, uint32_t);
@@ -2366,7 +2370,6 @@ typedef int32_t (*iFpLLppppp_t)(void*, uintptr_t, uintptr_t, void*, void*, void*
 typedef int32_t (*iFpLpipppp_t)(void*, uintptr_t, void*, int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFpLppLpip_t)(void*, uintptr_t, void*, void*, uintptr_t, void*, int32_t, void*);
 typedef int32_t (*iFpLpppppp_t)(void*, uintptr_t, void*, void*, void*, void*, 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);
@@ -2465,18 +2468,19 @@ typedef void (*vFppiiiiiii_t)(void*, void*, 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 (*vFppuippiip_t)(void*, void*, uint32_t, int32_t, 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 (*vFppuppiiii_t)(void*, void*, uint32_t, void*, void*, int32_t, int32_t, int32_t, int32_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 (*vFppddddudd_t)(void*, void*, double, double, double, double, uint32_t, double, double);
 typedef void (*vFpplpppppi_t)(void*, void*, intptr_t, void*, void*, void*, void*, void*, int32_t);
 typedef void (*vFpppiiiiii_t)(void*, void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppppipiip_t)(void*, void*, void*, void*, int32_t, void*, int32_t, int32_t, void*);
@@ -2569,14 +2573,13 @@ typedef void (*vFpuupuuuuuu_t)(void*, uint32_t, uint32_t, void*, uint32_t, uint3
 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 (*vFppuuppiiii_t)(void*, void*, uint32_t, uint32_t, void*, void*, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppuuppppii_t)(void*, void*, uint32_t, uint32_t, void*, void*, void*, void*, int32_t, int32_t);
+typedef void (*vFppuppuiiii_t)(void*, void*, uint32_t, void*, void*, uint32_t, int32_t, int32_t, 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*);
@@ -2634,9 +2637,8 @@ typedef void (*vFppiiiiipiii_t)(void*, void*, int32_t, 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 (*vFppuuppiiiiu_t)(void*, void*, uint32_t, uint32_t, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_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);
@@ -2677,6 +2679,7 @@ 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 (*vFppuuppuiiiii_t)(void*, void*, uint32_t, uint32_t, void*, void*, uint32_t, 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);
@@ -2706,7 +2709,7 @@ typedef void (*vFpippppppppppp_t)(void*, int32_t, void*, void*, void*, void*, vo
 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 (*vFppuuppiiiiuii_t)(void*, void*, uint32_t, uint32_t, void*, void*, int32_t, int32_t, int32_t, int32_t, uint32_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*);
@@ -3168,6 +3171,7 @@ void vFpiC(x64emu_t *emu, uintptr_t fcn) { vFpiC_t fn = (vFpiC_t)fcn; fn((void*)
 void vFpiu(x64emu_t *emu, uintptr_t fcn) { vFpiu_t fn = (vFpiu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX); }
 void vFpif(x64emu_t *emu, uintptr_t fcn) { vFpif_t fn = (vFpif_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, emu->xmm[0].f[0]); }
 void vFpid(x64emu_t *emu, uintptr_t fcn) { vFpid_t fn = (vFpid_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, emu->xmm[0].d[0]); }
+void vFpiL(x64emu_t *emu, uintptr_t fcn) { vFpiL_t fn = (vFpiL_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX); }
 void vFpip(x64emu_t *emu, uintptr_t fcn) { vFpip_t fn = (vFpip_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
 void vFpui(x64emu_t *emu, uintptr_t fcn) { vFpui_t fn = (vFpui_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
 void vFpuI(x64emu_t *emu, uintptr_t fcn) { vFpuI_t fn = (vFpuI_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int64_t)R_RDX); }
@@ -3225,6 +3229,7 @@ void iFiip(x64emu_t *emu, uintptr_t fcn) { iFiip_t fn = (iFiip_t)fcn; R_RAX=(int
 void iFiiO(x64emu_t *emu, uintptr_t fcn) { iFiiO_t fn = (iFiiO_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (int32_t)R_RSI, of_convert((int32_t)R_RDX)); }
 void iFiCC(x64emu_t *emu, uintptr_t fcn) { iFiCC_t fn = (iFiCC_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint8_t)R_RSI, (uint8_t)R_RDX); }
 void iFiuu(x64emu_t *emu, uintptr_t fcn) { iFiuu_t fn = (iFiuu_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX); }
+void iFiup(x64emu_t *emu, uintptr_t fcn) { iFiup_t fn = (iFiup_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); }
 void iFill(x64emu_t *emu, uintptr_t fcn) { iFill_t fn = (iFill_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
 void iFiLi(x64emu_t *emu, uintptr_t fcn) { iFiLi_t fn = (iFiLi_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX); }
 void iFiLp(x64emu_t *emu, uintptr_t fcn) { iFiLp_t fn = (iFiLp_t)fcn; R_RAX=(int32_t)fn((int32_t)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
@@ -3579,12 +3584,12 @@ void vFpiUu(x64emu_t *emu, uintptr_t fcn) { vFpiUu_t fn = (vFpiUu_t)fcn; fn((voi
 void vFpiUU(x64emu_t *emu, uintptr_t fcn) { vFpiUU_t fn = (vFpiUU_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX); }
 void vFpifi(x64emu_t *emu, uintptr_t fcn) { vFpifi_t fn = (vFpifi_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, emu->xmm[0].f[0], (int32_t)R_RDX); }
 void vFpipi(x64emu_t *emu, uintptr_t fcn) { vFpipi_t fn = (vFpipi_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
+void vFpipu(x64emu_t *emu, uintptr_t fcn) { vFpipu_t fn = (vFpipu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void vFpipp(x64emu_t *emu, uintptr_t fcn) { vFpipp_t fn = (vFpipp_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void vFpIdi(x64emu_t *emu, uintptr_t fcn) { vFpIdi_t fn = (vFpIdi_t)fcn; fn((void*)R_RDI, (int64_t)R_RSI, emu->xmm[0].d[0], (int32_t)R_RDX); }
 void vFpCuW(x64emu_t *emu, uintptr_t fcn) { vFpCuW_t fn = (vFpCuW_t)fcn; fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint16_t)R_RCX); }
 void vFpuii(x64emu_t *emu, uintptr_t fcn) { vFpuii_t fn = (vFpuii_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void vFpuip(x64emu_t *emu, uintptr_t fcn) { vFpuip_t fn = (vFpuip_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
-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); }
@@ -3601,7 +3606,6 @@ void vFpUpp(x64emu_t *emu, uintptr_t fcn) { vFpUpp_t fn = (vFpUpp_t)fcn; fn((voi
 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 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); }
@@ -4094,7 +4098,6 @@ void vFpiuuu(x64emu_t *emu, uintptr_t fcn) { vFpiuuu_t fn = (vFpiuuu_t)fcn; fn((
 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); }
-void vFpipiu(x64emu_t *emu, uintptr_t fcn) { vFpipiu_t fn = (vFpipiu_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); }
 void vFpippi(x64emu_t *emu, uintptr_t fcn) { vFpippi_t fn = (vFpippi_t)fcn; fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void vFpuiip(x64emu_t *emu, uintptr_t fcn) { vFpuiip_t fn = (vFpuiip_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void vFpuipp(x64emu_t *emu, uintptr_t fcn) { vFpuipp_t fn = (vFpuipp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -4143,6 +4146,7 @@ void vFppddp(x64emu_t *emu, uintptr_t fcn) { vFppddp_t fn = (vFppddp_t)fcn; fn((
 void vFppLpL(x64emu_t *emu, uintptr_t fcn) { vFppLpL_t fn = (vFppLpL_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void vFpppii(x64emu_t *emu, uintptr_t fcn) { vFpppii_t fn = (vFpppii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void vFpppip(x64emu_t *emu, uintptr_t fcn) { vFpppip_t fn = (vFpppip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
+void vFpppui(x64emu_t *emu, uintptr_t fcn) { vFpppui_t fn = (vFpppui_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8); }
 void vFpppuu(x64emu_t *emu, uintptr_t fcn) { vFpppuu_t fn = (vFpppuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void vFpppup(x64emu_t *emu, uintptr_t fcn) { vFpppup_t fn = (vFpppup_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void vFpppdd(x64emu_t *emu, uintptr_t fcn) { vFpppdd_t fn = (vFpppdd_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
@@ -4228,6 +4232,7 @@ void iFpuuLL(x64emu_t *emu, uintptr_t fcn) { iFpuuLL_t fn = (iFpuuLL_t)fcn; R_RA
 void iFpulup(x64emu_t *emu, uintptr_t fcn) { iFpulup_t fn = (iFpulup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void iFpulpp(x64emu_t *emu, uintptr_t fcn) { iFpulpp_t fn = (iFpulpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpupiU(x64emu_t *emu, uintptr_t fcn) { iFpupiU_t fn = (iFpupiU_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint64_t)R_R8); }
+void iFpupuu(x64emu_t *emu, uintptr_t fcn) { iFpupuu_t fn = (iFpupuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void iFpupup(x64emu_t *emu, uintptr_t fcn) { iFpupup_t fn = (iFpupup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void iFpuppp(x64emu_t *emu, uintptr_t fcn) { iFpuppp_t fn = (iFpuppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFpUiUi(x64emu_t *emu, uintptr_t fcn) { iFpUiUi_t fn = (iFpUiUi_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint64_t)R_RSI, (int32_t)R_RDX, (uint64_t)R_RCX, (int32_t)R_R8); }
@@ -4383,6 +4388,7 @@ void pFpLiii(x64emu_t *emu, uintptr_t fcn) { pFpLiii_t fn = (pFpLiii_t)fcn; R_RA
 void pFpLLLp(x64emu_t *emu, uintptr_t fcn) { pFpLLLp_t fn = (pFpLLLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)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); }
 void pFppiii(x64emu_t *emu, uintptr_t fcn) { pFppiii_t fn = (pFppiii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
+void pFppiiu(x64emu_t *emu, uintptr_t fcn) { pFppiiu_t fn = (pFppiiu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8); }
 void pFppiip(x64emu_t *emu, uintptr_t fcn) { pFppiip_t fn = (pFppiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void pFppiup(x64emu_t *emu, uintptr_t fcn) { pFppiup_t fn = (pFppiup_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void pFppipi(x64emu_t *emu, uintptr_t fcn) { pFppipi_t fn = (pFppipi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
@@ -4393,7 +4399,6 @@ void pFppuip(x64emu_t *emu, uintptr_t fcn) { pFppuip_t fn = (pFppuip_t)fcn; R_RA
 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 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); }
@@ -4529,7 +4534,6 @@ void vFpddddd(x64emu_t *emu, uintptr_t fcn) { vFpddddd_t fn = (vFpddddd_t)fcn; f
 void vFpddddp(x64emu_t *emu, uintptr_t fcn) { vFpddddp_t fn = (vFpddddp_t)fcn; 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*)R_RSI); }
 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); }
@@ -4553,9 +4557,11 @@ void vFppLppi(x64emu_t *emu, uintptr_t fcn) { vFppLppi_t fn = (vFppLppi_t)fcn; f
 void vFppLppp(x64emu_t *emu, uintptr_t fcn) { vFppLppp_t fn = (vFppLppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFpppiii(x64emu_t *emu, uintptr_t fcn) { vFpppiii_t fn = (vFpppiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void vFpppiip(x64emu_t *emu, uintptr_t fcn) { vFpppiip_t fn = (vFpppiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9); }
+void vFpppiui(x64emu_t *emu, uintptr_t fcn) { vFpppiui_t fn = (vFpppiui_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uint32_t)R_R8, (int32_t)R_R9); }
 void vFpppiff(x64emu_t *emu, uintptr_t fcn) { vFpppiff_t fn = (vFpppiff_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, emu->xmm[0].f[0], emu->xmm[1].f[0]); }
 void vFpppipu(x64emu_t *emu, uintptr_t fcn) { vFpppipu_t fn = (vFpppipu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 void vFpppuii(x64emu_t *emu, uintptr_t fcn) { vFpppuii_t fn = (vFpppuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
+void vFpppuuu(x64emu_t *emu, uintptr_t fcn) { vFpppuuu_t fn = (vFpppuuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void vFppppii(x64emu_t *emu, uintptr_t fcn) { vFppppii_t fn = (vFppppii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void vFpppppi(x64emu_t *emu, uintptr_t fcn) { vFpppppi_t fn = (vFpppppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void vFpppppu(x64emu_t *emu, uintptr_t fcn) { vFpppppu_t fn = (vFpppppu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
@@ -4599,7 +4605,6 @@ void iFpiiuii(x64emu_t *emu, uintptr_t fcn) { iFpiiuii_t fn = (iFpiiuii_t)fcn; R
 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 iFpiiupp(x64emu_t *emu, uintptr_t fcn) { iFpiiupp_t fn = (iFpiiupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)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); }
 void iFpiCCpu(x64emu_t *emu, uintptr_t fcn) { iFpiCCpu_t fn = (iFpiCCpu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint8_t)R_RDX, (uint8_t)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 void iFpiuuup(x64emu_t *emu, uintptr_t fcn) { iFpiuuup_t fn = (iFpiuuup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
@@ -4861,8 +4866,8 @@ void vFppipppp(x64emu_t *emu, uintptr_t fcn) { vFppipppp_t fn = (vFppipppp_t)fcn
 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 vFppddddu(x64emu_t *emu, uintptr_t fcn) { vFppddddu_t fn = (vFppddddu_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], (uint32_t)R_RDX); }
+void vFppddpiu(x64emu_t *emu, uintptr_t fcn) { vFppddpiu_t fn = (vFppddpiu_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, (uint32_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)); }
 void vFppLpppp(x64emu_t *emu, uintptr_t fcn) { vFppLpppp_t fn = (vFppLpppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 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)); }
@@ -4871,7 +4876,6 @@ void vFpppiipp(x64emu_t *emu, uintptr_t fcn) { vFpppiipp_t fn = (vFpppiipp_t)fcn
 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)); }
@@ -4950,7 +4954,6 @@ void iFppppilp(x64emu_t *emu, uintptr_t fcn) { iFppppilp_t fn = (iFppppilp_t)fcn
 void iFppppipp(x64emu_t *emu, uintptr_t fcn) { iFppppipp_t fn = (iFppppipp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFppppdpu(x64emu_t *emu, uintptr_t fcn) { iFppppdpu_t fn = (iFppppdpu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, emu->xmm[0].d[0], (void*)R_R8, (uint32_t)R_R9); }
 void iFpppppip(x64emu_t *emu, uintptr_t fcn) { iFpppppip_t fn = (iFpppppip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
-void iFpppppup(x64emu_t *emu, uintptr_t fcn) { iFpppppup_t fn = (iFpppppup_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8)); }
 void iFpppppLp(x64emu_t *emu, uintptr_t fcn) { iFpppppLp_t fn = (iFpppppLp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8)); }
 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)); }
@@ -5080,9 +5083,12 @@ void vFppipppui(x64emu_t *emu, uintptr_t fcn) { vFppipppui_t fn = (vFppipppui_t)
 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 vFppuppiii(x64emu_t *emu, uintptr_t fcn) { vFppuppiii_t fn = (vFppuppiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16)); }
+void vFppuppiiu(x64emu_t *emu, uintptr_t fcn) { vFppuppiiu_t fn = (vFppuppiiu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(uint32_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)); }
+void vFpppuiiii(x64emu_t *emu, uintptr_t fcn) { vFpppuiiii_t fn = (vFpppuiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)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 vFppppiipi(x64emu_t *emu, uintptr_t fcn) { vFppppiipi_t fn = (vFppppiipi_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), *(int32_t*)(R_RSP + 16)); }
 void vFpppppuuu(x64emu_t *emu, uintptr_t fcn) { vFpppppuuu_t fn = (vFpppppuuu_t)fcn; 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), *(uint32_t*)(R_RSP + 16)); }
 void vFpppppppp(x64emu_t *emu, uintptr_t fcn) { vFpppppppp_t fn = (vFpppppppp_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)); }
@@ -5103,6 +5109,7 @@ void iFpWWipppp(x64emu_t *emu, uintptr_t fcn) { iFpWWipppp_t fn = (iFpWWipppp_t)
 void iFpuiipppp(x64emu_t *emu, uintptr_t fcn) { iFpuiipppp_t fn = (iFpuiipppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpuippLpp(x64emu_t *emu, uintptr_t fcn) { iFpuippLpp_t fn = (iFpuippLpp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpuuiiiii(x64emu_t *emu, uintptr_t fcn) { iFpuuiiiii_t fn = (iFpuuiiiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_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)); }
+void iFpuuipppp(x64emu_t *emu, uintptr_t fcn) { iFpuuipppp_t fn = (iFpuuipppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpuuupupu(x64emu_t *emu, uintptr_t fcn) { iFpuuupupu_t fn = (iFpuuupupu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void iFpuupuupp(x64emu_t *emu, uintptr_t fcn) { iFpuupuupp_t fn = (iFpuupuupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpupppWWu(x64emu_t *emu, uintptr_t fcn) { iFpupppWWu_t fn = (iFpupppWWu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (uint16_t)R_R9, *(uint16_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
@@ -5115,7 +5122,6 @@ void iFpLLppppp(x64emu_t *emu, uintptr_t fcn) { iFpLLppppp_t fn = (iFpLLppppp_t)
 void iFpLpipppp(x64emu_t *emu, uintptr_t fcn) { iFpLpipppp_t fn = (iFpLpipppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpLppLpip(x64emu_t *emu, uintptr_t fcn) { iFpLppLpip_t fn = (iFpLppLpip_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void iFpLpppppp(x64emu_t *emu, uintptr_t fcn) { iFpLpppppp_t fn = (iFpLpppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
-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)); }
@@ -5214,18 +5220,19 @@ void vFppiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiiii_t fn = (vFppiiiiiii
 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 vFppuippiip(x64emu_t *emu, uintptr_t fcn) { vFppuippiip_t fn = (vFppuippiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)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 vFppuppiiii(x64emu_t *emu, uintptr_t fcn) { vFppuppiiii_t fn = (vFppuppiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)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 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 vFppddddudd(x64emu_t *emu, uintptr_t fcn) { vFppddddudd_t fn = (vFppddddudd_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], (uint32_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)); }
 void vFpppiiiiii(x64emu_t *emu, uintptr_t fcn) { vFpppiiiiii_t fn = (vFpppiiiiii_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)); }
 void vFppppipiip(x64emu_t *emu, uintptr_t fcn) { vFppppipiip_t fn = (vFppppipiip_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), *(int32_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
@@ -5318,14 +5325,13 @@ void vFpuupuuuuuu(x64emu_t *emu, uintptr_t fcn) { vFpuupuuuuuu_t fn = (vFpuupuuu
 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 vFppuuppiiii(x64emu_t *emu, uintptr_t fcn) { vFppuuppiiii_t fn = (vFppuuppiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)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 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 vFppuppuiiii(x64emu_t *emu, uintptr_t fcn) { vFppuppuiiii_t fn = (vFppuppuiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(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)); }
@@ -5383,9 +5389,8 @@ void vFppiiiiipiii(x64emu_t *emu, uintptr_t fcn) { vFppiiiiipiii_t fn = (vFppiii
 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 vFppuuppiiiiu(x64emu_t *emu, uintptr_t fcn) { vFppuuppiiiiu_t fn = (vFppuuppiiiiu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)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), *(uint32_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)); }
@@ -5426,6 +5431,7 @@ 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 vFppuuppuiiiii(x64emu_t *emu, uintptr_t fcn) { vFppuuppuiiiii_t fn = (vFppuuppuiiiii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)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), *(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)); }
@@ -5455,7 +5461,7 @@ void vFpippppppppppp(x64emu_t *emu, uintptr_t fcn) { vFpippppppppppp_t fn = (vFp
 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 vFppuuppiiiiuii(x64emu_t *emu, uintptr_t fcn) { vFppuuppiiiiuii_t fn = (vFppuuppiiiiuii_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)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), *(uint32_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)); }
@@ -5869,6 +5875,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpiu) return 1;
 	if (fun == &vFpif) return 2;
 	if (fun == &vFpid) return 2;
+	if (fun == &vFpiL) return 1;
 	if (fun == &vFpip) return 1;
 	if (fun == &vFpui) return 1;
 	if (fun == &vFpuI) return 1;
@@ -5912,6 +5919,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFiip) return 1;
 	if (fun == &iFiCC) return 1;
 	if (fun == &iFiuu) return 1;
+	if (fun == &iFiup) return 1;
 	if (fun == &iFill) return 1;
 	if (fun == &iFiLi) return 1;
 	if (fun == &iFiLp) return 1;
@@ -6213,12 +6221,12 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpiUU) return 1;
 	if (fun == &vFpifi) return 2;
 	if (fun == &vFpipi) return 1;
+	if (fun == &vFpipu) return 1;
 	if (fun == &vFpipp) return 1;
 	if (fun == &vFpIdi) return 2;
 	if (fun == &vFpCuW) return 1;
 	if (fun == &vFpuii) return 1;
 	if (fun == &vFpuip) return 1;
-	if (fun == &vFpuui) return 1;
 	if (fun == &vFpuuu) return 1;
 	if (fun == &vFpuup) return 1;
 	if (fun == &vFpufi) return 2;
@@ -6235,7 +6243,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpfff) return 4;
 	if (fun == &vFpdii) 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;
@@ -6646,7 +6653,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpiUUp) return 1;
 	if (fun == &vFpilpp) return 1;
 	if (fun == &vFpipii) return 1;
-	if (fun == &vFpipiu) return 1;
 	if (fun == &vFpippi) return 1;
 	if (fun == &vFpuiip) return 1;
 	if (fun == &vFpuipp) return 1;
@@ -6695,6 +6701,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFppLpL) return 1;
 	if (fun == &vFpppii) return 1;
 	if (fun == &vFpppip) return 1;
+	if (fun == &vFpppui) return 1;
 	if (fun == &vFpppuu) return 1;
 	if (fun == &vFpppup) return 1;
 	if (fun == &vFpppdd) return 3;
@@ -6756,6 +6763,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpulup) return 1;
 	if (fun == &iFpulpp) return 1;
 	if (fun == &iFpupiU) return 1;
+	if (fun == &iFpupuu) return 1;
 	if (fun == &iFpupup) return 1;
 	if (fun == &iFpuppp) return 1;
 	if (fun == &iFpUiUi) return 1;
@@ -6892,6 +6900,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpLLLp) return 1;
 	if (fun == &pFpLpii) return 1;
 	if (fun == &pFppiii) return 1;
+	if (fun == &pFppiiu) return 1;
 	if (fun == &pFppiip) return 1;
 	if (fun == &pFppiup) return 1;
 	if (fun == &pFppipi) return 1;
@@ -6902,7 +6911,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	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 == &pFpppii) return 1;
@@ -7011,7 +7019,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpddddp) return 5;
 	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;
@@ -7035,9 +7042,11 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFppLppp) return 1;
 	if (fun == &vFpppiii) return 1;
 	if (fun == &vFpppiip) return 1;
+	if (fun == &vFpppiui) return 1;
 	if (fun == &vFpppiff) return 3;
 	if (fun == &vFpppipu) return 1;
 	if (fun == &vFpppuii) return 1;
+	if (fun == &vFpppuuu) return 1;
 	if (fun == &vFppppii) return 1;
 	if (fun == &vFpppppi) return 1;
 	if (fun == &vFpppppu) return 1;
@@ -7067,7 +7076,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpiiuui) return 1;
 	if (fun == &iFpiiupp) return 1;
 	if (fun == &iFpiipip) return 1;
-	if (fun == &iFpiippu) return 1;
 	if (fun == &iFpiippp) return 1;
 	if (fun == &iFpiCCpu) return 1;
 	if (fun == &iFpiuuup) return 1;
@@ -7223,8 +7231,8 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFudddddd) return 7;
 	if (fun == &vFpddiidd) return 5;
 	if (fun == &vFpdddddd) return 7;
-	if (fun == &vFppddddi) return 5;
-	if (fun == &vFppddpii) return 3;
+	if (fun == &vFppddddu) return 5;
+	if (fun == &vFppddpiu) return 3;
 	if (fun == &iFppppdpu) return 2;
 	if (fun == &pFifffppp) return 4;
 	if (fun == &pFfiiiiid) return 3;
@@ -7239,7 +7247,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpudddddd) return 7;
 	if (fun == &vFuffffffff) return 9;
 	if (fun == &vFffCCCCfff) return 6;
-	if (fun == &vFppddddidd) return 7;
+	if (fun == &vFppddddudd) return 7;
 	if (fun == &iFdddpppppp) return 4;
 	if (fun == &vFuffiiffiip) return 5;
 	if (fun == &vFuddiiddiip) return 5;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 83a38d65..e6138c3a 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -420,6 +420,7 @@ void vFpiC(x64emu_t *emu, uintptr_t fnc);
 void vFpiu(x64emu_t *emu, uintptr_t fnc);
 void vFpif(x64emu_t *emu, uintptr_t fnc);
 void vFpid(x64emu_t *emu, uintptr_t fnc);
+void vFpiL(x64emu_t *emu, uintptr_t fnc);
 void vFpip(x64emu_t *emu, uintptr_t fnc);
 void vFpui(x64emu_t *emu, uintptr_t fnc);
 void vFpuI(x64emu_t *emu, uintptr_t fnc);
@@ -477,6 +478,7 @@ void iFiip(x64emu_t *emu, uintptr_t fnc);
 void iFiiO(x64emu_t *emu, uintptr_t fnc);
 void iFiCC(x64emu_t *emu, uintptr_t fnc);
 void iFiuu(x64emu_t *emu, uintptr_t fnc);
+void iFiup(x64emu_t *emu, uintptr_t fnc);
 void iFill(x64emu_t *emu, uintptr_t fnc);
 void iFiLi(x64emu_t *emu, uintptr_t fnc);
 void iFiLp(x64emu_t *emu, uintptr_t fnc);
@@ -831,12 +833,12 @@ void vFpiUu(x64emu_t *emu, uintptr_t fnc);
 void vFpiUU(x64emu_t *emu, uintptr_t fnc);
 void vFpifi(x64emu_t *emu, uintptr_t fnc);
 void vFpipi(x64emu_t *emu, uintptr_t fnc);
+void vFpipu(x64emu_t *emu, uintptr_t fnc);
 void vFpipp(x64emu_t *emu, uintptr_t fnc);
 void vFpIdi(x64emu_t *emu, uintptr_t fnc);
 void vFpCuW(x64emu_t *emu, uintptr_t fnc);
 void vFpuii(x64emu_t *emu, uintptr_t fnc);
 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);
@@ -853,7 +855,6 @@ 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 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);
@@ -1346,7 +1347,6 @@ 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);
-void vFpipiu(x64emu_t *emu, uintptr_t fnc);
 void vFpippi(x64emu_t *emu, uintptr_t fnc);
 void vFpuiip(x64emu_t *emu, uintptr_t fnc);
 void vFpuipp(x64emu_t *emu, uintptr_t fnc);
@@ -1395,6 +1395,7 @@ void vFppddp(x64emu_t *emu, uintptr_t fnc);
 void vFppLpL(x64emu_t *emu, uintptr_t fnc);
 void vFpppii(x64emu_t *emu, uintptr_t fnc);
 void vFpppip(x64emu_t *emu, uintptr_t fnc);
+void vFpppui(x64emu_t *emu, uintptr_t fnc);
 void vFpppuu(x64emu_t *emu, uintptr_t fnc);
 void vFpppup(x64emu_t *emu, uintptr_t fnc);
 void vFpppdd(x64emu_t *emu, uintptr_t fnc);
@@ -1480,6 +1481,7 @@ void iFpuuLL(x64emu_t *emu, uintptr_t fnc);
 void iFpulup(x64emu_t *emu, uintptr_t fnc);
 void iFpulpp(x64emu_t *emu, uintptr_t fnc);
 void iFpupiU(x64emu_t *emu, uintptr_t fnc);
+void iFpupuu(x64emu_t *emu, uintptr_t fnc);
 void iFpupup(x64emu_t *emu, uintptr_t fnc);
 void iFpuppp(x64emu_t *emu, uintptr_t fnc);
 void iFpUiUi(x64emu_t *emu, uintptr_t fnc);
@@ -1635,6 +1637,7 @@ void pFpLiii(x64emu_t *emu, uintptr_t fnc);
 void pFpLLLp(x64emu_t *emu, uintptr_t fnc);
 void pFpLpii(x64emu_t *emu, uintptr_t fnc);
 void pFppiii(x64emu_t *emu, uintptr_t fnc);
+void pFppiiu(x64emu_t *emu, uintptr_t fnc);
 void pFppiip(x64emu_t *emu, uintptr_t fnc);
 void pFppiup(x64emu_t *emu, uintptr_t fnc);
 void pFppipi(x64emu_t *emu, uintptr_t fnc);
@@ -1645,7 +1648,6 @@ 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 pFpppii(x64emu_t *emu, uintptr_t fnc);
@@ -1781,7 +1783,6 @@ void vFpddddd(x64emu_t *emu, uintptr_t fnc);
 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);
@@ -1805,9 +1806,11 @@ void vFppLppi(x64emu_t *emu, uintptr_t fnc);
 void vFppLppp(x64emu_t *emu, uintptr_t fnc);
 void vFpppiii(x64emu_t *emu, uintptr_t fnc);
 void vFpppiip(x64emu_t *emu, uintptr_t fnc);
+void vFpppiui(x64emu_t *emu, uintptr_t fnc);
 void vFpppiff(x64emu_t *emu, uintptr_t fnc);
 void vFpppipu(x64emu_t *emu, uintptr_t fnc);
 void vFpppuii(x64emu_t *emu, uintptr_t fnc);
+void vFpppuuu(x64emu_t *emu, uintptr_t fnc);
 void vFppppii(x64emu_t *emu, uintptr_t fnc);
 void vFpppppi(x64emu_t *emu, uintptr_t fnc);
 void vFpppppu(x64emu_t *emu, uintptr_t fnc);
@@ -1851,7 +1854,6 @@ void iFpiiuii(x64emu_t *emu, uintptr_t fnc);
 void iFpiiuui(x64emu_t *emu, uintptr_t fnc);
 void iFpiiupp(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);
 void iFpiCCpu(x64emu_t *emu, uintptr_t fnc);
 void iFpiuuup(x64emu_t *emu, uintptr_t fnc);
@@ -2113,8 +2115,8 @@ 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 vFppddddu(x64emu_t *emu, uintptr_t fnc);
+void vFppddpiu(x64emu_t *emu, uintptr_t fnc);
 void vFppLpppi(x64emu_t *emu, uintptr_t fnc);
 void vFppLpppp(x64emu_t *emu, uintptr_t fnc);
 void vFpppiiii(x64emu_t *emu, uintptr_t fnc);
@@ -2123,7 +2125,6 @@ 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);
@@ -2202,7 +2203,6 @@ void iFppppilp(x64emu_t *emu, uintptr_t fnc);
 void iFppppipp(x64emu_t *emu, uintptr_t fnc);
 void iFppppdpu(x64emu_t *emu, uintptr_t fnc);
 void iFpppppip(x64emu_t *emu, uintptr_t fnc);
-void iFpppppup(x64emu_t *emu, uintptr_t fnc);
 void iFpppppLp(x64emu_t *emu, uintptr_t fnc);
 void iFppppppu(x64emu_t *emu, uintptr_t fnc);
 void iFppppppp(x64emu_t *emu, uintptr_t fnc);
@@ -2332,9 +2332,12 @@ 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 vFppuppiii(x64emu_t *emu, uintptr_t fnc);
+void vFppuppiiu(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);
+void vFpppuiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppppiipi(x64emu_t *emu, uintptr_t fnc);
 void vFpppppuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpppppppp(x64emu_t *emu, uintptr_t fnc);
@@ -2355,6 +2358,7 @@ void iFpWWipppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuiipppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuippLpp(x64emu_t *emu, uintptr_t fnc);
 void iFpuuiiiii(x64emu_t *emu, uintptr_t fnc);
+void iFpuuipppp(x64emu_t *emu, uintptr_t fnc);
 void iFpuuupupu(x64emu_t *emu, uintptr_t fnc);
 void iFpuupuupp(x64emu_t *emu, uintptr_t fnc);
 void iFpupppWWu(x64emu_t *emu, uintptr_t fnc);
@@ -2367,7 +2371,6 @@ void iFpLLppppp(x64emu_t *emu, uintptr_t fnc);
 void iFpLpipppp(x64emu_t *emu, uintptr_t fnc);
 void iFpLppLpip(x64emu_t *emu, uintptr_t fnc);
 void iFpLpppppp(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);
@@ -2466,18 +2469,19 @@ 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 vFppuippiip(x64emu_t *emu, uintptr_t fnc);
 void vFppuuiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppuuiiiiu(x64emu_t *emu, uintptr_t fnc);
+void vFppuppiiii(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 vFppddddudd(x64emu_t *emu, uintptr_t fnc);
 void vFpplpppppi(x64emu_t *emu, uintptr_t fnc);
 void vFpppiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppppipiip(x64emu_t *emu, uintptr_t fnc);
@@ -2570,14 +2574,13 @@ 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 vFppuuppiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppuuppppii(x64emu_t *emu, uintptr_t fnc);
+void vFppuppuiiii(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);
@@ -2635,9 +2638,8 @@ 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 vFppuuppiiiiu(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);
@@ -2678,6 +2680,7 @@ 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 vFppuuppuiiiii(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);
@@ -2707,7 +2710,7 @@ 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 vFppuuppiiiiuii(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);
diff --git a/src/wrapped/wrappedgdk3_private.h b/src/wrapped/wrappedgdk3_private.h
index b41f6aa9..298dbc9e 100755
--- a/src/wrapped/wrappedgdk3_private.h
+++ b/src/wrapped/wrappedgdk3_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_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_new, pFv)
+GO(gdk_app_launch_context_set_desktop, vFpi)
+GO(gdk_app_launch_context_set_display, vFpp)
+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)
@@ -79,23 +79,23 @@ GO(gdk_cursor_ref, pFp)
 GO(gdk_cursor_type_get_type, iFv)
 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_key, iFpupp)
+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, iFv)
-GO(gdk_device_set_axis_use, vFpui)
+GO(gdk_device_set_axis_use, vFpuu)
 GO(gdk_device_manager_get_type, lFv)
-GO(gdk_device_set_key, vFpuui)
-GO(gdk_device_set_mode, iFpi)
+GO(gdk_device_set_key, vFpuuu)
+GO(gdk_device_set_mode, iFpu)
 GO(gdk_device_set_source, vFpi)
 GO(gdk_devices_list, pFv)
 //GOM(gdk_display_add_client_message_filter, vFEpppp)
@@ -127,7 +127,7 @@ GO(gdk_display_manager_set_default_display, vFpp)
 GO(gdk_display_map_keycode, iFpuppp)
 GO(gdk_display_notify_startup_complete, vFpp)
 GO(gdk_display_open, pFp)
-//GO(gdk_display_open_default_libgtk_only, 
+GO(gdk_display_open_default_libgtk_only, pFv)
 GO(gdk_display_peek_event, pFp)
 GO(gdk_display_pointer_is_grabbed, iFp)
 GO(gdk_display_pointer_ungrab, vFpu)
@@ -151,8 +151,8 @@ GO(gdk_drag_action_get_type, iFv)
 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, iFv)
@@ -167,9 +167,9 @@ GO(gdk_drag_find_window_for_screen, vFpppiipp)
 GO(gdk_drag_get_protocol, pFpp)
 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, iFv)
-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)
@@ -220,7 +220,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_modifier_state, iFp)
@@ -339,13 +339,13 @@ GO(gdk_input_source_get_type, iFv)
 GO(gdk_join_style_get_type, iFv)
 GO(gdk_key_event_get_keycode, uFp)
 GO(gdk_key_event_get_keyval, uFp)
-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)
 GO(gdk_keymap_get_caps_lock_state, iFp)
 GO(gdk_keymap_get_default, pFv)
-GO(gdk_keymap_get_direction, iFp)
+GO(gdk_keymap_get_direction, uFp)
 GO(gdk_keymap_get_entries_for_keycode, iFpuppp)
 GO(gdk_keymap_get_entries_for_keyval, iFpupp)
 GO(gdk_keymap_get_for_display, pFp)
@@ -353,7 +353,7 @@ GO(gdk_keymap_get_type, iFv)
 GO(gdk_keymap_have_bidi_layouts, iFp)
 GO(gdk_keymap_lookup_key, uFpp)
 GO(gdk_keymap_map_virtual_modifiers, iFpp)
-GO(gdk_keymap_translate_keyboard_state, iFpuiipppp)
+GO(gdk_keymap_translate_keyboard_state, iFpuuipppp)
 GO(gdk_keyval_convert_case, vFupp)
 GO(gdk_keyval_from_name, uFp)
 GO(gdk_keyval_is_lower, iFu)
@@ -418,12 +418,12 @@ GO(gdk_pixmap_impl_x11_get_type, iFv)
 GO(gdk_pixmap_lookup, pFp)
 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, iFv)
@@ -543,7 +543,7 @@ GO(gdk_string_to_compound_text_for_display, iFpppppp)
 //GO(gdk_subwindow_mode_get_type, 
 //GO(gdk_synthesize_window_state, 
 //GO(gdk_test_render_sync, 
-//GO(gdk_test_simulate_button, 
+GO(gdk_test_simulate_button, iFpiiuui)
 //GO(gdk_test_simulate_key, 
 //GO(gdk_text_extents, 
 //GO(gdk_text_extents_wc, 
@@ -552,7 +552,7 @@ GO(gdk_string_to_compound_text_for_display, iFpppppp)
 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_property_to_utf8_list_for_display, iFppipip)
 //GO(gdk_text_width, 
 //GO(gdk_text_width_wc, 
 GO(gdk_texture_download, vFppL)
@@ -576,21 +576,21 @@ GO(gdk_utf8_to_string_target, pFp)
 GO(gdk_visibility_state_get_type, iFv)
 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)
 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, iFv)
-GO(gdk_visual_get_visual_type, iFp)
+GO(gdk_visual_get_type, LFv)
+GO(gdk_visual_get_visual_type, uFp)
 GO(gdk_visual_type_get_type, iFv)
 GO(gdk_wayland_toplevel_set_transient_for_exported, iFpp)
 GO(gdk_wayland_window_set_transient_for_exported, iFpp)
@@ -612,7 +612,7 @@ 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_image_surface, pFpiiii)
-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, 
@@ -638,10 +638,10 @@ 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)
+GO(gdk_window_get_geometry, vFppppp)
 GO(gdk_window_get_group, pFp)
 GO(gdk_window_get_height, iFp)
 GO(gdk_window_get_internal_paint_info, vFpppp)
@@ -653,16 +653,16 @@ 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, lFv)
-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, iFv)
@@ -710,11 +710,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)
@@ -723,7 +723,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)
@@ -732,7 +732,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)
@@ -821,4 +821,4 @@ DATA(gdk_threads_lock, 4)
 DATA(gdk_threads_unlock, 4)
 
 GO(dummy_set_child_property, vFppupp)       // to get vFppupp for gtkclass.c
-GO(dummy_constructor, vFLup)    // to get vFlup for gtkclass.c
\ No newline at end of file
+GO(dummy_constructor, vFLup)    // to get vFlup for gtkclass.c
diff --git a/src/wrapped/wrappedgtk3_private.h b/src/wrapped/wrappedgtk3_private.h
index 46b69727..3c914c19 100755
--- a/src/wrapped/wrappedgtk3_private.h
+++ b/src/wrapped/wrappedgtk3_private.h
@@ -9,7 +9,7 @@ GO(gtk_about_dialog_get_comments, pFp)
 GO(gtk_about_dialog_get_copyright, pFp)
 GO(gtk_about_dialog_get_documenters, pFp)
 GO(gtk_about_dialog_get_license, pFp)
-GO(gtk_about_dialog_get_license_type, iFp)
+GO(gtk_about_dialog_get_license_type, uFp)
 GO(gtk_about_dialog_get_logo, pFp)
 GO(gtk_about_dialog_get_logo_icon_name, pFp)
 GO(gtk_about_dialog_get_name, pFp)
@@ -28,7 +28,7 @@ GO(gtk_about_dialog_set_copyright, vFpp)
 GO(gtk_about_dialog_set_documenters, vFpp)
 //GO(gtk_about_dialog_set_email_hook, 
 GO(gtk_about_dialog_set_license, vFpp)
-GO(gtk_about_dialog_set_license_type, vFpi)
+GO(gtk_about_dialog_set_license_type, vFpu)
 GO(gtk_about_dialog_set_logo, vFpp)
 GO(gtk_about_dialog_set_logo_icon_name, vFpp)
 GO(gtk_about_dialog_set_name, vFpp)
@@ -40,54 +40,54 @@ GO(gtk_about_dialog_set_website, vFpp)
 GO(gtk_about_dialog_set_website_label, vFpp)
 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, pFv)
-GO(gtk_accel_group_activate, iFpppui)
+GO(gtk_accel_group_activate, iFpupuu)
 GO(gtk_accel_group_connect, vFpuiip)  // Closure probably needs wrapping when not null
 GO(gtk_accel_group_connect_by_path, vFppp)
 GO(gtk_accel_group_disconnect, iFpp)
-GO(gtk_accel_group_disconnect_key, iFpui)
+GO(gtk_accel_group_disconnect_key, iFpuu)
 //GOM(gtk_accel_group_find, pFEppp)
 GO(gtk_accel_group_from_accel_closure, pFp)
 GO(gtk_accel_group_get_is_locked, iFp)
-GO(gtk_accel_group_get_modifier_mask, iFp)
+GO(gtk_accel_group_get_modifier_mask, uFp)
 GO(gtk_accel_group_get_type, pFv)
 GO(gtk_accel_group_lock, vFp)
 GO(gtk_accel_group_new, pFv)
-GO(gtk_accel_group_query, pFpuip)
+GO(gtk_accel_group_query, pFpuup)
 GO(gtk_accel_groups_activate, iFpui)
 GO(gtk_accel_groups_from_object, pFp)
 GO(gtk_accel_group_unlock, vFp)
-//GO(gtk_accel_label_get_accel_widget, 
-//GO(gtk_accel_label_get_accel_width, 
+GO(gtk_accel_label_get_accel_widget, pFp)
+GO(gtk_accel_label_get_accel_width, uFp)
 GO(gtk_accel_label_get_type, pFv)
 //GO(gtk_accel_label_new, 
-//GO(gtk_accel_label_refetch, 
+GO(gtk_accel_label_refetch, iFp)
 //GO(gtk_accel_label_set_accel_closure, 
-//GO(gtk_accel_label_set_accel_widget, 
-//GO(gtk_accel_map_add_entry, 
+GO(gtk_accel_label_set_accel_widget, vFpp)
+GO(gtk_accel_map_add_entry, vFpuu)
 //GO(gtk_accel_map_add_filter, 
-//GO(gtk_accel_map_change_entry, 
+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, pFv)
 //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_save_fd, vFi)
 //GO(gtk_accel_map_unlock_path, 
 //GO(gtk_accessible_connect_widget_destroyed, 
 GO(gtk_accessible_get_type, pFv)
-//GO(gtk_accessible_get_widget, 
-//GO(gtk_accessible_set_widget, 
+GO(gtk_accessible_get_widget, pFp)
+GO(gtk_accessible_set_widget, vFpp)
 GO(gtk_actionable_get_type, pFv)
 //GO(gtk_action_activate, 
 GO(gtk_action_bar_get_type, pFv)
@@ -95,21 +95,21 @@ GO(gtk_action_bar_get_type, pFv)
 //GO(gtk_action_block_activate_from, 
 //GO(gtk_action_connect_accelerator, 
 //GO(gtk_action_connect_proxy, 
-//GO(gtk_action_create_icon, 
-//GO(gtk_action_create_menu, 
+GO(gtk_action_create_icon, pFpu)
+GO(gtk_action_create_menu, pFp)
 //GO(gtk_action_create_menu_item, 
 //GO(gtk_action_create_tool_item, 
 //GO(gtk_action_disconnect_accelerator, 
 //GO(gtk_action_disconnect_proxy, 
 //GO(gtk_action_get_accel_closure, 
 //GO(gtk_action_get_accel_path, 
-//GO(gtk_action_get_always_show_image, 
-//GO(gtk_action_get_gicon, 
-//GO(gtk_action_get_icon_name, 
+GO(gtk_action_get_always_show_image, iFp)
+GO(gtk_action_get_gicon, pFp)
+GO(gtk_action_get_icon_name, pFp)
 //GO(gtk_action_get_is_important, 
 //GO(gtk_action_get_label, 
 //GO(gtk_action_get_name, 
-//GO(gtk_action_get_proxies, 
+GO(gtk_action_get_proxies, pFp)
 //GO(gtk_action_get_sensitive, 
 //GO(gtk_action_get_short_label, 
 //GO(gtk_action_get_stock_id, 
@@ -121,32 +121,32 @@ GO(gtk_action_get_type, pFv)
 //GO(gtk_action_group_add_action, 
 //GO(gtk_action_group_add_actions, 
 //GO(gtk_action_group_add_actions_full, 
-//GO(gtk_action_group_add_action_with_accel, 
+GO(gtk_action_group_add_action_with_accel, vFppp)
 //GO(gtk_action_group_add_radio_actions, 
 //GO(gtk_action_group_add_radio_actions_full, 
 //GO(gtk_action_group_add_toggle_actions, 
 //GO(gtk_action_group_add_toggle_actions_full, 
-//GO(gtk_action_group_get_action, 
-//GO(gtk_action_group_get_name, 
+GO(gtk_action_group_get_action, pFpp)
+GO(gtk_action_group_get_name, pFp)
 //GO(gtk_action_group_get_sensitive, 
 GO(gtk_action_group_get_type, pFv)
-//GO(gtk_action_group_get_visible, 
-//GO(gtk_action_group_list_actions, 
-//GO(gtk_action_group_new, 
+GO(gtk_action_group_get_visible, iFp)
+GO(gtk_action_group_list_actions, pFp)
+GO(gtk_action_group_new, pFp)
 //GO(gtk_action_group_remove_action, 
 //GO(gtk_action_group_set_sensitive, 
 //GO(gtk_action_group_set_translate_func, 
-//GO(gtk_action_group_set_translation_domain, 
-//GO(gtk_action_group_set_visible, 
-//GO(gtk_action_group_translate_string, 
+GO(gtk_action_group_set_translation_domain, vFpp)
+GO(gtk_action_group_set_visible, vFpi)
+GO(gtk_action_group_translate_string, pFpp)
 //GO(gtk_action_is_sensitive, 
 //GO(gtk_action_is_visible, 
 //GO(gtk_action_new, 
-//GO(gtk_action_set_accel_group, 
+GO(gtk_action_set_accel_group, vFpp)
 //GO(gtk_action_set_accel_path, 
-//GO(gtk_action_set_always_show_image, 
-//GO(gtk_action_set_gicon, 
-//GO(gtk_action_set_icon_name, 
+GO(gtk_action_set_always_show_image, vFpi)
+GO(gtk_action_set_gicon, vFpp)
+GO(gtk_action_set_icon_name, vFpp)
 //GO(gtk_action_set_is_important, 
 //GO(gtk_action_set_label, 
 //GO(gtk_action_set_sensitive, 
@@ -158,12 +158,12 @@ GO(gtk_action_group_get_type, pFv)
 //GO(gtk_action_set_visible_vertical, 
 //GO(gtk_action_unblock_activate, 
 //GO(gtk_action_unblock_activate_from, 
-//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, pFv)
-//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)
@@ -194,7 +194,7 @@ GO(gtk_anchor_type_get_type, pFv)
 GO(gtk_application_add_window, vFpp)
 GO(gtk_application_get_new, pFpi)
 GO(gtk_application_get_type, pFv)
-GO(gtk_application_new, pFpi)
+GO(gtk_application_new, pFpu)
 GO(gtk_application_set_accels_for_action, vFppp)
 GO(gtk_application_window_new, pFp)
 GO(gtk_application_window_get_type, pFv)
@@ -204,51 +204,51 @@ GO(gtk_app_chooser_get_type, pFv)
 GO(gtk_app_chooser_widget_get_type, pFv)
 GO(gtk_arg_flags_get_type, pFv)
 GO(gtk_arrow_get_type, pFv)
-GO(gtk_arrow_new, pFii)
+GO(gtk_arrow_new, pFuu)
 GO(gtk_arrow_placement_get_type, pFv)
-GO(gtk_arrow_set, vFpii)
+GO(gtk_arrow_set, vFpuu)
 GO(gtk_arrow_type_get_type, pFv)
 GO(gtk_aspect_frame_get_type, pFv)
-//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_append_page, iFpp)
 //GO(gtk_assistant_commit, 
 //GO(gtk_assistant_get_current_page, 
-//GO(gtk_assistant_get_n_pages, 
-//GO(gtk_assistant_get_nth_page, 
+GO(gtk_assistant_get_n_pages, iFp)
+GO(gtk_assistant_get_nth_page, pFpi)
 //GO(gtk_assistant_get_page_complete, 
 //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, pFv)
-//GO(gtk_assistant_insert_page, 
+GO(gtk_assistant_insert_page, iFppi)
 //GO(gtk_assistant_new, 
 GO(gtk_assistant_page_type_get_type, pFv)
 //GO(gtk_assistant_prepend_page, 
-//GO(gtk_assistant_remove_action_widget, 
+GO(gtk_assistant_remove_action_widget, vFpp)
 //GO(gtk_assistant_set_current_page, 
 //GO(gtk_assistant_set_forward_page_func, 
 //GO(gtk_assistant_set_page_complete, 
 //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, pFv)
 //GO(gtk_binding_entry_add_signal, 
-//GO(gtk_binding_entry_add_signall, 
+GO(gtk_binding_entry_add_signall, vFpuupp)
 //GO(gtk_binding_entry_clear, 
-//GO(gtk_binding_entry_remove, 
+GO(gtk_binding_entry_remove, vFpuu)
 //GO(gtk_binding_entry_skip, 
 //GO(gtk_binding_parse_binding, 
-//GO(gtk_bindings_activate, 
+GO(gtk_bindings_activate, iFpuu)
 GO(gtk_bindings_activate_event, iFpp)
-//GO(gtk_binding_set_activate, 
-//GO(gtk_binding_set_add_path, 
-//GO(gtk_binding_set_by_class, 
-//GO(gtk_binding_set_find, 
+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, 
 GO(gtk_bin_get_child, pFp)
 GO(gtk_bin_get_type, pFv)
@@ -259,14 +259,14 @@ GO(gtk_border_new, pFv)
 GO(gtk_box_get_homogeneous, iFp)
 GO(gtk_box_get_spacing, iFp)
 GO(gtk_box_get_type, pFv)
-GO(gtk_box_new, pFii)
+GO(gtk_box_new, pFui)
 GO(gtk_box_pack_end, vFppiiu)
 GO(gtk_box_pack_end_defaults, vFpp)
 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)
@@ -282,7 +282,7 @@ 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_resource, 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)
@@ -293,22 +293,22 @@ GO(gtk_builder_get_object, pFpp)
 GO(gtk_builder_get_objects, pFp)
 GO(gtk_builder_get_translation_domain, pFp)
 GO(gtk_builder_get_type, pFv)
-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, pFv)
 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, pFv)
 GO(gtk_button_box_new, pFi)
 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, pFv)
 //GO(gtk_button_clicked, 
 //GO(gtk_button_enter, 
@@ -316,9 +316,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, pFv)
 GO(gtk_button_get_use_stock, iFp)
 GO(gtk_button_get_use_underline, iFp)
@@ -332,9 +332,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, pFv)
@@ -342,25 +342,25 @@ GO(gtk_buttons_type_get_type, pFv)
 //GO(gtk_calendar_display_options, 
 GO(gtk_calendar_display_options_get_type, pFv)
 //GO(gtk_calendar_freeze, 
-//GO(gtk_calendar_get_date, 
-//GO(gtk_calendar_get_detail_height_rows, 
+GO(gtk_calendar_get_date, vFpppp)
+GO(gtk_calendar_get_detail_height_rows, iFp)
 //GO(gtk_calendar_get_detail_width_chars, 
-//GO(gtk_calendar_get_display_options, 
+GO(gtk_calendar_get_display_options, uFp)
 GO(gtk_calendar_get_type, pFv)
 //GO(gtk_calendar_mark_day, 
 //GO(gtk_calendar_new, 
 //GO(gtk_calendar_select_day, 
-//GO(gtk_calendar_select_month, 
+GO(gtk_calendar_select_month, vFpuu)
 //GO(gtk_calendar_set_detail_func, 
-//GO(gtk_calendar_set_detail_height_rows, 
+GO(gtk_calendar_set_detail_height_rows, vFpi)
 //GO(gtk_calendar_set_detail_width_chars, 
-//GO(gtk_calendar_set_display_options, 
+GO(gtk_calendar_set_display_options, vFpu)
 //GO(gtk_calendar_thaw, 
-//GO(gtk_calendar_unmark_day, 
+GO(gtk_calendar_unmark_day, vFpu)
 //GO(gtk_cell_editable_editing_done, 
 GO(gtk_cell_editable_get_type, pFv)
 //GO(gtk_cell_editable_remove_widget, 
-//GO(gtk_cell_editable_start_editing, 
+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)
@@ -374,15 +374,15 @@ GO(gtk_cell_layout_set_attributes, vFpppppppppp)  // vaarg
 GO(gtk_cell_renderer_accel_get_type, pFv)
 GO(gtk_cell_renderer_accel_mode_get_type, pFv)
 //GO(gtk_cell_renderer_accel_new, 
-//GO(gtk_cell_renderer_activate, 
+GO(gtk_cell_renderer_activate, iFppppppu)
 GO(gtk_cell_renderer_combo_get_type, pFv)
 //GO(gtk_cell_renderer_combo_new, 
 //GO(gtk_cell_renderer_editing_canceled, 
-//GO(gtk_cell_renderer_get_alignment, 
+GO(gtk_cell_renderer_get_alignment, vFppp)
 //GO(gtk_cell_renderer_get_fixed_size, 
-//GO(gtk_cell_renderer_get_padding, 
+GO(gtk_cell_renderer_get_padding, vFppp)
 //GO(gtk_cell_renderer_get_sensitive, 
-//GO(gtk_cell_renderer_get_size, 
+GO(gtk_cell_renderer_get_size, vFppppppp)
 GO(gtk_cell_renderer_get_type, pFv)
 //GO(gtk_cell_renderer_get_visible, 
 GO(gtk_cell_renderer_mode_get_type, pFv)
@@ -390,19 +390,19 @@ GO(gtk_cell_renderer_pixbuf_get_type, pFv)
 GO(gtk_cell_renderer_pixbuf_new, pFv)
 GO(gtk_cell_renderer_progress_get_type, pFv)
 //GO(gtk_cell_renderer_progress_new, 
-//GO(gtk_cell_renderer_render, 
-//GO(gtk_cell_renderer_set_alignment, 
+GO(gtk_cell_renderer_render, vFpppppu)
+GO(gtk_cell_renderer_set_alignment, vFpff)
 //GO(gtk_cell_renderer_set_fixed_size, 
-//GO(gtk_cell_renderer_set_padding, 
+GO(gtk_cell_renderer_set_padding, vFpii)
 //GO(gtk_cell_renderer_set_sensitive, 
 //GO(gtk_cell_renderer_set_visible, 
 GO(gtk_cell_renderer_spin_get_type, pFv)
 GO(gtk_cell_renderer_spinner_get_type, pFv)
 //GO(gtk_cell_renderer_spinner_new, 
 //GO(gtk_cell_renderer_spin_new, 
-//GO(gtk_cell_renderer_start_editing, 
+GO(gtk_cell_renderer_start_editing, pFppppppu)
 GO(gtk_cell_renderer_state_get_type, pFv)
-//GO(gtk_cell_renderer_stop_editing, 
+GO(gtk_cell_renderer_stop_editing, vFpi)
 GO(gtk_cell_renderer_text_get_type, pFv)
 GO(gtk_cell_renderer_text_new, pFv)
 GO(gtk_cell_renderer_text_set_fixed_height_from_font, vFpi)
@@ -416,17 +416,17 @@ GO(gtk_cell_renderer_toggle_set_active, vFpi)
 GO(gtk_cell_renderer_toggle_set_radio, vFpi)
 GO(gtk_cell_type_get_type, pFv)
 //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_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, pFv)
 //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, pFv)
 GO(gtk_check_button_new, pFv)
 GO(gtk_check_button_new_with_label, pFp)
@@ -456,7 +456,7 @@ GO(gtk_clipboard_get_type, pFv)
 //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)
@@ -597,7 +597,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)
@@ -622,7 +622,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)
@@ -659,7 +659,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, vFpppp)
-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)
@@ -672,7 +672,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, pFv)
 GO(gtk_container_propagate_expose, vFppp)
 GO(gtk_container_remove, vFpp)
@@ -682,8 +682,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, pFv)
 GO(gtk_css_provider_get_default, pFv)
@@ -698,7 +698,7 @@ GO(gtk_css_section_get_end_line, uFp)
 GO(gtk_css_section_get_end_position, uFp)
 GO(gtk_css_section_get_file, pFp)
 GO(gtk_css_section_get_parent, pFp)
-GO(gtk_css_section_get_section_type, iFp)
+GO(gtk_css_section_get_section_type, uFp)
 GO(gtk_css_section_get_start_line, uFp)
 GO(gtk_css_section_get_start_position, uFp)
 GO(gtk_css_section_ref, pFp)
@@ -813,8 +813,8 @@ GO(gtk_dialog_set_has_separator, vFpi)
 GO(gtk_dialog_set_response_sensitive, vFpii)
 GO(gtk_direction_type_get_type, pFv)
 GO(gtk_disable_setlocale, vFv)
-GO(gtk_distribute_natural_allocation, iFpup)
-GO(gtk_drag_begin, pFppiip)
+GO(gtk_distribute_natural_allocation, iFiup)
+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)
@@ -822,8 +822,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)
@@ -843,7 +843,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)
@@ -865,7 +865,7 @@ GO(gtk_draw_hline, vFppiiii)
 GO(gtk_drawing_area_get_type, pFv)
 GO(gtk_drawing_area_new, pFv)
 GO(gtk_drawing_area_size, vFpii)
-GO(gtk_draw_insertion_cursor, vFppppiii)
+GO(gtk_draw_insertion_cursor, vFpppiui)
 GO(gtk_draw_layout, vFppiiiip)
 GO(gtk_draw_option, vFppiiiiii)
 GO(gtk_draw_polygon, vFppiipii)
@@ -891,70 +891,70 @@ 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, pFv)
-//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, pFv)
-//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_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_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, 
@@ -962,7 +962,7 @@ GO(gtk_entry_get_type, pFv)
 //GO(gtk_entry_get_visibility, 
 GO(gtk_entry_get_width_chars, iFp)
 GO(gtk_entry_icon_position_get_type, pFv)
-//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)
@@ -974,30 +974,30 @@ 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)
@@ -1035,7 +1035,7 @@ 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, pFv)
 GO(gtk_file_chooser_button_get_width_chars, iFp)
-GO(gtk_file_chooser_button_new, pFpi)
+GO(gtk_file_chooser_button_new, pFpu)
 GO(gtk_file_chooser_button_new_with_backend, pFpip)
 GO(gtk_file_chooser_button_new_with_dialog, pFp)
 GO(gtk_file_chooser_button_set_focus_on_click, vFpi)
@@ -1047,7 +1047,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, pFv)
 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)
@@ -1082,7 +1082,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)
@@ -1105,7 +1105,7 @@ 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, pFv)
-GO(gtk_file_chooser_widget_new, pFi)
+GO(gtk_file_chooser_widget_new, pFu)
 GO(gtk_file_chooser_widget_new_with_backend, pFip)
 //GOM(gtk_file_filter_add_custom, vFEppppp)
 GO(gtk_file_filter_add_mime_type, vFpp)
@@ -1114,7 +1114,7 @@ GO(gtk_file_filter_add_pixbuf_formats, vFp)
 GO(gtk_file_filter_filter, iFpp)
 GO(gtk_file_filter_flags_get_type, pFv)
 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, pFv)
 GO(gtk_file_filter_new, pFv)
 GO(gtk_file_filter_set_name, vFpp)
@@ -1161,7 +1161,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, pFv)
 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)
@@ -1181,13 +1181,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, pFv)
 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, pFv)
 GO(gtk_gamma_curve_new, pFv)
 GO(gtk_gc_get, pFippu)
@@ -1215,13 +1215,13 @@ GO(gtk_grid_set_row_homogeneous, vFpi)
 GO(gtk_grid_set_row_spacing, vFpu)
 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, pFv)
 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, pFv)
 GO(gtk_hbox_new, pFii)
 GO(gtk_hbutton_box_get_layout_default, iFv)
@@ -1246,13 +1246,13 @@ GO(gtk_hscrollbar_get_type, pFv)
 GO(gtk_hscrollbar_new, pFp)
 GO(gtk_hseparator_get_type, pFv)
 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, pFv)
-//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)
@@ -1274,7 +1274,7 @@ GO(gtk_icon_info_load_icon, pFpp)
 GO(gtk_icon_info_load_surface, pFppp)
 GO(gtk_icon_info_load_symbolic_for_context, pFpppp)
 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, pFv)
 GO(gtk_icon_set_add_source, vFpp)
 GO(gtk_icon_set_copy, pFp)
@@ -1283,36 +1283,36 @@ GO(gtk_icon_set_get_type, pFv)
 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, pFv)
-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, pFv)
 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)
@@ -1332,7 +1332,7 @@ GO(gtk_icon_theme_list_icons, pFpp)
 GO(gtk_icon_theme_load_icon, pFppiup)
 GO(gtk_icon_theme_lookup_by_gicon, pFppiu)
 GO(gtk_icon_theme_lookup_icon, pFppiu)
-GO(gtk_icon_theme_lookup_icon_for_scale, pFppiii)
+GO(gtk_icon_theme_lookup_icon_for_scale, pFppiiu)
 GO(gtk_icon_theme_new, pFv)
 //GO(gtk_icon_theme_prepend_search_path, 
 GO(gtk_icon_theme_rescan_if_needed, iFp)
@@ -1342,8 +1342,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, pFv)
-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)
@@ -1351,7 +1351,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)
@@ -1364,7 +1364,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)
@@ -1382,8 +1382,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)
@@ -1393,7 +1393,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)
@@ -1420,7 +1420,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, pFv)
 GO(gtk_image_menu_item_get_always_show_image, iFp)
 GO(gtk_image_menu_item_get_image, pFp)
@@ -1437,9 +1437,9 @@ 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_gicon, pFpu)
 GO(gtk_image_new_from_icon_name, pFpi)
-GO(gtk_image_new_from_icon_set, pFpi)
+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)
@@ -1447,9 +1447,9 @@ 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_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)
@@ -1480,19 +1480,19 @@ GO(gtk_im_multicontext_new, pFv)
 GO(gtk_im_multicontext_set_context_id, vFpp)
 GO(gtk_im_preedit_style_get_type, pFv)
 GO(gtk_im_status_style_get_type, pFv)
-//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, pFv)
 //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)
@@ -1503,11 +1503,11 @@ GO(gtk_input_dialog_new, pFv)
 GO(gtk_input_hints_get_type, pFv)
 GO(gtk_input_purpose_get_type, pFv)
 GO(gtk_input_remove, vFu)
-//GO(gtk_invisible_get_screen, 
+GO(gtk_invisible_get_screen, pFp)
 GO(gtk_invisible_get_type, pFv)
 //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_factory_add_foreign, 
@@ -1543,13 +1543,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)
@@ -1568,11 +1568,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)
@@ -1587,29 +1587,29 @@ GO(gtk_label_set_use_markup, vFpi)
 GO(gtk_label_set_use_underline, vFpi)
 GO(gtk_label_set_width_chars, vFpi)
 //GO(gtk_layout_freeze, 
-//GO(gtk_layout_get_bin_window, 
+GO(gtk_layout_get_bin_window, pFp)
 //GO(gtk_layout_get_hadjustment, 
-//GO(gtk_layout_get_size, 
+GO(gtk_layout_get_size, vFppp)
 GO(gtk_layout_get_type, pFv)
-//GO(gtk_layout_get_vadjustment, 
-//GO(gtk_layout_move, 
+GO(gtk_layout_get_vadjustment, pFp)
+GO(gtk_layout_move, vFppii)
 GO(gtk_layout_new, pFpp)
 //GO(gtk_layout_put, 
 //GO(gtk_layout_set_hadjustment, 
-//GO(gtk_layout_set_size, 
-//GO(gtk_layout_set_vadjustment, 
+GO(gtk_layout_set_size, vFpuu)
+GO(gtk_layout_set_vadjustment, vFpp)
 //GO(gtk_layout_thaw, 
 GO(gtk_level_bar_mode_get_type, pFv)
 GO(gtk_level_bar_get_type, pFv)
 GO(gtk_license_get_type, pFv)
 GO(gtk_link_button_get_type, pFv)
-//GO(gtk_link_button_get_uri, 
-//GO(gtk_link_button_get_visited, 
+GO(gtk_link_button_get_uri, pFp)
+GO(gtk_link_button_get_visited, iFp)
 //GO(gtk_link_button_new, 
 //GO(gtk_link_button_new_with_label, 
-//GO(gtk_link_button_set_uri, 
+GO(gtk_link_button_set_uri, vFpp)
 //GO(gtk_link_button_set_uri_hook, 
-//GO(gtk_link_button_set_visited, 
+GO(gtk_link_button_set_visited, vFpi)
 GO(gtk_list_append_items, vFpp)
 GO(gtk_list_box_get_type, pFv)
 GO(gtk_list_box_row_get_type, pFv)
@@ -1701,11 +1701,11 @@ GO(gtk_main_quit, vFv)
 GO(gtk_match_type_get_type, pFv)
 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, pFv)
 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_button_new, pFv)
 GO(gtk_menu_button_set_menu_model, vFpp)
@@ -1755,26 +1755,26 @@ 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, 
 //GO(gtk_menu_shell_deselect, 
-//GO(gtk_menu_shell_get_take_focus, 
+GO(gtk_menu_shell_get_take_focus, iFp)
 GO(gtk_menu_shell_get_type, pFv)
 GO(gtk_menu_shell_insert, vFppi)
 GO(gtk_menu_shell_prepend, vFpp)
 GO(gtk_menu_shell_select_first, vFpi)
 GO(gtk_menu_shell_select_item, vFpp)
-//GO(gtk_menu_shell_set_take_focus, 
-//GO(gtk_menu_tool_button_get_menu, 
+GO(gtk_menu_shell_set_take_focus, vFpi)
+GO(gtk_menu_tool_button_get_menu, pFp)
 GO(gtk_menu_tool_button_get_type, pFv)
-//GO(gtk_menu_tool_button_new, 
+GO(gtk_menu_tool_button_new, pFpp)
 //GO(gtk_menu_tool_button_new_from_stock, 
 //GO(gtk_menu_tool_button_set_arrow_tooltip, 
-//GO(gtk_menu_tool_button_set_arrow_tooltip_markup, 
+GO(gtk_menu_tool_button_set_arrow_tooltip_markup, vFpp)
 //GO(gtk_menu_tool_button_set_arrow_tooltip_text, 
-//GO(gtk_menu_tool_button_set_menu, 
+GO(gtk_menu_tool_button_set_menu, vFpp)
 GOM(gtk_message_dialog_format_secondary_markup, vFEppV)
 GOM(gtk_message_dialog_format_secondary_text, vFEppV)
 GO(gtk_message_dialog_get_image, pFp)
@@ -1802,7 +1802,7 @@ GO(gtk_movement_step_get_type, pFv)
 GO(gtk_native_get_surface, pFp)
 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)
@@ -1818,7 +1818,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, pFv)
@@ -1835,7 +1835,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)
@@ -1852,7 +1852,7 @@ 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_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)
@@ -1896,9 +1896,9 @@ 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, pFv)
-GO(gtk_orientable_set_orientation, vFpi)
+GO(gtk_orientable_set_orientation, vFpu)
 GO(gtk_orientation_get_type, pFv)
 GO(gtk_overlay_add_overlay, vFpp)
 GO(gtk_overlay_get_type, pFv)
@@ -1906,11 +1906,11 @@ GO(gtk_pack_direction_get_type, pFv)
 GO(gtk_pack_type_get_type, pFv)
 GO(gtk_page_orientation_get_type, pFv)
 GO(gtk_page_set_get_type, pFv)
-//GO(gtk_page_setup_copy, 
+GO(gtk_page_setup_copy, pFp)
 //GO(gtk_page_setup_get_bottom_margin, 
 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)
@@ -1919,54 +1919,54 @@ GO(gtk_page_setup_get_right_margin, dFpi)
 GO(gtk_page_setup_get_top_margin, dFpi)
 GO(gtk_page_setup_get_type, pFv)
 //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, pFv)
 //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, vFppuuppuiiiii)
 GO(gtk_paint_box, vFppiipppiiii)
-GO(gtk_paint_box_gap, vFppiipppiiiiiii)
+GO(gtk_paint_box_gap, vFppuuppiiiiuii)
 GO(gtk_paint_check, vFppiipppiiii)
 GO(gtk_paint_diamond, vFppiipppiiii)
-GO(gtk_paint_expander, vFppipppiii)
-GO(gtk_paint_extension, vFppiipppiiiii)
+GO(gtk_paint_expander, vFppuppiiu)
+GO(gtk_paint_extension, vFppuuppiiiiu)
 GO(gtk_paint_flat_box, vFppiipppiiii)
-GO(gtk_paint_focus, vFppipppiiii)
-GO(gtk_paint_handle, vFppiipppiiiii)
+GO(gtk_paint_focus, vFppuppiiii)
+GO(gtk_paint_handle, vFppuuppiiiiu)
 GO(gtk_paint_hline, vFppipppiii)
-GO(gtk_paint_layout, vFppiipppiip)
+GO(gtk_paint_layout, vFppuippiip)
 GO(gtk_paint_option, vFppiipppiiii)
 GO(gtk_paint_polygon, vFppiippppii)
-GO(gtk_paint_resize_grip, vFppipppiiiii)
+GO(gtk_paint_resize_grip, vFppuppuiiii)
 GO(gtk_paint_shadow, vFppiipppiiii)
 GO(gtk_paint_shadow_gap, vFppiipppiiiiiii)
 GO(gtk_paint_slider, vFppiipppiiiii)
-GO(gtk_paint_spinner, vFppipppuiiii)
+GO(gtk_paint_spinner, vFppuppuiiii)
 GO(gtk_paint_string, vFppipppiip)
-GO(gtk_paint_tab, vFppiipppiiii)
-GO(gtk_paint_vline, vFppipppiii)
+GO(gtk_paint_tab, vFppuuppiiii)
+GO(gtk_paint_vline, vFppuppiii)
 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, pFv)
 GO(gtk_paned_pack1, vFppii)
 GO(gtk_paned_pack2, vFppii)
@@ -1976,7 +1976,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)
@@ -1988,10 +1988,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, pFv)
@@ -2043,18 +2043,18 @@ GO(gtk_print_backend_get_type, pFv)
 //GO(gtk_print_backend_set_list_done, 
 //GO(gtk_print_backend_set_password, 
 GO(gtk_print_capabilities_get_type, pFv)
-//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, pFv)
 //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, pFv)
 //GO(gtk_printer_accepts_pdf, 
 //GO(gtk_printer_accepts_ps, 
@@ -2136,118 +2136,118 @@ GO(gtk_print_job_set_source_file, iFppp)
 GO(gtk_print_operation_action_get_type, pFv)
 //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, pFv)
 //GO(gtk_print_operation_is_finished, 
-//GO(gtk_print_operation_new, 
+GO(gtk_print_operation_new, pFv)
 //GO(gtk_print_operation_preview_end_preview, 
 GO(gtk_print_operation_preview_get_type, pFv)
-//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, pFv)
-//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_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, 
-//GO(gtk_print_operation_set_embed_page_setup, 
+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, pFv)
 GO(gtk_print_quality_get_type, pFv)
-//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, pFv)
 //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_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, 
-//GO(gtk_print_settings_set_paper_height, 
-//GO(gtk_print_settings_set_paper_size, 
+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, vFpd)
-GO(gtk_print_settings_set_print_pages, vFpi)
-//GO(gtk_print_settings_set_quality, 
-//GO(gtk_print_settings_set_resolution, 
+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, 
-//GO(gtk_print_settings_set_scale, 
+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, pFv)
 //GO(gtk_print_unix_dialog_add_custom_tab, 
@@ -2270,10 +2270,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, pFv)
-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_pulse_step, dFp)
 GO(gtk_progress_bar_get_text, pFp)
 GO(gtk_progress_bar_get_type, pFv)
 GO(gtk_progress_bar_new, pFv)
@@ -2284,7 +2284,7 @@ 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_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_pulse_step, vFpd)
@@ -2356,7 +2356,7 @@ GO(gtk_range_get_slider_range, vFppp)
 GO(gtk_range_get_slider_size_fixed, iFp)
 GO(gtk_range_get_type, pFv)
 GO(gtk_range_get_update_policy, iFp)
-GO(gtk_range_get_upper_stepper_sensitivity, iFp)
+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)
@@ -2371,7 +2371,7 @@ 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_upper_stepper_sensitivity, vFpu)
 GO(gtk_range_set_value, vFpd)
 GO(gtk_rc_add_class_style, vFpp)
 GO(gtk_rc_add_default_file, vFp)
@@ -2385,7 +2385,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)
@@ -2411,111 +2411,111 @@ GO(gtk_rc_style_unref, vFp)
 GO(gtk_rc_token_type_get_type, pFv)
 GO(gtk_revealer_get_type, pFv)
 GO(gtk_revealer_transition_type_get_type, pFv)
-//GO(gtk_recent_action_get_show_numbers, 
+GO(gtk_recent_action_get_show_numbers, iFp)
 GO(gtk_recent_action_get_type, pFv)
-//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, pFv)
 //GO(gtk_recent_chooser_dialog_new, 
 //GO(gtk_recent_chooser_dialog_new_for_manager, 
 GO(gtk_recent_chooser_error_get_type, pFv)
-//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, pFv)
-//GO(gtk_recent_chooser_get_uris, 
-//GO(gtk_recent_chooser_list_filters, 
-//GO(gtk_recent_chooser_menu_get_show_numbers, 
+GO(gtk_recent_chooser_get_uris, pFpp)
+GO(gtk_recent_chooser_list_filters, pFp)
+GO(gtk_recent_chooser_menu_get_show_numbers, iFp)
 GO(gtk_recent_chooser_menu_get_type, pFv)
 //GO(gtk_recent_chooser_menu_new, 
 //GO(gtk_recent_chooser_menu_new_for_manager, 
-//GO(gtk_recent_chooser_menu_set_show_numbers, 
+GO(gtk_recent_chooser_menu_set_show_numbers, vFpi)
 //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_set_sort_type, vFpu)
 //GO(gtk_recent_chooser_unselect_all, 
-//GO(gtk_recent_chooser_unselect_uri, 
+GO(gtk_recent_chooser_unselect_uri, vFpp)
 GO(gtk_recent_chooser_widget_get_type, pFv)
 //GO(gtk_recent_chooser_widget_new, 
-//GO(gtk_recent_chooser_widget_new_for_manager, 
-//GO(gtk_recent_filter_add_age, 
+GO(gtk_recent_chooser_widget_new_for_manager, pFp)
+GO(gtk_recent_filter_add_age, vFpi)
 //GO(gtk_recent_filter_add_application, 
 //GO(gtk_recent_filter_add_custom, 
-//GO(gtk_recent_filter_add_group, 
+GO(gtk_recent_filter_add_group, vFpp)
 //GO(gtk_recent_filter_add_mime_type, 
 //GO(gtk_recent_filter_add_pattern, 
 //GO(gtk_recent_filter_add_pixbuf_formats, 
-//GO(gtk_recent_filter_filter, 
+GO(gtk_recent_filter_filter, iFpp)
 GO(gtk_recent_filter_flags_get_type, pFv)
-//GO(gtk_recent_filter_get_name, 
-//GO(gtk_recent_filter_get_needed, 
+GO(gtk_recent_filter_get_name, pFp)
+GO(gtk_recent_filter_get_needed, uFp)
 GO(gtk_recent_filter_get_type, pFv)
-//GO(gtk_recent_filter_new, 
+GO(gtk_recent_filter_new, pFv)
 //GO(gtk_recent_filter_set_name, 
-//GO(gtk_recent_info_exists, 
+GO(gtk_recent_info_exists, iFp)
 //GO(gtk_recent_info_get_added, 
-//GO(gtk_recent_info_get_age, 
-//GO(gtk_recent_info_get_application_info, 
+GO(gtk_recent_info_get_age, iFp)
+GO(gtk_recent_info_get_application_info, iFppppp)
 //GO(gtk_recent_info_get_applications, 
 //GO(gtk_recent_info_get_description, 
 //GO(gtk_recent_info_get_display_name, 
-//GO(gtk_recent_info_get_groups, 
-//GO(gtk_recent_info_get_icon, 
-//GO(gtk_recent_info_get_mime_type, 
+GO(gtk_recent_info_get_groups, pFpp)
+GO(gtk_recent_info_get_icon, pFpi)
+GO(gtk_recent_info_get_mime_type, pFp)
 //GO(gtk_recent_info_get_modified, 
 //GO(gtk_recent_info_get_private_hint, 
 //GO(gtk_recent_info_get_short_name, 
 GO(gtk_recent_info_get_type, pFv)
 //GO(gtk_recent_info_get_uri, 
-//GO(gtk_recent_info_get_uri_display, 
-//GO(gtk_recent_info_get_visited, 
+GO(gtk_recent_info_get_uri_display, pFp)
+GO(gtk_recent_info_get_visited, lFp)
 //GO(gtk_recent_info_has_application, 
-//GO(gtk_recent_info_has_group, 
+GO(gtk_recent_info_has_group, iFpp)
 //GO(gtk_recent_info_is_local, 
 //GO(gtk_recent_info_last_application, 
-//GO(gtk_recent_info_match, 
-//GO(gtk_recent_info_ref, 
+GO(gtk_recent_info_match, iFpp)
+GO(gtk_recent_info_ref, pFp)
 GO(gtk_recent_info_unref, vFp)
-//GO(gtk_recent_manager_add_full, 
+GO(gtk_recent_manager_add_full, iFppp)
 //GO(gtk_recent_manager_add_item, 
 GO(gtk_recent_manager_error_get_type, pFv)
 //GO(gtk_recent_manager_error_quark, 
-//GO(gtk_recent_manager_get_default, 
+GO(gtk_recent_manager_get_default, pFv)
 //GO(gtk_recent_manager_get_for_screen, 
-//GO(gtk_recent_manager_get_items, 
+GO(gtk_recent_manager_get_items, pFp)
 //GO(gtk_recent_manager_get_limit, 
 GO(gtk_recent_manager_get_type, pFv)
-//GO(gtk_recent_manager_has_item, 
-//GO(gtk_recent_manager_lookup_item, 
-//GO(gtk_recent_manager_move_item, 
+GO(gtk_recent_manager_has_item, iFpp)
+GO(gtk_recent_manager_lookup_item, pFppp)
+GO(gtk_recent_manager_move_item, iFpppp)
 //GO(gtk_recent_manager_new, 
-//GO(gtk_recent_manager_purge_items, 
-//GO(gtk_recent_manager_remove_item, 
+GO(gtk_recent_manager_purge_items, iFpp)
+GO(gtk_recent_manager_remove_item, iFppp)
 //GO(gtk_recent_manager_set_limit, 
 //GO(gtk_recent_manager_set_screen, 
 GO(gtk_recent_sort_type_get_type, pFv)
@@ -2526,25 +2526,25 @@ GO(gtk_render_background, vFppdddd)
 GO(gtk_render_background_get_clip, vFpddddp)
 GO(gtk_render_check, vFppdddd)
 GO(gtk_render_expander, vFppdddd)
-GO(gtk_render_extension, vFppddddi)
+GO(gtk_render_extension, vFppddddu)
 GO(gtk_render_focus, vFppdddd)
 GO(gtk_render_frame, vFppdddd)
-GO(gtk_render_frame_gap, vFppddddidd)
+GO(gtk_render_frame_gap, vFppddddudd)
 GO(gtk_render_handle, vFppdddd)
 GO(gtk_render_icon, vFpppdd)
-GO(gtk_render_icon_pixbuf, pFppi)
+GO(gtk_render_icon_pixbuf, pFppu)
 GO(gtk_render_icon_surface, vFpppdd)
-GO(gtk_render_insertion_cursor, vFppddpii)
+GO(gtk_render_insertion_cursor, vFppddpiu)
 GO(gtk_render_layout, vFppddp)
 GO(gtk_render_line, vFppdddd)
 GO(gtk_render_option, vFppdddd)
-GO(gtk_render_slider, vFppddddi)
+GO(gtk_render_slider, vFppddddu)
 GO(gtk_requisition_copy, pFp)
 GO(gtk_requisition_free, vFp)
 GO(gtk_requisition_get_type, pFv)
 GO(gtk_resize_mode_get_type, pFv)
 GO(gtk_response_type_get_type, pFv)
-//GO(gtk_rgb_to_hsv, 
+GO(gtk_rgb_to_hsv, vFdddppp)
 //GO(gtk_ruler_draw_pos, 
 //GO(gtk_ruler_draw_ticks, 
 //GO(gtk_ruler_get_metric, 
@@ -2552,44 +2552,44 @@ GO(gtk_response_type_get_type, pFv)
 GO(gtk_ruler_get_type, pFv)
 //GO(gtk_ruler_set_metric, 
 //GO(gtk_ruler_set_range, 
-//GO(gtk_scale_add_mark, 
-//GO(gtk_scale_button_get_adjustment, 
+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_plus_button, 
-//GO(gtk_scale_button_get_popup, 
+GO(gtk_scale_button_get_popup, pFp)
 GO(gtk_scale_button_get_type, pFv)
-//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_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, 
-//GO(gtk_scale_button_set_value, 
+GO(gtk_scale_button_set_value, vFpd)
 //GO(gtk_scale_clear_marks, 
-//GO(gtk_scale_get_digits, 
+GO(gtk_scale_get_digits, iFp)
 //GO(gtk_scale_get_draw_value, 
-//GO(gtk_scale_get_layout, 
-//GO(gtk_scale_get_layout_offsets, 
+GO(gtk_scale_get_layout, pFp)
+GO(gtk_scale_get_layout_offsets, vFppp)
 GO(gtk_scale_get_type, pFv)
-//GO(gtk_scale_get_value_pos, 
-//GO(gtk_scale_set_digits, 
+GO(gtk_scale_get_value_pos, uFp)
+GO(gtk_scale_set_digits, vFpi)
 //GO(gtk_scale_set_draw_value, 
-//GO(gtk_scale_set_value_pos, 
+GO(gtk_scale_set_value_pos, vFpu)
 GO(gtk_scrollbar_get_type, pFv)
-//GO(gtk_scrolled_window_add_with_viewport, 
+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, pFv)
 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, pFv)
@@ -2604,7 +2604,7 @@ GO(gtk_selection_convert, iFpppu)
 GO(gtk_selection_data_copy, pFp)
 GO(gtk_selection_data_free, vFp)
 GO(gtk_selection_data_get_data, pFp)
-GO(gtk_selection_data_get_data_type, iFp)
+GO(gtk_selection_data_get_data_type, pFp)
 GO(gtk_selection_data_get_display, pFp)
 GO(gtk_selection_data_get_format, iFp)
 GO(gtk_selection_data_get_length, iFp)
@@ -2631,7 +2631,7 @@ GO(gtk_sensitivity_type_get_type, pFv)
 GO(gtk_separator_get_type, pFv)
 GO(gtk_separator_menu_item_get_type, pFv)
 GO(gtk_separator_menu_item_new, pFv)
-GO(gtk_separator_new, pFi)
+GO(gtk_separator_new, pFu)
 GO(gtk_separator_tool_item_get_draw, iFp)
 GO(gtk_separator_tool_item_get_type, pFv)
 GO(gtk_separator_tool_item_new, pFv)
@@ -2663,15 +2663,15 @@ GOM(gtk_signal_connect_full, LFEppppppii)
 //GO(gtk_signal_newv, 
 GO(gtk_signal_run_type_get_type, pFv)
 //GO(gtk_size_group_add_widget, 
-//GO(gtk_size_group_get_ignore_hidden, 
-//GO(gtk_size_group_get_mode, 
+GO(gtk_size_group_get_ignore_hidden, iFp)
+GO(gtk_size_group_get_mode, uFp)
 GO(gtk_size_group_get_type, pFv)
-//GO(gtk_size_group_get_widgets, 
+GO(gtk_size_group_get_widgets, pFp)
 GO(gtk_size_group_mode_get_type, pFv)
-//GO(gtk_size_group_new, 
-//GO(gtk_size_group_remove_widget, 
-//GO(gtk_size_group_set_ignore_hidden, 
-//GO(gtk_size_group_set_mode, 
+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, vFpu)
 GO(gtk_snapshot_new, pFv)
 GO(gtk_snapshot_free_to_node, pFp)
 GO(gtk_snapshot_render_background, vFppdddd)
@@ -2690,7 +2690,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, pFv)
-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)
@@ -2702,10 +2702,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, pFv)
 GO(gtk_spinner_get_type, pFv)
@@ -2737,7 +2737,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)
@@ -2773,32 +2773,32 @@ 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, vFpppuiiii)
 GO(gtk_style_attach, pFpp)
 GO(gtk_style_context_add_class, vFpp)
 GO(gtk_style_context_add_provider, vFppu)
 GO(gtk_style_context_add_provider_for_display, vFppu)
 GO(gtk_style_context_add_provider_for_screen, vFppu)
-GO(gtk_style_context_add_region, vFppi)
+GO(gtk_style_context_add_region, vFppu)
 GO(gtk_style_context_cancel_animations, vFpp)
 //GO2(gtk_style_context_get, vFppV, gtk_style_context_get_valist)
 GO(gtk_style_context_get_border, vFpip)
 GO(gtk_style_context_get_background_color, vFpip)
-GO(gtk_style_context_get_border_color, vFpip)
+GO(gtk_style_context_get_border_color, vFpup)
 GO(gtk_style_context_get_color, vFpip)
-GO(gtk_style_context_get_direction, iFp)
-GO(gtk_style_context_get_font, pFpi)
-GO(gtk_style_context_get_junction_sides, iFp)
-GO(gtk_style_context_get_margin, vFpip)
+GO(gtk_style_context_get_direction, uFp)
+GO(gtk_style_context_get_font, pFpu)
+GO(gtk_style_context_get_junction_sides, uFp)
+GO(gtk_style_context_get_margin, vFpup)
 GO(gtk_style_context_get_padding, vFpip)
 GO(gtk_style_context_get_parent, pFp)
 GO(gtk_style_context_get_path, pFp)
-GO(gtk_style_context_get_property, vFppip)
+GO(gtk_style_context_get_property, vFppup)
 GO(gtk_style_context_get_frame_clock, pFp)
 GO(gtk_style_context_get_scale, iFp)
 GO(gtk_style_context_get_screen, pFp)
 GO(gtk_style_context_get_section, pFpp)
-GO(gtk_style_context_get_state, iFp)
+GO(gtk_style_context_get_state, uFp)
 //GO2(gtk_style_context_get_style, vFpV, gtk_style_context_get_style_valist)
 GO(gtk_style_context_get_style_property, vFppp)
 GOM(gtk_style_context_get_style_valist, vFEpA)
@@ -2811,7 +2811,7 @@ GO(gtk_style_context_list_regions, pFp)
 GO(gtk_style_context_lookup_color, iFppp)
 GO(gtk_style_context_lookup_icon_set, pFpp)
 GO(gtk_style_context_new, pFv)
-GO(gtk_style_context_notify_state_change, vFpppip)
+GO(gtk_style_context_notify_state_change, vFpppui)
 GO(gtk_style_context_pop_animatable_region, vFp)
 GO(gtk_style_context_push_animatable_region, vFpp)
 GO(gtk_style_context_restore, vFp)
@@ -2824,36 +2824,36 @@ GO(gtk_style_context_reset_widgets, vFp)
 GO(gtk_style_context_save, vFp)
 GO(gtk_style_context_scroll_animations, vFppii)
 GO(gtk_style_context_set_background, vFpp)
-GO(gtk_style_context_set_direction, vFpi)
+GO(gtk_style_context_set_direction, vFpu)
 GO(gtk_style_context_set_frame_clock, vFpp)
-GO(gtk_style_context_set_junction_sides, vFpi)
+GO(gtk_style_context_set_junction_sides, vFpu)
 GO(gtk_style_context_set_parent, vFpp)
 GO(gtk_style_context_set_path, vFpp)
 GO(gtk_style_context_set_scale, vFpi)
 GO(gtk_style_context_set_screen, vFpp)
-GO(gtk_style_context_set_state, vFpi)
-GO(gtk_style_context_state_is_running, iFpip)
-GO(gtk_style_context_to_string, pFpi)
+GO(gtk_style_context_set_state, vFpu)
+GO(gtk_style_context_state_is_running, iFpup)
+GO(gtk_style_context_to_string, pFpu)
 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, pFv)
 //GO(gtk_style_get_valist, vFpipA)
 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_provider_get_type, pFv)
 GO(gtk_style_unref, vFp)
 GO(gtk_submenu_direction_get_type, pFv)
 GO(gtk_submenu_placement_get_type, pFv)
 GO(gtk_switch_get_type, pFv)
-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)
@@ -2881,7 +2881,7 @@ GO(gtk_target_list_find, iFppp)
 GO(gtk_target_list_get_type, pFv)
 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)
@@ -2891,22 +2891,22 @@ GO(gtk_target_table_free, vFpi)
 GO(gtk_target_table_new_from_list, pFpp)
 GO(gtk_tearoff_menu_item_get_type, pFv)
 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_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_list_all_types, pFp)
+GO(gtk_test_register_all_types, vFv)
+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)
@@ -2931,7 +2931,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)
@@ -3162,7 +3162,7 @@ GO(gtk_text_tag_get_priority, iFp)
 GO(gtk_text_tag_get_type, pFv)
 GO(gtk_text_tag_new, pFp)
 GO(gtk_text_tag_set_priority, vFpi)
-GO(gtk_text_tag_table_add, vFpp)
+GO(gtk_text_tag_table_add, iFpp)
 //GOM(gtk_text_tag_table_foreach, vFEpBp)
 GO(gtk_text_tag_table_get_size, iFp)
 GO(gtk_text_tag_table_get_type, pFv)
@@ -3171,24 +3171,24 @@ 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)
 GO(gtk_text_view_get_editable, iFp)
 GO(gtk_text_view_get_hadjustment, pFp)
 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_at_location, iFppii)
+GO(gtk_text_view_get_iter_at_position, iFpppii)
 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)
@@ -3201,9 +3201,9 @@ GO(gtk_text_view_get_tabs, pFp)
 GO(gtk_text_view_get_type, pFv)
 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)
@@ -3216,12 +3216,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)
@@ -3229,9 +3229,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, pFv)
 //GO(gtk_theme_engine_create_rc_style, 
 //GO(gtk_theme_engine_get, 
@@ -3246,12 +3246,12 @@ GO(gtk_tips_query_get_type, pFv)
 //GO(gtk_tips_query_start_query, 
 //GO(gtk_tips_query_stop_query, 
 //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, pFv)
-//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_toggled, vFp)
 GO(gtk_toggle_button_get_active, iFp)
 GO(gtk_toggle_button_get_inconsistent, iFp)
 GO(gtk_toggle_button_get_mode, iFp)
@@ -3274,14 +3274,14 @@ GO(gtk_toolbar_append_space, vFp)
 GO(gtk_toolbar_append_widget, vFpppp)
 GO(gtk_toolbar_child_type_get_type, pFv)
 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_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, pFv)
 GO(gtk_toolbar_insert, vFppi)
@@ -3297,10 +3297,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_icon_size, vFpu)
 GO(gtk_toolbar_set_orientation, vFpi)
 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, pFv)
 GO(gtk_toolbar_style_get_type, pFv)
@@ -3321,119 +3321,119 @@ 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, pFv)
 //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, pFv)
 //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_is_important, vFpi)
+GO(gtk_tool_item_set_proxy_menu_item, vFppp)
 //GO(gtk_tool_item_set_tooltip, 
-//GO(gtk_tool_item_set_tooltip_markup, 
+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_palette_add_drag_dest, vFppuuu)
 GO(gtk_tool_palette_drag_targets_get_type, pFv)
-//GO(gtk_tool_palette_get_drag_item, 
-//GO(gtk_tool_palette_get_drag_target_group, 
+GO(gtk_tool_palette_get_drag_item, pFpp)
+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, pFv)
-//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_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, pFv)
 //GO(gtk_tool_shell_rebuild_menu, 
 GO(gtk_tooltip_get_type, pFv)
 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, pFv)
 GO(gtk_tooltips_new, pFv)
 GO(gtk_tooltips_set_delay, vFpu)
 GO(gtk_tooltips_set_tip, vFpppp)
-//GO(gtk_tooltip_trigger_tooltip_query, 
+GO(gtk_tooltip_trigger_tooltip_query, vFp)
 GO(gtk_tray_icon_get_type, pFv)
 //GO(gtk_tree_append, 
 //GO(gtk_tree_child_position, 
 //GO(gtk_tree_clear_items, 
 //GO(gtk_tree_drag_dest_drag_data_received, 
 GO(gtk_tree_drag_dest_get_type, pFv)
-//GO(gtk_tree_drag_dest_row_drop_possible, 
-//GO(gtk_tree_drag_source_drag_data_delete, 
-//GO(gtk_tree_drag_source_drag_data_get, 
+GO(gtk_tree_drag_dest_row_drop_possible, iFppp)
+GO(gtk_tree_drag_source_drag_data_delete, iFpp)
+GO(gtk_tree_drag_source_drag_data_get, iFppp)
 GO(gtk_tree_drag_source_get_type, pFv)
 //GO(gtk_tree_drag_source_row_draggable, 
-//GO(gtk_tree_get_row_drag_data, 
+GO(gtk_tree_get_row_drag_data, iFppp)
 GO(gtk_tree_get_type, pFv)
 //GO(gtk_tree_insert, 
 //GO(gtk_tree_item_collapse, 
@@ -3449,22 +3449,22 @@ GO(gtk_tree_iter_copy, pFp)
 GO(gtk_tree_iter_free, vFp)
 GO(gtk_tree_iter_get_type, pFv)
 //GO(gtk_tree_model_filter_clear_cache, 
-//GO(gtk_tree_model_filter_convert_child_iter_to_iter, 
+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, pFv)
-//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, pFv)
 //GOM(gtk_tree_model_foreach, vFEpBp)
 //GO2(gtk_tree_model_get, vFppV, gtk_tree_model_get_valist)
-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)
@@ -3487,14 +3487,14 @@ GO(gtk_tree_model_row_has_child_toggled, vFppp)
 GO(gtk_tree_model_row_inserted, vFppp)
 GO(gtk_tree_model_rows_reordered, vFpppp)
 //GO(gtk_tree_model_sort_clear_cache, 
-//GO(gtk_tree_model_sort_convert_child_iter_to_iter, 
+GO(gtk_tree_model_sort_convert_child_iter_to_iter, iFppp)
 //GO(gtk_tree_model_sort_convert_child_path_to_path, 
-//GO(gtk_tree_model_sort_convert_iter_to_child_iter, 
-//GO(gtk_tree_model_sort_convert_path_to_child_path, 
-//GO(gtk_tree_model_sort_get_model, 
+GO(gtk_tree_model_sort_convert_iter_to_child_iter, vFppp)
+GO(gtk_tree_model_sort_convert_path_to_child_path, pFpp)
+GO(gtk_tree_model_sort_get_model, pFp)
 GO(gtk_tree_model_sort_get_type, pFv)
-//GO(gtk_tree_model_sort_iter_is_valid, 
-//GO(gtk_tree_model_sort_new_with_model, 
+GO(gtk_tree_model_sort_iter_is_valid, iFpp)
+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, 
@@ -3534,7 +3534,7 @@ GO(gtk_tree_row_reference_reordered, vFpppp)
 GO(gtk_tree_row_reference_valid, iFp)
 //GO(gtk_tree_select_child, 
 GO(gtk_tree_selection_count_selected_rows, iFp)
-GO(gtk_tree_selection_get_mode, iFp)
+GO(gtk_tree_selection_get_mode, uFp)
 GO(gtk_tree_selection_get_selected, iFppp)
 GO(gtk_tree_selection_get_selected_rows, pFpp)
 //GOM(gtk_tree_selection_get_select_function, BFEp)
@@ -3548,14 +3548,14 @@ GO(gtk_tree_selection_select_all, vFp)
 GO(gtk_tree_selection_select_iter, vFpp)
 GO(gtk_tree_selection_select_path, vFpp)
 GO(gtk_tree_selection_select_range, vFppp)
-GO(gtk_tree_selection_set_mode, vFpi)
+GO(gtk_tree_selection_set_mode, vFpu)
 //GOM(gtk_tree_selection_set_select_function, vFEpBpB)
 GO(gtk_tree_selection_unselect_all, vFp)
 GO(gtk_tree_selection_unselect_iter, vFpp)
 GO(gtk_tree_selection_unselect_path, vFpp)
 GO(gtk_tree_selection_unselect_range, vFppp)
 //GO(gtk_tree_select_item, 
-//GO(gtk_tree_set_row_drag_data, 
+GO(gtk_tree_set_row_drag_data, iFppp)
 //GO(gtk_tree_set_selection_mode, 
 //GO(gtk_tree_set_view_lines, 
 //GO(gtk_tree_set_view_mode, 
@@ -3563,32 +3563,32 @@ GO(gtk_tree_sortable_get_sort_column_id, iFppp)
 GO(gtk_tree_sortable_get_type, pFv)
 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)
 GO(gtk_tree_store_clear, vFp)
 GO(gtk_tree_store_get_type, pFv)
-//GO(gtk_tree_store_insert, 
-//GO(gtk_tree_store_insert_after, 
+GO(gtk_tree_store_insert, vFpppi)
+GO(gtk_tree_store_insert_after, vFpppp)
 //GO(gtk_tree_store_insert_before, 
 //GO(gtk_tree_store_insert_with_values, 
-//GO(gtk_tree_store_insert_with_valuesv, 
+GO(gtk_tree_store_insert_with_valuesv, vFpppippi)
 GO(gtk_tree_store_is_ancestor, iFppp)
 GO(gtk_tree_store_iter_depth, iFpp)
 GO(gtk_tree_store_iter_is_valid, iFpp)
-//GO(gtk_tree_store_move_after, 
+GO(gtk_tree_store_move_after, vFppp)
 //GO(gtk_tree_store_move_before, 
 GOM(gtk_tree_store_new, pFEuV)
-GO(gtk_tree_store_newv, pFup)
+GO(gtk_tree_store_newv, pFip)
 GO(gtk_tree_store_prepend, vFppp)
 //GO(gtk_tree_store_remove, 
 GO(gtk_tree_store_reorder, vFppp)
 //GO2(gtk_tree_store_set, vFppV, gtk_tree_store_set_valist)
-//GO(gtk_tree_store_set_column_types, 
+GO(gtk_tree_store_set_column_types, vFpip)
 //GO(gtk_tree_store_set_valist, vFppp)
-//GO(gtk_tree_store_set_value, 
-//GO(gtk_tree_store_set_valuesv, 
+GO(gtk_tree_store_set_value, vFppip)
+GO(gtk_tree_store_set_valuesv, vFppppi)
 //GO(gtk_tree_store_swap, 
 //GO(gtk_tree_unselect_child, 
 //GO(gtk_tree_unselect_item, 
@@ -3613,10 +3613,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)
@@ -3640,10 +3640,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)
@@ -3658,7 +3658,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, pFv)
 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)
@@ -3674,7 +3674,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)
@@ -3710,7 +3710,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)
@@ -3718,12 +3718,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)
@@ -3757,25 +3757,25 @@ GO(gtk_type_flags_get_values, pFi)
 GO(gtk_type_init, vFi)
 GO(gtk_type_new, pFi)
 GOM(gtk_type_unique, iFELp)
-//GO(gtk_ui_manager_add_ui, 
+GO(gtk_ui_manager_add_ui, vFpupppui)
 //GO(gtk_ui_manager_add_ui_from_file, 
-//GO(gtk_ui_manager_add_ui_from_string, 
-//GO(gtk_ui_manager_ensure_update, 
-//GO(gtk_ui_manager_get_accel_group, 
-//GO(gtk_ui_manager_get_action, 
-//GO(gtk_ui_manager_get_action_groups, 
-//GO(gtk_ui_manager_get_add_tearoffs, 
-//GO(gtk_ui_manager_get_toplevels, 
+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, pFpu)
 GO(gtk_ui_manager_get_type, pFv)
-//GO(gtk_ui_manager_get_ui, 
-//GO(gtk_ui_manager_get_widget, 
-//GO(gtk_ui_manager_insert_action_group, 
+GO(gtk_ui_manager_get_ui, pFp)
+GO(gtk_ui_manager_get_widget, pFpp)
+GO(gtk_ui_manager_insert_action_group, vFppi)
 GO(gtk_ui_manager_item_type_get_type, pFv)
-//GO(gtk_ui_manager_new, 
-//GO(gtk_ui_manager_new_merge_id, 
-//GO(gtk_ui_manager_remove_action_group, 
-//GO(gtk_ui_manager_remove_ui, 
-//GO(gtk_ui_manager_set_add_tearoffs, 
+GO(gtk_ui_manager_new, pFv)
+GO(gtk_ui_manager_new_merge_id, uFp)
+GO(gtk_ui_manager_remove_action_group, vFpp)
+GO(gtk_ui_manager_remove_ui, vFpu)
+GO(gtk_ui_manager_set_add_tearoffs, vFpi)
 GO(gtk_unit_get_type, pFv)
 GO(gtk_update_type_get_type, pFv)
 GO(gtk_vbox_get_type, pFv)
@@ -3788,14 +3788,14 @@ GO(gtk_vbutton_box_get_type, pFv)
 //GO(gtk_vbutton_box_set_spacing_default, 
 //GO(gtk_viewport_get_bin_window, 
 //GO(gtk_viewport_get_hadjustment, 
-//GO(gtk_viewport_get_shadow_type, 
+GO(gtk_viewport_get_shadow_type, uFp)
 GO(gtk_viewport_get_type, pFv)
-//GO(gtk_viewport_get_vadjustment, 
-//GO(gtk_viewport_get_view_window, 
-//GO(gtk_viewport_new, 
+GO(gtk_viewport_get_vadjustment, pFp)
+GO(gtk_viewport_get_view_window, pFp)
+GO(gtk_viewport_new, pFpp)
 //GO(gtk_viewport_set_hadjustment, 
-//GO(gtk_viewport_set_shadow_type, 
-//GO(gtk_viewport_set_vadjustment, 
+GO(gtk_viewport_set_shadow_type, vFpu)
+GO(gtk_viewport_set_vadjustment, vFpp)
 GO(gtk_visibility_get_type, pFv)
 GO(gtk_volume_button_get_type, pFv)
 GO(gtk_volume_button_new, pFv)
@@ -3808,10 +3808,10 @@ GO(gtk_vscale_new, pFp)
 GO(gtk_vscale_new_with_range, pFddd)
 GO(gtk_vscrollbar_get_type, pFv)
 GO(gtk_vscrollbar_new, pFp)
-GO(gtk_vseparator_get_type, pFv)
+GO(gtk_vseparator_get_type, LFv)
 GO(gtk_vseparator_new, pFv)
 GO(gtk_widget_activate, iFp)
-GO(gtk_widget_add_accelerator, vFpppuii)
+GO(gtk_widget_add_accelerator, vFpppuuu)
 GO(gtk_widget_add_events, vFpi)
 GO(gtk_widget_add_mnemonic_label, vFpp)
 GO(gtk_widget_can_activate_accel, iFpu)
@@ -3825,7 +3825,7 @@ GO(gtk_widget_class_install_style_property, vFpp)
 GO(gtk_widget_class_list_style_properties, pFpp)
 GO(gtk_widget_class_path, vFpppp)
 //GOM(gtk_widget_class_set_connect_func, vFEpBpB)
-GO(gtk_widget_compute_expand, iFpi)
+GO(gtk_widget_compute_expand, iFpu)
 GO(gtk_widget_create_pango_context, pFp)
 GO(gtk_widget_create_pango_layout, pFpp)
 GO(gtk_widget_destroy, vFp)
@@ -3855,7 +3855,7 @@ GO(gtk_widget_get_default_colormap, pFv)
 GO(gtk_widget_get_default_direction, iFv)
 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)
@@ -3889,7 +3889,7 @@ GO(gtk_widget_get_preferred_width, vFppp)
 GO(gtk_widget_get_preferred_width_for_height, vFpipp)
 GO(gtk_widget_get_realized, iFp)
 GO(gtk_widget_get_receives_default, iFp)
-GO(gtk_widget_get_request_mode, iFp)
+GO(gtk_widget_get_request_mode, uFp)
 GO(gtk_widget_get_requisition, vFpp)
 GO(gtk_widget_get_root_window, pFp)
 GO(gtk_widget_get_scale_factor, iFp)
@@ -3898,17 +3898,17 @@ 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_style_context, pFp)
-GO(gtk_widget_get_template_child, pFpip)
+GO(gtk_widget_get_template_child, pFpLp)
 GO(gtk_widget_get_tooltip_markup, pFp)
 GO(gtk_widget_get_tooltip_text, pFp)
 GO(gtk_widget_get_tooltip_window, pFp)
 GO(gtk_widget_get_toplevel, pFp)
 GO(gtk_widget_get_type, pFv)
 GO(gtk_widget_get_valign, iFp)
-GO(gtk_widget_get_valign_with_baseline, iFp)
+GO(gtk_widget_get_valign_with_baseline, uFp)
 GO(gtk_widget_get_vexpand, iFp)
 GO(gtk_widget_get_vexpand_set, iFp)
 GO(gtk_widget_get_visible, iFp)
@@ -3934,13 +3934,13 @@ 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_measure, vFpiipppp)
 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)
@@ -3949,29 +3949,29 @@ GO(gtk_widget_modify_style, vFpp)
 GO(gtk_widget_modify_text, vFpip)
 GO(gtk_widget_new, pFppppppppppppp) //vaarg
 GO(gtk_widget_path, vFpppp)
-GO(gtk_widget_path_append_type, iFpp)
+GO(gtk_widget_path_append_type, iFpL)
 GO(gtk_widget_path_append_with_siblings, iFppu)
 GO(gtk_widget_path_append_for_widget, iFpp)
 GO(gtk_widget_path_copy, pFp)
 GO(gtk_widget_path_free, vFp)
-GO(gtk_widget_path_get_object_type, pFp)
-GO(gtk_widget_path_has_parent, iFpp)
+GO(gtk_widget_path_get_object_type, LFp)
+GO(gtk_widget_path_has_parent, iFpL)
 GO(gtk_widget_path_is_type, iFpp)
 GO(gtk_widget_path_iter_add_class, vFpip)
-GO(gtk_widget_path_iter_add_region, vFpipi)
+GO(gtk_widget_path_iter_add_region, vFpipu)
 GO(gtk_widget_path_iter_clear_classes, vFpi)
 GO(gtk_widget_path_iter_clear_regions, vFpi)
 GO(gtk_widget_path_iter_get_name, pFpi)
 GO(gtk_widget_path_iter_get_object_name, pFpi)
-GO(gtk_widget_path_iter_get_object_type, pFpi)
+GO(gtk_widget_path_iter_get_object_type, LFpi)
 GO(gtk_widget_path_iter_get_siblings, pFpi)
 GO(gtk_widget_path_iter_get_sibling_index, uFpi)
-GO(gtk_widget_path_iter_get_state, iFpi)
+GO(gtk_widget_path_iter_get_state, uFpi)
 GO(gtk_widget_path_iter_has_class, iFpip)
 GO(gtk_widget_path_iter_has_name, iFpip)
-GO(gtk_widget_path_iter_has_qclass, iFpip)
+GO(gtk_widget_path_iter_has_qclass, iFpiu)
 GO(gtk_widget_path_iter_has_qname, iFpip)
-GO(gtk_widget_path_iter_has_qregion, iFpipp)
+GO(gtk_widget_path_iter_has_qregion, iFpiup)
 GO(gtk_widget_path_iter_has_region, iFpipp)
 GO(gtk_widget_path_iter_list_classes, pFpi)
 GO(gtk_widget_path_iter_list_regions, pFpi)
@@ -3979,11 +3979,11 @@ GO(gtk_widget_path_iter_remove_class, vFpip)
 GO(gtk_widget_path_iter_remove_region, vFpip)
 GO(gtk_widget_path_iter_set_name, vFpip)
 GO(gtk_widget_path_iter_set_object_name, vFpip)
-GO(gtk_widget_path_iter_set_object_type, vFpip)
-GO(gtk_widget_path_iter_set_state, vFpii)
+GO(gtk_widget_path_iter_set_object_type, vFpiL)
+GO(gtk_widget_path_iter_set_state, vFpiu)
 GO(gtk_widget_path_length, iFp)
 GO(gtk_widget_path_new, pFv)
-GO(gtk_widget_path_prepend_type, vFpp)
+GO(gtk_widget_path_prepend_type, vFpL)
 GO(gtk_widget_path_to_string, pFp)
 GO(gtk_widget_path_ref, pFp)
 GO(gtk_widget_path_unref, vFp)
@@ -4000,9 +4000,9 @@ GO(gtk_widget_queue_resize_no_redraw, vFp)
 GO(gtk_widget_realize, vFp)
 GO(gtk_widget_ref, pFp)
 GO(gtk_widget_region_intersect, pFpp)
-GO(gtk_widget_remove_accelerator, iFppui)
+GO(gtk_widget_remove_accelerator, iFppuu)
 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)
@@ -4019,8 +4019,8 @@ GO(gtk_widget_set_colormap, vFpp)
 GO(gtk_widget_set_composite_name, vFpp)
 GO(gtk_widget_set_css_classes, 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)
@@ -4047,8 +4047,8 @@ 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_flags, vFpii)
+GO(gtk_widget_set_state, vFpu)
+GO(gtk_widget_set_state_flags, vFpui)
 GO(gtk_widget_set_style, vFpp)
 GO(gtk_widget_class_set_template, vFpp)
 GO(gtk_widget_class_set_template_from_resource, vFpp)
@@ -4057,7 +4057,7 @@ GO(gtk_widget_set_tooltip_text, vFpp)
 GO(gtk_widget_set_tooltip_window, vFpp)
 GO(gtk_widget_set_uposition, vFpii)
 GO(gtk_widget_set_usize, vFpii)
-GO(gtk_widget_set_valign, vFpi)
+GO(gtk_widget_set_valign, vFpu)
 GO(gtk_widget_set_vexpand, vFpi)
 GO(gtk_widget_set_vexpand_set, vFpi)
 GO(gtk_widget_set_visible, vFpi)
@@ -4102,13 +4102,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)
@@ -4122,7 +4122,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, pFv)
-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)
@@ -4137,9 +4137,9 @@ GO(gtk_window_iconify, vFp)
 GO(gtk_window_is_active, iFp)
 GO(gtk_window_list_toplevels, pFv)
 GO(gtk_window_maximize, vFp)
-GO(gtk_window_mnemonic_activate, iFpui)
+GO(gtk_window_mnemonic_activate, iFpuu)
 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, pFv)
 GO(gtk_window_present, vFp)
@@ -4164,8 +4164,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_hide_on_close, vFpi)
 GO(gtk_window_set_icon, vFpp)
@@ -4174,12 +4174,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)
@@ -4188,7 +4188,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_titlebar, vFpp)
 GO(gtk_window_set_urgency_hint, vFpi)
 GO(gtk_widget_set_visual, vFpp)
@@ -4206,4 +4206,4 @@ GO(gtk_event_controller_get_type, LFv)
 GO(gtk_stack_set_visible_child_name, vFpp)
 GO(gtk_stack_get_visible_child_name, pFp)
 
-GO(dummy_iFppdd, iFppdd)    // for GtkEventController wrapping
\ No newline at end of file
+GO(dummy_iFppdd, iFppdd)    // for GtkEventController wrapping
author	ptitSeb <sebastien.chev@gmail.com>	2023-04-24 19:21:25 +0200
committer	ptitSeb <sebastien.chev@gmail.com>	2023-04-24 19:21:25 +0200
commit	6bfeb156551ce98d4feafb6fe764bbe4fd1cab03 (patch)
tree	216ea24dfb064d532b136f818118716696980d41 /src
parent	69eb071fab2ee0e429a01e2915881c872aae6a6c (diff)
download	box64-6bfeb156551ce98d4feafb6fe764bbe4fd1cab03.tar.gz box64-6bfeb156551ce98d4feafb6fe764bbe4fd1cab03.zip