More work on GTK wrapping. Still not ok, but better

13 files changed, 972 insertions, 760 deletions

diff --git a/src/include/gtkclass.h b/src/include/gtkclass.h
index 889bf24e..53921591 100755
--- a/src/include/gtkclass.h
+++ b/src/include/gtkclass.h
@@ -269,8 +269,8 @@ typedef struct my_GtkTypeInfo_s {
 } my_GtkTypeInfo_t ;
 
 my_GTypeValueTable_t* findFreeGTypeValueTable(my_GTypeValueTable_t* fcts);
-my_GTypeInfo_t* findFreeGTypeInfo(my_GTypeInfo_t* fcts, int parent);
-my_GtkTypeInfo_t* findFreeGtkTypeInfo(my_GtkTypeInfo_t* fcts, int parent);
+my_GTypeInfo_t* findFreeGTypeInfo(my_GTypeInfo_t* fcts, size_t parent);
+my_GtkTypeInfo_t* findFreeGtkTypeInfo(my_GtkTypeInfo_t* fcts, size_t parent);
 
 void InitGTKClass(bridge_t *bridge);
 void FiniGTKClass();
@@ -289,15 +289,15 @@ GTKCLASS(GtkWindow)     \
 GTKCLASS(GtkTable)      \
 GTKCLASS(MetaFrames)    \
 
-#define GTKCLASS(A) void Set##A##ID(int id);
+#define GTKCLASS(A) void Set##A##ID(size_t id);
 GTKCLASSES()
 #undef GTKCLASS
 
 void SetGTypeName(void* f);
-void AutoBridgeGtk(void*(*ref)(int), void(*unref)(void*));
+void AutoBridgeGtk(void*(*ref)(size_t), void(*unref)(void*));
 
-void* wrapCopyGTKClass(void* cl, int type);
-void* unwrapCopyGTKClass(void* klass, int type);
+void* wrapCopyGTKClass(void* cl, size_t type);
+void* unwrapCopyGTKClass(void* klass, size_t type);
 
 typedef struct my_signal_s {
     uint64_t sign;  // signature
diff --git a/src/tools/gtkclass.c b/src/tools/gtkclass.c
index 5e17cd14..6a664dc1 100755
--- a/src/tools/gtkclass.c
+++ b/src/tools/gtkclass.c
@@ -17,9 +17,9 @@
 #include "custommem.h"
 #include "khash.h"
 
-static bridge_t*        my_bridge       = NULL;
-static const char* (*g_type_name)(int)  = NULL;
-#define GTKCLASS(A) static int my_##A = -1;
+static bridge_t*        my_bridge           = NULL;
+static const char* (*g_type_name)(size_t)   = NULL;
+#define GTKCLASS(A) static size_t my_##A    = (size_t)-1;
 GTKCLASSES()
 #undef GTKCLASS
 
@@ -114,7 +114,7 @@ AUTOBRIDGE(A, NAME)
 
 // ----- GObjectClass ------
 // wrapper x64 -> natives of callbacks
-WRAPPER(GObject, constructor, void*, (int type, uint32_t n_construct_properties, void* construct_properties), 3, type, n_construct_properties, construct_properties);
+WRAPPER(GObject, constructor, void*, (size_t type, uint32_t n_construct_properties, void* construct_properties), 3, type, n_construct_properties, construct_properties);
 WRAPPER(GObject, set_property, void, (void* object, uint32_t property_id, void* value, void* pspec), 4, object, property_id, value, pspec);
 WRAPPER(GObject, get_property, void, (void* object, uint32_t property_id, void* value, void* pspec), 4, object, property_id, value, pspec);
 WRAPPER(GObject, dispose, void, (void* object), 1, object);
@@ -124,7 +124,7 @@ WRAPPER(GObject, notify, void*, (int type, void* pspecs), 2, type, pspecs);
 WRAPPER(GObject, constructed, void, (void* object), 1, object);
 
 #define SUPERGO() \
-    GO(constructor, pFiup);                 \
+    GO(constructor, pFLup);                 \
     GO(set_property, vFpupp);               \
     GO(get_property, vFpupp);               \
     GO(dispose, vFp);                       \
@@ -678,7 +678,7 @@ static void bridgeMetaFramesClass(my_MetaFramesClass_t* class)
 #undef WRAPPED
 
 // g_type_class_peek_parent
-static void wrapGTKClass(void* cl, int type)
+static void wrapGTKClass(void* cl, size_t type)
 {
     #define GTKCLASS(A)                             \
     if(type==my_##A)                                \
@@ -691,12 +691,12 @@ static void wrapGTKClass(void* cl, int type)
             my_MetaFrames = type;
             wrapMetaFramesClass((my_MetaFramesClass_t*)cl);
         } else
-            printf_log(LOG_NONE, "Warning, Custom Class initializer with unknown class type %d (%s)\n", type, g_type_name(type));
+            printf_log(LOG_NONE, "Warning, Custom Class initializer with unknown class type %zu (%s)\n", type, g_type_name(type));
     }
     #undef GTKCLASS
 }
 
