[WRAPPER] Reworked libgobject-2.0 with new wrapperhelper

6 files changed, 198 insertions, 194 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 41e4ab4a..2f944729 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -682,6 +682,7 @@
 #() lFppp
 #() lFppS
 #() lFSpl
+#() LFEpp
 #() LFEpA
 #() LFipL
 #() LFuui
@@ -805,7 +806,6 @@
 #() iWppp
 #() uWpui
 #() uWpup
-#() vFEiip
 #() vFEipp
 #() vFEipV
 #() vFEipA
@@ -816,6 +816,7 @@
 #() vFEpuV
 #() vFEpuA
 #() vFEpUp
+#() vFEpLp
 #() vFEppp
 #() vFEppV
 #() vFEppA
@@ -1360,8 +1361,8 @@
 #() vFEpipA
 #() vFEpuup
 #() vFEpuuV
+#() vFEpuuA
 #() vFEpupp
-#() vFEpupA
 #() vFEpLLp
 #() vFEppip
 #() vFEppiV
@@ -1734,11 +1735,11 @@
 #() lFppupp
 #() lFppLpL
 #() lFppLpp
-#() LFELppi
+#() LFELppu
 #() LFEpppp
 #() LFLpppL
 #() LFpuipp
-#() LFpuppi
+#() LFpuupi
 #() LFpLuuu
 #() LFpLLLp
 #() LFpLpuu
@@ -2192,10 +2193,10 @@
 #() lFpuuLLp
 #() lFppLipp
 #() lFpppLpp
-#() LFEupppp
-#() LFELpppi
+#() LFEuuppp
+#() LFELpppu
 #() LFEpippp
-#() LFEppppi
+#() LFEppppu
 #() LFpipipi
 #() LFpLippp
 #() LFpLLLLL
@@ -2718,7 +2719,7 @@
 #() iFbupppWWu
 #() CFuiifpppp
 #() uFEipupppp
-#() uFEpiupppp
+#() uFEpuuuppp
 #() uFEppupppp
 #() uFEpppuppp
 #() uFEppppppp
@@ -2734,7 +2735,7 @@
 #() uFbCuuuCup
 #() uFbWWWWWWp
 #() LFELpupupu
-#() LFEpiupppp
+#() LFEpuuuppp
 #() LFpLpuuLLu
 #() pFEiplllpp
 #() pFEipLLLpp
@@ -3031,9 +3032,9 @@
 #() iFppuppLLpupp
 #() iFpppiiuuiiuu
 #() iFpppppiiuupp
-#() uFEpLiupppLuV
-#() uFEpLippppLup
-#() uFEpLippppLuA
+#() uFEpLuupppLuV
+#() uFEpLuppppLup
+#() uFEpLuppppLuA
 #() uFEppppppuppp
 #() uFppppppppppp
 #() pFEpipppppppi
@@ -3739,21 +3740,21 @@ wrappedgobject2:
   - g_type_class_peek_parent
 - vFpp:
   - g_closure_set_marshal
-- iFpp:
+- LFpp:
   - g_param_type_register_static
 - pFpp:
   - g_value_array_sort
-- vFiip:
-  - g_value_register_transform_func
 - vFLLp:
   - g_type_add_interface_static
+  - g_value_register_transform_func
 - vFpup:
   - g_object_class_install_properties
+- vFpLp:
+  - g_signal_override_class_handler
 - vFppp:
   - g_closure_add_finalize_notifier
   - g_closure_remove_finalize_notifier
   - g_object_weak_ref
-  - g_signal_override_class_handler
 - vFppV:
   - g_object_get
   - g_object_set
@@ -3774,36 +3775,36 @@ wrappedgobject2:
   - g_object_connect
 - vFpuuV:
   - g_signal_emit
+- vFpuuA:
+  - g_signal_emit_valist
 - vFpupp:
+  - g_object_set_qdata_full
   - g_param_spec_set_qdata_full
-- vFpupA:
-  - g_signal_emit_valist
 - vFpppp:
   - g_object_set_data_full
-  - g_object_set_qdata_full
-- LFLppi:
+- LFLppu:
   - g_type_register_static
-- LFupppp:
+- LFuuppp:
   - g_signal_add_emission_hook
-- LFLpppi:
+- LFLpppu:
   - g_type_register_fundamental
-- LFppppi:
+- LFppppu:
   - g_signal_connect_object
 - LFpppppu:
   - g_signal_connect_data
-- uFpiupppp:
+- uFpuuuppp:
   - g_signal_handlers_block_matched
   - g_signal_handlers_disconnect_matched
   - g_signal_handlers_unblock_matched
 - LFLpupupu:
   - g_type_register_static_simple
-- LFpiupppp:
+- LFpuuuppp:
   - g_signal_handler_find
-- uFpLiupppLuV:
+- uFpLuupppLuV:
   - g_signal_new
-- uFpLippppLup:
+- uFpLuppppLup:
   - g_signal_newv
-- uFpLippppLuA:
+- uFpLuppppLuA:
   - g_signal_new_valist
 wrappedgomp:
 - vFppuu:
diff --git a/src/wrapped/generated/wrappedgobject2types.h b/src/wrapped/generated/wrappedgobject2types.h
index 3bb9aba5..54038c97 100644
--- a/src/wrapped/generated/wrappedgobject2types.h
+++ b/src/wrapped/generated/wrappedgobject2types.h
@@ -14,11 +14,11 @@
 typedef void* (*pFL_t)(uintptr_t);
 typedef void* (*pFp_t)(void*);
 typedef void (*vFpp_t)(void*, void*);
-typedef int32_t (*iFpp_t)(void*, void*);
+typedef uintptr_t (*LFpp_t)(void*, void*);
 typedef void* (*pFpp_t)(void*, void*);
-typedef void (*vFiip_t)(int32_t, int32_t, void*);
 typedef void (*vFLLp_t)(uintptr_t, uintptr_t, void*);
 typedef void (*vFpup_t)(void*, uint32_t, void*);
+typedef void (*vFpLp_t)(void*, uintptr_t, void*);
 typedef void (*vFppp_t)(void*, void*, void*);
 typedef void (*vFppV_t)(void*, void*, ...);
 typedef void (*vFppA_t)(void*, void*, va_list);
@@ -28,34 +28,34 @@ typedef void* (*pFLpA_t)(uintptr_t, void*, va_list);
 typedef void* (*pFppp_t)(void*, void*, void*);
 typedef void* (*pFppV_t)(void*, void*, ...);
 typedef void (*vFpuuV_t)(void*, uint32_t, uint32_t, ...);
+typedef void (*vFpuuA_t)(void*, uint32_t, uint32_t, va_list);
 typedef void (*vFpupp_t)(void*, uint32_t, void*, void*);
-typedef void (*vFpupA_t)(void*, uint32_t, void*, va_list);
 typedef void (*vFpppp_t)(void*, void*, void*, void*);
-typedef uintptr_t (*LFLppi_t)(uintptr_t, void*, void*, int32_t);
-typedef uintptr_t (*LFupppp_t)(uint32_t, void*, void*, void*, void*);
-typedef uintptr_t (*LFLpppi_t)(uintptr_t, void*, void*, void*, int32_t);
-typedef uintptr_t (*LFppppi_t)(void*, void*, void*, void*, int32_t);
+typedef uintptr_t (*LFLppu_t)(uintptr_t, void*, void*, uint32_t);
+typedef uintptr_t (*LFuuppp_t)(uint32_t, uint32_t, void*, void*, void*);
+typedef uintptr_t (*LFLpppu_t)(uintptr_t, void*, void*, void*, uint32_t);
+typedef uintptr_t (*LFppppu_t)(void*, void*, void*, void*, uint32_t);
 typedef uintptr_t (*LFpppppu_t)(void*, void*, void*, void*, void*, uint32_t);
-typedef uint32_t (*uFpiupppp_t)(void*, int32_t, uint32_t, void*, void*, void*, void*);
+typedef uint32_t (*uFpuuuppp_t)(void*, uint32_t, uint32_t, uint32_t, void*, void*, void*);
 typedef uintptr_t (*LFLpupupu_t)(uintptr_t, void*, uint32_t, void*, uint32_t, void*, uint32_t);
-typedef uintptr_t (*LFpiupppp_t)(void*, int32_t, uint32_t, void*, void*, void*, void*);
-typedef uint32_t (*uFpLiupppLuV_t)(void*, uintptr_t, int32_t, uint32_t, void*, void*, void*, uintptr_t, uint32_t, ...);
-typedef uint32_t (*uFpLippppLup_t)(void*, uintptr_t, int32_t, void*, void*, void*, void*, uintptr_t, uint32_t, void*);
-typedef uint32_t (*uFpLippppLuA_t)(void*, uintptr_t, int32_t, void*, void*, void*, void*, uintptr_t, uint32_t, va_list);
+typedef uintptr_t (*LFpuuuppp_t)(void*, uint32_t, uint32_t, uint32_t, void*, void*, void*);
+typedef uint32_t (*uFpLuupppLuV_t)(void*, uintptr_t, uint32_t, uint32_t, void*, void*, void*, uintptr_t, uint32_t, ...);
+typedef uint32_t (*uFpLuppppLup_t)(void*, uintptr_t, uint32_t, void*, void*, void*, void*, uintptr_t, uint32_t, void*);
+typedef uint32_t (*uFpLuppppLuA_t)(void*, uintptr_t, uint32_t, void*, void*, void*, void*, uintptr_t, uint32_t, va_list);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(g_type_value_table_peek, pFL_t) \
 	GO(g_type_class_peek_parent, pFp_t) \
 	GO(g_closure_set_marshal, vFpp_t) \
