[WRAPPER] Reworked wrapped libgio-2.0

6 files changed, 827 insertions, 829 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 24609a4c..f654bcc4 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -1692,7 +1692,7 @@
 #() uFEpppV
 #() uFiuuuu
 #() uFiuppi
-#() uFipipp
+#() uFipupp
 #() uFipLpp
 #() uFuiiii
 #() uFLpppL
@@ -1858,11 +1858,11 @@
 #() vFEpippp
 #() vFEpuipp
 #() vFEpuipV
+#() vFEpuipA
 #() vFEpupup
 #() vFEpuppp
 #() vFEpLLpp
 #() vFEppipV
-#() vFEppipA
 #() vFEppupp
 #() vFEpppLp
 #() vFEppppp
@@ -2155,6 +2155,7 @@
 #() uFEpippp
 #() uFEpCppp
 #() uFEpuppp
+#() uFipuppp
 #() uFuuuuuu
 #() uFupuufp
 #() uFuppppp
@@ -2167,7 +2168,6 @@
 #() uFpuuppp
 #() uFpupupu
 #() uFpupppp
-#() uFppippp
 #() uFppuuup
 #() uFppuupu
 #() uFppLpLp
@@ -2197,6 +2197,8 @@
 #() LFppLLpL
 #() LFppLpLL
 #() LFSpLiip
+#() pFELpppV
+#() pFELpApp
 #() pFEpiupp
 #() pFEpippp
 #() pFEpuipp
@@ -2208,8 +2210,6 @@
 #() pFEpppLp
 #() pFEppppi
 #() pFEppppp
-#() pFEppppV
-#() pFEppApp
 #() pFiiiiii
 #() pFiiiiid
 #() pFipippp
@@ -2279,8 +2279,8 @@
 #() iWpppppi
 #() iWpppppu
 #() vFEpiiipp
-#() vFEpipppp
 #() vFEpuipuV
+#() vFEpupppp
 #() vFEppippp
 #() vFEpppLpp
 #() vFEppppup
@@ -2359,6 +2359,7 @@
 #() vFpdddddd
 #() vFpLiLiLp
 #() vFpLpiipi
+#() vFppcuupp
 #() vFppiiiii
 #() vFppiiipi
 #() vFppiipuu
@@ -2368,7 +2369,6 @@
 #() vFppipiip
 #() vFppipipp
 #() vFppipppp
-#() vFppCuupp
 #() vFppuiiip
 #() vFppuuuii
 #() vFppuupii
@@ -2580,10 +2580,10 @@
 #() iWpuuuppu
 #() iWpupuufu
 #() iWpppuppp
-#() vFEiippppV
-#() vFEiupippp
-#() vFEipAippp
-#() vFEppipppp
+#() vFELippppV
+#() vFELupippp
+#() vFELpAippp
+#() vFEppupppp
 #() vFEppLippp
 #() vFEppLpLpp
 #() vFEpppippp
@@ -2714,9 +2714,9 @@
 #() iFbWWipppp
 #() iFbupppWWu
 #() CFuiifpppp
-#() uFEipipppp
+#() uFEipupppp
 #() uFEpiupppp
-#() uFEppipppp
+#() uFEppupppp
 #() uFEpppuppp
 #() uFEppppppp
 #() uFuipppppp
@@ -2778,8 +2778,8 @@
 #() vFEpippippV
 #() vFEpippippA
 #() vFEpuuuippp
-#() vFEppiipppp
-#() vFEpppiippp
+#() vFEppuipppp
+#() vFEpppuippp
 #() vFEpppLLpLp
 #() vFEppppippp
 #() vFiiiiiiiii
@@ -2875,7 +2875,7 @@
 #() iFppppppupp
 #() iFppppppppu
 #() iFppppppppp
-#() uFEipippppp
+#() uFEipuppppp
 #() uFEpppufppp
 #() uFuulpiuiuf
 #() uFpuupuppuu
@@ -2909,9 +2909,9 @@
 #() iWpiuuupipu
 #() iWpuiuuipip
 #() iWppppupiii
-#() vFEiippppppp
-#() vFEpippppppp
-#() vFEpppiipppp
+#() vFEiuppppppp
+#() vFEpuppppppp
+#() vFEpppuipppp
 #() vFEpppLuLpLp
 #() vFiiiiiiiiii
 #() vFiiiiiiiiiu
@@ -2966,7 +2966,7 @@
 #() uFpddpippppp
 #() uFpppppppppp
 #() lFpLppdddddd
-#() pFEiippppppp
+#() pFEiuppppppp
 #() pFEpiiiiiipp
 #() pFEpippppppp
 #() pFpupLLLLLpp
@@ -3031,7 +3031,7 @@
 #() uFEpLiupppLuV
 #() uFEpLippppLup
 #() uFEpLippppLuA
-#() uFEppppppippp
+#() uFEppppppuppp
 #() uFppppppppppp
 #() pFEpipppppppi
 #() pFEppiiLpppip
@@ -3075,7 +3075,7 @@
 #() pFpppppppppppp
 #() pFbCuuWWwwCCup
 #() pFbuuuWWWWWWWW
-#() vFEpppppppiippp
+#() vFEpppppppuippp
 #() vFuiiiiiiiiiuup
 #() vFuuuuuuuuuuuuu
 #() vFuUuuuuuuuuuuu
@@ -3502,55 +3502,54 @@ wrappedgio2:
 - vFpippp:
   - g_async_initable_init_async
 - vFpuipV:
-  - g_task_return_new_error
-- vFppipV:
   - g_simple_async_result_set_error
-- vFppipA:
+  - g_task_return_new_error
+- vFpuipA:
   - g_simple_async_result_set_error_va
-- pFppppV:
+- pFLpppV:
   - g_initable_new
-- pFppApp:
+- pFLpApp:
   - g_initable_new_valist
-- vFpipppp:
+- vFpupppp:
   - g_dbus_connection_new_for_address
-- vFiippppV:
+- vFLippppV:
   - g_async_initable_new_async
-- vFiupippp:
+- vFLupippp:
   - g_async_initable_newv_async
-- vFipAippp:
+- vFLpAippp:
   - g_async_initable_new_valist_async
-- vFppipppp:
+- vFppupppp:
   - g_dbus_connection_new
 - vFppLippp:
   - g_input_stream_read_async
 - vFpppuipV:
   - g_simple_async_report_error_in_idle
-- uFipipppp:
+- uFipupppp:
   - g_bus_watch_name
-- uFppipppp:
+- uFppupppp:
   - g_bus_own_name_on_connection
   - g_bus_watch_name_on_connection
 - uFppppppp:
   - g_dbus_connection_register_object
 - pFpppuipV:
   - g_simple_async_result_new_error
-- vFppiipppp:
+- vFppuipppp:
   - g_dbus_connection_send_message_with_reply
-- vFpppiippp:
+- vFpppuippp:
   - g_dbus_proxy_call
-- uFipippppp:
+- uFipuppppp:
   - g_bus_own_name
-- vFiippppppp:
+- vFiuppppppp:
   - g_dbus_proxy_new_for_bus
-- vFpippppppp:
+- vFpuppppppp:
   - g_dbus_proxy_new
-- vFpppiipppp:
+- vFpppuipppp:
   - g_dbus_proxy_call_with_unix_fd_list
-- pFiippppppp:
+- pFiuppppppp:
   - g_dbus_object_manager_client_new_for_bus_sync
-- uFppppppippp:
+- uFppppppuppp:
   - g_dbus_connection_signal_subscribe
-- vFpppppppiippp:
+- vFpppppppuippp:
   - g_dbus_connection_call
 wrappedglesv2:
 wrappedglib2:
diff --git a/src/wrapped/generated/wrappedgio2types.h b/src/wrapped/generated/wrappedgio2types.h
index 69d77eaa..403ce7eb 100644
--- a/src/wrapped/generated/wrappedgio2types.h
+++ b/src/wrapped/generated/wrappedgio2types.h
@@ -20,30 +20,29 @@ typedef uintptr_t (*LFpppp_t)(void*, void*, void*, void*);
 typedef void* (*pFpppp_t)(void*, void*, void*, void*);
 typedef void (*vFpippp_t)(void*, int32_t, void*, void*, void*);
 typedef void (*vFpuipV_t)(void*, uint32_t, int32_t, void*, ...);
-typedef void (*vFppipV_t)(void*, void*, int32_t, void*, ...);
-typedef void (*vFppipA_t)(void*, void*, int32_t, void*, va_list);
-typedef void* (*pFppppV_t)(void*, void*, void*, void*, ...);
-typedef void* (*pFppApp_t)(void*, void*, va_list, void*, void*);
-typedef void (*vFpipppp_t)(void*, int32_t, void*, void*, void*, void*);
-typedef void (*vFiippppV_t)(int32_t, int32_t, void*, void*, void*, void*, ...);
-typedef void (*vFiupippp_t)(int32_t, uint32_t, void*, int32_t, void*, void*, void*);
-typedef void (*vFipAippp_t)(int32_t, void*, va_list, int32_t, void*, void*, void*);
-typedef void (*vFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*);
+typedef void (*vFpuipA_t)(void*, uint32_t, int32_t, void*, va_list);
+typedef void* (*pFLpppV_t)(uintptr_t, void*, void*, void*, ...);
+typedef void* (*pFLpApp_t)(uintptr_t, void*, va_list, void*, void*);
+typedef void (*vFpupppp_t)(void*, uint32_t, void*, void*, void*, void*);
+typedef void (*vFLippppV_t)(uintptr_t, int32_t, void*, void*, void*, void*, ...);
+typedef void (*vFLupippp_t)(uintptr_t, uint32_t, void*, int32_t, void*, void*, void*);
+typedef void (*vFLpAippp_t)(uintptr_t, void*, va_list, int32_t, void*, void*, void*);
+typedef void (*vFppupppp_t)(void*, void*, uint32_t, void*, void*, void*, void*);
 typedef void (*vFppLippp_t)(void*, void*, uintptr_t, int32_t, void*, void*, void*);
 typedef void (*vFpppuipV_t)(void*, void*, void*, uint32_t, int32_t, void*, ...);
-typedef uint32_t (*uFipipppp_t)(int32_t, void*, int32_t, void*, void*, void*, void*);
-typedef uint32_t (*uFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*);
+typedef uint32_t (*uFipupppp_t)(int32_t, void*, uint32_t, void*, void*, void*, void*);
+typedef uint32_t (*uFppupppp_t)(void*, void*, uint32_t, void*, void*, void*, void*);
 typedef uint32_t (*uFppppppp_t)(void*, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFpppuipV_t)(void*, void*, void*, uint32_t, int32_t, void*, ...);