-static void unwrapGTKClass(void* cl, int type)
+static void unwrapGTKClass(void* cl, size_t type)
 {
     #define GTKCLASS(A)                             \
     if(type==my_##A)                                \
@@ -708,7 +708,7 @@ static void unwrapGTKClass(void* cl, int type)
     #undef GTKCLASS
 }
 
-static void bridgeGTKClass(void* cl, int type)
+static void bridgeGTKClass(void* cl, size_t type)
 {
     #define GTKCLASS(A)                             \
     if(type==my_##A)                                \
@@ -717,7 +717,7 @@ static void bridgeGTKClass(void* cl, int type)
 
     GTKCLASSES()
     {
-        printf_log(LOG_NONE, "Warning, AutoBridge GTK Class with unknown class type %d (%s)\n", type, g_type_name(type));
+        printf_log(LOG_NONE, "Warning, AutoBridge GTK Class with unknown class type %zu (%s)\n", type, g_type_name(type));
     }
     #undef GTKCLASS
 }
@@ -736,18 +736,18 @@ static my_GClassAll_t my_gclassall_##A;
 SUPER()
 #undef GO
 
-void* unwrapCopyGTKClass(void* klass, int type)
+void* unwrapCopyGTKClass(void* klass, size_t type)
 {
     if(!klass) return klass;
     #define GO(A) if(klass == my_gclassall_ref_##A) return &my_gclassall_##A;
     SUPER()
     #undef GO
     // check if class is the exact type we know
-    int sz = 0;
+    size_t sz = 0;
     #define GTKCLASS(A) if(type==my_##A) sz = sizeof(my_##A##Class_t); else
     GTKCLASSES()
     {
-        printf_log(LOG_NONE, "Warning, unwrapCopyGTKClass called with unknown class type %d (%s)\n", type, g_type_name(type));
+        printf_log(LOG_NONE, "Warning, unwrapCopyGTKClass called with unknown class type %zu (%s)\n", type, g_type_name(type));
         return klass;
     }
     #undef GTKCLASS
@@ -772,19 +772,25 @@ static my_GClassAll_t my_gclassallu_##A;
 
 SUPER()
 #undef GO
-void* wrapCopyGTKClass(void* klass, int type)
+void* wrapCopyGTKClass(void* klass, size_t type)
 {
     if(!klass) return klass;
     #define GO(A) if(klass == my_gclassallu_ref_##A) return &my_gclassallu_##A;
     SUPER()
     #undef GO
     // check if class is the exact type we know
-    int sz = 0;
+    size_t sz = 0;
     #define GTKCLASS(A) if(type==my_##A) sz = sizeof(my_##A##Class_t); else
     GTKCLASSES()
     {
-        printf_log(LOG_NONE, "Warning, wrapCopyGTKClass called with unknown class type 0x%x (%s)\n", type, g_type_name(type));
-        return klass;
+        if(my_MetaFrames==(size_t)-1 && !strcmp(g_type_name(type), "MetaFrames")) {
+            my_MetaFrames = type;
+            sz = sizeof(my_MetaFramesClass_t);
+        }
+        if(!sz) {
+            printf_log(LOG_NONE, "Warning, wrapCopyGTKClass called with unknown class type %p (%s)\n", (void*)type, g_type_name(type));
+            return klass;
+        }
     }
     #undef GTKCLASS
     my_GClassAll_t *newklass = NULL;
@@ -809,39 +815,138 @@ static my_GTypeValueTable_t   *ref_gtypevaluetable_##A = NULL;
 SUPER()
 #undef GO
 // Then the static functions callback that may be used with the structure
+// value_init ...
 #define GO(A)   \
-static uintptr_t fct_funcs_value_init_##A = 0;  \
-static void my_funcs_value_init_##A(void* value) {   \
-    printf_log(LOG_DEBUG, "Calling fct_funcs_value_init_" #A " wrapper\n");             \
-    RunFunction(my_context, fct_funcs_value_init_##A, 1, value);    \
-}   \
-static uintptr_t fct_funcs_value_free_##A = 0;  \
-static void my_funcs_value_free_##A(void* value) {   \
-    printf_log(LOG_DEBUG, "Calling fct_funcs_value_free_" #A " wrapper\n");             \
-    RunFunction(my_context, fct_funcs_value_free_##A, 1, value);    \
-}   \
-static uintptr_t fct_funcs_value_copy_##A = 0;  \
-static void my_funcs_value_copy_##A(void* source, void* dest) {   \
-    printf_log(LOG_DEBUG, "Calling fct_funcs_value_copy_" #A " wrapper\n");             \
-    RunFunction(my_context, fct_funcs_value_copy_##A, 2, source, dest);    \
-}   \
-static uintptr_t fct_funcs_value_peek_pointer_##A = 0;  \
-static void* my_funcs_value_peek_pointer_##A(void* value) {   \
-    printf_log(LOG_DEBUG, "Calling fct_funcs_value_peek_pointer_" #A " wrapper\n");             \
-    return (void*)RunFunction(my_context, fct_funcs_value_peek_pointer_##A, 1, value);    \
-}   \
-static uintptr_t fct_funcs_collect_value_##A = 0;  \
-static void* my_funcs_collect_value_##A(void* value, uint32_t n, void* collect, uint32_t flags) {   \
-    printf_log(LOG_DEBUG, "Calling fct_funcs_collect_value_" #A " wrapper\n");             \
-    return (void*)RunFunction(my_context, fct_funcs_collect_value_##A, 4, value, n, collect, flags);    \
-}   \
-static uintptr_t fct_funcs_lcopy_value_##A = 0;  \
-static void* my_funcs_lcopy_value_##A(void* value, uint32_t n, void* collect, uint32_t flags) {   \
-    printf_log(LOG_DEBUG, "Calling fct_funcs_lcopy_value_" #A " wrapper\n");             \
-    return (void*)RunFunction(my_context, fct_funcs_lcopy_value_##A, 4, value, n, collect, flags);    \
+static uintptr_t my_value_init_fct_##A = 0;                 \
+static void my_value_init_##A(void* a)                      \
+{                                                           \
+    RunFunction(my_context, my_value_init_fct_##A, 1, a);   \
+}
+SUPER()
+#undef GO
+static void* find_value_init_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_value_init_fct_##A == (uintptr_t)fct) return my_value_init_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_value_init_fct_##A == 0) {my_value_init_fct_##A = (uintptr_t)fct; return my_value_init_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for GTypeInfo value_init callback\n");
+    return NULL;
+}
+// value_free ...
+#define GO(A)   \
+static uintptr_t my_value_free_fct_##A = 0;                 \
+static void my_value_free_##A(void* a)                      \
+{                                                           \
+    RunFunction(my_context, my_value_free_fct_##A, 1, a);   \
+}
+SUPER()
+#undef GO
+static void* find_value_free_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_value_free_fct_##A == (uintptr_t)fct) return my_value_free_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_value_free_fct_##A == 0) {my_value_free_fct_##A = (uintptr_t)fct; return my_value_free_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for GTypeInfo value_free callback\n");
+    return NULL;
+}
+// value_copy ...
+#define GO(A)   \
+static uintptr_t my_value_copy_fct_##A = 0;                 \
+static void my_value_copy_##A(void* a, void* b)             \
+{                                                           \
+    RunFunction(my_context, my_value_copy_fct_##A, 2, a, b);\
+}
+SUPER()
+#undef GO
+static void* find_value_copy_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_value_copy_fct_##A == (uintptr_t)fct) return my_value_copy_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_value_copy_fct_##A == 0) {my_value_copy_fct_##A = (uintptr_t)fct; return my_value_copy_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for GTypeInfo value_copy callback\n");
+    return NULL;
+}
+// value_peek_pointer ...
+#define GO(A)   \
+static uintptr_t my_value_peek_pointer_fct_##A = 0;                             \
+static void* my_value_peek_pointer_##A(void* a)                                 \
+{                                                                               \
+    return (void*)RunFunction(my_context, my_value_peek_pointer_fct_##A, 1, a); \
+}
+SUPER()
+#undef GO
+static void* find_value_peek_pointer_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_value_peek_pointer_fct_##A == (uintptr_t)fct) return my_value_peek_pointer_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_value_peek_pointer_fct_##A == 0) {my_value_peek_pointer_fct_##A = (uintptr_t)fct; return my_value_peek_pointer_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for GTypeInfo value_peek_pointer callback\n");
+    return NULL;
+}
+// collect_value ...
+#define GO(A)   \
+static uintptr_t my_collect_value_fct_##A = 0;                                      \
+static void* my_collect_value_##A(void* a, uint32_t b, void* c, uint32_t d)         \
+{                                                                                   \
+    return (void*)RunFunction(my_context, my_collect_value_fct_##A, 4, a, b, c, d); \
+}
+SUPER()
+#undef GO
+static void* find_collect_value_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_collect_value_fct_##A == (uintptr_t)fct) return my_collect_value_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_collect_value_fct_##A == 0) {my_collect_value_fct_##A = (uintptr_t)fct; return my_collect_value_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for GTypeInfo collect_value callback\n");
+    return NULL;
+}
+// lcopy_value ...
+#define GO(A)   \
+static uintptr_t my_lcopy_value_fct_##A = 0;                                      \
+static void* my_lcopy_value_##A(void* a, uint32_t b, void* c, uint32_t d)         \
+{                                                                                   \
+    return (void*)RunFunction(my_context, my_lcopy_value_fct_##A, 4, a, b, c, d); \
 }
 SUPER()
 #undef GO
+static void* find_lcopy_value_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_lcopy_value_fct_##A == (uintptr_t)fct) return my_lcopy_value_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_lcopy_value_fct_##A == 0) {my_lcopy_value_fct_##A = (uintptr_t)fct; return my_lcopy_value_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for GTypeInfo lcopy_value callback\n");
+    return NULL;
+}
 // And now the get slot / assign... Taking into account that the desired callback may already be a wrapped one (so unwrapping it)
 my_GTypeValueTable_t* findFreeGTypeValueTable(my_GTypeValueTable_t* fcts)
 {
@@ -849,23 +954,17 @@ my_GTypeValueTable_t* findFreeGTypeValueTable(my_GTypeValueTable_t* fcts)
     #define GO(A) if(ref_gtypevaluetable_##A == fcts) return &my_gtypevaluetable_##A;
     SUPER()
     #undef GO
-    #define GO(A) if(ref_gtypevaluetable_##A == 0) {    \
-        ref_gtypevaluetable_##A = fcts;                 \
-        my_gtypevaluetable_##A.value_init = (fcts->value_init)?((GetNativeFnc((uintptr_t)fcts->value_init))?GetNativeFnc((uintptr_t)fcts->value_init):my_funcs_value_init_##A):NULL;    \
-        fct_funcs_value_init_##A = (uintptr_t)fcts->value_init;                             \
-        my_gtypevaluetable_##A.value_free = (fcts->value_free)?((GetNativeFnc((uintptr_t)fcts->value_free))?GetNativeFnc((uintptr_t)fcts->value_free):my_funcs_value_free_##A):NULL;    \
-        fct_funcs_value_free_##A = (uintptr_t)fcts->value_free;                             \
-        my_gtypevaluetable_##A.value_copy = (fcts->value_copy)?((GetNativeFnc((uintptr_t)fcts->value_copy))?GetNativeFnc((uintptr_t)fcts->value_copy):my_funcs_value_copy_##A):NULL;    \
-        fct_funcs_value_copy_##A = (uintptr_t)fcts->value_copy;                             \
-        my_gtypevaluetable_##A.value_peek_pointer = (fcts->value_peek_pointer)?((GetNativeFnc((uintptr_t)fcts->value_peek_pointer))?GetNativeFnc((uintptr_t)fcts->value_peek_pointer):my_funcs_value_peek_pointer_##A):NULL;    \
-        fct_funcs_value_peek_pointer_##A = (uintptr_t)fcts->value_peek_pointer;             \
-        my_gtypevaluetable_##A.collect_format = fcts->collect_format;                       \
-        my_gtypevaluetable_##A.collect_value = (fcts->collect_value)?((GetNativeFnc((uintptr_t)fcts->collect_value))?GetNativeFnc((uintptr_t)fcts->collect_value):my_funcs_collect_value_##A):NULL;    \
-        fct_funcs_collect_value_##A = (uintptr_t)fcts->collect_value;                       \
-        my_gtypevaluetable_##A.lcopy_format = fcts->lcopy_format;                           \
-        my_gtypevaluetable_##A.lcopy_value = (fcts->lcopy_value)?((GetNativeFnc((uintptr_t)fcts->lcopy_value))?GetNativeFnc((uintptr_t)fcts->lcopy_value):my_funcs_lcopy_value_##A):NULL;    \
-        fct_funcs_lcopy_value_##A = (uintptr_t)fcts->lcopy_value;                           \
-        return &my_gtypevaluetable_##A;                 \
+    #define GO(A) if(ref_gtypevaluetable_##A == 0) {                                                        \
+        ref_gtypevaluetable_##A = fcts;                                                                     \
+        my_gtypevaluetable_##A.value_init = find_value_init_Fct(fcts->value_init);                          \
+        my_gtypevaluetable_##A.value_free = find_value_free_Fct(fcts->value_free);                          \
+        my_gtypevaluetable_##A.value_copy = find_value_copy_Fct(fcts->value_copy);                          \
+        my_gtypevaluetable_##A.value_peek_pointer = find_value_peek_pointer_Fct(fcts->value_peek_pointer);  \
+        my_gtypevaluetable_##A.collect_format = fcts->collect_format;                                       \
+        my_gtypevaluetable_##A.collect_value = find_collect_value_Fct(fcts->collect_value);                 \
+        my_gtypevaluetable_##A.lcopy_format = fcts->lcopy_format;                                           \
+        my_gtypevaluetable_##A.lcopy_value = find_lcopy_value_Fct(fcts->lcopy_value);                       \
+        return &my_gtypevaluetable_##A;                                                                     \
     }
     SUPER()
     #undef GO
@@ -884,68 +983,137 @@ static int              used_gtypeinfo_##A = 0;
 SUPER()
 #undef GO
 // Then the static functions callback that may be used with the structure
+// base_init ...
 #define GO(A)   \
-static int fct_parent_##A = 0 ;                     \
-static uintptr_t fct_funcs_base_init_##A = 0;       \
-static int my_funcs_base_init_##A(void* g_class) {  \
-    printf_log(LOG_DEBUG, "Calling fct_funcs_base_init_" #A " wrapper\n");             \
-    return (int)RunFunction(my_context, fct_funcs_base_init_##A, 1, g_class);    \
-}   \
-static uintptr_t fct_funcs_base_finalize_##A = 0;   \
-static int my_funcs_base_finalize_##A(void* g_class) {   \
-    printf_log(LOG_DEBUG, "Calling fct_funcs_base_finalize_" #A " wrapper\n");             \
-    return (int)RunFunction(my_context, fct_funcs_base_finalize_##A, 1, g_class);    \
-}   \
-static uintptr_t fct_funcs_class_init_##A = 0;                      \
-static int my_funcs_class_init_##A(void* g_class, void* data) {     \
-    printf_log(LOG_DEBUG, "Calling fct_funcs_class_init_" #A " wrapper\n");             \
-    wrapGTKClass(g_class, fct_parent_##A);                          \
-    int ret = (int)RunFunction(my_context, fct_funcs_class_init_##A, 2, g_class, data);    \
-    unwrapGTKClass(g_class, fct_parent_##A);                        \
-    return ret;                                                     \
-}   \
-static uintptr_t fct_funcs_class_finalize_##A = 0;  \
-static int my_funcs_class_finalize_##A(void* g_class, void* data) { \
-    printf_log(LOG_DEBUG, "Calling fct_funcs_class_finalize_" #A " wrapper\n");             \
-    wrapGTKClass(g_class, fct_parent_##A);                          \
-    int ret = (int)RunFunction(my_context, fct_funcs_class_finalize_##A, 2, g_class, data);    \
-    unwrapGTKClass(g_class, fct_parent_##A);                        \
-    return ret;                                                     \
-}   \
-static uintptr_t fct_funcs_instance_init_##A = 0;  \
-static int my_funcs_instance_init_##A(void* instance, void* data) {   \
-    printf_log(LOG_DEBUG, "Calling fct_funcs_instance_init_" #A " wrapper\n");             \
-    return (int)RunFunction(my_context, fct_funcs_instance_init_##A, 2, instance, data);    \
+static uintptr_t my_base_init_fct_##A = 0;                      \
+static int my_base_init_##A(void* a)                            \
+{                                                               \
+    return RunFunction(my_context, my_base_init_fct_##A, 1, a); \
+}
+SUPER()
+#undef GO
+static void* find_base_init_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_base_init_fct_##A == (uintptr_t)fct) return my_base_init_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_base_init_fct_##A == 0) {my_base_init_fct_##A = (uintptr_t)fct; return my_base_init_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for GTypeInfo base_init callback\n");
+    return NULL;
+}
+// base_finalize ...
+#define GO(A)   \
+static uintptr_t my_base_finalize_fct_##A = 0;                      \
+static int my_base_finalize_##A(void* a)                            \
+{                                                                   \
+    return RunFunction(my_context, my_base_finalize_fct_##A, 1, a); \
+}
+SUPER()
+#undef GO
+static void* find_base_finalize_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_base_finalize_fct_##A == (uintptr_t)fct) return my_base_finalize_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_base_finalize_fct_##A == 0) {my_base_finalize_fct_##A = (uintptr_t)fct; return my_base_finalize_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for GTypeInfo base_finalize callback\n");
+    return NULL;
+}
+// class_init ...
+#define GO(A)   \
+static uintptr_t my_class_init_fct_##A = 0;                         \
+static int my_class_init_##A(void* a, void* b)                      \
+{                                                                   \
+    return RunFunction(my_context, my_class_init_fct_##A, 2, a, b); \
+}
+SUPER()
+#undef GO
+static void* find_class_init_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_class_init_fct_##A == (uintptr_t)fct) return my_class_init_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_class_init_fct_##A == 0) {my_class_init_fct_##A = (uintptr_t)fct; return my_class_init_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for GTypeInfo class_init callback\n");
+    return NULL;
+}
+// class_finalize ...
+#define GO(A)   \
+static uintptr_t my_class_finalize_fct_##A = 0;                         \
+static int my_class_finalize_##A(void* a, void* b)                      \
+{                                                                       \
+    return RunFunction(my_context, my_class_finalize_fct_##A, 2, a, b); \
+}
+SUPER()
+#undef GO
+static void* find_class_finalize_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_class_finalize_fct_##A == (uintptr_t)fct) return my_class_finalize_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_class_finalize_fct_##A == 0) {my_class_finalize_fct_##A = (uintptr_t)fct; return my_class_finalize_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for GTypeInfo class_finalize callback\n");
+    return NULL;
+}
+// instance_init ...
+#define GO(A)   \
+static uintptr_t my_instance_init_fct_##A = 0;                         \
+static int my_instance_init_##A(void* a, void* b)                      \
+{                                                                      \
+    return RunFunction(my_context, my_instance_init_fct_##A, 2, a, b); \
 }
-
 SUPER()
 #undef GO
+static void* find_instance_init_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_instance_init_fct_##A == (uintptr_t)fct) return my_instance_init_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_instance_init_fct_##A == 0) {my_instance_init_fct_##A = (uintptr_t)fct; return my_instance_init_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for GTypeInfo instance_init callback\n");
+    return NULL;
+}
 // And now the get slot / assign... Taking into account that the desired callback may already be a wrapped one (so unwrapping it)
-my_GTypeInfo_t* findFreeGTypeInfo(my_GTypeInfo_t* fcts, int parent)
+my_GTypeInfo_t* findFreeGTypeInfo(my_GTypeInfo_t* fcts, size_t parent)
 {
     if(!fcts) return NULL;
-    #define GO(A) if(used_gtypeinfo_##A==0 && memcmp(&ref_gtypeinfo_##A, fcts, sizeof(my_GTypeInfo_t))==0) return &my_gtypeinfo_##A;
+    #define GO(A) if(used_gtypeinfo_##A && memcmp(&ref_gtypeinfo_##A, fcts, sizeof(my_GTypeInfo_t))==0) return &my_gtypeinfo_##A;
     SUPER()
     #undef GO
-    #define GO(A) if(used_gtypeinfo_##A == 0) {                         \
-        memcpy(&ref_gtypeinfo_##A, fcts, sizeof(my_GTypeInfo_t));            \
-        fct_parent_##A = parent;                                        \
-        my_gtypeinfo_##A.class_size = fcts->class_size;                 \
-        my_gtypeinfo_##A.base_init = (fcts->base_init)?((GetNativeFnc((uintptr_t)fcts->base_init))?GetNativeFnc((uintptr_t)fcts->base_init):my_funcs_base_init_##A):NULL;    \
-        fct_funcs_base_init_##A = (uintptr_t)fcts->base_init;           \
-        my_gtypeinfo_##A.base_finalize = (fcts->base_finalize)?((GetNativeFnc((uintptr_t)fcts->base_finalize))?GetNativeFnc((uintptr_t)fcts->base_finalize):my_funcs_base_finalize_##A):NULL;    \
-        fct_funcs_base_finalize_##A = (uintptr_t)fcts->base_finalize;   \
-        my_gtypeinfo_##A.class_init = (fcts->class_init)?((GetNativeFnc((uintptr_t)fcts->class_init))?GetNativeFnc((uintptr_t)fcts->class_init):my_funcs_class_init_##A):NULL;    \
-        fct_funcs_class_init_##A = (uintptr_t)fcts->class_init;         \
-        my_gtypeinfo_##A.class_finalize = (fcts->class_finalize)?((GetNativeFnc((uintptr_t)fcts->class_finalize))?GetNativeFnc((uintptr_t)fcts->class_finalize):my_funcs_class_finalize_##A):NULL;    \
-        fct_funcs_class_finalize_##A = (uintptr_t)fcts->class_finalize; \
-        my_gtypeinfo_##A.class_data = fcts->class_data;                 \
-        my_gtypeinfo_##A.instance_size = fcts->instance_size;           \
-        my_gtypeinfo_##A.n_preallocs = fcts->n_preallocs;               \
-        my_gtypeinfo_##A.instance_init = (fcts->instance_init)?((GetNativeFnc((uintptr_t)fcts->instance_init))?GetNativeFnc((uintptr_t)fcts->instance_init):my_funcs_instance_init_##A):NULL;    \
-        fct_funcs_instance_init_##A = (uintptr_t)fcts->instance_init;   \
-        my_gtypeinfo_##A.value_table = findFreeGTypeValueTable(fcts->value_table);           \
-        return &my_gtypeinfo_##A;                                       \
+    #define GO(A) if(used_gtypeinfo_##A == 0) {                                         \
+        used_gtypeinfo_##A = 1;                                                         \
+        memcpy(&ref_gtypeinfo_##A, fcts, sizeof(my_GTypeInfo_t));                       \
+        my_gtypeinfo_##A.class_size = fcts->class_size;                                 \
+        my_gtypeinfo_##A.base_init = find_base_init_Fct(fcts->base_init);               \
+        my_gtypeinfo_##A.base_finalize = find_base_finalize_Fct(fcts->base_finalize);   \
+        my_gtypeinfo_##A.class_init = find_class_init_Fct(fcts->class_init);            \
+        my_gtypeinfo_##A.class_finalize = find_class_finalize_Fct(fcts->class_finalize);\
+        my_gtypeinfo_##A.class_data = fcts->class_data;                                 \
+        my_gtypeinfo_##A.instance_size = fcts->instance_size;                           \
+        my_gtypeinfo_##A.n_preallocs = fcts->n_preallocs;                               \
+        my_gtypeinfo_##A.instance_init = find_instance_init_Fct(fcts->instance_init);   \
+        my_gtypeinfo_##A.value_table = findFreeGTypeValueTable(fcts->value_table);      \
+        return &my_gtypeinfo_##A;                                                       \
     }
     SUPER()
     #undef GO
@@ -984,7 +1152,7 @@ static int my_gtk_base_class_init_##A(void* instance, void* data) {   \
 SUPER()
 #undef GO
 // And now the get slot / assign... Taking into account that the desired callback may already be a wrapped one (so unwrapping it)
-my_GtkTypeInfo_t* findFreeGtkTypeInfo(my_GtkTypeInfo_t* fcts, int parent)
+my_GtkTypeInfo_t* findFreeGtkTypeInfo(my_GtkTypeInfo_t* fcts, size_t parent)
 {
     if(!fcts) return NULL;
     #define GO(A) if(used_gtktypeinfo_##A && memcmp(&ref_gtktypeinfo_##A, fcts, sizeof(my_GtkTypeInfo_t))==0) return &my_gtktypeinfo_##A;
@@ -1034,14 +1202,14 @@ void FiniGTKClass()
 }
 
 #define GTKCLASS(A)             \
-void Set##A##ID(int id)         \
+void Set##A##ID(size_t id)      \
 {                               \
     my_##A = id;                \
 }
 GTKCLASSES()
 #undef GTKCLASS
 
-void AutoBridgeGtk(void*(*ref)(int), void(*unref)(void*))
+void AutoBridgeGtk(void*(*ref)(size_t), void(*unref)(void*))
 {
     void* p;
     #define GTKCLASS(A)             \
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 87b6989d..b6e8589f 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -143,6 +143,7 @@
 #() iFup
 #() iFli
 #() iFlp
+#() iFLu
 #() iFLL
 #() iFLp
 #() iFpw
@@ -213,6 +214,7 @@
 #() LFii
 #() LFuu
 #() LFLi
+#() LFLL
 #() LFpi
 #() LFpL
 #() LFpp
@@ -230,6 +232,7 @@
 #() pFUi
 #() pFdd
 #() pFlp
+#() pFLu
 #() pFLL
 #() pFLp
 #() pFpi
@@ -278,6 +281,7 @@
 #() vFudd
 #() vFull
 #() vFulp
+#() vFuLp
 #() vFupu
 #() vFupp
 #() vFfff
@@ -300,6 +304,7 @@
 #() vFpdd
 #() vFpll
 #() vFpLi
+#() vFpLu
 #() vFpLL
 #() vFpLp
 #() vFppi
@@ -460,7 +465,6 @@
 #() pFiiu
 #() pFiip
 #() pFiIp
-#() pFiup
 #() pFipi
 #() pFipL
 #() pFipp
@@ -476,6 +480,7 @@
 #() pFdip
 #() pFddd
 #() pFDip
+#() pFLup
 #() pFpii
 #() pFpiu
 #() pFpid
@@ -510,6 +515,7 @@
 #() vFEipp
 #() vFEipV
 #() vFEipA
+#() vFELLp
 #() vFEpii
 #() vFEpip
 #() vFEpup
@@ -768,6 +774,7 @@
 #() lFppii
 #() lFppip
 #() lFpppL
+#() LFEppp
 #() LFippL
 #() LFippp
 #() LFpuuu
@@ -780,9 +787,9 @@
 #() LFpppi
 #() LFpppp
 #() pFEipp
-#() pFEipV
-#() pFEipA
 #() pFEupp
+#() pFELpV
+#() pFELpA
 #() pFEpii
 #() pFEpip
 #() pFEppi
@@ -959,7 +966,6 @@
 #() vFppppp
 #() iFEiipp
 #() iFEiipV
-#() iFEippi
 #() iFEippp
 #() iFEpiii
 #() iFEpipi
@@ -1018,6 +1024,7 @@
 #() iFplluu
 #() iFpLiLi
 #() iFpLlpp
+#() iFpLppi
 #() iFppiiu
 #() iFppiip
 #() iFppiup
@@ -1064,6 +1071,7 @@
 #() lFipili
 #() lFipLli
 #() lFipLLi
+#() LFELppi
 #() LFEpppp
 #() LFpuppi
 #() LFpLLLp
@@ -1226,7 +1234,6 @@
 #() cFppLppi
 #() iFEiippi
 #() iFEiippp
-#() iFEipppi
 #() iFElpppp
 #() iFEpiipp
 #() iFEpiipV
@@ -1308,6 +1315,7 @@
 #() lFipLipp
 #() lFipLpLL
 #() LFEupppp
+#() LFELpppi
 #() LFpipipi
 #() LFpLippp
 #() LFSpLiip
@@ -1562,7 +1570,6 @@
 #() vFpplppppi
 #() vFpplppppp
 #() vFppppiipi
-#() iFEipupupi
 #() iFEpippppp
 #() iFEpuuLppp
 #() iFEppppipp
@@ -1593,6 +1600,7 @@
 #() uFEppppppp
 #() uFuipppppp
 #() uFppuppppp
+#() LFELpLpLpi
 #() LFEpiupppp
 #() pFEppLiiip
 #() pFEpppuipV
@@ -1764,9 +1772,9 @@
 #() iFEppppiiiiuu
 #() iFiiiiiiiiiip
 #() iFppppiiuuiiL
-#() uFEpiiupppiuV
-#() uFEpiippppiup
-#() uFEpiippppiuA
+#() uFEpLiupppLuV
+#() uFEpLippppLup
+#() uFEpLippppLuA
 #() uFEppppppippp
 #() uFppppppppppp
 #() pFEpipppppppi
@@ -2184,19 +2192,20 @@ wrappedgobject2:
 - pFpp:
   - g_value_array_sort
 - vFiip:
-  - g_type_add_interface_static
   - g_value_register_transform_func
+- vFLLp:
+  - g_type_add_interface_static
 - vFppV:
   - g_object_get
   - g_object_set
 - vFppA:
   - g_object_get_valist
   - g_object_set_valist
-- iFppp:
+- LFppp:
   - g_boxed_type_register_static
-- pFipV:
+- pFLpV:
   - g_object_new
-- pFipA:
+- pFLpA:
   - g_object_new_valist
 - pFppp:
   - g_value_array_sort_with_data
@@ -2210,27 +2219,27 @@ wrappedgobject2:
   - g_signal_emit_valist
 - vFpppp:
   - g_object_set_data_full
-- iFippi:
+- LFLppi:
   - g_type_register_static
-- iFipppi:
-  - g_type_register_fundamental
 - LFupppp:
   - g_signal_add_emission_hook
+- LFLpppi:
+  - g_type_register_fundamental
 - LFpppppu:
   - g_signal_connect_data
-- iFipupupi:
-  - g_type_register_static_simple
 - uFpiupppp:
   - g_signal_handlers_block_matched
   - g_signal_handlers_disconnect_matched
   - g_signal_handlers_unblock_matched
+- LFLpLpLpi:
+  - g_type_register_static_simple
 - LFpiupppp:
   - g_signal_handler_find
-- uFpiiupppiuV:
+- uFpLiupppLuV:
   - g_signal_new
-- uFpiippppiup:
+- uFpLippppLup:
   - g_signal_newv
-- uFpiippppiuA:
+- uFpLippppLuA:
   - g_signal_new_valist
 wrappedgssapi:
 wrappedgssapikrb5:
diff --git a/src/wrapped/generated/wrappedgobject2types.h b/src/wrapped/generated/wrappedgobject2types.h
index 966bd36a..5e859825 100644
--- a/src/wrapped/generated/wrappedgobject2types.h
+++ b/src/wrapped/generated/wrappedgobject2types.h
@@ -15,58 +15,59 @@ typedef void* (*pFp_t)(void*);
 typedef int64_t (*iFpp_t)(void*, void*);
 typedef void* (*pFpp_t)(void*, void*);
 typedef void (*vFiip_t)(int64_t, int64_t, void*);
+typedef void (*vFLLp_t)(uintptr_t, uintptr_t, void*);
 typedef void (*vFppV_t)(void*, void*, ...);
 typedef void (*vFppA_t)(void*, void*, va_list);
-typedef int64_t (*iFppp_t)(void*, void*, void*);
-typedef void* (*pFipV_t)(int64_t, void*, ...);
-typedef void* (*pFipA_t)(int64_t, void*, va_list);
+typedef uintptr_t (*LFppp_t)(void*, void*, void*);
+typedef void* (*pFLpV_t)(uintptr_t, void*, ...);
+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*, uint64_t, uint64_t, ...);
 typedef void (*vFpupp_t)(void*, uint64_t, void*, void*);
 typedef void (*vFpupA_t)(void*, uint64_t, void*, va_list);
 typedef void (*vFpppp_t)(void*, void*, void*, void*);
-typedef int64_t (*iFippi_t)(int64_t, void*, void*, int64_t);
-typedef int64_t (*iFipppi_t)(int64_t, void*, void*, void*, int64_t);
+typedef uintptr_t (*LFLppi_t)(uintptr_t, void*, void*, int64_t);
 typedef uintptr_t (*LFupppp_t)(uint64_t, void*, void*, void*, void*);
+typedef uintptr_t (*LFLpppi_t)(uintptr_t, void*, void*, void*, int64_t);
 typedef uintptr_t (*LFpppppu_t)(void*, void*, void*, void*, void*, uint64_t);
-typedef int64_t (*iFipupupi_t)(int64_t, void*, uint64_t, void*, uint64_t, void*, int64_t);
 typedef uint64_t (*uFpiupppp_t)(void*, int64_t, uint64_t, void*, void*, void*, void*);
+typedef uintptr_t (*LFLpLpLpi_t)(uintptr_t, void*, uintptr_t, void*, uintptr_t, void*, int64_t);
 typedef uintptr_t (*LFpiupppp_t)(void*, int64_t, uint64_t, void*, void*, void*, void*);
-typedef uint64_t (*uFpiiupppiuV_t)(void*, int64_t, int64_t, uint64_t, void*, void*, void*, int64_t, uint64_t, ...);
-typedef uint64_t (*uFpiippppiup_t)(void*, int64_t, int64_t, void*, void*, void*, void*, int64_t, uint64_t, void*);
-typedef uint64_t (*uFpiippppiuA_t)(void*, int64_t, int64_t, void*, void*, void*, void*, int64_t, uint64_t, va_list);
+typedef uint64_t (*uFpLiupppLuV_t)(void*, uintptr_t, int64_t, uint64_t, void*, void*, void*, uintptr_t, uint64_t, ...);
+typedef uint64_t (*uFpLippppLup_t)(void*, uintptr_t, int64_t, void*, void*, void*, void*, uintptr_t, uint64_t, void*);
+typedef uint64_t (*uFpLippppLuA_t)(void*, uintptr_t, int64_t, void*, void*, void*, void*, uintptr_t, uint64_t, va_list);
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(g_type_class_peek_parent, pFp_t) \
 	GO(g_param_type_register_static, iFpp_t) \
 	GO(g_value_array_sort, pFpp_t) \
-	GO(g_type_add_interface_static, vFiip_t) \
 	GO(g_value_register_transform_func, vFiip_t) \
+	GO(g_type_add_interface_static, vFLLp_t) \
 	GO(g_object_get, vFppV_t) \
 	GO(g_object_set, vFppV_t) \
 	GO(g_object_get_valist, vFppA_t) \
 	GO(g_object_set_valist, vFppA_t) \
-	GO(g_boxed_type_register_static, iFppp_t) \
-	GO(g_object_new, pFipV_t) \
-	GO(g_object_new_valist, pFipA_t) \
+	GO(g_boxed_type_register_static, LFppp_t) \
+	GO(g_object_new, pFLpV_t) \
+	GO(g_object_new_valist, pFLpA_t) \
 	GO(g_value_array_sort_with_data, pFppp_t) \
 	GO(g_object_connect, pFppV_t) \
 	GO(g_signal_emit, vFpuuV_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_type_register_static, iFippi_t) \
-	GO(g_type_register_fundamental, iFipppi_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_data, LFpppppu_t) \
-	GO(g_type_register_static_simple, iFipupupi_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_type_register_static_simple, LFLpLpLpi_t) \
 	GO(g_signal_handler_find, LFpiupppp_t) \
-	GO(g_signal_new, uFpiiupppiuV_t) \
-	GO(g_signal_newv, uFpiippppiup_t) \
-	GO(g_signal_new_valist, uFpiippppiuA_t)
+	GO(g_signal_new, uFpLiupppLuV_t) \
+	GO(g_signal_newv, uFpLippppLup_t) \
+	GO(g_signal_new_valist, uFpLippppLuA_t)
 
 #endif // __wrappedgobject2TYPES_H_
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 4e732782..9e1f807b 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -177,6 +177,7 @@ typedef int64_t (*iFuL_t)(uint64_t, uintptr_t);
 typedef int64_t (*iFup_t)(uint64_t, void*);
 typedef int64_t (*iFli_t)(intptr_t, int64_t);
 typedef int64_t (*iFlp_t)(intptr_t, void*);
+typedef int64_t (*iFLu_t)(uintptr_t, uint64_t);
 typedef int64_t (*iFLL_t)(uintptr_t, uintptr_t);
 typedef int64_t (*iFLp_t)(uintptr_t, void*);
 typedef int64_t (*iFpw_t)(void*, int16_t);
@@ -247,6 +248,7 @@ typedef uintptr_t (*LFEL_t)(x64emu_t*, uintptr_t);
 typedef uintptr_t (*LFii_t)(int64_t, int64_t);
 typedef uintptr_t (*LFuu_t)(uint64_t, uint64_t);
 typedef uintptr_t (*LFLi_t)(uintptr_t, int64_t);
+typedef uintptr_t (*LFLL_t)(uintptr_t, uintptr_t);
 typedef uintptr_t (*LFpi_t)(void*, int64_t);
 typedef uintptr_t (*LFpL_t)(void*, uintptr_t);
 typedef uintptr_t (*LFpp_t)(void*, void*);
@@ -264,6 +266,7 @@ typedef void* (*pFuV_t)(uint64_t, void*);
 typedef void* (*pFUi_t)(uint64_t, int64_t);
 typedef void* (*pFdd_t)(double, double);
 typedef void* (*pFlp_t)(intptr_t, void*);
+typedef void* (*pFLu_t)(uintptr_t, uint64_t);
 typedef void* (*pFLL_t)(uintptr_t, uintptr_t);
 typedef void* (*pFLp_t)(uintptr_t, void*);
 typedef void* (*pFpi_t)(void*, int64_t);
@@ -312,6 +315,7 @@ typedef void (*vFuff_t)(uint64_t, float, float);
 typedef void (*vFudd_t)(uint64_t, double, double);
 typedef void (*vFull_t)(uint64_t, intptr_t, intptr_t);
 typedef void (*vFulp_t)(uint64_t, intptr_t, void*);
+typedef void (*vFuLp_t)(uint64_t, uintptr_t, void*);
 typedef void (*vFupu_t)(uint64_t, void*, uint64_t);
 typedef void (*vFupp_t)(uint64_t, void*, void*);
 typedef void (*vFfff_t)(float, float, float);
@@ -334,6 +338,7 @@ typedef void (*vFpff_t)(void*, float, float);
 typedef void (*vFpdd_t)(void*, double, double);
 typedef void (*vFpll_t)(void*, intptr_t, intptr_t);
 typedef void (*vFpLi_t)(void*, uintptr_t, int64_t);
+typedef void (*vFpLu_t)(void*, uintptr_t, uint64_t);
 typedef void (*vFpLL_t)(void*, uintptr_t, uintptr_t);
 typedef void (*vFpLp_t)(void*, uintptr_t, void*);
 typedef void (*vFppi_t)(void*, void*, int64_t);
@@ -494,7 +499,6 @@ typedef void* (*pFiii_t)(int64_t, int64_t, int64_t);
 typedef void* (*pFiiu_t)(int64_t, int64_t, uint64_t);
 typedef void* (*pFiip_t)(int64_t, int64_t, void*);
 typedef void* (*pFiIp_t)(int64_t, int64_t, void*);
-typedef void* (*pFiup_t)(int64_t, uint64_t, void*);
 typedef void* (*pFipi_t)(int64_t, void*, int64_t);
 typedef void* (*pFipL_t)(int64_t, void*, uintptr_t);
 typedef void* (*pFipp_t)(int64_t, void*, void*);
@@ -510,6 +514,7 @@ typedef void* (*pFUpi_t)(uint64_t, void*, int64_t);
 typedef void* (*pFdip_t)(double, int64_t, void*);
 typedef void* (*pFddd_t)(double, double, double);
 typedef void* (*pFDip_t)(long double, int64_t, void*);
+typedef void* (*pFLup_t)(uintptr_t, uint64_t, void*);
 typedef void* (*pFpii_t)(void*, int64_t, int64_t);
 typedef void* (*pFpiu_t)(void*, int64_t, uint64_t);
 typedef void* (*pFpid_t)(void*, int64_t, double);
@@ -544,6 +549,7 @@ typedef void (*vFEiip_t)(x64emu_t*, int64_t, int64_t, void*);
 typedef void (*vFEipp_t)(x64emu_t*, int64_t, void*, void*);
 typedef void (*vFEipV_t)(x64emu_t*, int64_t, void*, void*);
 typedef void (*vFEipA_t)(x64emu_t*, int64_t, void*, void*);
+typedef void (*vFELLp_t)(x64emu_t*, uintptr_t, uintptr_t, void*);
 typedef void (*vFEpii_t)(x64emu_t*, void*, int64_t, int64_t);
 typedef void (*vFEpip_t)(x64emu_t*, void*, int64_t, void*);
 typedef void (*vFEpup_t)(x64emu_t*, void*, uint64_t, void*);
@@ -802,6 +808,7 @@ typedef intptr_t (*lFpilp_t)(void*, int64_t, intptr_t, void*);
 typedef intptr_t (*lFppii_t)(void*, void*, int64_t, int64_t);
 typedef intptr_t (*lFppip_t)(void*, void*, int64_t, void*);
 typedef intptr_t (*lFpppL_t)(void*, void*, void*, uintptr_t);
+typedef uintptr_t (*LFEppp_t)(x64emu_t*, void*, void*, void*);
 typedef uintptr_t (*LFippL_t)(int64_t, void*, void*, uintptr_t);
 typedef uintptr_t (*LFippp_t)(int64_t, void*, void*, void*);
 typedef uintptr_t (*LFpuuu_t)(void*, uint64_t, uint64_t, uint64_t);
@@ -814,9 +821,9 @@ typedef uintptr_t (*LFppLp_t)(void*, void*, uintptr_t, void*);
 typedef uintptr_t (*LFpppi_t)(void*, void*, void*, int64_t);
 typedef uintptr_t (*LFpppp_t)(void*, void*, void*, void*);
 typedef void* (*pFEipp_t)(x64emu_t*, int64_t, void*, void*);
-typedef void* (*pFEipV_t)(x64emu_t*, int64_t, void*, void*);
-typedef void* (*pFEipA_t)(x64emu_t*, int64_t, void*, void*);
 typedef void* (*pFEupp_t)(x64emu_t*, uint64_t, void*, void*);
+typedef void* (*pFELpV_t)(x64emu_t*, uintptr_t, void*, void*);
+typedef void* (*pFELpA_t)(x64emu_t*, uintptr_t, void*, void*);
 typedef void* (*pFEpii_t)(x64emu_t*, void*, int64_t, int64_t);
 typedef void* (*pFEpip_t)(x64emu_t*, void*, int64_t, void*);
 typedef void* (*pFEppi_t)(x64emu_t*, void*, void*, int64_t);
@@ -993,7 +1000,6 @@ typedef void (*vFppppL_t)(void*, void*, void*, void*, uintptr_t);
 typedef void (*vFppppp_t)(void*, void*, void*, void*, void*);
 typedef int64_t (*iFEiipp_t)(x64emu_t*, int64_t, int64_t, void*, void*);
 typedef int64_t (*iFEiipV_t)(x64emu_t*, int64_t, int64_t, void*, void*);
-typedef int64_t (*iFEippi_t)(x64emu_t*, int64_t, void*, void*, int64_t);
 typedef int64_t (*iFEippp_t)(x64emu_t*, int64_t, void*, void*, void*);
 typedef int64_t (*iFEpiii_t)(x64emu_t*, void*, int64_t, int64_t, int64_t);
 typedef int64_t (*iFEpipi_t)(x64emu_t*, void*, int64_t, void*, int64_t);
@@ -1052,6 +1058,7 @@ typedef int64_t (*iFpuppp_t)(void*, uint64_t, void*, void*, void*);
 typedef int64_t (*iFplluu_t)(void*, intptr_t, intptr_t, uint64_t, uint64_t);
 typedef int64_t (*iFpLiLi_t)(void*, uintptr_t, int64_t, uintptr_t, int64_t);
 typedef int64_t (*iFpLlpp_t)(void*, uintptr_t, intptr_t, void*, void*);
+typedef int64_t (*iFpLppi_t)(void*, uintptr_t, void*, void*, int64_t);
 typedef int64_t (*iFppiiu_t)(void*, void*, int64_t, int64_t, uint64_t);
 typedef int64_t (*iFppiip_t)(void*, void*, int64_t, int64_t, void*);
 typedef int64_t (*iFppiup_t)(void*, void*, int64_t, uint64_t, void*);
@@ -1098,6 +1105,7 @@ typedef uint64_t (*UFuiiii_t)(uint64_t, int64_t, int64_t, int64_t, int64_t);
 typedef intptr_t (*lFipili_t)(int64_t, void*, int64_t, intptr_t, int64_t);
 typedef intptr_t (*lFipLli_t)(int64_t, void*, uintptr_t, intptr_t, int64_t);
 typedef intptr_t (*lFipLLi_t)(int64_t, void*, uintptr_t, uintptr_t, int64_t);
+typedef uintptr_t (*LFELppi_t)(x64emu_t*, uintptr_t, void*, void*, int64_t);
 typedef uintptr_t (*LFEpppp_t)(x64emu_t*, void*, void*, void*, void*);
 typedef uintptr_t (*LFpuppi_t)(void*, uint64_t, void*, void*, int64_t);
 typedef uintptr_t (*LFpLLLp_t)(void*, uintptr_t, uintptr_t, uintptr_t, void*);
@@ -1260,7 +1268,6 @@ typedef void (*vFpppppp_t)(void*, void*, void*, void*, void*, void*);
 typedef int8_t (*cFppLppi_t)(void*, void*, uintptr_t, void*, void*, int64_t);
 typedef int64_t (*iFEiippi_t)(x64emu_t*, int64_t, int64_t, void*, void*, int64_t);
 typedef int64_t (*iFEiippp_t)(x64emu_t*, int64_t, int64_t, void*, void*, void*);
-typedef int64_t (*iFEipppi_t)(x64emu_t*, int64_t, void*, void*, void*, int64_t);
 typedef int64_t (*iFElpppp_t)(x64emu_t*, intptr_t, void*, void*, void*, void*);
 typedef int64_t (*iFEpiipp_t)(x64emu_t*, void*, int64_t, int64_t, void*, void*);
 typedef int64_t (*iFEpiipV_t)(x64emu_t*, void*, int64_t, int64_t, void*, void*);
@@ -1342,6 +1349,7 @@ typedef intptr_t (*lFipLipu_t)(int64_t, void*, uintptr_t, int64_t, void*, uint64
 typedef intptr_t (*lFipLipp_t)(int64_t, void*, uintptr_t, int64_t, void*, void*);
 typedef intptr_t (*lFipLpLL_t)(int64_t, void*, uintptr_t, void*, uintptr_t, uintptr_t);
 typedef uintptr_t (*LFEupppp_t)(x64emu_t*, uint64_t, void*, void*, void*, void*);
+typedef uintptr_t (*LFELpppi_t)(x64emu_t*, uintptr_t, void*, void*, void*, int64_t);
 typedef uintptr_t (*LFpipipi_t)(void*, int64_t, void*, int64_t, void*, int64_t);
 typedef uintptr_t (*LFpLippp_t)(void*, uintptr_t, int64_t, void*, void*, void*);
 typedef uintptr_t (*LFSpLiip_t)(void*, void*, uintptr_t, int64_t, int64_t, void*);
@@ -1596,7 +1604,6 @@ typedef void (*vFppippppp_t)(void*, void*, int64_t, void*, void*, void*, void*,
 typedef void (*vFpplppppi_t)(void*, void*, intptr_t, void*, void*, void*, void*, int64_t);
 typedef void (*vFpplppppp_t)(void*, void*, intptr_t, void*, void*, void*, void*, void*);
 typedef void (*vFppppiipi_t)(void*, void*, void*, void*, int64_t, int64_t, void*, int64_t);
-typedef int64_t (*iFEipupupi_t)(x64emu_t*, int64_t, void*, uint64_t, void*, uint64_t, void*, int64_t);
 typedef int64_t (*iFEpippppp_t)(x64emu_t*, void*, int64_t, void*, void*, void*, void*, void*);
 typedef int64_t (*iFEpuuLppp_t)(x64emu_t*, void*, uint64_t, uint64_t, uintptr_t, void*, void*, void*);
 typedef int64_t (*iFEppppipp_t)(x64emu_t*, void*, void*, void*, void*, int64_t, void*, void*);
@@ -1627,6 +1634,7 @@ typedef uint64_t (*uFEppipppp_t)(x64emu_t*, void*, void*, int64_t, void*, void*,
 typedef uint64_t (*uFEppppppp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, void*);
 typedef uint64_t (*uFuipppppp_t)(uint64_t, int64_t, void*, void*, void*, void*, void*, void*);
 typedef uint64_t (*uFppuppppp_t)(void*, void*, uint64_t, void*, void*, void*, void*, void*);
+typedef uintptr_t (*LFELpLpLpi_t)(x64emu_t*, uintptr_t, void*, uintptr_t, void*, uintptr_t, void*, int64_t);
 typedef uintptr_t (*LFEpiupppp_t)(x64emu_t*, void*, int64_t, uint64_t, void*, void*, void*, void*);
 typedef void* (*pFEppLiiip_t)(x64emu_t*, void*, void*, uintptr_t, int64_t, int64_t, int64_t, void*);
 typedef void* (*pFEpppuipV_t)(x64emu_t*, void*, void*, void*, uint64_t, int64_t, void*, void*);
@@ -1798,9 +1806,9 @@ typedef int64_t (*iFEpppipppppp_t)(x64emu_t*, void*, void*, void*, int64_t, void
 typedef int64_t (*iFEppppiiiiuu_t)(x64emu_t*, void*, void*, void*, void*, int64_t, int64_t, int64_t, int64_t, uint64_t, uint64_t);
 typedef int64_t (*iFiiiiiiiiiip_t)(int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, int64_t, void*);
 typedef int64_t (*iFppppiiuuiiL_t)(void*, void*, void*, void*, int64_t, int64_t, uint64_t, uint64_t, int64_t, int64_t, uintptr_t);
-typedef uint64_t (*uFEpiiupppiuV_t)(x64emu_t*, void*, int64_t, int64_t, uint64_t, void*, void*, void*, int64_t, uint64_t, void*);
-typedef uint64_t (*uFEpiippppiup_t)(x64emu_t*, void*, int64_t, int64_t, void*, void*, void*, void*, int64_t, uint64_t, void*);
-typedef uint64_t (*uFEpiippppiuA_t)(x64emu_t*, void*, int64_t, int64_t, void*, void*, void*, void*, int64_t, uint64_t, void*);
+typedef uint64_t (*uFEpLiupppLuV_t)(x64emu_t*, void*, uintptr_t, int64_t, uint64_t, void*, void*, void*, uintptr_t, uint64_t, void*);
+typedef uint64_t (*uFEpLippppLup_t)(x64emu_t*, void*, uintptr_t, int64_t, void*, void*, void*, void*, uintptr_t, uint64_t, void*);
+typedef uint64_t (*uFEpLippppLuA_t)(x64emu_t*, void*, uintptr_t, int64_t, void*, void*, void*, void*, uintptr_t, uint64_t, void*);
 typedef uint64_t (*uFEppppppippp_t)(x64emu_t*, void*, void*, void*, void*, void*, void*, int64_t, void*, void*, void*);
 typedef uint64_t (*uFppppppppppp_t)(void*, void*, void*, void*, void*, void*, void*, void*, void*, void*, void*);
 typedef void* (*pFEpipppppppi_t)(x64emu_t*, void*, int64_t, void*, void*, void*, void*, void*, void*, void*, int64_t);
@@ -2043,6 +2051,7 @@ void iFuL(x64emu_t *emu, uintptr_t fcn) { iFuL_t fn = (iFuL_t)fcn; R_RAX=(int64_
 void iFup(x64emu_t *emu, uintptr_t fcn) { iFup_t fn = (iFup_t)fcn; R_RAX=(int64_t)fn((uint64_t)R_RDI, (void*)R_RSI); }
 void iFli(x64emu_t *emu, uintptr_t fcn) { iFli_t fn = (iFli_t)fcn; R_RAX=(int64_t)fn((intptr_t)R_RDI, (int64_t)R_RSI); }
 void iFlp(x64emu_t *emu, uintptr_t fcn) { iFlp_t fn = (iFlp_t)fcn; R_RAX=(int64_t)fn((intptr_t)R_RDI, (void*)R_RSI); }
+void iFLu(x64emu_t *emu, uintptr_t fcn) { iFLu_t fn = (iFLu_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (uint64_t)R_RSI); }
 void iFLL(x64emu_t *emu, uintptr_t fcn) { iFLL_t fn = (iFLL_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI); }
 void iFLp(x64emu_t *emu, uintptr_t fcn) { iFLp_t fn = (iFLp_t)fcn; R_RAX=(int64_t)fn((uintptr_t)R_RDI, (void*)R_RSI); }
 void iFpw(x64emu_t *emu, uintptr_t fcn) { iFpw_t fn = (iFpw_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (int16_t)R_RSI); }
@@ -2113,6 +2122,7 @@ void LFEL(x64emu_t *emu, uintptr_t fcn) { LFEL_t fn = (LFEL_t)fcn; R_RAX=(uintpt
 void LFii(x64emu_t *emu, uintptr_t fcn) { LFii_t fn = (LFii_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (int64_t)R_RSI); }
 void LFuu(x64emu_t *emu, uintptr_t fcn) { LFuu_t fn = (LFuu_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (uint64_t)R_RSI); }
 void LFLi(x64emu_t *emu, uintptr_t fcn) { LFLi_t fn = (LFLi_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (int64_t)R_RSI); }
+void LFLL(x64emu_t *emu, uintptr_t fcn) { LFLL_t fn = (LFLL_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI); }
 void LFpi(x64emu_t *emu, uintptr_t fcn) { LFpi_t fn = (LFpi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int64_t)R_RSI); }
 void LFpL(x64emu_t *emu, uintptr_t fcn) { LFpL_t fn = (LFpL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uintptr_t)R_RSI); }
 void LFpp(x64emu_t *emu, uintptr_t fcn) { LFpp_t fn = (LFpp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI); }
@@ -2130,6 +2140,7 @@ void pFuV(x64emu_t *emu, uintptr_t fcn) { pFuV_t fn = (pFuV_t)fcn; R_RAX=(uintpt
 void pFUi(x64emu_t *emu, uintptr_t fcn) { pFUi_t fn = (pFUi_t)fcn; R_RAX=(uintptr_t)fn((uint64_t)R_RDI, (int64_t)R_RSI); }
 void pFdd(x64emu_t *emu, uintptr_t fcn) { pFdd_t fn = (pFdd_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void pFlp(x64emu_t *emu, uintptr_t fcn) { pFlp_t fn = (pFlp_t)fcn; R_RAX=(uintptr_t)fn((intptr_t)R_RDI, (void*)R_RSI); }
+void pFLu(x64emu_t *emu, uintptr_t fcn) { pFLu_t fn = (pFLu_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uint64_t)R_RSI); }
 void pFLL(x64emu_t *emu, uintptr_t fcn) { pFLL_t fn = (pFLL_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uintptr_t)R_RSI); }
 void pFLp(x64emu_t *emu, uintptr_t fcn) { pFLp_t fn = (pFLp_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (void*)R_RSI); }
 void pFpi(x64emu_t *emu, uintptr_t fcn) { pFpi_t fn = (pFpi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int64_t)R_RSI); }
@@ -2178,6 +2189,7 @@ void vFuff(x64emu_t *emu, uintptr_t fcn) { vFuff_t fn = (vFuff_t)fcn; fn((uint64
 void vFudd(x64emu_t *emu, uintptr_t fcn) { vFudd_t fn = (vFudd_t)fcn; fn((uint64_t)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void vFull(x64emu_t *emu, uintptr_t fcn) { vFull_t fn = (vFull_t)fcn; fn((uint64_t)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
 void vFulp(x64emu_t *emu, uintptr_t fcn) { vFulp_t fn = (vFulp_t)fcn; fn((uint64_t)R_RDI, (intptr_t)R_RSI, (void*)R_RDX); }
+void vFuLp(x64emu_t *emu, uintptr_t fcn) { vFuLp_t fn = (vFuLp_t)fcn; fn((uint64_t)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void vFupu(x64emu_t *emu, uintptr_t fcn) { vFupu_t fn = (vFupu_t)fcn; fn((uint64_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX); }
 void vFupp(x64emu_t *emu, uintptr_t fcn) { vFupp_t fn = (vFupp_t)fcn; fn((uint64_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void vFfff(x64emu_t *emu, uintptr_t fcn) { vFfff_t fn = (vFfff_t)fcn; fn(emu->xmm[0].f[0], emu->xmm[1].f[0], emu->xmm[2].f[0]); }
@@ -2200,6 +2212,7 @@ void vFpff(x64emu_t *emu, uintptr_t fcn) { vFpff_t fn = (vFpff_t)fcn; fn((void*)
 void vFpdd(x64emu_t *emu, uintptr_t fcn) { vFpdd_t fn = (vFpdd_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
 void vFpll(x64emu_t *emu, uintptr_t fcn) { vFpll_t fn = (vFpll_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX); }
 void vFpLi(x64emu_t *emu, uintptr_t fcn) { vFpLi_t fn = (vFpLi_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX); }
+void vFpLu(x64emu_t *emu, uintptr_t fcn) { vFpLu_t fn = (vFpLu_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uint64_t)R_RDX); }
 void vFpLL(x64emu_t *emu, uintptr_t fcn) { vFpLL_t fn = (vFpLL_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX); }
 void vFpLp(x64emu_t *emu, uintptr_t fcn) { vFpLp_t fn = (vFpLp_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void vFppi(x64emu_t *emu, uintptr_t fcn) { vFppi_t fn = (vFppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
@@ -2360,7 +2373,6 @@ void pFiii(x64emu_t *emu, uintptr_t fcn) { pFiii_t fn = (pFiii_t)fcn; R_RAX=(uin
 void pFiiu(x64emu_t *emu, uintptr_t fcn) { pFiiu_t fn = (pFiiu_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX); }
 void pFiip(x64emu_t *emu, uintptr_t fcn) { pFiip_t fn = (pFiip_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX); }
 void pFiIp(x64emu_t *emu, uintptr_t fcn) { pFiIp_t fn = (pFiIp_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX); }
-void pFiup(x64emu_t *emu, uintptr_t fcn) { pFiup_t fn = (pFiup_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX); }
 void pFipi(x64emu_t *emu, uintptr_t fcn) { pFipi_t fn = (pFipi_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
 void pFipL(x64emu_t *emu, uintptr_t fcn) { pFipL_t fn = (pFipL_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX); }
 void pFipp(x64emu_t *emu, uintptr_t fcn) { pFipp_t fn = (pFipp_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
@@ -2376,6 +2388,7 @@ void pFUpi(x64emu_t *emu, uintptr_t fcn) { pFUpi_t fn = (pFUpi_t)fcn; R_RAX=(uin
 void pFdip(x64emu_t *emu, uintptr_t fcn) { pFdip_t fn = (pFdip_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], (int64_t)R_RDI, (void*)R_RSI); }
 void pFddd(x64emu_t *emu, uintptr_t fcn) { pFddd_t fn = (pFddd_t)fcn; R_RAX=(uintptr_t)fn(emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0]); }
 void pFDip(x64emu_t *emu, uintptr_t fcn) { pFDip_t fn = (pFDip_t)fcn; R_RAX=(uintptr_t)fn(LD2localLD((void*)(R_RSP + 8)), (int64_t)R_RDI, (void*)R_RSI); }
+void pFLup(x64emu_t *emu, uintptr_t fcn) { pFLup_t fn = (pFLup_t)fcn; R_RAX=(uintptr_t)fn((uintptr_t)R_RDI, (uint64_t)R_RSI, (void*)R_RDX); }
 void pFpii(x64emu_t *emu, uintptr_t fcn) { pFpii_t fn = (pFpii_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX); }
 void pFpiu(x64emu_t *emu, uintptr_t fcn) { pFpiu_t fn = (pFpiu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int64_t)R_RSI, (uint64_t)R_RDX); }
 void pFpid(x64emu_t *emu, uintptr_t fcn) { pFpid_t fn = (pFpid_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int64_t)R_RSI, emu->xmm[0].d[0]); }
@@ -2410,6 +2423,7 @@ void vFEiip(x64emu_t *emu, uintptr_t fcn) { vFEiip_t fn = (vFEiip_t)fcn; fn(emu,
 void vFEipp(x64emu_t *emu, uintptr_t fcn) { vFEipp_t fn = (vFEipp_t)fcn; fn(emu, (int64_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, (int64_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, (int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
+void vFELLp(x64emu_t *emu, uintptr_t fcn) { vFELLp_t fn = (vFELLp_t)fcn; fn(emu, (uintptr_t)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX); }
 void vFEpii(x64emu_t *emu, uintptr_t fcn) { vFEpii_t fn = (vFEpii_t)fcn; fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX); }
 void vFEpip(x64emu_t *emu, uintptr_t fcn) { vFEpip_t fn = (vFEpip_t)fcn; fn(emu, (void*)R_RDI, (int64_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); }
@@ -2668,6 +2682,7 @@ void lFpilp(x64emu_t *emu, uintptr_t fcn) { lFpilp_t fn = (lFpilp_t)fcn; R_RAX=(
 void lFppii(x64emu_t *emu, uintptr_t fcn) { lFppii_t fn = (lFppii_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
 void lFppip(x64emu_t *emu, uintptr_t fcn) { lFppip_t fn = (lFppip_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX); }
 void lFpppL(x64emu_t *emu, uintptr_t fcn) { lFpppL_t fn = (lFpppL_t)fcn; R_RAX=(intptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
+void LFEppp(x64emu_t *emu, uintptr_t fcn) { LFEppp_t fn = (LFEppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void LFippL(x64emu_t *emu, uintptr_t fcn) { LFippL_t fn = (LFippL_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (uintptr_t)R_RCX); }
 void LFippp(x64emu_t *emu, uintptr_t fcn) { LFippp_t fn = (LFippp_t)fcn; R_RAX=(uintptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void LFpuuu(x64emu_t *emu, uintptr_t fcn) { LFpuuu_t fn = (LFpuuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uint64_t)R_RCX); }
@@ -2680,9 +2695,9 @@ void LFppLp(x64emu_t *emu, uintptr_t fcn) { LFppLp_t fn = (LFppLp_t)fcn; R_RAX=(
 void LFpppi(x64emu_t *emu, uintptr_t fcn) { LFpppi_t fn = (LFpppi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX); }
 void LFpppp(x64emu_t *emu, uintptr_t fcn) { LFpppp_t fn = (LFpppp_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void pFEipp(x64emu_t *emu, uintptr_t fcn) { pFEipp_t fn = (pFEipp_t)fcn; R_RAX=(uintptr_t)fn(emu, (int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
-void pFEipV(x64emu_t *emu, uintptr_t fcn) { pFEipV_t fn = (pFEipV_t)fcn; R_RAX=(uintptr_t)fn(emu, (int64_t)R_RDI, (void*)R_RSI, (void*)(R_RSP + 8)); }
-void pFEipA(x64emu_t *emu, uintptr_t fcn) { pFEipA_t fn = (pFEipA_t)fcn; R_RAX=(uintptr_t)fn(emu, (int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void pFEupp(x64emu_t *emu, uintptr_t fcn) { pFEupp_t fn = (pFEupp_t)fcn; R_RAX=(uintptr_t)fn(emu, (uint64_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
+void pFELpV(x64emu_t *emu, uintptr_t fcn) { pFELpV_t fn = (pFELpV_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)(R_RSP + 8)); }
+void pFELpA(x64emu_t *emu, uintptr_t fcn) { pFELpA_t fn = (pFELpA_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX); }
 void pFEpii(x64emu_t *emu, uintptr_t fcn) { pFEpii_t fn = (pFEpii_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX); }
 void pFEpip(x64emu_t *emu, uintptr_t fcn) { pFEpip_t fn = (pFEpip_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX); }
 void pFEppi(x64emu_t *emu, uintptr_t fcn) { pFEppi_t fn = (pFEppi_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX); }
@@ -2859,7 +2874,6 @@ void vFppppL(x64emu_t *emu, uintptr_t fcn) { vFppppL_t fn = (vFppppL_t)fcn; fn((
 void vFppppp(x64emu_t *emu, uintptr_t fcn) { vFppppp_t fn = (vFppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFEiipp(x64emu_t *emu, uintptr_t fcn) { iFEiipp_t fn = (iFEiipp_t)fcn; R_RAX=(int64_t)fn(emu, (int64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFEiipV(x64emu_t *emu, uintptr_t fcn) { iFEiipV_t fn = (iFEiipV_t)fcn; R_RAX=(int64_t)fn(emu, (int64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); }
-void iFEippi(x64emu_t *emu, uintptr_t fcn) { iFEippi_t fn = (iFEippi_t)fcn; R_RAX=(int64_t)fn(emu, (int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (int64_t)R_RCX); }
 void iFEippp(x64emu_t *emu, uintptr_t fcn) { iFEippp_t fn = (iFEippp_t)fcn; R_RAX=(int64_t)fn(emu, (int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void iFEpiii(x64emu_t *emu, uintptr_t fcn) { iFEpiii_t fn = (iFEpiii_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); }
 void iFEpipi(x64emu_t *emu, uintptr_t fcn) { iFEpipi_t fn = (iFEpipi_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (int64_t)R_RCX); }
@@ -2918,6 +2932,7 @@ void iFpuppp(x64emu_t *emu, uintptr_t fcn) { iFpuppp_t fn = (iFpuppp_t)fcn; R_RA
 void iFplluu(x64emu_t *emu, uintptr_t fcn) { iFplluu_t fn = (iFplluu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uint64_t)R_RCX, (uint64_t)R_R8); }
 void iFpLiLi(x64emu_t *emu, uintptr_t fcn) { iFpLiLi_t fn = (iFpLiLi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX, (uintptr_t)R_RCX, (int64_t)R_R8); }
 void iFpLlpp(x64emu_t *emu, uintptr_t fcn) { iFpLlpp_t fn = (iFpLlpp_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void iFpLppi(x64emu_t *emu, uintptr_t fcn) { iFpLppi_t fn = (iFpLppi_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8); }
 void iFppiiu(x64emu_t *emu, uintptr_t fcn) { iFppiiu_t fn = (iFppiiu_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (uint64_t)R_R8); }
 void iFppiip(x64emu_t *emu, uintptr_t fcn) { iFppiip_t fn = (iFppiip_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (void*)R_R8); }
 void iFppiup(x64emu_t *emu, uintptr_t fcn) { iFppiup_t fn = (iFppiup_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (void*)R_R8); }
@@ -2964,6 +2979,7 @@ void UFuiiii(x64emu_t *emu, uintptr_t fcn) { UFuiiii_t fn = (UFuiiii_t)fcn; R_RA
 void lFipili(x64emu_t *emu, uintptr_t fcn) { lFipili_t fn = (lFipili_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (intptr_t)R_RCX, (int64_t)R_R8); }
 void lFipLli(x64emu_t *emu, uintptr_t fcn) { lFipLli_t fn = (lFipLli_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (intptr_t)R_RCX, (int64_t)R_R8); }
 void lFipLLi(x64emu_t *emu, uintptr_t fcn) { lFipLLi_t fn = (lFipLLi_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (int64_t)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, (int64_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 LFpuppi(x64emu_t *emu, uintptr_t fcn) { LFpuppi_t fn = (LFpuppi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (uint64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_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); }
@@ -3126,7 +3142,6 @@ void vFpppppp(x64emu_t *emu, uintptr_t fcn) { vFpppppp_t fn = (vFpppppp_t)fcn; f
 void cFppLppi(x64emu_t *emu, uintptr_t fcn) { cFppLppi_t fn = (cFppLppi_t)fcn; R_RAX=fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (int64_t)R_R9); }
 void iFEiippi(x64emu_t *emu, uintptr_t fcn) { iFEiippi_t fn = (iFEiippi_t)fcn; R_RAX=(int64_t)fn(emu, (int64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8); }
 void iFEiippp(x64emu_t *emu, uintptr_t fcn) { iFEiippp_t fn = (iFEiippp_t)fcn; R_RAX=(int64_t)fn(emu, (int64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
-void iFEipppi(x64emu_t *emu, uintptr_t fcn) { iFEipppi_t fn = (iFEipppi_t)fcn; R_RAX=(int64_t)fn(emu, (int64_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8); }
 void iFElpppp(x64emu_t *emu, uintptr_t fcn) { iFElpppp_t fn = (iFElpppp_t)fcn; R_RAX=(int64_t)fn(emu, (intptr_t)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFEpiipp(x64emu_t *emu, uintptr_t fcn) { iFEpiipp_t fn = (iFEpiipp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void iFEpiipV(x64emu_t *emu, uintptr_t fcn) { iFEpiipV_t fn = (iFEpiipV_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); }
@@ -3208,6 +3223,7 @@ void lFipLipu(x64emu_t *emu, uintptr_t fcn) { lFipLipu_t fn = (lFipLipu_t)fcn; R
 void lFipLipp(x64emu_t *emu, uintptr_t fcn) { lFipLipp_t fn = (lFipLipp_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int64_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void lFipLpLL(x64emu_t *emu, uintptr_t fcn) { lFipLpLL_t fn = (lFipLpLL_t)fcn; R_RAX=(intptr_t)fn((int64_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (uintptr_t)R_R9); }
 void LFEupppp(x64emu_t *emu, uintptr_t fcn) { LFEupppp_t fn = (LFEupppp_t)fcn; R_RAX=(uintptr_t)fn(emu, (uint64_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, (int64_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, (int64_t)R_RSI, (void*)R_RDX, (int64_t)R_RCX, (void*)R_R8, (int64_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, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)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, (int64_t)R_RCX, (int64_t)R_R8, (void*)R_R9); }
@@ -3462,7 +3478,6 @@ void vFppippppp(x64emu_t *emu, uintptr_t fcn) { vFppippppp_t fn = (vFppippppp_t)
 void vFpplppppi(x64emu_t *emu, uintptr_t fcn) { vFpplppppi_t fn = (vFpplppppi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int64_t*)(R_RSP + 16)); }
 void vFpplppppp(x64emu_t *emu, uintptr_t fcn) { vFpplppppp_t fn = (vFpplppppp_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void vFppppiipi(x64emu_t *emu, uintptr_t fcn) { vFppppiipi_t fn = (vFppppiipi_t)fcn; fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(void**)(R_RSP + 8), *(int64_t*)(R_RSP + 16)); }
-void iFEipupupi(x64emu_t *emu, uintptr_t fcn) { iFEipupupi_t fn = (iFEipupupi_t)fcn; R_RAX=(int64_t)fn(emu, (int64_t)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (uint64_t)R_R8, (void*)R_R9, *(int64_t*)(R_RSP + 8)); }
 void iFEpippppp(x64emu_t *emu, uintptr_t fcn) { iFEpippppp_t fn = (iFEpippppp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFEpuuLppp(x64emu_t *emu, uintptr_t fcn) { iFEpuuLppp_t fn = (iFEpuuLppp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (uint64_t)R_RSI, (uint64_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void iFEppppipp(x64emu_t *emu, uintptr_t fcn) { iFEppppipp_t fn = (iFEppppipp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
@@ -3493,6 +3508,7 @@ void uFEppipppp(x64emu_t *emu, uintptr_t fcn) { uFEppipppp_t fn = (uFEppipppp_t)
 void uFEppppppp(x64emu_t *emu, uintptr_t fcn) { uFEppppppp_t fn = (uFEppppppp_t)fcn; R_RAX=(uint64_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=(uint64_t)fn((uint64_t)R_RDI, (int64_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
 void uFppuppppp(x64emu_t *emu, uintptr_t fcn) { uFppuppppp_t fn = (uFppuppppp_t)fcn; R_RAX=(uint64_t)fn((void*)R_RDI, (void*)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(void**)(R_RSP + 16)); }
+void LFELpLpLpi(x64emu_t *emu, uintptr_t fcn) { LFELpLpLpi_t fn = (LFELpLpLpi_t)fcn; R_RAX=(uintptr_t)fn(emu, (uintptr_t)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (uintptr_t)R_R8, (void*)R_R9, *(int64_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, (int64_t)R_RSI, (uint64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8)); }
 void pFEppLiiip(x64emu_t *emu, uintptr_t fcn) { pFEppLiiip_t fn = (pFEppLiiip_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(void**)(R_RSP + 8)); }
 void pFEpppuipV(x64emu_t *emu, uintptr_t fcn) { pFEpppuipV_t fn = (pFEpppuipV_t)fcn; R_RAX=(uintptr_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (uint64_t)R_RCX, (int64_t)R_R8, (void*)R_R9, (void*)(R_RSP + 8)); }
@@ -3664,9 +3680,9 @@ void iFEpppipppppp(x64emu_t *emu, uintptr_t fcn) { iFEpppipppppp_t fn = (iFEpppi
 void iFEppppiiiiuu(x64emu_t *emu, uintptr_t fcn) { iFEppppiiiiuu_t fn = (iFEppppiiiiuu_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(uint64_t*)(R_RSP + 24), *(uint64_t*)(R_RSP + 32)); }
 void iFiiiiiiiiiip(x64emu_t *emu, uintptr_t fcn) { iFiiiiiiiiiip_t fn = (iFiiiiiiiiiip_t)fcn; R_RAX=(int64_t)fn((int64_t)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(int64_t*)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(int64_t*)(R_RSP + 24), *(int64_t*)(R_RSP + 32), *(void**)(R_RSP + 40)); }
 void iFppppiiuuiiL(x64emu_t *emu, uintptr_t fcn) { iFppppiiuuiiL_t fn = (iFppppiiuuiiL_t)fcn; R_RAX=(int64_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (int64_t)R_R8, (int64_t)R_R9, *(uint64_t*)(R_RSP + 8), *(uint64_t*)(R_RSP + 16), *(int64_t*)(R_RSP + 24), *(int64_t*)(R_RSP + 32), *(uintptr_t*)(R_RSP + 40)); }
-void uFEpiiupppiuV(x64emu_t *emu, uintptr_t fcn) { uFEpiiupppiuV_t fn = (uFEpiiupppiuV_t)fcn; R_RAX=(uint64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(uint64_t*)(R_RSP + 24), (void*)(R_RSP + 32)); }
-void uFEpiippppiup(x64emu_t *emu, uintptr_t fcn) { uFEpiippppiup_t fn = (uFEpiippppiup_t)fcn; R_RAX=(uint64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(uint64_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
-void uFEpiippppiuA(x64emu_t *emu, uintptr_t fcn) { uFEpiippppiuA_t fn = (uFEpiippppiuA_t)fcn; R_RAX=(uint64_t)fn(emu, (void*)R_RDI, (int64_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(int64_t*)(R_RSP + 16), *(uint64_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
+void uFEpLiupppLuV(x64emu_t *emu, uintptr_t fcn) { uFEpLiupppLuV_t fn = (uFEpLiupppLuV_t)fcn; R_RAX=(uint64_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX, (uint64_t)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uint64_t*)(R_RSP + 24), (void*)(R_RSP + 32)); }
+void uFEpLippppLup(x64emu_t *emu, uintptr_t fcn) { uFEpLippppLup_t fn = (uFEpLippppLup_t)fcn; R_RAX=(uint64_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uint64_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
+void uFEpLippppLuA(x64emu_t *emu, uintptr_t fcn) { uFEpLippppLuA_t fn = (uFEpLippppLuA_t)fcn; R_RAX=(uint64_t)fn(emu, (void*)R_RDI, (uintptr_t)R_RSI, (int64_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(void**)(R_RSP + 8), *(uintptr_t*)(R_RSP + 16), *(uint64_t*)(R_RSP + 24), *(void**)(R_RSP + 32)); }
 void uFEppppppippp(x64emu_t *emu, uintptr_t fcn) { uFEppppppippp_t fn = (uFEppppppippp_t)fcn; R_RAX=(uint64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9, *(int64_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=(uint64_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, (int64_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), *(int64_t*)(R_RSP + 32)); }
@@ -3903,6 +3919,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFup) return 1;
 	if (fun == &iFli) return 1;
 	if (fun == &iFlp) return 1;
+	if (fun == &iFLu) return 1;
 	if (fun == &iFLL) return 1;
 	if (fun == &iFLp) return 1;
 	if (fun == &iFpw) return 1;
@@ -3960,6 +3977,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &LFii) return 1;
 	if (fun == &LFuu) return 1;
 	if (fun == &LFLi) return 1;
+	if (fun == &LFLL) return 1;
 	if (fun == &LFpi) return 1;
 	if (fun == &LFpL) return 1;
 	if (fun == &LFpp) return 1;
@@ -3973,6 +3991,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFUi) return 1;
 	if (fun == &pFdd) return 3;
 	if (fun == &pFlp) return 1;
+	if (fun == &pFLu) return 1;
 	if (fun == &pFLL) return 1;
 	if (fun == &pFLp) return 1;
 	if (fun == &pFpi) return 1;
@@ -4013,6 +4032,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFudd) return 3;
 	if (fun == &vFull) return 1;
 	if (fun == &vFulp) return 1;
+	if (fun == &vFuLp) return 1;
 	if (fun == &vFupu) return 1;
 	if (fun == &vFupp) return 1;
 	if (fun == &vFfff) return 4;
@@ -4035,6 +4055,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpdd) return 3;
 	if (fun == &vFpll) return 1;
 	if (fun == &vFpLi) return 1;
+	if (fun == &vFpLu) return 1;
 	if (fun == &vFpLL) return 1;
 	if (fun == &vFpLp) return 1;
 	if (fun == &vFppi) return 1;
@@ -4164,7 +4185,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFiiu) return 1;
 	if (fun == &pFiip) return 1;
 	if (fun == &pFiIp) return 1;
-	if (fun == &pFiup) return 1;
 	if (fun == &pFipi) return 1;
 	if (fun == &pFipL) return 1;
 	if (fun == &pFipp) return 1;
@@ -4179,6 +4199,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFUpi) return 1;
 	if (fun == &pFdip) return 2;
 	if (fun == &pFddd) return 4;
+	if (fun == &pFLup) return 1;
 	if (fun == &pFpii) return 1;
 	if (fun == &pFpiu) return 1;
 	if (fun == &pFpid) return 2;
@@ -4637,6 +4658,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFplluu) return 1;
 	if (fun == &iFpLiLi) return 1;
 	if (fun == &iFpLlpp) return 1;
+	if (fun == &iFpLppi) return 1;
 	if (fun == &iFppiiu) return 1;
 	if (fun == &iFppiip) return 1;
 	if (fun == &iFppiup) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 9e53f124..8854aa62 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -176,6 +176,7 @@ void iFuL(x64emu_t *emu, uintptr_t fnc);
 void iFup(x64emu_t *emu, uintptr_t fnc);
 void iFli(x64emu_t *emu, uintptr_t fnc);
 void iFlp(x64emu_t *emu, uintptr_t fnc);
+void iFLu(x64emu_t *emu, uintptr_t fnc);
 void iFLL(x64emu_t *emu, uintptr_t fnc);
 void iFLp(x64emu_t *emu, uintptr_t fnc);
 void iFpw(x64emu_t *emu, uintptr_t fnc);
@@ -246,6 +247,7 @@ void LFEL(x64emu_t *emu, uintptr_t fnc);
 void LFii(x64emu_t *emu, uintptr_t fnc);
 void LFuu(x64emu_t *emu, uintptr_t fnc);
 void LFLi(x64emu_t *emu, uintptr_t fnc);
+void LFLL(x64emu_t *emu, uintptr_t fnc);
 void LFpi(x64emu_t *emu, uintptr_t fnc);
 void LFpL(x64emu_t *emu, uintptr_t fnc);
 void LFpp(x64emu_t *emu, uintptr_t fnc);
@@ -263,6 +265,7 @@ void pFuV(x64emu_t *emu, uintptr_t fnc);
 void pFUi(x64emu_t *emu, uintptr_t fnc);
 void pFdd(x64emu_t *emu, uintptr_t fnc);
 void pFlp(x64emu_t *emu, uintptr_t fnc);
+void pFLu(x64emu_t *emu, uintptr_t fnc);
 void pFLL(x64emu_t *emu, uintptr_t fnc);
 void pFLp(x64emu_t *emu, uintptr_t fnc);
 void pFpi(x64emu_t *emu, uintptr_t fnc);
@@ -311,6 +314,7 @@ void vFuff(x64emu_t *emu, uintptr_t fnc);
 void vFudd(x64emu_t *emu, uintptr_t fnc);
 void vFull(x64emu_t *emu, uintptr_t fnc);
 void vFulp(x64emu_t *emu, uintptr_t fnc);
+void vFuLp(x64emu_t *emu, uintptr_t fnc);
 void vFupu(x64emu_t *emu, uintptr_t fnc);
 void vFupp(x64emu_t *emu, uintptr_t fnc);
 void vFfff(x64emu_t *emu, uintptr_t fnc);
@@ -333,6 +337,7 @@ void vFpff(x64emu_t *emu, uintptr_t fnc);
 void vFpdd(x64emu_t *emu, uintptr_t fnc);
 void vFpll(x64emu_t *emu, uintptr_t fnc);
 void vFpLi(x64emu_t *emu, uintptr_t fnc);
+void vFpLu(x64emu_t *emu, uintptr_t fnc);
 void vFpLL(x64emu_t *emu, uintptr_t fnc);
 void vFpLp(x64emu_t *emu, uintptr_t fnc);
 void vFppi(x64emu_t *emu, uintptr_t fnc);
@@ -493,7 +498,6 @@ void pFiii(x64emu_t *emu, uintptr_t fnc);
 void pFiiu(x64emu_t *emu, uintptr_t fnc);
 void pFiip(x64emu_t *emu, uintptr_t fnc);
 void pFiIp(x64emu_t *emu, uintptr_t fnc);
-void pFiup(x64emu_t *emu, uintptr_t fnc);
 void pFipi(x64emu_t *emu, uintptr_t fnc);
 void pFipL(x64emu_t *emu, uintptr_t fnc);
 void pFipp(x64emu_t *emu, uintptr_t fnc);
@@ -509,6 +513,7 @@ void pFUpi(x64emu_t *emu, uintptr_t fnc);
 void pFdip(x64emu_t *emu, uintptr_t fnc);
 void pFddd(x64emu_t *emu, uintptr_t fnc);
 void pFDip(x64emu_t *emu, uintptr_t fnc);
+void pFLup(x64emu_t *emu, uintptr_t fnc);
 void pFpii(x64emu_t *emu, uintptr_t fnc);
 void pFpiu(x64emu_t *emu, uintptr_t fnc);
 void pFpid(x64emu_t *emu, uintptr_t fnc);
@@ -543,6 +548,7 @@ 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);
+void vFELLp(x64emu_t *emu, uintptr_t fnc);
 void vFEpii(x64emu_t *emu, uintptr_t fnc);
 void vFEpip(x64emu_t *emu, uintptr_t fnc);
 void vFEpup(x64emu_t *emu, uintptr_t fnc);
@@ -801,6 +807,7 @@ void lFpilp(x64emu_t *emu, uintptr_t fnc);
 void lFppii(x64emu_t *emu, uintptr_t fnc);
 void lFppip(x64emu_t *emu, uintptr_t fnc);
 void lFpppL(x64emu_t *emu, uintptr_t fnc);
+void LFEppp(x64emu_t *emu, uintptr_t fnc);
 void LFippL(x64emu_t *emu, uintptr_t fnc);
 void LFippp(x64emu_t *emu, uintptr_t fnc);
 void LFpuuu(x64emu_t *emu, uintptr_t fnc);
@@ -813,9 +820,9 @@ void LFppLp(x64emu_t *emu, uintptr_t fnc);
 void LFpppi(x64emu_t *emu, uintptr_t fnc);
 void LFpppp(x64emu_t *emu, uintptr_t fnc);
 void pFEipp(x64emu_t *emu, uintptr_t fnc);
-void pFEipV(x64emu_t *emu, uintptr_t fnc);
-void pFEipA(x64emu_t *emu, uintptr_t fnc);
 void pFEupp(x64emu_t *emu, uintptr_t fnc);
+void pFELpV(x64emu_t *emu, uintptr_t fnc);
+void pFELpA(x64emu_t *emu, uintptr_t fnc);
 void pFEpii(x64emu_t *emu, uintptr_t fnc);
 void pFEpip(x64emu_t *emu, uintptr_t fnc);
 void pFEppi(x64emu_t *emu, uintptr_t fnc);
@@ -992,7 +999,6 @@ void vFppppL(x64emu_t *emu, uintptr_t fnc);
 void vFppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEiipp(x64emu_t *emu, uintptr_t fnc);
 void iFEiipV(x64emu_t *emu, uintptr_t fnc);
-void iFEippi(x64emu_t *emu, uintptr_t fnc);
 void iFEippp(x64emu_t *emu, uintptr_t fnc);
 void iFEpiii(x64emu_t *emu, uintptr_t fnc);
 void iFEpipi(x64emu_t *emu, uintptr_t fnc);
@@ -1051,6 +1057,7 @@ void iFpuppp(x64emu_t *emu, uintptr_t fnc);
 void iFplluu(x64emu_t *emu, uintptr_t fnc);
 void iFpLiLi(x64emu_t *emu, uintptr_t fnc);
 void iFpLlpp(x64emu_t *emu, uintptr_t fnc);
+void iFpLppi(x64emu_t *emu, uintptr_t fnc);
 void iFppiiu(x64emu_t *emu, uintptr_t fnc);
 void iFppiip(x64emu_t *emu, uintptr_t fnc);
 void iFppiup(x64emu_t *emu, uintptr_t fnc);
@@ -1097,6 +1104,7 @@ void UFuiiii(x64emu_t *emu, uintptr_t fnc);
 void lFipili(x64emu_t *emu, uintptr_t fnc);
 void lFipLli(x64emu_t *emu, uintptr_t fnc);
 void lFipLLi(x64emu_t *emu, uintptr_t fnc);
+void LFELppi(x64emu_t *emu, uintptr_t fnc);
 void LFEpppp(x64emu_t *emu, uintptr_t fnc);
 void LFpuppi(x64emu_t *emu, uintptr_t fnc);
 void LFpLLLp(x64emu_t *emu, uintptr_t fnc);
@@ -1259,7 +1267,6 @@ void vFpppppp(x64emu_t *emu, uintptr_t fnc);
 void cFppLppi(x64emu_t *emu, uintptr_t fnc);
 void iFEiippi(x64emu_t *emu, uintptr_t fnc);
 void iFEiippp(x64emu_t *emu, uintptr_t fnc);
-void iFEipppi(x64emu_t *emu, uintptr_t fnc);
 void iFElpppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpiipp(x64emu_t *emu, uintptr_t fnc);
 void iFEpiipV(x64emu_t *emu, uintptr_t fnc);
@@ -1341,6 +1348,7 @@ void lFipLipu(x64emu_t *emu, uintptr_t fnc);
 void lFipLipp(x64emu_t *emu, uintptr_t fnc);
 void lFipLpLL(x64emu_t *emu, uintptr_t fnc);
 void LFEupppp(x64emu_t *emu, uintptr_t fnc);
+void LFELpppi(x64emu_t *emu, uintptr_t fnc);
 void LFpipipi(x64emu_t *emu, uintptr_t fnc);
 void LFpLippp(x64emu_t *emu, uintptr_t fnc);
 void LFSpLiip(x64emu_t *emu, uintptr_t fnc);
@@ -1595,7 +1603,6 @@ void vFppippppp(x64emu_t *emu, uintptr_t fnc);
 void vFpplppppi(x64emu_t *emu, uintptr_t fnc);
 void vFpplppppp(x64emu_t *emu, uintptr_t fnc);
 void vFppppiipi(x64emu_t *emu, uintptr_t fnc);
-void iFEipupupi(x64emu_t *emu, uintptr_t fnc);
 void iFEpippppp(x64emu_t *emu, uintptr_t fnc);
 void iFEpuuLppp(x64emu_t *emu, uintptr_t fnc);
 void iFEppppipp(x64emu_t *emu, uintptr_t fnc);
@@ -1626,6 +1633,7 @@ void uFEppipppp(x64emu_t *emu, uintptr_t fnc);
 void uFEppppppp(x64emu_t *emu, uintptr_t fnc);
 void uFuipppppp(x64emu_t *emu, uintptr_t fnc);
 void uFppuppppp(x64emu_t *emu, uintptr_t fnc);
+void LFELpLpLpi(x64emu_t *emu, uintptr_t fnc);
 void LFEpiupppp(x64emu_t *emu, uintptr_t fnc);
 void pFEppLiiip(x64emu_t *emu, uintptr_t fnc);
 void pFEpppuipV(x64emu_t *emu, uintptr_t fnc);
@@ -1797,9 +1805,9 @@ void iFEpppipppppp(x64emu_t *emu, uintptr_t fnc);
 void iFEppppiiiiuu(x64emu_t *emu, uintptr_t fnc);
 void iFiiiiiiiiiip(x64emu_t *emu, uintptr_t fnc);
 void iFppppiiuuiiL(x64emu_t *emu, uintptr_t fnc);
-void uFEpiiupppiuV(x64emu_t *emu, uintptr_t fnc);
-void uFEpiippppiup(x64emu_t *emu, uintptr_t fnc);
-void uFEpiippppiuA(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 uFppppppppppp(x64emu_t *emu, uintptr_t fnc);
 void pFEpipppppppi(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedgdkx112_private.h b/src/wrapped/wrappedgdkx112_private.h
index 3b2a4660..1c0400a0 100755
--- a/src/wrapped/wrappedgdkx112_private.h
+++ b/src/wrapped/wrappedgdkx112_private.h
@@ -15,10 +15,10 @@
 GO(gdk_atom_intern, pFpi)
 GO(gdk_atom_intern_static_string, pFp)
 GO(gdk_atom_name, pFp)
-GO(gdk_axis_use_get_type, iFv)
+GO(gdk_axis_use_get_type, LFv)
 GO(gdk_beep, vFv)
 GO(gdk_bitmap_create_from_data, pFppii)
-GO(gdk_byte_order_get_type, iFv)
+GO(gdk_byte_order_get_type, LFv)
 GO(gdk_cairo_create, pFp)
 GO(gdk_cairo_rectangle, vFpp)
 GO(gdk_cairo_region, vFpp)
@@ -38,7 +38,7 @@ GO(gdk_color_change, iFpp)
 GO(gdk_color_copy, pFp)
 GO(gdk_color_equal, iFpp)
 GO(gdk_color_free, vFp)
-GO(gdk_color_get_type, iFv)
+GO(gdk_color_get_type, LFv)
 GO(gdk_color_hash, uFp)
 GO(gdk_colormap_alloc_color, iFppii)
 GO(gdk_colormap_alloc_colors, iFppiiip)
@@ -47,7 +47,7 @@ GO(gdk_colormap_free_colors, vFppi)
 GO(gdk_colormap_get_screen, pFp)
 GO(gdk_colormap_get_system, pFv)
 GO(gdk_colormap_get_system_size, iFv)
-GO(gdk_colormap_get_type, iFv)
+GO(gdk_colormap_get_type, LFv)
 GO(gdk_colormap_get_visual, pFp)
 GO(gdk_colormap_new, pFpi)
 GO(gdk_colormap_query_color, vFpLp)
@@ -59,18 +59,18 @@ GO(gdk_colors_free, vFppiL)
 GO(gdk_colors_store, vFppi)
 GO(gdk_color_to_string, pFp)
 GO(gdk_color_white, iFpp)
-GO(gdk_crossing_mode_get_type, iFv)
+GO(gdk_crossing_mode_get_type, LFv)
 GO(gdk_cursor_get_cursor_type, iFp)
 GO(gdk_cursor_get_display, pFp)
 GO(gdk_cursor_get_image, pFp)
-GO(gdk_cursor_get_type, iFv)
+GO(gdk_cursor_get_type, LFv)
 GO(gdk_cursor_new, pFi)
 GO(gdk_cursor_new_for_display, pFpi)
 GO(gdk_cursor_new_from_name, pFpp)
 GO(gdk_cursor_new_from_pixbuf, pFppii)
 GO(gdk_cursor_new_from_pixmap, pFppppii)
 GO(gdk_cursor_ref, pFp)
-GO(gdk_cursor_type_get_type, iFv)
+GO(gdk_cursor_type_get_type, LFv)
 GO(gdk_cursor_unref, vFp)
 GO(gdk_device_free_history, vFpi)
 GO(gdk_device_get_axis, iFppip)
@@ -85,7 +85,7 @@ GO(gdk_device_get_n_axes, iFp)
 GO(gdk_device_get_n_keys, iFp)
 GO(gdk_device_get_source, iFp)
 GO(gdk_device_get_state, vFpppp)
-GO(gdk_device_get_type, iFv)
+GO(gdk_device_get_type, LFv)
 GO(gdk_device_set_axis_use, vFpui)
 GO(gdk_device_set_key, vFpuui)
 GO(gdk_device_set_mode, iFpi)
@@ -106,14 +106,14 @@ GO(gdk_display_get_name, pFp)
 GO(gdk_display_get_n_screens, iFp)
 GO(gdk_display_get_pointer, vFppppp)
 GO(gdk_display_get_screen, pFpi)
-GO(gdk_display_get_type, iFv)
+GO(gdk_display_get_type, LFv)
 GO(gdk_display_get_window_at_pointer, pFppp)
 GO(gdk_display_is_closed, iFp)
 GO(gdk_display_keyboard_ungrab, vFpu)
 GO(gdk_display_list_devices, pFp)
 GO(gdk_display_manager_get, pFv)
 GO(gdk_display_manager_get_default_display, pFp)
-GO(gdk_display_manager_get_type, iFv)
+GO(gdk_display_manager_get_type, LFv)
 GO(gdk_display_manager_list_displays, pFp)
 GO(gdk_display_manager_set_default_display, vFpp)
 GO(gdk_display_open, pFp)
@@ -137,7 +137,7 @@ GO(gdk_display_supports_shapes, iFp)
 GO(gdk_display_sync, vFp)
 GO(gdk_display_warp_pointer, vFppii)
 GO(gdk_drag_abort, vFpu)
-GO(gdk_drag_action_get_type, iFv)
+GO(gdk_drag_action_get_type, LFv)
 GO(gdk_drag_begin, pFpp)
 GO(gdk_drag_context_get_actions, iFp)
 GO(gdk_drag_context_get_dest_window, pFp)
@@ -145,7 +145,7 @@ GO(gdk_drag_context_get_protocol, iFp)
 GO(gdk_drag_context_get_selected_action, iFp)
 GO(gdk_drag_context_get_source_window, pFp)
 GO(gdk_drag_context_get_suggested_action, iFp)
-GO(gdk_drag_context_get_type, iFv)
+GO(gdk_drag_context_get_type, LFv)
 GO(gdk_drag_context_list_targets, pFp)
 GO(gdk_drag_context_new, pFv)
 GO(gdk_drag_context_ref, vFp)
@@ -158,7 +158,7 @@ GO(gdk_drag_get_protocol, pFpp)
 GO(gdk_drag_get_protocol_for_display, pFppp)
 GO(gdk_drag_get_selection, pFp)
 GO(gdk_drag_motion, iFppiiiiiu)
-GO(gdk_drag_protocol_get_type, iFv)
+GO(gdk_drag_protocol_get_type, LFv)
 GO(gdk_drag_status, vFpiu)
 GO(gdk_drawable_copy_to_image, pFppiiiiii)
 GO(gdk_drawable_get_clip_region, pFp)
@@ -169,7 +169,7 @@ GO(gdk_drawable_get_display, pFp)
 GO(gdk_drawable_get_image, pFpiiii)
 GO(gdk_drawable_get_screen, pFp)
 GO(gdk_drawable_get_size, vFppp)
-GO(gdk_drawable_get_type, iFv)
+GO(gdk_drawable_get_type, LFv)
 GO(gdk_drawable_get_visible_region, pFp)
 GO(gdk_drawable_get_visual, pFp)
 GO(gdk_drawable_ref, pFp)
@@ -217,9 +217,9 @@ GO(gdk_event_get_root_coords, iFppp)
 GO(gdk_event_get_screen, pFp)
 GO(gdk_event_get_state, iFpp)
 GO(gdk_event_get_time, uFp)
-GO(gdk_event_get_type, iFv)
+GO(gdk_event_get_type, LFv)
 GOM(gdk_event_handler_set, vFEppp)
-GO(gdk_event_mask_get_type, iFv)
+GO(gdk_event_mask_get_type, LFv)
 GO(gdk_event_new, pFi)
 GO(gdk_event_peek, pFv)
 GO(gdk_event_put, vFp)
@@ -240,7 +240,7 @@ GO(gdk_flush, vFv)
 //GO(gdk_font_from_description, 
 //GO(gdk_font_from_description_for_display, 
 //GO(gdk_font_get_display, 
-GO(gdk_font_get_type, iFv)
+GO(gdk_font_get_type, LFv)
 //GO(gdk_font_id, 
 //GO(gdk_font_load, 
 //GO(gdk_font_load_for_display, 
@@ -251,11 +251,11 @@ GO(gdk_font_get_type, iFv)
 //GO(gdk_font_unref, 
 GO(gdk_free_compound_text, vFp)
 GO(gdk_free_text_list, vFp)
-GO(gdk_function_get_type, iFv)
+GO(gdk_function_get_type, LFv)
 GO(gdk_gc_copy, vFpp)
 GO(gdk_gc_get_colormap, pFp)
 GO(gdk_gc_get_screen, pFp)
-GO(gdk_gc_get_type, iFv)
+GO(gdk_gc_get_type, LFv)
 GO(gdk_gc_get_values, vFpp)
 GO(gdk_gc_new, pFp)
 GO(gdk_gc_new_with_values, pFppu)
@@ -282,15 +282,15 @@ GO(gdk_gc_set_tile, vFpp)
 GO(gdk_gc_set_ts_origin, vFpii)
 GO(gdk_gc_set_values, vFppu)
 GO(gdk_gc_unref, vFp)
-GO(gdk_gc_values_mask_get_type, iFv)
+GO(gdk_gc_values_mask_get_type, LFv)
 GO(gdk_get_default_root_window, pFv)
 GO(gdk_get_display, pFv)
 GO(gdk_get_display_arg_name, pFv)
 GO(gdk_get_program_class, pFv)
 GO(gdk_get_show_events, iFv)
 GO(gdk_get_use_xshm, iFv)
-GO(gdk_grab_status_get_type, iFv)
-GO(gdk_gravity_get_type, iFv)
+GO(gdk_grab_status_get_type, LFv)
+GO(gdk_gravity_get_type, LFv)
 GO(gdk_image_get, pFpiiii)
 GO(gdk_image_get_bits_per_pixel, WFp)
 GO(gdk_image_get_byte_order, iFp)
@@ -302,7 +302,7 @@ GO(gdk_image_get_height, iFp)
 GO(gdk_image_get_image_type, iFp)
 GO(gdk_image_get_pixel, uFpii)
 GO(gdk_image_get_pixels, pFp)
-GO(gdk_image_get_type, iFv)
+GO(gdk_image_get_type, LFv)
 GO(gdk_image_get_visual, pFp)
 GO(gdk_image_get_width, iFp)
 GO(gdk_image_new, pFipii)
@@ -310,18 +310,18 @@ GO(gdk_image_new_bitmap, pFppii)
 GO(gdk_image_put_pixel, vFpiiu)
 GO(gdk_image_ref, pFp)
 GO(gdk_image_set_colormap, vFpp)
-GO(gdk_image_type_get_type, iFv)
+GO(gdk_image_type_get_type, LFv)
 GO(gdk_image_unref, vFp)
 GOM(gdk_init, vFEpp)
 GOM(gdk_init_check, iFEpp)
 GOM(gdk_input_add, iFEiipp)
 GOM(gdk_input_add_full, iFEiippp)
-GO(gdk_input_condition_get_type, iFv)
-GO(gdk_input_mode_get_type, iFv)
+GO(gdk_input_condition_get_type, LFv)
+GO(gdk_input_mode_get_type, LFv)
 GO(gdk_input_remove, vFi)
 GO(gdk_input_set_extension_events, vFpii)
-GO(gdk_input_source_get_type, iFv)
-GO(gdk_join_style_get_type, iFv)
+GO(gdk_input_source_get_type, LFv)
+GO(gdk_join_style_get_type, LFv)
 GO(gdk_keyboard_grab, iFpiu)
 //GO(gdk_keyboard_grab_info_libgtk_only, 
 GO(gdk_keyboard_ungrab, vFu)
@@ -332,7 +332,7 @@ GO(gdk_keymap_get_direction, iFp)
 GO(gdk_keymap_get_entries_for_keycode, iFpuppp)
 GO(gdk_keymap_get_entries_for_keyval, iFpupp)
 GO(gdk_keymap_get_for_display, pFp)
-GO(gdk_keymap_get_type, iFv)
+GO(gdk_keymap_get_type, LFv)
 GO(gdk_keymap_have_bidi_layouts, iFp)
 GO(gdk_keymap_lookup_key, uFpp)
 GO(gdk_keymap_map_virtual_modifiers, iFpp)
@@ -345,20 +345,20 @@ GO(gdk_keyval_name, pFu)
 GO(gdk_keyval_to_lower, uFu)
 GO(gdk_keyval_to_unicode, uFu)
 GO(gdk_keyval_to_upper, uFu)
-GO(gdk_line_style_get_type, iFv)
+GO(gdk_line_style_get_type, LFv)
 GO(gdk_list_visuals, pFv)
 //GO(gdk_mbstowcs, 
-GO(gdk_modifier_type_get_type, iFv)
+GO(gdk_modifier_type_get_type, LFv)
 GO(gdk_net_wm_supports, iFp)
 GO(gdk_notify_startup_complete, vFv)
 GO(gdk_notify_startup_complete_with_id, vFp)
-GO(gdk_notify_type_get_type, iFv)
+GO(gdk_notify_type_get_type, LFv)
 GO(gdk_offscreen_window_get_embedder, pFp)
 GO(gdk_offscreen_window_get_pixmap, pFp)
-GO(gdk_offscreen_window_get_type, iFv)
+GO(gdk_offscreen_window_get_type, LFv)
 GO(gdk_offscreen_window_set_embedder, vFpp)
-GO(gdk_overlap_type_get_type, iFv)
-GO(gdk_owner_change_get_type, iFv)
+GO(gdk_overlap_type_get_type, LFv)
+GO(gdk_owner_change_get_type, LFv)
 GO(gdk_pango_attr_emboss_color_new, pFp)
 GO(gdk_pango_attr_embossed_new, pFi)
 GO(gdk_pango_attr_stipple_new, pFp)
@@ -368,7 +368,7 @@ GO(gdk_pango_context_set_colormap, vFpp)
 GO(gdk_pango_layout_get_clip_region, pFpiipi)
 GO(gdk_pango_layout_line_get_clip_region, pFpiipi)
 GO(gdk_pango_renderer_get_default, pFp)
-GO(gdk_pango_renderer_get_type, iFv)
+GO(gdk_pango_renderer_get_type, LFv)
 GO(gdk_pango_renderer_new, pFp)
 GO(gdk_pango_renderer_set_drawable, vFpp)
 GO(gdk_pango_renderer_set_gc, vFpp)
@@ -391,8 +391,8 @@ GO(gdk_pixmap_foreign_new, pFp)
 GO(gdk_pixmap_foreign_new_for_display, pFpp)
 GO(gdk_pixmap_foreign_new_for_screen, pFppiii)
 GO(gdk_pixmap_get_size, vFppp)
-GO(gdk_pixmap_get_type, iFv)
-GO(gdk_pixmap_impl_x11_get_type, iFv)
+GO(gdk_pixmap_get_type, LFv)
+GO(gdk_pixmap_impl_x11_get_type, LFv)
 GO(gdk_pixmap_lookup, pFp)
 GO(gdk_pixmap_lookup_for_display, pFpp)
 GO(gdk_pixmap_new, pFpiii)
@@ -404,11 +404,11 @@ GO(gdk_pointer_ungrab, vFu)
 GO(gdk_property_change, vFpppiipi)
 GO(gdk_property_delete, vFpp)
 GO(gdk_property_get, iFpppLLipppp)
-GO(gdk_property_state_get_type, iFv)
-GO(gdk_prop_mode_get_type, iFv)
+GO(gdk_property_state_get_type, LFv)
+GO(gdk_prop_mode_get_type, LFv)
 GO(gdk_query_depths, vFpp)
 GO(gdk_query_visual_types, vFpp)
-GO(gdk_rectangle_get_type, iFv)
+GO(gdk_rectangle_get_type, LFv)
 GO(gdk_rectangle_intersect, iFppp)
 GO(gdk_rectangle_union, vFppp)
 GO(gdk_region_copy, pFp)
@@ -435,7 +435,7 @@ GO(gdk_rgb_cmap_free, vFp)
 GO(gdk_rgb_cmap_new, pFpi)
 GO(gdk_rgb_colormap_ditherable, iFp)
 GO(gdk_rgb_ditherable, iFv)
-GO(gdk_rgb_dither_get_type, iFv)
+GO(gdk_rgb_dither_get_type, LFv)
 GO(gdk_rgb_find_color, vFpp)
 GO(gdk_rgb_gc_set_background, vFpu)
 GO(gdk_rgb_gc_set_foreground, vFpu)
@@ -473,7 +473,7 @@ GO(gdk_screen_get_setting, iFppp)
 GO(gdk_screen_get_system_colormap, pFp)
 GO(gdk_screen_get_system_visual, pFp)
 GO(gdk_screen_get_toplevel_windows, pFp)
-GO(gdk_screen_get_type, iFv)
+GO(gdk_screen_get_type, LFv)
 GO(gdk_screen_get_width, iFp)
 GO(gdk_screen_get_width_mm, iFp)
 GO(gdk_screen_get_window_stack, pFp)
@@ -487,7 +487,7 @@ GO(gdk_screen_set_font_options, vFpp)
 GO(gdk_screen_set_resolution, vFpd)
 GO(gdk_screen_width, iFv)
 GO(gdk_screen_width_mm, iFv)
-GO(gdk_scroll_direction_get_type, iFv)
+GO(gdk_scroll_direction_get_type, LFv)
 GO(gdk_selection_convert, vFpppu)
 GO(gdk_selection_owner_get, pFp)
 GO(gdk_selection_owner_get_for_display, pFpp)
@@ -502,13 +502,13 @@ GO(gdk_set_locale, pFv)
 GO(gdk_set_program_class, vFp)
 GO(gdk_set_show_events, vFi)
 GO(gdk_set_sm_client_id, vFp)
-GO(gdk_setting_action_get_type, iFv)
+GO(gdk_setting_action_get_type, LFv)
 GO(gdk_setting_get, iFpp)
 GO(gdk_set_use_xshm, vFi)
 GO(gdk_spawn_command_line_on_screen, iFppp)
 //GOM(gdk_spawn_on_screen, iFEppppipppp)
 //GOM(gdk_spawn_on_screen_with_pipes, iFEppppippppppp)
-GO(gdk_status_get_type, iFv)
+GO(gdk_status_get_type, LFv)
 //GO(gdk_string_extents, 
 //GO(gdk_string_height, 
 //GO(gdk_string_measure, 
@@ -544,7 +544,7 @@ GO(gdk_unicode_to_keyval, uFu)
 GO(gdk_utf8_to_compound_text, iFppppp)
 GO(gdk_utf8_to_compound_text_for_display, iFpppppp)
 GO(gdk_utf8_to_string_target, pFp)
-GO(gdk_visibility_state_get_type, iFv)
+GO(gdk_visibility_state_get_type, LFv)
 GO(gdk_visual_get_best, pFv)
 GO(gdk_visual_get_best_depth, iFv)
 GO(gdk_visual_get_best_type, iFv)
@@ -560,9 +560,9 @@ GO(gdk_visual_get_green_pixel_details, vFpppp)
 GO(gdk_visual_get_red_pixel_details, vFpppp)
 GO(gdk_visual_get_screen, pFp)
 GO(gdk_visual_get_system, pFv)
-GO(gdk_visual_get_type, iFv)
+GO(gdk_visual_get_type, LFv)
 GO(gdk_visual_get_visual_type, iFp)
-GO(gdk_visual_type_get_type, iFv)
+GO(gdk_visual_type_get_type, LFv)
 //GO(gdk_wcstombs, 
 GOM(gdk_window_add_filter, vFEppp)
 GO(gdk_window_at_pointer, pFpp)
@@ -572,7 +572,7 @@ GO(gdk_window_begin_move_drag, vFpiiiu)
 GO(gdk_window_begin_paint_rect, vFpp)
 GO(gdk_window_begin_paint_region, vFpp)
 GO(gdk_window_begin_resize_drag, vFpuiiiu)
-GO(gdk_window_class_get_type, iFv)
+GO(gdk_window_class_get_type, LFv)
 GO(gdk_window_clear, vFp)
 GO(gdk_window_clear_area, vFpiiii)
 GO(gdk_window_clear_area_e, vFpiiii)
@@ -632,10 +632,10 @@ GO(gdk_window_get_width, iFp)
 GO(gdk_window_get_window_type, iFp)
 GO(gdk_window_has_native, iFp)
 GO(gdk_window_hide, vFp)
-GO(gdk_window_hints_get_type, iFv)
+GO(gdk_window_hints_get_type, LFv)
 GO(gdk_window_iconify, vFp)
-GO(gdk_window_impl_get_type, iFv)
-GO(gdk_window_impl_x11_get_type, iFv)
+GO(gdk_window_impl_get_type, LFv)
+GO(gdk_window_impl_x11_get_type, LFv)
 GO(gdk_window_input_shape_combine_mask, vFppii)
 GO(gdk_window_input_shape_combine_region, vFppii)
 //GOM(gdk_window_invalidate_maybe_recurse, vFEppBp)
@@ -656,7 +656,7 @@ GO(gdk_window_move, vFpii)
 GO(gdk_window_move_region, vFppii)
 GO(gdk_window_move_resize, vFpiiii)
 GO(gdk_window_new, pFppi)
-GO(gdk_window_object_get_type, iFv)
+GO(gdk_window_object_get_type, LFv)
 GO(gdk_window_peek_children, pFp)
 GO(gdk_window_process_all_updates, vFv)
 GO(gdk_window_process_updates, vFpi)
@@ -706,18 +706,18 @@ GO(gdk_window_shape_combine_mask, vFppii)
 GO(gdk_window_shape_combine_region, vFppii)
 GO(gdk_window_show, vFp)
 GO(gdk_window_show_unraised, vFp)
-GO(gdk_window_state_get_type, iFv)
+GO(gdk_window_state_get_type, LFv)
 GO(gdk_window_stick, vFp)
 //GO(gdk_window_thaw_toplevel_updates_libgtk_only, 
 GO(gdk_window_thaw_updates, vFp)
-GO(gdk_window_type_get_type, iFv)
-GO(gdk_window_type_hint_get_type, iFv)
+GO(gdk_window_type_get_type, LFv)
+GO(gdk_window_type_hint_get_type, LFv)
 GO(gdk_window_unfullscreen, vFp)
 GO(gdk_window_unmaximize, vFp)
 GO(gdk_window_unstick, vFp)
 GO(gdk_window_withdraw, vFp)
-GO(gdk_wm_decoration_get_type, iFv)
-GO(gdk_wm_function_get_type, iFv)
+GO(gdk_wm_decoration_get_type, LFv)
+GO(gdk_wm_function_get_type, LFv)
 GO(gdk_x11_atom_to_xatom, pFp)
 GO(gdk_x11_atom_to_xatom_for_display, pFpp)
 GO(gdk_x11_colormap_foreign_new, pFpp)
diff --git a/src/wrapped/wrappedgio2.c b/src/wrapped/wrappedgio2.c
index 52697769..08d7ce27 100755
--- a/src/wrapped/wrappedgio2.c
+++ b/src/wrapped/wrappedgio2.c
@@ -34,7 +34,6 @@ typedef unsigned long (*LFpppp_t)   (void*, void*, void*, void*);
 typedef void    (*vFpippp_t)        (void*, int, void*, void*, void*);
 typedef void    (*vFpipppp_t)       (void*, int, void*, void*, void*, void*);
 typedef void*   (*vFippippp_t)      (int, void*, void*, int, void*, void*, void*);
-typedef void*   (*vFipAippp_t)      (int, void*, va_list, int, void*, void*, void*);
 typedef uint32_t(*uFipipppp_t)      (int, void*, int, void*, void*, void*, void*);
 typedef uint32_t(*uFppipppp_t)      (void*, void*, int, void*, void*, void*, void*);
 typedef void    (*vFppipppp_t)      (void*, void*, int, void*, void*, void*, void*);
@@ -42,13 +41,14 @@ typedef void    (*vFiupippp_t)      (int, uint32_t, void*, int, void*, void*, vo
 typedef void    (*vFpppuipV_t)      (void*, void*, void*, uint32_t, int, void*, ...);
 typedef void*   (*pFpppuipV_t)      (void*, void*, void*, uint32_t, int, void*, ...);
 typedef uint32_t(*uFppppppp_t)      (void*, void*, void*, void*, void*, void*, void*);
+typedef void*   (*vFLpAippp_t)      (size_t, void*, va_list, int, void*, void*, void*);
 typedef void    (*vFppiipppp_t)     (void*, void*, int, int, void*, void*, void*, void*);
 typedef void    (*vFpppiippp_t)     (void*, void*, void*, int, int, void*, void*, void*);
-typedef uint32_t(*uFipippppp_t)     (int, void*, int, void*, void*, void*, void*, void*);
+typedef uint32_t(*uFLpippppp_t)     (size_t, void*, int, void*, void*, void*, void*, void*);
 typedef void    (*vFpppiipppp_t)    (void*, void*, void*, int, int, void*, void*, void*, void*);
 typedef void    (*vFiippppppp_t)    (int, int, void*, void*, void*, void*, void*, void*, void*);
-typedef void*   (*pFiippppppp_t)    (int, int, void*, void*, void*, void*, void*, void*, void*);
 typedef void    (*vFpippppppp_t)    (void*, int, void*, void*, void*, void*, void*, void*, void*);
+typedef void*   (*pFLippppppp_t)    (size_t, int, void*, void*, void*, void*, void*, void*, void*);
 typedef uint32_t(*uFppppppippp_t)   (void*, void*, void*, void*, void*, void*, int, void*, void*, void*);
 typedef void    (*vFpppppppiippp_t) (void*, void*, void*, void*, void*, void*, void*, int, int, void*, void*, void*);
 
@@ -57,7 +57,7 @@ typedef void    (*vFpppppppiippp_t) (void*, void*, void*, void*, void*, void*, v
     GO(g_dbus_proxy_new_for_bus, vFiippppppp_t)     \
     GO(g_dbus_proxy_call, vFpppiippp_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_object_manager_client_new_for_bus_sync, pFLippppppp_t)    \
     GO(g_simple_async_result_new, pFpppp_t)         \
     GO(g_simple_async_result_new_error, pFpppuipV_t)\
     GO(g_simple_async_result_new_from_error, pFpppp_t)                  \
@@ -69,7 +69,7 @@ typedef void    (*vFpppppppiippp_t) (void*, void*, void*, void*, void*, void*, v
     GO(g_simple_async_report_take_gerror_in_idle, vFpppp_t)             \
     GO(g_cancellable_connect, LFpppp_t)             \
     GO(g_async_initable_init_async, vFpippp_t)      \
-    GO(g_async_initable_new_valist_async, vFipAippp_t)                  \
+    GO(g_async_initable_new_valist_async, vFLpAippp_t)                  \
     GO(g_async_initable_newv_async, vFiupippp_t)    \
     GO(g_bus_get, vFippp_t)                         \
     GO(g_dbus_connection_new, vFppipppp_t)          \
@@ -83,7 +83,7 @@ typedef void    (*vFpppppppiippp_t) (void*, void*, void*, void*, void*, void*, v
     GO(g_dbus_connection_register_object, uFppppppp_t)                  \
     GO(g_bus_watch_name, uFipipppp_t)               \
     GO(g_bus_watch_name_on_connection, uFppipppp_t) \
-    GO(g_bus_own_name, uFipippppp_t)                \
+    GO(g_bus_own_name, uFLpippppp_t)                \
     GO(g_bus_own_name_on_connection, uFppipppp_t)
 
 
@@ -478,7 +478,7 @@ EXPORT void my_g_dbus_proxy_call_with_unix_fd_list(x64emu_t* emu, void* proxy, v
     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, int 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, int flags, void* name, void* path, void* cb, void* data, void* destroy, void* cancellable, void* error)
 {
     library_t * lib = GetLibInternal(libname);
     gio2_my_t *my = (gio2_my_t*)lib->priv.w.p2;
@@ -583,7 +583,7 @@ EXPORT void my_g_async_initable_init_async(x64emu_t* emu, void* initable, int pr
     my->g_async_initable_init_async(initable, priority, cancellable, findGAsyncReadyCallbackFct(cb), data);
 }
 
-EXPORT void my_g_async_initable_new_valist_async(x64emu_t* emu, int type, void* first, x64_va_list_t var_args, int priority, void* cancellable, void* cb, void* data)
+EXPORT void my_g_async_initable_new_valist_async(x64emu_t* emu, size_t type, void* first, x64_va_list_t var_args, int priority, void* cancellable, void* cb, void* data)
 {
     library_t * lib = GetLibInternal(libname);
     gio2_my_t *my = (gio2_my_t*)lib->priv.w.p2;
@@ -592,7 +592,7 @@ EXPORT void my_g_async_initable_new_valist_async(x64emu_t* emu, int type, void*
     my->g_async_initable_new_valist_async(type, first, VARARGS, priority, cancellable, findGAsyncReadyCallbackFct(cb), data);
 }
 
-EXPORT void my_g_async_initable_new_async(x64emu_t* emu, int type, int priority, void* cancellable, void* cb, void* data, void* first, uintptr_t* V)
+EXPORT void my_g_async_initable_new_async(x64emu_t* emu, size_t type, int priority, void* cancellable, void* cb, void* data, void* first, uintptr_t* V)
 {
     library_t * lib = GetLibInternal(libname);
     gio2_my_t *my = (gio2_my_t*)lib->priv.w.p2;
@@ -601,7 +601,7 @@ EXPORT void my_g_async_initable_new_async(x64emu_t* emu, int type, int priority,
     my->g_async_initable_new_valist_async(type, first, VARARGS, priority, cancellable, findGAsyncReadyCallbackFct(cb), data);
 }
 
-EXPORT void my_g_async_initable_newv_async(x64emu_t* emu, int type, uint32_t n, void* params, int priority, void* cancellable, void* cb, void* data)
+EXPORT void my_g_async_initable_newv_async(x64emu_t* emu, size_t type, uint32_t n, void* params, int priority, void* cancellable, void* cb, void* data)
 {
     library_t * lib = GetLibInternal(libname);
     gio2_my_t *my = (gio2_my_t*)lib->priv.w.p2;
@@ -609,7 +609,7 @@ EXPORT void my_g_async_initable_newv_async(x64emu_t* emu, int type, uint32_t n,
     my->g_async_initable_newv_async(type, n, params, priority, cancellable, findGAsyncReadyCallbackFct(cb), data);
 }
 
-EXPORT void my_g_bus_get(x64emu_t* emu, int type, void* cancellable, void* cb, void* data)
+EXPORT void my_g_bus_get(x64emu_t* emu, size_t type, void* cancellable, void* cb, void* data)
 {
     library_t * lib = GetLibInternal(libname);
     gio2_my_t *my = (gio2_my_t*)lib->priv.w.p2;
@@ -689,7 +689,7 @@ 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, int type, void* name, int flags, void* appeared, void* vanished, void* data, void* notify)
+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)
 {
     library_t * lib = GetLibInternal(libname);
     gio2_my_t *my = (gio2_my_t*)lib->priv.w.p2;
@@ -705,7 +705,7 @@ EXPORT uint32_t my_g_bus_watch_name_on_connection(x64emu_t* emu, void* connectio
     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, int 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, int flags, void* bus_acquired, void* name_acquired, void* name_lost, void* data, void* notify)
 {
     library_t * lib = GetLibInternal(libname);
     gio2_my_t *my = (gio2_my_t*)lib->priv.w.p2;
diff --git a/src/wrapped/wrappedgio2_private.h b/src/wrapped/wrappedgio2_private.h
index 47bb2f8a..8f510825 100755
--- a/src/wrapped/wrappedgio2_private.h
+++ b/src/wrapped/wrappedgio2_private.h
@@ -23,7 +23,7 @@ GO(g_action_group_get_action_parameter_type, pFpp)
 GO(g_action_group_get_action_state, pFpp)
 GO(g_action_group_get_action_state_hint, pFpp)
 GO(g_action_group_get_action_state_type, pFpp)
-GO(g_action_group_get_type, iFv)
+GO(g_action_group_get_type, LFv)
 GO(g_action_group_has_action, iFpp)
 GO(g_action_group_list_actions, pFp)
 GO(g_action_group_query_action, iFppppppp)
@@ -38,7 +38,7 @@ GO(g_action_group_query_action, iFppppppp)
 GO(g_app_info_add_supports_type, iFppp)
 GO(g_app_info_can_delete, iFp)
 GO(g_app_info_can_remove_supports_type, iFp)
-GO(g_app_info_create_flags_get_type, iFv)
+GO(g_app_info_create_flags_get_type, LFv)
 GO(g_app_info_create_from_commandline, pFppup)
 GO(g_app_info_delete, iFp)
 GO(g_app_info_dup, pFp)
@@ -57,12 +57,12 @@ GO(g_app_info_get_id, pFp)
 GO(g_app_info_get_name, pFp)
 GO(g_app_info_get_recommended_for_type, pFp)
 GO(g_app_info_get_supported_types, pFp)
-GO(g_app_info_get_type, iFv)
+GO(g_app_info_get_type, LFv)
 GO(g_app_info_launch, iFpppp)
 GO(g_app_info_launch_default_for_uri, iFppp)
 GO(g_app_info_launch_uris, iFpppp)
 //GO(g_app_info_monitor_get, 
-GO(g_app_info_monitor_get_type, iFv)
+GO(g_app_info_monitor_get_type, LFv)
 GO(g_app_info_remove_supports_type, iFppp)
 GO(g_app_info_reset_type_associations, vFp)
 GO(g_app_info_set_as_default_for_extension, iFppp)
@@ -74,7 +74,7 @@ GO(g_app_info_supports_uris, iFp)
 //GO(g_app_launch_context_get_display, 
 //GO(g_app_launch_context_get_environment, 
 //GO(g_app_launch_context_get_startup_notify_id, 
-GO(g_app_launch_context_get_type, iFv)
+GO(g_app_launch_context_get_type, LFv)
 //GO(g_app_launch_context_launch_failed, 
 //GO(g_app_launch_context_new, 
 //GO(g_app_launch_context_setenv, 
@@ -127,7 +127,7 @@ GO(g_app_launch_context_get_type, iFv)
 //GO(g_application_unmark_busy, 
 //GO(g_application_withdraw_notification, 
 //GO(g_ask_password_flags_get_type, 
-GO(g_async_initable_get_type, iFv)
+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)
@@ -161,13 +161,13 @@ GOM(g_async_initable_newv_async, vFEiupippp)
 GOM(g_bus_get, vFEippp)
 GO(g_bus_get_finish, pFpp)
 GO(g_bus_get_sync, pFipp)
-GO(g_bus_name_owner_flags_get_type, iFv)
-GO(g_bus_name_watcher_flags_get_type, iFv)
+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)
-GO(g_bus_type_get_type, iFv)
+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)
@@ -182,7 +182,7 @@ GOM(g_cancellable_connect, LFEpppp)
 GO(g_cancellable_disconnect, vFpL)
 GO(g_cancellable_get_current, pFv)
 GO(g_cancellable_get_fd, iFp)
-GO(g_cancellable_get_type, iFv)
+GO(g_cancellable_get_type, LFv)
 GO(g_cancellable_is_cancelled, iFp)
 GO(g_cancellable_make_pollfd, iFpp)
 GO(g_cancellable_new, pFv)
@@ -193,7 +193,7 @@ GO(g_cancellable_reset, vFp)
 GO(g_cancellable_set_error_if_cancelled, iFpp)
 GO(g_cancellable_source_new, pFp)
 //GO(g_charset_converter_get_num_fallbacks, 
-GO(g_charset_converter_get_type, iFv)
+GO(g_charset_converter_get_type, LFv)
 //GO(g_charset_converter_get_use_fallback, 
 //GO(g_charset_converter_new, 
 //GO(g_charset_converter_set_use_fallback, 
@@ -276,19 +276,19 @@ GO(g_content_types_get_registered, pFv)
 //GO(g_dbus_address_get_stream, 
 //GO(g_dbus_address_get_stream_finish, 
 //GO(g_dbus_address_get_stream_sync, 
-GO(g_dbus_annotation_info_get_type, iFv)
+GO(g_dbus_annotation_info_get_type, LFv)
 GO(g_dbus_annotation_info_lookup, pFpp)
 GO(g_dbus_annotation_info_ref, pFp)
 GO(g_dbus_annotation_info_unref, vFp)
-GO(g_dbus_arg_info_get_type, iFv)
+GO(g_dbus_arg_info_get_type, LFv)
 GO(g_dbus_arg_info_ref, pFp)
 GO(g_dbus_arg_info_unref, vFp)
 //GO(g_dbus_auth_observer_allow_mechanism, 
 //GO(g_dbus_auth_observer_authorize_authenticated_peer, 
 //GO(g_dbus_auth_observer_get_type, 
 //GO(g_dbus_auth_observer_new, 
-GO(g_dbus_call_flags_get_type, iFv)
-GO(g_dbus_capability_flags_get_type, iFv)
+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)
 GO(g_dbus_connection_call_finish, pFppp)
@@ -302,7 +302,7 @@ GO(g_dbus_connection_close_sync, iFppp)
 GO(g_dbus_connection_emit_signal, iFppppppp)
 //GO(g_dbus_connection_export_action_group, 
 //GO(g_dbus_connection_export_menu_model, 
-GO(g_dbus_connection_flags_get_type, iFv)
+GO(g_dbus_connection_flags_get_type, LFv)
 GOM(g_dbus_connection_flush, vFEpppp)
 GO(g_dbus_connection_flush_finish, iFppp)
 GO(g_dbus_connection_flush_sync, iFppp)
@@ -312,7 +312,7 @@ GO(g_dbus_connection_get_guid, pFp)
 GO(g_dbus_connection_get_last_serial, uFp)
 GO(g_dbus_connection_get_peer_credentials, pFp)
 GO(g_dbus_connection_get_stream, pFp)
-GO(g_dbus_connection_get_type, iFv)
+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)
@@ -358,7 +358,7 @@ GO(g_dbus_gvariant_to_gvalue, vFpp)
 GO(g_dbus_interface_info_cache_build, vFp)
 GO(g_dbus_interface_info_cache_release, vFp)
 GO(g_dbus_interface_info_generate_xml, vFpup)
-GO(g_dbus_interface_info_get_type, iFv)
+GO(g_dbus_interface_info_get_type, LFv)
 GO(g_dbus_interface_info_lookup_method, pFpp)
 GO(g_dbus_interface_info_lookup_property, pFpp)
 GO(g_dbus_interface_info_lookup_signal, pFpp)
@@ -388,11 +388,11 @@ GO(g_dbus_is_name, iFp)
 GO(g_dbus_is_supported_address, iFpp)
 GO(g_dbus_is_unique_name, iFp)
 GO(g_dbus_menu_model_get, pFppp)
-GO(g_dbus_menu_model_get_type, iFv)
-GO(g_dbus_message_byte_order_get_type, iFv)
+GO(g_dbus_menu_model_get_type, LFv)
+GO(g_dbus_message_byte_order_get_type, LFv)
 GO(g_dbus_message_bytes_needed, lFpLp)
 GO(g_dbus_message_copy, pFpp)
-GO(g_dbus_message_flags_get_type, iFv)
+GO(g_dbus_message_flags_get_type, LFv)
 GO(g_dbus_message_get_arg0, pFp)
 GO(g_dbus_message_get_body, pFp)
 GO(g_dbus_message_get_byte_order, iFp)
@@ -411,9 +411,9 @@ GO(g_dbus_message_get_reply_serial, uFp)
 GO(g_dbus_message_get_sender, pFp)
 GO(g_dbus_message_get_serial, uFp)
 GO(g_dbus_message_get_signature, pFp)
-GO(g_dbus_message_get_type, iFv)
+GO(g_dbus_message_get_type, LFv)
 GO(g_dbus_message_get_unix_fd_list, pFp)
-GO(g_dbus_message_header_field_get_type, iFv)
+GO(g_dbus_message_header_field_get_type, LFv)
 GO(g_dbus_message_lock, vFp)
 GO(g_dbus_message_new, pFv)
 GO(g_dbus_message_new_from_blob, pFpLip)
@@ -442,8 +442,8 @@ GO(g_dbus_message_set_signature, vFpp)
 GO(g_dbus_message_set_unix_fd_list, vFpp)
 GO(g_dbus_message_to_blob, pFppip)
 GO(g_dbus_message_to_gerror, iFpp)
-GO(g_dbus_message_type_get_type, iFv)
-GO(g_dbus_method_info_get_type, iFv)
+GO(g_dbus_message_type_get_type, LFv)
+GO(g_dbus_method_info_get_type, LFv)
 GO(g_dbus_method_info_ref, pFp)
 GO(g_dbus_method_info_unref, vFp)
 GO(g_dbus_method_invocation_get_connection, pFp)
@@ -455,7 +455,7 @@ GO(g_dbus_method_invocation_get_object_path, pFp)
 GO(g_dbus_method_invocation_get_parameters, pFp)
 GO(g_dbus_method_invocation_get_property_info, pFp)
 GO(g_dbus_method_invocation_get_sender, pFp)
-GO(g_dbus_method_invocation_get_type, iFv)
+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)
@@ -466,7 +466,7 @@ GO(g_dbus_method_invocation_return_value, vFpp)
 GO(g_dbus_method_invocation_return_value_with_unix_fd_list, vFppp)
 GO(g_dbus_method_invocation_take_error, vFpp)
 GO(g_dbus_node_info_generate_xml, vFpup)
-GO(g_dbus_node_info_get_type, iFv)
+GO(g_dbus_node_info_get_type, LFv)
 GO(g_dbus_node_info_lookup_interface, pFpp)
 GO(g_dbus_node_info_new_for_xml, pFpp)
 GO(g_dbus_node_info_ref, pFp)
@@ -474,13 +474,13 @@ GO(g_dbus_node_info_unref, vFp)
 GO(g_dbus_object_get_interface, pFpp)
 GO(g_dbus_object_get_interfaces, pFp)
 GO(g_dbus_object_get_object_path, pFp)
-GO(g_dbus_object_get_type, iFv)
-GO(g_dbus_object_manager_client_flags_get_type, iFv)
+GO(g_dbus_object_get_type, LFv)
+GO(g_dbus_object_manager_client_flags_get_type, LFv)
 GO(g_dbus_object_manager_client_get_connection, pFp)
 GO(g_dbus_object_manager_client_get_flags, iFp)
 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, iFv)
+GO(g_dbus_object_manager_client_get_type, LFv)
 //GOM(g_dbus_object_manager_client_new, 
 GO(g_dbus_object_manager_client_new_finish, pFpp)
 //GOM(g_dbus_object_manager_client_new_for_bus, 
@@ -511,7 +511,7 @@ GO(g_dbus_object_manager_get_objects, pFp)
 //GO(g_dbus_object_skeleton_remove_interface_by_name, 
 //GO(g_dbus_object_skeleton_set_object_path, 
 //GO(g_dbus_property_info_flags_get_type, 
-GO(g_dbus_property_info_get_type, iFv)
+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)
@@ -520,7 +520,7 @@ GO(g_dbus_proxy_call_sync, pFpppiipp)
 GOM(g_dbus_proxy_call_with_unix_fd_list, vFEpppiipppp)
 GO(g_dbus_proxy_call_with_unix_fd_list_finish, pFpppp)
 GO(g_dbus_proxy_call_with_unix_fd_list_sync, pFpppiipppp)
-GO(g_dbus_proxy_flags_get_type, iFv)
+GO(g_dbus_proxy_flags_get_type, LFv)
 GO(g_dbus_proxy_get_cached_property, pFpp)
 GO(g_dbus_proxy_get_cached_property_names, pFp)
 GO(g_dbus_proxy_get_connection, pFp)
@@ -531,7 +531,7 @@ GO(g_dbus_proxy_get_interface_name, pFp)
 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, iFv)
+GO(g_dbus_proxy_get_type, LFv)
 GOM(g_dbus_proxy_new, vFEpippppppp)
 GO(g_dbus_proxy_new_finish, pFpp)
 GOM(g_dbus_proxy_new_for_bus, vFEiippppppp)
@@ -552,10 +552,10 @@ GO(g_dbus_proxy_set_interface_info, vFpp)
 //GO(g_dbus_server_start, 
 //GO(g_dbus_server_stop, 
 //GO(g_dbus_signal_flags_get_type, 
-GO(g_dbus_signal_info_get_type, iFv)
+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, iFv)
+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_categories, pFp)
@@ -568,13 +568,13 @@ 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_string, 
-GO(g_desktop_app_info_get_type, iFv)
+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_lookup_get_type, iFv)
+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)
@@ -649,11 +649,11 @@ GO(g_file_append_to_finish, pFppp)
 //GOM(g_file_copy_async, vFEppiipBpBp)
 GO(g_file_copy_attributes, iFppipp)
 GO(g_file_copy_finish, iFppp)
-GO(g_file_copy_flags_get_type, iFv)
+GO(g_file_copy_flags_get_type, LFv)
 GO(g_file_create, pFpipp)
 //GOM(g_file_create_async, vFEpiipBp)
 GO(g_file_create_finish, pFppp)
-GO(g_file_create_flags_get_type, iFv)
+GO(g_file_create_flags_get_type, LFv)
 GO(g_file_create_readwrite, pFpipp)
 //GOM(g_file_create_readwrite_async, vFEpiipBp)
 GO(g_file_create_readwrite_finish, pFppp)
@@ -693,7 +693,7 @@ GO(g_file_get_parent, pFp)
 GO(g_file_get_parse_name, pFp)
 GO(g_file_get_path, pFp)
 GO(g_file_get_relative_path, pFpp)
-GO(g_file_get_type, iFv)
+GO(g_file_get_type, LFv)
 GO(g_file_get_uri, pFp)
 GO(g_file_get_uri_scheme, pFp)
 GO(g_file_hash, uFp)
@@ -701,7 +701,7 @@ GO(g_file_has_parent, iFpp)
 GO(g_file_has_prefix, iFpp)
 GO(g_file_has_uri_scheme, iFpp)
 GO(g_file_icon_get_file, pFp)
-GO(g_file_icon_get_type, iFv)
+GO(g_file_icon_get_type, LFv)
 GO(g_file_icon_new, pFp)
 //GO(g_file_info_clear_status, 
 //GO(g_file_info_copy_into, 
@@ -882,7 +882,7 @@ GO(g_file_supports_thread_contexts, iFp)
 GO(g_file_trash, iFppp)
 //GOM(g_file_trash_async, vFEpipBp)
 GO(g_file_trash_finish, pFppp)
-GO(g_file_type_get_type, iFv)
+GO(g_file_type_get_type, LFv)
 //GOM(g_file_unmount_mountable, vFEpipBp)
 GO(g_file_unmount_mountable_finish, iFppp)
 //GOM(g_file_unmount_mountable_with_operation, vFEpippBp)
@@ -938,7 +938,7 @@ GO(g_icon_to_string, pFp)
 //GO(g_inet_socket_address_get_type, 
 //GO(g_inet_socket_address_new, 
 //GO(g_inet_socket_address_new_from_string, 
-GO(g_initable_get_type, iFv)
+GO(g_initable_get_type, LFv)
 GO(g_initable_init, iFppp)
 //GO(g_initable_new, pFippppppppppppppp)    // vaarg, should vrap with g_initable_new_valist
 GO(g_initable_newv, pFpippp)
@@ -1390,7 +1390,7 @@ GO(g_simple_async_result_get_op_res_gboolean, iFp)
 GO(g_simple_async_result_get_op_res_gpointer, pFp)
 GO(g_simple_async_result_get_op_res_gssize, lFp)
 GO(g_simple_async_result_get_source_tag, pFp)
-GO(g_simple_async_result_get_type, iFv)
+GO(g_simple_async_result_get_type, LFv)
 GO(g_simple_async_result_is_valid, iFppp)
 GOM(g_simple_async_result_new, pFEpppp)
 GOM(g_simple_async_result_new_error, pFEpppuipV)
@@ -1407,9 +1407,9 @@ GO(g_simple_async_result_set_op_res_gboolean, vFpi)
 GOM(g_simple_async_result_set_op_res_gpointer, vFEppp)
 GO(g_simple_async_result_set_op_res_gssize, vFpl)
 GO(g_simple_async_result_take_error, vFpp)
-GO(g_simple_permission_get_type, iFv)
+GO(g_simple_permission_get_type, LFv)
 //GO(g_simple_permission_new, 
-GO(g_simple_proxy_resolver_get_type, iFv)
+GO(g_simple_proxy_resolver_get_type, LFv)
 //GO(g_simple_proxy_resolver_new, 
 //GO(g_simple_proxy_resolver_set_default_proxy, 
 //GO(g_simple_proxy_resolver_set_ignore_hosts, 
@@ -1660,7 +1660,7 @@ GO(g_simple_proxy_resolver_get_type, iFv)
 //GO(g_test_dbus_up, 
 GO(g_themed_icon_append_name, vFpp)
 GO(g_themed_icon_get_names, pFp)
-GO(g_themed_icon_get_type, iFv)
+GO(g_themed_icon_get_type, LFv)
 GO(g_themed_icon_new, pFp)
 GO(g_themed_icon_new_from_names, pFpi)
 GO(g_themed_icon_new_with_default_fallbacks, pFp)
@@ -1777,7 +1777,7 @@ GO(g_themed_icon_prepend_name, vFpp)
 //GO(g_unix_fd_list_append, 
 //GO(g_unix_fd_list_get, 
 //GO(g_unix_fd_list_get_length, 
-GO(g_unix_fd_list_get_type, iFv)
+GO(g_unix_fd_list_get_type, LFv)
 //GO(g_unix_fd_list_new, 
 //GO(g_unix_fd_list_new_from_array, 
 //GO(g_unix_fd_list_peek_fds, 
diff --git a/src/wrapped/wrappedgobject2.c b/src/wrapped/wrappedgobject2.c
index 4b1ba6d0..87587287 100755
--- a/src/wrapped/wrappedgobject2.c
+++ b/src/wrapped/wrappedgobject2.c
@@ -23,12 +23,12 @@ const char* gobject2Name = "libgobject-2.0.so.0";
 #define LIBNAME gobject2
 library_t *my_lib = NULL;
 
-typedef int (*iFv_t)(void);
-typedef void*(*pFi_t)(int);
+typedef size_t(*LFv_t)(void);
+typedef void*(*pFL_t)(size_t);
 
 #define ADDED_FUNCTIONS()           \
- GO(g_object_get_type, iFv_t)       \
- GO(g_type_name, pFi_t)
+ GO(g_object_get_type, LFv_t)       \
+ GO(g_type_name, pFL_t)
 
 #include "generated/wrappedgobject2types.h"
 
@@ -522,7 +522,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, int itype, int flags, uint32_t offset, void* acc, void* accu_data, void* marsh, int rtype, uint32_t n, void** b)
+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)
 {
     gobject2_my_t *my = (gobject2_my_t*)my_lib->priv.w.p2;
 
@@ -544,7 +544,7 @@ EXPORT uint32_t my_g_signal_new(x64emu_t* emu, void* name, int itype, int flags,
     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, int itype, int flags, void* closure, void* acc, void* accu_data, void* marsh, int rtype, uint32_t n, void* types)
+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)
 {
     gobject2_my_t *my = (gobject2_my_t*)my_lib->priv.w.p2;
 
@@ -553,7 +553,7 @@ EXPORT uint32_t my_g_signal_newv(x64emu_t* emu, void* name, int itype, int flags
     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, int itype, int flags, void* closure, void* acc, void* accu_data, void* marsh, int 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, int flags, void* closure, void* acc, void* accu_data, void* marsh, size_t rtype, uint32_t n, x64_va_list_t b)
 {
     gobject2_my_t *my = (gobject2_my_t*)my_lib->priv.w.p2;
 
@@ -602,7 +602,7 @@ EXPORT unsigned long my_g_signal_handler_find(x64emu_t* emu, void* instance, int
     return my->g_signal_handler_find(instance, mask, signal, detail, closure, fnc, data);
 }
 
-EXPORT void* my_g_object_new(x64emu_t* emu, int type, void* first, void* b)
+EXPORT void* my_g_object_new(x64emu_t* emu, size_t type, void* first, void* b)
 {
     gobject2_my_t *my = (gobject2_my_t*)my_lib->priv.w.p2;
 
@@ -613,21 +613,21 @@ EXPORT void* my_g_object_new(x64emu_t* emu, int type, void* first, void* b)
     return my->g_object_new(type, first);
 }
 
-EXPORT void* my_g_object_new_valist(x64emu_t* emu, int type, void* first, x64_va_list_t b)
+EXPORT void* my_g_object_new_valist(x64emu_t* emu, size_t type, void* first, x64_va_list_t b)
 {
     gobject2_my_t *my = (gobject2_my_t*)my_lib->priv.w.p2;
     CONVERT_VALIST(b);
     return my->g_object_new_valist(type, first, VARARGS);
 }
 
-EXPORT int my_g_type_register_static(x64emu_t* emu, int parent, void* name, my_GTypeInfo_t* info, int flags)
+EXPORT size_t my_g_type_register_static(x64emu_t* emu, size_t parent, void* name, my_GTypeInfo_t* info, int flags)
 {
     gobject2_my_t *my = (gobject2_my_t*)my_lib->priv.w.p2;
 
     return my->g_type_register_static(parent, name, findFreeGTypeInfo(info, parent), flags);
 }
 
-EXPORT int my_g_type_register_fundamental(x64emu_t* emu, int parent, void* name, my_GTypeInfo_t* info, void* finfo, int flags)
+EXPORT size_t my_g_type_register_fundamental(x64emu_t* emu, size_t parent, void* name, my_GTypeInfo_t* info, void* finfo, int flags)
 {
     gobject2_my_t *my = (gobject2_my_t*)my_lib->priv.w.p2;
 
@@ -658,7 +658,7 @@ EXPORT unsigned long my_g_signal_add_emission_hook(x64emu_t* emu, uint32_t signa
     return my->g_signal_add_emission_hook(signal, detail, my_signal_emission_hook, sig, my_signal_delete);
 }
 
-EXPORT int my_g_type_register_static_simple(x64emu_t* emu, int parent, void* name, uint32_t class_size, void* class_init, uint32_t instance_size, void* instance_init, int flags)
+EXPORT size_t my_g_type_register_static_simple(x64emu_t* emu, size_t parent, void* name, size_t class_size, void* class_init, size_t instance_size, void* instance_init, int flags)
 {
         //gobject2_my_t *my = (gobject2_my_t*)my_lib->priv.w.p2;
 
@@ -677,7 +677,7 @@ typedef struct my_GInterfaceInfo_s {
     void* data;
 } my_GInterfaceInfo_t;
 
-EXPORT void my_g_type_add_interface_static(x64emu_t* emu, int instance_type, int interface_type, my_GInterfaceInfo_t* info)
+EXPORT void my_g_type_add_interface_static(x64emu_t* emu, size_t instance_type, size_t interface_type, my_GInterfaceInfo_t* info)
 {
     gobject2_my_t *my = (gobject2_my_t*)my_lib->priv.w.p2;
 
@@ -728,7 +728,7 @@ EXPORT void* my_g_type_class_peek_parent(x64emu_t* emu, void* object)
     gobject2_my_t *my = (gobject2_my_t*)my_lib->priv.w.p2;
 
     void* klass = my->g_type_class_peek_parent(object);
-    int type = klass?*(int*)klass:0;
+    size_t type = klass?*(size_t*)klass:0;
     return wrapCopyGTKClass(klass, type);
 }
 
diff --git a/src/wrapped/wrappedgobject2_private.h b/src/wrapped/wrappedgobject2_private.h
index 44891f38..39c61826 100755
--- a/src/wrapped/wrappedgobject2_private.h
+++ b/src/wrapped/wrappedgobject2_private.h
@@ -1,24 +1,25 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
 #error meh!
 #endif
+//GType is gulong !!!!!
 
 //GO(__aeabi_f2lz, 
 //GO(__aeabi_f2ulz, 
 //GO(_fini, 
-GO(g_array_get_type, iFv)
-GO(g_binding_flags_get_type, iFv)
+GO(g_array_get_type, LFv)
+GO(g_binding_flags_get_type, LFv)
 //GO(g_binding_get_flags, 
 //GO(g_binding_get_source, 
 //GO(g_binding_get_source_property, 
 //GO(g_binding_get_target, 
 //GO(g_binding_get_target_property, 
-GO(g_binding_get_type, iFv)
+GO(g_binding_get_type, LFv)
 //GO(g_binding_unbind, 
 GO(g_boxed_copy, pFip)
 GO(g_boxed_free, vFip)
-GOM(g_boxed_type_register_static, iFEppp)
-GO(g_byte_array_get_type, iFv)
-GO(g_bytes_get_type, iFv)
+GOM(g_boxed_type_register_static, LFEppp)
+GO(g_byte_array_get_type, LFv)
+GO(g_bytes_get_type, LFv)
 DATA(g_cclosure_marshal_BOOLEAN__BOXED_BOXED, sizeof(void*))    // set all cclosure_marshal as data, so they can be used "as-is" in cclosure parameter (not-wrapped)
 DATA(g_cclosure_marshal_BOOLEAN__BOXED_BOXEDv, sizeof(void*))
 DATA(g_cclosure_marshal_BOOLEAN__FLAGS, sizeof(void*))
@@ -86,31 +87,31 @@ GO(g_clear_object, vFp)
 //GO(g_closure_set_meta_marshal, 
 //GO(g_closure_sink, 
 //GO(g_closure_unref, 
-GO(g_date_get_type, iFv)
-GO(g_date_time_get_type, iFv)
-GO(g_enum_complete_type_info, vFipp)
+GO(g_date_get_type, LFv)
+GO(g_date_time_get_type, LFv)
+GO(g_enum_complete_type_info, vFLpp)
 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, iFpp)
-GO(g_error_get_type, iFv)
+GO(g_enum_register_static, LFpp)
+GO(g_error_get_type, LFv)
 GO(g_flags_complete_type_info, vFipp)
 GO(g_flags_get_first_value, pFpi)
 GO(g_flags_get_value_by_name, pFpp)
 GO(g_flags_get_value_by_nick, pFpp)
 GO(g_flags_register_static, iFpp)
-GO(g_gstring_get_type, iFv)
-GO(g_gtype_get_type, iFv)
-GO(g_hash_table_get_type, iFv)
-GO(g_initially_unowned_get_type, iFv)
-GO(g_io_channel_get_type, iFv)
-GO(g_io_condition_get_type, iFv)
-GO(g_key_file_get_type, iFv)
-GO(g_main_context_get_type, iFv)
-GO(g_main_loop_get_type, iFv)
-GO(g_mapped_file_get_type, iFv)
-GO(g_markup_parse_context_get_type, iFv)
-GO(g_match_info_get_type, iFv)
+GO(g_gstring_get_type, LFv)
+GO(g_gtype_get_type, LFv)
+GO(g_hash_table_get_type, LFv)
+GO(g_initially_unowned_get_type, LFv)
+GO(g_io_channel_get_type, LFv)
+GO(g_io_condition_get_type, LFv)
+GO(g_key_file_get_type, LFv)
+GO(g_main_context_get_type, LFv)
+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)
 GO(g_object_add_weak_pointer, vFpp)
 //GO(g_object_bind_property, 
@@ -132,15 +133,15 @@ 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_type, iFv)
+GO(g_object_get_type, LFv)
 GOM(g_object_get_valist, vFEppA)
 GO(g_object_interface_find_property, pFpp)
 GO(g_object_interface_install_property, vFpp)
 GO(g_object_interface_list_properties, pFpp)
 GO(g_object_is_floating, iFp)
-GOM(g_object_new, pFEipV)
-GO(g_object_newv, pFiup)
-GOM(g_object_new_valist, pFEipA)
+GOM(g_object_new, pFELpV)
+GO(g_object_newv, pFLup)
+GOM(g_object_new_valist, pFELpA)
 GO(g_object_notify, vFpp)
 GO(g_object_notify_by_pspec, vFpp)
 GO(g_object_ref, pFp)
@@ -165,7 +166,7 @@ GO(g_object_watch_closure, vFpp)
 //GOM(g_object_weak_ref, vFpBp)
 GO(g_object_weak_unref, vFpp)
 GO(g_param_spec_boolean, pFpppii)
-GO(g_param_spec_boxed, pFpppii)
+GO(g_param_spec_boxed, pFpppLi)
 GO(g_param_spec_char, pFpppccci)
 GO(g_param_spec_double, pFpppdddi)
 GO(g_param_spec_enum, pFpppiii)
@@ -245,41 +246,41 @@ GO(g_signal_has_handler_pending, iFpupi)
 GO(g_signal_list_ids, pFip)
 GO(g_signal_lookup, uFpi)
 GO(g_signal_name, pFu)
-GOM(g_signal_new, uFEpiiupppiuV)
-//GOM(g_signal_new_class_handler, uFEpiupppppnV)
-GOM(g_signal_newv, uFEpiippppiup)
-GOM(g_signal_new_valist, uFEpiippppiuA)
-GO(g_signal_override_class_closure, vFuip)
+GOM(g_signal_new, uFEpLiupppLuV)
+//GOM(g_signal_new_class_handler, uFEpLupppppnV)
+GOM(g_signal_newv, uFEpLippppLup)
+GOM(g_signal_new_valist, uFEpLippppLuA)
+GO(g_signal_override_class_closure, vFuLp)
 //GOM(g_signal_override_class_handler, vFEppB)
-GO(g_signal_parse_name, iFpippi)
+GO(g_signal_parse_name, iFpLppi)
 GO(g_signal_query, vFup)
 GO(g_signal_remove_emission_hook, vFpL)
 //GOM(g_signal_set_va_marshaller, vFEuiB)
 GO(g_signal_stop_emission, vFpup)
 GO(g_signal_stop_emission_by_name, vFpp)
-GO(g_signal_type_cclosure_new, pFiu)    //should wrap?
-GO(g_source_get_type, iFv)
+GO(g_signal_type_cclosure_new, pFLu)    //should wrap?
+GO(g_source_get_type, LFv)
 //GO(g_source_set_closure, 
 //GO(g_source_set_dummy_callback, 
 GO(g_strdup_value_contents, pFp)
-GO(g_strv_get_type, iFv)
-GO(g_thread_get_type, iFv)
-GO(g_time_zone_get_type, iFv)
+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)
-GO(g_type_add_class_private, vFpiu)
+GO(g_type_add_class_private, vFpLu)
 //GO(g_type_add_instance_private, 
 //GOM(g_type_add_interface_check, vFEpB)
 //GOM(g_type_add_interface_dynamic, vFEiip)
-GOM(g_type_add_interface_static, vFEiip)
-GO(g_type_check_class_cast, pFpi)
-GO(g_type_check_class_is_a, iFpi)
-GO(g_type_check_instance, iFp)
-GO(g_type_check_instance_cast, pFpi)
-GO(g_type_check_instance_is_a, iFpi)
-GO(g_type_check_instance_is_fundamentally_a, iFpi)
-GO(g_type_check_is_value_type, iFpi)
-GO(g_type_check_value, iFp)
-GO(g_type_check_value_holds, iFpi)
+GOM(g_type_add_interface_static, vFELLp)
+GO(g_type_check_class_cast, pFpL)
+GO(g_type_check_class_is_a, LFpL)
+GO(g_type_check_instance, LFp)
+GO(g_type_check_instance_cast, pFpL)
+GO(g_type_check_instance_is_a, LFpL)
+GO(g_type_check_instance_is_fundamentally_a, LFpL)
+GO(g_type_check_is_value_type, LFpL)
+GO(g_type_check_value, LFp)
+GO(g_type_check_value_holds, LFpL)
 GO(g_type_children, pFip)
 GO(g_type_class_add_private, vFpu)
 GO(g_type_class_adjust_private_offset, vFpp)
@@ -306,14 +307,14 @@ GO(g_type_get_qdata, pFip)
 GO(g_type_get_type_registration_serial, uFv)
 GO(g_type_init, vFv)
 GO(g_type_init_with_debug_flags, vFi)
-GO(g_type_instance_get_private, pFpi)
-GO(g_type_interface_add_prerequisite, vFii)
+GO(g_type_instance_get_private, pFpL)
+GO(g_type_interface_add_prerequisite, vFLL)
 //GOM(g_type_interface_get_plugin, pFEii) // return GTypePlugin*
-GO(g_type_interface_peek, pFpi)
+GO(g_type_interface_peek, pFpL)
 GO(g_type_interface_peek_parent, pFp)
-GO(g_type_interface_prerequisites, pFip)
-GO(g_type_interfaces, pFip)
-GO(g_type_is_a, iFii)
+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, 
 //GO(g_type_module_register_enum, 
@@ -322,32 +323,32 @@ GO(g_type_is_a, iFii)
 //GO(g_type_module_set_name, 
 //GO(g_type_module_unuse, 
 //GO(g_type_module_use, 
-GO(g_type_name, pFi)
+GO(g_type_name, pFL)
 //GO(g_type_name_from_class, 
 //GO(g_type_name_from_instance, 
-GO(g_type_next_base, iFii)
-GO(g_type_parent, iFi)
+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, 
 //GO(g_type_plugin_unuse, 
 //GO(g_type_plugin_use, 
-GO(g_type_qname, pFi)
-GO(g_type_query, vFip)
+GO(g_type_qname, pFL)
+GO(g_type_query, vFLp)
 //GOM(type_register_dynamic, iFEpippi)
-GOM(g_type_register_fundamental, iFEipppi)
-GOM(g_type_register_static, iFEippi)
-GOM(g_type_register_static_simple, iFEipupupi)
+GOM(g_type_register_fundamental, LFELpppi)
+GOM(g_type_register_static, LFELppi)
+GOM(g_type_register_static_simple, LFELpLpLpi)
 //GOM(g_type_remove_class_cache_func, vFEpB)
 //GOM(g_type_remove_interface_check, vFEpB)
-GO(g_type_set_qdata, vFipp)
-GO(g_type_test_flags, iFiu)
+GO(g_type_set_qdata, vFLpp)
+GO(g_type_test_flags, iFLu)
 //GOM(g_type_value_table_peek, pFEi)    //need to bridge GTypeValueTable
 GO(g_value_array_append, pFpp)  //TODO: does GValueArray needs alignement?
 GO(g_value_array_copy, pFp)
 GO(g_value_array_free, vFp)
 GO(g_value_array_get_nth, pFpu)
-GO(g_value_array_get_type, iFv)
+GO(g_value_array_get_type, LFv)
 GO(g_value_array_insert, pFpup)
 GO(g_value_array_new, pFu)
 GO(g_value_array_prepend, pFpp)
@@ -377,7 +378,7 @@ GO(g_value_get_param, pFp)
 GO(g_value_get_pointer, pFp)
 GO(g_value_get_schar, cFp)
 GO(g_value_get_string, pFp)
-GO(g_value_get_type, iFv)
+GO(g_value_get_type, LFv)
 GO(g_value_get_uchar, CFp)
 GO(g_value_get_uint, uFp)
 GO(g_value_get_uint64, UFp)
diff --git a/src/wrapped/wrappedgtkx112.c b/src/wrapped/wrappedgtkx112.c
index a574de6c..e1ad8b11 100755
--- a/src/wrapped/wrappedgtkx112.c
+++ b/src/wrapped/wrappedgtkx112.c
@@ -23,16 +23,19 @@ const char* gtkx112Name = "libgtk-x11-2.0.so.0";
 static char* libname = NULL;
 #define LIBNAME gtkx112
 
-typedef int           (*iFv_t)(void);
+typedef size_t        (*LFv_t)(void);
 typedef void*         (*pFi_t)(int);
 typedef void          (*vFp_t)(void*);
 typedef int           (*iFp_t)(void*);
 typedef void*         (*pFp_t)(void*);
 typedef double        (*dFp_t)(void*);
+typedef void*         (*pFL_t)(size_t);
 typedef int           (*iFip_t)(int, void*);
 typedef int           (*iFpp_t)(void*, void*);
+typedef size_t        (*LFLp_t)(size_t, void*);
 typedef void*         (*pFpp_t)(void*, void*);
 typedef void*         (*pFpi_t)(void*, int);
+typedef void*         (*pFpL_t)(void*, size_t);
 typedef void          (*vFpp_t)(void*, void*);
 typedef void*         (*pFppi_t)(void*, void*, int32_t);
 typedef int32_t       (*iFppp_t)(void*, void*, void*);
@@ -61,19 +64,19 @@ typedef void*         (*pFpippppppp_t)(void*, int, void*, void*, void*, void*, v
 typedef void*         (*pFpipppppppi_t)(void*, int, void*, void*, void*, void*, void*, void*, void*, int);
 
 #define SUPER() \
-    GO(gtk_object_get_type, iFv_t)              \
+    GO(gtk_object_get_type, LFv_t)              \
     GO(gtk_object_set_data_full, vFpppp_t)      \
-    GO(g_type_check_instance_cast, pFpi_t)      \
-    GO(gtk_bin_get_type, iFv_t)                 \
-    GO(gtk_widget_get_type, iFv_t)              \
-    GO(gtk_button_get_type, iFv_t)              \
-    GO(gtk_container_get_type, iFv_t)           \
-    GO(gtk_misc_get_type, iFv_t)                \
-    GO(gtk_label_get_type, iFv_t)               \
-    GO(gtk_tree_view_get_type, iFv_t)           \
-    GO(gtk_window_get_type, iFv_t)              \
-    GO(gtk_table_get_type, iFv_t)               \
-    GO(gtk_type_class, pFi_t)                   \
+    GO(g_type_check_instance_cast, pFpL_t)      \
+    GO(gtk_bin_get_type, LFv_t)                 \
+    GO(gtk_widget_get_type, LFv_t)              \
+    GO(gtk_button_get_type, LFv_t)              \
+    GO(gtk_container_get_type, LFv_t)           \
+    GO(gtk_misc_get_type, LFv_t)                \
+    GO(gtk_label_get_type, LFv_t)               \
+    GO(gtk_tree_view_get_type, LFv_t)           \
+    GO(gtk_window_get_type, LFv_t)              \
+    GO(gtk_table_get_type, LFv_t)               \
+    GO(gtk_type_class, pFL_t)                   \
     GO(gtk_button_get_label, pFp_t)             \
     GO(gtk_signal_connect_full, LFppppppii_t)   \
     GO(gtk_dialog_add_button, pFppi_t)          \
@@ -101,20 +104,20 @@ typedef void*         (*pFpipppppppi_t)(void*, int, void*, void*, void*, void*,
     GO(gtk_toolbar_insert_stock, pFppppppi_t)   \
     GO(gtk_tree_sortable_set_sort_func, vFpippp_t)      \
     GO(gtk_tree_sortable_set_default_sort_func, vFpppp_t)\
-    GO(gtk_type_unique, iFip_t)                 \
+    GO(gtk_type_unique, LFLp_t)                 \
     GO(gtk_spin_button_get_value, dFp_t)        \
     GO(gtk_builder_connect_signals_full, vFppp_t)       \
-    GO(gtk_action_get_type, iFv_t)              \
+    GO(gtk_action_get_type, LFv_t)              \
     GO(gtk_binding_entry_add_signall, vFpuipp_t)\
     GO(gtk_binding_entry_add_signal, vFpuipuV_t)\
     GO(gtk_container_foreach, vFppp_t)          \
     GO(gtk_cell_layout_set_cell_data_func, vFppppp_t)   \
     GO(g_module_close, iFp_t)                   \
     GO(g_module_open, pFpi_t)                   \
-    GO(g_module_supported, iFv_t)               \
+    GO(g_module_supported, LFv_t)               \
     GO(g_module_symbol, iFppp_t)                \
     GO(g_log, vFpipV_t)                         \
-    GO(g_type_class_ref, pFi_t)                 \
+    GO(g_type_class_ref, pFL_t)                 \
     GO(g_type_class_unref, vFp_t)               \
     GO(g_signal_connect_object, LFppppi_t)      \
     GO(g_signal_connect_data, LFpppppi_t)       \
@@ -669,7 +672,7 @@ EXPORT void my_gtk_message_dialog_format_secondary_markup(x64emu_t* emu, void* d
     my->gtk_message_dialog_format_secondary_markup(dialog, buf);
     free(buf);
 }
-EXPORT void* my_gtk_type_class(x64emu_t* emu, int type)
+EXPORT void* my_gtk_type_class(x64emu_t* emu, size_t type)
 {
     library_t * lib = GetLibInternal(libname);
     gtkx112_my_t *my = (gtkx112_my_t*)lib->priv.w.p2;
@@ -820,7 +823,7 @@ EXPORT void* my_gtk_toolbar_insert_item(x64emu_t* emu, void* toolbar, void* text
     return my->gtk_toolbar_insert_item(toolbar, text, tooltip_text, tooltip_private, icon, findToolbarFct(f), data, position);
 }
 
-EXPORT void* my_gtk_toolbar_append_element(x64emu_t* emu, void* toolbar, int type, void* widget, void* text, void* tooltip_text, void* tooltip_private, void* icon, void* f, void* data)
+EXPORT void* my_gtk_toolbar_append_element(x64emu_t* emu, void* toolbar, size_t type, void* widget, void* text, void* tooltip_text, void* tooltip_private, void* icon, void* f, void* data)
 {
     library_t * lib = GetLibInternal(libname);
     gtkx112_my_t *my = (gtkx112_my_t*)lib->priv.w.p2;
@@ -828,7 +831,7 @@ EXPORT void* my_gtk_toolbar_append_element(x64emu_t* emu, void* toolbar, int typ
     return my->gtk_toolbar_append_element(toolbar, type, widget, text, tooltip_text, tooltip_private, icon, findToolbarFct(f), data);
 }
 
-EXPORT void* my_gtk_toolbar_prepend_element(x64emu_t* emu, void* toolbar, int type, void* widget, void* text, void* tooltip_text, void* tooltip_private, void* icon, void* f, void* data)
+EXPORT void* my_gtk_toolbar_prepend_element(x64emu_t* emu, void* toolbar, size_t type, void* widget, void* text, void* tooltip_text, void* tooltip_private, void* icon, void* f, void* data)
 {
     library_t * lib = GetLibInternal(libname);
     gtkx112_my_t *my = (gtkx112_my_t*)lib->priv.w.p2;
@@ -836,7 +839,7 @@ EXPORT void* my_gtk_toolbar_prepend_element(x64emu_t* emu, void* toolbar, int ty
     return my->gtk_toolbar_prepend_element(toolbar, type, widget, text, tooltip_text, tooltip_private, icon, findToolbarFct(f), data);
 }
 
-EXPORT void* my_gtk_toolbar_insert_element(x64emu_t* emu, void* toolbar, int type, void* widget, void* text, void* tooltip_text, void* tooltip_private, void* icon, void* f, void* data, int position)
+EXPORT void* my_gtk_toolbar_insert_element(x64emu_t* emu, void* toolbar, size_t type, void* widget, void* text, void* tooltip_text, void* tooltip_private, void* icon, void* f, void* data, int position)
 {
     library_t * lib = GetLibInternal(libname);
     gtkx112_my_t *my = (gtkx112_my_t*)lib->priv.w.p2;
@@ -897,7 +900,7 @@ EXPORT float my_gtk_spin_button_get_value_as_float(x64emu_t* emu, void* spinner)
     return my->gtk_spin_button_get_value(spinner);
 }
 
-static int gtk1Type(gtkx112_my_t *my, int type)
+static int gtk1Type(gtkx112_my_t *my, size_t type)
 {
     if (type==21)
         return my->gtk_object_get_type();
@@ -905,12 +908,12 @@ static int gtk1Type(gtkx112_my_t *my, int type)
 }
 
 typedef struct dummy_gtk1_button_s {
-    int type;
+    size_t type;
     int dummy[14];
     void* label;
 } dummy_gtk1_button_t;
 
-EXPORT void* my_gtk_type_check_object_cast(x64emu_t* emu, void* obj, int type)
+EXPORT void* my_gtk_type_check_object_cast(x64emu_t* emu, void* obj, size_t type)
 {
     library_t * lib = GetLibInternal(libname);
     gtkx112_my_t *my = (gtkx112_my_t*)lib->priv.w.p2;
diff --git a/src/wrapped/wrappedgtkx112_private.h b/src/wrapped/wrappedgtkx112_private.h
index 74ef3a54..b42a6b93 100755
--- a/src/wrapped/wrappedgtkx112_private.h
+++ b/src/wrapped/wrappedgtkx112_private.h
@@ -13,7 +13,7 @@
 //GO(gtk_about_dialog_get_name, 
 //GO(gtk_about_dialog_get_program_name, 
 //GO(gtk_about_dialog_get_translator_credits, 
-GO(gtk_about_dialog_get_type, iFv)
+GO(gtk_about_dialog_get_type, LFv)
 //GO(gtk_about_dialog_get_version, 
 //GO(gtk_about_dialog_get_website, 
 //GO(gtk_about_dialog_get_website_label, 
@@ -42,7 +42,7 @@ GO(gtk_accelerator_name, pFui)
 GO(gtk_accelerator_parse, vFppp)
 GO(gtk_accelerator_set_default_mod_mask, vFu)
 GO(gtk_accelerator_valid, iFui)
-GO(gtk_accel_flags_get_type, iFv)
+GO(gtk_accel_flags_get_type, LFv)
 GO(gtk_accel_group_activate, iFpppui)
 GO(gtk_accel_group_connect, vFpuiip)  // Closure probably needs wrapping when not null
 GO(gtk_accel_group_connect_by_path, vFppp)
@@ -52,7 +52,7 @@ GO(gtk_accel_group_disconnect_key, iFpui)
 GO(gtk_accel_group_from_accel_closure, pFp)
 GO(gtk_accel_group_get_is_locked, iFp)
 GO(gtk_accel_group_get_modifier_mask, iFp)
-GO(gtk_accel_group_get_type, iFv)
+GO(gtk_accel_group_get_type, LFv)
 GO(gtk_accel_group_lock, vFp)
 GO(gtk_accel_group_new, pFv)
 GO(gtk_accel_group_query, pFpuip)
@@ -61,7 +61,7 @@ GO(gtk_accel_groups_from_object, pFp)
 GO(gtk_accel_group_unlock, vFp)
 //GO(gtk_accel_label_get_accel_widget, 
 //GO(gtk_accel_label_get_accel_width, 
-GO(gtk_accel_label_get_type, iFv)
+GO(gtk_accel_label_get_type, LFv)
 //GO(gtk_accel_label_new, 
 //GO(gtk_accel_label_refetch, 
 //GO(gtk_accel_label_set_accel_closure, 
@@ -72,7 +72,7 @@ GO(gtk_accel_label_get_type, iFv)
 //GO(gtk_accel_map_foreach, 
 //GO(gtk_accel_map_foreach_unfiltered, 
 //GO(gtk_accel_map_get, 
-GO(gtk_accel_map_get_type, iFv)
+GO(gtk_accel_map_get_type, LFv)
 //GO(gtk_accel_map_load, 
 //GO(gtk_accel_map_load_fd, 
 //GO(gtk_accel_map_load_scanner, 
@@ -82,7 +82,7 @@ GO(gtk_accel_map_get_type, iFv)
 //GO(gtk_accel_map_save_fd, 
 //GO(gtk_accel_map_unlock_path, 
 //GO(gtk_accessible_connect_widget_destroyed, 
-GO(gtk_accessible_get_type, iFv)
+GO(gtk_accessible_get_type, LFv)
 //GO(gtk_accessible_get_widget, 
 //GO(gtk_accessible_set_widget, 
 GO(gtk_action_activate, vFp)
@@ -109,7 +109,7 @@ GO(gtk_action_get_sensitive, iFp)
 GO(gtk_action_get_short_label, pFp)
 GO(gtk_action_get_stock_id, pFp)
 GO(gtk_action_get_tooltip, pFp)
-GO(gtk_action_get_type, iFv)
+GO(gtk_action_get_type, LFv)
 GO(gtk_action_get_visible, iFp)
 GO(gtk_action_get_visible_horizontal, iFp)
 GO(gtk_action_get_visible_vertical, iFp)
@@ -124,7 +124,7 @@ GO(gtk_action_group_add_toggle_actions, vFppup)
 GO(gtk_action_group_get_action, pFpp)
 GO(gtk_action_group_get_name, pFp)
 GO(gtk_action_group_get_sensitive, iFp)
-GO(gtk_action_group_get_type, iFv)
+GO(gtk_action_group_get_type, LFv)
 GO(gtk_action_group_get_visible, iFp)
 GO(gtk_action_group_list_actions, pFp)
 GO(gtk_action_group_new, pFp)
@@ -155,7 +155,7 @@ GO(gtk_action_unblock_activate, vFp)
 GO(gtk_action_unblock_activate_from, vFpp)
 //GO(gtk_activatable_do_set_related_action, 
 //GO(gtk_activatable_get_related_action, 
-GO(gtk_activatable_get_type, iFv)
+GO(gtk_activatable_get_type, LFv)
 //GO(gtk_activatable_get_use_action_appearance, 
 //GO(gtk_activatable_set_related_action, 
 //GO(gtk_activatable_set_use_action_appearance, 
@@ -167,7 +167,7 @@ GO(gtk_adjustment_get_lower, dFp)
 GO(gtk_adjustment_get_page_increment, dFp)
 GO(gtk_adjustment_get_page_size, dFp)
 GO(gtk_adjustment_get_step_increment, dFp)
-GO(gtk_adjustment_get_type, iFv)
+GO(gtk_adjustment_get_type, LFv)
 GO(gtk_adjustment_get_upper, dFp)
 GO(gtk_adjustment_get_value, dFp)
 GO(gtk_adjustment_new, pFdddddd)
@@ -179,19 +179,19 @@ GO(gtk_adjustment_set_upper, vFpd)
 GO(gtk_adjustment_set_value, vFpd)
 GO(gtk_adjustment_value_changed, vFp)
 GO(gtk_alignment_get_padding, vFppppp)
-GO(gtk_alignment_get_type, iFv)
+GO(gtk_alignment_get_type, LFv)
 GO(gtk_alignment_new, pFffff)
 GO(gtk_alignment_set, vFpffff)
 GO(gtk_alignment_set_padding, vFpuuuu)
 GO(gtk_alternative_dialog_button_order, iFp)
-GO(gtk_anchor_type_get_type, iFv)
-GO(gtk_arg_flags_get_type, iFv)
-GO(gtk_arrow_get_type, iFv)
+GO(gtk_anchor_type_get_type, LFv)
+GO(gtk_arg_flags_get_type, LFv)
+GO(gtk_arrow_get_type, LFv)
 GO(gtk_arrow_new, pFii)
-GO(gtk_arrow_placement_get_type, iFv)
+GO(gtk_arrow_placement_get_type, LFv)
 GO(gtk_arrow_set, vFpii)
-GO(gtk_arrow_type_get_type, iFv)
-GO(gtk_aspect_frame_get_type, iFv)
+GO(gtk_arrow_type_get_type, LFv)
+GO(gtk_aspect_frame_get_type, LFv)
 //GO(gtk_aspect_frame_new, 
 //GO(gtk_aspect_frame_set, 
 //GO(gtk_assistant_add_action_widget, 
@@ -205,10 +205,10 @@ GO(gtk_aspect_frame_get_type, iFv)
 //GO(gtk_assistant_get_page_side_image, 
 //GO(gtk_assistant_get_page_title, 
 //GO(gtk_assistant_get_page_type, 
-GO(gtk_assistant_get_type, iFv)
+GO(gtk_assistant_get_type, LFv)
 //GO(gtk_assistant_insert_page, 
 //GO(gtk_assistant_new, 
-GO(gtk_assistant_page_type_get_type, iFv)
+GO(gtk_assistant_page_type_get_type, LFv)
 //GO(gtk_assistant_prepend_page, 
 //GO(gtk_assistant_remove_action_widget, 
 //GO(gtk_assistant_set_current_page, 
@@ -219,7 +219,7 @@ GO(gtk_assistant_page_type_get_type, iFv)
 //GO(gtk_assistant_set_page_title, 
 //GO(gtk_assistant_set_page_type, 
 //GO(gtk_assistant_update_buttons_state, 
-GO(gtk_attach_options_get_type, iFv)
+GO(gtk_attach_options_get_type, LFv)
 GOM(gtk_binding_entry_add_signal, vFEpuipuV)   //vaarg
 GO(gtk_binding_entry_add_signall, vFpuipp)
 GO(gtk_binding_entry_clear, vFpui)
@@ -234,14 +234,14 @@ GO(gtk_binding_set_by_class, pFp)
 GO(gtk_binding_set_find, pFp)
 GO(gtk_binding_set_new, pFp)
 GO(gtk_bin_get_child, pFp)
-GO(gtk_bin_get_type, iFv)
+GO(gtk_bin_get_type, LFv)
 GO(gtk_border_copy, pFp)
 GO(gtk_border_free, vFp)
-GO(gtk_border_get_type, iFv)
+GO(gtk_border_get_type, LFv)
 GO(gtk_border_new, pFv)
 GO(gtk_box_get_homogeneous, iFp)
 GO(gtk_box_get_spacing, iFp)
-GO(gtk_box_get_type, iFv)
+GO(gtk_box_get_type, LFv)
 GO(gtk_box_pack_end, vFppiiu)
 GO(gtk_box_pack_end_defaults, vFpp)
 GO(gtk_box_pack_start, vFppiiu)
@@ -258,7 +258,7 @@ GO(gtk_buildable_custom_tag_end, vFppppp)
 GO(gtk_buildable_custom_tag_start, iFpppppp)
 GO(gtk_buildable_get_internal_child, pFppp)
 GO(gtk_buildable_get_name, pFp)
-GO(gtk_buildable_get_type, iFv)
+GO(gtk_buildable_get_type, LFv)
 GO(gtk_buildable_parser_finished, vFpp)
 GO(gtk_buildable_set_buildable_property, vFpppp)
 GO(gtk_buildable_set_name, vFpp)
@@ -268,28 +268,28 @@ GO(gtk_builder_add_objects_from_file, uFpppp)
 GO(gtk_builder_add_objects_from_string, uFppLpp)
 GOM(gtk_builder_connect_signals, vFEpp)
 GOM(gtk_builder_connect_signals_full, vFEppp)
-GO(gtk_builder_error_get_type, iFv)
+GO(gtk_builder_error_get_type, LFv)
 GO(gtk_builder_error_quark, pFv)
 GO(gtk_builder_get_object, pFpp)
 GO(gtk_builder_get_objects, pFp)
 GO(gtk_builder_get_translation_domain, pFp)
-GO(gtk_builder_get_type, iFv)
+GO(gtk_builder_get_type, LFv)
 GO(gtk_builder_get_type_from_name, iFpp)
 GO(gtk_builder_new, pFv)
 GO(gtk_builder_set_translation_domain, vFpp)
 GO(gtk_builder_value_from_string, iFppppp)
 GO(gtk_builder_value_from_string_type, iFpippp)
-GO(gtk_button_action_get_type, iFv)
+GO(gtk_button_action_get_type, LFv)
 GO(gtk_button_box_get_child_ipadding, vFppp)
 GO(gtk_button_box_get_child_secondary, iFpp)
 GO(gtk_button_box_get_child_size, vFppp)
 GO(gtk_button_box_get_layout, iFp)
-GO(gtk_button_box_get_type, iFv)
+GO(gtk_button_box_get_type, LFv)
 GO(gtk_button_box_set_child_ipadding, vFpii)
 GO(gtk_button_box_set_child_secondary, vFppi)
 GO(gtk_button_box_set_child_size, vFpii)
 GO(gtk_button_box_set_layout, vFpi)
-GO(gtk_button_box_style_get_type, iFv)
+GO(gtk_button_box_style_get_type, LFv)
 //GO(gtk_button_clicked, 
 //GO(gtk_button_enter, 
 GO(gtk_button_get_alignment, vFppp)
@@ -299,7 +299,7 @@ GO(gtk_button_get_image, pFp)
 GO(gtk_button_get_image_position, iFp)
 GO(gtk_button_get_label, pFp)
 GO(gtk_button_get_relief, iFp)
-GO(gtk_button_get_type, iFv)
+GO(gtk_button_get_type, LFv)
 GO(gtk_button_get_use_stock, iFp)
 GO(gtk_button_get_use_underline, iFp)
 GO(gtk_button_leave, vFp)
@@ -317,16 +317,16 @@ GO(gtk_button_set_label, vFpp)
 GO(gtk_button_set_relief, vFpi)
 GO(gtk_button_set_use_stock, vFpi)
 GO(gtk_button_set_use_underline, vFpi)
-GO(gtk_buttons_type_get_type, iFv)
+GO(gtk_buttons_type_get_type, LFv)
 //GO(gtk_calendar_clear_marks, 
 //GO(gtk_calendar_display_options, 
-GO(gtk_calendar_display_options_get_type, iFv)
+GO(gtk_calendar_display_options_get_type, LFv)
 //GO(gtk_calendar_freeze, 
 //GO(gtk_calendar_get_date, 
 //GO(gtk_calendar_get_detail_height_rows, 
 //GO(gtk_calendar_get_detail_width_chars, 
 //GO(gtk_calendar_get_display_options, 
-GO(gtk_calendar_get_type, iFv)
+GO(gtk_calendar_get_type, LFv)
 //GO(gtk_calendar_mark_day, 
 //GO(gtk_calendar_new, 
 //GO(gtk_calendar_select_day, 
@@ -338,24 +338,24 @@ GO(gtk_calendar_get_type, iFv)
 //GO(gtk_calendar_thaw, 
 //GO(gtk_calendar_unmark_day, 
 //GO(gtk_cell_editable_editing_done, 
-GO(gtk_cell_editable_get_type, iFv)
+GO(gtk_cell_editable_get_type, LFv)
 //GO(gtk_cell_editable_remove_widget, 
 //GO(gtk_cell_editable_start_editing, 
 GO(gtk_cell_layout_add_attribute, vFpppi)
 GO(gtk_cell_layout_clear, vFp)
 GO(gtk_cell_layout_clear_attributes, vFpp)
 GO(gtk_cell_layout_get_cells, pFp)
-GO(gtk_cell_layout_get_type, iFv)
+GO(gtk_cell_layout_get_type, LFv)
 GO(gtk_cell_layout_pack_end, vFppi)
 GO(gtk_cell_layout_pack_start, vFppi)
 GO(gtk_cell_layout_reorder, vFppi)
 //GO(gtk_cell_layout_set_attributes, vFpppppppppp)  // vaarg
 GOM(gtk_cell_layout_set_cell_data_func, vFEppppp)
-GO(gtk_cell_renderer_accel_get_type, iFv)
-GO(gtk_cell_renderer_accel_mode_get_type, iFv)
+GO(gtk_cell_renderer_accel_get_type, LFv)
+GO(gtk_cell_renderer_accel_mode_get_type, LFv)
 GO(gtk_cell_renderer_accel_new, pFv)
 GO(gtk_cell_renderer_activate, iFppppppi)
-GO(gtk_cell_renderer_combo_get_type, iFv)
+GO(gtk_cell_renderer_combo_get_type, LFv)
 GO(gtk_cell_renderer_combo_new, pFv)
 GO(gtk_cell_renderer_editing_canceled, vFp)
 GO(gtk_cell_renderer_get_alignment, vFppp)
@@ -363,12 +363,12 @@ GO(gtk_cell_renderer_get_fixed_size, vFppp)
 GO(gtk_cell_renderer_get_padding, vFppp)
 GO(gtk_cell_renderer_get_sensitive, iFp)
 GO(gtk_cell_renderer_get_size, vFppppppp)
-GO(gtk_cell_renderer_get_type, iFv)
+GO(gtk_cell_renderer_get_type, LFv)
 GO(gtk_cell_renderer_get_visible, iFp)
-GO(gtk_cell_renderer_mode_get_type, iFv)
-GO(gtk_cell_renderer_pixbuf_get_type, iFv)
+GO(gtk_cell_renderer_mode_get_type, LFv)
+GO(gtk_cell_renderer_pixbuf_get_type, LFv)
 GO(gtk_cell_renderer_pixbuf_new, pFv)
-GO(gtk_cell_renderer_progress_get_type, iFv)
+GO(gtk_cell_renderer_progress_get_type, LFv)
 GO(gtk_cell_renderer_progress_new, pFv)
 GO(gtk_cell_renderer_render, vFppppppi)
 GO(gtk_cell_renderer_set_alignment, vFpff)
@@ -376,30 +376,30 @@ GO(gtk_cell_renderer_set_fixed_size, vFpii)
 GO(gtk_cell_renderer_set_padding, vFpii)
 GO(gtk_cell_renderer_set_sensitive, vFpi)
 GO(gtk_cell_renderer_set_visible, vFpi)
-GO(gtk_cell_renderer_spin_get_type, iFv)
-GO(gtk_cell_renderer_spinner_get_type, iFv)
+GO(gtk_cell_renderer_spin_get_type, LFv)
+GO(gtk_cell_renderer_spinner_get_type, LFv)
 GO(gtk_cell_renderer_spinner_new, pFv)
 GO(gtk_cell_renderer_spin_new, pFv)
 GO(gtk_cell_renderer_start_editing, pFppppppi)
-GO(gtk_cell_renderer_state_get_type, iFv)
+GO(gtk_cell_renderer_state_get_type, LFv)
 GO(gtk_cell_renderer_stop_editing, vFpi)
-GO(gtk_cell_renderer_text_get_type, iFv)
+GO(gtk_cell_renderer_text_get_type, LFv)
 GO(gtk_cell_renderer_text_new, pFv)
 GO(gtk_cell_renderer_text_set_fixed_height_from_font, vFpi)
 GO(gtk_cell_renderer_toggle_get_activatable, iFp)
 GO(gtk_cell_renderer_toggle_get_active, iFp)
 GO(gtk_cell_renderer_toggle_get_radio, iFp)
-GO(gtk_cell_renderer_toggle_get_type, iFv)
+GO(gtk_cell_renderer_toggle_get_type, LFv)
 GO(gtk_cell_renderer_toggle_new, pFv)
 GO(gtk_cell_renderer_toggle_set_activatable, vFpi)
 GO(gtk_cell_renderer_toggle_set_active, vFpi)
 GO(gtk_cell_renderer_toggle_set_radio, vFpi)
-GO(gtk_cell_type_get_type, iFv)
+GO(gtk_cell_type_get_type, LFv)
 //GO(gtk_cell_view_get_cell_renderers, 
 //GO(gtk_cell_view_get_displayed_row, 
 //GO(gtk_cell_view_get_model, 
 //GO(gtk_cell_view_get_size_of_row, 
-GO(gtk_cell_view_get_type, iFv)
+GO(gtk_cell_view_get_type, LFv)
 //GO(gtk_cell_view_new, 
 //GO(gtk_cell_view_new_with_markup, 
 //GO(gtk_cell_view_new_with_pixbuf, 
@@ -407,14 +407,14 @@ GO(gtk_cell_view_get_type, iFv)
 //GO(gtk_cell_view_set_background_color, 
 //GO(gtk_cell_view_set_displayed_row, 
 //GO(gtk_cell_view_set_model, 
-GO(gtk_check_button_get_type, iFv)
+GO(gtk_check_button_get_type, LFv)
 GO(gtk_check_button_new, pFv)
 GO(gtk_check_button_new_with_label, pFp)
 GO(gtk_check_button_new_with_mnemonic, pFp)
 GO(gtk_check_menu_item_get_active, iFp)
 GO(gtk_check_menu_item_get_draw_as_radio, iFp)
 GO(gtk_check_menu_item_get_inconsistent, iFp)
-GO(gtk_check_menu_item_get_type, iFv)
+GO(gtk_check_menu_item_get_type, LFv)
 GO(gtk_check_menu_item_new, pFv)
 GO(gtk_check_menu_item_new_with_label, pFp)
 GO(gtk_check_menu_item_new_with_mnemonic, pFp)
@@ -429,7 +429,7 @@ GO(gtk_clipboard_get, pFp)
 GO(gtk_clipboard_get_display, pFp)
 GO(gtk_clipboard_get_for_display, pFpp)
 GO(gtk_clipboard_get_owner, pFp)
-GO(gtk_clipboard_get_type, iFv)
+GO(gtk_clipboard_get_type, LFv)
 GOM(gtk_clipboard_request_contents, vFEpppp)
 //GOM(gtk_clipboard_request_image, vFEppp)
 //GOM(gtk_clipboard_request_rich_text, vFEpppp)
@@ -462,7 +462,7 @@ GO(gtk_clist_column_titles_active, vFp)
 GO(gtk_clist_column_titles_hide, vFp)
 GO(gtk_clist_column_titles_passive, vFp)
 GO(gtk_clist_column_titles_show, vFp)
-GO(gtk_clist_drag_pos_get_type, iFv)
+GO(gtk_clist_drag_pos_get_type, LFv)
 GO(gtk_clist_find_row_from_data, iFpp)
 GO(gtk_clist_freeze, vFp)
 GO(gtk_clist_get_cell_style, pFpii)
@@ -477,7 +477,7 @@ GO(gtk_clist_get_row_style, pFpi)
 GO(gtk_clist_get_selectable, iFpi)
 GO(gtk_clist_get_selection_info, iFpiipp)
 GO(gtk_clist_get_text, iFpiip)
-GO(gtk_clist_get_type, iFv)
+GO(gtk_clist_get_type, LFv)
 GO(gtk_clist_get_vadjustment, pFp)
 GO(gtk_clist_insert, iFpip)
 GO(gtk_clist_moveto, vFpiiff)
@@ -531,7 +531,7 @@ GO(gtk_clist_unselect_row, vFpii)
 GO(gtk_color_button_get_alpha, WFp)
 GO(gtk_color_button_get_color, vFpp)
 GO(gtk_color_button_get_title, pFp)
-GO(gtk_color_button_get_type, iFv)
+GO(gtk_color_button_get_type, LFv)
 GO(gtk_color_button_get_use_alpha, iFp)
 GO(gtk_color_button_new, pFv)
 GO(gtk_color_button_new_with_color, pFp)
@@ -540,7 +540,7 @@ GO(gtk_color_button_set_color, vFpp)
 GO(gtk_color_button_set_title, vFpp)
 GO(gtk_color_button_set_use_alpha, vFpi)
 GO(gtk_color_selection_dialog_get_color_selection, pFp)
-GO(gtk_color_selection_dialog_get_type, iFv)
+GO(gtk_color_selection_dialog_get_type, LFv)
 GO(gtk_color_selection_dialog_new, pFp)
 GO(gtk_color_selection_get_color, vFpp)
 GO(gtk_color_selection_get_current_alpha, WFp)
@@ -549,7 +549,7 @@ GO(gtk_color_selection_get_has_opacity_control, iFp)
 GO(gtk_color_selection_get_has_palette, iFp)
 GO(gtk_color_selection_get_previous_alpha, WFp)
 GO(gtk_color_selection_get_previous_color, vFpp)
-GO(gtk_color_selection_get_type, iFv)
+GO(gtk_color_selection_get_type, LFv)
 GO(gtk_color_selection_is_adjusting, iFp)
 GO(gtk_color_selection_new, pFv)
 GO(gtk_color_selection_palette_from_string, iFppp)
@@ -566,7 +566,7 @@ GO(gtk_color_selection_set_previous_color, vFpp)
 GO(gtk_color_selection_set_update_policy, vFpi)
 GO(gtk_combo_box_append_text, vFpp)
 GO(gtk_combo_box_entry_get_text_column, iFp)
-GO(gtk_combo_box_entry_get_type, iFv)
+GO(gtk_combo_box_entry_get_type, LFv)
 GO(gtk_combo_box_entry_new, pFv)
 GO(gtk_combo_box_entry_new_text, pFv)
 GO(gtk_combo_box_entry_new_with_model, pFpi)
@@ -585,7 +585,7 @@ GO(gtk_combo_box_get_popup_accessible, pFp)
 //GOM(gtk_combo_box_get_row_separator_func, pFEp)
 GO(gtk_combo_box_get_row_span_column, iFp)
 GO(gtk_combo_box_get_title, pFp)
-GO(gtk_combo_box_get_type, iFv)
+GO(gtk_combo_box_get_type, LFv)
 GO(gtk_combo_box_get_wrap_width, iFp)
 GO(gtk_combo_box_insert_text, vFpip)
 GO(gtk_combo_box_new, pFv)
@@ -611,14 +611,14 @@ GO(gtk_combo_box_set_title, vFpp)
 GO(gtk_combo_box_set_wrap_width, vFpi)
 //GO(gtk_combo_box_text_append_text, 
 //GO(gtk_combo_box_text_get_active_text, 
-GO(gtk_combo_box_text_get_type, iFv)
+GO(gtk_combo_box_text_get_type, LFv)
 //GO(gtk_combo_box_text_insert_text, 
 //GO(gtk_combo_box_text_new, 
 //GO(gtk_combo_box_text_new_with_entry, 
 //GO(gtk_combo_box_text_prepend_text, 
 //GO(gtk_combo_box_text_remove, 
 GO(gtk_combo_disable_activate, vFp)
-GO(gtk_combo_get_type, iFv)
+GO(gtk_combo_get_type, LFv)
 GO(gtk_combo_new, pFv)
 GO(gtk_combo_set_case_sensitive, vFpi)
 GO(gtk_combo_set_item_string, vFppp)
@@ -649,7 +649,7 @@ GO(gtk_container_get_focus_child, pFp)
 GO(gtk_container_get_focus_hadjustment, pFp)
 GO(gtk_container_get_focus_vadjustment, pFp)
 GO(gtk_container_get_resize_mode, iFp)
-GO(gtk_container_get_type, iFv)
+GO(gtk_container_get_type, LFv)
 GO(gtk_container_propagate_expose, vFppp)
 GO(gtk_container_remove, vFpp)
 GO(gtk_container_resize_children, vFp)
@@ -661,15 +661,15 @@ GO(gtk_container_set_focus_vadjustment, vFpp)
 GO(gtk_container_set_reallocate_redraws, vFpp)
 GO(gtk_container_set_resize_mode, vFpi)
 GO(gtk_container_unset_focus_chain, vFp)
-GO(gtk_corner_type_get_type, iFv)
+GO(gtk_corner_type_get_type, LFv)
 //GO(gtk_ctree_collapse, 
 //GO(gtk_ctree_collapse_recursive, 
 //GO(gtk_ctree_collapse_to_depth, 
 //GO(gtk_ctree_expand, 
-GO(gtk_ctree_expander_style_get_type, iFv)
+GO(gtk_ctree_expander_style_get_type, LFv)
 //GO(gtk_ctree_expand_recursive, 
 //GO(gtk_ctree_expand_to_depth, 
-GO(gtk_ctree_expansion_type_get_type, iFv)
+GO(gtk_ctree_expansion_type_get_type, LFv)
 //GO(gtk_ctree_export_to_gnode, 
 //GO(gtk_ctree_find, 
 //GO(gtk_ctree_find_all_by_row_data, 
@@ -678,14 +678,14 @@ GO(gtk_ctree_expansion_type_get_type, iFv)
 //GO(gtk_ctree_find_by_row_data_custom, 
 //GO(gtk_ctree_find_node_ptr, 
 //GO(gtk_ctree_get_node_info, 
-GO(gtk_ctree_get_type, iFv)
+GO(gtk_ctree_get_type, LFv)
 //GO(gtk_ctree_insert_gnode, 
 //GO(gtk_ctree_insert_node, 
 //GO(gtk_ctree_is_ancestor, 
 //GO(gtk_ctree_is_hot_spot, 
 //GO(gtk_ctree_is_viewable, 
 //GO(gtk_ctree_last, 
-GO(gtk_ctree_line_style_get_type, iFv)
+GO(gtk_ctree_line_style_get_type, LFv)
 //GO(gtk_ctree_move, 
 //GO(gtk_ctree_new, 
 //GO(gtk_ctree_new_with_titles, 
@@ -697,7 +697,7 @@ GO(gtk_ctree_line_style_get_type, iFv)
 //GO(gtk_ctree_node_get_row_style, 
 //GO(gtk_ctree_node_get_selectable, 
 //GO(gtk_ctree_node_get_text, 
-GO(gtk_ctree_node_get_type, iFv)
+GO(gtk_ctree_node_get_type, LFv)
 //GO(gtk_ctree_node_is_visible, 
 //GO(gtk_ctree_node_moveto, 
 //GO(gtk_ctree_node_nth, 
@@ -712,7 +712,7 @@ GO(gtk_ctree_node_get_type, iFv)
 //GO(gtk_ctree_node_set_selectable, 
 //GO(gtk_ctree_node_set_shift, 
 //GO(gtk_ctree_node_set_text, 
-GO(gtk_ctree_pos_get_type, iFv)
+GO(gtk_ctree_pos_get_type, LFv)
 //GO(gtk_ctree_post_recursive, 
 //GO(gtk_ctree_post_recursive_to_depth, 
 //GO(gtk_ctree_pre_recursive, 
@@ -734,7 +734,7 @@ GO(gtk_ctree_pos_get_type, iFv)
 //GO(gtk_ctree_toggle_expansion_recursive, 
 //GO(gtk_ctree_unselect, 
 //GO(gtk_ctree_unselect_recursive, 
-GO(gtk_curve_get_type, iFv)
+GO(gtk_curve_get_type, LFv)
 GO(gtk_curve_get_vector, vFpip)
 GO(gtk_curve_new, pFv)
 GO(gtk_curve_reset, vFp)
@@ -742,24 +742,24 @@ GO(gtk_curve_set_curve_type, vFpi)
 GO(gtk_curve_set_gamma, vFpf)
 GO(gtk_curve_set_range, vFpffff)
 GO(gtk_curve_set_vector, vFpip)
-GO(gtk_curve_type_get_type, iFv)
-GO(gtk_custom_paper_unix_dialog_get_type, iFv)
-GO(gtk_debug_flag_get_type, iFv)
+GO(gtk_curve_type_get_type, LFv)
+GO(gtk_custom_paper_unix_dialog_get_type, LFv)
+GO(gtk_debug_flag_get_type, LFv)
 GO(gtk_decorated_window_calculate_frame_size, vFp)
 GO(gtk_decorated_window_init, vFp)
 GO(gtk_decorated_window_move_resize_window, vFpiiii)
 GO(gtk_decorated_window_set_title, vFpp)
-GO(gtk_delete_type_get_type, iFv)
-GO(gtk_dest_defaults_get_type, iFv)
+GO(gtk_delete_type_get_type, LFv)
+GO(gtk_dest_defaults_get_type, LFv)
 GO(gtk_dialog_add_action_widget, vFppi)
 GO(gtk_dialog_add_button, pFppi)
 GOM(gtk_dialog_add_buttons, vFEppV)
-GO(gtk_dialog_flags_get_type, iFv)
+GO(gtk_dialog_flags_get_type, LFv)
 GO(gtk_dialog_get_action_area, pFp)
 GO(gtk_dialog_get_content_area, pFp)
 GO(gtk_dialog_get_has_separator, iFp)
 GO(gtk_dialog_get_response_for_widget, iFpp)
-GO(gtk_dialog_get_type, iFv)
+GO(gtk_dialog_get_type, LFv)
 GO(gtk_dialog_get_widget_for_response, pFpi)
 GO(gtk_dialog_new, pFv)
 GO(gtk_dialog_new_with_buttons, pFppipppppppppppp)    //vaarg
@@ -770,7 +770,7 @@ GO(gtk_dialog_set_alternative_button_order_from_array, vFpip)
 GO(gtk_dialog_set_default_response, vFpi)
 GO(gtk_dialog_set_has_separator, vFpi)
 GO(gtk_dialog_set_response_sensitive, vFpii)
-GO(gtk_direction_type_get_type, iFv)
+GO(gtk_direction_type_get_type, LFv)
 GO(gtk_disable_setlocale, vFv)
 GO(gtk_drag_begin, pFppiip)
 GO(gtk_drag_check_threshold, iFpiiii)
@@ -789,7 +789,7 @@ GO(gtk_drag_finish, vFpiiu)
 GO(gtk_drag_get_data, vFpppu)
 GO(gtk_drag_get_source_widget, pFp)
 GO(gtk_drag_highlight, vFp)
-GO(gtk_drag_result_get_type, iFv)
+GO(gtk_drag_result_get_type, LFv)
 GO(gtk_drag_set_default_icon, vFpppii)
 GO(gtk_drag_set_icon_default, vFp)
 GO(gtk_drag_set_icon_name, vFppii)
@@ -820,7 +820,7 @@ GO(gtk_draw_flat_box, vFppiiiiii)
 GO(gtk_draw_focus, vFppiiii)
 GO(gtk_draw_handle, vFppiiiiiii)
 GO(gtk_draw_hline, vFppiiii)
-GO(gtk_drawing_area_get_type, iFv)
+GO(gtk_drawing_area_get_type, LFv)
 GO(gtk_drawing_area_new, pFv)
 GO(gtk_drawing_area_size, vFpii)
 GO(gtk_draw_insertion_cursor, vFppppiii)
@@ -842,7 +842,7 @@ GO(gtk_editable_get_chars, pFpii)
 GO(gtk_editable_get_editable, iFp)
 GO(gtk_editable_get_position, iFp)
 GO(gtk_editable_get_selection_bounds, iFppp)
-GO(gtk_editable_get_type, iFv)
+GO(gtk_editable_get_type, LFv)
 GO(gtk_editable_insert_text, vFppip)
 GO(gtk_editable_paste_clipboard, vFp)
 GO(gtk_editable_select_region, vFpii)
@@ -856,7 +856,7 @@ GO(gtk_entry_append_text, vFpp)
 //GO(gtk_entry_buffer_get_length, 
 //GO(gtk_entry_buffer_get_max_length, 
 //GO(gtk_entry_buffer_get_text, 
-GO(gtk_entry_buffer_get_type, iFv)
+GO(gtk_entry_buffer_get_type, LFv)
 //GO(gtk_entry_buffer_insert_text, 
 //GO(gtk_entry_buffer_new, 
 //GO(gtk_entry_buffer_set_max_length, 
@@ -873,7 +873,7 @@ GO(gtk_entry_buffer_get_type, iFv)
 //GO(gtk_entry_completion_get_popup_set_width, 
 //GO(gtk_entry_completion_get_popup_single_match, 
 //GO(gtk_entry_completion_get_text_column, 
-GO(gtk_entry_completion_get_type, iFv)
+GO(gtk_entry_completion_get_type, LFv)
 //GO(gtk_entry_completion_insert_action_markup, 
 //GO(gtk_entry_completion_insert_action_text, 
 //GO(gtk_entry_completion_insert_prefix, 
@@ -916,10 +916,10 @@ GO(gtk_entry_get_overwrite_mode, iFp)
 GO(gtk_entry_get_text, pFp)
 GO(gtk_entry_get_text_length, WFp)
 //GO(gtk_entry_get_text_window, 
-GO(gtk_entry_get_type, iFv)
+GO(gtk_entry_get_type, LFv)
 //GO(gtk_entry_get_visibility, 
 GO(gtk_entry_get_width_chars, iFp)
-GO(gtk_entry_icon_position_get_type, iFv)
+GO(gtk_entry_icon_position_get_type, LFv)
 //GO(gtk_entry_im_context_filter_keypress, 
 //GO(gtk_entry_layout_index_to_text_index, 
 GO(gtk_entry_new, pFv)
@@ -959,7 +959,7 @@ GO(gtk_entry_set_width_chars, uFp)
 //GO(gtk_entry_unset_invisible_char, 
 //GO(gtk_enumerate_printers, 
 GO(gtk_event_box_get_above_child, iFp)
-GO(gtk_event_box_get_type, iFv)
+GO(gtk_event_box_get_type, LFv)
 GO(gtk_event_box_get_visible_window, iFp)
 GO(gtk_event_box_new, pFv)
 GO(gtk_event_box_set_above_child, vFpi)
@@ -971,7 +971,7 @@ GO(gtk_expander_get_label, pFp)
 GO(gtk_expander_get_label_fill, iFp)
 GO(gtk_expander_get_label_widget, pFp)
 GO(gtk_expander_get_spacing, iFp)
-GO(gtk_expander_get_type, iFv)
+GO(gtk_expander_get_type, LFv)
 GO(gtk_expander_get_use_markup, iFp)
 GO(gtk_expander_get_use_underline, iFp)
 GO(gtk_expander_new, pFp)
@@ -983,15 +983,15 @@ GO(gtk_expander_set_label_widget, vFpp)
 GO(gtk_expander_set_spacing, vFpi)
 GO(gtk_expander_set_use_markup, vFpi)
 GO(gtk_expander_set_use_underline, vFpi)
-GO(gtk_expander_style_get_type, iFv)
+GO(gtk_expander_style_get_type, LFv)
 GO(gtk_false, iFv)
-GO(gtk_file_chooser_action_get_type, iFv)
+GO(gtk_file_chooser_action_get_type, LFv)
 GO(gtk_file_chooser_add_filter, vFpp)
 GO(gtk_file_chooser_add_shortcut_folder, iFppp)
 GO(gtk_file_chooser_add_shortcut_folder_uri, iFppp)
 GO(gtk_file_chooser_button_get_focus_on_click, iFp)
 GO(gtk_file_chooser_button_get_title, pFp)
-GO(gtk_file_chooser_button_get_type, iFv)
+GO(gtk_file_chooser_button_get_type, LFv)
 GO(gtk_file_chooser_button_get_width_chars, iFp)
 GO(gtk_file_chooser_button_new, pFpi)
 GO(gtk_file_chooser_button_new_with_backend, pFpip)
@@ -999,11 +999,11 @@ GO(gtk_file_chooser_button_new_with_dialog, pFp)
 GO(gtk_file_chooser_button_set_focus_on_click, vFpi)
 GO(gtk_file_chooser_button_set_title, vFpp)
 GO(gtk_file_chooser_button_set_width_chars, vFpi)
-GO(gtk_file_chooser_confirmation_get_type, iFv)
-GO(gtk_file_chooser_dialog_get_type, iFv)
+GO(gtk_file_chooser_confirmation_get_type, LFv)
+GO(gtk_file_chooser_dialog_get_type, LFv)
 GO(gtk_file_chooser_dialog_new, pFppipipipipipipip)  // vaargs (so pFppipV) with additionnal buttons, end with a NULL
 GO(gtk_file_chooser_dialog_new_with_backend, pFppippipipipipipip)   // same but pFppippV
-GO(gtk_file_chooser_error_get_type, iFv)
+GO(gtk_file_chooser_error_get_type, LFv)
 GO(gtk_file_chooser_error_quark, pFv)
 GO(gtk_file_chooser_get_action, iFp)
 GO(gtk_file_chooser_get_create_folders, iFp)
@@ -1025,7 +1025,7 @@ GO(gtk_file_chooser_get_preview_widget, pFp)
 GO(gtk_file_chooser_get_preview_widget_active, iFp)
 GO(gtk_file_chooser_get_select_multiple, iFp)
 GO(gtk_file_chooser_get_show_hidden, iFp)
-GO(gtk_file_chooser_get_type, iFv)
+GO(gtk_file_chooser_get_type, LFv)
 GO(gtk_file_chooser_get_uri, pFp)
 GO(gtk_file_chooser_get_uris, pFp)
 GO(gtk_file_chooser_get_use_preview_label, iFp)
@@ -1061,7 +1061,7 @@ GO(gtk_file_chooser_unselect_all, vFp)
 GO(gtk_file_chooser_unselect_file, vFpp)
 GO(gtk_file_chooser_unselect_filename, vFpp)
 GO(gtk_file_chooser_unselect_uri, vFpp)
-GO(gtk_file_chooser_widget_get_type, iFv)
+GO(gtk_file_chooser_widget_get_type, LFv)
 GO(gtk_file_chooser_widget_new, pFi)
 GO(gtk_file_chooser_widget_new_with_backend, pFip)
 //GOM(gtk_file_filter_add_custom, vFEppppp)
@@ -1069,24 +1069,24 @@ GO(gtk_file_chooser_widget_new_with_backend, pFip)
 GO(gtk_file_filter_add_pattern, vFpp)
 GO(gtk_file_filter_add_pixbuf_formats, vFp)
 GO(gtk_file_filter_filter, iFpp)
-GO(gtk_file_filter_flags_get_type, iFv)
+GO(gtk_file_filter_flags_get_type, LFv)
 GO(gtk_file_filter_get_name, pFp)
 GO(gtk_file_filter_get_needed, iFp)
-GO(gtk_file_filter_get_type, iFv)
+GO(gtk_file_filter_get_type, LFv)
 GO(gtk_file_filter_new, pFv)
 GO(gtk_file_filter_set_name, vFpp)
 GO(gtk_file_selection_complete, vFpp)
 GO(gtk_file_selection_get_filename, pFp)
 GO(gtk_file_selection_get_selections, pFp)
 GO(gtk_file_selection_get_select_multiple, iFp)
-GO(gtk_file_selection_get_type, iFv)
+GO(gtk_file_selection_get_type, LFv)
 GO(gtk_file_selection_hide_fileop_buttons, vFp)
 GO(gtk_file_selection_new, pFp)
 GO(gtk_file_selection_set_filename, vFpp)
 GO(gtk_file_selection_set_select_multiple, vFpi)
 GO(gtk_file_selection_show_fileop_buttons, vFp)
 GO(gtk_fixed_get_has_window, iFp)
-GO(gtk_fixed_get_type, iFv)
+GO(gtk_fixed_get_type, LFv)
 GO(gtk_fixed_move, vFppii)
 GO(gtk_fixed_new, pFv)
 GO(gtk_fixed_put, vFppii)
@@ -1095,7 +1095,7 @@ GO(gtk_font_button_get_font_name, pFp)
 GO(gtk_font_button_get_show_size, iFp)
 GO(gtk_font_button_get_show_style, iFp)
 GO(gtk_font_button_get_title, pFp)
-GO(gtk_font_button_get_type, iFv)
+GO(gtk_font_button_get_type, LFv)
 GO(gtk_font_button_get_use_font, iFp)
 GO(gtk_font_button_get_use_size, iFp)
 GO(gtk_font_button_new, pFv)
@@ -1113,7 +1113,7 @@ GO(gtk_font_selection_dialog_get_font_name, pFp)
 GO(gtk_font_selection_dialog_get_font_selection, pFp)
 GO(gtk_font_selection_dialog_get_ok_button, pFp)
 GO(gtk_font_selection_dialog_get_preview_text, pFp)
-GO(gtk_font_selection_dialog_get_type, iFv)
+GO(gtk_font_selection_dialog_get_type, LFv)
 GO(gtk_font_selection_dialog_new, pFp)
 GO(gtk_font_selection_dialog_set_font_name, vFpp)
 GO(gtk_font_selection_dialog_set_preview_text, vFpp)
@@ -1128,7 +1128,7 @@ GO(gtk_font_selection_get_preview_text, pFp)
 GO(gtk_font_selection_get_size, iFp)
 GO(gtk_font_selection_get_size_entry, pFp)
 GO(gtk_font_selection_get_size_list, pFp)
-GO(gtk_font_selection_get_type, iFv)
+GO(gtk_font_selection_get_type, LFv)
 GO(gtk_font_selection_new, pFv)
 GO(gtk_font_selection_set_font_name, iFpp)
 GO(gtk_font_selection_set_preview_text, vFpp)
@@ -1136,13 +1136,13 @@ GO(gtk_frame_get_label, pFp)
 GO(gtk_frame_get_label_align, vFppp)
 GO(gtk_frame_get_label_widget, pFp)
 GO(gtk_frame_get_shadow_type, iFp)
-GO(gtk_frame_get_type, iFv)
+GO(gtk_frame_get_type, LFv)
 GO(gtk_frame_new, pFp)
 GO(gtk_frame_set_label, vFpp)
 GO(gtk_frame_set_label_align, vFpff)
 GO(gtk_frame_set_label_widget, vFpp)
 GO(gtk_frame_set_shadow_type, vFpi)
-GO(gtk_gamma_curve_get_type, iFv)
+GO(gtk_gamma_curve_get_type, LFv)
 GO(gtk_gamma_curve_new, pFv)
 GO(gtk_gc_get, pFippu)
 GO(gtk_gc_release, vFp)
@@ -1159,33 +1159,33 @@ GO(gtk_handle_box_get_child_detached, iFp)
 GO(gtk_handle_box_get_handle_position, iFp)
 GO(gtk_handle_box_get_shadow_type, iFp)
 GO(gtk_handle_box_get_snap_edge, iFp)
-GO(gtk_handle_box_get_type, iFv)
+GO(gtk_handle_box_get_type, LFv)
 GO(gtk_handle_box_new, pFv)
 GO(gtk_handle_box_set_handle_position, vFpi)
 GO(gtk_handle_box_set_shadow_type, vFpi)
 GO(gtk_handle_box_set_snap_edge, vFpi)
-GO(gtk_hbox_get_type, iFv)
+GO(gtk_hbox_get_type, LFv)
 GO(gtk_hbox_new, pFii)
 GO(gtk_hbutton_box_get_layout_default, iFv)
 GO(gtk_hbutton_box_get_spacing_default, iFv)
-GO(gtk_hbutton_box_get_type, iFv)
+GO(gtk_hbutton_box_get_type, LFv)
 GO(gtk_hbutton_box_new, pFv)
 GO(gtk_hbutton_box_set_layout_default, vFi)
 GO(gtk_hbutton_box_set_spacing_default, vFi)
-GO(gtk_hpaned_get_type, iFv)
+GO(gtk_hpaned_get_type, LFv)
 //GO(gtk_hpaned_new, 
-GO(gtk_hruler_get_type, iFv)
+GO(gtk_hruler_get_type, LFv)
 //GO(gtk_hruler_new, 
-GO(gtk_hscale_get_type, iFv)
+GO(gtk_hscale_get_type, LFv)
 GO(gtk_hscale_new, pFp)
 GO(gtk_hscale_new_with_range, pFddd)
-GO(gtk_hscrollbar_get_type, iFv)
+GO(gtk_hscrollbar_get_type, LFv)
 GO(gtk_hscrollbar_new, pFp)
-GO(gtk_hseparator_get_type, iFv)
+GO(gtk_hseparator_get_type, LFv)
 GO(gtk_hseparator_new, pFv)
 //GO(gtk_hsv_get_color, 
 //GO(gtk_hsv_get_metrics, 
-GO(gtk_hsv_get_type, iFv)
+GO(gtk_hsv_get_type, LFv)
 //GO(gtk_hsv_is_adjusting, 
 //GO(gtk_hsv_new, 
 //GO(gtk_hsv_set_color, 
@@ -1193,7 +1193,7 @@ GO(gtk_hsv_get_type, iFv)
 //GO(gtk_hsv_to_rgb, 
 GO(gtk_icon_factory_add, vFppp)
 GO(gtk_icon_factory_add_default, vFp)
-GO(gtk_icon_factory_get_type, iFv)
+GO(gtk_icon_factory_get_type, LFv)
 GO(gtk_icon_factory_lookup, pFpp)
 GO(gtk_icon_factory_lookup_default, pFp)
 GO(gtk_icon_factory_new, pFv)
@@ -1206,15 +1206,15 @@ GO(gtk_icon_info_get_builtin_pixbuf, pFp)
 GO(gtk_icon_info_get_display_name, pFp)
 GO(gtk_icon_info_get_embedded_rect, iFpp)
 GO(gtk_icon_info_get_filename, pFp)
-GO(gtk_icon_info_get_type, iFv)
+GO(gtk_icon_info_get_type, LFv)
 GO(gtk_icon_info_load_icon, pFpp)
 GO(gtk_icon_info_new_for_pixbuf, pFpp)
 GO(gtk_icon_info_set_raw_coordinates, vFpp)
-GO(gtk_icon_lookup_flags_get_type, iFv)
+GO(gtk_icon_lookup_flags_get_type, LFv)
 GO(gtk_icon_set_add_source, vFpp)
 GO(gtk_icon_set_copy, pFp)
 GO(gtk_icon_set_get_sizes, vFppp)
-GO(gtk_icon_set_get_type, iFv)
+GO(gtk_icon_set_get_type, LFv)
 GO(gtk_icon_set_new, pFv)
 GO(gtk_icon_set_new_from_pixbuf, pFp)
 GO(gtk_icon_set_ref, pFp)
@@ -1222,7 +1222,7 @@ GO(gtk_icon_set_render_icon, pFppipipp)
 GO(gtk_icon_set_unref, vFp)
 GO(gtk_icon_size_from_name, iFp)
 GO(gtk_icon_size_get_name, pFi)
-GO(gtk_icon_size_get_type, iFv)
+GO(gtk_icon_size_get_type, LFv)
 GO(gtk_icon_size_lookup, iFipp)
 GO(gtk_icon_size_lookup_for_settings, iFpipp)
 GO(gtk_icon_size_register, iFpii)
@@ -1238,7 +1238,7 @@ GO(gtk_icon_source_get_size, iFp)
 GO(gtk_icon_source_get_size_wildcarded, iFp)
 GO(gtk_icon_source_get_state, iFp)
 GO(gtk_icon_source_get_state_wildcarded, iFp)
-GO(gtk_icon_source_get_type, iFv)
+GO(gtk_icon_source_get_type, LFv)
 GO(gtk_icon_source_new, pFv)
 GO(gtk_icon_source_set_direction, vFpi)
 GO(gtk_icon_source_set_direction_wildcarded, vFpi)
@@ -1252,14 +1252,14 @@ GO(gtk_icon_source_set_state_wildcarded, vFpi)
 GO(gtk_icon_theme_add_builtin_icon, vFpip)
 GO(gtk_icon_theme_append_search_path, vFpp)
 GO(gtk_icon_theme_choose_icon, pFppiu)
-GO(gtk_icon_theme_error_get_type, iFv)
+GO(gtk_icon_theme_error_get_type, LFv)
 //GO(gtk_icon_theme_error_quark, 
 GO(gtk_icon_theme_get_default, pFv)
 GO(gtk_icon_theme_get_example_icon_name, pFp)
 GO(gtk_icon_theme_get_for_screen, pFp)
 GO(gtk_icon_theme_get_icon_sizes, pFpp)
 GO(gtk_icon_theme_get_search_path, vFppp)
-GO(gtk_icon_theme_get_type, iFv)
+GO(gtk_icon_theme_get_type, LFv)
 GO(gtk_icon_theme_has_icon, iFpp)
 GO(gtk_icon_theme_list_contexts, pFp)
 GO(gtk_icon_theme_list_icons, pFpp)
@@ -1274,7 +1274,7 @@ GO(gtk_icon_theme_set_screen, vFpp)
 GO(gtk_icon_theme_set_search_path, vFppi)
 GO(gtk_icon_view_convert_widget_to_bin_window_coords, vFpiipp)
 GO(gtk_icon_view_create_drag_icon, pFpp)
-GO(gtk_icon_view_drop_position_get_type, iFv)
+GO(gtk_icon_view_drop_position_get_type, LFv)
 GO(gtk_icon_view_enable_model_drag_dest, vFppii)
 GO(gtk_icon_view_enable_model_drag_source, vFpipii)
 GO(gtk_icon_view_get_columns, iFp)
@@ -1302,7 +1302,7 @@ GO(gtk_icon_view_get_spacing, iFp)
 GO(gtk_icon_view_get_text_column, iFp)
 GO(gtk_icon_view_get_tooltip_column, iFp)
 GO(gtk_icon_view_get_tooltip_context, iFpppippp)
-GO(gtk_icon_view_get_type, iFv)
+GO(gtk_icon_view_get_type, LFv)
 GO(gtk_icon_view_get_visible_range, iFppp)
 GO(gtk_icon_view_item_activated, vFpp)
 GO(gtk_icon_view_new, pFv)
@@ -1336,7 +1336,7 @@ GO(gtk_icon_view_unselect_all, vFp)
 GO(gtk_icon_view_unselect_path, vFpp)
 GO(gtk_icon_view_unset_model_drag_dest, vFp)
 GO(gtk_icon_view_unset_model_drag_source, vFp)
-GO(gtk_identifier_get_type, iFv)
+GO(gtk_identifier_get_type, LFv)
 //GOM(gtk_idle_add, uFEBp)
 //GOM(gtk_idle_add_full, uFEiBppB)
 //GOM(gtk_idle_add_priority, uFEiBp)
@@ -1354,10 +1354,10 @@ GO(gtk_image_get_pixel_size, iFp)
 GO(gtk_image_get_pixmap, vFppp)
 GO(gtk_image_get_stock, vFppp)
 GO(gtk_image_get_storage_type, iFp)
-GO(gtk_image_get_type, iFv)
+GO(gtk_image_get_type, LFv)
 GO(gtk_image_menu_item_get_always_show_image, iFp)
 GO(gtk_image_menu_item_get_image, pFp)
-GO(gtk_image_menu_item_get_type, iFv)
+GO(gtk_image_menu_item_get_type, LFv)
 GO(gtk_image_menu_item_get_use_stock, iFp)
 GO(gtk_image_menu_item_new, pFv)
 GO(gtk_image_menu_item_new_from_stock, pFpp)
@@ -1388,36 +1388,36 @@ GO(gtk_image_set_from_pixbuf, vFpp)
 GO(gtk_image_set_from_pixmap, vFppp)
 GO(gtk_image_set_from_stock, vFppi)
 GO(gtk_image_set_pixel_size, vFpi)
-GO(gtk_image_type_get_type, iFv)
+GO(gtk_image_type_get_type, LFv)
 GO(gtk_im_context_delete_surrounding, iFpii)
 GO(gtk_im_context_filter_keypress, iFpp)
 GO(gtk_im_context_focus_in, vFp)
 GO(gtk_im_context_focus_out, vFp)
 GO(gtk_im_context_get_preedit_string, vFpppp)
 GO(gtk_im_context_get_surrounding, iFppp)
-GO(gtk_im_context_get_type, iFv)
+GO(gtk_im_context_get_type, LFv)
 GO(gtk_im_context_reset, vFp)
 GO(gtk_im_context_set_client_window, vFpp)
 GO(gtk_im_context_set_cursor_location, vFpp)
 GO(gtk_im_context_set_surrounding, vFppii)
 GO(gtk_im_context_set_use_preedit, vFpi)
 GO(gtk_im_context_simple_add_table, vFppii)
-GO(gtk_im_context_simple_get_type, iFv)
+GO(gtk_im_context_simple_get_type, LFv)
 GO(gtk_im_context_simple_new, pFv)
 GO(gtk_im_multicontext_append_menuitems, vFpp)
 GO(gtk_im_multicontext_get_context_id, pFp)
-GO(gtk_im_multicontext_get_type, iFv)
+GO(gtk_im_multicontext_get_type, LFv)
 GO(gtk_im_multicontext_new, pFv)
 GO(gtk_im_multicontext_set_context_id, vFpp)
-GO(gtk_im_preedit_style_get_type, iFv)
-GO(gtk_im_status_style_get_type, iFv)
+GO(gtk_im_preedit_style_get_type, LFv)
+GO(gtk_im_status_style_get_type, LFv)
 //GO(gtk_info_bar_add_action_widget, 
 //GO(gtk_info_bar_add_button, 
 //GO(gtk_info_bar_add_buttons, 
 //GO(gtk_info_bar_get_action_area, 
 //GO(gtk_info_bar_get_content_area, 
 //GO(gtk_info_bar_get_message_type, 
-GO(gtk_info_bar_get_type, iFv)
+GO(gtk_info_bar_get_type, LFv)
 //GO(gtk_info_bar_new, 
 //GO(gtk_info_bar_new_with_buttons, 
 //GO(gtk_info_bar_response, 
@@ -1429,11 +1429,11 @@ GOM(gtk_init, vFEpp)
 GOM(gtk_init_check, iFEpp)
 GOM(gtk_init_with_args, iFEpppppp)
 GOM(gtk_input_add_full, uFEiipppp)
-GO(gtk_input_dialog_get_type, iFv)
+GO(gtk_input_dialog_get_type, LFv)
 GO(gtk_input_dialog_new, pFv)
 GO(gtk_input_remove, vFu)
 //GO(gtk_invisible_get_screen, 
-GO(gtk_invisible_get_type, iFv)
+GO(gtk_invisible_get_type, LFv)
 //GO(gtk_invisible_new, 
 //GO(gtk_invisible_new_for_screen, 
 //GO(gtk_invisible_set_screen, 
@@ -1452,7 +1452,7 @@ GO(gtk_invisible_get_type, iFv)
 //GO(gtk_item_factory_from_widget, 
 //GO(gtk_item_factory_get_item, 
 //GO(gtk_item_factory_get_item_by_action, 
-GO(gtk_item_factory_get_type, iFv)
+GO(gtk_item_factory_get_type, LFv)
 //GO(gtk_item_factory_get_widget, 
 //GO(gtk_item_factory_get_widget_by_action, 
 //GO(gtk_item_factory_new, 
@@ -1462,10 +1462,10 @@ GO(gtk_item_factory_get_type, iFv)
 //GO(gtk_item_factory_popup_data_from_widget, 
 //GO(gtk_item_factory_popup_with_data, 
 //GO(gtk_item_factory_set_translate_func, 
-GO(gtk_item_get_type, iFv)
+GO(gtk_item_get_type, LFv)
 //GO(gtk_item_select, 
 //GO(gtk_item_toggle, 
-GO(gtk_justification_get_type, iFv)
+GO(gtk_justification_get_type, LFv)
 //GOM(gtk_key_snooper_install, uFEBp)
 GO(gtk_key_snooper_remove, vFu)
 GO(gtk_label_get, vFpp)
@@ -1487,7 +1487,7 @@ GO(gtk_label_get_selection_bounds, iFppp)
 GO(gtk_label_get_single_line_mode, iFp)
 GO(gtk_label_get_text, pFp)
 GO(gtk_label_get_track_visited_links, iFp)
-GO(gtk_label_get_type, iFv)
+GO(gtk_label_get_type, LFv)
 GO(gtk_label_get_use_markup, iFp)
 GO(gtk_label_get_use_underline, iFp)
 GO(gtk_label_get_width_chars, iFp)
@@ -1519,7 +1519,7 @@ GO(gtk_label_set_width_chars, vFpi)
 //GO(gtk_layout_get_bin_window, 
 //GO(gtk_layout_get_hadjustment, 
 //GO(gtk_layout_get_size, 
-GO(gtk_layout_get_type, iFv)
+GO(gtk_layout_get_type, LFv)
 //GO(gtk_layout_get_vadjustment, 
 //GO(gtk_layout_move, 
 GO(gtk_layout_new, pFpp)
@@ -1528,7 +1528,7 @@ GO(gtk_layout_new, pFpp)
 //GO(gtk_layout_set_size, 
 //GO(gtk_layout_set_vadjustment, 
 //GO(gtk_layout_thaw, 
-GO(gtk_link_button_get_type, iFv)
+GO(gtk_link_button_get_type, LFv)
 //GO(gtk_link_button_get_uri, 
 //GO(gtk_link_button_get_visited, 
 //GO(gtk_link_button_new, 
@@ -1542,10 +1542,10 @@ GO(gtk_list_clear_items, vFpii)
 GO(gtk_list_end_drag_selection, vFp)
 GO(gtk_list_end_selection, vFp)
 GO(gtk_list_extend_selection, vFpifi)
-GO(gtk_list_get_type, iFv)
+GO(gtk_list_get_type, LFv)
 GO(gtk_list_insert_items, vFppi)
 GO(gtk_list_item_deselect, vFp)
-GO(gtk_list_item_get_type, iFv)
+GO(gtk_list_item_get_type, LFv)
 GO(gtk_list_item_new, pFv)
 GO(gtk_list_item_new_with_label, pFp)
 GO(gtk_list_item_select, vFp)
@@ -1562,7 +1562,7 @@ GO(gtk_list_set_selection_mode, vFpi)
 GO(gtk_list_start_selection, vFp)
 GO(gtk_list_store_append, vFpp)
 GO(gtk_list_store_clear, vFp)
-GO(gtk_list_store_get_type, iFv)
+GO(gtk_list_store_get_type, LFv)
 GO(gtk_list_store_insert, vFppi)
 GO(gtk_list_store_insert_after, vFppp)
 GO(gtk_list_store_insert_before, vFppp)
@@ -1621,17 +1621,17 @@ GO(gtk_main_quit, vFv)
 //GO(gtk_marshal_VOID__UINT_POINTER_UINT_ENUM_ENUM_POINTER, 
 //GO(gtk_marshal_VOID__UINT_POINTER_UINT_UINT_ENUM, 
 //GO(gtk_marshal_VOID__UINT_STRING, 
-GO(gtk_match_type_get_type, iFv)
+GO(gtk_match_type_get_type, LFv)
 GO(gtk_menu_attach, vFppuuuu)
 GOM(gtk_menu_attach_to_widget, vFEppp)
 GO(gtk_menu_bar_get_child_pack_direction, iFp)
 GO(gtk_menu_bar_get_pack_direction, iFp)
-GO(gtk_menu_bar_get_type, iFv)
+GO(gtk_menu_bar_get_type, LFv)
 GO(gtk_menu_bar_new, pFv)
 GO(gtk_menu_bar_set_child_pack_direction, vFpi)
 GO(gtk_menu_bar_set_pack_direction, vFpi)
 GO(gtk_menu_detach, vFp)
-GO(gtk_menu_direction_type_get_type, iFv)
+GO(gtk_menu_direction_type_get_type, LFv)
 GO(gtk_menu_get_accel_group, pFp)
 GO(gtk_menu_get_accel_path, pFp)
 GO(gtk_menu_get_active, pFp)
@@ -1641,14 +1641,14 @@ GO(gtk_menu_get_monitor, iFp)
 GO(gtk_menu_get_reserve_toggle_size, iFp)
 GO(gtk_menu_get_tearoff_state, iFp)
 GO(gtk_menu_get_title, pFp)
-GO(gtk_menu_get_type, iFv)
+GO(gtk_menu_get_type, LFv)
 GO(gtk_menu_item_activate, vFp)
 GO(gtk_menu_item_deselect, vFp)
 GO(gtk_menu_item_get_accel_path, pFp)
 GO(gtk_menu_item_get_label, pFp)
 GO(gtk_menu_item_get_right_justified, iFp)
 GO(gtk_menu_item_get_submenu, pFp)
-GO(gtk_menu_item_get_type, iFv)
+GO(gtk_menu_item_get_type, LFv)
 GO(gtk_menu_item_get_use_underline, vFpi)
 GO(gtk_menu_item_new, pFv)
 GO(gtk_menu_item_new_with_label, pFp)
@@ -1681,14 +1681,14 @@ GO(gtk_menu_shell_append, vFpp)
 //GO(gtk_menu_shell_deactivate, 
 //GO(gtk_menu_shell_deselect, 
 //GO(gtk_menu_shell_get_take_focus, 
-GO(gtk_menu_shell_get_type, iFv)
+GO(gtk_menu_shell_get_type, LFv)
 GO(gtk_menu_shell_insert, vFppi)
 GO(gtk_menu_shell_prepend, vFpp)
 GO(gtk_menu_shell_select_first, vFpi)
 GO(gtk_menu_shell_select_item, vFpp)
 //GO(gtk_menu_shell_set_take_focus, 
 GO(gtk_menu_tool_button_get_menu, pFp)
-GO(gtk_menu_tool_button_get_type, iFv)
+GO(gtk_menu_tool_button_get_type, LFv)
 GO(gtk_menu_tool_button_new, pFpp)
 GO(gtk_menu_tool_button_new_from_stock, pFp)
 GO(gtk_menu_tool_button_set_arrow_tooltip, vFpppp)
@@ -1699,26 +1699,26 @@ GOM(gtk_message_dialog_format_secondary_markup, vFEppV)
 GOM(gtk_message_dialog_format_secondary_text, vFEppV)
 GO(gtk_message_dialog_get_image, pFp)
 GO(gtk_message_dialog_get_message_area, pFp)
-GO(gtk_message_dialog_get_type, iFv)
+GO(gtk_message_dialog_get_type, LFv)
 GO(gtk_message_dialog_new, pFpuiippppppppppp)   // vaarg :(
 GO(gtk_message_dialog_new_with_markup, pFpuiippppppppppp)   // vaarg
 GO(gtk_message_dialog_set_image, vFpp)
 GO(gtk_message_dialog_set_markup, vFpp)
-GO(gtk_message_type_get_type, iFv)
-GO(gtk_metric_type_get_type, iFv)
+GO(gtk_message_type_get_type, LFv)
+GO(gtk_metric_type_get_type, LFv)
 GO(gtk_misc_get_alignment, vFppp)
 GO(gtk_misc_get_padding, vFppp)
-GO(gtk_misc_get_type, iFv)
+GO(gtk_misc_get_type, LFv)
 GO(gtk_misc_set_alignment, vFpff)
 GO(gtk_misc_set_padding, vFpii)
 GO(gtk_mount_operation_get_parent, pFp)
 GO(gtk_mount_operation_get_screen, pFp)
-GO(gtk_mount_operation_get_type, iFv)
+GO(gtk_mount_operation_get_type, LFv)
 GO(gtk_mount_operation_is_showing, iFp)
 GO(gtk_mount_operation_new, pFp)
 GO(gtk_mount_operation_set_parent, vFpp)
 GO(gtk_mount_operation_set_screen, vFpp)
-GO(gtk_movement_step_get_type, iFv)
+GO(gtk_movement_step_get_type, LFv)
 GO(gtk_notebook_append_page, iFppp)
 GO(gtk_notebook_append_page_menu, iFpppp)
 GO(gtk_notebook_get_action_widget, pFpi)
@@ -1740,7 +1740,7 @@ GO(gtk_notebook_get_tab_label_text, pFpp)
 GO(gtk_notebook_get_tab_pos, iFp)
 GO(gtk_notebook_get_tab_reorderable, iFpp)
 GO(gtk_notebook_get_tab_vborder, WFp)
-GO(gtk_notebook_get_type, iFv)
+GO(gtk_notebook_get_type, LFv)
 GO(gtk_notebook_insert_page, iFpppi)
 GO(gtk_notebook_insert_page_menu, iFppppi)
 GO(gtk_notebook_new, pFv)
@@ -1775,15 +1775,15 @@ GO(gtk_notebook_set_tab_pos, vFpi)
 GO(gtk_notebook_set_tab_reorderable, vFppi)
 GO(gtk_notebook_set_tab_vborder, vFpu)
 //GOM(gtk_notebook_set_window_creation_hook, pFEppp)
-GO(gtk_notebook_tab_get_type, iFv)
-GO(gtk_number_up_layout_get_type, iFv)
+GO(gtk_notebook_tab_get_type, LFv)
+GO(gtk_number_up_layout_get_type, LFv)
 GO(gtk_object_add_arg_type, vFpiuu)
 GO(gtk_object_destroy, vFp)
-GO(gtk_object_flags_get_type, iFv)
+GO(gtk_object_flags_get_type, LFv)
 GO(gtk_object_get, vFppppppppppp)   // vaarg
 GO(gtk_object_get_data, pFpp)
 GO(gtk_object_get_data_by_id, pFpp)
-GO(gtk_object_get_type, iFv)
+GO(gtk_object_get_type, LFv)
 GO(gtk_object_get_user_data, pFp)
 GO(gtk_object_new, pFppppppppppp)   //vaarg
 GO(gtk_object_ref, pFp)
@@ -1803,26 +1803,26 @@ GO(gtk_object_unref, vFp)
 //GOM(gtk_object_weakunref, vFEppp)
 GO(gtk_offscreen_window_get_pixbuf, pFp)
 GO(gtk_offscreen_window_get_pixmap, pFp)
-GO(gtk_offscreen_window_get_type, iFv)
+GO(gtk_offscreen_window_get_type, LFv)
 GO(gtk_offscreen_window_new, pFv)
 GO(gtk_old_editable_changed, vFp)
 GO(gtk_old_editable_claim_selection, vFpiu)
-GO(gtk_old_editable_get_type, iFv)
+GO(gtk_old_editable_get_type, LFv)
 GO(gtk_option_menu_get_history, iFp)
 GO(gtk_option_menu_get_menu, pFp)
-GO(gtk_option_menu_get_type, iFv)
+GO(gtk_option_menu_get_type, LFv)
 GO(gtk_option_menu_new, pFv)
 GO(gtk_option_menu_remove_menu, vFp)
 GO(gtk_option_menu_set_history, vFpu)
 GO(gtk_option_menu_set_menu, vFpp)
 GO(gtk_orientable_get_orientation, iFp)
-GO(gtk_orientable_get_type, iFv)
+GO(gtk_orientable_get_type, LFv)
 GO(gtk_orientable_set_orientation, vFpi)
-GO(gtk_orientation_get_type, iFv)
-GO(gtk_pack_direction_get_type, iFv)
-GO(gtk_pack_type_get_type, iFv)
-GO(gtk_page_orientation_get_type, iFv)
-GO(gtk_page_set_get_type, iFv)
+GO(gtk_orientation_get_type, LFv)
+GO(gtk_pack_direction_get_type, LFv)
+GO(gtk_pack_type_get_type, LFv)
+GO(gtk_page_orientation_get_type, LFv)
+GO(gtk_page_set_get_type, LFv)
 //GO(gtk_page_setup_copy, 
 //GO(gtk_page_setup_get_bottom_margin, 
 //GO(gtk_page_setup_get_left_margin, 
@@ -1834,7 +1834,7 @@ GO(gtk_page_set_get_type, iFv)
 //GO(gtk_page_setup_get_paper_width, 
 //GO(gtk_page_setup_get_right_margin, 
 //GO(gtk_page_setup_get_top_margin, 
-GO(gtk_page_setup_get_type, iFv)
+GO(gtk_page_setup_get_type, LFv)
 //GO(gtk_page_setup_load_file, 
 //GO(gtk_page_setup_load_key_file, 
 //GO(gtk_page_setup_new, 
@@ -1851,7 +1851,7 @@ GO(gtk_page_setup_get_type, iFv)
 //GO(gtk_page_setup_to_key_file, 
 //GO(gtk_page_setup_unix_dialog_get_page_setup, 
 //GO(gtk_page_setup_unix_dialog_get_print_settings, 
-GO(gtk_page_setup_unix_dialog_get_type, iFv)
+GO(gtk_page_setup_unix_dialog_get_type, LFv)
 //GO(gtk_page_setup_unix_dialog_new, 
 //GO(gtk_page_setup_unix_dialog_set_page_setup, 
 //GO(gtk_page_setup_unix_dialog_set_print_settings, 
@@ -1884,7 +1884,7 @@ GO(gtk_paned_get_child1, pFp)
 GO(gtk_paned_get_child2, pFp)
 GO(gtk_paned_get_handle_window, pFp)
 GO(gtk_paned_get_position, pFp)
-GO(gtk_paned_get_type, iFv)
+GO(gtk_paned_get_type, LFv)
 GO(gtk_paned_pack1, vFppii)
 GO(gtk_paned_pack2, vFppii)
 GO(gtk_paned_set_position, vFpi)
@@ -1900,7 +1900,7 @@ GO(gtk_paper_size_get_height, dFpi)
 GO(gtk_paper_size_get_name, pFp)
 GO(gtk_paper_size_get_paper_sizes, pFi)
 GO(gtk_paper_size_get_ppd_name, pFp)
-GO(gtk_paper_size_get_type, iFv)
+GO(gtk_paper_size_get_type, LFv)
 GO(gtk_paper_size_get_width, dFpi)
 GO(gtk_paper_size_is_custom, iFp)
 GO(gtk_paper_size_is_equal, iFpp)
@@ -1911,11 +1911,11 @@ GO(gtk_paper_size_new_from_ppd, pFppdd)
 GO(gtk_paper_size_set_size, vFpddi)
 GO(gtk_paper_size_to_key_file, vFppp)
 GO(gtk_parse_args, iFpp)
-GO(gtk_path_bar_get_type, iFv)
-GO(gtk_path_priority_type_get_type, iFv)
-GO(gtk_path_type_get_type, iFv)
+GO(gtk_path_bar_get_type, LFv)
+GO(gtk_path_priority_type_get_type, LFv)
+GO(gtk_path_type_get_type, LFv)
 GO(gtk_pixmap_get, vFppp)
-GO(gtk_pixmap_get_type, iFv)
+GO(gtk_pixmap_get_type, LFv)
 GO(gtk_pixmap_new, pFpp)
 GO(gtk_pixmap_set, vFppp)
 GO(gtk_pixmap_set_build_insensitive, vFpi)
@@ -1924,15 +1924,15 @@ GO(gtk_plug_construct_for_display, vFppp)
 GO(gtk_plug_get_embedded, iFp)
 GO(gtk_plug_get_id, pFp)
 GO(gtk_plug_get_socket_window, pFp)
-GO(gtk_plug_get_type, iFv)
+GO(gtk_plug_get_type, LFv)
 GO(gtk_plug_new, pFp)
 GO(gtk_plug_new_for_display, pFpp)
-GO(gtk_policy_type_get_type, iFv)
-GO(gtk_position_type_get_type, iFv)
+GO(gtk_policy_type_get_type, LFv)
+GO(gtk_position_type_get_type, LFv)
 //GO(gtk_preview_draw_row, 
 //GO(gtk_preview_get_cmap, 
 //GO(gtk_preview_get_info, 
-GO(gtk_preview_get_type, iFv)
+GO(gtk_preview_get_type, LFv)
 //GO(gtk_preview_get_visual, 
 //GO(gtk_preview_new, 
 //GO(gtk_preview_put, 
@@ -1944,21 +1944,21 @@ GO(gtk_preview_get_type, iFv)
 //GO(gtk_preview_set_install_cmap, 
 //GO(gtk_preview_set_reserved, 
 //GO(gtk_preview_size, 
-GO(gtk_preview_type_get_type, iFv)
+GO(gtk_preview_type_get_type, LFv)
 //GO(gtk_preview_uninit, 
 //GO(gtk_print_backend_add_printer, 
 //GO(gtk_print_backend_destroy, 
 //GO(gtk_print_backend_error_quark, 
 //GO(gtk_print_backend_find_printer, 
 //GO(gtk_print_backend_get_printer_list, 
-GO(gtk_print_backend_get_type, iFv)
+GO(gtk_print_backend_get_type, LFv)
 //GO(gtk_print_backend_load_modules, 
 //GO(gtk_print_backend_printer_list_is_done, 
 //GO(gtk_print_backend_print_stream, 
 //GO(gtk_print_backend_remove_printer, 
 //GO(gtk_print_backend_set_list_done, 
 //GO(gtk_print_backend_set_password, 
-GO(gtk_print_capabilities_get_type, iFv)
+GO(gtk_print_capabilities_get_type, LFv)
 //GO(gtk_print_context_create_pango_context, 
 //GO(gtk_print_context_create_pango_layout, 
 //GO(gtk_print_context_get_cairo_context, 
@@ -1968,10 +1968,10 @@ GO(gtk_print_capabilities_get_type, iFv)
 //GO(gtk_print_context_get_height, 
 //GO(gtk_print_context_get_page_setup, 
 //GO(gtk_print_context_get_pango_fontmap, 
-GO(gtk_print_context_get_type, iFv)
+GO(gtk_print_context_get_type, LFv)
 //GO(gtk_print_context_get_width, 
 //GO(gtk_print_context_set_cairo_context, 
-GO(gtk_print_duplex_get_type, iFv)
+GO(gtk_print_duplex_get_type, LFv)
 //GO(gtk_printer_accepts_pdf, 
 //GO(gtk_printer_accepts_ps, 
 //GO(gtk_printer_compare, 
@@ -1985,7 +1985,7 @@ GO(gtk_print_duplex_get_type, iFv)
 //GO(gtk_printer_get_location, 
 //GO(gtk_printer_get_name, 
 //GO(gtk_printer_get_state_message, 
-GO(gtk_printer_get_type, iFv)
+GO(gtk_printer_get_type, LFv)
 //GO(gtk_printer_has_details, 
 //GO(gtk_printer_is_accepting_jobs, 
 //GO(gtk_printer_is_active, 
@@ -1999,7 +1999,7 @@ GO(gtk_printer_get_type, iFv)
 //GO(gtk_printer_option_choices_from_array, 
 //GO(gtk_printer_option_clear_has_conflict, 
 //GO(gtk_printer_option_get_activates_default, 
-GO(gtk_printer_option_get_type, iFv)
+GO(gtk_printer_option_get_type, LFv)
 //GO(gtk_printer_option_has_choice, 
 //GO(gtk_printer_option_new, 
 //GO(gtk_printer_option_set, 
@@ -2010,19 +2010,19 @@ GO(gtk_printer_option_get_type, iFv)
 //GO(gtk_printer_option_set_foreach, 
 //GO(gtk_printer_option_set_foreach_in_group, 
 //GO(gtk_printer_option_set_get_groups, 
-GO(gtk_printer_option_set_get_type, iFv)
+GO(gtk_printer_option_set_get_type, LFv)
 //GO(gtk_printer_option_set_has_conflict, 
 //GO(gtk_printer_option_set_lookup, 
 //GO(gtk_printer_option_set_new, 
 //GO(gtk_printer_option_set_remove, 
 //GO(gtk_printer_option_widget_get_external_label, 
-GO(gtk_printer_option_widget_get_type, iFv)
+GO(gtk_printer_option_widget_get_type, LFv)
 //GO(gtk_printer_option_widget_get_value, 
 //GO(gtk_printer_option_widget_has_external_label, 
 //GO(gtk_printer_option_widget_new, 
 //GO(gtk_printer_option_widget_set_source, 
 //GO(gtk_printer_request_details, 
-GO(gtk_print_error_get_type, iFv)
+GO(gtk_print_error_get_type, LFv)
 //GO(gtk_print_error_quark, 
 //GO(gtk_printer_set_accepts_pdf, 
 //GO(gtk_printer_set_accepts_ps, 
@@ -2043,13 +2043,13 @@ GO(gtk_print_error_get_type, iFv)
 //GO(gtk_print_job_get_surface, 
 //GO(gtk_print_job_get_title, 
 //GO(gtk_print_job_get_track_print_status, 
-GO(gtk_print_job_get_type, iFv)
+GO(gtk_print_job_get_type, LFv)
 //GO(gtk_print_job_new, 
 //GO(gtk_print_job_send, 
 //GO(gtk_print_job_set_source_file, 
 //GO(gtk_print_job_set_status, 
 //GO(gtk_print_job_set_track_print_status, 
-GO(gtk_print_operation_action_get_type, iFv)
+GO(gtk_print_operation_action_get_type, LFv)
 //GO(gtk_print_operation_cancel, 
 //GO(gtk_print_operation_draw_page_finish, 
 //GO(gtk_print_operation_get_default_page_setup, 
@@ -2061,14 +2061,14 @@ GO(gtk_print_operation_action_get_type, iFv)
 //GO(gtk_print_operation_get_status, 
 //GO(gtk_print_operation_get_status_string, 
 //GO(gtk_print_operation_get_support_selection, 
-GO(gtk_print_operation_get_type, iFv)
+GO(gtk_print_operation_get_type, LFv)
 //GO(gtk_print_operation_is_finished, 
 //GO(gtk_print_operation_new, 
 //GO(gtk_print_operation_preview_end_preview, 
-GO(gtk_print_operation_preview_get_type, iFv)
+GO(gtk_print_operation_preview_get_type, LFv)
 //GO(gtk_print_operation_preview_is_selected, 
 //GO(gtk_print_operation_preview_render_page, 
-GO(gtk_print_operation_result_get_type, iFv)
+GO(gtk_print_operation_result_get_type, LFv)
 //GO(gtk_print_operation_run, 
 //GO(gtk_print_operation_set_allow_async, 
 //GO(gtk_print_operation_set_current_page, 
@@ -2086,8 +2086,8 @@ GO(gtk_print_operation_result_get_type, iFv)
 //GO(gtk_print_operation_set_track_print_status, 
 //GO(gtk_print_operation_set_unit, 
 //GO(gtk_print_operation_set_use_full_page, 
-GO(gtk_print_pages_get_type, iFv)
-GO(gtk_print_quality_get_type, iFv)
+GO(gtk_print_pages_get_type, LFv)
+GO(gtk_print_quality_get_type, LFv)
 //GO(gtk_print_run_page_setup_dialog, 
 //GO(gtk_print_run_page_setup_dialog_async, 
 //GO(gtk_print_settings_copy, 
@@ -2124,7 +2124,7 @@ GO(gtk_print_quality_get_type, iFv)
 //GO(gtk_print_settings_get_resolution_y, 
 //GO(gtk_print_settings_get_reverse, 
 //GO(gtk_print_settings_get_scale, 
-GO(gtk_print_settings_get_type, iFv)
+GO(gtk_print_settings_get_type, LFv)
 //GO(gtk_print_settings_get_use_color, 
 //GO(gtk_print_settings_has_key, 
 //GO(gtk_print_settings_load_file, 
@@ -2165,7 +2165,7 @@ GO(gtk_print_settings_get_type, iFv)
 //GO(gtk_print_settings_to_file, 
 //GO(gtk_print_settings_to_key_file, 
 //GO(gtk_print_settings_unset, 
-GO(gtk_print_status_get_type, iFv)
+GO(gtk_print_status_get_type, LFv)
 //GO(gtk_print_unix_dialog_add_custom_tab, 
 //GO(gtk_print_unix_dialog_get_current_page, 
 //GO(gtk_print_unix_dialog_get_embed_page_setup, 
@@ -2176,7 +2176,7 @@ GO(gtk_print_status_get_type, iFv)
 //GO(gtk_print_unix_dialog_get_selected_printer, 
 //GO(gtk_print_unix_dialog_get_settings, 
 //GO(gtk_print_unix_dialog_get_support_selection, 
-GO(gtk_print_unix_dialog_get_type, iFv)
+GO(gtk_print_unix_dialog_get_type, LFv)
 //GO(gtk_print_unix_dialog_new, 
 //GO(gtk_print_unix_dialog_set_current_page, 
 //GO(gtk_print_unix_dialog_set_embed_page_setup, 
@@ -2185,16 +2185,16 @@ GO(gtk_print_unix_dialog_get_type, iFv)
 //GO(gtk_print_unix_dialog_set_page_setup, 
 //GO(gtk_print_unix_dialog_set_settings, 
 //GO(gtk_print_unix_dialog_set_support_selection, 
-GO(gtk_private_flags_get_type, iFv)
+GO(gtk_private_flags_get_type, LFv)
 GO(gtk_progress_bar_get_ellipsize, iFp)
 GO(gtk_progress_bar_get_fraction, dFp)
 GO(gtk_progress_bar_get_orientation, iFp)
 GO(gtk_progress_bar_get_pulse_step, fFp)
 GO(gtk_progress_bar_get_text, pFp)
-GO(gtk_progress_bar_get_type, iFv)
+GO(gtk_progress_bar_get_type, LFv)
 GO(gtk_progress_bar_new, pFv)
 GO(gtk_progress_bar_new_with_adjustment, pFp)
-GO(gtk_progress_bar_orientation_get_type, iFv)
+GO(gtk_progress_bar_orientation_get_type, LFv)
 GO(gtk_progress_bar_pulse, vFp)
 GO(gtk_progress_bar_set_activity_blocks, vFpu)
 GO(gtk_progress_bar_set_activity_step, vFpu)
@@ -2205,14 +2205,14 @@ GO(gtk_progress_bar_set_fraction, vFpd)
 GO(gtk_progress_bar_set_orientation, vFpi)
 GO(gtk_progress_bar_set_pulse_step, vFpd)
 GO(gtk_progress_bar_set_text, vFpp)
-GO(gtk_progress_bar_style_get_type, iFv)
+GO(gtk_progress_bar_style_get_type, LFv)
 GO(gtk_progress_bar_update, vFpd)
 GO(gtk_progress_configure, vFpddd)
 GO(gtk_progress_get_current_percentage, dFp)
 GO(gtk_progress_get_current_text, pFp)
 GO(gtk_progress_get_percentage_from_value, dFpd)
 GO(gtk_progress_get_text_from_value, pFpd)
-GO(gtk_progress_get_type, iFv)
+GO(gtk_progress_get_type, LFv)
 GO(gtk_progress_get_value, dFp)
 GO(gtk_progress_set_activity_mode, vFpi)
 GO(gtk_progress_set_adjustment, vFpp)
@@ -2229,12 +2229,12 @@ GO(gtk_quit_remove, vFu)
 GO(gtk_quit_remove_by_data, vFp)
 GO(gtk_radio_action_get_current_value, iFp)
 GO(gtk_radio_action_get_group, pFp)
-GO(gtk_radio_action_get_type, iFv)
+GO(gtk_radio_action_get_type, LFv)
 GO(gtk_radio_action_new, pFppppi)
 GO(gtk_radio_action_set_current_value, vFpi)
 GO(gtk_radio_action_set_group, vFpp)
 GO(gtk_radio_button_get_group, pFp)
-GO(gtk_radio_button_get_type, iFv)
+GO(gtk_radio_button_get_type, LFv)
 GO(gtk_radio_button_new, pFp)
 GO(gtk_radio_button_new_from_widget, pFp)
 GO(gtk_radio_button_new_with_label, pFpp)
@@ -2243,7 +2243,7 @@ GO(gtk_radio_button_new_with_mnemonic, pFpp)
 GO(gtk_radio_button_new_with_mnemonic_from_widget, pFpp)
 GO(gtk_radio_button_set_group, vFpp)
 GO(gtk_radio_menu_item_get_group, pFp)
-GO(gtk_radio_menu_item_get_type, iFv)
+GO(gtk_radio_menu_item_get_type, LFv)
 GO(gtk_radio_menu_item_new, pFp)
 GO(gtk_radio_menu_item_new_from_widget, pFp)
 GO(gtk_radio_menu_item_new_with_label, pFpp)
@@ -2252,7 +2252,7 @@ GO(gtk_radio_menu_item_new_with_mnemonic, pFpp)
 GO(gtk_radio_menu_item_new_with_mnemonic_from_widget, pFpp)
 GO(gtk_radio_menu_item_set_group, vFpp)
 GO(gtk_radio_tool_button_get_group, pFp)
-GO(gtk_radio_tool_button_get_type, iFv)
+GO(gtk_radio_tool_button_get_type, LFv)
 GO(gtk_radio_tool_button_new, pFp)
 GO(gtk_radio_tool_button_new_from_stock, pFpp)
 GO(gtk_radio_tool_button_new_from_widget, pFp)
@@ -2270,7 +2270,7 @@ GO(gtk_range_get_round_digits, iFp)
 GO(gtk_range_get_show_fill_level, iFp)
 GO(gtk_range_get_slider_range, vFppp)
 GO(gtk_range_get_slider_size_fixed, iFp)
-GO(gtk_range_get_type, iFv)
+GO(gtk_range_get_type, LFv)
 GO(gtk_range_get_update_policy, iFp)
 GO(gtk_range_get_upper_stepper_sensitivity, iFp)
 GO(gtk_range_get_value, dFp)
@@ -2295,7 +2295,7 @@ GO(gtk_rc_add_widget_class_style, vFpp)
 GO(gtk_rc_add_widget_name_style, vFpp)
 GO(gtk_rc_find_module_in_path, pFp)
 GO(gtk_rc_find_pixmap_in_path, pFppp)
-GO(gtk_rc_flags_get_type, iFv)
+GO(gtk_rc_flags_get_type, LFv)
 GO(gtk_rc_get_default_files, pFv)
 GO(gtk_rc_get_im_module_file, pFv)
 GO(gtk_rc_get_im_module_path, pFv)
@@ -2320,21 +2320,21 @@ GO(gtk_rc_reset_styles, vFp)
 GO(gtk_rc_scanner_new, pFv)
 GO(gtk_rc_set_default_files, vFp)
 GO(gtk_rc_style_copy, pFp)
-GO(gtk_rc_style_get_type, iFv)
+GO(gtk_rc_style_get_type, LFv)
 GO(gtk_rc_style_new, pFv)
 GO(gtk_rc_style_ref, vFp)
 GO(gtk_rc_style_unref, vFp)
-GO(gtk_rc_token_type_get_type, iFv)
+GO(gtk_rc_token_type_get_type, LFv)
 //GO(gtk_recent_action_get_show_numbers, 
-GO(gtk_recent_action_get_type, iFv)
+GO(gtk_recent_action_get_type, LFv)
 //GO(gtk_recent_action_new, 
 //GO(gtk_recent_action_new_for_manager, 
 //GO(gtk_recent_action_set_show_numbers, 
 //GO(gtk_recent_chooser_add_filter, 
-GO(gtk_recent_chooser_dialog_get_type, iFv)
+GO(gtk_recent_chooser_dialog_get_type, LFv)
 //GO(gtk_recent_chooser_dialog_new, 
 //GO(gtk_recent_chooser_dialog_new_for_manager, 
-GO(gtk_recent_chooser_error_get_type, iFv)
+GO(gtk_recent_chooser_error_get_type, LFv)
 //GO(gtk_recent_chooser_error_quark, 
 //GO(gtk_recent_chooser_get_current_item, 
 //GO(gtk_recent_chooser_get_current_uri, 
@@ -2349,11 +2349,11 @@ GO(gtk_recent_chooser_error_get_type, iFv)
 //GO(gtk_recent_chooser_get_show_private, 
 //GO(gtk_recent_chooser_get_show_tips, 
 //GO(gtk_recent_chooser_get_sort_type, 
-GO(gtk_recent_chooser_get_type, iFv)
+GO(gtk_recent_chooser_get_type, LFv)
 //GO(gtk_recent_chooser_get_uris, 
 //GO(gtk_recent_chooser_list_filters, 
 //GO(gtk_recent_chooser_menu_get_show_numbers, 
-GO(gtk_recent_chooser_menu_get_type, iFv)
+GO(gtk_recent_chooser_menu_get_type, LFv)
 //GO(gtk_recent_chooser_menu_new, 
 //GO(gtk_recent_chooser_menu_new_for_manager, 
 //GO(gtk_recent_chooser_menu_set_show_numbers, 
@@ -2374,7 +2374,7 @@ GO(gtk_recent_chooser_menu_get_type, iFv)
 //GO(gtk_recent_chooser_set_sort_type, 
 //GO(gtk_recent_chooser_unselect_all, 
 //GO(gtk_recent_chooser_unselect_uri, 
-GO(gtk_recent_chooser_widget_get_type, iFv)
+GO(gtk_recent_chooser_widget_get_type, LFv)
 //GO(gtk_recent_chooser_widget_new, 
 //GO(gtk_recent_chooser_widget_new_for_manager, 
 GO(gtk_recent_filter_add_age, vFpi)
@@ -2385,10 +2385,10 @@ GO(gtk_recent_filter_add_mime_type, vFpp)
 GO(gtk_recent_filter_add_pattern, vFpp)
 GO(gtk_recent_filter_add_pixbuf_formats, vFp)
 GO(gtk_recent_filter_filter, iFpp)
-GO(gtk_recent_filter_flags_get_type, iFv)
+GO(gtk_recent_filter_flags_get_type, LFv)
 GO(gtk_recent_filter_get_name, pFp)
 GO(gtk_recent_filter_get_needed, iFp)
-GO(gtk_recent_filter_get_type, iFv)
+GO(gtk_recent_filter_get_type, LFv)
 GO(gtk_recent_filter_new, pFv)
 GO(gtk_recent_filter_set_name, vFpp)
 GO(gtk_recent_info_exists, iFp)
@@ -2404,7 +2404,7 @@ GO(gtk_recent_info_get_mime_type, pFp)
 GO(gtk_recent_info_get_modified, lFp)
 GO(gtk_recent_info_get_private_hint, iFp)
 GO(gtk_recent_info_get_short_name, pFp)
-GO(gtk_recent_info_get_type, iFv)
+GO(gtk_recent_info_get_type, LFv)
 GO(gtk_recent_info_get_uri, pFp)
 GO(gtk_recent_info_get_uri_display, pFp)
 GO(gtk_recent_info_get_visited, lFp)
@@ -2417,13 +2417,13 @@ GO(gtk_recent_info_ref, pFp)
 GO(gtk_recent_info_unref, vFp)
 GO(gtk_recent_manager_add_full, iFppp)
 GO(gtk_recent_manager_add_item, iFpp)
-GO(gtk_recent_manager_error_get_type, iFv)
+GO(gtk_recent_manager_error_get_type, LFv)
 GO(gtk_recent_manager_error_quark, pFv)
 GO(gtk_recent_manager_get_default, pFv)
 GO(gtk_recent_manager_get_for_screen, pFp)
 GO(gtk_recent_manager_get_items, pFp)
 GO(gtk_recent_manager_get_limit, iFp)
-GO(gtk_recent_manager_get_type, iFv)
+GO(gtk_recent_manager_get_type, LFv)
 GO(gtk_recent_manager_has_item, iFpp)
 GO(gtk_recent_manager_lookup_item, pFppp)
 GO(gtk_recent_manager_move_item, iFpppp)
@@ -2432,19 +2432,19 @@ GO(gtk_recent_manager_purge_items, iFpp)
 GO(gtk_recent_manager_remove_item, iFppp)
 GO(gtk_recent_manager_set_limit, vFpi)
 GO(gtk_recent_manager_set_screen, vFpp)
-GO(gtk_recent_sort_type_get_type, iFv)
-GO(gtk_relief_style_get_type, iFv)
+GO(gtk_recent_sort_type_get_type, LFv)
+GO(gtk_relief_style_get_type, LFv)
 GO(gtk_requisition_copy, pFp)
 GO(gtk_requisition_free, vFp)
-GO(gtk_requisition_get_type, iFv)
-GO(gtk_resize_mode_get_type, iFv)
-GO(gtk_response_type_get_type, iFv)
+GO(gtk_requisition_get_type, LFv)
+GO(gtk_resize_mode_get_type, LFv)
+GO(gtk_response_type_get_type, LFv)
 //GO(gtk_rgb_to_hsv, 
 //GO(gtk_ruler_draw_pos, 
 //GO(gtk_ruler_draw_ticks, 
 //GO(gtk_ruler_get_metric, 
 //GO(gtk_ruler_get_range, 
-GO(gtk_ruler_get_type, iFv)
+GO(gtk_ruler_get_type, LFv)
 //GO(gtk_ruler_set_metric, 
 //GO(gtk_ruler_set_range, 
 //GO(gtk_scale_add_mark, 
@@ -2453,7 +2453,7 @@ GO(gtk_ruler_get_type, iFv)
 //GO(gtk_scale_button_get_orientation, 
 //GO(gtk_scale_button_get_plus_button, 
 //GO(gtk_scale_button_get_popup, 
-GO(gtk_scale_button_get_type, iFv)
+GO(gtk_scale_button_get_type, LFv)
 //GO(gtk_scale_button_get_value, 
 //GO(gtk_scale_button_new, 
 //GO(gtk_scale_button_set_adjustment, 
@@ -2465,19 +2465,19 @@ GO(gtk_scale_button_get_type, iFv)
 //GO(gtk_scale_get_draw_value, 
 //GO(gtk_scale_get_layout, 
 //GO(gtk_scale_get_layout_offsets, 
-GO(gtk_scale_get_type, iFv)
+GO(gtk_scale_get_type, LFv)
 //GO(gtk_scale_get_value_pos, 
 //GO(gtk_scale_set_digits, 
 //GO(gtk_scale_set_draw_value, 
 //GO(gtk_scale_set_value_pos, 
-GO(gtk_scrollbar_get_type, iFv)
+GO(gtk_scrollbar_get_type, LFv)
 GO(gtk_scrolled_window_add_with_viewport, vFpp)
 GO(gtk_scrolled_window_get_hadjustment, pFp)
 GO(gtk_scrolled_window_get_hscrollbar, pFp)
 GO(gtk_scrolled_window_get_placement, iFp)
 GO(gtk_scrolled_window_get_policy, vFppp)
 GO(gtk_scrolled_window_get_shadow_type, iFp)
-GO(gtk_scrolled_window_get_type, iFv)
+GO(gtk_scrolled_window_get_type, LFv)
 GO(gtk_scrolled_window_get_vadjustment, pFp)
 GO(gtk_scrolled_window_get_vscrollbar, pFp)
 GO(gtk_scrolled_window_new, pFpp)
@@ -2487,8 +2487,8 @@ GO(gtk_scrolled_window_set_policy, vFpii)
 GO(gtk_scrolled_window_set_shadow_type, vFpi)
 GO(gtk_scrolled_window_set_vadjustment, vFpp)
 GO(gtk_scrolled_window_unset_placement, vFp)
-GO(gtk_scroll_step_get_type, iFv)
-GO(gtk_scroll_type_get_type, iFv)
+GO(gtk_scroll_step_get_type, LFv)
+GO(gtk_scroll_type_get_type, LFv)
 GO(gtk_selection_add_target, vFpppu)
 GO(gtk_selection_add_targets, vFpppu)
 GO(gtk_selection_clear, iFpp)
@@ -2506,7 +2506,7 @@ GO(gtk_selection_data_get_selection, pFp)
 GO(gtk_selection_data_get_target, pFp)
 GO(gtk_selection_data_get_targets, iFppp)
 GO(gtk_selection_data_get_text, pFp)
-GO(gtk_selection_data_get_type, iFv)
+GO(gtk_selection_data_get_type, LFv)
 GO(gtk_selection_data_get_uris, pFp)
 GO(gtk_selection_data_set, vFppipi)
 GO(gtk_selection_data_set_pixbuf, iFpp)
@@ -2516,32 +2516,32 @@ GO(gtk_selection_data_targets_include_image, iFpi)
 GO(gtk_selection_data_targets_include_rich_text, iFpp)
 GO(gtk_selection_data_targets_include_text, iFp)
 GO(gtk_selection_data_targets_include_uri, iFp)
-GO(gtk_selection_mode_get_type, iFv)
+GO(gtk_selection_mode_get_type, LFv)
 GO(gtk_selection_owner_set, iFppu)
 GO(gtk_selection_owner_set_for_display, iFpppu)
 GO(gtk_selection_remove_all, vFp)
-GO(gtk_sensitivity_type_get_type, iFv)
-GO(gtk_separator_get_type, iFv)
-GO(gtk_separator_menu_item_get_type, iFv)
+GO(gtk_sensitivity_type_get_type, LFv)
+GO(gtk_separator_get_type, LFv)
+GO(gtk_separator_menu_item_get_type, LFv)
 GO(gtk_separator_menu_item_new, pFv)
 GO(gtk_separator_tool_item_get_draw, iFp)
-GO(gtk_separator_tool_item_get_type, iFv)
+GO(gtk_separator_tool_item_get_type, LFv)
 GO(gtk_separator_tool_item_new, pFv)
 GO(gtk_separator_tool_item_set_draw, vFpi)
 GO(gtk_set_locale, pFv)
 GO(gtk_settings_get_default, pFv)
 GO(gtk_settings_get_for_screen, pFp)
-GO(gtk_settings_get_type, iFv)
+GO(gtk_settings_get_type, LFv)
 GO(gtk_settings_install_property, vFp)
 //GOM(gtk_settings_install_property_parser, vFEpB)
 GO(gtk_settings_set_double_property, vFppdp)
 GO(gtk_settings_set_long_property, vFpplp)
 GO(gtk_settings_set_property_value, vFppp)  //TODO: GtkSettingsValue needs alignment too!
 GO(gtk_settings_set_string_property, vFpppp)
-GO(gtk_shadow_type_get_type, iFv)
+GO(gtk_shadow_type_get_type, LFv)
 //GO(gtk_show_about_dialog, 
 GO(gtk_show_uri, iFppup)
-GO(gtk_side_type_get_type, iFv)
+GO(gtk_side_type_get_type, LFv)
 //GO(gtk_signal_compat_matched, 
 GOM(gtk_signal_connect_full, LFEppppppii)
 //GO(gtk_signal_connect_object_while_alive, 
@@ -2553,13 +2553,13 @@ GOM(gtk_signal_connect_full, LFEppppppii)
 //GO(gtk_signal_emitv_by_name, 
 //GO(gtk_signal_new, 
 //GO(gtk_signal_newv, 
-GO(gtk_signal_run_type_get_type, iFv)
+GO(gtk_signal_run_type_get_type, LFv)
 //GO(gtk_size_group_add_widget, 
 //GO(gtk_size_group_get_ignore_hidden, 
 //GO(gtk_size_group_get_mode, 
-GO(gtk_size_group_get_type, iFv)
+GO(gtk_size_group_get_type, LFv)
 //GO(gtk_size_group_get_widgets, 
-GO(gtk_size_group_mode_get_type, iFv)
+GO(gtk_size_group_mode_get_type, LFv)
 //GO(gtk_size_group_new, 
 //GO(gtk_size_group_remove_widget, 
 //GO(gtk_size_group_set_ignore_hidden, 
@@ -2567,10 +2567,10 @@ GO(gtk_size_group_mode_get_type, iFv)
 GO(gtk_socket_add_id, vFpp)
 GO(gtk_socket_get_id, pFp)
 GO(gtk_socket_get_plug_window, pFp)
-GO(gtk_socket_get_type, iFv)
+GO(gtk_socket_get_type, LFv)
 GO(gtk_socket_new, pFv)
 GO(gtk_socket_steal, vFpp)
-GO(gtk_sort_type_get_type, iFv)
+GO(gtk_sort_type_get_type, LFv)
 GO(gtk_spin_button_configure, vFppdu)
 GO(gtk_spin_button_get_adjustment, pFp)
 GO(gtk_spin_button_get_digits, uFp)
@@ -2578,7 +2578,7 @@ GO(gtk_spin_button_get_increments, vFppp)
 GO(gtk_spin_button_get_numeric, iFp)
 GO(gtk_spin_button_get_range, vFppp)
 GO(gtk_spin_button_get_snap_to_ticks, iFp)
-GO(gtk_spin_button_get_type, iFv)
+GO(gtk_spin_button_get_type, LFv)
 GO(gtk_spin_button_get_update_policy, iFp)
 GO(gtk_spin_button_get_value, dFp)
 GO(gtk_spin_button_get_value_as_int, iFp)
@@ -2596,17 +2596,17 @@ GO(gtk_spin_button_set_value, vFpd)
 GO(gtk_spin_button_set_wrap, vFpi)
 GO(gtk_spin_button_spin, vFpid)
 GO(gtk_spin_button_update, vFp)
-GO(gtk_spin_button_update_policy_get_type, iFv)
-GO(gtk_spinner_get_type, iFv)
+GO(gtk_spin_button_update_policy_get_type, LFv)
+GO(gtk_spinner_get_type, LFv)
 GO(gtk_spinner_new, pFv)
 GO(gtk_spinner_start, vFp)
 GO(gtk_spinner_stop, vFp)
-GO(gtk_spin_type_get_type, iFv)
-GO(gtk_state_type_get_type, iFv)
+GO(gtk_spin_type_get_type, LFv)
+GO(gtk_state_type_get_type, LFv)
 GO(gtk_statusbar_get_context_id, uFpp)
 GO(gtk_statusbar_get_has_resize_grip, iFp)
 GO(gtk_statusbar_get_message_area, pFp)
-GO(gtk_statusbar_get_type, iFv)
+GO(gtk_statusbar_get_type, LFv)
 GO(gtk_statusbar_new, pFv)
 GO(gtk_statusbar_pop, vFpu)
 GO(gtk_statusbar_push, uFpup)
@@ -2626,7 +2626,7 @@ GO(gtk_status_icon_get_storage_type, iFp)
 GO(gtk_status_icon_get_title, pFp)
 GO(gtk_status_icon_get_tooltip_markup, pFp)
 GO(gtk_status_icon_get_tooltip_text, pFp)
-GO(gtk_status_icon_get_type, iFv)
+GO(gtk_status_icon_get_type, LFv)
 GO(gtk_status_icon_get_visible, iFp)
 GO(gtk_status_icon_get_x11_window_id, uFp)
 GO(gtk_status_icon_is_embedded, iFp)
@@ -2665,7 +2665,7 @@ GO(gtk_style_detach, vFp)
 GO(gtk_style_get, vFpippppppppppp)  //vaarg, wrap with gtk_style_get_valist?
 GO(gtk_style_get_font, pFp)
 GO(gtk_style_get_style_property, vFpipp)
-GO(gtk_style_get_type, iFv)
+GO(gtk_style_get_type, LFv)
 //GO(gtk_style_get_valist, vFpipp)    
 GO(gtk_style_lookup_color, iFppp)
 GO(gtk_style_lookup_icon_set, pFpp)
@@ -2675,8 +2675,8 @@ GO(gtk_style_render_icon, pFppiiipp)
 GO(gtk_style_set_background, vFppi)
 GO(gtk_style_set_font, vFpp)
 GO(gtk_style_unref, vFp)
-GO(gtk_submenu_direction_get_type, iFv)
-GO(gtk_submenu_placement_get_type, iFv)
+GO(gtk_submenu_direction_get_type, LFv)
+GO(gtk_submenu_placement_get_type, LFv)
 GO(gtk_table_attach, vFppuuuuiiuu)
 GO(gtk_table_attach_defaults, vFppuuuu)
 GO(gtk_table_get_col_spacing, uFpu)
@@ -2685,7 +2685,7 @@ GO(gtk_table_get_default_row_spacing, uFp)
 GO(gtk_table_get_homogeneous, iFp)
 GO(gtk_table_get_row_spacing, uFpu)
 GO(gtk_table_get_size, vFppp)
-GO(gtk_table_get_type, iFv)
+GO(gtk_table_get_type, LFv)
 GO(gtk_table_new, pFuui)
 GO(gtk_table_resize, vFpuu)
 GO(gtk_table_set_col_spacing, vFpuu)
@@ -2693,7 +2693,7 @@ GO(gtk_table_set_col_spacings, vFpu)
 GO(gtk_table_set_homogeneous, vFpi)
 GO(gtk_table_set_row_spacing, vFpuu)
 GO(gtk_table_set_row_spacings, vFpu)
-GO(gtk_target_flags_get_type, iFv)
+GO(gtk_target_flags_get_type, LFv)
 GO(gtk_target_list_add, vFppuu)
 GO(gtk_target_list_add_image_targets, vFpui)
 GO(gtk_target_list_add_rich_text_targets, vFpuip)
@@ -2701,7 +2701,7 @@ GO(gtk_target_list_add_table, vFppu)
 GO(gtk_target_list_add_text_targets, vFpu)
 GO(gtk_target_list_add_uri_targets, vFpu)
 GO(gtk_target_list_find, iFppp)
-GO(gtk_target_list_get_type, iFv)
+GO(gtk_target_list_get_type, LFv)
 GO(gtk_target_list_new, pFpu)
 GO(gtk_target_list_ref, pFp)
 GO(gtk_target_list_remove, iFppp)
@@ -2712,7 +2712,7 @@ GO(gtk_targets_include_text, iFpi)
 GO(gtk_targets_include_uri, iFpi)
 GO(gtk_target_table_free, vFpi)
 GO(gtk_target_table_new_from_list, pFpp)
-GO(gtk_tearoff_menu_item_get_type, iFv)
+GO(gtk_tearoff_menu_item_get_type, LFv)
 GO(gtk_tearoff_menu_item_new, pFv)
 //GO(gtk_test_create_simple_window, 
 //GO(gtk_test_create_widget, 
@@ -2733,7 +2733,7 @@ GO(gtk_tearoff_menu_item_new, pFv)
 GO(gtk_text_anchored_child_set_layout, vFpp)
 GO(gtk_text_attributes_copy, pFp)
 GO(gtk_text_attributes_copy_values, vFpp)
-GO(gtk_text_attributes_get_type, iFv)
+GO(gtk_text_attributes_get_type, LFv)
 GO(gtk_text_attributes_new, pFv)
 GO(gtk_text_attributes_ref, pFp)
 GO(gtk_text_attributes_unref, vFp)
@@ -2782,7 +2782,7 @@ GO(gtk_text_buffer_get_slice, pFpppi)
 GO(gtk_text_buffer_get_start_iter, vFpp)
 GO(gtk_text_buffer_get_tag_table, pFp)
 GO(gtk_text_buffer_get_text, pFpppi)
-GO(gtk_text_buffer_get_type, iFv)
+GO(gtk_text_buffer_get_type, LFv)
 GO(gtk_text_buffer_insert, vFpppi)
 GO(gtk_text_buffer_insert_at_cursor, vFppi)
 GO(gtk_text_buffer_insert_child_anchor, vFppp)
@@ -2810,23 +2810,23 @@ GO(gtk_text_buffer_select_range, vFppp)
 GO(gtk_text_buffer_serialize, pFpppppp)
 GO(gtk_text_buffer_set_modified, vFpi)
 GO(gtk_text_buffer_set_text, vFppi)
-GO(gtk_text_buffer_target_info_get_type, iFv)
+GO(gtk_text_buffer_target_info_get_type, LFv)
 GO(gtk_text_buffer_unregister_deserialize_format, vFpp)
 GO(gtk_text_buffer_unregister_serialize_format, vFpp)
 GO(gtk_text_byte_begins_utf8_char, iFp)
 GO(gtk_text_child_anchor_get_deleted, iFp)
-GO(gtk_text_child_anchor_get_type, iFv)
+GO(gtk_text_child_anchor_get_type, LFv)
 GO(gtk_text_child_anchor_get_widgets, pFp)
 GO(gtk_text_child_anchor_new, pFv)
 GO(gtk_text_child_anchor_queue_resize, vFpp)
 GO(gtk_text_child_anchor_register_child, vFppp)
 GO(gtk_text_child_anchor_unregister_child, vFpp)
-GO(gtk_text_direction_get_type, iFv)
+GO(gtk_text_direction_get_type, LFv)
 GO(gtk_text_forward_delete, iFpu)
 GO(gtk_text_freeze, vFp)
 GO(gtk_text_get_length, uFp)
 GO(gtk_text_get_point, uFp)
-GO(gtk_text_get_type, iFv)
+GO(gtk_text_get_type, LFv)
 GO(gtk_text_insert, vFpppppi)
 GO(gtk_text_iter_backward_char, iFp)
 GO(gtk_text_iter_backward_chars, iFpi)
@@ -2896,7 +2896,7 @@ GO(gtk_text_iter_get_slice, pFpp)
 GO(gtk_text_iter_get_tags, pFp)
 GO(gtk_text_iter_get_text, pFpp)
 GO(gtk_text_iter_get_toggled_tags, pFpi)
-GO(gtk_text_iter_get_type, iFv)
+GO(gtk_text_iter_get_type, LFv)
 GO(gtk_text_iter_get_visible_line_index, iFp)
 GO(gtk_text_iter_get_visible_line_offset, iFp)
 GO(gtk_text_iter_get_visible_slice, pFpp)
@@ -2938,7 +2938,7 @@ GO(gtk_text_iter_toggles_tag, iFpp)
 //GO(gtk_text_layout_get_lines, 
 //GO(gtk_text_layout_get_line_yrange, 
 //GO(gtk_text_layout_get_size, 
-GO(gtk_text_layout_get_type, iFv)
+GO(gtk_text_layout_get_type, LFv)
 //GO(gtk_text_layout_invalidate, 
 //GO(gtk_text_layout_invalidate_cursors, 
 //GO(gtk_text_layout_is_valid, 
@@ -2969,12 +2969,12 @@ GO(gtk_text_mark_get_buffer, pFp)
 GO(gtk_text_mark_get_deleted, iFp)
 GO(gtk_text_mark_get_left_gravity, iFp)
 GO(gtk_text_mark_get_name, pFp)
-GO(gtk_text_mark_get_type, iFv)
+GO(gtk_text_mark_get_type, LFv)
 GO(gtk_text_mark_get_visible, iFp)
 GO(gtk_text_mark_new, pFpi)
 GO(gtk_text_mark_set_visible, vFpi)
 GO(gtk_text_new, pFpp)
-GO(gtk_text_search_flags_get_type, iFv)
+GO(gtk_text_search_flags_get_type, LFv)
 GO(gtk_text_set_adjustments, vFppp)
 GO(gtk_text_set_editable, vFpi)
 GO(gtk_text_set_line_wrap, vFpi)
@@ -2982,13 +2982,13 @@ GO(gtk_text_set_point, vFpu)
 GO(gtk_text_set_word_wrap, vFpi)
 GO(gtk_text_tag_event, iFpppp)
 GO(gtk_text_tag_get_priority, iFp)
-GO(gtk_text_tag_get_type, iFv)
+GO(gtk_text_tag_get_type, LFv)
 GO(gtk_text_tag_new, pFp)
 GO(gtk_text_tag_set_priority, vFpi)
 GO(gtk_text_tag_table_add, vFpp)
 //GOM(gtk_text_tag_table_foreach, vFEpBp)
 GO(gtk_text_tag_table_get_size, iFp)
-GO(gtk_text_tag_table_get_type, iFv)
+GO(gtk_text_tag_table_get_type, LFv)
 GO(gtk_text_tag_table_lookup, pFpp)
 GO(gtk_text_tag_table_new, pFv)
 GO(gtk_text_tag_table_remove, vFpp)
@@ -3021,7 +3021,7 @@ GO(gtk_text_view_get_pixels_below_lines, iFp)
 GO(gtk_text_view_get_pixels_inside_wrap, iFp)
 GO(gtk_text_view_get_right_margin, iFp)
 GO(gtk_text_view_get_tabs, pFp)
-GO(gtk_text_view_get_type, iFv)
+GO(gtk_text_view_get_type, LFv)
 GO(gtk_text_view_get_vadjustment, pFp)
 GO(gtk_text_view_get_visible_rect, vFpp)
 GO(gtk_text_view_get_window, pFpi)
@@ -3055,14 +3055,14 @@ GO(gtk_text_view_set_tabs, vFpp)
 GO(gtk_text_view_set_wrap_mode, vFpi)
 GO(gtk_text_view_starts_display_line, iFpp)
 GO(gtk_text_view_window_to_buffer_coords, vFpiiipp)
-GO(gtk_text_window_type_get_type, iFv)
+GO(gtk_text_window_type_get_type, LFv)
 //GO(gtk_theme_engine_create_rc_style, 
 //GO(gtk_theme_engine_get, 
-GO(gtk_theme_engine_get_type, iFv)
+GO(gtk_theme_engine_get_type, LFv)
 GOM(gtk_timeout_add, uFEupp)
 //GOM(gtk_timeout_add_full, uFuBppB)
 GO(gtk_timeout_remove, vFu)
-GO(gtk_tips_query_get_type, iFv)
+GO(gtk_tips_query_get_type, LFv)
 //GO(gtk_tips_query_new, 
 //GO(gtk_tips_query_set_caller, 
 //GO(gtk_tips_query_set_labels, 
@@ -3070,7 +3070,7 @@ GO(gtk_tips_query_get_type, iFv)
 //GO(gtk_tips_query_stop_query, 
 //GO(gtk_toggle_action_get_active, 
 //GO(gtk_toggle_action_get_draw_as_radio, 
-GO(gtk_toggle_action_get_type, iFv)
+GO(gtk_toggle_action_get_type, LFv)
 //GO(gtk_toggle_action_new, 
 //GO(gtk_toggle_action_set_active, 
 //GO(gtk_toggle_action_set_draw_as_radio, 
@@ -3078,7 +3078,7 @@ GO(gtk_toggle_action_get_type, iFv)
 GO(gtk_toggle_button_get_active, iFp)
 GO(gtk_toggle_button_get_inconsistent, iFp)
 GO(gtk_toggle_button_get_mode, iFp)
-GO(gtk_toggle_button_get_type, iFv)
+GO(gtk_toggle_button_get_type, LFv)
 GO(gtk_toggle_button_new, pFv)
 GO(gtk_toggle_button_new_with_label, pFp)
 GO(gtk_toggle_button_new_with_mnemonic, pFp)
@@ -3087,7 +3087,7 @@ GO(gtk_toggle_button_set_inconsistent, vFpi)
 GO(gtk_toggle_button_set_mode, vFpi)
 GO(gtk_toggle_button_toggled, vFp)
 GO(gtk_toggle_tool_button_get_active, iFp)
-GO(gtk_toggle_tool_button_get_type, iFv)
+GO(gtk_toggle_tool_button_get_type, LFv)
 GO(gtk_toggle_tool_button_new, pFv)
 GO(gtk_toggle_tool_button_new_from_stock, pFp)
 GO(gtk_toggle_tool_button_set_active, vFpi)
@@ -3095,7 +3095,7 @@ GOM(gtk_toolbar_append_element, pFEpippppppp)
 GOM(gtk_toolbar_append_item, pFEppppppp)
 GO(gtk_toolbar_append_space, vFp)
 GO(gtk_toolbar_append_widget, vFpppp)
-GO(gtk_toolbar_child_type_get_type, iFv)
+GO(gtk_toolbar_child_type_get_type, LFv)
 GO(gtk_toolbar_get_drop_index, iFpii)
 GO(gtk_toolbar_get_icon_size, iFp)
 GO(gtk_toolbar_get_item_index, iFpp)
@@ -3106,7 +3106,7 @@ GO(gtk_toolbar_get_relief_style, iFp)
 GO(gtk_toolbar_get_show_arrow, iFp)
 GO(gtk_toolbar_get_style, iFp)
 GO(gtk_toolbar_get_tooltips, iFp)
-GO(gtk_toolbar_get_type, iFv)
+GO(gtk_toolbar_get_type, LFv)
 GO(gtk_toolbar_insert, vFppi)
 GOM(gtk_toolbar_insert_element, pFEpipppppppi)
 GOM(gtk_toolbar_insert_item, pFEpppppppi)
@@ -3125,8 +3125,8 @@ GO(gtk_toolbar_set_orientation, vFpi)
 GO(gtk_toolbar_set_show_arrow, vFpi)
 GO(gtk_toolbar_set_style, vFpi)
 GO(gtk_toolbar_set_tooltips, vFpi)
-GO(gtk_toolbar_space_style_get_type, iFv)
-GO(gtk_toolbar_style_get_type, iFv)
+GO(gtk_toolbar_space_style_get_type, LFv)
+GO(gtk_toolbar_style_get_type, LFv)
 GO(gtk_toolbar_unset_icon_size, vFp)
 GO(gtk_toolbar_unset_style, vFp)
 GO(gtk_tool_button_get_icon_name, pFp)
@@ -3134,7 +3134,7 @@ GO(gtk_tool_button_get_icon_widget, pFp)
 GO(gtk_tool_button_get_label, pFp)
 GO(gtk_tool_button_get_label_widget, pFp)
 GO(gtk_tool_button_get_stock_id, pFp)
-GO(gtk_tool_button_get_type, iFv)
+GO(gtk_tool_button_get_type, LFv)
 GO(gtk_tool_button_get_use_underline, iFp)
 GO(gtk_tool_button_new, pFpp)
 GO(gtk_tool_button_new_from_stock, pFp)
@@ -3156,7 +3156,7 @@ GO(gtk_tool_button_set_use_underline, vFpi)
 //GO(gtk_tool_item_get_text_orientation, 
 //GO(gtk_tool_item_get_text_size_group, 
 //GO(gtk_tool_item_get_toolbar_style, 
-GO(gtk_tool_item_get_type, iFv)
+GO(gtk_tool_item_get_type, LFv)
 //GO(gtk_tool_item_get_use_drag_window, 
 //GO(gtk_tool_item_get_visible_horizontal, 
 //GO(gtk_tool_item_get_visible_vertical, 
@@ -3169,7 +3169,7 @@ GO(gtk_tool_item_get_type, iFv)
 //GO(gtk_tool_item_group_get_label_widget, 
 //GO(gtk_tool_item_group_get_n_items, 
 //GO(gtk_tool_item_group_get_nth_item, 
-GO(gtk_tool_item_group_get_type, iFv)
+GO(gtk_tool_item_group_get_type, LFv)
 //GO(gtk_tool_item_group_insert, 
 //GO(gtk_tool_item_group_new, 
 //GO(gtk_tool_item_group_set_collapsed, 
@@ -3193,7 +3193,7 @@ GO(gtk_tool_item_group_get_type, iFv)
 //GO(gtk_tool_item_set_visible_vertical, 
 //GO(gtk_tool_item_toolbar_reconfigured, 
 //GO(gtk_tool_palette_add_drag_dest, 
-GO(gtk_tool_palette_drag_targets_get_type, iFv)
+GO(gtk_tool_palette_drag_targets_get_type, LFv)
 //GO(gtk_tool_palette_get_drag_item, 
 //GO(gtk_tool_palette_get_drag_target_group, 
 //GO(gtk_tool_palette_get_drag_target_item, 
@@ -3205,7 +3205,7 @@ GO(gtk_tool_palette_drag_targets_get_type, iFv)
 //GO(gtk_tool_palette_get_hadjustment, 
 //GO(gtk_tool_palette_get_icon_size, 
 //GO(gtk_tool_palette_get_style, 
-GO(gtk_tool_palette_get_type, iFv)
+GO(gtk_tool_palette_get_type, LFv)
 //GO(gtk_tool_palette_get_vadjustment, 
 //GO(gtk_tool_palette_new, 
 //GO(gtk_tool_palette_set_drag_source, 
@@ -3224,9 +3224,9 @@ GO(gtk_tool_palette_get_type, iFv)
 //GO(gtk_tool_shell_get_text_alignment, 
 //GO(gtk_tool_shell_get_text_orientation, 
 //GO(gtk_tool_shell_get_text_size_group, 
-GO(gtk_tool_shell_get_type, iFv)
+GO(gtk_tool_shell_get_type, LFv)
 //GO(gtk_tool_shell_rebuild_menu, 
-GO(gtk_tooltip_get_type, iFv)
+GO(gtk_tooltip_get_type, LFv)
 GO(gtk_tooltips_data_get, pFp)
 GO(gtk_tooltips_disable, vFp)
 GO(gtk_tooltips_enable, vFp)
@@ -3240,29 +3240,29 @@ GO(gtk_tooltips_enable, vFp)
 //GO(gtk_tooltip_set_tip_area, 
 GO(gtk_tooltips_force_window, vFp)
 GO(gtk_tooltips_get_info_from_tip_window, iFppp)
-GO(gtk_tooltips_get_type, iFv)
+GO(gtk_tooltips_get_type, LFv)
 GO(gtk_tooltips_new, pFv)
 GO(gtk_tooltips_set_delay, vFpu)
 GO(gtk_tooltips_set_tip, vFpppp)
 //GO(gtk_tooltip_trigger_tooltip_query, 
-GO(gtk_tray_icon_get_type, iFv)
+GO(gtk_tray_icon_get_type, LFv)
 //GO(gtk_tree_append, 
 //GO(gtk_tree_child_position, 
 //GO(gtk_tree_clear_items, 
 //GO(gtk_tree_drag_dest_drag_data_received, 
-GO(gtk_tree_drag_dest_get_type, iFv)
+GO(gtk_tree_drag_dest_get_type, LFv)
 //GO(gtk_tree_drag_dest_row_drop_possible, 
 //GO(gtk_tree_drag_source_drag_data_delete, 
 //GO(gtk_tree_drag_source_drag_data_get, 
-GO(gtk_tree_drag_source_get_type, iFv)
+GO(gtk_tree_drag_source_get_type, LFv)
 //GO(gtk_tree_drag_source_row_draggable, 
 //GO(gtk_tree_get_row_drag_data, 
-GO(gtk_tree_get_type, iFv)
+GO(gtk_tree_get_type, LFv)
 //GO(gtk_tree_insert, 
 //GO(gtk_tree_item_collapse, 
 //GO(gtk_tree_item_deselect, 
 //GO(gtk_tree_item_expand, 
-GO(gtk_tree_item_get_type, iFv)
+GO(gtk_tree_item_get_type, LFv)
 //GO(gtk_tree_item_new, 
 //GO(gtk_tree_item_new_with_label, 
 //GO(gtk_tree_item_remove_subtree, 
@@ -3270,20 +3270,20 @@ GO(gtk_tree_item_get_type, iFv)
 //GO(gtk_tree_item_set_subtree, 
 GO(gtk_tree_iter_copy, pFp)
 GO(gtk_tree_iter_free, vFp)
-GO(gtk_tree_iter_get_type, iFv)
+GO(gtk_tree_iter_get_type, LFv)
 //GO(gtk_tree_model_filter_clear_cache, 
 //GO(gtk_tree_model_filter_convert_child_iter_to_iter, 
 //GO(gtk_tree_model_filter_convert_child_path_to_path, 
 //GO(gtk_tree_model_filter_convert_iter_to_child_iter, 
 //GO(gtk_tree_model_filter_convert_path_to_child_path, 
 //GO(gtk_tree_model_filter_get_model, 
-GO(gtk_tree_model_filter_get_type, iFv)
+GO(gtk_tree_model_filter_get_type, LFv)
 //GO(gtk_tree_model_filter_new, 
 //GO(gtk_tree_model_filter_refilter, 
 //GO(gtk_tree_model_filter_set_modify_func, 
 //GO(gtk_tree_model_filter_set_visible_column, 
 //GO(gtk_tree_model_filter_set_visible_func, 
-GO(gtk_tree_model_flags_get_type, iFv)
+GO(gtk_tree_model_flags_get_type, LFv)
 GOM(gtk_tree_model_foreach, vFEppp)
 //GO2(gtk_tree_model_get, vFppV, gtk_tree_model_get_valist)
 GO(gtk_tree_model_get_column_type, iFpi)
@@ -3294,7 +3294,7 @@ GO(gtk_tree_model_get_iter_from_string, iFppp)
 GO(gtk_tree_model_get_n_columns, iFp)
 GO(gtk_tree_model_get_path, pFpp)
 GO(gtk_tree_model_get_string_from_iter, pFpp)
-GO(gtk_tree_model_get_type, iFv)
+GO(gtk_tree_model_get_type, LFv)
 //GO(gtk_tree_model_get_valist, vFppp)
 GO(gtk_tree_model_get_value, vFppip)
 GO(gtk_tree_model_iter_children, iFppp)
@@ -3315,7 +3315,7 @@ GO(gtk_tree_model_rows_reordered, vFpppp)
 //GO(gtk_tree_model_sort_convert_iter_to_child_iter, 
 //GO(gtk_tree_model_sort_convert_path_to_child_path, 
 //GO(gtk_tree_model_sort_get_model, 
-GO(gtk_tree_model_sort_get_type, iFv)
+GO(gtk_tree_model_sort_get_type, LFv)
 //GO(gtk_tree_model_sort_iter_is_valid, 
 //GO(gtk_tree_model_sort_new_with_model, 
 //GO(gtk_tree_model_sort_reset_default_sort_func, 
@@ -3329,7 +3329,7 @@ GO(gtk_tree_path_free, vFp)
 GO(gtk_tree_path_get_depth, iFp)
 GO(gtk_tree_path_get_indices, pFp)
 GO(gtk_tree_path_get_indices_with_depth, pFpp)
-GO(gtk_tree_path_get_type, iFv)
+GO(gtk_tree_path_get_type, LFv)
 GO(gtk_tree_path_is_ancestor, iFpp)
 GO(gtk_tree_path_is_descendant, iFpp)
 GO(gtk_tree_path_new, pFv)
@@ -3349,7 +3349,7 @@ GO(gtk_tree_row_reference_deleted, vFpp)
 GO(gtk_tree_row_reference_free, vFp)
 GO(gtk_tree_row_reference_get_model, pFp)
 GO(gtk_tree_row_reference_get_path, pFp)
-GO(gtk_tree_row_reference_get_type, iFv)
+GO(gtk_tree_row_reference_get_type, LFv)
 GO(gtk_tree_row_reference_inserted, vFpp)
 GO(gtk_tree_row_reference_new, pFpp)
 GO(gtk_tree_row_reference_new_proxy, pFppp)
@@ -3362,7 +3362,7 @@ GO(gtk_tree_selection_get_selected, iFppp)
 GO(gtk_tree_selection_get_selected_rows, pFpp)
 //GOM(gtk_tree_selection_get_select_function, BFEp)
 GO(gtk_tree_selection_get_tree_view, pFp)
-GO(gtk_tree_selection_get_type, iFv)
+GO(gtk_tree_selection_get_type, LFv)
 //GOM(gtk_tree_selection_get_user_data, pFEp)
 GO(gtk_tree_selection_iter_is_selected, iFpp)
 GO(gtk_tree_selection_path_is_selected, iFpp)
@@ -3383,7 +3383,7 @@ GO(gtk_tree_selection_unselect_range, vFppp)
 //GO(gtk_tree_set_view_lines, 
 //GO(gtk_tree_set_view_mode, 
 GO(gtk_tree_sortable_get_sort_column_id, iFppp)
-GO(gtk_tree_sortable_get_type, iFv)
+GO(gtk_tree_sortable_get_type, LFv)
 GO(gtk_tree_sortable_has_default_sort_func, iFp)
 GOM(gtk_tree_sortable_set_default_sort_func, vFEpppp)
 GO(gtk_tree_sortable_set_sort_column_id, vFpii)
@@ -3391,7 +3391,7 @@ GOM(gtk_tree_sortable_set_sort_func, vFEpippp)
 GO(gtk_tree_sortable_sort_column_changed, vFp)
 GO(gtk_tree_store_append, vFppp)
 GO(gtk_tree_store_clear, vFp)
-GO(gtk_tree_store_get_type, iFv)
+GO(gtk_tree_store_get_type, LFv)
 GO(gtk_tree_store_insert, vFpppi)
 GO(gtk_tree_store_insert_after, vFpppp)
 GO(gtk_tree_store_insert_before, vFpppp)
@@ -3443,7 +3443,7 @@ GO(gtk_tree_view_column_get_sort_order, iFp)
 GO(gtk_tree_view_column_get_spacing, iFp)
 GO(gtk_tree_view_column_get_title, pFp)
 GO(gtk_tree_view_column_get_tree_view, pFp)
-GO(gtk_tree_view_column_get_type, iFv)
+GO(gtk_tree_view_column_get_type, LFv)
 GO(gtk_tree_view_column_get_visible, iFp)
 GO(gtk_tree_view_column_get_widget, pFp)
 GO(gtk_tree_view_column_get_width, iFp)
@@ -3471,7 +3471,7 @@ GO(gtk_tree_view_column_set_spacing, vFpi)
 GO(gtk_tree_view_column_set_title, vFpp)
 GO(gtk_tree_view_column_set_visible, vFpi)
 GO(gtk_tree_view_column_set_widget, vFpp)
-GO(gtk_tree_view_column_sizing_get_type, iFv)
+GO(gtk_tree_view_column_sizing_get_type, LFv)
 GO(gtk_tree_view_convert_bin_window_to_tree_coords, vFpiipp)
 GO(gtk_tree_view_convert_bin_window_to_widget_coords, vFpiipp)
 GO(gtk_tree_view_convert_tree_to_bin_window_coords, vFpiipp)
@@ -3479,7 +3479,7 @@ GO(gtk_tree_view_convert_tree_to_widget_coords, vFpiipp)
 GO(gtk_tree_view_convert_widget_to_bin_window_coords, vFpiipp)
 GO(gtk_tree_view_convert_widget_to_tree_coords, vFpiipp)
 GO(gtk_tree_view_create_row_drag_icon, pFpp)
-GO(gtk_tree_view_drop_position_get_type, iFv)
+GO(gtk_tree_view_drop_position_get_type, LFv)
 GO(gtk_tree_view_enable_model_drag_dest, vFppiu)
 GO(gtk_tree_view_enable_model_drag_source, vFpipiu)
 GO(gtk_tree_view_expand_all, vFp)
@@ -3518,17 +3518,17 @@ GO(gtk_tree_view_get_selection, pFp)
 GO(gtk_tree_view_get_show_expanders, iFp)
 GO(gtk_tree_view_get_tooltip_column, iFp)
 GO(gtk_tree_view_get_tooltip_context, iFpppippp)
-GO(gtk_tree_view_get_type, iFv)
+GO(gtk_tree_view_get_type, LFv)
 GO(gtk_tree_view_get_vadjustment, pFp)
 GO(gtk_tree_view_get_visible_range, iFppp)
 GO(gtk_tree_view_get_visible_rect, vFpp)
-GO(gtk_tree_view_grid_lines_get_type, iFv)
+GO(gtk_tree_view_grid_lines_get_type, LFv)
 GO(gtk_tree_view_insert_column, iFppi)
 GO(gtk_tree_view_insert_column_with_attributes, iFpipppppppppppp) //vaarg
 //GOM(gtk_tree_view_insert_column_with_data_func, iFpippBpB)
 GO(gtk_tree_view_is_rubber_banding_active, iFp)
 //GOM(gtk_tree_view_map_expanded_rows, vFEpBp)
-GO(gtk_tree_view_mode_get_type, iFv)
+GO(gtk_tree_view_mode_get_type, LFv)
 GO(gtk_tree_view_move_column_after, vFppp)
 GO(gtk_tree_view_new, pFv)
 GO(gtk_tree_view_new_with_model, pFp)
@@ -3589,49 +3589,49 @@ GO(gtk_ui_manager_get_action, pFpp)
 GO(gtk_ui_manager_get_action_groups, pFp)
 GO(gtk_ui_manager_get_add_tearoffs, iFp)
 GO(gtk_ui_manager_get_toplevels, pFpi)
-GO(gtk_ui_manager_get_type, iFv)
+GO(gtk_ui_manager_get_type, LFv)
 GO(gtk_ui_manager_get_ui, pFp)
 GO(gtk_ui_manager_get_widget, pFpp)
 GO(gtk_ui_manager_insert_action_group, vFppi)
-GO(gtk_ui_manager_item_type_get_type, iFv)
+GO(gtk_ui_manager_item_type_get_type, LFv)
 GO(gtk_ui_manager_new, pFv)
 GO(gtk_ui_manager_new_merge_id, uFp)
 GO(gtk_ui_manager_remove_action_group, vFpp)
 GO(gtk_ui_manager_remove_ui, vFpu)
 GO(gtk_ui_manager_set_add_tearoffs, vFpi)
-GO(gtk_unit_get_type, iFv)
-GO(gtk_update_type_get_type, iFv)
-GO(gtk_vbox_get_type, iFv)
+GO(gtk_unit_get_type, LFv)
+GO(gtk_update_type_get_type, LFv)
+GO(gtk_vbox_get_type, LFv)
 GO(gtk_vbox_new, pFii)
 //GO(gtk_vbutton_box_get_layout_default, 
 //GO(gtk_vbutton_box_get_spacing_default, 
-GO(gtk_vbutton_box_get_type, iFv)
+GO(gtk_vbutton_box_get_type, LFv)
 //GO(gtk_vbutton_box_new, 
 //GO(gtk_vbutton_box_set_layout_default, 
 //GO(gtk_vbutton_box_set_spacing_default, 
 GO(gtk_viewport_get_bin_window, pFp)
 GO(gtk_viewport_get_hadjustment, pFp)
 GO(gtk_viewport_get_shadow_type, iFp)
-GO(gtk_viewport_get_type, iFv)
+GO(gtk_viewport_get_type, LFv)
 GO(gtk_viewport_get_vadjustment, pFp)
 GO(gtk_viewport_get_view_window, pFp)
 GO(gtk_viewport_new, pFpp)
 GO(gtk_viewport_set_hadjustment, vFpp)
 GO(gtk_viewport_set_shadow_type, vFpi)
 GO(gtk_viewport_set_vadjustment, vFpp)
-GO(gtk_visibility_get_type, iFv)
-GO(gtk_volume_button_get_type, iFv)
+GO(gtk_visibility_get_type, LFv)
+GO(gtk_volume_button_get_type, LFv)
 GO(gtk_volume_button_new, pFv)
-GO(gtk_vpaned_get_type, iFv)
+GO(gtk_vpaned_get_type, LFv)
 GO(gtk_vpaned_new, pFv)
-GO(gtk_vruler_get_type, iFv)
+GO(gtk_vruler_get_type, LFv)
 GO(gtk_vruler_new, pFv)
-GO(gtk_vscale_get_type, iFv)
+GO(gtk_vscale_get_type, LFv)
 GO(gtk_vscale_new, pFp)
 GO(gtk_vscale_new_with_range, pFddd)
-GO(gtk_vscrollbar_get_type, iFv)
+GO(gtk_vscrollbar_get_type, LFv)
 GO(gtk_vscrollbar_new, pFp)
-GO(gtk_vseparator_get_type, iFv)
+GO(gtk_vseparator_get_type, LFv)
 GO(gtk_vseparator_new, pFv)
 GO(gtk_widget_activate, iFp)
 GO(gtk_widget_add_accelerator, vFpppuii)
@@ -3653,7 +3653,7 @@ GO(gtk_widget_draw, vFpp)
 GO(gtk_widget_ensure_style, vFp)
 GO(gtk_widget_error_bell, vFp)
 GO(gtk_widget_event, iFpp)
-GO(gtk_widget_flags_get_type, iFv)
+GO(gtk_widget_flags_get_type, LFv)
 GO(gtk_widget_freeze_child_notify, vFp)
 GO(gtk_widget_get_accessible, pFp)
 GO(gtk_widget_get_action, pFp)
@@ -3701,7 +3701,7 @@ GO(gtk_widget_get_tooltip_markup, pFp)
 GO(gtk_widget_get_tooltip_text, pFp)
 GO(gtk_widget_get_tooltip_window, pFp)
 GO(gtk_widget_get_toplevel, pFp)
-GO(gtk_widget_get_type, iFv)
+GO(gtk_widget_get_type, LFv)
 GO(gtk_widget_get_visible, iFp)
 GO(gtk_widget_get_visual, pFp)
 GO(gtk_widget_get_window, pFp)
@@ -3712,7 +3712,7 @@ GO(gtk_widget_has_focus, iFp)
 GO(gtk_widget_has_grab, iFp)
 GO(gtk_widget_has_rc_style, iFp)
 GO(gtk_widget_has_screen, iFp)
-GO(gtk_widget_help_type_get_type, iFv)
+GO(gtk_widget_help_type_get_type, LFv)
 GO(gtk_widget_hide, vFp)
 GO(gtk_widget_hide_all, vFp)
 GO(gtk_widget_hide_on_delete, iFp)
@@ -3853,13 +3853,13 @@ GO(gtk_window_get_skip_pager_hint, iFp)
 GO(gtk_window_get_skip_taskbar_hint, iFp)
 GO(gtk_window_get_title, pFp)
 GO(gtk_window_get_transient_for, pFp)
-GO(gtk_window_get_type, iFv)
+GO(gtk_window_get_type, LFv)
 GO(gtk_window_get_type_hint, iFp)
 GO(gtk_window_get_urgency_hint, iFp)
 GO(gtk_window_get_window_type, uFp)
 GO(gtk_window_group_add_window, vFpp)
 GO(gtk_window_group_get_current_grab, pFp)
-GO(gtk_window_group_get_type, iFv)
+GO(gtk_window_group_get_type, LFv)
 GO(gtk_window_group_list_windows, pFp)
 GO(gtk_window_group_new, pFv)
 GO(gtk_window_group_remove_window, vFpp)
@@ -3873,7 +3873,7 @@ GO(gtk_window_mnemonic_activate, iFpui)
 GO(gtk_window_move, vFpii)
 GO(gtk_window_new, pFi)
 GO(gtk_window_parse_geometry, iFpp)
-GO(gtk_window_position_get_type, iFv)
+GO(gtk_window_position_get_type, LFv)
 GO(gtk_window_present, vFp)
 GO(gtk_window_present_with_time, vFpu)
 GO(gtk_window_propagate_key_event, iFpp)
@@ -3923,11 +3923,11 @@ GO(gtk_window_set_type_hint, vFpi)
 GO(gtk_window_set_urgency_hint, vFpi)
 GO(gtk_window_set_wmclass, vFppp)
 GO(gtk_window_stick, vFp)
-GO(gtk_window_type_get_type, iFv)
+GO(gtk_window_type_get_type, LFv)
 GO(gtk_window_unfullscreen, vFp)
 GO(gtk_window_unmaximize, vFp)
 GO(gtk_window_unstick, vFp)
-GO(gtk_wrap_mode_get_type, iFv)
+GO(gtk_wrap_mode_get_type, LFv)
 
 // from gtk-1.2
 GOM(gtk_signal_connect, LFEpppp)