Added some more glib2 wrapped functions (for #202 and second ticket of #195)

6 files changed, 76 insertions, 175 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index c885127a..3027b1e3 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -448,6 +448,7 @@
 #() lFppL
 #() lFppp
 #() lFSpl
+#() LFEpA
 #() LFipL
 #() LFLLl
 #() LFLpu
@@ -2167,11 +2168,13 @@ wrappedglib2:
   - g_printerr
 - iFpp:
   - g_source_remove_by_funcs_user_data
-  - g_vprintf
 - iFpV:
   - g_printf
+- iFpA:
+  - g_vprintf
 - uFpp:
   - g_idle_add
+- LFpA:
   - g_printf_string_upper_bound
 - pFup:
   - g_ptr_array_new_full
@@ -2182,7 +2185,7 @@ wrappedglib2:
   - g_list_sort
   - g_log_set_default_handler
   - g_slist_sort
-  - g_strdup_vprintf
+  - g_variant_new_parsed_va
 - pFpV:
   - g_build_filename
   - g_markup_printf_escaped
@@ -2191,8 +2194,8 @@ wrappedglib2:
   - g_variant_new
 - pFpA:
   - g_markup_vprintf_escaped
+  - g_strdup_vprintf
   - g_strjoinv
-  - g_variant_new_parsed_va
 - vFppp:
   - g_array_sort_with_data
   - g_hash_table_foreach
@@ -2206,13 +2209,13 @@ wrappedglib2:
 - vFppA:
   - g_string_append_vprintf
   - g_string_vprintf
-- iFppp:
-  - g_vasprintf
-  - g_vfprintf
-  - g_vsprintf
 - iFppV:
   - g_fprintf
   - g_sprintf
+- iFppA:
+  - g_vasprintf
+  - g_vfprintf
+  - g_vsprintf
 - uFipp:
   - g_child_watch_add
 - uFupp:
@@ -2241,10 +2244,10 @@ wrappedglib2:
   - g_datalist_id_set_data_full
 - vFpppp:
   - g_source_set_callback
-- iFpLpp:
-  - g_vsnprintf
 - iFpLpV:
   - g_snprintf
+- iFpLpA:
+  - g_vsnprintf
 - uFippp:
   - g_idle_add_full
 - uFpipp:
@@ -2270,6 +2273,8 @@ wrappedglib2:
 - uFiuppp:
   - g_timeout_add_full
   - g_timeout_add_seconds_full
+- pFppppp:
+  - g_option_group_new
 - iFpupppp:
   - g_datalist_id_replace_data
 - uFpiippp:
diff --git a/src/wrapped/generated/wrappedglib2types.h b/src/wrapped/generated/wrappedglib2types.h
index ba82b40d..f4a7ef9d 100644
--- a/src/wrapped/generated/wrappedglib2types.h
+++ b/src/wrapped/generated/wrappedglib2types.h
@@ -17,7 +17,9 @@ typedef void (*vFpp_t)(void*, void*);
 typedef void (*vFpV_t)(void*, ...);
 typedef int64_t (*iFpp_t)(void*, void*);
 typedef int64_t (*iFpV_t)(void*, ...);
+typedef int64_t (*iFpA_t)(void*, va_list);
 typedef uint64_t (*uFpp_t)(void*, void*);
+typedef uintptr_t (*LFpA_t)(void*, va_list);
 typedef void* (*pFup_t)(uint64_t, void*);
 typedef void* (*pFpu_t)(void*, uint64_t);
 typedef void* (*pFpp_t)(void*, void*);
@@ -26,8 +28,8 @@ typedef void* (*pFpA_t)(void*, va_list);
 typedef void (*vFppp_t)(void*, void*, void*);
 typedef void (*vFppV_t)(void*, void*, ...);
 typedef void (*vFppA_t)(void*, void*, va_list);
-typedef int64_t (*iFppp_t)(void*, void*, void*);
 typedef int64_t (*iFppV_t)(void*, void*, ...);
+typedef int64_t (*iFppA_t)(void*, void*, va_list);
 typedef uint64_t (*uFipp_t)(int64_t, void*, void*);
 typedef uint64_t (*uFupp_t)(uint64_t, void*, void*);
 typedef uint64_t (*uFppp_t)(void*, void*, void*);
@@ -37,8 +39,8 @@ typedef void (*vFpipV_t)(void*, int64_t, void*, ...);
 typedef void (*vFpipA_t)(void*, int64_t, void*, va_list);
 typedef void (*vFpupp_t)(void*, uint64_t, void*, void*);
 typedef void (*vFpppp_t)(void*, void*, void*, void*);
-typedef int64_t (*iFpLpp_t)(void*, uintptr_t, void*, void*);
 typedef int64_t (*iFpLpV_t)(void*, uintptr_t, void*, ...);
+typedef int64_t (*iFpLpA_t)(void*, uintptr_t, void*, va_list);
 typedef uint64_t (*uFippp_t)(int64_t, void*, void*, void*);
 typedef uint64_t (*uFpipp_t)(void*, int64_t, void*, void*);
 typedef void* (*pFpipV_t)(void*, int64_t, void*, ...);
@@ -50,6 +52,7 @@ typedef void (*vFpiLpp_t)(void*, int64_t, uintptr_t, void*, void*);
 typedef void (*vFppipV_t)(void*, void*, int64_t, void*, ...);
 typedef uint64_t (*uFiippp_t)(int64_t, int64_t, void*, void*, void*);
 typedef uint64_t (*uFiuppp_t)(int64_t, uint64_t, void*, void*, void*);
+typedef void* (*pFppppp_t)(void*, void*, void*, void*, void*);
 typedef int64_t (*iFpupppp_t)(void*, uint64_t, void*, void*, void*, void*);
 typedef uint64_t (*uFpiippp_t)(void*, int64_t, int64_t, void*, void*, void*);
 typedef void* (*pFppuipp_t)(void*, void*, uint64_t, int64_t, void*, void*);
@@ -78,25 +81,25 @@ typedef int64_t (*iFpppippppppp_t)(void*, void*, void*, int64_t, void*, void*, v
 	GO(g_print, vFpV_t) \
 	GO(g_printerr, vFpV_t) \
 	GO(g_source_remove_by_funcs_user_data, iFpp_t) \
-	GO(g_vprintf, iFpp_t) \
 	GO(g_printf, iFpV_t) \
+	GO(g_vprintf, iFpA_t) \
 	GO(g_idle_add, uFpp_t) \
-	GO(g_printf_string_upper_bound, uFpp_t) \
+	GO(g_printf_string_upper_bound, LFpA_t) \
 	GO(g_ptr_array_new_full, pFup_t) \
 	GO(g_source_new, pFpu_t) \
 	GO(g_hash_table_new, pFpp_t) \
 	GO(g_list_sort, pFpp_t) \
 	GO(g_log_set_default_handler, pFpp_t) \
 	GO(g_slist_sort, pFpp_t) \
-	GO(g_strdup_vprintf, pFpp_t) \
+	GO(g_variant_new_parsed_va, pFpp_t) \
 	GO(g_build_filename, pFpV_t) \
 	GO(g_markup_printf_escaped, pFpV_t) \
 	GO(g_strdup_printf, pFpV_t) \
 	GO(g_strjoin, pFpV_t) \
 	GO(g_variant_new, pFpV_t) \
 	GO(g_markup_vprintf_escaped, pFpA_t) \
+	GO(g_strdup_vprintf, pFpA_t) \
 	GO(g_strjoinv, pFpA_t) \
-	GO(g_variant_new_parsed_va, pFpA_t) \
 	GO(g_array_sort_with_data, vFppp_t) \
 	GO(g_hash_table_foreach, vFppp_t) \
 	GO(g_ptr_array_foreach, vFppp_t) \
@@ -107,11 +110,11 @@ typedef int64_t (*iFpppippppppp_t)(void*, void*, void*, int64_t, void*, void*, v
 	GO(g_variant_get, vFppV_t) \
 	GO(g_string_append_vprintf, vFppA_t) \
 	GO(g_string_vprintf, vFppA_t) \
-	GO(g_vasprintf, iFppp_t) \
-	GO(g_vfprintf, iFppp_t) \
-	GO(g_vsprintf, iFppp_t) \
 	GO(g_fprintf, iFppV_t) \
 	GO(g_sprintf, iFppV_t) \
+	GO(g_vasprintf, iFppA_t) \
+	GO(g_vfprintf, iFppA_t) \
+	GO(g_vsprintf, iFppA_t) \
 	GO(g_child_watch_add, uFipp_t) \
 	GO(g_timeout_add, uFupp_t) \
 	GO(g_timeout_add_seconds, uFupp_t) \
@@ -131,8 +134,8 @@ typedef int64_t (*iFpppippppppp_t)(void*, void*, void*, int64_t, void*, void*, v
 	GO(g_logv, vFpipA_t) \
 	GO(g_datalist_id_set_data_full, vFpupp_t) \
 	GO(g_source_set_callback, vFpppp_t) \
-	GO(g_vsnprintf, iFpLpp_t) \
 	GO(g_snprintf, iFpLpV_t) \
+	GO(g_vsnprintf, iFpLpA_t) \
 	GO(g_idle_add_full, uFippp_t) \
 	GO(g_io_add_watch, uFpipp_t) \
 	GO(g_log_set_handler, uFpipp_t) \
@@ -147,6 +150,7 @@ typedef int64_t (*iFpppippppppp_t)(void*, void*, void*, int64_t, void*, void*, v
 	GO(g_child_watch_add_full, uFiippp_t) \
 	GO(g_timeout_add_full, uFiuppp_t) \
 	GO(g_timeout_add_seconds_full, uFiuppp_t) \
+	GO(g_option_group_new, pFppppp_t) \
 	GO(g_datalist_id_replace_data, iFpupppp_t) \
 	GO(g_io_add_watch_full, uFpiippp_t) \
 	GO(g_variant_new_from_data, pFppuipp_t) \
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 81d3de30..00b0dc0f 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -482,6 +482,7 @@ typedef intptr_t (*lFppi_t)(void*, void*, int64_t);
 typedef intptr_t (*lFppL_t)(void*, void*, uintptr_t);
 typedef intptr_t (*lFppp_t)(void*, void*, void*);
 typedef intptr_t (*lFSpl_t)(void*, void*, intptr_t);
+typedef uintptr_t (*LFEpA_t)(x64emu_t*, void*, void*);
 typedef uintptr_t (*LFipL_t)(int64_t, void*, uintptr_t);
 typedef uintptr_t (*LFLLl_t)(uintptr_t, uintptr_t, intptr_t);
 typedef uintptr_t (*LFLpu_t)(uintptr_t, void*, uint64_t);
@@ -2440,6 +2441,7 @@ void lFppi(x64emu_t *emu, uintptr_t fcn) { lFppi_t fn = (lFppi_t)fcn; R_RAX=(int
 void lFppL(x64emu_t *emu, uintptr_t fcn) { lFppL_t fn = (lFppL_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 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 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 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((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void LFLLl(x64emu_t *emu, uintptr_t fcn) { LFLLl_t fn = (LFLLl_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI, (intptr_t)R_RDX); }
 void LFLpu(x64emu_t *emu, uintptr_t fcn) { LFLpu_t fn = (LFLpu_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX); }
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 2cab25fa..e39bd1f8 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -481,6 +481,7 @@ void lFppi(x64emu_t *emu, uintptr_t fnc);
 void lFppL(x64emu_t *emu, uintptr_t fnc);
 void lFppp(x64emu_t *emu, uintptr_t fnc);
 void lFSpl(x64emu_t *emu, uintptr_t fnc);
+void LFEpA(x64emu_t *emu, uintptr_t fnc);
 void LFipL(x64emu_t *emu, uintptr_t fnc);
 void LFLLl(x64emu_t *emu, uintptr_t fnc);
 void LFLpu(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedglib2.c b/src/wrapped/wrappedglib2.c
index 7c7a53f9..769ca8cd 100755
--- a/src/wrapped/wrappedglib2.c
+++ b/src/wrapped/wrappedglib2.c
@@ -26,132 +26,15 @@ static library_t* my_lib = NULL;
 
 static char* libname = NULL;
 
-typedef void (*vFp_t)(void*);
-typedef void* (*pFp_t)(void*);
-typedef void  (*vFpp_t)(void*, void*);
-typedef void* (*pFup_t)(uint32_t, void*);
-typedef int  (*iFpp_t)(void*, void*);
-typedef int  (*iFpA_t)(void*, va_list);
-typedef size_t(*LFpA_t)(void*, va_list);
-typedef void* (*pFpp_t)(void*, void*);
-typedef void* (*pFpA_t)(void*, va_list);
-typedef void* (*pFpu_t)(void*, uint32_t);
-typedef uint32_t  (*uFpp_t)(void*, void*);
-typedef int  (*iFppp_t)(void*, void*, void*);
-typedef int  (*iFppA_t)(void*, void*, va_list);
-typedef uint32_t (*uFipp_t)(int, void*, void*);
-typedef uint32_t  (*uFppp_t)(void*, void*, void*);
-typedef void  (*vFppp_t)(void*, void*, void*);
-typedef uint32_t (*uFupp_t)(uint32_t, void*, void*);
-typedef void* (*pFppp_t)(void*, void*, void*);
 typedef void  (*vFppip_t)(void*, void*, int, void*);
-typedef void* (*pFppip_t)(void*, void*, int, void*);
-typedef uint32_t (*uFpipp_t)(void*, int, void*, void*);
-typedef uint32_t (*uFuppp_t)(uint32_t, void*, void*, void*);
-typedef uint32_t (*uFippp_t)(int, void*, void*, void*);
-typedef uint32_t (*uFiuppp_t)(int, uint32_t, void*, void*, void*);
-typedef void (*vFpiLpp_t)(void*, int, unsigned long, void*, void*);
-typedef void* (*pFpppp_t)(void*, void*, void*, void*);
-typedef void (*vFpppp_t)(void*, void*, void*, void*);
-typedef void (*vFpupp_t)(void*, uint32_t, void*, void*);
-typedef int (*iFpLpp_t)(void*, unsigned long, void*, void*);
-typedef int (*iFpLpA_t)(void*, unsigned long, void*, va_list);
-typedef void* (*pFpupp_t)(void*, uint32_t, void*, void*);
-typedef uint32_t (*uFiippp_t)(int, int, void*, void*, void*);
-typedef uint32_t (*uFpiippp_t)(void*, int, int, void*, void*, void*);
-typedef int (*iFpupppp_t)(void*, uint32_t, void*, void*, void*, void*);
-typedef void* (*pFppuipp_t)(void*, void*, uint32_t, int32_t, void*, void*);
-typedef void* (*pFppLiiip_t)(void*, void*, unsigned long, int, int, int, void*);
-typedef int (*iFpppipppp_t)(void*, void*, void*, int, void*, void*, void*, void*);
-typedef int (*iFpppipppppp_t)(void*, void*, void*, int, void*, void*, void*, void*, void*, void*);
-typedef int (*iFpppippppppp_t)(void*, void*, void*, int, void*, void*, void*, void*, void*, void*, void*);
-typedef void* (*pFpipA_t)(void*, int, void*, va_list);
-typedef void (*vFpipA_t)(void*, int, void*, va_list);
-typedef void (*vFppA_t)(void*, void*, va_list);
 
-#define SUPER() \
-    GO(g_list_free_full, vFpp_t)                \
-    GO(g_markup_vprintf_escaped, pFpA_t)        \
+#define ADDED_FUNCTIONS() \
     GO(g_build_filenamev, pFp_t)                \
-    GO(g_timeout_add_full, uFiuppp_t)           \
-    GO(g_datalist_id_set_data_full, vFpupp_t)   \
-    GO(g_datalist_id_dup_data, pFpupp_t)        \
-    GO(g_datalist_id_replace_data, iFpupppp_t)  \
-    GO(g_variant_new_from_data, pFppuipp_t)     \
-    GO(g_variant_new_parsed_va, pFpp_t)         \
     GO(g_variant_get_va, vFpppp_t)              \
-    GO(g_strdup_vprintf, pFpA_t)                \
-    GO(g_vprintf, iFpA_t)                       \
-    GO(g_vfprintf, iFppA_t)                     \
-    GO(g_vsprintf, iFppA_t)                     \
-    GO(g_vsnprintf, iFpLpA_t)                   \
-    GO(g_vasprintf, iFppA_t)                    \
-    GO(g_printf_string_upper_bound, LFpA_t)     \
-    GO(g_source_new, pFpu_t)                    \
-    GO(g_source_set_funcs, vFpp_t)              \
-    GO(g_source_remove_by_funcs_user_data, iFpp_t) \
-    GO(g_main_context_get_poll_func, pFp_t)     \
-    GO(g_main_context_set_poll_func, vFpp_t)    \
-    GO(g_print, vFp_t)                          \
-    GO(g_printerr, vFp_t)                       \
-    GO(g_idle_add_full, uFippp_t)               \
-    GO(g_hash_table_new, pFpp_t)                \
-    GO(g_hash_table_new_full, pFpppp_t)         \
-    GO(g_hash_table_foreach, vFppp_t)           \
-    GO(g_hash_table_foreach_remove, uFppp_t)    \
-    GO(g_hash_table_foreach_steal, uFppp_t)     \
-    GO(g_hash_table_find, pFppp_t)              \
-    GO(g_spawn_async_with_pipes, iFpppippppppp_t)\
-    GO(g_spawn_async, iFpppipppp_t)             \
-    GO(g_spawn_sync, iFpppipppppp_t)            \
-    GO(g_child_watch_add, uFipp_t)              \
-    GO(g_child_watch_add_full, uFiippp_t)       \
-    GO(g_private_new, pFp_t)                    \
-    GO(g_static_private_set, vFppp_t)           \
-    GO(g_ptr_array_new_with_free_func, pFp_t)   \
-    GO(g_ptr_array_new_full, pFup_t)            \
-    GO(g_ptr_array_set_free_func, vFpp_t)       \
-    GO(g_ptr_array_sort, vFpp_t)                \
-    GO(g_ptr_array_sort_with_data, vFppp_t)     \
-    GO(g_ptr_array_foreach, vFppp_t)            \
-    GO(g_qsort_with_data, vFpiLpp_t)            \
-    GO(g_thread_create, pFppip_t)               \
-    GO(g_thread_create_full, pFppLiiip_t)       \
-    GO(g_thread_foreach, vFpp_t)                \
-    GO(g_array_sort, vFpp_t)                    \
-    GO(g_array_sort_with_data, vFppp_t)         \
-    GO(g_array_set_clear_func, vFpp_t)          \
-    GO(g_source_set_callback, vFpppp_t)         \
-    GO(g_slist_insert_sorted, pFppp_t)          \
-    GO(g_slist_insert_sorted_with_data, pFpppp_t)   \
-    GO(g_slist_foreach, pFppp_t)                \
-    GO(g_slist_find_custom, pFppp_t)            \
-    GO(g_idle_add, uFpp_t)                      \
-    GO(g_variant_new_va, pFppp_t)               \
-    GO(g_completion_new, pFp_t)                 \
-    GO(g_completion_set_compare, vFpp_t)        \
-    GO(g_log_set_default_handler, pFpp_t)       \
-    GO(g_io_add_watch, uFpipp_t)                \
-    GO(g_io_add_watch_full, uFpiippp_t)         \
-    GO(g_set_print_handler, pFp_t)              \
-    GO(g_set_printerr_handler, pFp_t)           \
-    GO(g_slist_sort, pFpp_t)                    \
-    GO(g_slist_sort_with_data, pFppp_t)         \
     GO(g_build_pathv, pFpp_t)                   \
-    GO(g_list_sort, pFpp_t)                     \
-    GO(g_list_sort_with_data, pFppp_t)          \
-    GO(g_queue_find_custom, pFppp_t)            \
-    GO(g_list_find_custom, pFppp_t)             \
-    GO(g_timeout_add_seconds, uFupp_t)          \
-    GO(g_timeout_add_seconds_full, uFiuppp_t)   \
-    GO(g_log_set_handler, uFpipp_t)             \
     GO(g_set_error_literal, vFppip_t)           \
-    GO(g_error_new_valist, pFpipA_t)            \
-    GO(g_logv, vFpipA_t)                        \
-    GO(g_string_append_vprintf, vFppA_t)        \
-    GO(g_string_vprintf, vFppA_t)               \
-    GO(g_strjoinv, pFpA_t)                      \
 
+#include "wrappedglib2types.h"
 
 typedef struct glib2_my_s {
     // functions
@@ -1501,6 +1384,12 @@ EXPORT void* my_g_strjoinv(x64emu_t* emu, void* a, x64_va_list_t V)
     return my->g_strjoinv(a, VARARGS);
 }
 
+EXPORT void* my_g_option_group_new(x64emu_t* emu, void* name, void* desc, void* help, void* data, void* destroy)
+{
+    glib2_my_t *my = (glib2_my_t*)my_lib->priv.w.p2;
+    return my->g_option_group_new(name, desc, help, data, findDestroyFct(destroy));
+}
+
 
 #define PRE_INIT    \
     if(box64_nogtk) \
diff --git a/src/wrapped/wrappedglib2_private.h b/src/wrapped/wrappedglib2_private.h
index eddacf55..4bcb1521 100755
--- a/src/wrapped/wrappedglib2_private.h
+++ b/src/wrapped/wrappedglib2_private.h
@@ -786,7 +786,7 @@ GO(g_option_context_set_translation_domain, vFpp)
 //GO(g_option_error_quark, 
 GO(g_option_group_add_entries, vFpp)
 GO(g_option_group_free, vFp)
-//GOM(g_option_group_new, pFEppppB)
+GOM(g_option_group_new, pFEppppp)
 GO(g_option_group_ref, pFp) // 2.44+
 //GOM(g_option_group_set_error_hook, vFEpB)
 //GOM(g_option_group_set_parse_hooks, vFEpBB)
@@ -812,7 +812,7 @@ GO(g_poll, iFpui)
 GOM(g_print, vFEpV)
 GOM(g_printerr, vFEpV)
 GOM(g_printf, iFEpV)
-GOM(g_printf_string_upper_bound, uFEpp)
+GOM(g_printf_string_upper_bound, LFEpA)
 GO(g_private_get, pFp)
 GOM(g_private_new, pFEp)
 GO(g_private_replace, vFpp)
@@ -1146,7 +1146,7 @@ GO(g_strdown, pFp)
 GO(g_strdup, pFp)
 GOM(g_strdup_printf, pFEpV)
 GO(g_strdupv, pFp)
-GOM(g_strdup_vprintf, pFEpp)
+GOM(g_strdup_vprintf, pFEpA)
 GO(g_str_equal, iFpp)
 GO(g_strerror, pFi)
 GO(g_strescape, pFpp)
@@ -1531,7 +1531,7 @@ GO(g_variant_new_maybe, pFpp)
 GO(g_variant_new_object_path, pFp)
 GO(g_variant_new_objv, pFpi)
 //GO2(g_variant_new_parsed, pFEpV, my_g_variant_new_parsed_va)
-GOM(g_variant_new_parsed_va, pFEpA)
+GOM(g_variant_new_parsed_va, pFEpp)
 //GO(g_variant_new_printf,  // needs alignment.....
 GO(g_variant_new_signature, pFp)
 GO(g_variant_new_string, pFp)
@@ -1563,16 +1563,16 @@ GO(g_variant_ref_sink, pFp)
 GO(g_variant_store, vFp)
 GO(g_variant_take_ref, pFp)
 GO(g_variant_type_checked_, pFp)
-//GO(g_variant_type_copy, 
-//GO(g_variant_type_dup_string, 
+GO(g_variant_type_copy, pFp)
+GO(g_variant_type_dup_string, pFp)
 //GO(g_variant_type_element, 
-//GO(g_variant_type_equal, 
+GO(g_variant_type_equal, iFpp)
 //GO(g_variant_type_first, 
-//GO(g_variant_type_free, 
-//GO(g_variant_type_get_string_length, 
-//GO(g_variant_type_hash, 
+GO(g_variant_type_free, vFp)
+GO(g_variant_type_get_string_length, LFp)
+GO(g_variant_type_hash, uFp)
 //GO(g_variant_type_info_assert_no_infos, 
-//GO(g_variant_type_info_element, 
+GO(g_variant_type_info_element, pFp)
 //GO(g_variant_type_info_get, 
 //GO(g_variant_type_info_get_type_string, 
 //GO(g_variant_type_info_member_info, 
@@ -1581,33 +1581,33 @@ GO(g_variant_type_checked_, pFp)
 //GO(g_variant_type_info_query_element, 
 //GO(g_variant_type_info_ref, 
 //GO(g_variant_type_info_unref, 
-//GO(g_variant_type_is_array, 
-//GO(g_variant_type_is_basic, 
-//GO(g_variant_type_is_container, 
-//GO(g_variant_type_is_definite, 
-//GO(g_variant_type_is_dict_entry, 
-//GO(g_variant_type_is_maybe, 
-//GO(g_variant_type_is_subtype_of, 
-//GO(g_variant_type_is_tuple, 
-//GO(g_variant_type_is_variant, 
-//GO(g_variant_type_key, 
-//GO(g_variant_type_new, 
-//GO(g_variant_type_new_array, 
-//GO(g_variant_type_new_dict_entry, 
-//GO(g_variant_type_new_maybe, 
-//GO(g_variant_type_new_tuple, 
-//GO(g_variant_type_next, 
-//GO(g_variant_type_n_items, 
-//GO(g_variant_type_peek_string, 
-//GO(g_variant_type_string_is_valid, 
-//GO(g_variant_type_string_scan, 
-//GO(g_variant_type_value, 
+GO(g_variant_type_is_array, iFp)
+GO(g_variant_type_is_basic, iFp)
+GO(g_variant_type_is_container, iFp)
+GO(g_variant_type_is_definite, iFp)
+GO(g_variant_type_is_dict_entry, iFp)
+GO(g_variant_type_is_maybe, iFp)
+GO(g_variant_type_is_subtype_of, iFpp)
+GO(g_variant_type_is_tuple, iFp)
+GO(g_variant_type_is_variant, iFp)
+GO(g_variant_type_key, pFp)
+GO(g_variant_type_new, pFp)
+GO(g_variant_type_new_array, pFp)
+GO(g_variant_type_new_dict_entry, pFpp)
+GO(g_variant_type_new_maybe, pFp)
+GO(g_variant_type_new_tuple, pFpi)
+GO(g_variant_type_next, pFp)
+GO(g_variant_type_n_items, iFp)
+GO(g_variant_type_peek_string, pFp)
+GO(g_variant_type_string_is_valid, iFp)
+GO(g_variant_type_string_scan, iFppp)
+GO(g_variant_type_value, pFp)
 GO(g_variant_unref, vFp)
-GOM(g_vasprintf, iFEppp)
-GOM(g_vfprintf, iFEppp)
-GOM(g_vprintf, iFEpp)
-GOM(g_vsnprintf, iFEpLpp)
-GOM(g_vsprintf, iFEppp)
+GOM(g_vasprintf, iFEppA)
+GOM(g_vfprintf, iFEppA)
+GOM(g_vprintf, iFEpA)
+GOM(g_vsnprintf, iFEpLpA)
+GOM(g_vsprintf, iFEppA)
 GO(g_warn_message, vFppipp)
 //GO(_init,