-	GO(g_param_type_register_static, iFpp_t) \
+	GO(g_param_type_register_static, LFpp_t) \
 	GO(g_value_array_sort, pFpp_t) \
-	GO(g_value_register_transform_func, vFiip_t) \
 	GO(g_type_add_interface_static, vFLLp_t) \
+	GO(g_value_register_transform_func, vFLLp_t) \
 	GO(g_object_class_install_properties, vFpup_t) \
+	GO(g_signal_override_class_handler, vFpLp_t) \
 	GO(g_closure_add_finalize_notifier, vFppp_t) \
 	GO(g_closure_remove_finalize_notifier, vFppp_t) \
 	GO(g_object_weak_ref, vFppp_t) \
-	GO(g_signal_override_class_handler, vFppp_t) \
 	GO(g_object_get, vFppV_t) \
 	GO(g_object_set, vFppV_t) \
 	GO(g_object_get_valist, vFppA_t) \
@@ -68,22 +68,22 @@ typedef uint32_t (*uFpLippppLuA_t)(void*, uintptr_t, int32_t, void*, void*, void
 	GO(g_value_array_sort_with_data, pFppp_t) \
 	GO(g_object_connect, pFppV_t) \
 	GO(g_signal_emit, vFpuuV_t) \
+	GO(g_signal_emit_valist, vFpuuA_t) \
+	GO(g_object_set_qdata_full, vFpupp_t) \
 	GO(g_param_spec_set_qdata_full, vFpupp_t) \
-	GO(g_signal_emit_valist, vFpupA_t) \
 	GO(g_object_set_data_full, vFpppp_t) \
-	GO(g_object_set_qdata_full, vFpppp_t) \
-	GO(g_type_register_static, LFLppi_t) \
-	GO(g_signal_add_emission_hook, LFupppp_t) \
-	GO(g_type_register_fundamental, LFLpppi_t) \
-	GO(g_signal_connect_object, LFppppi_t) \
+	GO(g_type_register_static, LFLppu_t) \
+	GO(g_signal_add_emission_hook, LFuuppp_t) \
+	GO(g_type_register_fundamental, LFLpppu_t) \
+	GO(g_signal_connect_object, LFppppu_t) \
 	GO(g_signal_connect_data, LFpppppu_t) \
-	GO(g_signal_handlers_block_matched, uFpiupppp_t) \
-	GO(g_signal_handlers_disconnect_matched, uFpiupppp_t) \
-	GO(g_signal_handlers_unblock_matched, uFpiupppp_t) \
+	GO(g_signal_handlers_block_matched, uFpuuuppp_t) \
+	GO(g_signal_handlers_disconnect_matched, uFpuuuppp_t) \
+	GO(g_signal_handlers_unblock_matched, uFpuuuppp_t) \
 	GO(g_type_register_static_simple, LFLpupupu_t) \
-	GO(g_signal_handler_find, LFpiupppp_t) \
-	GO(g_signal_new, uFpLiupppLuV_t) \
-	GO(g_signal_newv, uFpLippppLup_t) \
-	GO(g_signal_new_valist, uFpLippppLuA_t)
+	GO(g_signal_handler_find, LFpuuuppp_t) \
+	GO(g_signal_new, uFpLuupppLuV_t) \
+	GO(g_signal_newv, uFpLuppppLup_t) \
+	GO(g_signal_new_valist, uFpLuppppLuA_t)
 
 #endif // __wrappedgobject2TYPES_H_
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index c7398cd2..b878a617 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -714,6 +714,7 @@ typedef intptr_t (*lFppL_t)(void*, void*, uintptr_t);
 typedef intptr_t (*lFppp_t)(void*, void*, void*);
 typedef intptr_t (*lFppS_t)(void*, void*, void*);
 typedef intptr_t (*lFSpl_t)(void*, void*, intptr_t);
+typedef uintptr_t (*LFEpp_t)(x64emu_t*, void*, void*);
 typedef uintptr_t (*LFEpA_t)(x64emu_t*, void*, void*);
 typedef uintptr_t (*LFipL_t)(int32_t, void*, uintptr_t);
 typedef uintptr_t (*LFuui_t)(uint32_t, uint32_t, int32_t);
@@ -836,7 +837,6 @@ typedef int32_t (*iWppu_t)(void*, void*, uint32_t);
 typedef int32_t (*iWppp_t)(void*, void*, void*);
 typedef uint32_t (*uWpui_t)(void*, uint32_t, int32_t);
 typedef uint32_t (*uWpup_t)(void*, uint32_t, void*);
-typedef void (*vFEiip_t)(x64emu_t*, int32_t, int32_t, void*);
 typedef void (*vFEipp_t)(x64emu_t*, int32_t, void*, void*);
 typedef void (*vFEipV_t)(x64emu_t*, int32_t, void*, void*);
 typedef void (*vFEipA_t)(x64emu_t*, int32_t, void*, void*);
@@ -847,6 +847,7 @@ typedef void (*vFEpup_t)(x64emu_t*, void*, uint32_t, void*);
 typedef void (*vFEpuV_t)(x64emu_t*, void*, uint32_t, void*);
 typedef void (*vFEpuA_t)(x64emu_t*, void*, uint32_t, void*);
 typedef void (*vFEpUp_t)(x64emu_t*, void*, uint64_t, void*);
+typedef void (*vFEpLp_t)(x64emu_t*, void*, uintptr_t, void*);
 typedef void (*vFEppp_t)(x64emu_t*, void*, void*, void*);
 typedef void (*vFEppV_t)(x64emu_t*, void*, void*, void*);
 typedef void (*vFEppA_t)(x64emu_t*, void*, void*, void*);
@@ -1389,8 +1390,8 @@ typedef void (*vFEpipV_t)(x64emu_t*, void*, int32_t, void*, void*);
 typedef void (*vFEpipA_t)(x64emu_t*, void*, int32_t, void*, void*);
 typedef void (*vFEpuup_t)(x64emu_t*, void*, uint32_t, uint32_t, void*);
 typedef void (*vFEpuuV_t)(x64emu_t*, void*, uint32_t, uint32_t, void*);
+typedef void (*vFEpuuA_t)(x64emu_t*, void*, uint32_t, uint32_t, void*);
 typedef void (*vFEpupp_t)(x64emu_t*, void*, uint32_t, void*, void*);
-typedef void (*vFEpupA_t)(x64emu_t*, void*, uint32_t, void*, void*);
 typedef void (*vFEpLLp_t)(x64emu_t*, void*, uintptr_t, uintptr_t, void*);
 typedef void (*vFEppip_t)(x64emu_t*, void*, void*, int32_t, void*);
 typedef void (*vFEppiV_t)(x64emu_t*, void*, void*, int32_t, void*);
@@ -1763,11 +1764,11 @@ typedef intptr_t (*lFpuuLL_t)(void*, uint32_t, uint32_t, uintptr_t, uintptr_t);
 typedef intptr_t (*lFppupp_t)(void*, void*, uint32_t, void*, void*);
 typedef intptr_t (*lFppLpL_t)(void*, void*, uintptr_t, void*, uintptr_t);
 typedef intptr_t (*lFppLpp_t)(void*, void*, uintptr_t, void*, void*);
-typedef uintptr_t (*LFELppi_t)(x64emu_t*, uintptr_t, void*, void*, int32_t);
+typedef uintptr_t (*LFELppu_t)(x64emu_t*, uintptr_t, void*, void*, uint32_t);
 typedef uintptr_t (*LFEpppp_t)(x64emu_t*, void*, void*, void*, void*);
 typedef uintptr_t (*LFLpppL_t)(uintptr_t, void*, void*, void*, uintptr_t);
 typedef uintptr_t (*LFpuipp_t)(void*, uint32_t, int32_t, void*, void*);
-typedef uintptr_t (*LFpuppi_t)(void*, uint32_t, void*, void*, int32_t);
+typedef uintptr_t (*LFpuupi_t)(void*, uint32_t, uint32_t, void*, int32_t);
 typedef uintptr_t (*LFpLuuu_t)(void*, uintptr_t, uint32_t, uint32_t, uint32_t);
 typedef uintptr_t (*LFpLLLp_t)(void*, uintptr_t, uintptr_t, uintptr_t, void*);
 typedef uintptr_t (*LFpLpuu_t)(void*, uintptr_t, void*, uint32_t, uint32_t);
@@ -2220,10 +2221,10 @@ typedef intptr_t (*lFpipill_t)(void*, int32_t, void*, int32_t, intptr_t, intptr_
 typedef intptr_t (*lFpuuLLp_t)(void*, uint32_t, uint32_t, uintptr_t, uintptr_t, void*);
 typedef intptr_t (*lFppLipp_t)(void*, void*, uintptr_t, int32_t, void*, void*);
 typedef intptr_t (*lFpppLpp_t)(void*, void*, void*, uintptr_t, void*, void*);
-typedef uintptr_t (*LFEupppp_t)(x64emu_t*, uint32_t, void*, void*, void*, void*);
-typedef uintptr_t (*LFELpppi_t)(x64emu_t*, uintptr_t, void*, void*, void*, int32_t);
+typedef uintptr_t (*LFEuuppp_t)(x64emu_t*, uint32_t, uint32_t, void*, void*, void*);
+typedef uintptr_t (*LFELpppu_t)(x64emu_t*, uintptr_t, void*, void*, void*, uint32_t);
 typedef uintptr_t (*LFEpippp_t)(x64emu_t*, void*, int32_t, void*, void*, void*);
-typedef uintptr_t (*LFEppppi_t)(x64emu_t*, void*, void*, void*, void*, int32_t);
+typedef uintptr_t (*LFEppppu_t)(x64emu_t*, void*, void*, void*, void*, uint32_t);
 typedef uintptr_t (*LFpipipi_t)(void*, int32_t, void*, int32_t, void*, int32_t);
 typedef uintptr_t (*LFpLippp_t)(void*, uintptr_t, int32_t, void*, void*, void*);
 typedef uintptr_t (*LFpLLLLL_t)(void*, uintptr_t, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
@@ -2746,7 +2747,7 @@ typedef int32_t (*iFbWWipppp_t)(void*, uint16_t, uint16_t, int32_t, 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 (*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 (*uFEpuuuppp_t)(x64emu_t*, void*, uint32_t, uint32_t, uint32_t, 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*);
@@ -2762,7 +2763,7 @@ typedef uint32_t (*uFpppppupp_t)(void*, void*, void*, void*, void*, uint32_t, vo
 typedef uint32_t (*uFbCuuuCup_t)(void*, uint8_t, uint32_t, uint32_t, uint32_t, uint8_t, uint32_t, void*);
 typedef uint32_t (*uFbWWWWWWp_t)(void*, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, uint16_t, void*);
 typedef uintptr_t (*LFELpupupu_t)(x64emu_t*, uintptr_t, void*, uint32_t, void*, uint32_t, void*, uint32_t);
-typedef uintptr_t (*LFEpiupppp_t)(x64emu_t*, void*, int32_t, uint32_t, void*, void*, void*, void*);
+typedef uintptr_t (*LFEpuuuppp_t)(x64emu_t*, void*, uint32_t, uint32_t, uint32_t, void*, void*, void*);
 typedef uintptr_t (*LFpLpuuLLu_t)(void*, uintptr_t, void*, uint32_t, uint32_t, uintptr_t, uintptr_t, uint32_t);
 typedef void* (*pFEiplllpp_t)(x64emu_t*, int32_t, void*, intptr_t, intptr_t, intptr_t, void*, void*);
 typedef void* (*pFEipLLLpp_t)(x64emu_t*, int32_t, void*, uintptr_t, uintptr_t, uintptr_t, void*, void*);
@@ -3058,9 +3059,9 @@ typedef int32_t (*iFppippipppip_t)(void*, void*, int32_t, void*, void*, int32_t,
 typedef int32_t (*iFppuppLLpupp_t)(void*, void*, uint32_t, void*, void*, uintptr_t, uintptr_t, void*, uint32_t, void*, void*);
 typedef int32_t (*iFpppiiuuiiuu_t)(void*, void*, void*, int32_t, int32_t, uint32_t, uint32_t, int32_t, int32_t, uint32_t, uint32_t);
 typedef int32_t (*iFpppppiiuupp_t)(void*, void*, void*, void*, void*, int32_t, int32_t, uint32_t, uint32_t, void*, void*);
-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 (*uFEpLuupppLuV_t)(x64emu_t*, void*, uintptr_t, uint32_t, uint32_t, void*, void*, void*, uintptr_t, uint32_t, void*);
+typedef uint32_t (*uFEpLuppppLup_t)(x64emu_t*, void*, uintptr_t, uint32_t, void*, void*, void*, void*, uintptr_t, uint32_t, void*);
+typedef uint32_t (*uFEpLuppppLuA_t)(x64emu_t*, void*, uintptr_t, uint32_t, void*, void*, void*, void*, uintptr_t, uint32_t, 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);
@@ -3916,6 +3917,7 @@ void lFppL(x64emu_t *emu, uintptr_t fcn) { lFppL_t fn = (lFppL_t)fcn; R_RAX=(int
 void lFppp(x64emu_t *emu, uintptr_t fcn) { lFppp_t fn = (lFppp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void lFppS(x64emu_t *emu, uintptr_t fcn) { lFppS_t fn = (lFppS_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, io_convert((void*)R_RDX)); }
 void lFSpl(x64emu_t *emu, uintptr_t fcn) { lFSpl_t fn = (lFSpl_t)fcn; R_RAX=(intptr_t)fn(io_convert((void*)R_RDI), (void*)R_RSI, (intptr_t)R_RDX); }
+void LFEpp(x64emu_t *emu, uintptr_t fcn) { LFEpp_t fn = (LFEpp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI); }
 void LFEpA(x64emu_t *emu, uintptr_t fcn) { LFEpA_t fn = (LFEpA_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI); }
 void LFipL(x64emu_t *emu, uintptr_t fcn) { LFipL_t fn = (LFipL_t)fcn; R_RAX=(uintptr_t)fn((int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void LFuui(x64emu_t *emu, uintptr_t fcn) { LFuui_t fn = (LFuui_t)fcn; R_RAX=(uintptr_t)fn((uint32_t)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
@@ -4038,7 +4040,6 @@ void iWppu(x64emu_t *emu, uintptr_t fcn) { iWppu_t fn = (iWppu_t)fcn; R_RAX=(int
 void iWppp(x64emu_t *emu, uintptr_t fcn) { iWppp_t fn = (iWppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RCX, (void*)R_RDX, (void*)R_R8); }
 void uWpui(x64emu_t *emu, uintptr_t fcn) { uWpui_t fn = (uWpui_t)fcn; R_RAX=(uint32_t)fn((void*)R_RCX, (uint32_t)R_RDX, (int32_t)R_R8); }
 void uWpup(x64emu_t *emu, uintptr_t fcn) { uWpup_t fn = (uWpup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RCX, (uint32_t)R_RDX, (void*)R_R8); }
-void vFEiip(x64emu_t *emu, uintptr_t fcn) { vFEiip_t fn = (vFEiip_t)fcn; fn(emu, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
 void vFEipp(x64emu_t *emu, uintptr_t fcn) { vFEipp_t fn = (vFEipp_t)fcn; fn(emu, (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void vFEipV(x64emu_t *emu, uintptr_t fcn) { vFEipV_t fn = (vFEipV_t)fcn; fn(emu, (int32_t)R_RDI, (void*)R_RSI, (void*)(R_RSP + 8)); }
 void vFEipA(x64emu_t *emu, uintptr_t fcn) { vFEipA_t fn = (vFEipA_t)fcn; fn(emu, (int32_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
@@ -4049,6 +4050,7 @@ void vFEpup(x64emu_t *emu, uintptr_t fcn) { vFEpup_t fn = (vFEpup_t)fcn; fn(emu,
 void vFEpuV(x64emu_t *emu, uintptr_t fcn) { vFEpuV_t fn = (vFEpuV_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)(R_RSP + 8)); }
 void vFEpuA(x64emu_t *emu, uintptr_t fcn) { vFEpuA_t fn = (vFEpuA_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX); }
 void vFEpUp(x64emu_t *emu, uintptr_t fcn) { vFEpUp_t fn = (vFEpUp_t)fcn; fn(emu, (void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX); }
+void vFEpLp(x64emu_t *emu, uintptr_t fcn) { vFEpLp_t fn = (vFEpLp_t)fcn; fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void vFEppp(x64emu_t *emu, uintptr_t fcn) { vFEppp_t fn = (vFEppp_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void vFEppV(x64emu_t *emu, uintptr_t fcn) { vFEppV_t fn = (vFEppV_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)(R_RSP + 8)); }
 void vFEppA(x64emu_t *emu, uintptr_t fcn) { vFEppA_t fn = (vFEppA_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
@@ -4591,8 +4593,8 @@ void vFEpipV(x64emu_t *emu, uintptr_t fcn) { vFEpipV_t fn = (vFEpipV_t)fcn; fn(e
 void vFEpipA(x64emu_t *emu, uintptr_t fcn) { vFEpipA_t fn = (vFEpipA_t)fcn; fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void vFEpuup(x64emu_t *emu, uintptr_t fcn) { vFEpuup_t fn = (vFEpuup_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void vFEpuuV(x64emu_t *emu, uintptr_t fcn) { vFEpuuV_t fn = (vFEpuuV_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)(R_RSP + 8)); }
+void vFEpuuA(x64emu_t *emu, uintptr_t fcn) { vFEpuuA_t fn = (vFEpuuA_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void vFEpupp(x64emu_t *emu, uintptr_t fcn) { vFEpupp_t fn = (vFEpupp_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
-void vFEpupA(x64emu_t *emu, uintptr_t fcn) { vFEpupA_t fn = (vFEpupA_t)fcn; fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void vFEpLLp(x64emu_t *emu, uintptr_t fcn) { vFEpLLp_t fn = (vFEpLLp_t)fcn; fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX); }
 void vFEppip(x64emu_t *emu, uintptr_t fcn) { vFEppip_t fn = (vFEppip_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void vFEppiV(x64emu_t *emu, uintptr_t fcn) { vFEppiV_t fn = (vFEppiV_t)fcn; fn(emu, (void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)(R_RSP + 8)); }
@@ -4965,11 +4967,11 @@ void lFpuuLL(x64emu_t *emu, uintptr_t fcn) { lFpuuLL_t fn = (lFpuuLL_t)fcn; R_RA
 void lFppupp(x64emu_t *emu, uintptr_t fcn) { lFppupp_t fn = (lFppupp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void lFppLpL(x64emu_t *emu, uintptr_t fcn) { lFppLpL_t fn = (lFppLpL_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void lFppLpp(x64emu_t *emu, uintptr_t fcn) { lFppLpp_t fn = (lFppLpp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
-void LFELppi(x64emu_t *emu, uintptr_t fcn) { LFELppi_t fn = (LFELppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
+void LFELppu(x64emu_t *emu, uintptr_t fcn) { LFELppu_t fn = (LFELppu_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void LFEpppp(x64emu_t *emu, uintptr_t fcn) { LFEpppp_t fn = (LFEpppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void LFLpppL(x64emu_t *emu, uintptr_t fcn) { LFLpppL_t fn = (LFLpppL_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void LFpuipp(x64emu_t *emu, uintptr_t fcn) { LFpuipp_t fn = (LFpuipp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
-void LFpuppi(x64emu_t *emu, uintptr_t fcn) { LFpuppi_t fn = (LFpuppi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
+void LFpuupi(x64emu_t *emu, uintptr_t fcn) { LFpuupi_t fn = (LFpuupi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
 void LFpLuuu(x64emu_t *emu, uintptr_t fcn) { LFpLuuu_t fn = (LFpLuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
 void LFpLLLp(x64emu_t *emu, uintptr_t fcn) { LFpLLLp_t fn = (LFpLLLp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
 void LFpLpuu(x64emu_t *emu, uintptr_t fcn) { LFpLpuu_t fn = (LFpLpuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
@@ -5422,10 +5424,10 @@ void lFpipill(x64emu_t *emu, uintptr_t fcn) { lFpipill_t fn = (lFpipill_t)fcn; R
 void lFpuuLLp(x64emu_t *emu, uintptr_t fcn) { lFpuuLLp_t fn = (lFpuuLLp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9); }
 void lFppLipp(x64emu_t *emu, uintptr_t fcn) { lFppLipp_t fn = (lFppLipp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void lFpppLpp(x64emu_t *emu, uintptr_t fcn) { lFpppLpp_t fn = (lFpppLpp_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9); }
-void LFEupppp(x64emu_t *emu, uintptr_t fcn) { LFEupppp_t fn = (LFEupppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (uint32_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
-void LFELpppi(x64emu_t *emu, uintptr_t fcn) { LFELpppi_t fn = (LFELpppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
+void LFEuuppp(x64emu_t *emu, uintptr_t fcn) { LFEuuppp_t fn = (LFEuuppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (uint32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void LFELpppu(x64emu_t *emu, uintptr_t fcn) { LFELpppu_t fn = (LFELpppu_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void LFEpippp(x64emu_t *emu, uintptr_t fcn) { LFEpippp_t fn = (LFEpippp_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 LFEppppi(x64emu_t *emu, uintptr_t fcn) { LFEppppi_t fn = (LFEppppi_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 LFEppppu(x64emu_t *emu, uintptr_t fcn) { LFEppppu_t fn = (LFEppppu_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uint32_t)R_R8); }
 void LFpipipi(x64emu_t *emu, uintptr_t fcn) { LFpipipi_t fn = (LFpipipi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8, (int32_t)R_R9); }
 void LFpLippp(x64emu_t *emu, uintptr_t fcn) { LFpLippp_t fn = (LFpLippp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void LFpLLLLL(x64emu_t *emu, uintptr_t fcn) { LFpLLLLL_t fn = (LFpLLLLL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9); }
@@ -5948,7 +5950,7 @@ void iFbWWipppp(x64emu_t *emu, uintptr_t fcn) { iFbWWipppp_t fn = (iFbWWipppp_t)
 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 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 uFEpuuuppp(x64emu_t *emu, uintptr_t fcn) { uFEpuuuppp_t fn = (uFEpuuuppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)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)); }
@@ -5964,7 +5966,7 @@ void uFpppppupp(x64emu_t *emu, uintptr_t fcn) { uFpppppupp_t fn = (uFpppppupp_t)
 void uFbCuuuCup(x64emu_t *emu, uintptr_t fcn) { uFbCuuuCup_t fn = (uFbCuuuCup_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uint32_t)fn(aligned_xcb, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uint8_t)R_R9, *(uint32_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void uFbWWWWWWp(x64emu_t *emu, uintptr_t fcn) { uFbWWWWWWp_t fn = (uFbWWWWWWp_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uint32_t)fn(aligned_xcb, (uint16_t)R_RSI, (uint16_t)R_RDX, (uint16_t)R_RCX, (uint16_t)R_R8, (uint16_t)R_R9, *(uint16_t*)(R_RSP + 8), *(void**)(R_RSP + 16)); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
 void LFELpupupu(x64emu_t *emu, uintptr_t fcn) { LFELpupupu_t fn = (LFELpupupu_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (uint32_t)R_R8, (void*)R_R9, *(uint32_t*)(R_RSP + 8)); }
-void LFEpiupppp(x64emu_t *emu, uintptr_t fcn) { LFEpiupppp_t fn = (LFEpiupppp_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*)R_R9, *(void**)(R_RSP + 8)); }
+void LFEpuuuppp(x64emu_t *emu, uintptr_t fcn) { LFEpuuuppp_t fn = (LFEpuuuppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void LFpLpuuLLu(x64emu_t *emu, uintptr_t fcn) { LFpLpuuLLu_t fn = (LFpLpuuLLu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (uintptr_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16)); }
 void pFEiplllpp(x64emu_t *emu, uintptr_t fcn) { pFEiplllpp_t fn = (pFEiplllpp_t)fcn; R_RAX=(uintptr_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFEipLLLpp(x64emu_t *emu, uintptr_t fcn) { pFEipLLLpp_t fn = (pFEipLLLpp_t)fcn; R_RAX=(uintptr_t)fn(emu, (int32_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
@@ -6260,9 +6262,9 @@ void iFppippipppip(x64emu_t *emu, uintptr_t fcn) { iFppippipppip_t fn = (iFppipp
 void iFppuppLLpupp(x64emu_t *emu, uintptr_t fcn) { iFppuppLLpupp_t fn = (iFppuppLLpupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (uintptr_t)R_R9, *(uintptr_t*)(R_RSP + 8), *(void**)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void iFpppiiuuiiuu(x64emu_t *emu, uintptr_t fcn) { iFpppiiuuiiuu_t fn = (iFpppiiuuiiuu_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (int32_t)R_R8, (uint32_t)R_R9, *(uint32_t*)(R_RSP + 8), *(int32_t*)(R_RSP + 16), *(int32_t*)(R_RSP + 24), *(uint32_t*)(R_RSP + 32), *(uint32_t*)(R_RSP + 40)); }
 void iFpppppiiuupp(x64emu_t *emu, uintptr_t fcn) { iFpppppiiuupp_t fn = (iFpppppiiuupp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (int32_t)R_R9, *(int32_t*)(R_RSP + 8), *(uint32_t*)(R_RSP + 16), *(uint32_t*)(R_RSP + 24), *(void**)(R_RSP + 32), *(void**)(R_RSP + 40)); }
-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 uFEpLuupppLuV(x64emu_t *emu, uintptr_t fcn) { uFEpLuupppLuV_t fn = (uFEpLuupppLuV_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (uint32_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 uFEpLuppppLup(x64emu_t *emu, uintptr_t fcn) { uFEpLuppppLup_t fn = (uFEpLuppppLup_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (uint32_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 uFEpLuppppLuA(x64emu_t *emu, uintptr_t fcn) { uFEpLuppppLuA_t fn = (uFEpLuppppLuA_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (uint32_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 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)); }
@@ -7846,7 +7848,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &lFppLpp) return 1;
 	if (fun == &LFLpppL) return 1;
 	if (fun == &LFpuipp) return 1;
-	if (fun == &LFpuppi) return 1;
+	if (fun == &LFpuupi) return 1;
 	if (fun == &LFpLuuu) return 1;
 	if (fun == &LFpLLLp) return 1;
 	if (fun == &LFpLpuu) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 8996c9f1..93e19cf9 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -719,6 +719,7 @@ void lFppL(x64emu_t *emu, uintptr_t fnc);
 void lFppp(x64emu_t *emu, uintptr_t fnc);
 void lFppS(x64emu_t *emu, uintptr_t fnc);
 void lFSpl(x64emu_t *emu, uintptr_t fnc);
+void LFEpp(x64emu_t *emu, uintptr_t fnc);
 void LFEpA(x64emu_t *emu, uintptr_t fnc);
 void LFipL(x64emu_t *emu, uintptr_t fnc);
 void LFuui(x64emu_t *emu, uintptr_t fnc);
@@ -842,7 +843,6 @@ void iWppu(x64emu_t *emu, uintptr_t fnc);
 void iWppp(x64emu_t *emu, uintptr_t fnc);
 void uWpui(x64emu_t *emu, uintptr_t fnc);
 void uWpup(x64emu_t *emu, uintptr_t fnc);
-void vFEiip(x64emu_t *emu, uintptr_t fnc);
 void vFEipp(x64emu_t *emu, uintptr_t fnc);
 void vFEipV(x64emu_t *emu, uintptr_t fnc);
 void vFEipA(x64emu_t *emu, uintptr_t fnc);
@@ -853,6 +853,7 @@ void vFEpup(x64emu_t *emu, uintptr_t fnc);
 void vFEpuV(x64emu_t *emu, uintptr_t fnc);
 void vFEpuA(x64emu_t *emu, uintptr_t fnc);
 void vFEpUp(x64emu_t *emu, uintptr_t fnc);
+void vFEpLp(x64emu_t *emu, uintptr_t fnc);
 void vFEppp(x64emu_t *emu, uintptr_t fnc);
 void vFEppV(x64emu_t *emu, uintptr_t fnc);
 void vFEppA(x64emu_t *emu, uintptr_t fnc);
@@ -1397,8 +1398,8 @@ void vFEpipV(x64emu_t *emu, uintptr_t fnc);
 void vFEpipA(x64emu_t *emu, uintptr_t fnc);
 void vFEpuup(x64emu_t *emu, uintptr_t fnc);
 void vFEpuuV(x64emu_t *emu, uintptr_t fnc);
+void vFEpuuA(x64emu_t *emu, uintptr_t fnc);
 void vFEpupp(x64emu_t *emu, uintptr_t fnc);
-void vFEpupA(x64emu_t *emu, uintptr_t fnc);
 void vFEpLLp(x64emu_t *emu, uintptr_t fnc);
 void vFEppip(x64emu_t *emu, uintptr_t fnc);
 void vFEppiV(x64emu_t *emu, uintptr_t fnc);
@@ -1771,11 +1772,11 @@ void lFpuuLL(x64emu_t *emu, uintptr_t fnc);
 void lFppupp(x64emu_t *emu, uintptr_t fnc);
 void lFppLpL(x64emu_t *emu, uintptr_t fnc);
 void lFppLpp(x64emu_t *emu, uintptr_t fnc);
-void LFELppi(x64emu_t *emu, uintptr_t fnc);
+void LFELppu(x64emu_t *emu, uintptr_t fnc);
 void LFEpppp(x64emu_t *emu, uintptr_t fnc);
 void LFLpppL(x64emu_t *emu, uintptr_t fnc);
 void LFpuipp(x64emu_t *emu, uintptr_t fnc);
-void LFpuppi(x64emu_t *emu, uintptr_t fnc);
+void LFpuupi(x64emu_t *emu, uintptr_t fnc);
 void LFpLuuu(x64emu_t *emu, uintptr_t fnc);
 void LFpLLLp(x64emu_t *emu, uintptr_t fnc);
 void LFpLpuu(x64emu_t *emu, uintptr_t fnc);
@@ -2229,10 +2230,10 @@ void lFpipill(x64emu_t *emu, uintptr_t fnc);
 void lFpuuLLp(x64emu_t *emu, uintptr_t fnc);
 void lFppLipp(x64emu_t *emu, uintptr_t fnc);
 void lFpppLpp(x64emu_t *emu, uintptr_t fnc);
-void LFEupppp(x64emu_t *emu, uintptr_t fnc);
-void LFELpppi(x64emu_t *emu, uintptr_t fnc);
+void LFEuuppp(x64emu_t *emu, uintptr_t fnc);
+void LFELpppu(x64emu_t *emu, uintptr_t fnc);
 void LFEpippp(x64emu_t *emu, uintptr_t fnc);
-void LFEppppi(x64emu_t *emu, uintptr_t fnc);
+void LFEppppu(x64emu_t *emu, uintptr_t fnc);
 void LFpipipi(x64emu_t *emu, uintptr_t fnc);
 void LFpLippp(x64emu_t *emu, uintptr_t fnc);
 void LFpLLLLL(x64emu_t *emu, uintptr_t fnc);
@@ -2755,7 +2756,7 @@ 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 uFEipupppp(x64emu_t *emu, uintptr_t fnc);
-void uFEpiupppp(x64emu_t *emu, uintptr_t fnc);
+void uFEpuuuppp(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);
@@ -2771,7 +2772,7 @@ void uFpppppupp(x64emu_t *emu, uintptr_t fnc);
 void uFbCuuuCup(x64emu_t *emu, uintptr_t fnc);
 void uFbWWWWWWp(x64emu_t *emu, uintptr_t fnc);
 void LFELpupupu(x64emu_t *emu, uintptr_t fnc);
-void LFEpiupppp(x64emu_t *emu, uintptr_t fnc);
+void LFEpuuuppp(x64emu_t *emu, uintptr_t fnc);
 void LFpLpuuLLu(x64emu_t *emu, uintptr_t fnc);
 void pFEiplllpp(x64emu_t *emu, uintptr_t fnc);
 void pFEipLLLpp(x64emu_t *emu, uintptr_t fnc);
@@ -3068,9 +3069,9 @@ void iFppippipppip(x64emu_t *emu, uintptr_t fnc);
 void iFppuppLLpupp(x64emu_t *emu, uintptr_t fnc);
 void iFpppiiuuiiuu(x64emu_t *emu, uintptr_t fnc);
 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 uFEpLuupppLuV(x64emu_t *emu, uintptr_t fnc);
+void uFEpLuppppLup(x64emu_t *emu, uintptr_t fnc);
+void uFEpLuppppLuA(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);
diff --git a/src/wrapped/wrappedgobject2.c b/src/wrapped/wrappedgobject2.c
index a29588fd..07cce9f7 100644
--- a/src/wrapped/wrappedgobject2.c
+++ b/src/wrapped/wrappedgobject2.c
@@ -640,7 +640,7 @@ EXPORT int my_g_boxed_type_register_static(x64emu_t* emu, void* name, void* boxe
     return my->g_boxed_type_register_static(name, bc, bf);
 }
 
-EXPORT uint32_t my_g_signal_new(x64emu_t* emu, void* name, size_t itype, int flags, uint32_t offset, void* acc, void* accu_data, void* marsh, size_t rtype, uint32_t n, void** b)
+EXPORT uint32_t my_g_signal_new(x64emu_t* emu, void* name, size_t itype, uint32_t flags, uint32_t offset, void* acc, void* accu_data, void* marsh, size_t rtype, uint32_t n, void** b)
 {
     printf_log(LOG_DEBUG, "g_signal_new for \"%s\", with offset=%d and %d args\n", (const char*)name, offset, n);
 
@@ -661,14 +661,14 @@ EXPORT uint32_t my_g_signal_new(x64emu_t* emu, void* name, size_t itype, int fla
     return my->g_signal_new(name, itype, flags, offset, cb_acc, accu_data, cb_marsh, rtype, n, b[0], b[1], b[2]);
 }
 
-EXPORT uint32_t my_g_signal_newv(x64emu_t* emu, void* name, size_t itype, int flags, void* closure, void* acc, void* accu_data, void* marsh, size_t rtype, uint32_t n, void* types)
+EXPORT uint32_t my_g_signal_newv(x64emu_t* emu, void* name, size_t itype, uint32_t flags, void* closure, void* acc, void* accu_data, void* marsh, size_t rtype, uint32_t n, void* types)
 {
     printf_log(LOG_DEBUG, "g_signal_newv for \"%s\", with %d args\n", (const char*)name, n);
 
     return my->g_signal_newv(name, itype, flags, closure, findAccumulatorFct(acc), accu_data, findMarshalFct(marsh), rtype, n, types);
 }
 
-EXPORT uint32_t my_g_signal_new_valist(x64emu_t* emu, void* name, size_t itype, int flags, void* closure, void* acc, void* accu_data, void* marsh, size_t rtype, uint32_t n, x64_va_list_t b)
+EXPORT uint32_t my_g_signal_new_valist(x64emu_t* emu, void* name, size_t itype, uint32_t flags, void* closure, void* acc, void* accu_data, void* marsh, size_t rtype, uint32_t n, x64_va_list_t b)
 {
     printf_log(LOG_DEBUG, "g_signal_new_valist for \"%s\", with %d args\n", (const char*)name, n);
     #ifdef CONVERT_VALIST
@@ -679,7 +679,7 @@ EXPORT uint32_t my_g_signal_new_valist(x64emu_t* emu, void* name, size_t itype,
     return my->g_signal_new_valist(name, itype, flags, closure, findAccumulatorFct(acc), accu_data, findMarshalFct(marsh), rtype, n, VARARGS);
 }
 
-EXPORT uint32_t my_g_signal_handlers_block_matched(x64emu_t* emu, void* instance, int mask, uint32_t signal, void* detail, void* closure, void* fnc, void* data)
+EXPORT uint32_t my_g_signal_handlers_block_matched(x64emu_t* emu, void* instance, uint32_t mask, uint32_t signal, uint32_t detail, void* closure, void* fnc, void* data)
 {
     // NOTE that I have no idea of the fnc signature!...
     if (fnc) printf_log(LOG_DEBUG, "Warning, gobject g_signal_handlers_block_matched called with non null function \n");
@@ -687,7 +687,7 @@ EXPORT uint32_t my_g_signal_handlers_block_matched(x64emu_t* emu, void* instance
     return my->g_signal_handlers_block_matched(instance, mask, signal, detail, closure, fnc, data);
 }
 
-EXPORT uint32_t my_g_signal_handlers_unblock_matched(x64emu_t* emu, void* instance, int mask, uint32_t signal, void* detail, void* closure, void* fnc, void* data)
+EXPORT uint32_t my_g_signal_handlers_unblock_matched(x64emu_t* emu, void* instance, uint32_t mask, uint32_t signal, uint32_t detail, void* closure, void* fnc, void* data)
 {
     // NOTE that I have no idea of the fnc signature!...
     if (fnc) printf_log(LOG_DEBUG, "Warning, gobject g_signal_handlers_unblock_matched called with non null function \n");
@@ -695,7 +695,7 @@ EXPORT uint32_t my_g_signal_handlers_unblock_matched(x64emu_t* emu, void* instan
     return my->g_signal_handlers_unblock_matched(instance, mask, signal, detail, closure, fnc, data);
 }
 
-EXPORT uint32_t my_g_signal_handlers_disconnect_matched(x64emu_t* emu, void* instance, int mask, uint32_t signal, void* detail, void* closure, void* fnc, void* data)
+EXPORT uint32_t my_g_signal_handlers_disconnect_matched(x64emu_t* emu, void* instance, uint32_t mask, uint32_t signal, uint32_t detail, void* closure, void* fnc, void* data)
 {
     // NOTE that I have no idea of the fnc signature!...
     if (fnc) printf_log(LOG_DEBUG, "Warning, gobject g_signal_handlers_disconnect_matched called with non null function \n");
@@ -703,7 +703,7 @@ EXPORT uint32_t my_g_signal_handlers_disconnect_matched(x64emu_t* emu, void* ins
     return my->g_signal_handlers_disconnect_matched(instance, mask, signal, detail, closure, fnc, data);
 }
 
-EXPORT unsigned long my_g_signal_handler_find(x64emu_t* emu, void* instance, int mask, uint32_t signal, void* detail, void* closure, void* fnc, void* data)
+EXPORT unsigned long my_g_signal_handler_find(x64emu_t* emu, void* instance, uint32_t mask, uint32_t signal, uint32_t detail, void* closure, void* fnc, void* data)
 {
     // NOTE that I have no idea of the fnc signature!...
     if (fnc) printf_log(LOG_DEBUG, "Warning, gobject g_signal_handler_find called with non null function \n");
@@ -756,7 +756,7 @@ static int my_signal_emission_hook(void* ihint, uint32_t n, void* values, my_sig
     printf_log(LOG_DEBUG, "gobject2 Signal Emission Hook called, sig=%p\n", sig);
     return (int)RunFunctionFmt(sig->c_handler, "pupp", ihint, n, values, sig->data);
 }
-EXPORT unsigned long my_g_signal_add_emission_hook(x64emu_t* emu, uint32_t signal, void* detail, void* f, void* data, void* notify)
+EXPORT unsigned long my_g_signal_add_emission_hook(x64emu_t* emu, uint32_t signal, uint32_t detail, void* f, void* data, void* notify)
 {
     // there can be many signals connected, so something "light" is needed here
 
@@ -801,7 +801,7 @@ EXPORT void my_g_param_spec_set_qdata_full(x64emu_t* emu, void* pspec, uint32_t
     my->g_param_spec_set_qdata_full(pspec, quark, data, findFreeFct(notify));
 }
 
-EXPORT int my_g_param_type_register_static(x64emu_t* emu, void* name, void* pspec_info)
+EXPORT size_t my_g_param_type_register_static(x64emu_t* emu, void* name, void* pspec_info)
 {
 
     return my->g_param_type_register_static(name, findFreeGParamSpecTypeInfo(pspec_info));
@@ -833,7 +833,7 @@ EXPORT void* my_g_type_class_peek_parent(x64emu_t* emu, void* object)
     return wrapCopyGTKClass(klass, type);
 }
 
-EXPORT void my_g_signal_emit_valist(x64emu_t* emu, void* inst, uint32_t id, void* quark, x64_va_list_t b)
+EXPORT void my_g_signal_emit_valist(x64emu_t* emu, void* inst, uint32_t id, uint32_t quark, x64_va_list_t b)
 {
     #ifdef CONVERT_VALIST
     CONVERT_VALIST(b);
@@ -843,7 +843,7 @@ EXPORT void my_g_signal_emit_valist(x64emu_t* emu, void* inst, uint32_t id, void
     my->g_signal_emit_valist(inst, id, quark, VARARGS);
 }
 
-EXPORT void my_g_signal_emit(x64emu_t* emu, void* inst, uint32_t id, void* quark, uintptr_t* b)
+EXPORT void my_g_signal_emit(x64emu_t* emu, void* inst, uint32_t id, uint32_t quark, uintptr_t* b)
 {
     CREATE_VALIST_FROM_VAARG(b, emu->scratch, 3);
     my->g_signal_emit_valist(inst, id, quark, VARARGS);
@@ -882,7 +882,7 @@ EXPORT void my_g_object_set(x64emu_t* emu, void* a1, void* a2, uintptr_t* b)
     my->g_object_set_valist(a1, a2, VARARGS);
 }
 
-EXPORT void my_g_object_set_qdata_full(x64emu_t* emu, void* o, void* q, void* data, void* d)
+EXPORT void my_g_object_set_qdata_full(x64emu_t* emu, void* o, uint32_t q, void* data, void* d)
 {
     my->g_object_set_qdata_full(o, q, data, findDestroyFct(d));
 }
@@ -897,7 +897,7 @@ EXPORT void my_g_object_weak_ref(x64emu_t* emu, void* object, void* notify, void
     my->g_object_weak_ref(object, findWeakNotifyFct(notify), data);
 }
 
-EXPORT void my_g_signal_override_class_handler(x64emu_t* emu, char* name, void* gtype, void* callback)
+EXPORT void my_g_signal_override_class_handler(x64emu_t* emu, char* name, size_t gtype, void* callback)
 {
     my->g_signal_override_class_handler(name, gtype, findGCallbackFct(callback));
 }
diff --git a/src/wrapped/wrappedgobject2_private.h b/src/wrapped/wrappedgobject2_private.h
index fcf4c5ca..bced8c93 100644
--- a/src/wrapped/wrappedgobject2_private.h
+++ b/src/wrapped/wrappedgobject2_private.h
@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 //GType is gulong !!!!!
 
@@ -9,9 +9,9 @@
 GO(g_array_get_type, LFv)
 GO(g_binding_flags_get_type, LFv)
 GO(g_binding_get_flags, uFp)
-//GO(g_binding_get_source, 
-//GO(g_binding_get_source_property, 
-//GO(g_binding_get_target, 
+GO(g_binding_get_source, pFp)
+GO(g_binding_get_source_property, pFp)
+GO(g_binding_get_target, pFp)
 GO(g_binding_get_target_property, pFp)
 GO(g_binding_get_type, LFv)
 GO(g_binding_unbind, vFp)
@@ -67,35 +67,35 @@ DATA(g_cclosure_marshal_VOID__VARIANTv, sizeof(void*))
 DATA(g_cclosure_marshal_VOID__VOID, sizeof(void*))
 DATA(g_cclosure_marshal_VOID__VOIDv, sizeof(void*))
 GOM(g_cclosure_new, pFEppp)
-//GO(g_cclosure_new_object, 
-//GO(g_cclosure_new_object_swap, 
+//GOM(g_cclosure_new_object, pFpp)
+//GOM(g_cclosure_new_object_swap, pFpp)
 GOM(g_cclosure_new_swap, pFEppp)
-//GO(g_checksum_get_type, 
+GO(g_checksum_get_type, LFv)
 GO(g_clear_object, vFp)
 GOM(g_closure_add_finalize_notifier, vFEppp)
-//GO(g_closure_add_invalidate_notifier, 
-//GO(g_closure_add_marshal_guards, 
-//GO(g_closure_get_type, 
-//GO(g_closure_invalidate, 
-//GO(g_closure_invoke, 
-//GO(g_closure_new_object, 
+//GOM(g_closure_add_invalidate_notifier, vFppp)
+//GOM(g_closure_add_marshal_guards, vFppppp)
+GO(g_closure_get_type, LFv)
+//GOM(g_closure_invalidate, vFp)
+//GOM(g_closure_invoke, vFppupp)
+//GOM(g_closure_new_object, pFup)
 GO(g_closure_new_simple, pFup)
-//GO(g_closure_ref, 
+//GOM(g_closure_ref, pFp)
 GOM(g_closure_remove_finalize_notifier, vFEppp)
-//GO(g_closure_remove_invalidate_notifier, 
+//GOM(g_closure_remove_invalidate_notifier, vFppp)
 GOM(g_closure_set_marshal, vFEpp)
-//GO(g_closure_set_meta_marshal, 
-//GO(g_closure_sink, 
-GO(g_closure_unref, pFp)
+//GOM(g_closure_set_meta_marshal, vFppp)
+//GOM(g_closure_sink, vFp)
+GO(g_closure_unref, vFp)
 GO(g_date_get_type, LFv)
 GO(g_date_time_get_type, LFv)
-GO(g_enum_complete_type_info, vFLpp)
+GO(g_enum_complete_type_info, vFLpp)    // should the GTypeInfo (1st "p") needs wrapping?
 GO(g_enum_get_value, pFpi)
 GO(g_enum_get_value_by_name, pFpp)
 GO(g_enum_get_value_by_nick, pFpp)
 GO(g_enum_register_static, LFpp)
 GO(g_error_get_type, LFv)
-GO(g_flags_complete_type_info, vFipp)
+GO(g_flags_complete_type_info, vFLpp)    // should the GTypeInfo (1st "p") needs wrapping?
 GO(g_flags_get_first_value, pFpu)
 GO(g_flags_get_value_by_name, pFpp)
 GO(g_flags_get_value_by_nick, pFpp)
@@ -112,27 +112,27 @@ GO(g_main_loop_get_type, LFv)
 GO(g_mapped_file_get_type, LFv)
 GO(g_markup_parse_context_get_type, LFv)
 GO(g_match_info_get_type, LFv)
-//GOM(g_object_add_toggle_ref, vFEpBp)
+//GOM(g_object_add_toggle_ref, vFEppp)
 GO(g_object_add_weak_pointer, vFpp)
 GO(g_object_bind_property, pFppppu)
-//GO(g_object_bind_property_full, 
-//GO(g_object_bind_property_with_closures, 
-GO(g_object_class_find_property, pFpp)
+//GOM(g_object_bind_property_full, pFppppupppp)
+//GOM(g_object_bind_property_with_closures, pFppppupp)
+GO(g_object_class_find_property, pFpp)  // need wrapping?
 GOM(g_object_class_install_properties, vFEpup)
-GO(g_object_class_install_property, vFpup)
-GO(g_object_class_list_properties, pFpp)
-GO(g_object_class_override_property, vFpup)
+GO(g_object_class_install_property, vFpup)  // need wrapping?
+GO(g_object_class_list_properties, pFpp)    // need wrapping?
+GO(g_object_class_override_property, vFpup) // need wrapping?
 GO(g_object_compat_control, LFLp)
 GOM(g_object_connect, pFEppV)
-GO(g_object_disconnect, vFpppppppppppppppp)   // caarg
-//GOM(g_object_dup_data, pFEppBp)
-//GOM(g_object_dup_qdata, pFEppBp)
+GO(g_object_disconnect, vFpppppppppppppppp)   // vaarg
+//GOM(g_object_dup_data, pFEpppp)
+//GOM(g_object_dup_qdata, pFEpupp)
 GO(g_object_force_floating, vFp)
 GO(g_object_freeze_notify, vFp)
 GOM(g_object_get, vFEppV)
 GO(g_object_get_data, pFpp)
 GO(g_object_get_property, vFppp)
-GO(g_object_get_qdata, pFpp)
+GO(g_object_get_qdata, pFpu)
 GO(g_object_get_type, LFv)
 GOM(g_object_get_valist, vFEppA)
 GO(g_object_interface_find_property, pFpp)
@@ -146,25 +146,25 @@ GO(g_object_notify, vFpp)
 GO(g_object_notify_by_pspec, vFpp)
 GO(g_object_ref, pFp)
 GO(g_object_ref_sink, pFp)
-//GOM(g_object_remove_toggle_ref, vFEpBp)
+//GOM(g_object_remove_toggle_ref, vFEppp)
 GO(g_object_remove_weak_pointer, vFpp)
-//GOM(g_object_replace_data, iFEppppBB)
-//GOM(g_object_replace_qdata, iFEppppBB)
+//GOM(g_object_replace_data, iFEpppppp)
+//GOM(g_object_replace_qdata, iFEpupppp)
 GO(g_object_run_dispose, vFp)
 GOM(g_object_set, vFEppV)
 GO(g_object_set_data, vFppp)
 GOM(g_object_set_data_full, vFEpppp)
 GO(g_object_set_property, vFppp)
 GO(g_object_set_qdata, vFpup)
-GOM(g_object_set_qdata_full, vFEpppp)
+GOM(g_object_set_qdata_full, vFEpupp)
 GOM(g_object_set_valist, vFEppA)
 GO(g_object_steal_data, pFpp)
 GO(g_object_steal_qdata, pFpu)
 GO(g_object_thaw_notify, vFp)
 GO(g_object_unref, vFp)
-GO(g_object_watch_closure, vFpp)
+GO(g_object_watch_closure, vFpp)    // needs wrapping?
 GOM(g_object_weak_ref, vFEppp)
-GO(g_object_weak_unref, vFpp)
+GO(g_object_weak_unref, vFppp)  // needs wrapping?
 GO(g_param_spec_boolean, pFpppii)
 GO(g_param_spec_boxed, pFpppLi)
 GO(g_param_spec_char, pFpppccci)
@@ -185,7 +185,7 @@ GO(g_param_spec_internal, pFLpppi)
 GO(g_param_spec_long, pFpppllli)
 GO(g_param_spec_object, pFpppLi)
 GO(g_param_spec_override, pFpp)
-GO(g_param_spec_param, pFpppii)
+GO(g_param_spec_param, pFpppLi)
 GO(g_param_spec_pointer, pFpppi)
 GO(g_param_spec_pool_insert, vFppL)
 GO(g_param_spec_pool_list, pFpLp)
@@ -209,77 +209,77 @@ GO(g_param_spec_unichar, pFpppui)
 GO(g_param_spec_unref, vFp)
 GO(g_param_spec_value_array, pFppppi)
 GO(g_param_spec_variant, pFpppppi)
-GOM(g_param_type_register_static, iFEpp)
+GOM(g_param_type_register_static, LFEpp)
 GO(g_param_value_convert, iFpppi)
 GO(g_param_value_defaults, iFpp)
 GO(g_param_values_cmp, iFppp)
 GO(g_param_value_set_default, vFpp)
 GO(g_param_value_validate, iFpp)
 GO(g_pointer_type_register_static, LFp)
-//GO(g_pollfd_get_type, 
-//GO(g_ptr_array_get_type, 
-//GO(g_regex_get_type, 
+GO(g_pollfd_get_type, LFv)
+GO(g_ptr_array_get_type, LFv)
+GO(g_regex_get_type, LFv)
 GO(g_signal_accumulator_first_wins, iFpppp)
 GO(g_signal_accumulator_true_handled, iFpppp)
-GOM(g_signal_add_emission_hook, LFEupppp)
+GOM(g_signal_add_emission_hook, LFEuuppp)
 GO(g_signal_chain_from_overridden, vFpp)
-//GO(g_signal_chain_from_overridden_handler, vFpppppppppp)  //vaarg
-GO(g_signal_connect_closure, LFpppi)
-GO(g_signal_connect_closure_by_id, LFpuppi)
+//GOM(g_signal_chain_from_overridden_handler, vFpV)
+GO(g_signal_connect_closure, LFpppi)    // needs wrapping?
+GO(g_signal_connect_closure_by_id, LFpuupi) // needs wrapping?
 GOM(g_signal_connect_data, LFEpppppu)
-GOM(g_signal_connect_object, LFEppppi)
+GOM(g_signal_connect_object, LFEppppu)
 GOM(g_signal_emit, vFEpuuV)
 GO(g_signal_emit_by_name, vFppppppppppp)    //vaarg
 GO(g_signal_emitv, vFpuup)
-GOM(g_signal_emit_valist, vFEpupA)    // va_list here
+GOM(g_signal_emit_valist, vFEpuuA)
 GO(g_signal_get_invocation_hint, pFp)
 GO(g_signal_handler_block, vFpL)
 GO(g_signal_handler_disconnect, vFpL)
-GOM(g_signal_handler_find, LFEpiupppp)
+GOM(g_signal_handler_find, LFEpuuuppp)
 GO(g_signal_handler_is_connected, iFpL)
-GOM(g_signal_handlers_block_matched, uFEpiupppp)
-//GO(g_signal_handlers_destroy, 
-GOM(g_signal_handlers_disconnect_matched, uFEpiupppp)
-GOM(g_signal_handlers_unblock_matched, uFEpiupppp)
+GOM(g_signal_handlers_block_matched, uFEpuuuppp)
+GO(g_signal_handlers_destroy, vFp)
+GOM(g_signal_handlers_disconnect_matched, uFEpuuuppp)
+GOM(g_signal_handlers_unblock_matched, uFEpuuuppp)
 GO(g_signal_handler_unblock, vFpL)
 GO(g_signal_has_handler_pending, iFpuui)
 GO(g_signal_list_ids, pFLp)
 GO(g_signal_lookup, uFpL)
 GO(g_signal_name, pFu)
-GOM(g_signal_new, uFEpLiupppLuV)
-//GOM(g_signal_new_class_handler, uFEpLupppppnV)
-GOM(g_signal_newv, uFEpLippppLup)
-GOM(g_signal_new_valist, uFEpLippppLuA)
+GOM(g_signal_new, uFEpLuupppLuV)
+//GOM(g_signal_new_class_handler, uFEpLuppppLuV)
+GOM(g_signal_newv, uFEpLuppppLup)
+GOM(g_signal_new_valist, uFEpLuppppLuA)
 GO(g_signal_override_class_closure, vFuLp)
-GOM(g_signal_override_class_handler, vFEppp)
+GOM(g_signal_override_class_handler, vFEpLp)
 GO(g_signal_parse_name, iFpLppi)
 GO(g_signal_query, vFup)
 GO(g_signal_remove_emission_hook, vFuL)
-//GOM(g_signal_set_va_marshaller, vFEuiB)
+//GOM(g_signal_set_va_marshaller, vFEuLp)
 GO(g_signal_stop_emission, vFpuu)
 GO(g_signal_stop_emission_by_name, vFpp)
 GO(g_signal_type_cclosure_new, pFLu)    //should wrap?
 GO(g_source_get_type, LFv)
 GO(g_source_set_closure, vFpp)
-//GO(g_source_set_dummy_callback, 
+//GOM(g_source_set_dummy_callback, vFp)
 GO(g_strdup_value_contents, pFp)
 GO(g_strv_get_type, LFv)
 GO(g_thread_get_type, LFv)
 GO(g_time_zone_get_type, LFv)
-//GOM(g_type_add_class_cache_func, vFEpB)
+//GOM(g_type_add_class_cache_func, vFEpp)
 GO(g_type_add_class_private, vFLL)
 GO(g_type_add_instance_private, iFLL)
-//GOM(g_type_add_interface_check, vFEpB)
-//GOM(g_type_add_interface_dynamic, vFEiip)
+//GOM(g_type_add_interface_check, vFEpp)
+//GOM(g_type_add_interface_dynamic, vFELLp)
 GOM(g_type_add_interface_static, vFELLp)
 GO(g_type_check_class_cast, pFpL)
 GO(g_type_check_class_is_a, iFpL)
 GO(g_type_check_instance, iFp)
 GO(g_type_check_instance_cast, pFpL)
-GO(g_type_check_instance_is_a, LFpL)
+GO(g_type_check_instance_is_a, iFpL)
 GO(g_type_check_instance_is_fundamentally_a, iFpL)
 GO(g_type_check_is_value_type, iFL)
-GO(g_type_check_value, LFp)
+GO(g_type_check_value, iFp)
 GO(g_type_check_value_holds, iFpL)
 GO(g_type_children, pFLp)
 GO(g_type_class_add_private, vFpL)
@@ -289,7 +289,7 @@ GO(g_type_class_get_private, pFpL)
 GO(g_type_class_peek, pFL)
 GOM(g_type_class_peek_parent, pFEp)
 GO(g_type_class_peek_static, pFL)
-GO(g_type_class_ref, pFp)
+GO(g_type_class_ref, pFL)
 GO(g_type_class_unref, vFp)
 GO(g_type_class_unref_uncached, vFp)
 GO(g_type_create_instance, pFL)
@@ -302,24 +302,24 @@ GO(g_type_free_instance, vFp)
 GO(g_type_from_name, LFp)
 GO(g_type_fundamental, LFL)
 GO(g_type_fundamental_next, LFv)
-//GOM(g_type_get_plugin, pFEi)      // GTypePugin is a stuct with callback
+//GOM(g_type_get_plugin, pFEL)      // GTypePugin is a stuct with callback
 GO(g_type_get_qdata, pFLu)
 GO(g_type_get_type_registration_serial, uFv)
 GO(g_type_init, vFv)
 GO(g_type_init_with_debug_flags, vFu)
 GO(g_type_instance_get_private, pFpL)
 GO(g_type_interface_add_prerequisite, vFLL)
-//GOM(g_type_interface_get_plugin, pFEii) // return GTypePlugin*
+//GOM(g_type_interface_get_plugin, pFELL) // return GTypePlugin*
 GO(g_type_interface_peek, pFpL)
 GO(g_type_interface_peek_parent, pFp)
 GO(g_type_interface_prerequisites, pFLp)
 GO(g_type_interfaces, pFLp)
 GO(g_type_is_a, iFLL)
-//GO(g_type_module_add_interface, 
-//GO(g_type_module_get_type, 
+//GOM(g_type_module_add_interface, vFpLLp)
+GO(g_type_module_get_type, LFv)
 GO(g_type_module_register_enum, LFppp)
 GO(g_type_module_register_flags, LFppp)
-//GO(g_type_module_register_type, 
+//GOM(g_type_module_register_type, LFpLppu)
 GO(g_type_module_set_name, vFpp)
 GO(g_type_module_unuse, vFp)
 GO(g_type_module_use, iFp)
@@ -328,19 +328,19 @@ GO(g_type_name_from_class, pFp)
 GO(g_type_name_from_instance, pFp)
 GO(g_type_next_base, LFLL)
 GO(g_type_parent, LFL)
-//GO(g_type_plugin_complete_interface_info, 
-//GO(g_type_plugin_complete_type_info, 
-//GO(g_type_plugin_get_type, 
+//GOM(g_type_plugin_complete_interface_info, vFpLLp)
+//GOM(g_type_plugin_complete_type_info, vFpLpp)
+GO(g_type_plugin_get_type, LFv)
 GO(g_type_plugin_unuse, vFp)
-//GO(g_type_plugin_use, 
+GO(g_type_plugin_use, vFp)
 GO(g_type_qname, uFL)
 GO(g_type_query, vFLp)
 //GOM(type_register_dynamic, iFEpippi)
-GOM(g_type_register_fundamental, LFELpppi)
-GOM(g_type_register_static, LFELppi)
+GOM(g_type_register_fundamental, LFELpppu)
+GOM(g_type_register_static, LFELppu)
 GOM(g_type_register_static_simple, LFELpupupu)
-//GOM(g_type_remove_class_cache_func, vFEpB)
-//GOM(g_type_remove_interface_check, vFEpB)
+//GOM(g_type_remove_class_cache_func, vFEpp)
+//GOM(g_type_remove_interface_check, vFEpp)
 GO(g_type_set_qdata, vFLup)
 GO(g_type_test_flags, iFLu)
 GOM(g_type_value_table_peek, pFEL)    //need to bridge GTypeValueTable
@@ -364,7 +364,7 @@ GO(g_value_dup_variant, pFp)
 GO(g_value_fits_pointer, iFp)
 GO(g_value_get_boolean, iFp)
 GO(g_value_get_boxed, pFp)
-GO(g_value_get_char, CFp)
+GO(g_value_get_char, cFp)
 GO(g_value_get_double, dFp)
 GO(g_value_get_enum, iFp)
 GO(g_value_get_flags, uFp)
@@ -387,12 +387,12 @@ GO(g_value_get_variant, pFp)
 GO(g_value_init, pFpL)
 GO(g_value_init_from_instance, vFpp)
 GO(g_value_peek_pointer, pFp)
-GOM(g_value_register_transform_func, vFEiip)
+GOM(g_value_register_transform_func, vFELLp)
 GO(g_value_reset, pFp)
 GO(g_value_set_boolean, vFpi)
 GO(g_value_set_boxed, vFpp)
 GO(g_value_set_boxed_take_ownership, vFpp)
-GO(g_value_set_char, vFpC)
+GO(g_value_set_char, vFpc)
 GO(g_value_set_double, vFpd)
 GO(g_value_set_enum, vFpi)
 GO(g_value_set_flags, vFpu)
@@ -423,13 +423,13 @@ GO(g_value_take_param, vFpp)
 GO(g_value_take_string, vFpp)
 GO(g_value_take_variant, vFpp)
 GO(g_value_transform, iFpp)
-GO(g_value_type_compatible, iFii)
+GO(g_value_type_compatible, iFLL)
 GO(g_value_type_transformable, iFLL)
 GO(g_value_unset, vFp)
-//GO(g_variant_builder_get_type, 
-//GO(g_variant_dict_get_type, 
-//GO(g_variant_get_gtype, 
-//GO(g_variant_type_get_gtype, 
+GO(g_variant_builder_get_type, LFv)
+GO(g_variant_dict_get_type, LFv)
+GO(g_variant_get_gtype, LFv)
+GO(g_variant_type_get_gtype, LFv)
 GO(g_weak_ref_clear, vFp)
 GO(g_weak_ref_get, pFp)
 GO(g_weak_ref_init, vFpp)
@@ -437,7 +437,7 @@ GO(g_weak_ref_set, vFpp)
 //GO(_init, 
 
 // to have some wrapper created for gtkclass.c
-GO(dummy_set_property, vFpupp)  
+GO(dummy_set_property, vFpupp)
 GO(dummy_drag_data_get, vFpppuu)
 GO(dummy_drag_motion, iFppiiu)
 GO(dummy_drag_data_received, vFppiipuu)