-typedef void (*vFppiipppp_t)(void*, void*, int32_t, int32_t, void*, void*, void*, void*);
-typedef void (*vFpppiippp_t)(void*, void*, void*, int32_t, int32_t, void*, void*, void*);
-typedef uint32_t (*uFipippppp_t)(int32_t, void*, int32_t, void*, void*, void*, void*, void*);
-typedef void (*vFiippppppp_t)(int32_t, int32_t, void*, void*, void*, void*, void*, void*, void*);
-typedef void (*vFpippppppp_t)(void*, int32_t, void*, void*, void*, void*, void*, void*, void*);
-typedef void (*vFpppiipppp_t)(void*, void*, void*, int32_t, int32_t, void*, void*, void*, void*);
-typedef void* (*pFiippppppp_t)(int32_t, int32_t, void*, void*, void*, void*, void*, void*, void*);
-typedef uint32_t (*uFppppppippp_t)(void*, void*, void*, void*, void*, void*, int32_t, void*, void*, void*);
-typedef void (*vFpppppppiippp_t)(void*, void*, void*, void*, void*, void*, void*, int32_t, int32_t, void*, void*, void*);
+typedef void (*vFppuipppp_t)(void*, void*, uint32_t, int32_t, void*, void*, void*, void*);
+typedef void (*vFpppuippp_t)(void*, void*, void*, uint32_t, int32_t, void*, void*, void*);
+typedef uint32_t (*uFipuppppp_t)(int32_t, void*, uint32_t, void*, void*, void*, void*, void*);
+typedef void (*vFiuppppppp_t)(int32_t, uint32_t, void*, void*, void*, void*, void*, void*, void*);
+typedef void (*vFpuppppppp_t)(void*, uint32_t, void*, void*, void*, void*, void*, void*, void*);
+typedef void (*vFpppuipppp_t)(void*, void*, void*, uint32_t, int32_t, void*, void*, void*, void*);
+typedef void* (*pFiuppppppp_t)(int32_t, uint32_t, void*, void*, void*, void*, void*, void*, void*);
+typedef uint32_t (*uFppppppuppp_t)(void*, void*, void*, void*, void*, void*, uint32_t, void*, void*, void*);
+typedef void (*vFpppppppuippp_t)(void*, void*, void*, void*, void*, void*, void*, uint32_t, int32_t, void*, void*, void*);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(g_simple_async_result_set_op_res_gpointer, vFppp_t) \
@@ -61,31 +60,31 @@ typedef void (*vFpppppppiippp_t)(void*, void*, void*, void*, void*, void*, void*
 	GO(g_simple_async_result_new_take_error, pFpppp_t) \
 	GO(g_task_new, pFpppp_t) \
 	GO(g_async_initable_init_async, vFpippp_t) \
+	GO(g_simple_async_result_set_error, vFpuipV_t) \
 	GO(g_task_return_new_error, vFpuipV_t) \
-	GO(g_simple_async_result_set_error, vFppipV_t) \
-	GO(g_simple_async_result_set_error_va, vFppipA_t) \
-	GO(g_initable_new, pFppppV_t) \
-	GO(g_initable_new_valist, pFppApp_t) \
-	GO(g_dbus_connection_new_for_address, vFpipppp_t) \
-	GO(g_async_initable_new_async, vFiippppV_t) \
-	GO(g_async_initable_newv_async, vFiupippp_t) \
-	GO(g_async_initable_new_valist_async, vFipAippp_t) \
-	GO(g_dbus_connection_new, vFppipppp_t) \
+	GO(g_simple_async_result_set_error_va, vFpuipA_t) \
+	GO(g_initable_new, pFLpppV_t) \
+	GO(g_initable_new_valist, pFLpApp_t) \
+	GO(g_dbus_connection_new_for_address, vFpupppp_t) \
+	GO(g_async_initable_new_async, vFLippppV_t) \
+	GO(g_async_initable_newv_async, vFLupippp_t) \
+	GO(g_async_initable_new_valist_async, vFLpAippp_t) \
+	GO(g_dbus_connection_new, vFppupppp_t) \
 	GO(g_input_stream_read_async, vFppLippp_t) \
 	GO(g_simple_async_report_error_in_idle, vFpppuipV_t) \
-	GO(g_bus_watch_name, uFipipppp_t) \
-	GO(g_bus_own_name_on_connection, uFppipppp_t) \
-	GO(g_bus_watch_name_on_connection, uFppipppp_t) \
+	GO(g_bus_watch_name, uFipupppp_t) \
+	GO(g_bus_own_name_on_connection, uFppupppp_t) \
+	GO(g_bus_watch_name_on_connection, uFppupppp_t) \
 	GO(g_dbus_connection_register_object, uFppppppp_t) \
 	GO(g_simple_async_result_new_error, pFpppuipV_t) \
-	GO(g_dbus_connection_send_message_with_reply, vFppiipppp_t) \
-	GO(g_dbus_proxy_call, vFpppiippp_t) \
-	GO(g_bus_own_name, uFipippppp_t) \
-	GO(g_dbus_proxy_new_for_bus, vFiippppppp_t) \
-	GO(g_dbus_proxy_new, vFpippppppp_t) \
-	GO(g_dbus_proxy_call_with_unix_fd_list, vFpppiipppp_t) \
-	GO(g_dbus_object_manager_client_new_for_bus_sync, pFiippppppp_t) \
-	GO(g_dbus_connection_signal_subscribe, uFppppppippp_t) \
-	GO(g_dbus_connection_call, vFpppppppiippp_t)
+	GO(g_dbus_connection_send_message_with_reply, vFppuipppp_t) \
+	GO(g_dbus_proxy_call, vFpppuippp_t) \
+	GO(g_bus_own_name, uFipuppppp_t) \
+	GO(g_dbus_proxy_new_for_bus, vFiuppppppp_t) \
+	GO(g_dbus_proxy_new, vFpuppppppp_t) \
+	GO(g_dbus_proxy_call_with_unix_fd_list, vFpppuipppp_t) \
+	GO(g_dbus_object_manager_client_new_for_bus_sync, pFiuppppppp_t) \
+	GO(g_dbus_connection_signal_subscribe, uFppppppuppp_t) \
+	GO(g_dbus_connection_call, vFpppppppuippp_t)
 
 #endif // __wrappedgio2TYPES_H_
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index ada9a9f0..deb7b1f2 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -1721,7 +1721,7 @@ typedef uint32_t (*uFEpppp_t)(x64emu_t*, void*, void*, void*, void*);
 typedef uint32_t (*uFEpppV_t)(x64emu_t*, void*, void*, void*, void*);
 typedef uint32_t (*uFiuuuu_t)(int32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef uint32_t (*uFiuppi_t)(int32_t, uint32_t, void*, void*, int32_t);
-typedef uint32_t (*uFipipp_t)(int32_t, void*, int32_t, void*, void*);
+typedef uint32_t (*uFipupp_t)(int32_t, void*, uint32_t, void*, void*);
 typedef uint32_t (*uFipLpp_t)(int32_t, void*, uintptr_t, void*, void*);
 typedef uint32_t (*uFuiiii_t)(uint32_t, int32_t, int32_t, int32_t, int32_t);
 typedef uint32_t (*uFLpppL_t)(uintptr_t, void*, void*, void*, uintptr_t);
@@ -1887,11 +1887,11 @@ typedef void (*vFEpiLpp_t)(x64emu_t*, void*, int32_t, uintptr_t, void*, void*);
 typedef void (*vFEpippp_t)(x64emu_t*, void*, int32_t, void*, void*, void*);
 typedef void (*vFEpuipp_t)(x64emu_t*, void*, uint32_t, int32_t, void*, void*);
 typedef void (*vFEpuipV_t)(x64emu_t*, void*, uint32_t, int32_t, void*, void*);
+typedef void (*vFEpuipA_t)(x64emu_t*, void*, uint32_t, int32_t, void*, void*);
 typedef void (*vFEpupup_t)(x64emu_t*, void*, uint32_t, void*, uint32_t, void*);
 typedef void (*vFEpuppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*);
 typedef void (*vFEpLLpp_t)(x64emu_t*, void*, uintptr_t, uintptr_t, void*, void*);
 typedef void (*vFEppipV_t)(x64emu_t*, void*, void*, int32_t, void*, void*);
-typedef void (*vFEppipA_t)(x64emu_t*, void*, void*, int32_t, void*, void*);
 typedef void (*vFEppupp_t)(x64emu_t*, void*, void*, uint32_t, void*, void*);
 typedef void (*vFEpppLp_t)(x64emu_t*, void*, void*, void*, uintptr_t, void*);
 typedef void (*vFEppppp_t)(x64emu_t*, void*, void*, void*, void*, void*);
@@ -2183,6 +2183,7 @@ typedef uint32_t (*uFEiuppp_t)(x64emu_t*, int32_t, uint32_t, void*, void*, void*
 typedef uint32_t (*uFEpippp_t)(x64emu_t*, void*, int32_t, void*, void*, void*);
 typedef uint32_t (*uFEpCppp_t)(x64emu_t*, void*, uint8_t, void*, void*, void*);
 typedef uint32_t (*uFEpuppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*);
+typedef uint32_t (*uFipuppp_t)(int32_t, void*, uint32_t, void*, void*, void*);
 typedef uint32_t (*uFuuuuuu_t)(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef uint32_t (*uFupuufp_t)(uint32_t, void*, uint32_t, uint32_t, float, void*);
 typedef uint32_t (*uFuppppp_t)(uint32_t, void*, void*, void*, void*, void*);
@@ -2195,7 +2196,6 @@ typedef uint32_t (*uFpuuupp_t)(void*, uint32_t, uint32_t, uint32_t, void*, void*
 typedef uint32_t (*uFpuuppp_t)(void*, uint32_t, uint32_t, void*, void*, void*);
 typedef uint32_t (*uFpupupu_t)(void*, uint32_t, void*, uint32_t, void*, uint32_t);
 typedef uint32_t (*uFpupppp_t)(void*, uint32_t, void*, void*, void*, void*);
-typedef uint32_t (*uFppippp_t)(void*, void*, int32_t, void*, void*, void*);
 typedef uint32_t (*uFppuuup_t)(void*, void*, uint32_t, uint32_t, uint32_t, void*);
 typedef uint32_t (*uFppuupu_t)(void*, void*, uint32_t, uint32_t, void*, uint32_t);
 typedef uint32_t (*uFppLpLp_t)(void*, void*, uintptr_t, void*, uintptr_t, void*);
@@ -2225,6 +2225,8 @@ typedef uintptr_t (*LFpLLLLL_t)(void*, uintptr_t, uintptr_t, uintptr_t, uintptr_
 typedef uintptr_t (*LFppLLpL_t)(void*, void*, uintptr_t, uintptr_t, void*, uintptr_t);
 typedef uintptr_t (*LFppLpLL_t)(void*, void*, uintptr_t, void*, uintptr_t, uintptr_t);
 typedef uintptr_t (*LFSpLiip_t)(void*, void*, uintptr_t, int32_t, int32_t, void*);
+typedef void* (*pFELpppV_t)(x64emu_t*, uintptr_t, void*, void*, void*, void*);
+typedef void* (*pFELpApp_t)(x64emu_t*, uintptr_t, void*, void*, void*, void*);
 typedef void* (*pFEpiupp_t)(x64emu_t*, void*, int32_t, uint32_t, void*, void*);
 typedef void* (*pFEpippp_t)(x64emu_t*, void*, int32_t, void*, void*, void*);
 typedef void* (*pFEpuipp_t)(x64emu_t*, void*, uint32_t, int32_t, void*, void*);
@@ -2236,8 +2238,6 @@ typedef void* (*pFEppLLp_t)(x64emu_t*, void*, void*, uintptr_t, uintptr_t, void*
 typedef void* (*pFEpppLp_t)(x64emu_t*, void*, void*, void*, uintptr_t, void*);
 typedef void* (*pFEppppi_t)(x64emu_t*, void*, void*, void*, void*, int32_t);
 typedef void* (*pFEppppp_t)(x64emu_t*, void*, void*, void*, void*, void*);
-typedef void* (*pFEppppV_t)(x64emu_t*, void*, void*, void*, void*, void*);
-typedef void* (*pFEppApp_t)(x64emu_t*, void*, void*, void*, void*, void*);
 typedef void* (*pFiiiiii_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void* (*pFiiiiid_t)(int32_t, int32_t, int32_t, int32_t, int32_t, double);
 typedef void* (*pFipippp_t)(int32_t, void*, int32_t, void*, void*, void*);
@@ -2307,8 +2307,8 @@ typedef int32_t (*iWpuiiii_t)(void*, uint32_t, int32_t, int32_t, int32_t, int32_
 typedef int32_t (*iWpppppi_t)(void*, void*, void*, void*, void*, int32_t);
 typedef int32_t (*iWpppppu_t)(void*, void*, void*, void*, void*, uint32_t);
 typedef void (*vFEpiiipp_t)(x64emu_t*, void*, int32_t, int32_t, int32_t, void*, void*);
-typedef void (*vFEpipppp_t)(x64emu_t*, void*, int32_t, void*, void*, void*, void*);
 typedef void (*vFEpuipuV_t)(x64emu_t*, void*, uint32_t, int32_t, void*, uint32_t, void*);
+typedef void (*vFEpupppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*, void*);
 typedef void (*vFEppippp_t)(x64emu_t*, void*, void*, int32_t, void*, void*, void*);
 typedef void (*vFEpppLpp_t)(x64emu_t*, void*, void*, void*, uintptr_t, void*, void*);
 typedef void (*vFEppppup_t)(x64emu_t*, void*, void*, void*, void*, uint32_t, void*);
@@ -2387,6 +2387,7 @@ typedef void (*vFpddiidd_t)(void*, double, double, int32_t, int32_t, double, dou
 typedef void (*vFpdddddd_t)(void*, double, double, double, double, double, double);
 typedef void (*vFpLiLiLp_t)(void*, uintptr_t, int32_t, uintptr_t, int32_t, uintptr_t, void*);
 typedef void (*vFpLpiipi_t)(void*, uintptr_t, void*, int32_t, int32_t, void*, int32_t);
+typedef void (*vFppcuupp_t)(void*, void*, int8_t, uint32_t, uint32_t, void*, void*);
 typedef void (*vFppiiiii_t)(void*, void*, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFppiiipi_t)(void*, void*, int32_t, int32_t, int32_t, void*, int32_t);
 typedef void (*vFppiipuu_t)(void*, void*, int32_t, int32_t, void*, uint32_t, uint32_t);
@@ -2396,7 +2397,6 @@ typedef void (*vFppiLiLp_t)(void*, void*, int32_t, uintptr_t, int32_t, uintptr_t
 typedef void (*vFppipiip_t)(void*, void*, int32_t, void*, int32_t, int32_t, void*);
 typedef void (*vFppipipp_t)(void*, void*, int32_t, void*, int32_t, void*, void*);
 typedef void (*vFppipppp_t)(void*, void*, int32_t, void*, void*, void*, void*);
-typedef void (*vFppCuupp_t)(void*, void*, uint8_t, uint32_t, uint32_t, void*, void*);
 typedef void (*vFppuiiip_t)(void*, void*, uint32_t, int32_t, int32_t, int32_t, void*);
 typedef void (*vFppuuuii_t)(void*, void*, uint32_t, uint32_t, uint32_t, int32_t, int32_t);
 typedef void (*vFppuupii_t)(void*, void*, uint32_t, uint32_t, void*, int32_t, int32_t);
@@ -2608,10 +2608,10 @@ typedef int32_t (*iWpuipupp_t)(void*, uint32_t, int32_t, void*, uint32_t, void*,
 typedef int32_t (*iWpuuuppu_t)(void*, uint32_t, uint32_t, uint32_t, void*, void*, uint32_t);
 typedef int32_t (*iWpupuufu_t)(void*, uint32_t, void*, uint32_t, uint32_t, float, uint32_t);
 typedef int32_t (*iWpppuppp_t)(void*, void*, void*, uint32_t, void*, void*, void*);
-typedef void (*vFEiippppV_t)(x64emu_t*, int32_t, int32_t, void*, void*, void*, void*, void*);
-typedef void (*vFEiupippp_t)(x64emu_t*, int32_t, uint32_t, void*, int32_t, void*, void*, void*);
-typedef void (*vFEipAippp_t)(x64emu_t*, int32_t, void*, void*, int32_t, void*, void*, void*);
-typedef void (*vFEppipppp_t)(x64emu_t*, void*, void*, int32_t, void*, void*, void*, void*);
+typedef void (*vFELippppV_t)(x64emu_t*, uintptr_t, int32_t, void*, void*, void*, void*, void*);
+typedef void (*vFELupippp_t)(x64emu_t*, uintptr_t, uint32_t, void*, int32_t, void*, void*, void*);
+typedef void (*vFELpAippp_t)(x64emu_t*, uintptr_t, void*, void*, int32_t, void*, void*, void*);
+typedef void (*vFEppupppp_t)(x64emu_t*, void*, void*, uint32_t, void*, void*, void*, void*);
 typedef void (*vFEppLippp_t)(x64emu_t*, void*, void*, uintptr_t, int32_t, void*, void*, void*);
 typedef void (*vFEppLpLpp_t)(x64emu_t*, void*, void*, uintptr_t, void*, uintptr_t, void*, void*);
 typedef void (*vFEpppippp_t)(x64emu_t*, void*, void*, void*, int32_t, void*, void*, void*);
@@ -2742,9 +2742,9 @@ typedef int32_t (*iFpppppppp_t)(void*, void*, void*, void*, void*, void*, void*,
 typedef int32_t (*iFbWWipppp_t)(void*, uint16_t, uint16_t, int32_t, void*, void*, void*, void*);
 typedef int32_t (*iFbupppWWu_t)(void*, uint32_t, void*, void*, void*, uint16_t, uint16_t, uint32_t);
 typedef uint8_t (*CFuiifpppp_t)(uint32_t, int32_t, int32_t, float, void*, void*, void*, void*);
-typedef uint32_t (*uFEipipppp_t)(x64emu_t*, int32_t, void*, int32_t, void*, void*, void*, void*);
+typedef uint32_t (*uFEipupppp_t)(x64emu_t*, int32_t, void*, uint32_t, void*, void*, void*, void*);
 typedef uint32_t (*uFEpiupppp_t)(x64emu_t*, void*, int32_t, uint32_t, void*, void*, void*, void*);
-typedef uint32_t (*uFEppipppp_t)(x64emu_t*, void*, void*, int32_t, void*, void*, void*, void*);
+typedef uint32_t (*uFEppupppp_t)(x64emu_t*, void*, void*, uint32_t, void*, void*, void*, void*);
 typedef uint32_t (*uFEpppuppp_t)(x64emu_t*, void*, void*, void*, uint32_t, void*, void*, void*);
 typedef uint32_t (*uFEppppppp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFuipppppp_t)(uint32_t, int32_t, void*, void*, void*, void*, void*, void*);
@@ -2806,8 +2806,8 @@ typedef void (*vFEpiiiuipp_t)(x64emu_t*, void*, int32_t, int32_t, int32_t, uint3
 typedef void (*vFEpippippV_t)(x64emu_t*, void*, int32_t, void*, void*, int32_t, void*, void*, void*);
 typedef void (*vFEpippippA_t)(x64emu_t*, void*, int32_t, void*, void*, int32_t, void*, void*, void*);
 typedef void (*vFEpuuuippp_t)(x64emu_t*, void*, uint32_t, uint32_t, uint32_t, int32_t, void*, void*, void*);
-typedef void (*vFEppiipppp_t)(x64emu_t*, void*, void*, int32_t, int32_t, void*, void*, void*, void*);
-typedef void (*vFEpppiippp_t)(x64emu_t*, void*, void*, void*, int32_t, int32_t, void*, void*, void*);
+typedef void (*vFEppuipppp_t)(x64emu_t*, void*, void*, uint32_t, int32_t, void*, void*, void*, void*);
+typedef void (*vFEpppuippp_t)(x64emu_t*, void*, void*, void*, uint32_t, int32_t, void*, void*, void*);
 typedef void (*vFEpppLLpLp_t)(x64emu_t*, void*, void*, void*, uintptr_t, uintptr_t, void*, uintptr_t, void*);
 typedef void (*vFEppppippp_t)(x64emu_t*, void*, void*, void*, void*, int32_t, void*, void*, void*);
 typedef void (*vFiiiiiiiii_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
@@ -2902,7 +2902,7 @@ typedef int32_t (*iFpppppLupp_t)(void*, void*, void*, void*, void*, uintptr_t, u
 typedef int32_t (*iFppppppupp_t)(void*, void*, void*, void*, void*, void*, uint32_t, void*, void*);
 typedef int32_t (*iFppppppppu_t)(void*, void*, void*, void*, void*, void*, void*, void*, uint32_t);
 typedef int32_t (*iFppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*);
-typedef uint32_t (*uFEipippppp_t)(x64emu_t*, int32_t, void*, int32_t, void*, void*, void*, void*, void*);
+typedef uint32_t (*uFEipuppppp_t)(x64emu_t*, int32_t, void*, uint32_t, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFEpppufppp_t)(x64emu_t*, void*, void*, void*, uint32_t, float, void*, void*, void*);
 typedef uint32_t (*uFuulpiuiuf_t)(uint32_t, uint32_t, intptr_t, void*, int32_t, uint32_t, int32_t, uint32_t, float);
 typedef uint32_t (*uFpuupuppuu_t)(void*, uint32_t, uint32_t, void*, uint32_t, void*, void*, uint32_t, uint32_t);
@@ -2936,9 +2936,9 @@ typedef int32_t (*iWEpuuuiipp_t)(x64emu_t*, void*, uint32_t, uint32_t, uint32_t,
 typedef int32_t (*iWpiuuupipu_t)(void*, int32_t, uint32_t, uint32_t, uint32_t, void*, int32_t, void*, uint32_t);
 typedef int32_t (*iWpuiuuipip_t)(void*, uint32_t, int32_t, uint32_t, uint32_t, int32_t, void*, int32_t, void*);
 typedef int32_t (*iWppppupiii_t)(void*, void*, void*, void*, uint32_t, void*, int32_t, int32_t, int32_t);
-typedef void (*vFEiippppppp_t)(x64emu_t*, int32_t, int32_t, void*, void*, void*, void*, void*, void*, void*);
-typedef void (*vFEpippppppp_t)(x64emu_t*, void*, int32_t, void*, void*, void*, void*, void*, void*, void*);
-typedef void (*vFEpppiipppp_t)(x64emu_t*, void*, void*, void*, int32_t, int32_t, void*, void*, void*, void*);
+typedef void (*vFEiuppppppp_t)(x64emu_t*, int32_t, uint32_t, void*, void*, void*, void*, void*, void*, void*);
+typedef void (*vFEpuppppppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*, void*, void*, void*, void*);
+typedef void (*vFEpppuipppp_t)(x64emu_t*, void*, void*, void*, uint32_t, int32_t, void*, void*, void*, void*);
 typedef void (*vFEpppLuLpLp_t)(x64emu_t*, void*, void*, void*, uintptr_t, uint32_t, uintptr_t, void*, uintptr_t, void*);
 typedef void (*vFiiiiiiiiii_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t);
 typedef void (*vFiiiiiiiiiu_t)(int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t);
@@ -2993,7 +2993,7 @@ typedef int32_t (*iFpppppppppu_t)(void*, void*, void*, void*, void*, void*, void
 typedef uint32_t (*uFpddpippppp_t)(void*, double, double, void*, int32_t, void*, void*, void*, void*, void*);
 typedef uint32_t (*uFpppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef intptr_t (*lFpLppdddddd_t)(void*, uintptr_t, void*, void*, double, double, double, double, double, double);
-typedef void* (*pFEiippppppp_t)(x64emu_t*, int32_t, int32_t, void*, void*, void*, void*, void*, void*, void*);
+typedef void* (*pFEiuppppppp_t)(x64emu_t*, int32_t, uint32_t, void*, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFEpiiiiiipp_t)(x64emu_t*, void*, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, void*, void*);
 typedef void* (*pFEpippppppp_t)(x64emu_t*, void*, int32_t, void*, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFpupLLLLLpp_t)(void*, uint32_t, void*, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t, void*, void*);
@@ -3058,7 +3058,7 @@ typedef int32_t (*iFpppppiiuupp_t)(void*, void*, void*, void*, void*, int32_t, i
 typedef uint32_t (*uFEpLiupppLuV_t)(x64emu_t*, void*, uintptr_t, int32_t, uint32_t, void*, void*, void*, uintptr_t, uint32_t, void*);
 typedef uint32_t (*uFEpLippppLup_t)(x64emu_t*, void*, uintptr_t, int32_t, void*, void*, void*, void*, uintptr_t, uint32_t, void*);
 typedef uint32_t (*uFEpLippppLuA_t)(x64emu_t*, void*, uintptr_t, int32_t, void*, void*, void*, void*, uintptr_t, uint32_t, void*);
-typedef uint32_t (*uFEppppppippp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, int32_t, void*, void*, void*);
+typedef uint32_t (*uFEppppppuppp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, uint32_t, void*, void*, void*);
 typedef uint32_t (*uFppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFEpipppppppi_t)(x64emu_t*, void*, int32_t, void*, void*, void*, void*, void*, void*, void*, int32_t);
 typedef void* (*pFEppiiLpppip_t)(x64emu_t*, void*, void*, int32_t, int32_t, uintptr_t, void*, void*, void*, int32_t, void*);
@@ -3102,7 +3102,7 @@ typedef void* (*pFppuuppppuppp_t)(void*, void*, uint32_t, uint32_t, void*, void*
 typedef void* (*pFpppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFbCuuWWwwCCup_t)(void*, uint8_t, uint32_t, uint32_t, uint16_t, uint16_t, int16_t, int16_t, uint8_t, uint8_t, uint32_t, void*);
 typedef void* (*pFbuuuWWWWWWWW_t)(void*, uint32_t, uint32_t, uint32_t, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t);
-typedef void (*vFEpppppppiippp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, void*, int32_t, int32_t, void*, void*, void*);
+typedef void (*vFEpppppppuippp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, void*, uint32_t, int32_t, void*, void*, void*);
 typedef void (*vFuiiiiiiiiiuup_t)(uint32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, int32_t, uint32_t, uint32_t, void*);
 typedef void (*vFuuuuuuuuuuuuu_t)(uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
 typedef void (*vFuUuuuuuuuuuuu_t)(uint32_t, uint64_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t, uint32_t);
@@ -4920,7 +4920,7 @@ void uFEpppp(x64emu_t *emu, uintptr_t fcn) { uFEpppp_t fn = (uFEpppp_t)fcn; R_RA
 void uFEpppV(x64emu_t *emu, uintptr_t fcn) { uFEpppV_t fn = (uFEpppV_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
 void uFiuuuu(x64emu_t *emu, uintptr_t fcn) { uFiuuuu_t fn = (uFiuuuu_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void uFiuppi(x64emu_t *emu, uintptr_t fcn) { uFiuppi_t fn = (uFiuppi_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
-void uFipipp(x64emu_t *emu, uintptr_t fcn) { uFipipp_t fn = (uFipipp_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void uFipupp(x64emu_t *emu, uintptr_t fcn) { uFipupp_t fn = (uFipupp_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFipLpp(x64emu_t *emu, uintptr_t fcn) { uFipLpp_t fn = (uFipLpp_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFuiiii(x64emu_t *emu, uintptr_t fcn) { uFuiiii_t fn = (uFuiiii_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void uFLpppL(x64emu_t *emu, uintptr_t fcn) { uFLpppL_t fn = (uFLpppL_t)fcn; R_RAX=(uint32_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
@@ -5086,11 +5086,11 @@ void vFEpiLpp(x64emu_t *emu, uintptr_t fcn) { vFEpiLpp_t fn = (vFEpiLpp_t)fcn; f
 void vFEpippp(x64emu_t *emu, uintptr_t fcn) { vFEpippp_t fn = (vFEpippp_t)fcn; fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFEpuipp(x64emu_t *emu, uintptr_t fcn) { vFEpuipp_t fn = (vFEpuipp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFEpuipV(x64emu_t *emu, uintptr_t fcn) { vFEpuipV_t fn = (vFEpuipV_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); }
+void vFEpuipA(x64emu_t *emu, uintptr_t fcn) { vFEpuipA_t fn = (vFEpuipA_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFEpupup(x64emu_t *emu, uintptr_t fcn) { vFEpupup_t fn = (vFEpupup_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
 void vFEpuppp(x64emu_t *emu, uintptr_t fcn) { vFEpuppp_t fn = (vFEpuppp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFEpLLpp(x64emu_t *emu, uintptr_t fcn) { vFEpLLpp_t fn = (vFEpLLpp_t)fcn; fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFEppipV(x64emu_t *emu, uintptr_t fcn) { vFEppipV_t fn = (vFEppipV_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); }
-void vFEppipA(x64emu_t *emu, uintptr_t fcn) { vFEppipA_t fn = (vFEppipA_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFEppupp(x64emu_t *emu, uintptr_t fcn) { vFEppupp_t fn = (vFEppupp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFEpppLp(x64emu_t *emu, uintptr_t fcn) { vFEpppLp_t fn = (vFEpppLp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
 void vFEppppp(x64emu_t *emu, uintptr_t fcn) { vFEppppp_t fn = (vFEppppp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -5382,6 +5382,7 @@ void uFEiuppp(x64emu_t *emu, uintptr_t fcn) { uFEiuppp_t fn = (uFEiuppp_t)fcn; R
 void uFEpippp(x64emu_t *emu, uintptr_t fcn) { uFEpippp_t fn = (uFEpippp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFEpCppp(x64emu_t *emu, uintptr_t fcn) { uFEpCppp_t fn = (uFEpCppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFEpuppp(x64emu_t *emu, uintptr_t fcn) { uFEpuppp_t fn = (uFEpuppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void uFipuppp(x64emu_t *emu, uintptr_t fcn) { uFipuppp_t fn = (uFipuppp_t)fcn; R_RAX=(uint32_t)fn((int32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFuuuuuu(x64emu_t *emu, uintptr_t fcn) { uFuuuuuu_t fn = (uFuuuuuu_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9); }
 void uFupuufp(x64emu_t *emu, uintptr_t fcn) { uFupuufp_t fn = (uFupuufp_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, emu->xmm[0].f[0], (void*)R_R8); }
 void uFuppppp(x64emu_t *emu, uintptr_t fcn) { uFuppppp_t fn = (uFuppppp_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -5394,7 +5395,6 @@ void uFpuuupp(x64emu_t *emu, uintptr_t fcn) { uFpuuupp_t fn = (uFpuuupp_t)fcn; R
 void uFpuuppp(x64emu_t *emu, uintptr_t fcn) { uFpuuppp_t fn = (uFpuuppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFpupupu(x64emu_t *emu, uintptr_t fcn) { uFpupupu_t fn = (uFpupupu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 void uFpupppp(x64emu_t *emu, uintptr_t fcn) { uFpupppp_t fn = (uFpupppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
-void uFppippp(x64emu_t *emu, uintptr_t fcn) { uFppippp_t fn = (uFppippp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFppuuup(x64emu_t *emu, uintptr_t fcn) { uFppuuup_t fn = (uFppuuup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
 void uFppuupu(x64emu_t *emu, uintptr_t fcn) { uFppuupu_t fn = (uFppuupu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
 void uFppLpLp(x64emu_t *emu, uintptr_t fcn) { uFppLpLp_t fn = (uFppLpLp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9); }
@@ -5424,6 +5424,8 @@ void LFpLLLLL(x64emu_t *emu, uintptr_t fcn) { LFpLLLLL_t fn = (LFpLLLLL_t)fcn; R
 void LFppLLpL(x64emu_t *emu, uintptr_t fcn) { LFppLLpL_t fn = (LFppLLpL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (uintptr_t)R_R9); }
 void LFppLpLL(x64emu_t *emu, uintptr_t fcn) { LFppLpLL_t fn = (LFppLpLL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9); }
 void LFSpLiip(x64emu_t *emu, uintptr_t fcn) { LFSpLiip_t fn = (LFSpLiip_t)fcn; R_RAX=(uintptr_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9); }
+void pFELpppV(x64emu_t *emu, uintptr_t fcn) { pFELpppV_t fn = (pFELpppV_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); }
+void pFELpApp(x64emu_t *emu, uintptr_t fcn) { pFELpApp_t fn = (pFELpApp_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFEpiupp(x64emu_t *emu, uintptr_t fcn) { pFEpiupp_t fn = (pFEpiupp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFEpippp(x64emu_t *emu, uintptr_t fcn) { pFEpippp_t fn = (pFEpippp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFEpuipp(x64emu_t *emu, uintptr_t fcn) { pFEpuipp_t fn = (pFEpuipp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
@@ -5435,8 +5437,6 @@ void pFEppLLp(x64emu_t *emu, uintptr_t fcn) { pFEppLLp_t fn = (pFEppLLp_t)fcn; R
 void pFEpppLp(x64emu_t *emu, uintptr_t fcn) { pFEpppLp_t fn = (pFEpppLp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
 void pFEppppi(x64emu_t *emu, uintptr_t fcn) { pFEppppi_t fn = (pFEppppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void pFEppppp(x64emu_t *emu, uintptr_t fcn) { pFEppppp_t fn = (pFEppppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
-void pFEppppV(x64emu_t *emu, uintptr_t fcn) { pFEppppV_t fn = (pFEppppV_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); }
-void pFEppApp(x64emu_t *emu, uintptr_t fcn) { pFEppApp_t fn = (pFEppApp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void pFiiiiii(x64emu_t *emu, uintptr_t fcn) { pFiiiiii_t fn = (pFiiiiii_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9); }
 void pFiiiiid(x64emu_t *emu, uintptr_t fcn) { pFiiiiid_t fn = (pFiiiiid_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, emu->xmm[0].d[0]); }
 void pFipippp(x64emu_t *emu, uintptr_t fcn) { pFipippp_t fn = (pFipippp_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
@@ -5506,8 +5506,8 @@ void iWpuiiii(x64emu_t *emu, uintptr_t fcn) { iWpuiiii_t fn = (iWpuiiii_t)fcn; R
 void iWpppppi(x64emu_t *emu, uintptr_t fcn) { iWpppppi_t fn = (iWpppppi_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (void*)R_RDX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 40), *(int32_t*)(R_RSP + 48)); }
 void iWpppppu(x64emu_t *emu, uintptr_t fcn) { iWpppppu_t fn = (iWpppppu_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (void*)R_RDX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 40), *(uint32_t*)(R_RSP + 48)); }
 void vFEpiiipp(x64emu_t *emu, uintptr_t fcn) { vFEpiiipp_t fn = (vFEpiiipp_t)fcn; fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
-void vFEpipppp(x64emu_t *emu, uintptr_t fcn) { vFEpipppp_t fn = (vFEpipppp_t)fcn; fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFEpuipuV(x64emu_t *emu, uintptr_t fcn) { vFEpuipuV_t fn = (vFEpuipuV_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)(R_RSP + 8)); }
+void vFEpupppp(x64emu_t *emu, uintptr_t fcn) { vFEpupppp_t fn = (vFEpupppp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFEppippp(x64emu_t *emu, uintptr_t fcn) { vFEppippp_t fn = (vFEppippp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFEpppLpp(x64emu_t *emu, uintptr_t fcn) { vFEpppLpp_t fn = (vFEpppLpp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void vFEppppup(x64emu_t *emu, uintptr_t fcn) { vFEppppup_t fn = (vFEppppup_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
@@ -5586,6 +5586,7 @@ void vFpddiidd(x64emu_t *emu, uintptr_t fcn) { vFpddiidd_t fn = (vFpddiidd_t)fcn
 void vFpdddddd(x64emu_t *emu, uintptr_t fcn) { vFpdddddd_t fn = (vFpdddddd_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], emu->xmm[4].d[0], emu->xmm[5].d[0]); }
 void vFpLiLiLp(x64emu_t *emu, uintptr_t fcn) { vFpLiLiLp_t fn = (vFpLiLiLp_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (uintptr_t)R_RCX, (int32_t)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8)); }
 void vFpLpiipi(x64emu_t *emu, uintptr_t fcn) { vFpLpiipi_t fn = (vFpLpiipi_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8)); }
+void vFppcuupp(x64emu_t *emu, uintptr_t fcn) { vFppcuupp_t fn = (vFppcuupp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int8_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFppiiiii(x64emu_t *emu, uintptr_t fcn) { vFppiiiii_t fn = (vFppiiiii_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 vFppiiipi(x64emu_t *emu, uintptr_t fcn) { vFppiiipi_t fn = (vFppiiipi_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)); }
 void vFppiipuu(x64emu_t *emu, uintptr_t fcn) { vFppiipuu_t fn = (vFppiipuu_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8)); }
@@ -5595,7 +5596,6 @@ void vFppiLiLp(x64emu_t *emu, uintptr_t fcn) { vFppiLiLp_t fn = (vFppiLiLp_t)fcn
 void vFppipiip(x64emu_t *emu, uintptr_t fcn) { vFppipiip_t fn = (vFppipiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
 void vFppipipp(x64emu_t *emu, uintptr_t fcn) { vFppipipp_t fn = (vFppipipp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFppipppp(x64emu_t *emu, uintptr_t fcn) { vFppipppp_t fn = (vFppipppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
-void vFppCuupp(x64emu_t *emu, uintptr_t fcn) { vFppCuupp_t fn = (vFppCuupp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint8_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFppuiiip(x64emu_t *emu, uintptr_t fcn) { vFppuiiip_t fn = (vFppuiiip_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(void**)(R_RSP + 8)); }
 void vFppuuuii(x64emu_t *emu, uintptr_t fcn) { vFppuuuii_t fn = (vFppuuuii_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)); }
 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)); }
@@ -5807,10 +5807,10 @@ void iWpuipupp(x64emu_t *emu, uintptr_t fcn) { iWpuipupp_t fn = (iWpuipupp_t)fcn
 void iWpuuuppu(x64emu_t *emu, uintptr_t fcn) { iWpuuuppu_t fn = (iWpuuuppu_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (uint32_t)R_RDX, (uint32_t)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(uint32_t*)(R_RSP + 56)); }
 void iWpupuufu(x64emu_t *emu, uintptr_t fcn) { iWpupuufu_t fn = (iWpupuufu_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (uint32_t)R_RDX, (void*)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 40), *(float*)(R_RSP + 48), *(uint32_t*)(R_RSP + 56)); }
 void iWpppuppp(x64emu_t *emu, uintptr_t fcn) { iWpppuppp_t fn = (iWpppuppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (void*)R_RDX, (void*)R_R8, (uint32_t)R_R9, *(void**)(R_RSP + 40), *(void**)(R_RSP + 48), *(void**)(R_RSP + 56)); }
-void vFEiippppV(x64emu_t *emu, uintptr_t fcn) { vFEiippppV_t fn = (vFEiippppV_t)fcn; fn(emu, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, (void*)(R_RSP + 8)); }
-void vFEiupippp(x64emu_t *emu, uintptr_t fcn) { vFEiupippp_t fn = (vFEiupippp_t)fcn; fn(emu, (int32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
-void vFEipAippp(x64emu_t *emu, uintptr_t fcn) { vFEipAippp_t fn = (vFEipAippp_t)fcn; fn(emu, (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
-void vFEppipppp(x64emu_t *emu, uintptr_t fcn) { vFEppipppp_t fn = (vFEppipppp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void vFELippppV(x64emu_t *emu, uintptr_t fcn) { vFELippppV_t fn = (vFELippppV_t)fcn; fn(emu, (uintptr_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, (void*)(R_RSP + 8)); }
+void vFELupippp(x64emu_t *emu, uintptr_t fcn) { vFELupippp_t fn = (vFELupippp_t)fcn; fn(emu, (uintptr_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void vFELpAippp(x64emu_t *emu, uintptr_t fcn) { vFELpAippp_t fn = (vFELpAippp_t)fcn; fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void vFEppupppp(x64emu_t *emu, uintptr_t fcn) { vFEppupppp_t fn = (vFEppupppp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFEppLippp(x64emu_t *emu, uintptr_t fcn) { vFEppLippp_t fn = (vFEppLippp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFEppLpLpp(x64emu_t *emu, uintptr_t fcn) { vFEppLpLpp_t fn = (vFEppLpLpp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void vFEpppippp(x64emu_t *emu, uintptr_t fcn) { vFEpppippp_t fn = (vFEpppippp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
@@ -5941,9 +5941,9 @@ void iFpppppppp(x64emu_t *emu, uintptr_t fcn) { iFpppppppp_t fn = (iFpppppppp_t)
 void iFbWWipppp(x64emu_t *emu, uintptr_t fcn) { iFbWWipppp_t fn = (iFbWWipppp_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(int32_t)fn(aligned_xcb, (uint16_t)R_RSI, (uint16_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void iFbupppWWu(x64emu_t *emu, uintptr_t fcn) { iFbupppWWu_t fn = (iFbupppWWu_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(int32_t)fn(aligned_xcb, (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)); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void CFuiifpppp(x64emu_t *emu, uintptr_t fcn) { CFuiifpppp_t fn = (CFuiifpppp_t)fcn; R_RAX=(unsigned char)fn((uint32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, emu->xmm[0].f[0], (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
-void uFEipipppp(x64emu_t *emu, uintptr_t fcn) { uFEipipppp_t fn = (uFEipipppp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void uFEipupppp(x64emu_t *emu, uintptr_t fcn) { uFEipupppp_t fn = (uFEipupppp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFEpiupppp(x64emu_t *emu, uintptr_t fcn) { uFEpiupppp_t fn = (uFEpiupppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
-void uFEppipppp(x64emu_t *emu, uintptr_t fcn) { uFEppipppp_t fn = (uFEppipppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
+void uFEppupppp(x64emu_t *emu, uintptr_t fcn) { uFEppupppp_t fn = (uFEppupppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFEpppuppp(x64emu_t *emu, uintptr_t fcn) { uFEpppuppp_t fn = (uFEpppuppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFEppppppp(x64emu_t *emu, uintptr_t fcn) { uFEppppppp_t fn = (uFEppppppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFuipppppp(x64emu_t *emu, uintptr_t fcn) { uFuipppppp_t fn = (uFuipppppp_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
@@ -6005,8 +6005,8 @@ void vFEpiiiuipp(x64emu_t *emu, uintptr_t fcn) { vFEpiiiuipp_t fn = (vFEpiiiuipp
 void vFEpippippV(x64emu_t *emu, uintptr_t fcn) { vFEpippippV_t fn = (vFEpippippV_t)fcn; fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), (void*)(R_RSP + 16)); }
 void vFEpippippA(x64emu_t *emu, uintptr_t fcn) { vFEpippippA_t fn = (vFEpippippA_t)fcn; fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFEpuuuippp(x64emu_t *emu, uintptr_t fcn) { vFEpuuuippp_t fn = (vFEpuuuippp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
-void vFEppiipppp(x64emu_t *emu, uintptr_t fcn) { vFEppiipppp_t fn = (vFEppiipppp_t)fcn; fn(emu, (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)); }
-void vFEpppiippp(x64emu_t *emu, uintptr_t fcn) { vFEpppiippp_t fn = (vFEpppiippp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void vFEppuipppp(x64emu_t *emu, uintptr_t fcn) { vFEppuipppp_t fn = (vFEppuipppp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void vFEpppuippp(x64emu_t *emu, uintptr_t fcn) { vFEpppuippp_t fn = (vFEpppuippp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFEpppLLpLp(x64emu_t *emu, uintptr_t fcn) { vFEpppLLpLp_t fn = (vFEpppLLpLp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(uintptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFEppppippp(x64emu_t *emu, uintptr_t fcn) { vFEppppippp_t fn = (vFEppppippp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFiiiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFiiiiiiiii_t fn = (vFiiiiiiiii_t)fcn; fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24)); }
@@ -6101,7 +6101,7 @@ void iFpppppLupp(x64emu_t *emu, uintptr_t fcn) { iFpppppLupp_t fn = (iFpppppLupp
 void iFppppppupp(x64emu_t *emu, uintptr_t fcn) { iFppppppupp_t fn = (iFppppppupp_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**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void iFppppppppu(x64emu_t *emu, uintptr_t fcn) { iFppppppppu_t fn = (iFppppppppu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(uint32_t*)(R_RSP + 24)); }
 void iFppppppppp(x64emu_t *emu, uintptr_t fcn) { iFppppppppp_t fn = (iFppppppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
-void uFEipippppp(x64emu_t *emu, uintptr_t fcn) { uFEipippppp_t fn = (uFEipippppp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)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 uFEipuppppp(x64emu_t *emu, uintptr_t fcn) { uFEipuppppp_t fn = (uFEipuppppp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void uFEpppufppp(x64emu_t *emu, uintptr_t fcn) { uFEpppufppp_t fn = (uFEpppufppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, emu->xmm[0].f[0], (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void uFuulpiuiuf(x64emu_t *emu, uintptr_t fcn) { uFuulpiuiuf_t fn = (uFuulpiuiuf_t)fcn; R_RAX=(uint32_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(int32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), emu->xmm[0].f[0]); }
 void uFpuupuppuu(x64emu_t *emu, uintptr_t fcn) { uFpuupuppuu_t fn = (uFpuupuppuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24)); }
@@ -6135,9 +6135,9 @@ void iWEpuuuiipp(x64emu_t *emu, uintptr_t fcn) { iWEpuuuiipp_t fn = (iWEpuuuiipp
 void iWpiuuupipu(x64emu_t *emu, uintptr_t fcn) { iWpiuuupipu_t fn = (iWpiuuupipu_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (int32_t)R_RDX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 40), *(void**)(R_RSP + 48), *(int32_t*)(R_RSP + 56), *(void**)(R_RSP + 64), *(uint32_t*)(R_RSP + 72)); }
 void iWpuiuuipip(x64emu_t *emu, uintptr_t fcn) { iWpuiuuipip_t fn = (iWpuiuuipip_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (uint32_t)R_RDX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 40), *(int32_t*)(R_RSP + 48), *(void**)(R_RSP + 56), *(int32_t*)(R_RSP + 64), *(void**)(R_RSP + 72)); }
 void iWppppupiii(x64emu_t *emu, uintptr_t fcn) { iWppppupiii_t fn = (iWppppupiii_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (void*)R_RDX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 40), *(void**)(R_RSP + 48), *(int32_t*)(R_RSP + 56), *(int32_t*)(R_RSP + 64), *(int32_t*)(R_RSP + 72)); }
-void vFEiippppppp(x64emu_t *emu, uintptr_t fcn) { vFEiippppppp_t fn = (vFEiippppppp_t)fcn; fn(emu, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
-void vFEpippppppp(x64emu_t *emu, uintptr_t fcn) { vFEpippppppp_t fn = (vFEpippppppp_t)fcn; fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
-void vFEpppiipppp(x64emu_t *emu, uintptr_t fcn) { vFEpppiipppp_t fn = (vFEpppiipppp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
+void vFEiuppppppp(x64emu_t *emu, uintptr_t fcn) { vFEiuppppppp_t fn = (vFEiuppppppp_t)fcn; fn(emu, (int32_t)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 vFEpuppppppp(x64emu_t *emu, uintptr_t fcn) { vFEpuppppppp_t fn = (vFEpuppppppp_t)fcn; fn(emu, (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 vFEpppuipppp(x64emu_t *emu, uintptr_t fcn) { vFEpppuipppp_t fn = (vFEpppuipppp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (int32_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void vFEpppLuLpLp(x64emu_t *emu, uintptr_t fcn) { vFEpppLuLpLp_t fn = (vFEpppLuLpLp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uint32_t)R_R8, (uintptr_t)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void vFiiiiiiiiii(x64emu_t *emu, uintptr_t fcn) { vFiiiiiiiiii_t fn = (vFiiiiiiiiii_t)fcn; fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
 void vFiiiiiiiiiu(x64emu_t *emu, uintptr_t fcn) { vFiiiiiiiiiu_t fn = (vFiiiiiiiiiu_t)fcn; fn((int32_t)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32)); }
@@ -6192,7 +6192,7 @@ void iFpppppppppu(x64emu_t *emu, uintptr_t fcn) { iFpppppppppu_t fn = (iFppppppp
 void uFpddpippppp(x64emu_t *emu, uintptr_t fcn) { uFpddpippppp_t fn = (uFpddpippppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (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 uFpppppppppp(x64emu_t *emu, uintptr_t fcn) { uFpppppppppp_t fn = (uFpppppppppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void lFpLppdddddd(x64emu_t *emu, uintptr_t fcn) { lFpLppdddddd_t fn = (lFpLppdddddd_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0], emu->xmm[3].d[0], emu->xmm[4].d[0], emu->xmm[5].d[0]); }
-void pFEiippppppp(x64emu_t *emu, uintptr_t fcn) { pFEiippppppp_t fn = (pFEiippppppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
+void pFEiuppppppp(x64emu_t *emu, uintptr_t fcn) { pFEiuppppppp_t fn = (pFEiuppppppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (int32_t)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 pFEpiiiiiipp(x64emu_t *emu, uintptr_t fcn) { pFEpiiiiiipp_t fn = (pFEpiiiiiipp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void pFEpippppppp(x64emu_t *emu, uintptr_t fcn) { pFEpippppppp_t fn = (pFEpippppppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24)); }
 void pFpupLLLLLpp(x64emu_t *emu, uintptr_t fcn) { pFpupLLLLLpp_t fn = (pFpupLLLLLpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
@@ -6257,7 +6257,7 @@ void iFpppppiiuupp(x64emu_t *emu, uintptr_t fcn) { iFpppppiiuupp_t fn = (iFppppp
 void uFEpLiupppLuV(x64emu_t *emu, uintptr_t fcn) { uFEpLiupppLuV_t fn = (uFEpLiupppLuV_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), (void*)(R_RSP + 32)); }
 void uFEpLippppLup(x64emu_t *emu, uintptr_t fcn) { uFEpLippppLup_t fn = (uFEpLippppLup_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void uFEpLippppLuA(x64emu_t *emu, uintptr_t fcn) { uFEpLippppLuA_t fn = (uFEpLippppLuA_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
-void uFEppppppippp(x64emu_t *emu, uintptr_t fcn) { uFEppppppippp_t fn = (uFEppppppippp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
+void uFEppppppuppp(x64emu_t *emu, uintptr_t fcn) { uFEppppppuppp_t fn = (uFEppppppuppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void uFppppppppppp(x64emu_t *emu, uintptr_t fcn) { uFppppppppppp_t fn = (uFppppppppppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void pFEpipppppppi(x64emu_t *emu, uintptr_t fcn) { pFEpipppppppi_t fn = (pFEpipppppppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(int32_t*)(R_RSP + 32)); }
 void pFEppiiLpppip(x64emu_t *emu, uintptr_t fcn) { pFEppiiLpppip_t fn = (pFEppiiLpppip_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
@@ -6301,7 +6301,7 @@ void pFppuuppppuppp(x64emu_t *emu, uintptr_t fcn) { pFppuuppppuppp_t fn = (pFppu
 void pFpppppppppppp(x64emu_t *emu, uintptr_t fcn) { pFpppppppppppp_t fn = (pFpppppppppppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16), *(void**)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); }
 void pFbCuuWWwwCCup(x64emu_t *emu, uintptr_t fcn) { pFbCuuWWwwCCup_t fn = (pFbCuuWWwwCCup_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uintptr_t)fn(aligned_xcb, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint16_t)R_R8, (uint16_t)R_R9, *(int16_t*)(R_RSP + 8), *(int16_t*)(R_RSP + 16), *(uint8_t*)(R_RSP + 24), *(uint8_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(void**)(R_RSP + 48)); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void pFbuuuWWWWWWWW(x64emu_t *emu, uintptr_t fcn) { pFbuuuWWWWWWWW_t fn = (pFbuuuWWWWWWWW_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uintptr_t)fn(aligned_xcb, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint16_t)R_R8, (uint16_t)R_R9, *(uint16_t*)(R_RSP + 8), *(uint16_t*)(R_RSP + 16), *(uint16_t*)(R_RSP + 24), *(uint16_t*)(R_RSP + 32), *(uint16_t*)(R_RSP + 40), *(uint16_t*)(R_RSP + 48)); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
-void vFEpppppppiippp(x64emu_t *emu, uintptr_t fcn) { vFEpppppppiippp_t fn = (vFEpppppppiippp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)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**)(R_RSP + 40), *(void**)(R_RSP + 48)); }
+void vFEpppppppuippp(x64emu_t *emu, uintptr_t fcn) { vFEpppppppuippp_t fn = (vFEpppppppuippp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40), *(void**)(R_RSP + 48)); }
 void vFuiiiiiiiiiuup(x64emu_t *emu, uintptr_t fcn) { vFuiiiiiiiiiuup_t fn = (vFuiiiiiiiiiuup_t)fcn; fn((uint32_t)R_RDI, (int32_t)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), *(uint32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48), *(void**)(R_RSP + 56)); }
 void vFuuuuuuuuuuuuu(x64emu_t *emu, uintptr_t fcn) { vFuuuuuuuuuuuuu_t fn = (vFuuuuuuuuuuuuu_t)fcn; fn((uint32_t)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48), *(uint32_t*)(R_RSP + 56)); }
 void vFuUuuuuuuuuuuu(x64emu_t *emu, uintptr_t fcn) { vFuUuuuuuuuuuuu_t fn = (vFuUuuuuuuuuuuu_t)fcn; fn((uint32_t)R_RDI, (uint64_t)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), *(uint32_t*)(R_RSP + 40), *(uint32_t*)(R_RSP + 48), *(uint32_t*)(R_RSP + 56)); }
@@ -7804,7 +7804,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &IFppIII) return 1;
 	if (fun == &uFiuuuu) return 1;
 	if (fun == &uFiuppi) return 1;
-	if (fun == &uFipipp) return 1;
+	if (fun == &uFipupp) return 1;
 	if (fun == &uFipLpp) return 1;
 	if (fun == &uFuiiii) return 1;
 	if (fun == &uFLpppL) return 1;
@@ -8185,6 +8185,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpppppu) return 1;
 	if (fun == &iFpppppL) return 1;
 	if (fun == &iFpppppp) return 1;
+	if (fun == &uFipuppp) return 1;
 	if (fun == &uFuuuuuu) return 1;
 	if (fun == &uFupuufp) return 2;
 	if (fun == &uFuppppp) return 1;
@@ -8197,7 +8198,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpuuppp) return 1;
 	if (fun == &uFpupupu) return 1;
 	if (fun == &uFpupppp) return 1;
-	if (fun == &uFppippp) return 1;
 	if (fun == &uFppuuup) return 1;
 	if (fun == &uFppuupu) return 1;
 	if (fun == &uFppLpLp) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 14a0d02d..4db79127 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -1729,7 +1729,7 @@ void uFEpppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpppV(x64emu_t *emu, uintptr_t fnc);
 void uFiuuuu(x64emu_t *emu, uintptr_t fnc);
 void uFiuppi(x64emu_t *emu, uintptr_t fnc);
-void uFipipp(x64emu_t *emu, uintptr_t fnc);
+void uFipupp(x64emu_t *emu, uintptr_t fnc);
 void uFipLpp(x64emu_t *emu, uintptr_t fnc);
 void uFuiiii(x64emu_t *emu, uintptr_t fnc);
 void uFLpppL(x64emu_t *emu, uintptr_t fnc);
@@ -1895,11 +1895,11 @@ void vFEpiLpp(x64emu_t *emu, uintptr_t fnc);
 void vFEpippp(x64emu_t *emu, uintptr_t fnc);
 void vFEpuipp(x64emu_t *emu, uintptr_t fnc);
 void vFEpuipV(x64emu_t *emu, uintptr_t fnc);
+void vFEpuipA(x64emu_t *emu, uintptr_t fnc);
 void vFEpupup(x64emu_t *emu, uintptr_t fnc);
 void vFEpuppp(x64emu_t *emu, uintptr_t fnc);
 void vFEpLLpp(x64emu_t *emu, uintptr_t fnc);
 void vFEppipV(x64emu_t *emu, uintptr_t fnc);
-void vFEppipA(x64emu_t *emu, uintptr_t fnc);
 void vFEppupp(x64emu_t *emu, uintptr_t fnc);
 void vFEpppLp(x64emu_t *emu, uintptr_t fnc);
 void vFEppppp(x64emu_t *emu, uintptr_t fnc);
@@ -2192,6 +2192,7 @@ void uFEiuppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpippp(x64emu_t *emu, uintptr_t fnc);
 void uFEpCppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpuppp(x64emu_t *emu, uintptr_t fnc);
+void uFipuppp(x64emu_t *emu, uintptr_t fnc);
 void uFuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void uFupuufp(x64emu_t *emu, uintptr_t fnc);
 void uFuppppp(x64emu_t *emu, uintptr_t fnc);
@@ -2204,7 +2205,6 @@ void uFpuuupp(x64emu_t *emu, uintptr_t fnc);
 void uFpuuppp(x64emu_t *emu, uintptr_t fnc);
 void uFpupupu(x64emu_t *emu, uintptr_t fnc);
 void uFpupppp(x64emu_t *emu, uintptr_t fnc);
-void uFppippp(x64emu_t *emu, uintptr_t fnc);
 void uFppuuup(x64emu_t *emu, uintptr_t fnc);
 void uFppuupu(x64emu_t *emu, uintptr_t fnc);
 void uFppLpLp(x64emu_t *emu, uintptr_t fnc);
@@ -2234,6 +2234,8 @@ void LFpLLLLL(x64emu_t *emu, uintptr_t fnc);
 void LFppLLpL(x64emu_t *emu, uintptr_t fnc);
 void LFppLpLL(x64emu_t *emu, uintptr_t fnc);
 void LFSpLiip(x64emu_t *emu, uintptr_t fnc);
+void pFELpppV(x64emu_t *emu, uintptr_t fnc);
+void pFELpApp(x64emu_t *emu, uintptr_t fnc);
 void pFEpiupp(x64emu_t *emu, uintptr_t fnc);
 void pFEpippp(x64emu_t *emu, uintptr_t fnc);
 void pFEpuipp(x64emu_t *emu, uintptr_t fnc);
@@ -2245,8 +2247,6 @@ void pFEppLLp(x64emu_t *emu, uintptr_t fnc);
 void pFEpppLp(x64emu_t *emu, uintptr_t fnc);
 void pFEppppi(x64emu_t *emu, uintptr_t fnc);
 void pFEppppp(x64emu_t *emu, uintptr_t fnc);
-void pFEppppV(x64emu_t *emu, uintptr_t fnc);
-void pFEppApp(x64emu_t *emu, uintptr_t fnc);
 void pFiiiiii(x64emu_t *emu, uintptr_t fnc);
 void pFiiiiid(x64emu_t *emu, uintptr_t fnc);
 void pFipippp(x64emu_t *emu, uintptr_t fnc);
@@ -2316,8 +2316,8 @@ void iWpuiiii(x64emu_t *emu, uintptr_t fnc);
 void iWpppppi(x64emu_t *emu, uintptr_t fnc);
 void iWpppppu(x64emu_t *emu, uintptr_t fnc);
 void vFEpiiipp(x64emu_t *emu, uintptr_t fnc);
-void vFEpipppp(x64emu_t *emu, uintptr_t fnc);
 void vFEpuipuV(x64emu_t *emu, uintptr_t fnc);
+void vFEpupppp(x64emu_t *emu, uintptr_t fnc);
 void vFEppippp(x64emu_t *emu, uintptr_t fnc);
 void vFEpppLpp(x64emu_t *emu, uintptr_t fnc);
 void vFEppppup(x64emu_t *emu, uintptr_t fnc);
@@ -2396,6 +2396,7 @@ void vFpddiidd(x64emu_t *emu, uintptr_t fnc);
 void vFpdddddd(x64emu_t *emu, uintptr_t fnc);
 void vFpLiLiLp(x64emu_t *emu, uintptr_t fnc);
 void vFpLpiipi(x64emu_t *emu, uintptr_t fnc);
+void vFppcuupp(x64emu_t *emu, uintptr_t fnc);
 void vFppiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFppiiipi(x64emu_t *emu, uintptr_t fnc);
 void vFppiipuu(x64emu_t *emu, uintptr_t fnc);
@@ -2405,7 +2406,6 @@ void vFppiLiLp(x64emu_t *emu, uintptr_t fnc);
 void vFppipiip(x64emu_t *emu, uintptr_t fnc);
 void vFppipipp(x64emu_t *emu, uintptr_t fnc);
 void vFppipppp(x64emu_t *emu, uintptr_t fnc);
-void vFppCuupp(x64emu_t *emu, uintptr_t fnc);
 void vFppuiiip(x64emu_t *emu, uintptr_t fnc);
 void vFppuuuii(x64emu_t *emu, uintptr_t fnc);
 void vFppuupii(x64emu_t *emu, uintptr_t fnc);
@@ -2617,10 +2617,10 @@ void iWpuipupp(x64emu_t *emu, uintptr_t fnc);
 void iWpuuuppu(x64emu_t *emu, uintptr_t fnc);
 void iWpupuufu(x64emu_t *emu, uintptr_t fnc);
 void iWpppuppp(x64emu_t *emu, uintptr_t fnc);
-void vFEiippppV(x64emu_t *emu, uintptr_t fnc);
-void vFEiupippp(x64emu_t *emu, uintptr_t fnc);
-void vFEipAippp(x64emu_t *emu, uintptr_t fnc);
-void vFEppipppp(x64emu_t *emu, uintptr_t fnc);
+void vFELippppV(x64emu_t *emu, uintptr_t fnc);
+void vFELupippp(x64emu_t *emu, uintptr_t fnc);
+void vFELpAippp(x64emu_t *emu, uintptr_t fnc);
+void vFEppupppp(x64emu_t *emu, uintptr_t fnc);
 void vFEppLippp(x64emu_t *emu, uintptr_t fnc);
 void vFEppLpLpp(x64emu_t *emu, uintptr_t fnc);
 void vFEpppippp(x64emu_t *emu, uintptr_t fnc);
@@ -2751,9 +2751,9 @@ void iFpppppppp(x64emu_t *emu, uintptr_t fnc);
 void iFbWWipppp(x64emu_t *emu, uintptr_t fnc);
 void iFbupppWWu(x64emu_t *emu, uintptr_t fnc);
 void CFuiifpppp(x64emu_t *emu, uintptr_t fnc);
-void uFEipipppp(x64emu_t *emu, uintptr_t fnc);
+void uFEipupppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpiupppp(x64emu_t *emu, uintptr_t fnc);
-void uFEppipppp(x64emu_t *emu, uintptr_t fnc);
+void uFEppupppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpppuppp(x64emu_t *emu, uintptr_t fnc);
 void uFEppppppp(x64emu_t *emu, uintptr_t fnc);
 void uFuipppppp(x64emu_t *emu, uintptr_t fnc);
@@ -2815,8 +2815,8 @@ void vFEpiiiuipp(x64emu_t *emu, uintptr_t fnc);
 void vFEpippippV(x64emu_t *emu, uintptr_t fnc);
 void vFEpippippA(x64emu_t *emu, uintptr_t fnc);
 void vFEpuuuippp(x64emu_t *emu, uintptr_t fnc);
-void vFEppiipppp(x64emu_t *emu, uintptr_t fnc);
-void vFEpppiippp(x64emu_t *emu, uintptr_t fnc);
+void vFEppuipppp(x64emu_t *emu, uintptr_t fnc);
+void vFEpppuippp(x64emu_t *emu, uintptr_t fnc);
 void vFEpppLLpLp(x64emu_t *emu, uintptr_t fnc);
 void vFEppppippp(x64emu_t *emu, uintptr_t fnc);
 void vFiiiiiiiii(x64emu_t *emu, uintptr_t fnc);
@@ -2912,7 +2912,7 @@ void iFpppppLupp(x64emu_t *emu, uintptr_t fnc);
 void iFppppppupp(x64emu_t *emu, uintptr_t fnc);
 void iFppppppppu(x64emu_t *emu, uintptr_t fnc);
 void iFppppppppp(x64emu_t *emu, uintptr_t fnc);
-void uFEipippppp(x64emu_t *emu, uintptr_t fnc);
+void uFEipuppppp(x64emu_t *emu, uintptr_t fnc);
 void uFEpppufppp(x64emu_t *emu, uintptr_t fnc);
 void uFuulpiuiuf(x64emu_t *emu, uintptr_t fnc);
 void uFpuupuppuu(x64emu_t *emu, uintptr_t fnc);
@@ -2946,9 +2946,9 @@ void iWEpuuuiipp(x64emu_t *emu, uintptr_t fnc);
 void iWpiuuupipu(x64emu_t *emu, uintptr_t fnc);
 void iWpuiuuipip(x64emu_t *emu, uintptr_t fnc);
 void iWppppupiii(x64emu_t *emu, uintptr_t fnc);
-void vFEiippppppp(x64emu_t *emu, uintptr_t fnc);
-void vFEpippppppp(x64emu_t *emu, uintptr_t fnc);
-void vFEpppiipppp(x64emu_t *emu, uintptr_t fnc);
+void vFEiuppppppp(x64emu_t *emu, uintptr_t fnc);
+void vFEpuppppppp(x64emu_t *emu, uintptr_t fnc);
+void vFEpppuipppp(x64emu_t *emu, uintptr_t fnc);
 void vFEpppLuLpLp(x64emu_t *emu, uintptr_t fnc);
 void vFiiiiiiiiii(x64emu_t *emu, uintptr_t fnc);
 void vFiiiiiiiiiu(x64emu_t *emu, uintptr_t fnc);
@@ -3003,7 +3003,7 @@ void iFpppppppppu(x64emu_t *emu, uintptr_t fnc);
 void uFpddpippppp(x64emu_t *emu, uintptr_t fnc);
 void uFpppppppppp(x64emu_t *emu, uintptr_t fnc);
 void lFpLppdddddd(x64emu_t *emu, uintptr_t fnc);
-void pFEiippppppp(x64emu_t *emu, uintptr_t fnc);
+void pFEiuppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFEpiiiiiipp(x64emu_t *emu, uintptr_t fnc);
 void pFEpippppppp(x64emu_t *emu, uintptr_t fnc);
 void pFpupLLLLLpp(x64emu_t *emu, uintptr_t fnc);
@@ -3068,7 +3068,7 @@ void iFpppppiiuupp(x64emu_t *emu, uintptr_t fnc);
 void uFEpLiupppLuV(x64emu_t *emu, uintptr_t fnc);
 void uFEpLippppLup(x64emu_t *emu, uintptr_t fnc);
 void uFEpLippppLuA(x64emu_t *emu, uintptr_t fnc);
-void uFEppppppippp(x64emu_t *emu, uintptr_t fnc);
+void uFEppppppuppp(x64emu_t *emu, uintptr_t fnc);
 void uFppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFEpipppppppi(x64emu_t *emu, uintptr_t fnc);
 void pFEppiiLpppip(x64emu_t *emu, uintptr_t fnc);
@@ -3112,7 +3112,7 @@ void pFppuuppppuppp(x64emu_t *emu, uintptr_t fnc);
 void pFpppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFbCuuWWwwCCup(x64emu_t *emu, uintptr_t fnc);
 void pFbuuuWWWWWWWW(x64emu_t *emu, uintptr_t fnc);
-void vFEpppppppiippp(x64emu_t *emu, uintptr_t fnc);
+void vFEpppppppuippp(x64emu_t *emu, uintptr_t fnc);
 void vFuiiiiiiiiiuup(x64emu_t *emu, uintptr_t fnc);
 void vFuuuuuuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
 void vFuUuuuuuuuuuuu(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedgio2.c b/src/wrapped/wrappedgio2.c
index 638bc14c..5d7ec5a5 100644
--- a/src/wrapped/wrappedgio2.c
+++ b/src/wrapped/wrappedgio2.c
@@ -383,27 +383,27 @@ EXPORT void my_g_task_return_pointer(x64emu_t* emu, void* task, void* result, vo
     my->g_task_return_pointer(task, result, findGDestroyNotifyFct(destroy));
 }
 
-EXPORT void my_g_dbus_proxy_new(x64emu_t* emu, void* connection, int flags, void* info, void* name, void* path, void* interface, void* cancellable, void* cb, void* data)
+EXPORT void my_g_dbus_proxy_new(x64emu_t* emu, void* connection, uint32_t flags, void* info, void* name, void* path, void* interface, void* cancellable, void* cb, void* data)
 {
     my->g_dbus_proxy_new(connection, flags, info, name, path, interface, cancellable, findGAsyncReadyCallbackFct(cb), data);
 }
 
-EXPORT void my_g_dbus_proxy_new_for_bus(x64emu_t* emu, int bus_type, int flags, void* info, void* name, void* path, void* interface, void* cancellable, void* cb, void* data)
+EXPORT void my_g_dbus_proxy_new_for_bus(x64emu_t* emu, int bus_type, uint32_t flags, void* info, void* name, void* path, void* interface, void* cancellable, void* cb, void* data)
 {
     my->g_dbus_proxy_new_for_bus(bus_type, flags, info, name, path, interface, cancellable, findGAsyncReadyCallbackFct(cb), data);
 }
 
-EXPORT void my_g_dbus_proxy_call(x64emu_t* emu, void* proxy, void* name, void* param, int flags, int timeout, void* cancellable, void* cb, void* data)
+EXPORT void my_g_dbus_proxy_call(x64emu_t* emu, void* proxy, void* name, void* param, uint32_t flags, int timeout, void* cancellable, void* cb, void* data)
 {
     my->g_dbus_proxy_call(proxy, name, param, flags, timeout, cancellable, findGAsyncReadyCallbackFct(cb), data);
 }
 
-EXPORT void my_g_dbus_proxy_call_with_unix_fd_list(x64emu_t* emu, void* proxy, void* name, void* param, int flags, int timeout, void* fd_list, void* cancellable, void* cb, void* data)
+EXPORT void my_g_dbus_proxy_call_with_unix_fd_list(x64emu_t* emu, void* proxy, void* name, void* param, uint32_t flags, int timeout, void* fd_list, void* cancellable, void* cb, void* data)
 {
     my->g_dbus_proxy_call_with_unix_fd_list(proxy, name, param, flags, timeout, fd_list, cancellable, findGAsyncReadyCallbackFct(cb), data);
 }
 
-EXPORT void* my_g_dbus_object_manager_client_new_for_bus_sync(x64emu_t* emu, size_t bus, int flags, void* name, void* path, void* cb, void* data, void* destroy, void* cancellable, void* error)
+EXPORT void* my_g_dbus_object_manager_client_new_for_bus_sync(x64emu_t* emu, size_t bus, uint32_t flags, void* name, void* path, void* cb, void* data, void* destroy, void* cancellable, void* error)
 {
     return my->g_dbus_object_manager_client_new_for_bus_sync(bus, flags, name, path, findGDBusProxyTypeFuncFct(cb), data, findGDestroyNotifyFct(destroy), cancellable, error);
 }
@@ -498,12 +498,12 @@ EXPORT void my_g_bus_get(x64emu_t* emu, size_t type, void* cancellable, void* cb
     my->g_bus_get(type, cancellable, findGAsyncReadyCallbackFct(cb), data);
 }
 
-EXPORT void my_g_dbus_connection_new(x64emu_t* emu, void* stream, void* guid, int flags, void* observer, void* cancellable, void* cb, void* data)
+EXPORT void my_g_dbus_connection_new(x64emu_t* emu, void* stream, void* guid, uint32_t flags, void* observer, void* cancellable, void* cb, void* data)
 {
     my->g_dbus_connection_new(stream, guid, flags, observer, cancellable, findGAsyncReadyCallbackFct(cb), data);
 }
 
-EXPORT void my_g_dbus_connection_new_for_address(x64emu_t* emu, void* address, int flags, void* observer, void* cancellable, void* cb, void* data)
+EXPORT void my_g_dbus_connection_new_for_address(x64emu_t* emu, void* address, uint32_t flags, void* observer, void* cancellable, void* cb, void* data)
 {
     my->g_dbus_connection_new_for_address(address, flags, observer, cancellable, findGAsyncReadyCallbackFct(cb), data);
 }
@@ -518,17 +518,17 @@ EXPORT void my_g_dbus_connection_flush(x64emu_t* emu, void* connection, void* ca
     my->g_dbus_connection_flush(connection, cancellable, findGAsyncReadyCallbackFct(cb), data);
 }
 
-EXPORT void my_g_dbus_connection_call(x64emu_t* emu, void* connection, void* bus, void* object, void* interface, void* method, void* param, void* reply, int flags, int timeout, void* cancellable, void* cb, void* data)
+EXPORT void my_g_dbus_connection_call(x64emu_t* emu, void* connection, void* bus, void* object, void* interface, void* method, void* param, void* reply, uint32_t flags, int timeout, void* cancellable, void* cb, void* data)
 {
     my->g_dbus_connection_call(connection, bus, object, interface, method, param, reply, flags, timeout, cancellable, findGAsyncReadyCallbackFct(cb), data);
 }
 
-EXPORT uint32_t my_g_dbus_connection_signal_subscribe(x64emu_t* emu, void* connection, void* sender, void* interface, void* member, void* object, void* arg0, int flags, void* cb, void* data, void* notify)
+EXPORT uint32_t my_g_dbus_connection_signal_subscribe(x64emu_t* emu, void* connection, void* sender, void* interface, void* member, void* object, void* arg0, uint32_t flags, void* cb, void* data, void* notify)
 {
     return my->g_dbus_connection_signal_subscribe(connection, sender, interface, member, object, arg0, flags, findGDBusSignalCallbackFct(cb), data, findGDestroyNotifyFct(notify));
 }
 
-EXPORT void my_g_dbus_connection_send_message_with_reply(x64emu_t* emu, void* connection, void* message, int flags, int timeout, void* serial, void* cancellable, void* cb, void* data)
+EXPORT void my_g_dbus_connection_send_message_with_reply(x64emu_t* emu, void* connection, void* message, uint32_t flags, int timeout, void* serial, void* cancellable, void* cb, void* data)
 {
     my->g_dbus_connection_send_message_with_reply(connection, message, flags, timeout, serial, cancellable, findGAsyncReadyCallbackFct(cb), data);
 }
@@ -543,27 +543,27 @@ EXPORT uint32_t my_g_dbus_connection_register_object(x64emu_t* emu, void* connec
     return my->g_dbus_connection_register_object(connection, object, info, findFreeGDBusInterfaceVTable(vtable), data, findGDestroyNotifyFct(notify), error);
 }
 
-EXPORT uint32_t my_g_bus_watch_name(x64emu_t* emu, size_t type, void* name, int flags, void* appeared, void* vanished, void* data, void* notify)
+EXPORT uint32_t my_g_bus_watch_name(x64emu_t* emu, int type, void* name, uint32_t flags, void* appeared, void* vanished, void* data, void* notify)
 {
     return my->g_bus_watch_name(type, name, flags, findGBusNameAppearedCallbackFct(appeared), findGBusNameVanishedCallbackFct(vanished), data, findGDestroyNotifyFct(notify));
 }
 
-EXPORT uint32_t my_g_bus_watch_name_on_connection(x64emu_t* emu, void* connection, void* name, int flags, void* appeared, void* vanished, void* data, void* notify)
+EXPORT uint32_t my_g_bus_watch_name_on_connection(x64emu_t* emu, void* connection, void* name, uint32_t flags, void* appeared, void* vanished, void* data, void* notify)
 {
     return my->g_bus_watch_name_on_connection(connection, name, flags, findGBusNameAppearedCallbackFct(appeared), findGBusNameVanishedCallbackFct(vanished), data, findGDestroyNotifyFct(notify));
 }
 
-EXPORT uint32_t my_g_bus_own_name(x64emu_t* emu, size_t type, void* name, int flags, void* bus_acquired, void* name_acquired, void* name_lost, void* data, void* notify)
+EXPORT uint32_t my_g_bus_own_name(x64emu_t* emu, size_t type, void* name, uint32_t flags, void* bus_acquired, void* name_acquired, void* name_lost, void* data, void* notify)
 {
     return my->g_bus_own_name(type, name, flags, findGBusAcquiredCallbackFct(bus_acquired), findGBusNameAcquiredCallbackFct(name_acquired), findGBusNameLostCallbackFct(name_lost), data, findGDestroyNotifyFct(notify));
 }
 
-EXPORT uint32_t my_g_bus_own_name_on_connection(x64emu_t* emu, void* connection, void* name, int flags, void* name_acquired, void* name_lost, void* data, void* notify)
+EXPORT uint32_t my_g_bus_own_name_on_connection(x64emu_t* emu, void* connection, void* name, uint32_t flags, void* name_acquired, void* name_lost, void* data, void* notify)
 {
     return my->g_bus_own_name_on_connection(connection, name, flags, findGBusNameAcquiredCallbackFct(name_acquired), findGBusNameLostCallbackFct(name_lost), data, findGDestroyNotifyFct(notify));
 }
 
-EXPORT void my_g_simple_async_result_set_error_va(x64emu_t* emu, void* simple, void* domain, int code, void* fmt, x64_va_list_t V)
+EXPORT void my_g_simple_async_result_set_error_va(x64emu_t* emu, void* simple, uint32_t domain, int code, void* fmt, x64_va_list_t V)
 {
     #ifdef CONVERT_VALIST
     CONVERT_VALIST(V);
@@ -573,14 +573,14 @@ EXPORT void my_g_simple_async_result_set_error_va(x64emu_t* emu, void* simple, v
     my->g_simple_async_result_set_error_va(simple, domain, code, fmt, VARARGS);
 }
 
-EXPORT void my_g_simple_async_result_set_error(x64emu_t* emu, void* simple, void* domain, int code, void* fmt, uintptr_t* b)
+EXPORT void my_g_simple_async_result_set_error(x64emu_t* emu, void* simple, uint32_t domain, int code, void* fmt, uintptr_t* b)
 {
     myStackAlign(emu, fmt, b, emu->scratch, R_EAX, 4);
     PREPARE_VALIST;
     my->g_simple_async_result_set_error_va(simple, domain, code, fmt, VARARGS);
 }
 
-EXPORT void* my_g_initable_new(x64emu_t* emu, void* type, void* cancel, void* err, void* first, uintptr_t* b)
+EXPORT void* my_g_initable_new(x64emu_t* emu, size_t type, void* cancel, void* err, void* first, uintptr_t* b)
 {
     #if 0
     // look for number of pairs
@@ -601,7 +601,7 @@ EXPORT void* my_g_initable_new(x64emu_t* emu, void* type, void* cancel, void* er
     return my->g_initable_new_valist(type, first, VARARGS, cancel, err);
 }
 
-EXPORT void* my_g_initable_new_valist(x64emu_t* emu, void* type, void* first, x64_va_list_t V, void* cancel, void* err)
+EXPORT void* my_g_initable_new_valist(x64emu_t* emu, size_t type, void* first, x64_va_list_t V, void* cancel, void* err)
 {
     #ifdef CONVERT_VALIST
     CONVERT_VALIST(V);
diff --git a/src/wrapped/wrappedgio2_private.h b/src/wrapped/wrappedgio2_private.h
index 22f92831..a3f52235 100644
--- a/src/wrapped/wrappedgio2_private.h
+++ b/src/wrapped/wrappedgio2_private.h
@@ -1,17 +1,17 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 //GO(_fini, 
 GO(g_action_activate, vFpp)
-//GO(g_action_change_state, 
+GO(g_action_change_state, vFpp)
 GO(g_action_get_enabled, iFp)
 GO(g_action_get_name, pFp)
-//GO(g_action_get_parameter_type, 
+GO(g_action_get_parameter_type, pFp)
 GO(g_action_get_state, pFp)
-//GO(g_action_get_state_hint, 
+GO(g_action_get_state_hint, pFp)
 GO(g_action_get_state_type, pFp)
-//GO(g_action_get_type, 
+GO(g_action_get_type, LFv)
 GO(g_action_group_action_added, vFpp)
 GO(g_action_group_action_enabled_changed, vFppi)
 GO(g_action_group_action_removed, vFpp)
@@ -29,10 +29,10 @@ GO(g_action_group_list_actions, pFp)
 GO(g_action_group_query_action, iFppppppp)
 GO(g_action_map_add_action, vFpp)
 GO(g_action_map_add_action_entries, vFppip)
-//GO(g_action_map_get_type, 
+GO(g_action_map_get_type, LFv)
 GO(g_action_map_lookup_action, pFpp)
 GO(g_action_map_remove_action, vFpp)
-//GO(g_action_name_is_valid, 
+GO(g_action_name_is_valid, iFp)
 GO(g_action_parse_detailed_name, iFpppp)
 GO(g_action_print_detailed_name, pFpp)
 GO(g_app_info_add_supports_type, iFppp)
@@ -71,16 +71,16 @@ GO(g_app_info_set_as_last_used_for_type, iFppp)
 GO(g_app_info_should_show, iFp)
 GO(g_app_info_supports_files, iFp)
 GO(g_app_info_supports_uris, iFp)
-//GO(g_app_launch_context_get_display, 
+GO(g_app_launch_context_get_display, pFppp)
 GO(g_app_launch_context_get_environment, pFp)
 GO(g_app_launch_context_get_startup_notify_id, pFppp)
 GO(g_app_launch_context_get_type, LFv)
 GO(g_app_launch_context_launch_failed, vFpp)
 GO(g_app_launch_context_new, pFv)
 GO(g_app_launch_context_setenv, vFppp)
-//GO(g_app_launch_context_unsetenv, 
+GO(g_app_launch_context_unsetenv, vFpp)
 GO(g_application_activate, vFp)
-GO(g_application_add_main_option, vFppCuupp)
+GO(g_application_add_main_option, vFppcuupp)
 GO(g_application_add_main_option_entries, vFpp)
 GO(g_application_add_option_group, vFpp)
 GO(g_application_command_line_create_file_for_arg, pFpp)
@@ -93,24 +93,24 @@ GO(g_application_command_line_get_is_remote, iFp)
 GO(g_application_command_line_get_options_dict, pFp)
 GO(g_application_command_line_get_platform_data, pFp)
 GO(g_application_command_line_get_stdin, pFp)
-//GO(g_application_command_line_get_type, 
-//GO(g_application_command_line_print, 
-//GO(g_application_command_line_printerr, 
+GO(g_application_command_line_get_type, LFv)
+//GOM(g_application_command_line_print, vFppV)
+//GOM(g_application_command_line_printerr, vFppV)
 GO(g_application_command_line_set_exit_status, vFpi)
-//GO(g_application_flags_get_type, 
-//GO(g_application_get_application_id, 
+GO(g_application_flags_get_type, LFv)
+GO(g_application_get_application_id, pFp)
 GO(g_application_get_dbus_connection, pFp)
-//GO(g_application_get_dbus_object_path, 
+GO(g_application_get_dbus_object_path, pFp)
 GO(g_application_get_default, pFv)
 GO(g_application_get_flags, uFp)
 GO(g_application_get_inactivity_timeout, uFp)
-//GO(g_application_get_is_registered, 
-//GO(g_application_get_is_remote, 
+GO(g_application_get_is_registered, iFp)
+GO(g_application_get_is_remote, iFp)
 GO(g_application_get_resource_base_path, pFp)
 GO(g_application_get_type, LFv)
-//GO(g_application_hold, 
-//GO(g_application_id_is_valid, 
-//GO(g_application_mark_busy, 
+GO(g_application_hold, vFp)
+GO(g_application_id_is_valid, iFp)
+GO(g_application_mark_busy, vFp)
 GO(g_application_new, pFpu)
 GO(g_application_open, vFppip)
 GO(g_application_quit, vFp)
@@ -119,32 +119,32 @@ GO(g_application_release, vFp)
 GO(g_application_run, iFpip)
 GO(g_application_send_notification, vFppp)
 GO(g_application_set_action_group, vFpp)
-//GO(g_application_set_application_id, 
-//GO(g_application_set_default, 
+GO(g_application_set_application_id, vFpp)
+GO(g_application_set_default, vFp)
 GO(g_application_set_flags, vFpu)
 GO(g_application_set_inactivity_timeout, vFpu)
-//GO(g_application_set_resource_base_path, 
-//GO(g_application_unmark_busy, 
+GO(g_application_set_resource_base_path, vFpp)
+GO(g_application_unmark_busy, vFp)
 GO(g_application_withdraw_notification, vFpp)
-//GO(g_ask_password_flags_get_type, 
+GO(g_ask_password_flags_get_type, LFv)
 GO(g_async_initable_get_type, LFv)
 GOM(g_async_initable_init_async, vFEpippp)
 GO(g_async_initable_init_finish, iFppp)
-GOM(g_async_initable_new_async, vFEiippppV)
+GOM(g_async_initable_new_async, vFELippppV)
 GO(g_async_initable_new_finish, pFppp)
-GOM(g_async_initable_new_valist_async, vFEipAippp)
-GOM(g_async_initable_newv_async, vFEiupippp)
+GOM(g_async_initable_new_valist_async, vFELpAippp)
+GOM(g_async_initable_newv_async, vFELupippp)
 GO(g_async_result_get_source_object, pFp)
 GO(g_async_result_get_type, LFv)
 GO(g_async_result_get_user_data, pFp)
 GO(g_async_result_is_tagged, iFpp)
-//GO(g_async_result_legacy_propagate_error, 
+GO(g_async_result_legacy_propagate_error, iFpp)
 GO(g_buffered_input_stream_fill, lFplpp)
-//GO(g_buffered_input_stream_fill_async, 
+//GOM(g_buffered_input_stream_fill_async, vFplippp)
 GO(g_buffered_input_stream_fill_finish, lFppp)
 GO(g_buffered_input_stream_get_available, LFp)
-//GO(g_buffered_input_stream_get_buffer_size, 
-//GO(g_buffered_input_stream_get_type, 
+GO(g_buffered_input_stream_get_buffer_size, LFp)
+GO(g_buffered_input_stream_get_type, LFv)
 GO(g_buffered_input_stream_new, pFp)
 GO(g_buffered_input_stream_new_sized, pFpL)
 GO(g_buffered_input_stream_peek, LFppLL)
@@ -153,7 +153,7 @@ GO(g_buffered_input_stream_read_byte, iFppp)
 GO(g_buffered_input_stream_set_buffer_size, vFpL)
 GO(g_buffered_output_stream_get_auto_grow, iFp)
 GO(g_buffered_output_stream_get_buffer_size, LFp)
-//GO(g_buffered_output_stream_get_type, 
+GO(g_buffered_output_stream_get_type, LFv)
 GO(g_buffered_output_stream_new, pFp)
 GO(g_buffered_output_stream_new_sized, pFpL)
 GO(g_buffered_output_stream_set_auto_grow, vFpi)
@@ -163,19 +163,19 @@ GO(g_bus_get_finish, pFpp)
 GO(g_bus_get_sync, pFipp)
 GO(g_bus_name_owner_flags_get_type, LFv)
 GO(g_bus_name_watcher_flags_get_type, LFv)
-GOM(g_bus_own_name, uFEipippppp)
-GOM(g_bus_own_name_on_connection, uFEppipppp)
-GO(g_bus_own_name_on_connection_with_closures, uFppipp)
-GO(g_bus_own_name_with_closures, uFppippp)
+GOM(g_bus_own_name, uFEipuppppp)
+GOM(g_bus_own_name_on_connection, uFEppupppp)
+GO(g_bus_own_name_on_connection_with_closures, uFppupp)
+GO(g_bus_own_name_with_closures, uFipuppp)
 GO(g_bus_type_get_type, LFv)
 GO(g_bus_unown_name, vFu)
 GO(g_bus_unwatch_name, vFu)
-GOM(g_bus_watch_name, uFEipipppp)
-GOM(g_bus_watch_name_on_connection, uFEppipppp)
-GO(g_bus_watch_name_on_connection_with_closures, uFppipp)   // mmm closure, wrapped or unwrapped?
-GO(g_bus_watch_name_with_closures, uFipipp)
+GOM(g_bus_watch_name, uFEipupppp)
+GOM(g_bus_watch_name_on_connection, uFEppupppp)
+GO(g_bus_watch_name_on_connection_with_closures, uFppupp)   // mmm closure, wrapped or unwrapped?
+GO(g_bus_watch_name_with_closures, uFipupp)
 GO(g_bytes_icon_get_bytes, pFp)
-//GO(g_bytes_icon_get_type, 
+GO(g_bytes_icon_get_type, LFv)
 GO(g_bytes_icon_new, pFp)
 GO(g_cancellable_cancel, vFp)
 GOM(g_cancellable_connect, LFEpppp)
@@ -211,18 +211,18 @@ GO(g_content_type_is_a, iFpp)
 GO(g_content_type_is_unknown, iFp)
 GO(g_content_types_get_registered, pFv)
 GO(g_converter_convert, uFppLpLuppp)
-//GO(g_converter_flags_get_type, 
-//GO(g_converter_get_type, 
+GO(g_converter_flags_get_type, LFv)
+GO(g_converter_get_type, LFv)
 GO(g_converter_input_stream_get_converter, pFp)
-//GO(g_converter_input_stream_get_type, 
+GO(g_converter_input_stream_get_type, LFv)
 GO(g_converter_input_stream_new, pFpp)
 GO(g_converter_output_stream_get_converter, pFp)
-//GO(g_converter_output_stream_get_type, 
+GO(g_converter_output_stream_get_type, LFv)
 GO(g_converter_output_stream_new, pFpp)
-//GO(g_converter_reset, 
-//GO(g_converter_result_get_type, 
+GO(g_converter_reset, vFp)
+GO(g_converter_result_get_type, LFv)
 GO(g_credentials_get_native, pFpu)
-//GO(g_credentials_get_type, 
+GO(g_credentials_get_type, LFv)
 GO(g_credentials_get_unix_pid, iFpp)
 GO(g_credentials_get_unix_user, uFpp)
 GO(g_credentials_is_same_user, iFppp)
@@ -230,33 +230,33 @@ GO(g_credentials_new, pFv)
 GO(g_credentials_set_native, vFpup)
 GO(g_credentials_set_unix_user, iFpup)
 GO(g_credentials_to_string, pFp)
-//GO(g_credentials_type_get_type, 
+GO(g_credentials_type_get_type, LFv)
 GO(g_data_input_stream_get_byte_order, uFp)
 GO(g_data_input_stream_get_newline_type, uFp)
-//GO(g_data_input_stream_get_type, 
+GO(g_data_input_stream_get_type, LFv)
 GO(g_data_input_stream_new, pFp)
 GO(g_data_input_stream_read_byte, CFppp)
 GO(g_data_input_stream_read_int16, wFppp)
 GO(g_data_input_stream_read_int32, iFppp)
 GO(g_data_input_stream_read_int64, lFppp)
-//GO(g_data_input_stream_read_line, 
-//GO(g_data_input_stream_read_line_async, 
-//GO(g_data_input_stream_read_line_finish, 
-//GO(g_data_input_stream_read_line_finish_utf8, 
+GO(g_data_input_stream_read_line, pFpppp)
+//GOM(g_data_input_stream_read_line_async, vFpippp)
+GO(g_data_input_stream_read_line_finish, pFpppp)
+GO(g_data_input_stream_read_line_finish_utf8, pFpppp)
 GO(g_data_input_stream_read_line_utf8, pFpppp)
 GO(g_data_input_stream_read_uint16, WFppp)
 GO(g_data_input_stream_read_uint32, uFppp)
 GO(g_data_input_stream_read_uint64, LFppp)
 GO(g_data_input_stream_read_until, pFppppp)
-//GO(g_data_input_stream_read_until_async, 
-//GO(g_data_input_stream_read_until_finish, 
+//GOM(g_data_input_stream_read_until_async, vFppippp)
+GO(g_data_input_stream_read_until_finish, pFpppp)
 GO(g_data_input_stream_read_upto, pFpplppp)
-//GO(g_data_input_stream_read_upto_async, 
+//GOM(g_data_input_stream_read_upto_async, vFpplippp)
 GO(g_data_input_stream_read_upto_finish, pFpppp)
 GO(g_data_input_stream_set_byte_order, vFpu)
 GO(g_data_input_stream_set_newline_type, vFpu)
 GO(g_data_output_stream_get_byte_order, uFp)
-//GO(g_data_output_stream_get_type, 
+GO(g_data_output_stream_get_type, LFv)
 GO(g_data_output_stream_new, pFp)
 GO(g_data_output_stream_put_byte, iFpCpp)
 GO(g_data_output_stream_put_int16, iFpwpp)
@@ -267,13 +267,13 @@ GO(g_data_output_stream_put_uint16, iFpWpp)
 GO(g_data_output_stream_put_uint32, iFpupp)
 GO(g_data_output_stream_put_uint64, iFpLpp)
 GO(g_data_output_stream_set_byte_order, vFpu)
-//GO(g_data_stream_byte_order_get_type, 
-//GO(g_data_stream_newline_type_get_type, 
+GO(g_data_stream_byte_order_get_type, LFv)
+GO(g_data_stream_newline_type_get_type, LFv)
 GO(g_dbus_action_group_get, pFppp)
-//GO(g_dbus_action_group_get_type, 
-//GO(g_dbus_address_escape_value, 
+GO(g_dbus_action_group_get_type, LFv)
+GO(g_dbus_address_escape_value, pFp)
 GO(g_dbus_address_get_for_bus_sync, pFipp)
-//GO(g_dbus_address_get_stream, 
+//GOM(g_dbus_address_get_stream, vFpppp)
 GO(g_dbus_address_get_stream_finish, pFppp)
 GO(g_dbus_address_get_stream_sync, pFpppp)
 GO(g_dbus_annotation_info_get_type, LFv)
@@ -285,15 +285,15 @@ GO(g_dbus_arg_info_ref, pFp)
 GO(g_dbus_arg_info_unref, vFp)
 GO(g_dbus_auth_observer_allow_mechanism, iFpp)
 GO(g_dbus_auth_observer_authorize_authenticated_peer, iFppp)
-//GO(g_dbus_auth_observer_get_type, 
+GO(g_dbus_auth_observer_get_type, LFv)
 GO(g_dbus_auth_observer_new, pFv)
 GO(g_dbus_call_flags_get_type, LFv)
 GO(g_dbus_capability_flags_get_type, LFv)
 GOM(g_dbus_connection_add_filter, uFEpppp)
-GOM(g_dbus_connection_call, vFEpppppppiippp)
+GOM(g_dbus_connection_call, vFEpppppppuippp)
 GO(g_dbus_connection_call_finish, pFppp)
 GO(g_dbus_connection_call_sync, pFpppppppuipp)
-//GO(g_dbus_connection_call_with_unix_fd_list, 
+//GOM(g_dbus_connection_call_with_unix_fd_list, vFpppppppuipppp)
 GO(g_dbus_connection_call_with_unix_fd_list_finish, pFpppp)
 GO(g_dbus_connection_call_with_unix_fd_list_sync, pFpppppppuipppp)
 GOM(g_dbus_connection_close, vFEpppp)
@@ -315,37 +315,37 @@ GO(g_dbus_connection_get_stream, pFp)
 GO(g_dbus_connection_get_type, LFv)
 GO(g_dbus_connection_get_unique_name, pFp)
 GO(g_dbus_connection_is_closed, iFp)
-GOM(g_dbus_connection_new, vFEppipppp)
+GOM(g_dbus_connection_new, vFEppupppp)
 GO(g_dbus_connection_new_finish, pFpp)
-GOM(g_dbus_connection_new_for_address, vFEpipppp)
+GOM(g_dbus_connection_new_for_address, vFEpupppp)
 GO(g_dbus_connection_new_for_address_finish, pFpp)
 GO(g_dbus_connection_new_for_address_sync, pFpuppp)
 GO(g_dbus_connection_new_sync, pFppuppp)
 GOM(g_dbus_connection_register_object, uFEppppppp)
-//GOM(g_dbus_connection_register_subtree, uFEppppppp)   // vtable need wrapping
+//GOM(g_dbus_connection_register_subtree, uFEpppuppp)   // vtable need wrapping
 GO(g_dbus_connection_remove_filter, vFpu)
 GO(g_dbus_connection_send_message, iFppupp)
-GOM(g_dbus_connection_send_message_with_reply, vFEppiipppp) //TODO: same volatile argument...
+GOM(g_dbus_connection_send_message_with_reply, vFEppuipppp) //TODO: same volatile argument...
 GO(g_dbus_connection_send_message_with_reply_finish, pFppp)
 GO(g_dbus_connection_send_message_with_reply_sync, pFppuippp)
 GO(g_dbus_connection_set_exit_on_close, vFpi)
-GOM(g_dbus_connection_signal_subscribe, uFEppppppippp)
+GOM(g_dbus_connection_signal_subscribe, uFEppppppuppp)
 GO(g_dbus_connection_signal_unsubscribe, vFpu)
 GO(g_dbus_connection_start_message_processing, vFp)
-//GO(g_dbus_connection_unexport_action_group, 
+GO(g_dbus_connection_unexport_action_group, vFpu)
 GO(g_dbus_connection_unexport_menu_model, vFpu)
 GO(g_dbus_connection_unregister_object, iFpu)
 GO(g_dbus_connection_unregister_subtree, iFpu)
 GO(g_dbus_error_encode_gerror, pFp)
-//GO(g_dbus_error_get_remote_error, 
-//GO(g_dbus_error_get_type, 
+GO(g_dbus_error_get_remote_error, pFp)
+GO(g_dbus_error_get_type, LFv)
 GO(g_dbus_error_is_remote_error, iFp)
 GO(g_dbus_error_new_for_dbus_error, pFpp)
 GO(g_dbus_error_quark, uFv)
-//GO(g_dbus_error_register_error, 
+GO(g_dbus_error_register_error, iFuip)
 GO(g_dbus_error_register_error_domain, vFpppu)
-//GO(g_dbus_error_set_dbus_error, 
-//GO(g_dbus_error_set_dbus_error_valist, 
+//GOM(g_dbus_error_set_dbus_error, vFppppV)
+//GOM(g_dbus_error_set_dbus_error_valist, vFppppA)
 GO(g_dbus_error_strip_remote_error, iFp)
 GO(g_dbus_error_unregister_error, iFuip)
 GO(g_dbus_generate_guid, pFv)
@@ -353,8 +353,8 @@ GO(g_dbus_gvalue_to_gvariant, pFpp)
 GO(g_dbus_gvariant_to_gvalue, vFpp)
 GO(g_dbus_interface_dup_object, pFp)
 GO(g_dbus_interface_get_info, pFp)
-//GO(g_dbus_interface_get_object, 
-//GO(g_dbus_interface_get_type, 
+GO(g_dbus_interface_get_object, pFp)
+GO(g_dbus_interface_get_type, LFv)
 GO(g_dbus_interface_info_cache_build, vFp)
 GO(g_dbus_interface_info_cache_release, vFp)
 GO(g_dbus_interface_info_generate_xml, vFpup)
@@ -366,19 +366,19 @@ GO(g_dbus_interface_info_ref, pFp)
 GO(g_dbus_interface_info_unref, vFp)
 GO(g_dbus_interface_set_object, vFpp)
 GO(g_dbus_interface_skeleton_export, iFpppp)
-//GO(g_dbus_interface_skeleton_flags_get_type, 
-//GO(g_dbus_interface_skeleton_flush, 
+GO(g_dbus_interface_skeleton_flags_get_type, LFv)
+GO(g_dbus_interface_skeleton_flush, vFp)
 GO(g_dbus_interface_skeleton_get_connection, pFp)
 GO(g_dbus_interface_skeleton_get_connections, pFp)
 GO(g_dbus_interface_skeleton_get_flags, uFp)
 GO(g_dbus_interface_skeleton_get_info, pFp)
 GO(g_dbus_interface_skeleton_get_object_path, pFp)
 GO(g_dbus_interface_skeleton_get_properties, pFp)
-//GO(g_dbus_interface_skeleton_get_type, 
-//GO(g_dbus_interface_skeleton_get_vtable, 
+GO(g_dbus_interface_skeleton_get_type, LFv)
+//GOM(g_dbus_interface_skeleton_get_vtable, pFp)
 GO(g_dbus_interface_skeleton_has_connection, iFpp)
 GO(g_dbus_interface_skeleton_set_flags, vFpu)
-//GO(g_dbus_interface_skeleton_unexport, 
+GO(g_dbus_interface_skeleton_unexport, vFp)
 GO(g_dbus_interface_skeleton_unexport_from_connection, vFpp)
 GO(g_dbus_is_address, iFp)
 GO(g_dbus_is_guid, iFp)
@@ -418,9 +418,9 @@ GO(g_dbus_message_lock, vFp)
 GO(g_dbus_message_new, pFv)
 GO(g_dbus_message_new_from_blob, pFpLup)
 GO(g_dbus_message_new_method_call, pFpppp)
-//GO2(g_dbus_message_new_method_error, pFpppV, g_dbus_message_new_method_error_valist)
+//GOM(g_dbus_message_new_method_error, pFpppV)
 GO(g_dbus_message_new_method_error_literal, pFppp)
-//GO(g_dbus_message_new_method_error_valist, pFpppp)
+//GOM(g_dbus_message_new_method_error_valist, pFpppA)
 GO(g_dbus_message_new_method_reply, pFp)
 GO(g_dbus_message_new_signal, pFppp)
 GO(g_dbus_message_print, pFpu)
@@ -458,9 +458,9 @@ GO(g_dbus_method_invocation_get_sender, pFp)
 GO(g_dbus_method_invocation_get_type, LFv)
 GO(g_dbus_method_invocation_get_user_data, pFp)
 GO(g_dbus_method_invocation_return_dbus_error, vFppp)
-//GO2(g_dbus_method_invocation_return_error, vFpuipV, g_dbus_method_invocation_return_error_valist)
+//GOM(g_dbus_method_invocation_return_error, vFpuipV)
 GO(g_dbus_method_invocation_return_error_literal, vFpuip)
-//GO(g_dbus_method_invocation_return_error_valist, vFpuipp)
+//GOM(g_dbus_method_invocation_return_error_valist, vFpuipA)
 GO(g_dbus_method_invocation_return_gerror, vFpp)
 GO(g_dbus_method_invocation_return_value, vFpp)
 GO(g_dbus_method_invocation_return_value_with_unix_fd_list, vFppp)
@@ -481,43 +481,43 @@ GO(g_dbus_object_manager_client_get_flags, uFp)
 GO(g_dbus_object_manager_client_get_name, pFp)
 GO(g_dbus_object_manager_client_get_name_owner, pFp)
 GO(g_dbus_object_manager_client_get_type, LFv)
-//GOM(g_dbus_object_manager_client_new, 
+//GOM(g_dbus_object_manager_client_new, vFpupppppppp)
 GO(g_dbus_object_manager_client_new_finish, pFpp)
-//GOM(g_dbus_object_manager_client_new_for_bus, 
+//GOM(g_dbus_object_manager_client_new_for_bus, vFiupppppppp)
 GO(g_dbus_object_manager_client_new_for_bus_finish, pFpp)
-GOM(g_dbus_object_manager_client_new_for_bus_sync, pFEiippppppp)
-//GOM(g_dbus_object_manager_client_new_sync, 
+GOM(g_dbus_object_manager_client_new_for_bus_sync, pFEiuppppppp)
+//GOM(g_dbus_object_manager_client_new_sync, pFpuppppppp)
 //GOM(g_dbus_object_manager_get_interface, pFEppp)  //struct GDBusObjectManagerIface is full of callbacks
 GO(g_dbus_object_manager_get_object, pFpp)
 GO(g_dbus_object_manager_get_object_path, pFp)
 GO(g_dbus_object_manager_get_objects, pFp)
-//GO(g_dbus_object_manager_get_type, 
-//GO(g_dbus_object_manager_server_export, 
+GO(g_dbus_object_manager_get_type, LFv)
+GO(g_dbus_object_manager_server_export, vFpp)
 GO(g_dbus_object_manager_server_export_uniquely, vFpp)
 GO(g_dbus_object_manager_server_get_connection, pFp)
-//GO(g_dbus_object_manager_server_get_type, 
+GO(g_dbus_object_manager_server_get_type, LFv)
 GO(g_dbus_object_manager_server_is_exported, iFpp)
 GO(g_dbus_object_manager_server_new, pFp)
 GO(g_dbus_object_manager_server_set_connection, vFpp)
 GO(g_dbus_object_manager_server_unexport, iFpp)
 GO(g_dbus_object_proxy_get_connection, pFp)
-//GO(g_dbus_object_proxy_get_type, 
+GO(g_dbus_object_proxy_get_type, LFv)
 GO(g_dbus_object_proxy_new, pFpp)
-//GO(g_dbus_object_skeleton_add_interface, 
-//GO(g_dbus_object_skeleton_flush, 
-//GO(g_dbus_object_skeleton_get_type, 
+GO(g_dbus_object_skeleton_add_interface, vFpp)
+GO(g_dbus_object_skeleton_flush, vFp)
+GO(g_dbus_object_skeleton_get_type, LFv)
 GO(g_dbus_object_skeleton_new, pFp)
 GO(g_dbus_object_skeleton_remove_interface, vFpp)
-//GO(g_dbus_object_skeleton_remove_interface_by_name, 
+GO(g_dbus_object_skeleton_remove_interface_by_name, vFpp)
 GO(g_dbus_object_skeleton_set_object_path, vFpp)
-//GO(g_dbus_property_info_flags_get_type, 
+GO(g_dbus_property_info_flags_get_type, LFv)
 GO(g_dbus_property_info_get_type, LFv)
 GO(g_dbus_property_info_ref, pFp)
 GO(g_dbus_property_info_unref, vFp)
-GOM(g_dbus_proxy_call, vFEpppiippp)
+GOM(g_dbus_proxy_call, vFEpppuippp)
 GO(g_dbus_proxy_call_finish, pFppp)
 GO(g_dbus_proxy_call_sync, pFpppuipp)
-GOM(g_dbus_proxy_call_with_unix_fd_list, vFEpppiipppp)
+GOM(g_dbus_proxy_call_with_unix_fd_list, vFEpppuipppp)
 GO(g_dbus_proxy_call_with_unix_fd_list_finish, pFpppp)
 GO(g_dbus_proxy_call_with_unix_fd_list_sync, pFpppuipppp)
 GO(g_dbus_proxy_flags_get_type, LFv)
@@ -532,159 +532,159 @@ GO(g_dbus_proxy_get_name, pFp)
 GO(g_dbus_proxy_get_name_owner, pFp)
 GO(g_dbus_proxy_get_object_path, pFp)
 GO(g_dbus_proxy_get_type, LFv)
-GOM(g_dbus_proxy_new, vFEpippppppp)
+GOM(g_dbus_proxy_new, vFEpuppppppp)
 GO(g_dbus_proxy_new_finish, pFpp)
-GOM(g_dbus_proxy_new_for_bus, vFEiippppppp)
+GOM(g_dbus_proxy_new_for_bus, vFEiuppppppp)
 GO(g_dbus_proxy_new_for_bus_finish, pFpp)
 GO(g_dbus_proxy_new_for_bus_sync, pFiupppppp)
 GO(g_dbus_proxy_new_sync, pFpupppppp)
 GO(g_dbus_proxy_set_cached_property, vFppp)
 GO(g_dbus_proxy_set_default_timeout, vFpi)
 GO(g_dbus_proxy_set_interface_info, vFpp)
-//GO(g_dbus_send_message_flags_get_type, 
-//GO(g_dbus_server_flags_get_type, 
-//GO(g_dbus_server_get_client_address, 
+GO(g_dbus_send_message_flags_get_type, LFv)
+GO(g_dbus_server_flags_get_type, LFv)
+GO(g_dbus_server_get_client_address, pFp)
 GO(g_dbus_server_get_flags, uFp)
 GO(g_dbus_server_get_guid, pFp)
-//GO(g_dbus_server_get_type, 
+GO(g_dbus_server_get_type, LFv)
 GO(g_dbus_server_is_active, iFp)
 GO(g_dbus_server_new_sync, pFpupppp)
-//GO(g_dbus_server_start, 
-//GO(g_dbus_server_stop, 
-//GO(g_dbus_signal_flags_get_type, 
+GO(g_dbus_server_start, vFp)
+GO(g_dbus_server_stop, vFp)
+GO(g_dbus_signal_flags_get_type, LFv)
 GO(g_dbus_signal_info_get_type, LFv)
 GO(g_dbus_signal_info_ref, pFp)
 GO(g_dbus_signal_info_unref, vFp)
 GO(g_dbus_subtree_flags_get_type, LFv)
-//GO(g_desktop_app_info_get_action_name, 
-//GO(g_desktop_app_info_get_boolean, 
+GO(g_desktop_app_info_get_action_name, pFpp)
+GO(g_desktop_app_info_get_boolean, iFpp)
 GO(g_desktop_app_info_get_categories, pFp)
 GO(g_desktop_app_info_get_filename, pFp)
 GO(g_desktop_app_info_get_generic_name, pFp)
-//GO(g_desktop_app_info_get_implementations, 
+GO(g_desktop_app_info_get_implementations, pFp)
 GO(g_desktop_app_info_get_is_hidden, iFp)
 GO(g_desktop_app_info_get_keywords, pFp)
 GO(g_desktop_app_info_get_nodisplay, iFp)
 GO(g_desktop_app_info_get_show_in, iFpp)
-//GO(g_desktop_app_info_get_startup_wm_class, 
+GO(g_desktop_app_info_get_startup_wm_class, pFp)
 GO(g_desktop_app_info_get_string, pFpp)
 GO(g_desktop_app_info_get_type, LFv)
-//GO(g_desktop_app_info_has_key, 
-//GO(g_desktop_app_info_launch_action, 
-//GO(g_desktop_app_info_launch_uris_as_manager, 
-//GO(g_desktop_app_info_list_actions, 
-//GO(g_desktop_app_info_lookup_get_default_for_uri_scheme, 
+GO(g_desktop_app_info_has_key, iFpp)
+GO(g_desktop_app_info_launch_action, vFppp)
+//GOM(g_desktop_app_info_launch_uris_as_manager, iFpppuppppp)
+GO(g_desktop_app_info_list_actions, pFp)
+GO(g_desktop_app_info_lookup_get_default_for_uri_scheme, pFpp)
 GO(g_desktop_app_info_lookup_get_type, LFv)
 GO(g_desktop_app_info_new, pFp)
 GO(g_desktop_app_info_new_from_filename, pFp)
 GO(g_desktop_app_info_new_from_keyfile, pFp)
-//GO(g_desktop_app_info_search, 
+GO(g_desktop_app_info_search, pFp)
 GO(g_desktop_app_info_set_desktop_env, vFp)
-//GO(g_drive_can_eject, 
-//GO(g_drive_can_poll_for_media, 
-//GO(g_drive_can_start, 
-//GO(g_drive_can_start_degraded, 
+GO(g_drive_can_eject, iFp)
+GO(g_drive_can_poll_for_media, iFp)
+GO(g_drive_can_start, iFp)
+GO(g_drive_can_start_degraded, iFp)
 GO(g_drive_can_stop, iFp)
-//GO(g_drive_eject, 
-//GO(g_drive_eject_finish, 
-//GO(g_drive_eject_with_operation, 
+//GOM(g_drive_eject, vFpuppp)
+GO(g_drive_eject_finish, iFppp)
+//GOM(g_drive_eject_with_operation, vFpupppp)
 GO(g_drive_eject_with_operation_finish, iFppp)
 GO(g_drive_enumerate_identifiers, pFp)
-//GO(g_drive_get_icon, 
+GO(g_drive_get_icon, pFp)
 GO(g_drive_get_identifier, pFpp)
 GO(g_drive_get_name, pFp)
 GO(g_drive_get_sort_key, pFp)
 GO(g_drive_get_start_stop_type, uFp)
 GO(g_drive_get_symbolic_icon, pFp)
-//GO(g_drive_get_type, 
+GO(g_drive_get_type, LFv)
 GO(g_drive_get_volumes, pFp)
-//GO(g_drive_has_media, 
-//GO(g_drive_has_volumes, 
-//GO(g_drive_is_media_check_automatic, 
-//GO(g_drive_is_media_removable, 
-//GO(g_drive_poll_for_media, 
-//GO(g_drive_poll_for_media_finish, 
-//GO(g_drive_start, 
-//GO(g_drive_start_finish, 
-//GO(g_drive_start_flags_get_type, 
-//GO(g_drive_start_stop_type_get_type, 
-//GO(g_drive_stop, 
-//GO(g_drive_stop_finish, 
+GO(g_drive_has_media, iFp)
+GO(g_drive_has_volumes, iFp)
+GO(g_drive_is_media_check_automatic, iFp)
+GO(g_drive_is_media_removable, iFp)
+//GOM(g_drive_poll_for_media, vFpppp)
+GO(g_drive_poll_for_media_finish, iFppp)
+//GOM(g_drive_start, vFpupppp)
+GO(g_drive_start_finish, iFppp)
+GO(g_drive_start_flags_get_type, LFv)
+GO(g_drive_start_stop_type_get_type, LFv)
+//GOM(g_drive_stop, vFpupppp)
+GO(g_drive_stop_finish, iFppp)
 GO(g_emblemed_icon_add_emblem, vFpp)
-//GO(g_emblemed_icon_clear_emblems, 
+GO(g_emblemed_icon_clear_emblems, vFp)
 GO(g_emblemed_icon_get_emblems, pFp)
 GO(g_emblemed_icon_get_icon, pFp)
-//GO(g_emblemed_icon_get_type, 
+GO(g_emblemed_icon_get_type, LFv)
 GO(g_emblemed_icon_new, pFpp)
 GO(g_emblem_get_icon, pFp)
 GO(g_emblem_get_origin, uFp)
-//GO(g_emblem_get_type, 
+GO(g_emblem_get_type, LFv)
 GO(g_emblem_new, pFp)
 GO(g_emblem_new_with_origin, pFpu)
-//GO(g_emblem_origin_get_type, 
-GO(g_file_append_to, pFpipp)
-//GOM(g_file_append_to_async, vFEpiipBp)
+GO(g_emblem_origin_get_type, LFv)
+GO(g_file_append_to, pFpupp)
+//GOM(g_file_append_to_async, vFEpuippp)
 GO(g_file_append_to_finish, pFppp)
-//GO(g_file_attribute_info_flags_get_type, 
+GO(g_file_attribute_info_flags_get_type, LFv)
 GO(g_file_attribute_info_list_add, vFppuu)
 GO(g_file_attribute_info_list_dup, pFp)
-//GO(g_file_attribute_info_list_get_type, 
+GO(g_file_attribute_info_list_get_type, LFv)
 GO(g_file_attribute_info_list_lookup, pFpp)
 GO(g_file_attribute_info_list_new, pFv)
-//GO(g_file_attribute_info_list_ref, 
-//GO(g_file_attribute_info_list_unref, 
+GO(g_file_attribute_info_list_ref, pFp)
+GO(g_file_attribute_info_list_unref, vFp)
 GO(g_file_attribute_matcher_enumerate_namespace, iFpp)
 GO(g_file_attribute_matcher_enumerate_next, pFp)
-//GO(g_file_attribute_matcher_get_type, 
-//GO(g_file_attribute_matcher_matches, 
-//GO(g_file_attribute_matcher_matches_only, 
+GO(g_file_attribute_matcher_get_type, LFv)
+GO(g_file_attribute_matcher_matches, iFpp)
+GO(g_file_attribute_matcher_matches_only, iFpp)
 GO(g_file_attribute_matcher_new, pFp)
 GO(g_file_attribute_matcher_ref, pFp)
 GO(g_file_attribute_matcher_subtract, pFpp)
 GO(g_file_attribute_matcher_to_string, pFp)
 GO(g_file_attribute_matcher_unref, vFp)
-//GO(g_file_attribute_status_get_type, 
-//GO(g_file_attribute_type_get_type, 
-//GOM(g_file_copy, iFEppipBpp)
-//GOM(g_file_copy_async, vFEppiipBpBp)
+GO(g_file_attribute_status_get_type, LFv)
+GO(g_file_attribute_type_get_type, LFv)
+//GOM(g_file_copy, iFEppupppp)
+//GOM(g_file_copy_async, vFEppuippppp)
 GO(g_file_copy_attributes, iFppupp)
 GO(g_file_copy_finish, iFppp)
 GO(g_file_copy_flags_get_type, LFv)
 GO(g_file_create, pFpupp)
-//GOM(g_file_create_async, vFEpiipBp)
+//GOM(g_file_create_async, vFEpuippp)
 GO(g_file_create_finish, pFppp)
 GO(g_file_create_flags_get_type, LFv)
 GO(g_file_create_readwrite, pFpupp)
-//GOM(g_file_create_readwrite_async, vFEpiipBp)
+//GOM(g_file_create_readwrite_async, vFEpuippp)
 GO(g_file_create_readwrite_finish, pFppp)
 GO(g_file_delete, iFppp)
-//GOM(g_file_delete_async, vFEpipBp)
-GO(g_file_delete_finish, pFppp)
-//GO(g_file_descriptor_based_get_fd, 
-//GO(g_file_descriptor_based_get_type, 
+//GOM(g_file_delete_async, vFEpippp)
+GO(g_file_delete_finish, iFppp)
+GO(g_file_descriptor_based_get_fd, iFp)
+GO(g_file_descriptor_based_get_type, LFv)
 GO(g_file_dup, pFp)
-//GOM(g_file_eject_mountable, vFEpipBp)
+//GOM(g_file_eject_mountable, vFEpuppp)
 GO(g_file_eject_mountable_finish, iFppp)
-//GOM(g_file_eject_mountable_with_operation, vFpippBp)
+//GOM(g_file_eject_mountable_with_operation, vFpupppp)
 GO(g_file_eject_mountable_with_operation_finish, iFppp)
 GO(g_file_enumerate_children, pFppupp)
-//GOM(g_file_enumerate_children_async, vFppiipBp)
+//GOM(g_file_enumerate_children_async, vFppuippp)
 GO(g_file_enumerate_children_finish, pFppp)
 GO(g_file_enumerator_close, iFppp)
-//GO(g_file_enumerator_close_async, 
+//GOM(g_file_enumerator_close_async, vFpippp)
 GO(g_file_enumerator_close_finish, iFppp)
 GO(g_file_enumerator_get_child, pFpp)
 GO(g_file_enumerator_get_container, pFp)
-//GO(g_file_enumerator_get_type, 
+GO(g_file_enumerator_get_type, LFv)
 GO(g_file_enumerator_has_pending, iFp)
-//GO(g_file_enumerator_is_closed, 
+GO(g_file_enumerator_is_closed, iFp)
 GO(g_file_enumerator_next_file, pFppp)
-//GO(g_file_enumerator_next_files_async, 
+//GOM(g_file_enumerator_next_files_async, vFpiippp)
 GO(g_file_enumerator_next_files_finish, pFppp)
 GO(g_file_enumerator_set_pending, vFpi)
 GO(g_file_equal, iFpp)
 GO(g_file_find_enclosing_mount, pFppp)
-//GOM(g_file_find_enclosing_mount_async, vFEpipBp)
+//GOM(g_file_find_enclosing_mount_async, vFEpippp)
 GO(g_file_find_enclosing_mount_finish, pFppp)
 GO(g_file_get_basename, pFp)
 GO(g_file_get_child, pFpp)
@@ -703,7 +703,7 @@ GO(g_file_has_uri_scheme, iFpp)
 GO(g_file_icon_get_file, pFp)
 GO(g_file_icon_get_type, LFv)
 GO(g_file_icon_new, pFp)
-//GO(g_file_info_clear_status, 
+GO(g_file_info_clear_status, vFp)
 GO(g_file_info_copy_into, vFpp)
 GO(g_file_info_dup, pFp)
 GO(g_file_info_get_attribute_as_string, pFpp)
@@ -714,33 +714,33 @@ GO(g_file_info_get_attribute_int32, iFpp)
 GO(g_file_info_get_attribute_int64, lFpp)
 GO(g_file_info_get_attribute_object, pFpp)
 GO(g_file_info_get_attribute_status, uFpp)
-//GO(g_file_info_get_attribute_string, 
+GO(g_file_info_get_attribute_string, pFpp)
 GO(g_file_info_get_attribute_stringv, pFpp)
 GO(g_file_info_get_attribute_type, uFpp)
 GO(g_file_info_get_attribute_uint32, uFpp)
 GO(g_file_info_get_attribute_uint64, LFpp)
-//GO(g_file_info_get_content_type, 
-//GO(g_file_info_get_deletion_date, 
-//GO(g_file_info_get_display_name, 
-//GO(g_file_info_get_edit_name, 
+GO(g_file_info_get_content_type, pFp)
+GO(g_file_info_get_deletion_date, pFp)
+GO(g_file_info_get_display_name, pFp)
+GO(g_file_info_get_edit_name, pFp)
 GO(g_file_info_get_etag, pFp)
 GO(g_file_info_get_file_type, uFp)
-//GO(g_file_info_get_icon, 
-//GO(g_file_info_get_is_backup, 
-//GO(g_file_info_get_is_hidden, 
+GO(g_file_info_get_icon, pFp)
+GO(g_file_info_get_is_backup, iFp)
+GO(g_file_info_get_is_hidden, iFp)
 GO(g_file_info_get_is_symlink, iFp)
-//GO(g_file_info_get_modification_time, 
-//GO(g_file_info_get_name, 
+GO(g_file_info_get_modification_time, vFpp)
+GO(g_file_info_get_name, pFp)
 GO(g_file_info_get_size, lFp)
 GO(g_file_info_get_sort_order, iFp)
 GO(g_file_info_get_symbolic_icon, pFp)
-//GO(g_file_info_get_symlink_target, 
-//GO(g_file_info_get_type, 
-//GO(g_file_info_has_attribute, 
-//GO(g_file_info_has_namespace, 
-//GO(g_file_info_list_attributes, 
+GO(g_file_info_get_symlink_target, pFp)
+GO(g_file_info_get_type, LFv)
+GO(g_file_info_has_attribute, iFpp)
+GO(g_file_info_has_namespace, iFpp)
+GO(g_file_info_list_attributes, pFpp)
 GO(g_file_info_new, pFv)
-//GO(g_file_info_remove_attribute, 
+GO(g_file_info_remove_attribute, vFpp)
 GO(g_file_info_set_attribute, vFppup)
 GO(g_file_info_set_attribute_boolean, vFppi)
 GO(g_file_info_set_attribute_byte_string, vFppp)
@@ -749,69 +749,69 @@ GO(g_file_info_set_attribute_int64, vFppl)
 GO(g_file_info_set_attribute_mask, vFpp)
 GO(g_file_info_set_attribute_object, vFppp)
 GO(g_file_info_set_attribute_status, iFppu)
-//GO(g_file_info_set_attribute_string, 
+GO(g_file_info_set_attribute_string, vFppp)
 GO(g_file_info_set_attribute_stringv, vFppp)
 GO(g_file_info_set_attribute_uint32, vFppu)
 GO(g_file_info_set_attribute_uint64, vFppL)
-//GO(g_file_info_set_content_type, 
-//GO(g_file_info_set_display_name, 
-//GO(g_file_info_set_edit_name, 
+GO(g_file_info_set_content_type, vFpp)
+GO(g_file_info_set_display_name, vFpp)
+GO(g_file_info_set_edit_name, vFpp)
 GO(g_file_info_set_file_type, vFpu)
-//GO(g_file_info_set_icon, 
-//GO(g_file_info_set_is_hidden, 
+GO(g_file_info_set_icon, vFpp)
+GO(g_file_info_set_is_hidden, vFpi)
 GO(g_file_info_set_is_symlink, vFpi)
 GO(g_file_info_set_modification_time, vFpp)
-//GO(g_file_info_set_name, 
+GO(g_file_info_set_name, vFpp)
 GO(g_file_info_set_size, vFpl)
 GO(g_file_info_set_sort_order, vFpi)
 GO(g_file_info_set_symbolic_icon, vFpp)
 GO(g_file_info_set_symlink_target, vFpp)
-//GO(g_file_info_unset_attribute_mask, 
-//GO(g_file_input_stream_get_type, 
+GO(g_file_info_unset_attribute_mask, vFp)
+GO(g_file_input_stream_get_type, LFv)
 GO(g_file_input_stream_query_info, pFpppp)
-//GO(g_file_input_stream_query_info_async, 
+//GOM(g_file_input_stream_query_info_async, vFppippp)
 GO(g_file_input_stream_query_info_finish, pFppp)
 GO(g_file_io_stream_get_etag, pFp)
-//GO(g_file_io_stream_get_type, 
+GO(g_file_io_stream_get_type, LFv)
 GO(g_file_io_stream_query_info, pFpppp)
-//GO(g_file_io_stream_query_info_async, 
+//GOM(g_file_io_stream_query_info_async, vFppippp)
 GO(g_file_io_stream_query_info_finish, pFppp)
-GO(g_file_is_native, iFpp)
+GO(g_file_is_native, iFp)
 GO(g_file_load_bytes, pFpppp)   //sice 2.56+
-//GOM(g_file_load_bytes_async, vFEppBp) //since 2.56+
+//GOM(g_file_load_bytes_async, vFEpppp) //since 2.56+
 GO(g_file_load_bytes_finish, pFpppp)    //since 2.56+
 GO(g_file_load_contents, iFpppppp)
-//GOM(g_file_load_contents_async, vFEppBp)
+//GOM(g_file_load_contents_async, vFEpppp)
 GO(g_file_load_contents_finish, iFpppppp)
-//GOM(g_file_load_partial_contents_async, vFppBBp)
+//GOM(g_file_load_partial_contents_async, vFppppp)
 GO(g_file_load_partial_contents_finish, iFpppppp)
 GO(g_file_make_directory, iFppp)
-//GOM(g_file_make_directory_async, vFEpipBp)
+//GOM(g_file_make_directory_async, vFEpippp)
 GO(g_file_make_directory_finish, iFppp)
 GO(g_file_make_directory_with_parents, iFppp)
 GO(g_file_make_symbolic_link, iFpppp)
-//GOM(g_file_measure_disk_usage, iFEpipBppppp)
-//GOM(g_file_measure_disk_usage_async, vFEpiipBpBp)
+//GOM(g_file_measure_disk_usage, iFEpuppppppp)
+//GOM(g_file_measure_disk_usage_async, vFEpuippppp)
 GO(g_file_measure_disk_usage_finish, iFpppppp)
-//GO(g_file_measure_flags_get_type, 
+GO(g_file_measure_flags_get_type, LFv)
 GO(g_file_monitor, pFpupp)
-//GO(g_file_monitor_cancel, 
-GO(g_file_monitor_directory, pFpipp)
+GO(g_file_monitor_cancel, iFp)
+GO(g_file_monitor_directory, pFpupp)
 GO(g_file_monitor_emit_event, vFpppu)
-//GO(g_file_monitor_event_get_type, 
-GO(g_file_monitor_file, pFpipp)
-//GO(g_file_monitor_flags_get_type, 
-//GO(g_file_monitor_get_type, 
+GO(g_file_monitor_event_get_type, LFv)
+GO(g_file_monitor_file, pFpupp)
+GO(g_file_monitor_flags_get_type, LFv)
+GO(g_file_monitor_get_type, LFv)
 GO(g_file_monitor_is_cancelled, iFp)
 GO(g_file_monitor_set_rate_limit, vFpi)
-//GOM(g_file_mount_enclosing_volume, vFEpippBp)
+//GOM(g_file_mount_enclosing_volume, vFEpupppp)
 GO(g_file_mount_enclosing_volume_finish, iFppp)
-//GOM(g_file_mount_mountable, vFEpippBp)
+//GOM(g_file_mount_mountable, vFEpupppp)
 GO(g_file_mount_mountable_finish, pFppp)
-//GOM(g_file_move, iFEppipBpp)
+//GOM(g_file_move, iFEppupppp)
 GO(g_filename_completer_get_completions, pFpp)
 GO(g_filename_completer_get_completion_suffix, pFpp)
-//GO(g_filename_completer_get_type, 
+GO(g_filename_completer_get_type, LFv)
 GO(g_filename_completer_new, pFv)
 GO(g_filename_completer_set_dirs_only, vFpi)
 GO(g_file_new_build_filename, pFppppppppppp)    // vaarg, since v2.56+
@@ -821,106 +821,106 @@ GO(g_file_new_for_path, pFp)
 GO(g_file_new_for_uri, pFp)
 GO(g_file_new_tmp, pFppp)
 GO(g_file_open_readwrite, pFppp)
-//GOM(g_file_open_readwrite_async, vFEpipBp)
+//GOM(g_file_open_readwrite_async, vFEpippp)
 GO(g_file_open_readwrite_finish, pFppp)
 GO(g_file_output_stream_get_etag, pFp)
-//GO(g_file_output_stream_get_type, 
+GO(g_file_output_stream_get_type, LFv)
 GO(g_file_output_stream_query_info, pFpppp)
-//GO(g_file_output_stream_query_info_async, 
+//GOM(g_file_output_stream_query_info_async, vFppippp)
 GO(g_file_output_stream_query_info_finish, pFppp)
 GO(g_file_parse_name, pFp)
-GO(g_file_peek_path , pFp)  // sice 2.56+
-//GOM(g_file_poll_mountable, vFEppBp)
+GO(g_file_peek_path, pFp)
+//GOM(g_file_poll_mountable, vFEpppp)
 GO(g_file_poll_mountable_finish, iFppp)
 GO(g_file_query_default_handler, pFppp)
-//GOMg_file_query_default_handler_async, vFEpipBp)  //since 2.60+
+//GOM(g_file_query_default_handler_async, vFEpipBp)  //since 2.60+
 GO(g_file_query_default_handler_finish, pFppp)      //since 2.60+
 GO(g_file_query_exists, iFpp)
 GO(g_file_query_filesystem_info, pFpppp)
-//GOM(g_file_query_filesystem_info_async, vFEppipBp)
+//GOM(g_file_query_filesystem_info_async, vFEppippp)
 GO(g_file_query_filesystem_info_finish, pFppp)
 GO(g_file_query_file_type, uFpup)
 GO(g_file_query_info, pFppupp)
-//GOM(g_file_query_info_async, vFEppiipBp)
+//GOM(g_file_query_info_async, vFEppuippp)
 GO(g_file_query_info_finish, pFppp)
-//GO(g_file_query_info_flags_get_type, 
+GO(g_file_query_info_flags_get_type, LFv)
 GO(g_file_query_settable_attributes, pFppp)
 GO(g_file_query_writable_namespaces, pFppp)
 GO(g_file_read, pFppp)
-//GOM(g_file_read_async, vFEpipBp)
+//GOM(g_file_read_async, vFEpippp)
 GO(g_file_read_finish, pFppp)
 GO(g_file_replace, pFppiupp)
-//GOM(g_file_replace_async, vFEppiiipBp)
+//GOM(g_file_replace_async, vFEppiuippp)
 GO(g_file_replace_contents, iFppLpiuppp)
-//GOM(g_file_replace_contents_async, vFEppLpuupBp)
-//GOM(g_file_replace_contents_bytes_async, vFEpppiipBp)
+//GOM(g_file_replace_contents_async, vFEppLpiuppp)
+//GOM(g_file_replace_contents_bytes_async, vFEpppiuppp)
 GO(g_file_replace_contents_finish, iFpppp)
 GO(g_file_replace_finish, pFppp)
 GO(g_file_replace_readwrite, pFppiupp)
-//GOM(g_file_replace_readwrite_async, vFEppiiipBp)
+//GOM(g_file_replace_readwrite_async, vFEppiuippp)
 GO(g_file_replace_readwrite_finish, pFppp)
 GO(g_file_resolve_relative_path, pFpp)
 GO(g_file_set_attribute, iFppupupp)
 GO(g_file_set_attribute_byte_string, iFpppupp)
 GO(g_file_set_attribute_int32, iFppiupp)
 GO(g_file_set_attribute_int64, iFpplupp)
-//GOM(g_file_set_attributes_async, vFEppiipBp)
+//GOM(g_file_set_attributes_async, vFEppuippp)
 GO(g_file_set_attributes_finish, iFpppp)
 GO(g_file_set_attributes_from_info, iFppupp)
-GO(g_file_set_attribute_string, iFpppipp)
+GO(g_file_set_attribute_string, iFpppupp)
 GO(g_file_set_attribute_uint32, iFppuupp)
 GO(g_file_set_attribute_uint64, iFppLupp)
 GO(g_file_set_display_name, pFpppp)
-//GOM(g_file_set_display_name_async, vFEppipBp)
+//GOM(g_file_set_display_name_async, vFEppippp)
 GO(g_file_set_display_name_finish, pFppp)
-//GOM(g_file_start_mountable, vFEpippBp)
+//GOM(g_file_start_mountable, vFEpupppp)
 GO(g_file_start_mountable_finish, iFppp)
-//GOM(g_file_stop_mountable, vFpippBp)
+//GOM(g_file_stop_mountable, vFpupppp)
 GO(g_file_stop_mountable_finish, iFppp)
 GO(g_file_supports_thread_contexts, iFp)
-//GO(g_filesystem_preview_type_get_type, 
+GO(g_filesystem_preview_type_get_type, LFv)
 GO(g_file_trash, iFppp)
-//GOM(g_file_trash_async, vFEpipBp)
-GO(g_file_trash_finish, pFppp)
+//GOM(g_file_trash_async, vFEpippp)
+GO(g_file_trash_finish, iFppp)
 GO(g_file_type_get_type, LFv)
-//GOM(g_file_unmount_mountable, vFEpipBp)
+//GOM(g_file_unmount_mountable, vFEpuppp)
 GO(g_file_unmount_mountable_finish, iFppp)
-//GOM(g_file_unmount_mountable_with_operation, vFEpippBp)
+//GOM(g_file_unmount_mountable_with_operation, vFEpupppp)
 GO(g_file_unmount_mountable_with_operation_finish, iFppp)
 GO(g_filter_input_stream_get_base_stream, pFp)
 GO(g_filter_input_stream_get_close_base_stream, iFp)
-//GO(g_filter_input_stream_get_type, 
+GO(g_filter_input_stream_get_type, LFv)
 GO(g_filter_input_stream_set_close_base_stream, vFpi)
 GO(g_filter_output_stream_get_base_stream, pFp)
 GO(g_filter_output_stream_get_close_base_stream, iFp)
-//GO(g_filter_output_stream_get_type, 
+GO(g_filter_output_stream_get_type, LFv)
 GO(g_filter_output_stream_set_close_base_stream, vFpi)
 GO(g_icon_deserialize, pFp)
 GO(g_icon_equal, iFpp)
-//GO(g_icon_get_type, 
+GO(g_icon_get_type, LFv)
 GO(g_icon_hash, uFp)
 GO(g_icon_new_for_string, pFpp)
 GO(g_icon_serialize, pFp)
 GO(g_icon_to_string, pFp)
 GO(g_inet_address_equal, iFpp)
 GO(g_inet_address_get_family, uFp)
-//GO(g_inet_address_get_is_any, 
-//GO(g_inet_address_get_is_link_local, 
-//GO(g_inet_address_get_is_loopback, 
-//GO(g_inet_address_get_is_mc_global, 
-//GO(g_inet_address_get_is_mc_link_local, 
-//GO(g_inet_address_get_is_mc_node_local, 
-//GO(g_inet_address_get_is_mc_org_local, 
+GO(g_inet_address_get_is_any, iFp)
+GO(g_inet_address_get_is_link_local, iFp)
+GO(g_inet_address_get_is_loopback, iFp)
+GO(g_inet_address_get_is_mc_global, iFp)
+GO(g_inet_address_get_is_mc_link_local, iFp)
+GO(g_inet_address_get_is_mc_node_local, iFp)
+GO(g_inet_address_get_is_mc_org_local, iFp)
 GO(g_inet_address_get_is_mc_site_local, iFp)
-//GO(g_inet_address_get_is_multicast, 
-//GO(g_inet_address_get_is_site_local, 
+GO(g_inet_address_get_is_multicast, iFp)
+GO(g_inet_address_get_is_site_local, iFp)
 GO(g_inet_address_get_native_size, LFp)
-//GO(g_inet_address_get_type, 
+GO(g_inet_address_get_type, LFv)
 GO(g_inet_address_mask_equal, iFpp)
 GO(g_inet_address_mask_get_address, pFp)
 GO(g_inet_address_mask_get_family, uFp)
 GO(g_inet_address_mask_get_length, uFp)
-//GO(g_inet_address_mask_get_type, 
+GO(g_inet_address_mask_get_type, LFv)
 GO(g_inet_address_mask_matches, iFpp)
 GO(g_inet_address_mask_new, pFpup)
 GO(g_inet_address_mask_new_from_string, pFpp)
@@ -928,40 +928,40 @@ GO(g_inet_address_mask_to_string, pFp)
 GO(g_inet_address_new_any, pFu)
 GO(g_inet_address_new_from_bytes, pFpu)
 GO(g_inet_address_new_from_string, pFp)
-//GO(g_inet_address_new_loopback, 
+GO(g_inet_address_new_loopback, pFu)
 GO(g_inet_address_to_bytes, pFp)
 GO(g_inet_address_to_string, pFp)
 GO(g_inet_socket_address_get_address, pFp)
-//GO(g_inet_socket_address_get_flowinfo, 
+GO(g_inet_socket_address_get_flowinfo, uFp)
 GO(g_inet_socket_address_get_port, WFp)
 GO(g_inet_socket_address_get_scope_id, uFp)
-//GO(g_inet_socket_address_get_type, 
+GO(g_inet_socket_address_get_type, LFv)
 GO(g_inet_socket_address_new, pFpW)
 GO(g_inet_socket_address_new_from_string, pFpu)
 GO(g_initable_get_type, LFv)
 GO(g_initable_init, iFppp)
-GOM(g_initable_new, pFEppppV)
+GOM(g_initable_new, pFELpppV)
 GO(g_initable_newv, pFLuppp)
-GOM(g_initable_new_valist, pFEppApp)
-//GO(g_input_stream_clear_pending, 
+GOM(g_initable_new_valist, pFELpApp)
+GO(g_input_stream_clear_pending, vFp)
 GO(g_input_stream_close, iFppp)
-//GO(g_input_stream_close_async, 
+//GOM(g_input_stream_close_async, vFpippp)
 GO(g_input_stream_close_finish, iFppp)
 GO(g_input_stream_get_type, LFv)
 GO(g_input_stream_has_pending, iFp)
-//GO(g_input_stream_is_closed, 
+GO(g_input_stream_is_closed, iFp)
 GO(g_input_stream_read, lFppLpp)
 GO(g_input_stream_read_all, iFppLppp)
 GOM(g_input_stream_read_async, vFEppLippp)
 GO(g_input_stream_read_bytes, pFpLpp)
-//GO(g_input_stream_read_bytes_async, 
+//GOM(g_input_stream_read_bytes_async, vFpLippp)
 GO(g_input_stream_read_bytes_finish, pFppp)
 GO(g_input_stream_read_finish, lFppp)
 GO(g_input_stream_set_pending, iFpp)
 GO(g_input_stream_skip, lFpLpp)
-//GO(g_input_stream_skip_async, 
+//GOM(g_input_stream_skip_async, vFpLippp)
 GO(g_input_stream_skip_finish, lFppp)
-//GO(g_io_error_enum_get_type, 
+GO(g_io_error_enum_get_type, LFv)
 GO(g_io_error_from_errno, uFi)
 GO(g_io_error_quark, uFv)
 GO(g_io_extension_get_name, pFp)
@@ -972,57 +972,57 @@ GO(g_io_extension_point_get_extensions, pFp)
 GO(g_io_extension_point_get_required_type, LFp)
 GO(g_io_extension_point_implement, pFpLpi)
 GO(g_io_extension_point_lookup, pFp)
-//GO(g_io_extension_point_register, 
+GO(g_io_extension_point_register, pFp)
 GO(g_io_extension_point_set_required_type, vFpL)
 GO(g_io_extension_ref_class, pFp)
-//GO(g_io_module_get_type, 
+GO(g_io_module_get_type, LFv)
 GO(g_io_module_new, pFp)
 GO(g_io_module_scope_block, vFpp)
-//GO(g_io_module_scope_flags_get_type, 
+GO(g_io_module_scope_flags_get_type, LFv)
 GO(g_io_module_scope_free, vFp)
 GO(g_io_module_scope_new, pFu)
 GO(g_io_modules_load_all_in_directory, pFp)
 GO(g_io_modules_load_all_in_directory_with_scope, pFpp)
 GO(g_io_modules_scan_all_in_directory, vFp)
 GO(g_io_modules_scan_all_in_directory_with_scope, vFpp)
-//GO(g_io_scheduler_cancel_all_jobs, 
-//GO(g_io_scheduler_job_send_to_mainloop, 
-//GO(g_io_scheduler_job_send_to_mainloop_async, 
-//GO(g_io_scheduler_push_job, 
-//GO(g_io_stream_clear_pending, 
+GO(g_io_scheduler_cancel_all_jobs, vFv)
+//GOM(g_io_scheduler_job_send_to_mainloop, iFpppp)
+//GOM(g_io_scheduler_job_send_to_mainloop_async, vFpppp)
+//GOM(g_io_scheduler_push_job, vFpppip)
+GO(g_io_stream_clear_pending, vFp)
 GO(g_io_stream_close, iFppp)
-//GO(g_io_stream_close_async, 
+//GOM(g_io_stream_close_async, vFpippp)
 GO(g_io_stream_close_finish, iFppp)
 GO(g_io_stream_get_input_stream, pFp)
 GO(g_io_stream_get_output_stream, pFp)
-//GO(g_io_stream_get_type, 
+GO(g_io_stream_get_type, LFv)
 GO(g_io_stream_has_pending, iFp)
-//GO(g_io_stream_is_closed, 
+GO(g_io_stream_is_closed, iFp)
 GO(g_io_stream_set_pending, iFpp)
-//GO(g_io_stream_splice_async, 
+//GOM(g_io_stream_splice_async, vFppuippp)
 GO(g_io_stream_splice_finish, iFpp)
-//GO(g_io_stream_splice_flags_get_type, 
+GO(g_io_stream_splice_flags_get_type, LFv)
 //GO(g_keyfile_settings_backend_new, 
 GO(g_list_model_get_item, pFpu)
 GO(g_list_model_get_n_items, uFp)
 GO(g_list_model_get_object, pFpu)
-//GO(g_loadable_icon_get_type, 
+GO(g_loadable_icon_get_type, LFv)
 GO(g_loadable_icon_load, pFpippp)
-//GO(g_loadable_icon_load_async, 
+//GOM(g_loadable_icon_load_async, vFpippp)
 GO(g_loadable_icon_load_finish, pFpppp)
 //GO(g_local_directory_monitor_get_type, 
 //GO(g_local_file_monitor_get_type, 
 GO(g_memory_input_stream_add_bytes, vFpp)
-//GO(g_memory_input_stream_add_data, 
-//GO(g_memory_input_stream_get_type, 
+//GOM(g_memory_input_stream_add_data, vFpplp)
+GO(g_memory_input_stream_get_type, LFv)
 GO(g_memory_input_stream_new, pFv)
 GO(g_memory_input_stream_new_from_bytes, pFp)
-//GO(g_memory_input_stream_new_from_data, 
-//GO(g_memory_output_stream_get_data, 
+//GOM(g_memory_input_stream_new_from_data, pFplp)
+GO(g_memory_output_stream_get_data, pFp)
 GO(g_memory_output_stream_get_data_size, LFp)
-//GO(g_memory_output_stream_get_size, 
-//GO(g_memory_output_stream_get_type, 
-//GO(g_memory_output_stream_new, 
+GO(g_memory_output_stream_get_size, LFp)
+GO(g_memory_output_stream_get_type, LFv)
+//GOM(g_memory_output_stream_new, pFpLpp)
 GO(g_memory_output_stream_new_resizable, pFv)
 GO(g_memory_output_stream_steal_as_bytes, pFp)
 GO(g_memory_output_stream_steal_data, pFp)
@@ -1033,107 +1033,107 @@ GO(g_menu_append_section, vFppp)
 GO(g_menu_append_submenu, vFppp)
 GO(g_menu_attribute_iter_get_name, pFp)
 GO(g_menu_attribute_iter_get_next, iFppp)
-//GO(g_menu_attribute_iter_get_type, 
+GO(g_menu_attribute_iter_get_type, LFv)
 GO(g_menu_attribute_iter_get_value, pFp)
 GO(g_menu_attribute_iter_next, iFp)
-//GO(g_menu_freeze, 
-//GO(g_menu_get_type, 
+GO(g_menu_freeze, vFp)
+GO(g_menu_get_type, LFv)
 GO(g_menu_insert, vFpipp)
 GO(g_menu_insert_item, vFpip)
-//GO(g_menu_insert_section, 
+GO(g_menu_insert_section, vFpipp)
 GO(g_menu_insert_submenu, vFpipp)
-//GO(g_menu_item_get_attribute, 
+//GOM(g_menu_item_get_attribute, iFpppV)
 GO(g_menu_item_get_attribute_value, pFppp)
 GO(g_menu_item_get_link, pFpp)
-//GO(g_menu_item_get_type, 
+GO(g_menu_item_get_type, LFv)
 GO(g_menu_item_new, pFpp)
 GO(g_menu_item_new_from_model, pFpi)
 GO(g_menu_item_new_section, pFpp)
-//GO(g_menu_item_new_submenu, 
-//GO(g_menu_item_set_action_and_target, 
+GO(g_menu_item_new_submenu, pFpp)
+//GOM(g_menu_item_set_action_and_target, vFpppV)
 GO(g_menu_item_set_action_and_target_value, vFppp)
-//GO(g_menu_item_set_attribute, 
-//GO(g_menu_item_set_attribute_value, 
+//GOM(g_menu_item_set_attribute, vFpppV)
+GO(g_menu_item_set_attribute_value, vFppp)
 GO(g_menu_item_set_detailed_action, vFpp)
 GO(g_menu_item_set_icon, vFpp)
-//GO(g_menu_item_set_label, 
+GO(g_menu_item_set_label, vFpp)
 GO(g_menu_item_set_link, vFppp)
 GO(g_menu_item_set_section, vFpp)
-//GO(g_menu_item_set_submenu, 
+GO(g_menu_item_set_submenu, vFpp)
 GO(g_menu_link_iter_get_name, pFp)
 GO(g_menu_link_iter_get_next, iFppp)
-//GO(g_menu_link_iter_get_type, 
+GO(g_menu_link_iter_get_type, LFv)
 GO(g_menu_link_iter_get_value, pFp)
 GO(g_menu_link_iter_next, iFp)
-//GO(g_menu_model_get_item_attribute, 
+//GOM(g_menu_model_get_item_attribute, iFpippV)
 GO(g_menu_model_get_item_attribute_value, pFpipp)
 GO(g_menu_model_get_item_link, pFpip)
 GO(g_menu_model_get_n_items, iFp)
-//GO(g_menu_model_get_type, 
+GO(g_menu_model_get_type, LFv)
 GO(g_menu_model_is_mutable, iFp)
 GO(g_menu_model_items_changed, vFpiii)
 GO(g_menu_model_iterate_item_attributes, pFpi)
 GO(g_menu_model_iterate_item_links, pFpi)
 GO(g_menu_new, pFv)
-//GO(g_menu_prepend, 
-//GO(g_menu_prepend_item, 
-//GO(g_menu_prepend_section, 
-//GO(g_menu_prepend_submenu, 
+GO(g_menu_prepend, vFppp)
+GO(g_menu_prepend_item, vFpp)
+GO(g_menu_prepend_section, vFppp)
+GO(g_menu_prepend_submenu, vFppp)
 GO(g_menu_remove, vFpi)
-//GO(g_menu_remove_all, 
-//GO(g_mount_can_eject, 
-//GO(g_mount_can_unmount, 
-//GO(g_mount_eject, 
-//GO(g_mount_eject_finish, 
-//GO(g_mount_eject_with_operation, 
+GO(g_menu_remove_all, vFp)
+GO(g_mount_can_eject, iFp)
+GO(g_mount_can_unmount, iFp)
+//GOM(g_mount_eject, vFpuppp)
+GO(g_mount_eject_finish, iFppp)
+//GOM(g_mount_eject_with_operation, vFpupppp)
 GO(g_mount_eject_with_operation_finish, iFppp)
 GO(g_mount_get_default_location, pFp)
 GO(g_mount_get_drive, pFp)
-//GO(g_mount_get_icon, 
-//GO(g_mount_get_name, 
-//GO(g_mount_get_root, 
+GO(g_mount_get_icon, pFp)
+GO(g_mount_get_name, pFp)
+GO(g_mount_get_root, pFp)
 GO(g_mount_get_sort_key, pFp)
 GO(g_mount_get_symbolic_icon, pFp)
-//GO(g_mount_get_type, 
+GO(g_mount_get_type, LFv)
 GO(g_mount_get_uuid, pFp)
-//GO(g_mount_get_volume, 
-//GO(g_mount_guess_content_type, 
+GO(g_mount_get_volume, pFp)
+//GOM(g_mount_guess_content_type, vFpippp)
 GO(g_mount_guess_content_type_finish, pFppp)
 GO(g_mount_guess_content_type_sync, pFpipp)
 GO(g_mount_is_shadowed, iFp)
-//GO(g_mount_mount_flags_get_type, 
-//GO(g_mount_operation_get_anonymous, 
+GO(g_mount_mount_flags_get_type, LFv)
+GO(g_mount_operation_get_anonymous, iFp)
 GO(g_mount_operation_get_choice, iFp)
 GO(g_mount_operation_get_domain, pFp)
-//GO(g_mount_operation_get_password, 
+GO(g_mount_operation_get_password, pFp)
 GO(g_mount_operation_get_password_save, uFp)
-//GO(g_mount_operation_get_type, 
-//GO(g_mount_operation_get_username, 
+GO(g_mount_operation_get_type, LFv)
+GO(g_mount_operation_get_username, pFp)
 GO(g_mount_operation_new, pFv)
 GO(g_mount_operation_reply, vFpu)
-//GO(g_mount_operation_result_get_type, 
-//GO(g_mount_operation_set_anonymous, 
+GO(g_mount_operation_result_get_type, LFv)
+GO(g_mount_operation_set_anonymous, vFpi)
 GO(g_mount_operation_set_choice, vFpi)
 GO(g_mount_operation_set_domain, vFpp)
-//GO(g_mount_operation_set_password, 
+GO(g_mount_operation_set_password, vFpp)
 GO(g_mount_operation_set_password_save, vFpu)
-//GO(g_mount_operation_set_username, 
-//GO(g_mount_remount, 
-//GO(g_mount_remount_finish, 
-//GO(g_mount_shadow, 
-//GO(g_mount_unmount, 
-//GO(g_mount_unmount_finish, 
-//GO(g_mount_unmount_flags_get_type, 
-//GO(g_mount_unmount_with_operation, 
-//GO(g_mount_unmount_with_operation_finish, 
-//GO(g_mount_unshadow, 
-//GO(g_native_volume_monitor_get_type, 
-//GO(g_network_address_get_hostname, 
+GO(g_mount_operation_set_username, vFpp)
+//GOM(g_mount_remount, vFpupppp)
+GO(g_mount_remount_finish, iFppp)
+GO(g_mount_shadow, vFp)
+//GOM(g_mount_unmount, vFpuppp)
+GO(g_mount_unmount_finish, iFppp)
+GO(g_mount_unmount_flags_get_type, LFv)
+//GOM(g_mount_unmount_with_operation, vFpupppp)
+GO(g_mount_unmount_with_operation_finish, iFppp)
+GO(g_mount_unshadow, vFp)
+GO(g_native_volume_monitor_get_type, LFv)
+GO(g_network_address_get_hostname, pFp)
 GO(g_network_address_get_port, WFp)
 GO(g_network_address_get_scheme, pFp)
-//GO(g_network_address_get_type, 
+GO(g_network_address_get_type, LFv)
 GO(g_network_address_new, pFpW)
-//GO(g_network_address_parse, 
+GO(g_network_address_parse, pFpWp)
 GO(g_network_address_parse_uri, pFpWp)
 //GO(g_networking_init, 
 //GO(g_network_monitor_base_add_network, 
@@ -1141,141 +1141,141 @@ GO(g_network_address_parse_uri, pFpWp)
 //GO(g_network_monitor_base_remove_network, 
 //GO(g_network_monitor_base_set_networks, 
 GO(g_network_monitor_can_reach, iFpppp)
-//GO(g_network_monitor_can_reach_async, 
+//GOM(g_network_monitor_can_reach_async, vFppppp)
 GO(g_network_monitor_can_reach_finish, iFppp)
 GO(g_network_monitor_get_default, pFv)
-//GO(g_network_monitor_get_network_available, 
-//GO(g_network_monitor_get_type, 
-//GO(g_network_service_get_domain, 
-//GO(g_network_service_get_protocol, 
+GO(g_network_monitor_get_network_available, iFp)
+GO(g_network_monitor_get_type, LFv)
+GO(g_network_service_get_domain, pFp)
+GO(g_network_service_get_protocol, pFp)
 GO(g_network_service_get_scheme, pFp)
-//GO(g_network_service_get_service, 
-//GO(g_network_service_get_type, 
+GO(g_network_service_get_service, pFp)
+GO(g_network_service_get_type, LFv)
 GO(g_network_service_new, pFppp)
 GO(g_network_service_set_scheme, vFpp)
 GO(g_notification_add_button, vFppp)
-//GO(g_notification_add_button_with_target, 
+//GOM(g_notification_add_button_with_target, vFppppV)
 GO(g_notification_add_button_with_target_value, vFpppp)
-//GO(g_notification_get_type, 
+GO(g_notification_get_type, LFv)
 GO(g_notification_new, pFp)
-//GO(g_notification_priority_get_type, 
-//GO(g_notification_set_body, 
+GO(g_notification_priority_get_type, LFv)
+GO(g_notification_set_body, vFpp)
 GO(g_notification_set_default_action, vFpp)
-//GO(g_notification_set_default_action_and_target, 
+//GOM(g_notification_set_default_action_and_target, vFpppV)
 GO(g_notification_set_default_action_and_target_value, vFppp)
 GO(g_notification_set_icon, vFpp)
 GO(g_notification_set_priority, vFpu)
-//GO(g_notification_set_title, 
+GO(g_notification_set_title, vFpp)
 GO(g_notification_set_urgent, vFpi)
 //GO(g_null_settings_backend_new, 
-//GO(g_output_stream_clear_pending, 
+GO(g_output_stream_clear_pending, vFp)
 GO(g_output_stream_close, iFppp)
-//GO(g_output_stream_close_async, 
+//GOM(g_output_stream_close_async, vFpippp)
 GO(g_output_stream_close_finish, iFppp)
-//GO(g_output_stream_flush, 
-//GO(g_output_stream_flush_async, 
-//GO(g_output_stream_flush_finish, 
-//GO(g_output_stream_get_type, 
+GO(g_output_stream_flush, iFppp)
+//GOM(g_output_stream_flush_async, vFpippp)
+GO(g_output_stream_flush_finish, iFppp)
+GO(g_output_stream_get_type, LFv)
 GO(g_output_stream_has_pending, iFp)
-//GO(g_output_stream_is_closed, 
-//GO(g_output_stream_is_closing, 
-//GO(g_output_stream_printf, 
+GO(g_output_stream_is_closed, iFp)
+GO(g_output_stream_is_closing, iFp)
+//GOM(g_output_stream_printf, iFpppppV)
 GO(g_output_stream_set_pending, iFpp)
 GO(g_output_stream_splice, lFppupp)
-//GO(g_output_stream_splice_async, 
+//GOM(g_output_stream_splice_async, vFppuippp)
 GO(g_output_stream_splice_finish, lFppp)
-//GO(g_output_stream_splice_flags_get_type, 
-//GO(g_output_stream_vprintf, 
+GO(g_output_stream_splice_flags_get_type, LFv)
+//GOM(g_output_stream_vprintf, iFpppppA)
 GO(g_output_stream_write, lFppLpp)
 GO(g_output_stream_write_all, iFppLppp)
-//GO(g_output_stream_write_async, 
+//GOM(g_output_stream_write_async, vFppLippp)
 GO(g_output_stream_write_bytes, lFpppp)
-//GO(g_output_stream_write_bytes_async, 
-//GO(g_output_stream_write_bytes_finish, 
-//GO(g_output_stream_write_finish, 
-//GO(g_password_save_get_type, 
-//GO(g_permission_acquire, 
-//GO(g_permission_acquire_async, 
-//GO(g_permission_acquire_finish, 
-//GO(g_permission_get_allowed, 
-//GO(g_permission_get_can_acquire, 
+//GOM(g_output_stream_write_bytes_async, vFppippp)
+GO(g_output_stream_write_bytes_finish, lFppp)
+GO(g_output_stream_write_finish, lFppp)
+GO(g_password_save_get_type, LFv)
+GO(g_permission_acquire, iFppp)
+//GOM(g_permission_acquire_async, vFpppp)
+GO(g_permission_acquire_finish, iFppp)
+GO(g_permission_get_allowed, iFp)
+GO(g_permission_get_can_acquire, iFp)
 GO(g_permission_get_can_release, iFp)
-//GO(g_permission_get_type, 
+GO(g_permission_get_type, LFv)
 GO(g_permission_impl_update, vFpiii)
 GO(g_permission_release, iFppp)
-//GO(g_permission_release_async, 
+//GOM(g_permission_release_async, vFpppp)
 GO(g_permission_release_finish, iFppp)
-//GO(g_pollable_input_stream_can_poll, 
-//GO(g_pollable_input_stream_create_source, 
-//GO(g_pollable_input_stream_get_type, 
+GO(g_pollable_input_stream_can_poll, iFp)
+//GOM(g_pollable_input_stream_create_source, pFpp)
+GO(g_pollable_input_stream_get_type, LFv)
 GO(g_pollable_input_stream_is_readable, iFp)
 GO(g_pollable_input_stream_read_nonblocking, lFppLpp)
-//GO(g_pollable_output_stream_can_poll, 
-//GO(g_pollable_output_stream_create_source, 
-//GO(g_pollable_output_stream_get_type, 
+GO(g_pollable_output_stream_can_poll, iFp)
+//GOM(g_pollable_output_stream_create_source, pFpp)
+GO(g_pollable_output_stream_get_type, LFv)
 GO(g_pollable_output_stream_is_writable, iFp)
 GO(g_pollable_output_stream_write_nonblocking, lFppLpp)
-//GO(g_pollable_source_new, 
-//GO(g_pollable_source_new_full, 
+//GOM(g_pollable_source_new, pFp)
+//GOM(g_pollable_source_new_full, pFppp)
 GO(g_pollable_stream_read, lFppLipp)
 GO(g_pollable_stream_write, lFppLipp)
 GO(g_pollable_stream_write_all, iFppLippp)
-//GO(g_property_action_get_type, 
+GO(g_property_action_get_type, LFv)
 GO(g_property_action_new, pFppp)
-//GO(g_proxy_address_enumerator_get_type, 
-//GO(g_proxy_address_get_destination_hostname, 
+GO(g_proxy_address_enumerator_get_type, LFv)
+GO(g_proxy_address_get_destination_hostname, pFp)
 GO(g_proxy_address_get_destination_port, WFp)
-//GO(g_proxy_address_get_destination_protocol, 
-//GO(g_proxy_address_get_password, 
-//GO(g_proxy_address_get_protocol, 
+GO(g_proxy_address_get_destination_protocol, pFp)
+GO(g_proxy_address_get_password, pFp)
+GO(g_proxy_address_get_protocol, pFp)
 GO(g_proxy_address_get_type, LFv)
 GO(g_proxy_address_get_uri, pFp)
-//GO(g_proxy_address_get_username, 
+GO(g_proxy_address_get_username, pFp)
 GO(g_proxy_address_new, pFpWppWpp)
 GO(g_proxy_connect, pFppppp)
-//GO(g_proxy_connect_async, 
+//GOM(g_proxy_connect_async, vFpppppp)
 GO(g_proxy_connect_finish, pFppp)
 GO(g_proxy_get_default_for_protocol, pFp)
-//GO(g_proxy_get_type, 
+GO(g_proxy_get_type, LFv)
 GO(g_proxy_resolver_get_default, pFv)
 GO(g_proxy_resolver_get_type, LFv)
 GO(g_proxy_resolver_is_supported, iFp)
 GO(g_proxy_resolver_lookup, pFpppp)
-//GO(g_proxy_resolver_lookup_async, 
+//GOM(g_proxy_resolver_lookup_async, vFppppp)
 GO(g_proxy_resolver_lookup_finish, pFppp)
 GO(g_proxy_supports_hostname, iFp)
-//GO(g_remote_action_group_activate_action_full, 
+GO(g_remote_action_group_activate_action_full, vFpppp)
 GO(g_remote_action_group_change_action_state_full, vFpppp)
-//GO(g_remote_action_group_get_type, 
-//GO(g_resolver_error_get_type, 
-//GO(g_resolver_error_quark, 
-//GO(g_resolver_free_addresses, 
+GO(g_remote_action_group_get_type, LFv)
+GO(g_resolver_error_get_type, LFv)
+GO(g_resolver_error_quark, uFv)
+GO(g_resolver_free_addresses, vFp)
 GO(g_resolver_free_targets, vFp)
 GO(g_resolver_get_default, pFv)
 GO(g_resolver_get_type, LFv)
 GO(g_resolver_lookup_by_address, pFpppp)
-//GO(g_resolver_lookup_by_address_async, 
+//GOM(g_resolver_lookup_by_address_async, vFppppp)
 GO(g_resolver_lookup_by_address_finish, pFppp)
 GO(g_resolver_lookup_by_name, pFpppp)
-//GO(g_resolver_lookup_by_name_async, 
-//GO(g_resolver_lookup_by_name_finish, 
+//GOM(g_resolver_lookup_by_name_async, vFppppp)
+GO(g_resolver_lookup_by_name_finish, pFppp)
 GO(g_resolver_lookup_records, pFppupp)
-//GO(g_resolver_lookup_records_async, 
+//GOM(g_resolver_lookup_records_async, vFppuppp)
 GO(g_resolver_lookup_records_finish, pFppp)
 GO(g_resolver_lookup_service, pFpppppp)
-//GO(g_resolver_lookup_service_async, 
-//GO(g_resolver_lookup_service_finish, 
-//GO(g_resolver_record_type_get_type, 
-//GO(g_resolver_set_default, 
+//GOM(g_resolver_lookup_service_async, vFppppppp)
+GO(g_resolver_lookup_service_finish, pFppp)
+GO(g_resolver_record_type_get_type, LFv)
+GO(g_resolver_set_default, vFp)
 GO(g_resource_enumerate_children, pFppup)
-//GO(g_resource_error_get_type, 
-//GO(g_resource_error_quark, 
-//GO(g_resource_flags_get_type, 
+GO(g_resource_error_get_type, LFv)
+GO(g_resource_error_quark, uFv)
+GO(g_resource_flags_get_type, LFv)
 GO(g_resource_get_info, iFppuppp)
-//GO(g_resource_get_type, 
+GO(g_resource_get_type, LFv)
 GO(g_resource_load, pFpp)
 GO(g_resource_lookup_data, pFppup)
-//GO(g_resource_lookup_flags_get_type, 
+GO(g_resource_lookup_flags_get_type, LFv)
 GO(g_resource_new_from_data, pFpp)
 GO(g_resource_open_stream, pFppup)
 GO(g_resource_ref, pFp)
@@ -1283,12 +1283,12 @@ GO(g_resources_enumerate_children, pFpup)
 GO(g_resources_get_info, iFpuppp)
 GO(g_resources_lookup_data, pFpup)
 GO(g_resources_open_stream, pFpup)
-//GO(g_resources_register, 
-//GO(g_resources_unregister, 
-//GO(g_resource_unref, 
-//GO(g_seekable_can_seek, 
+GO(g_resources_register, vFp)
+GO(g_resources_unregister, vFp)
+GO(g_resource_unref, vFp)
+GO(g_seekable_can_seek, iFp)
 GO(g_seekable_can_truncate, iFp)
-//GO(g_seekable_get_type, 
+GO(g_seekable_get_type, LFv)
 GO(g_seekable_seek, iFplupp)
 GO(g_seekable_tell, lFp)
 GO(g_seekable_truncate, iFplpp)
@@ -1303,12 +1303,12 @@ GO(g_settings_apply, vFp)
 //GO(g_settings_backend_path_writable_changed, 
 //GO(g_settings_backend_writable_changed, 
 GO(g_settings_bind, vFppppu)
-//GO(g_settings_bind_flags_get_type, 
-//GO(g_settings_bind_with_mapping, 
+GO(g_settings_bind_flags_get_type, LFv)
+//GOM(g_settings_bind_with_mapping, vFppppupppp)
 GO(g_settings_bind_writable, vFppppi)
 GO(g_settings_create_action, pFpp)
 GO(g_settings_delay, vFp)
-//GO(g_settings_get, 
+//GOM(g_settings_get, vFpppV)
 GO(g_settings_get_boolean, iFpp)
 GO(g_settings_get_child, pFpp)
 GO(g_settings_get_default_value, pFpp)
@@ -1317,41 +1317,41 @@ GO(g_settings_get_enum, iFpp)
 GO(g_settings_get_flags, uFpp)
 GO(g_settings_get_has_unapplied, iFp)
 GO(g_settings_get_int, iFpp)
-//GO(g_settings_get_mapped, 
-//GO(g_settings_get_range, 
+//GOM(g_settings_get_mapped, pFpppp)
+GO(g_settings_get_range, pFpp)
 GO(g_settings_get_string, pFpp)
 GO(g_settings_get_strv, pFpp)
-GO(g_settings_get_type, pFv)
+GO(g_settings_get_type, LFv)
 GO(g_settings_get_uint, uFpp)
 GO(g_settings_get_user_value, pFpp)
 GO(g_settings_get_value, pFpp)
 GO(g_settings_is_writable, iFpp)
-//GO(g_settings_list_children, 
+GO(g_settings_list_children, pFp)
 GO(g_settings_list_keys, pFp)
 GO(g_settings_list_relocatable_schemas, pFv)
-//GO(g_settings_list_schemas, 
+GO(g_settings_list_schemas, pFv)
 GO(g_settings_new, pFp)
 GO(g_settings_new_full, pFppp)
 GO(g_settings_new_with_backend, pFpp)
 GO(g_settings_new_with_backend_and_path, pFppp)
 GO(g_settings_new_with_path, pFpp)
-//GO(g_settings_range_check, 
+GO(g_settings_range_check, iFppp)
 GO(g_settings_reset, vFpp)
-//GO(g_settings_revert, 
-//GO(g_settings_schema_get_id, 
+GO(g_settings_revert, vFp)
+GO(g_settings_schema_get_id, pFp)
 GO(g_settings_schema_get_key, pFpp)
 GO(g_settings_schema_get_path, pFp)
-//GO(g_settings_schema_get_type, 
+GO(g_settings_schema_get_type, LFv)
 GO(g_settings_schema_has_key, iFpp)
-//GO(g_settings_schema_key_get_default_value, 
+GO(g_settings_schema_key_get_default_value, pFp)
 GO(g_settings_schema_key_get_description, pFp)
 GO(g_settings_schema_key_get_range, pFp)
-//GO(g_settings_schema_key_get_summary, 
-//GO(g_settings_schema_key_get_type, 
+GO(g_settings_schema_key_get_summary, pFp)
+GO(g_settings_schema_key_get_type, LFv)
 GO(g_settings_schema_key_get_value_type, pFp)
 GO(g_settings_schema_key_range_check, iFpp)
 GO(g_settings_schema_key_ref, pFp)
-//GO(g_settings_schema_key_unref, 
+GO(g_settings_schema_key_unref, vFp)
 GO(g_settings_schema_ref, pFp)
 GO(g_settings_schema_source_get_default, pFv)
 GO(g_settings_schema_source_get_type, LFv)
@@ -1361,7 +1361,7 @@ GO(g_settings_schema_source_new_from_directory, pFppip)
 GO(g_settings_schema_source_ref, pFp)
 GO(g_settings_schema_source_unref, vFp)
 GO(g_settings_schema_unref, vFp)
-//GO(g_settings_set, 
+//GOM(g_settings_set, iFpppV)
 GO(g_settings_set_boolean, iFppi)
 GO(g_settings_set_double, iFppd)
 GO(g_settings_set_enum, iFppi)
@@ -1369,13 +1369,13 @@ GO(g_settings_set_flags, iFppu)
 GO(g_settings_set_int, iFppi)
 GO(g_settings_set_string, iFppp)
 GO(g_settings_set_strv, iFppp)
-//GO(g_settings_set_uint, 
+GO(g_settings_set_uint, iFppu)
 GO(g_settings_set_value, iFppp)
 GO(g_settings_sync, vFv)
 GO(g_settings_unbind, vFpp)
 GO(g_simple_action_get_type, LFv)
-//GO(g_simple_action_group_add_entries, 
-//GO(g_simple_action_group_get_type, 
+//GOM(g_simple_action_group_add_entries, vFppip)
+GO(g_simple_action_group_get_type, LFv)
 GO(g_simple_action_group_insert, vFpp)
 GO(g_simple_action_group_lookup, pFpp)
 GO(g_simple_action_group_new, pFv)
@@ -1383,7 +1383,7 @@ GO(g_simple_action_group_remove, vFpp)
 GO(g_simple_action_new, pFpp)
 GO(g_simple_action_new_stateful, pFppp)
 GO(g_simple_action_set_enabled, vFpi)
-//GO(g_simple_action_set_state, 
+GO(g_simple_action_set_state, vFpp)
 GOM(g_simple_async_report_error_in_idle, vFEpppuipV)
 GOM(g_simple_async_report_gerror_in_idle, vFEpppp)
 GOM(g_simple_async_report_take_gerror_in_idle, vFEpppp)
@@ -1402,8 +1402,8 @@ GOM(g_simple_async_result_new_take_error, pFEpppp)
 GO(g_simple_async_result_propagate_error, iFpp)
 GOM(g_simple_async_result_run_in_thread, vFEppip)
 GO(g_simple_async_result_set_check_cancellable, vFpp)
-GOM(g_simple_async_result_set_error, vFEppipV)
-GOM(g_simple_async_result_set_error_va, vFEppipA)
+GOM(g_simple_async_result_set_error, vFEpuipV)
+GOM(g_simple_async_result_set_error_va, vFEpuipA)
 GO(g_simple_async_result_set_from_error, vFpp)
 GO(g_simple_async_result_set_handle_cancellation, vFpi)
 GO(g_simple_async_result_set_op_res_gboolean, vFpi)
@@ -1418,32 +1418,32 @@ GO(g_simple_proxy_resolver_set_default_proxy, vFpp)
 GO(g_simple_proxy_resolver_set_ignore_hosts, vFpp)
 GO(g_simple_proxy_resolver_set_uri_proxy, vFppp)
 GO(g_socket_accept, pFppp)
-//GO(g_socket_address_enumerator_get_type, 
+GO(g_socket_address_enumerator_get_type, LFv)
 GO(g_socket_address_enumerator_next, pFppp)
-//GO(g_socket_address_enumerator_next_async, 
+//GOM(g_socket_address_enumerator_next_async, vFpppp)
 GO(g_socket_address_enumerator_next_finish, pFppp)
 GO(g_socket_address_get_family, uFp)
 GO(g_socket_address_get_native_size, lFp)
 GO(g_socket_address_get_type, LFv)
-//GO(g_socket_address_new_from_native, 
+GO(g_socket_address_new_from_native, pFpL)
 GO(g_socket_address_to_native, iFppLp)
 GO(g_socket_bind, iFppip)
-//GO(g_socket_check_connect_result, 
+GO(g_socket_check_connect_result, iFpp)
 GO(g_socket_client_add_application_proxy, vFpp)
 GO(g_socket_client_connect, pFpppp)
-//GO(g_socket_client_connect_async, 
-//GO(g_socket_client_connect_finish, 
-//GO(g_socket_client_connect_to_host, 
-//GO(g_socket_client_connect_to_host_async, 
-//GO(g_socket_client_connect_to_host_finish, 
+//GOM(g_socket_client_connect_async, vFppppp)
+GO(g_socket_client_connect_finish, pFppp)
+GO(g_socket_client_connect_to_host, pFppWpp)
+//GOM(g_socket_client_connect_to_host_async, vFppWppp)
+GO(g_socket_client_connect_to_host_finish, pFppp)
 GO(g_socket_client_connect_to_service, pFppppp)
-//GO(g_socket_client_connect_to_service_async, 
-//GO(g_socket_client_connect_to_service_finish, 
+//GOM(g_socket_client_connect_to_service_async, vFpppppp)
+GO(g_socket_client_connect_to_service_finish, pFppp)
 GO(g_socket_client_connect_to_uri, pFppWpp)
-//GO(g_socket_client_connect_to_uri_async, 
+//GOM(g_socket_client_connect_to_uri_async, vFppWppp)
 GO(g_socket_client_connect_to_uri_finish, pFppp)
-//GO(g_socket_client_event_get_type, 
-//GO(g_socket_client_get_enable_proxy, 
+GO(g_socket_client_event_get_type, LFv)
+GO(g_socket_client_get_enable_proxy, iFp)
 GO(g_socket_client_get_family, uFp)
 GO(g_socket_client_get_local_address, pFp)
 GO(g_socket_client_get_protocol, iFp)
@@ -1454,7 +1454,7 @@ GO(g_socket_client_get_tls, iFp)
 GO(g_socket_client_get_tls_validation_flags, uFp)
 GO(g_socket_client_get_type, LFv)
 GO(g_socket_client_new, pFv)
-//GO(g_socket_client_set_enable_proxy, 
+GO(g_socket_client_set_enable_proxy, vFpi)
 GO(g_socket_client_set_family, vFpu)
 GO(g_socket_client_set_local_address, vFpp)
 GO(g_socket_client_set_protocol, vFpi)
@@ -1468,69 +1468,69 @@ GO(g_socket_condition_check, uFpu)
 GO(g_socket_condition_timed_wait, iFpulpp)
 GO(g_socket_condition_wait, iFpupp)
 GO(g_socket_connect, iFpppp)
-//GO(g_socket_connectable_enumerate, 
-//GO(g_socket_connectable_get_type, 
+GO(g_socket_connectable_enumerate, pFp)
+GO(g_socket_connectable_get_type, LFv)
 GO(g_socket_connectable_proxy_enumerate, pFp)
 GO(g_socket_connection_connect, iFpppp)
-//GO(g_socket_connection_connect_async, 
+//GOM(g_socket_connection_connect_async, vFppppp)
 GO(g_socket_connection_connect_finish, iFppp)
 GO(g_socket_connection_factory_create_connection, pFp)
 GO(g_socket_connection_factory_lookup_type, LFuui)
 GO(g_socket_connection_factory_register_type, vFLuui)
-//GO(g_socket_connection_get_local_address, 
+GO(g_socket_connection_get_local_address, pFpp)
 GO(g_socket_connection_get_remote_address, pFpp)
 GO(g_socket_connection_get_socket, pFp)
-//GO(g_socket_connection_get_type, 
+GO(g_socket_connection_get_type, LFv)
 GO(g_socket_connection_is_connected, iFp)
 GO(g_socket_control_message_deserialize, pFiiLp)
-//GO(g_socket_control_message_get_level, 
+GO(g_socket_control_message_get_level, iFp)
 GO(g_socket_control_message_get_msg_type, iFp)
 GO(g_socket_control_message_get_size, LFp)
-//GO(g_socket_control_message_get_type, 
+GO(g_socket_control_message_get_type, LFv)
 GO(g_socket_control_message_serialize, vFpp)
-//GO(g_socket_create_source, 
+//GOM(g_socket_create_source, pFpup)
 GO(g_socket_family_get_type, LFv)
 GO(g_socket_get_available_bytes, lFp)
-//GO(g_socket_get_blocking, 
-//GO(g_socket_get_broadcast, 
+GO(g_socket_get_blocking, iFp)
+GO(g_socket_get_broadcast, iFp)
 GO(g_socket_get_credentials, pFpp)
 GO(g_socket_get_family, uFp)
 GO(g_socket_get_fd, iFp)
-//GO(g_socket_get_keepalive, 
+GO(g_socket_get_keepalive, iFp)
 GO(g_socket_get_listen_backlog, iFp)
-//GO(g_socket_get_local_address, 
-//GO(g_socket_get_multicast_loopback, 
+GO(g_socket_get_local_address, pFpp)
+GO(g_socket_get_multicast_loopback, iFp)
 GO(g_socket_get_multicast_ttl, uFp)
 GO(g_socket_get_option, iFpiipp)
 GO(g_socket_get_protocol, iFp)
 GO(g_socket_get_remote_address, pFpp)
 GO(g_socket_get_socket_type, uFp)
-//GO(g_socket_get_timeout, 
-//GO(g_socket_get_ttl, 
+GO(g_socket_get_timeout, uFp)
+GO(g_socket_get_ttl, uFp)
 GO(g_socket_get_type, LFv)
-//GO(g_socket_is_closed, 
-//GO(g_socket_is_connected, 
-//GO(g_socket_join_multicast_group, 
+GO(g_socket_is_closed, iFp)
+GO(g_socket_is_connected, iFp)
+GO(g_socket_join_multicast_group, iFppipp)
 GO(g_socket_leave_multicast_group, iFppipp)
-//GO(g_socket_listen, 
+GO(g_socket_listen, iFpp)
 GO(g_socket_listener_accept, pFpppp)
-//GO(g_socket_listener_accept_async, 
+//GOM(g_socket_listener_accept_async, vFpppp)
 GO(g_socket_listener_accept_finish, pFpppp)
 GO(g_socket_listener_accept_socket, pFpppp)
-//GO(g_socket_listener_accept_socket_async, 
+//GOM(g_socket_listener_accept_socket_async, vFpppp)
 GO(g_socket_listener_accept_socket_finish, pFpppp)
 GO(g_socket_listener_add_address, iFppuippp)
 GO(g_socket_listener_add_any_inet_port, WFppp)
 GO(g_socket_listener_add_inet_port, iFpWpp)
 GO(g_socket_listener_add_socket, iFpppp)
-//GO(g_socket_listener_close, 
-//GO(g_socket_listener_get_type, 
+GO(g_socket_listener_close, vFp)
+GO(g_socket_listener_get_type, LFv)
 GO(g_socket_listener_new, pFv)
 GO(g_socket_listener_set_backlog, vFpi)
-//GO(g_socket_msg_flags_get_type, 
+GO(g_socket_msg_flags_get_type, LFv)
 GO(g_socket_new, pFuuip)
 GO(g_socket_new_from_fd, pFip)
-//GO(g_socket_protocol_get_type, 
+GO(g_socket_protocol_get_type, LFv)
 GO(g_socket_receive, lFppLpp)
 GO(g_socket_receive_from, lFpppLpp)
 GO(g_socket_receive_message, lFpppippppp)
@@ -1542,26 +1542,26 @@ GO(g_socket_send_with_blocking, lFppLipp)
 GO(g_socket_service_get_type, LFv)
 GO(g_socket_service_is_active, iFp)
 GO(g_socket_service_new, pFv)
-//GO(g_socket_service_start, 
-//GO(g_socket_service_stop, 
-//GO(g_socket_set_blocking, 
-//GO(g_socket_set_broadcast, 
-//GO(g_socket_set_keepalive, 
+GO(g_socket_service_start, vFp)
+GO(g_socket_service_stop, vFp)
+GO(g_socket_set_blocking, vFpi)
+GO(g_socket_set_broadcast, vFpi)
+GO(g_socket_set_keepalive, vFpi)
 GO(g_socket_set_listen_backlog, vFpi)
 GO(g_socket_set_multicast_loopback, vFpi)
 GO(g_socket_set_multicast_ttl, vFpu)
 GO(g_socket_set_option, iFpiiip)
-//GO(g_socket_set_timeout, 
-//GO(g_socket_set_ttl, 
+GO(g_socket_set_timeout, vFpu)
+GO(g_socket_set_ttl, vFpu)
 GO(g_socket_shutdown, iFpiip)
 GO(g_socket_speaks_ipv4, iFp)
-//GO(g_socket_type_get_type, 
+GO(g_socket_type_get_type, LFv)
 GO(g_srv_target_copy, pFp)
 GO(g_srv_target_free, vFp)
 GO(g_srv_target_get_hostname, pFp)
-//GO(g_srv_target_get_port, 
-//GO(g_srv_target_get_priority, 
-//GO(g_srv_target_get_type, 
+GO(g_srv_target_get_port, WFp)
+GO(g_srv_target_get_priority, WFp)
+GO(g_srv_target_get_type, LFv)
 GO(g_srv_target_get_weight, WFp)
 GO(g_srv_target_list_sort, pFp)
 GO(g_srv_target_new, pFpWWW)
@@ -1569,98 +1569,98 @@ GO(g_static_resource_fini, vFp)
 GO(g_static_resource_get_resource, pFp)
 GO(g_static_resource_init, vFp)
 GO(g_subprocess_communicate, iFpppppp)
-//GO(g_subprocess_communicate_async, 
+//GOM(g_subprocess_communicate_async, vFppppp)
 GO(g_subprocess_communicate_finish, iFppppp)
 GO(g_subprocess_communicate_utf8, iFpppppp)
-//GO(g_subprocess_communicate_utf8_async, 
+//GOM(g_subprocess_communicate_utf8_async, vFppppp)
 GO(g_subprocess_communicate_utf8_finish, iFppppp)
-//GO(g_subprocess_flags_get_type, 
-//GO(g_subprocess_force_exit, 
-//GO(g_subprocess_get_exit_status, 
+GO(g_subprocess_flags_get_type, LFv)
+GO(g_subprocess_force_exit, vFp)
+GO(g_subprocess_get_exit_status, iFp)
 GO(g_subprocess_get_identifier, pFp)
-//GO(g_subprocess_get_if_exited, 
+GO(g_subprocess_get_if_exited, iFp)
 GO(g_subprocess_get_if_signaled, iFp)
-//GO(g_subprocess_get_status, 
+GO(g_subprocess_get_status, iFp)
 GO(g_subprocess_get_stderr_pipe, pFp)
 GO(g_subprocess_get_stdin_pipe, pFp)
-//GO(g_subprocess_get_stdout_pipe, 
-//GO(g_subprocess_get_successful, 
+GO(g_subprocess_get_stdout_pipe, pFp)
+GO(g_subprocess_get_successful, iFp)
 GO(g_subprocess_get_term_sig, iFp)
-//GO(g_subprocess_get_type, 
+GO(g_subprocess_get_type, LFv)
 GO(g_subprocess_launcher_getenv, pFpp)
-//GO(g_subprocess_launcher_get_type, 
+GO(g_subprocess_launcher_get_type, LFv)
 GO(g_subprocess_launcher_new, pFu)
-//GO(g_subprocess_launcher_set_child_setup, 
-//GO(g_subprocess_launcher_set_cwd, 
+//GOM(g_subprocess_launcher_set_child_setup, vFpppp)
+GO(g_subprocess_launcher_set_cwd, vFpp)
 GO(g_subprocess_launcher_setenv, vFpppi)
 GO(g_subprocess_launcher_set_environ, vFpp)
 GO(g_subprocess_launcher_set_flags, vFpu)
 GO(g_subprocess_launcher_set_stderr_file_path, vFpp)
-//GO(g_subprocess_launcher_set_stdin_file_path, 
-//GO(g_subprocess_launcher_set_stdout_file_path, 
-//GO(g_subprocess_launcher_spawn, 
+GO(g_subprocess_launcher_set_stdin_file_path, vFpp)
+GO(g_subprocess_launcher_set_stdout_file_path, vFpp)
+//GOM(g_subprocess_launcher_spawn, pFpppV)
 GO(g_subprocess_launcher_spawnv, pFppp)
 GO(g_subprocess_launcher_take_fd, vFpii)
 GO(g_subprocess_launcher_take_stderr_fd, vFpi)
-//GO(g_subprocess_launcher_take_stdin_fd, 
-//GO(g_subprocess_launcher_take_stdout_fd, 
-//GO(g_subprocess_launcher_unsetenv, 
-//GO(g_subprocess_new, 
+GO(g_subprocess_launcher_take_stdin_fd, vFpi)
+GO(g_subprocess_launcher_take_stdout_fd, vFpi)
+GO(g_subprocess_launcher_unsetenv, vFpp)
+//GOM(g_subprocess_new, pFuppV)
 GO(g_subprocess_newv, pFpup)
 GO(g_subprocess_send_signal, vFpi)
-//GO(g_subprocess_wait, 
-//GO(g_subprocess_wait_async, 
+GO(g_subprocess_wait, iFppp)
+//GOM(g_subprocess_wait_async, vFpppp)
 GO(g_subprocess_wait_check, iFppp)
-//GO(g_subprocess_wait_check_async, 
+//GOM(g_subprocess_wait_check_async, vFpppp)
 GO(g_subprocess_wait_check_finish, iFppp)
-//GO(g_subprocess_wait_finish, 
-//GO(g_task_attach_source, 
+GO(g_subprocess_wait_finish, iFppp)
+//GOM(g_task_attach_source, vFppp)
 GO(g_task_get_cancellable, pFp)
-//GO(g_task_get_check_cancellable, 
+GO(g_task_get_check_cancellable, iFp)
 GO(g_task_get_context, pFp)
 GO(g_task_get_priority, iFp)
-//GO(g_task_get_return_on_cancel, 
-//GO(g_task_get_source_object, 
+GO(g_task_get_return_on_cancel, iFp)
+GO(g_task_get_source_object, pFp)
 GO(g_task_get_source_tag, pFp)
-//GO(g_task_get_task_data, 
+GO(g_task_get_task_data, pFp)
 GO(g_task_get_type, LFv)
-//GO(g_task_had_error, 
+GO(g_task_had_error, iFp)
 GO(g_task_is_valid, iFpp)
 GOM(g_task_new, pFEpppp)
 GO(g_task_propagate_boolean, iFpp)
 GO(g_task_propagate_int, lFpp)
 GO(g_task_propagate_pointer, pFpp)
-//GO(g_task_report_error, 
-//GO(g_task_report_new_error, 
+//GOM(g_task_report_error, vFppppp)
+//GOM(g_task_report_new_error, vFppppuipV)
 GO(g_task_return_boolean, vFpi)
 GO(g_task_return_error, vFpp)
-//GO(g_task_return_error_if_cancelled, 
+GO(g_task_return_error_if_cancelled, iFp)
 GO(g_task_return_int, vFpl)
 GOM(g_task_return_new_error, vFEpuipV)
 GOM(g_task_return_pointer, vFEppp)
-//GO(g_task_run_in_thread, 
-//GO(g_task_run_in_thread_sync, 
-//GO(g_task_set_check_cancellable, 
+//GOM(g_task_run_in_thread, vFpp)
+//GOM(g_task_run_in_thread_sync, vFpp)
+GO(g_task_set_check_cancellable, vFpi)
 GO(g_task_set_priority, vFpi)
 GO(g_task_set_return_on_cancel, iFpi)
 GO(g_task_set_source_tag, vFpp)
-//GO(g_task_set_task_data, 
+//GOM(g_task_set_task_data, vFppp)
 GO(g_tcp_connection_get_graceful_disconnect, iFp)
-//GO(g_tcp_connection_get_type, 
+GO(g_tcp_connection_get_type, LFv)
 GO(g_tcp_connection_set_graceful_disconnect, vFpi)
 GO(g_tcp_wrapper_connection_get_base_io_stream, pFp)
-//GO(g_tcp_wrapper_connection_get_type, 
+GO(g_tcp_wrapper_connection_get_type, LFv)
 GO(g_tcp_wrapper_connection_new, pFpp)
 GO(g_test_dbus_add_service_dir, vFpp)
-//GO(g_test_dbus_down, 
-//GO(g_test_dbus_flags_get_type, 
+GO(g_test_dbus_down, vFp)
+GO(g_test_dbus_flags_get_type, LFv)
 GO(g_test_dbus_get_bus_address, pFp)
 GO(g_test_dbus_get_flags, uFp)
-//GO(g_test_dbus_get_type, 
+GO(g_test_dbus_get_type, LFv)
 GO(g_test_dbus_new, pFu)
-//GO(g_test_dbus_stop, 
+GO(g_test_dbus_stop, vFp)
 GO(g_test_dbus_unset, vFv)
-//GO(g_test_dbus_up, 
+GO(g_test_dbus_up, vFp)
 GO(g_themed_icon_append_name, vFpp)
 GO(g_themed_icon_get_names, pFp)
 GO(g_themed_icon_get_type, LFv)
@@ -1669,30 +1669,30 @@ GO(g_themed_icon_new_from_names, pFpi)
 GO(g_themed_icon_new_with_default_fallbacks, pFp)
 GO(g_themed_icon_prepend_name, vFpp)
 //GO(g_threaded_resolver_get_type, 
-//GO(g_threaded_socket_service_get_type, 
+GO(g_threaded_socket_service_get_type, LFv)
 GO(g_threaded_socket_service_new, pFi)
-//GO(g_tls_authentication_mode_get_type, 
-//GO(g_tls_backend_get_certificate_type, 
-//GO(g_tls_backend_get_client_connection_type, 
+GO(g_tls_authentication_mode_get_type, LFv)
+GO(g_tls_backend_get_certificate_type, LFp)
+GO(g_tls_backend_get_client_connection_type, LFp)
 GO(g_tls_backend_get_default, pFv)
 GO(g_tls_backend_get_default_database, pFp)
-//GO(g_tls_backend_get_file_database_type, 
-//GO(g_tls_backend_get_server_connection_type, 
-//GO(g_tls_backend_get_type, 
-//GO(g_tls_backend_supports_tls, 
-//GO(g_tls_certificate_flags_get_type, 
+GO(g_tls_backend_get_file_database_type, LFp)
+GO(g_tls_backend_get_server_connection_type, LFp)
+GO(g_tls_backend_get_type, LFv)
+GO(g_tls_backend_supports_tls, iFp)
+GO(g_tls_certificate_flags_get_type, LFv)
 GO(g_tls_certificate_get_issuer, pFp)
 GO(g_tls_certificate_get_type, LFv)
 GO(g_tls_certificate_is_same, iFpp)
 GO(g_tls_certificate_list_new_from_file, pFpp)
 GO(g_tls_certificate_new_from_file, pFpp)
-//GO(g_tls_certificate_new_from_files, 
+GO(g_tls_certificate_new_from_files, pFppp)
 GO(g_tls_certificate_new_from_pem, pFplp)
-//GO(g_tls_certificate_request_flags_get_type, 
+GO(g_tls_certificate_request_flags_get_type, LFv)
 GO(g_tls_certificate_verify, uFppp)
 GO(g_tls_client_connection_get_accepted_cas, pFp)
 GO(g_tls_client_connection_get_server_identity, pFp)
-//GO(g_tls_client_connection_get_type, 
+GO(g_tls_client_connection_get_type, LFv)
 GO(g_tls_client_connection_get_use_ssl3, iFp)
 GO(g_tls_client_connection_get_validation_flags, uFp)
 GO(g_tls_client_connection_new, pFppp)
@@ -1700,7 +1700,7 @@ GO(g_tls_client_connection_set_server_identity, vFpp)
 GO(g_tls_client_connection_set_use_ssl3, vFpi)
 GO(g_tls_client_connection_set_validation_flags, vFpu)
 GO(g_tls_connection_emit_accept_certificate, iFppu)
-//GO(g_tls_connection_get_certificate, 
+GO(g_tls_connection_get_certificate, pFp)
 GO(g_tls_connection_get_database, pFp)
 GO(g_tls_connection_get_interaction, pFp)
 GO(g_tls_connection_get_peer_certificate, pFp)
@@ -1708,76 +1708,76 @@ GO(g_tls_connection_get_peer_certificate_errors, uFp)
 GO(g_tls_connection_get_rehandshake_mode, uFp)
 GO(g_tls_connection_get_require_close_notify, iFp)
 GO(g_tls_connection_get_type, LFv)
-//GO(g_tls_connection_get_use_system_certdb, 
+GO(g_tls_connection_get_use_system_certdb, iFp)
 GO(g_tls_connection_handshake, iFppp)
-//GO(g_tls_connection_handshake_async, 
+//GOM(g_tls_connection_handshake_async, vFpippp)
 GO(g_tls_connection_handshake_finish, iFppp)
 GO(g_tls_connection_set_certificate, vFpp)
 GO(g_tls_connection_set_database, vFpp)
 GO(g_tls_connection_set_interaction, vFpp)
 GO(g_tls_connection_set_rehandshake_mode, vFpu)
 GO(g_tls_connection_set_require_close_notify, vFpi)
-//GO(g_tls_connection_set_use_system_certdb, 
+GO(g_tls_connection_set_use_system_certdb, vFpi)
 GO(g_tls_database_create_certificate_handle, pFpp)
 GO(g_tls_database_get_type, LFv)
 GO(g_tls_database_lookup_certificate_for_handle, pFpppupp)
-//GO(g_tls_database_lookup_certificate_for_handle_async, 
-//GO(g_tls_database_lookup_certificate_for_handle_finish, 
+//GOM(g_tls_database_lookup_certificate_for_handle_async, vFpppuppp)
+GO(g_tls_database_lookup_certificate_for_handle_finish, pFppp)
 GO(g_tls_database_lookup_certificate_issuer, pFpppupp)
-//GO(g_tls_database_lookup_certificate_issuer_async, 
+//GOM(g_tls_database_lookup_certificate_issuer_async, vFpppuppp)
 GO(g_tls_database_lookup_certificate_issuer_finish, pFppp)
 GO(g_tls_database_lookup_certificates_issued_by, pFpppupp)
-//GO(g_tls_database_lookup_certificates_issued_by_async, 
+//GOM(g_tls_database_lookup_certificates_issued_by_async, vFpppuppp)
 GO(g_tls_database_lookup_certificates_issued_by_finish, pFppp)
-//GO(g_tls_database_lookup_flags_get_type, 
+GO(g_tls_database_lookup_flags_get_type, LFv)
 GO(g_tls_database_verify_chain, uFpppppupp)
-//GO(g_tls_database_verify_chain_async, 
+//GOM(g_tls_database_verify_chain_async, vFpppppuppp)
 GO(g_tls_database_verify_chain_finish, uFppp)
-//GO(g_tls_database_verify_flags_get_type, 
-//GO(g_tls_error_get_type, 
-//GO(g_tls_error_quark, 
-//GO(g_tls_file_database_get_type, 
+GO(g_tls_database_verify_flags_get_type, LFv)
+GO(g_tls_error_get_type, LFv)
+GO(g_tls_error_quark, uFv)
+GO(g_tls_file_database_get_type, LFv)
 GO(g_tls_file_database_new, pFpp)
 GO(g_tls_interaction_ask_password, uFpppp)
-//GO(g_tls_interaction_ask_password_async, 
-//GO(g_tls_interaction_ask_password_finish, 
+//GOM(g_tls_interaction_ask_password_async, vFppppp)
+GO(g_tls_interaction_ask_password_finish, uFppp)
 GO(g_tls_interaction_get_type, LFv)
-//GO(g_tls_interaction_invoke_ask_password, 
-//GO(g_tls_interaction_invoke_request_certificate, 
+GO(g_tls_interaction_invoke_ask_password, uFpppp)
+GO(g_tls_interaction_invoke_request_certificate, uFppupp)
 GO(g_tls_interaction_request_certificate, uFppupp)
-//GO(g_tls_interaction_request_certificate_async, 
+//GOM(g_tls_interaction_request_certificate_async, vFppuppp)
 GO(g_tls_interaction_request_certificate_finish, uFppp)
-//GO(g_tls_interaction_result_get_type, 
-//GO(g_tls_password_flags_get_type, 
-//GO(g_tls_password_get_description, 
+GO(g_tls_interaction_result_get_type, LFv)
+GO(g_tls_password_flags_get_type, LFv)
+GO(g_tls_password_get_description, pFp)
 GO(g_tls_password_get_flags, uFp)
-//GO(g_tls_password_get_type, 
+GO(g_tls_password_get_type, LFv)
 GO(g_tls_password_get_value, pFpp)
 GO(g_tls_password_get_warning, pFp)
 GO(g_tls_password_new, pFup)
-//GO(g_tls_password_set_description, 
+GO(g_tls_password_set_description, vFpp)
 GO(g_tls_password_set_flags, vFpu)
 GO(g_tls_password_set_value, vFppl)
-//GO(g_tls_password_set_value_full, 
+//GOM(g_tls_password_set_value_full, vFpplp)
 GO(g_tls_password_set_warning, vFpp)
-//GO(g_tls_rehandshake_mode_get_type, 
-//GO(g_tls_server_connection_get_type, 
+GO(g_tls_rehandshake_mode_get_type, LFv)
+GO(g_tls_server_connection_get_type, LFv)
 GO(g_tls_server_connection_new, pFppp)
-//GO(g_unix_connection_get_type, 
+GO(g_unix_connection_get_type, LFv)
 GO(g_unix_connection_receive_credentials, pFppp)
-//GO(g_unix_connection_receive_credentials_async, 
+//GOM(g_unix_connection_receive_credentials_async, vFpppp)
 GO(g_unix_connection_receive_credentials_finish, pFppp)
 GO(g_unix_connection_receive_fd, iFppp)
 GO(g_unix_connection_send_credentials, iFppp)
-//GO(g_unix_connection_send_credentials_async, 
+//GOM(g_unix_connection_send_credentials_async, vFpppp)
 GO(g_unix_connection_send_credentials_finish, iFppp)
 GO(g_unix_connection_send_fd, iFpipp)
 GO(g_unix_credentials_message_get_credentials, pFp)
-//GO(g_unix_credentials_message_get_type, 
-//GO(g_unix_credentials_message_is_supported, 
+GO(g_unix_credentials_message_get_type, LFv)
+GO(g_unix_credentials_message_is_supported, iFv)
 GO(g_unix_credentials_message_new, pFv)
 GO(g_unix_credentials_message_new_with_credentials, pFp)
-//GO(g_unix_fd_list_append, 
+GO(g_unix_fd_list_append, iFpip)
 GO(g_unix_fd_list_get, iFpip)
 GO(g_unix_fd_list_get_length, iFp)
 GO(g_unix_fd_list_get_type, LFv)
@@ -1785,105 +1785,105 @@ GO(g_unix_fd_list_new, pFv)
 GO(g_unix_fd_list_new_from_array, pFpi)
 GO(g_unix_fd_list_peek_fds, pFpp)
 GO(g_unix_fd_list_steal_fds, pFpp)
-//GO(g_unix_fd_message_append_fd, 
-//GO(g_unix_fd_message_get_fd_list, 
-//GO(g_unix_fd_message_get_type, 
-//GO(g_unix_fd_message_new, 
-//GO(g_unix_fd_message_new_with_fd_list, 
-//GO(g_unix_fd_message_steal_fds, 
-//GO(g_unix_input_stream_get_close_fd, 
-//GO(g_unix_input_stream_get_fd, 
-//GO(g_unix_input_stream_get_type, 
-//GO(g_unix_input_stream_new, 
-//GO(g_unix_input_stream_set_close_fd, 
-//GO(g_unix_is_mount_path_system_internal, 
-//GO(g_unix_mount_at, 
-//GO(g_unix_mount_compare, 
-//GO(g_unix_mount_free, 
-//GO(g_unix_mount_get_device_path, 
-//GO(g_unix_mount_get_fs_type, 
-//GO(g_unix_mount_get_mount_path, 
-//GO(g_unix_mount_guess_can_eject, 
-//GO(g_unix_mount_guess_icon, 
-//GO(g_unix_mount_guess_name, 
-//GO(g_unix_mount_guess_should_display, 
-//GO(g_unix_mount_guess_symbolic_icon, 
-//GO(g_unix_mount_is_readonly, 
-//GO(g_unix_mount_is_system_internal, 
-//GO(g_unix_mount_monitor_get_type, 
-//GO(g_unix_mount_monitor_new, 
-//GO(g_unix_mount_monitor_set_rate_limit, 
-//GO(g_unix_mount_point_compare, 
-//GO(g_unix_mount_point_free, 
-//GO(g_unix_mount_point_get_device_path, 
-//GO(g_unix_mount_point_get_fs_type, 
-//GO(g_unix_mount_point_get_mount_path, 
-//GO(g_unix_mount_point_get_options, 
-//GO(g_unix_mount_point_guess_can_eject, 
-//GO(g_unix_mount_point_guess_icon, 
-//GO(g_unix_mount_point_guess_name, 
-//GO(g_unix_mount_point_guess_symbolic_icon, 
-//GO(g_unix_mount_point_is_loopback, 
-//GO(g_unix_mount_point_is_readonly, 
-//GO(g_unix_mount_point_is_user_mountable, 
-//GO(g_unix_mount_points_changed_since, 
-//GO(g_unix_mount_points_get, 
-//GO(g_unix_mounts_changed_since, 
-//GO(g_unix_mounts_get, 
-//GO(g_unix_output_stream_get_close_fd, 
-//GO(g_unix_output_stream_get_fd, 
-//GO(g_unix_output_stream_get_type, 
-//GO(g_unix_output_stream_new, 
-//GO(g_unix_output_stream_set_close_fd, 
+GO(g_unix_fd_message_append_fd, iFpip)
+GO(g_unix_fd_message_get_fd_list, pFp)
+GO(g_unix_fd_message_get_type, LFv)
+GO(g_unix_fd_message_new, pFv)
+GO(g_unix_fd_message_new_with_fd_list, pFp)
+GO(g_unix_fd_message_steal_fds, pFpp)
+GO(g_unix_input_stream_get_close_fd, iFp)
+GO(g_unix_input_stream_get_fd, iFp)
+GO(g_unix_input_stream_get_type, LFv)
+GO(g_unix_input_stream_new, pFii)
+GO(g_unix_input_stream_set_close_fd, vFpi)
+GO(g_unix_is_mount_path_system_internal, iFp)
+GO(g_unix_mount_at, pFpp)
+GO(g_unix_mount_compare, iFpp)
+GO(g_unix_mount_free, vFp)
+GO(g_unix_mount_get_device_path, pFp)
+GO(g_unix_mount_get_fs_type, pFp)
+GO(g_unix_mount_get_mount_path, pFp)
+GO(g_unix_mount_guess_can_eject, iFp)
+GO(g_unix_mount_guess_icon, pFp)
+GO(g_unix_mount_guess_name, pFp)
+GO(g_unix_mount_guess_should_display, iFp)
+GO(g_unix_mount_guess_symbolic_icon, pFp)
+GO(g_unix_mount_is_readonly, iFp)
+GO(g_unix_mount_is_system_internal, iFp)
+GO(g_unix_mount_monitor_get_type, LFv)
+GO(g_unix_mount_monitor_new, pFv)
+GO(g_unix_mount_monitor_set_rate_limit, vFpi)
+GO(g_unix_mount_point_compare, iFpp)
+GO(g_unix_mount_point_free, vFp)
+GO(g_unix_mount_point_get_device_path, pFp)
+GO(g_unix_mount_point_get_fs_type, pFp)
+GO(g_unix_mount_point_get_mount_path, pFp)
+GO(g_unix_mount_point_get_options, pFp)
+GO(g_unix_mount_point_guess_can_eject, iFp)
+GO(g_unix_mount_point_guess_icon, pFp)
+GO(g_unix_mount_point_guess_name, pFp)
+GO(g_unix_mount_point_guess_symbolic_icon, pFp)
+GO(g_unix_mount_point_is_loopback, iFp)
+GO(g_unix_mount_point_is_readonly, iFp)
+GO(g_unix_mount_point_is_user_mountable, iFp)
+GO(g_unix_mount_points_changed_since, iFL)
+GO(g_unix_mount_points_get, pFp)
+GO(g_unix_mounts_changed_since, iFL)
+GO(g_unix_mounts_get, pFp)
+GO(g_unix_output_stream_get_close_fd, iFp)
+GO(g_unix_output_stream_get_fd, iFp)
+GO(g_unix_output_stream_get_type, LFv)
+GO(g_unix_output_stream_new, pFii)
+GO(g_unix_output_stream_set_close_fd, vFpi)
 GO(g_unix_socket_address_abstract_names_supported, iFv)
 GO(g_unix_socket_address_get_address_type, uFp)
 GO(g_unix_socket_address_get_is_abstract, iFp)
 GO(g_unix_socket_address_get_path, pFp)
 GO(g_unix_socket_address_get_path_len, LFp)
-//GO(g_unix_socket_address_get_type, 
+GO(g_unix_socket_address_get_type, LFv)
 GO(g_unix_socket_address_new, pFp)
 GO(g_unix_socket_address_new_abstract, pFpi)
 GO(g_unix_socket_address_new_with_type, pFpiu)
-//GO(g_unix_socket_address_type_get_type, 
-//GO(g_vfs_get_default, 
-//GO(g_vfs_get_file_for_path, 
-//GO(g_vfs_get_file_for_uri, 
+GO(g_unix_socket_address_type_get_type, LFv)
+GO(g_vfs_get_default, pFv)
+GO(g_vfs_get_file_for_path, pFpp)
+GO(g_vfs_get_file_for_uri, pFpp)
 GO(g_vfs_get_local, pFv)
 GO(g_vfs_get_supported_uri_schemes, pFp)
-//GO(g_vfs_get_type, 
+GO(g_vfs_get_type, LFv)
 GO(g_vfs_is_active, iFp)
 GO(g_vfs_parse_name, pFpp)
-//GO(g_volume_can_eject, 
-//GO(g_volume_can_mount, 
-//GO(g_volume_eject, 
-//GO(g_volume_eject_finish, 
-//GO(g_volume_eject_with_operation, 
+GO(g_volume_can_eject, iFp)
+GO(g_volume_can_mount, iFp)
+//GOM(g_volume_eject, vFpuppp)
+GO(g_volume_eject_finish, iFppp)
+//GOM(g_volume_eject_with_operation, vFpupppp)
 GO(g_volume_eject_with_operation_finish, iFppp)
 GO(g_volume_enumerate_identifiers, pFp)
 GO(g_volume_get_activation_root, pFp)
 GO(g_volume_get_drive, pFp)
-//GO(g_volume_get_icon, 
+GO(g_volume_get_icon, pFp)
 GO(g_volume_get_identifier, pFpp)
 GO(g_volume_get_mount, pFp)
-//GO(g_volume_get_name, 
+GO(g_volume_get_name, pFp)
 GO(g_volume_get_sort_key, pFp)
 GO(g_volume_get_symbolic_icon, pFp)
-//GO(g_volume_get_type, 
+GO(g_volume_get_type, LFv)
 GO(g_volume_get_uuid, pFp)
 GO(g_volume_monitor_adopt_orphan_mount, pFp)
 GO(g_volume_monitor_get, pFv)
-//GO(g_volume_monitor_get_connected_drives, 
+GO(g_volume_monitor_get_connected_drives, pFp)
 GO(g_volume_monitor_get_mount_for_uuid, pFpp)
 GO(g_volume_monitor_get_mounts, pFp)
-//GO(g_volume_monitor_get_type, 
+GO(g_volume_monitor_get_type, LFv)
 GO(g_volume_monitor_get_volume_for_uuid, pFpp)
-//GO(g_volume_monitor_get_volumes, 
-//GO(g_volume_mount, 
-//GO(g_volume_mount_finish, 
+GO(g_volume_monitor_get_volumes, pFp)
+//GOM(g_volume_mount, vFpupppp)
+GO(g_volume_mount_finish, iFppp)
 GO(g_volume_should_automount, iFp)
-//GO(g_zlib_compressor_format_get_type, 
+GO(g_zlib_compressor_format_get_type, LFv)
 GO(g_zlib_compressor_get_file_info, pFp)
-//GO(g_zlib_compressor_get_type, 
+GO(g_zlib_compressor_get_type, LFv)
 GO(g_zlib_compressor_new, pFui)
 GO(g_zlib_compressor_set_file_info, vFpp)
 GO(g_zlib_decompressor_get_file_info, pFp)