about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--src/wrapped/generated/functions_list.txt4
-rw-r--r--src/wrapped/generated/wrappedlbertypes.h4
-rw-r--r--src/wrapped/generated/wrapper.c7
-rw-r--r--src/wrapped/generated/wrapper.h2
-rw-r--r--src/wrapped/wrappedgssapikrb5_private.h18
-rw-r--r--src/wrapped/wrappedidn2_private.h10
-rw-r--r--src/wrapped/wrappedlber.c178
-rw-r--r--src/wrapped/wrappedlber_private.h4
-rw-r--r--src/wrapped/wrappedldapr_private.h20
-rw-r--r--src/wrapped/wrappedlibxcbxinput_private.h938
-rw-r--r--src/wrapped/wrappedpulse_private.h1
11 files changed, 686 insertions, 500 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index feea0d40..4999044b 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -582,7 +582,6 @@
 #() uFpip
 #() uFpCi
 #() uFpWi
-#() uFpWW
 #() uFpWu
 #() uFpWf
 #() uFpWp
@@ -2087,6 +2086,7 @@
 #() uFpuuupp
 #() uFpuuppp
 #() uFpupupu
+#() uFpupppp
 #() uFppippp
 #() uFppuuup
 #() uFppuupu
@@ -3991,6 +3991,8 @@ wrappedkrb5:
 - iFppppppipp:
   - krb5_get_init_creds_password
 wrappedlber:
+- iFppip:
+  - ber_sockbuf_add_io
 wrappedlcms2:
 wrappedldapr:
 - iFpppppupp:
diff --git a/src/wrapped/generated/wrappedlbertypes.h b/src/wrapped/generated/wrappedlbertypes.h
index 3074af68..4e0ffd66 100644
--- a/src/wrapped/generated/wrappedlbertypes.h
+++ b/src/wrapped/generated/wrappedlbertypes.h
@@ -11,7 +11,9 @@
 #define ADDED_FUNCTIONS() 
 #endif
 
+typedef int32_t (*iFppip_t)(void*, void*, int32_t, void*);
 
-#define SUPER() ADDED_FUNCTIONS()
+#define SUPER() ADDED_FUNCTIONS() \
+	GO(ber_sockbuf_add_io, iFppip_t)
 
 #endif // __wrappedlberTYPES_H_
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 5966030b..6da52f0f 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -620,7 +620,6 @@ typedef uint32_t (*uFpiu_t)(void*, int32_t, uint32_t);
 typedef uint32_t (*uFpip_t)(void*, int32_t, void*);
 typedef uint32_t (*uFpCi_t)(void*, uint8_t, int32_t);
 typedef uint32_t (*uFpWi_t)(void*, uint16_t, int32_t);
-typedef uint32_t (*uFpWW_t)(void*, uint16_t, uint16_t);
 typedef uint32_t (*uFpWu_t)(void*, uint16_t, uint32_t);
 typedef uint32_t (*uFpWf_t)(void*, uint16_t, float);
 typedef uint32_t (*uFpWp_t)(void*, uint16_t, void*);
@@ -2125,6 +2124,7 @@ typedef uint32_t (*uFpuuuup_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t, vo
 typedef uint32_t (*uFpuuupp_t)(void*, uint32_t, uint32_t, uint32_t, void*, void*);
 typedef uint32_t (*uFpuuppp_t)(void*, uint32_t, uint32_t, void*, void*, void*);
 typedef uint32_t (*uFpupupu_t)(void*, uint32_t, void*, uint32_t, void*, uint32_t);
+typedef uint32_t (*uFpupppp_t)(void*, uint32_t, void*, void*, void*, void*);
 typedef uint32_t (*uFppippp_t)(void*, void*, int32_t, void*, void*, void*);
 typedef uint32_t (*uFppuuup_t)(void*, void*, uint32_t, uint32_t, uint32_t, void*);
 typedef uint32_t (*uFppuupu_t)(void*, void*, uint32_t, uint32_t, void*, uint32_t);
@@ -3678,7 +3678,6 @@ void uFpiu(x64emu_t *emu, uintptr_t fcn) { uFpiu_t fn = (uFpiu_t)fcn; R_RAX=(uin
 void uFpip(x64emu_t *emu, uintptr_t fcn) { uFpip_t fn = (uFpip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
 void uFpCi(x64emu_t *emu, uintptr_t fcn) { uFpCi_t fn = (uFpCi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (int32_t)R_RDX); }
 void uFpWi(x64emu_t *emu, uintptr_t fcn) { uFpWi_t fn = (uFpWi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (int32_t)R_RDX); }
-void uFpWW(x64emu_t *emu, uintptr_t fcn) { uFpWW_t fn = (uFpWW_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint16_t)R_RDX); }
 void uFpWu(x64emu_t *emu, uintptr_t fcn) { uFpWu_t fn = (uFpWu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint32_t)R_RDX); }
 void uFpWf(x64emu_t *emu, uintptr_t fcn) { uFpWf_t fn = (uFpWf_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, emu->xmm[0].f[0]); }
 void uFpWp(x64emu_t *emu, uintptr_t fcn) { uFpWp_t fn = (uFpWp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX); }
@@ -5183,6 +5182,7 @@ void uFpuuuup(x64emu_t *emu, uintptr_t fcn) { uFpuuuup_t fn = (uFpuuuup_t)fcn; R
 void uFpuuupp(x64emu_t *emu, uintptr_t fcn) { uFpuuupp_t fn = (uFpuuupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFpuuppp(x64emu_t *emu, uintptr_t fcn) { uFpuuppp_t fn = (uFpuuppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFpupupu(x64emu_t *emu, uintptr_t fcn) { uFpupupu_t fn = (uFpupupu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
+void uFpupppp(x64emu_t *emu, uintptr_t fcn) { uFpupppp_t fn = (uFpupppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFppippp(x64emu_t *emu, uintptr_t fcn) { uFppippp_t fn = (uFppippp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); }
 void uFppuuup(x64emu_t *emu, uintptr_t fcn) { uFppuuup_t fn = (uFppuuup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8, (void*)R_R9); }
 void uFppuupu(x64emu_t *emu, uintptr_t fcn) { uFppuupu_t fn = (uFppuupu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8, (uint32_t)R_R9); }
@@ -6639,7 +6639,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpip) return 1;
 	if (fun == &uFpCi) return 1;
 	if (fun == &uFpWi) return 1;
-	if (fun == &uFpWW) return 1;
 	if (fun == &uFpWu) return 1;
 	if (fun == &uFpWf) return 2;
 	if (fun == &uFpWp) return 1;
@@ -7872,6 +7871,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpuuupp) return 1;
 	if (fun == &uFpuuppp) return 1;
 	if (fun == &uFpupupu) return 1;
+	if (fun == &uFpupppp) return 1;
 	if (fun == &uFppippp) return 1;
 	if (fun == &uFppuuup) return 1;
 	if (fun == &uFppuupu) return 1;
@@ -8205,7 +8205,6 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFufp) return 3;
 	if (fun == &uFupu) return 1;
 	if (fun == &uFupp) return 1;
-	if (fun == &uFpWW) return 1;
 	if (fun == &uFpWu) return 1;
 	if (fun == &uFpWf) return 3;
 	if (fun == &uFpWp) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 9181958c..e6cc6738 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -620,7 +620,6 @@ void uFpiu(x64emu_t *emu, uintptr_t fnc);
 void uFpip(x64emu_t *emu, uintptr_t fnc);
 void uFpCi(x64emu_t *emu, uintptr_t fnc);
 void uFpWi(x64emu_t *emu, uintptr_t fnc);
-void uFpWW(x64emu_t *emu, uintptr_t fnc);
 void uFpWu(x64emu_t *emu, uintptr_t fnc);
 void uFpWf(x64emu_t *emu, uintptr_t fnc);
 void uFpWp(x64emu_t *emu, uintptr_t fnc);
@@ -2125,6 +2124,7 @@ void uFpuuuup(x64emu_t *emu, uintptr_t fnc);
 void uFpuuupp(x64emu_t *emu, uintptr_t fnc);
 void uFpuuppp(x64emu_t *emu, uintptr_t fnc);
 void uFpupupu(x64emu_t *emu, uintptr_t fnc);
+void uFpupppp(x64emu_t *emu, uintptr_t fnc);
 void uFppippp(x64emu_t *emu, uintptr_t fnc);
 void uFppuuup(x64emu_t *emu, uintptr_t fnc);
 void uFppuupu(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedgssapikrb5_private.h b/src/wrapped/wrappedgssapikrb5_private.h
index e95d77da..1329530f 100644
--- a/src/wrapped/wrappedgssapikrb5_private.h
+++ b/src/wrapped/wrappedgssapikrb5_private.h
@@ -12,7 +12,7 @@ GO(gss_acquire_cred, uFppuppppp)
 //GO(gss_add_cred_from, 
 //GO(gss_add_cred_impersonate_name, 
 //GO(gss_add_cred_with_password, 
-//GO(gss_add_oid_set_member, 
+GO(gss_add_oid_set_member, uFpup)
 //GO(gss_authorize_localname, 
 //GO(gss_canonicalize_name, 
 //DATA(GSS_C_ATTR_LOCAL_LOGIN_USER, 
@@ -51,17 +51,17 @@ DATA(GSS_C_NT_HOSTBASED_SERVICE, sizeof(void*))
 //DATA(GSS_C_NT_HOSTBASED_SERVICE_X, 
 //DATA(GSS_C_NT_MACHINE_UID_NAME, 
 //DATA(GSS_C_NT_STRING_UID_NAME, 
-//DATA(GSS_C_NT_USER_NAME, 
+DATA(GSS_C_NT_USER_NAME, sizeof(void*))
 //GO(gss_compare_name, 
 //GO(gss_complete_auth_token, 
 //GO(gss_context_time, 
 //GO(gss_create_empty_buffer_set, 
-//GO(gss_create_empty_oid_set, 
+GO(gss_create_empty_oid_set, uFpp)
 //GO(gss_decapsulate_token, 
 //GO(gss_delete_name_attribute, 
 GO(gss_delete_sec_context, uFppp)
 //GO(gss_display_mech_attr, 
-//GO(gss_display_name, 
+GO(gss_display_name, uFpppp)
 //GO(gss_display_name_ext, 
 GO(gss_display_status, uFpuippp)
 //GO(gss_duplicate_name, 
@@ -77,13 +77,13 @@ GO(gss_get_mic, uFppupp)
 //GO(gss_import_cred, 
 GO(gss_import_name, uFpppp)
 //GO(gss_import_sec_context, 
-//GO(gss_indicate_mechs, 
+GO(gss_indicate_mechs, uFpp)
 //GO(gss_indicate_mechs_by_attrs, 
 GO(gss_init_sec_context, uFpppppuupppppp)
 //GO(gss_inquire_attrs_for_mech, 
 GO(gss_inquire_context, uFppppppppp)
-//GO(gss_inquire_cred, 
-//GO(gss_inquire_cred_by_mech, 
+GO(gss_inquire_cred, uFpupppp)
+GO(gss_inquire_cred_by_mech, uFpuupppp)
 //GO(gss_inquire_cred_by_oid, 
 //GO(gss_inquire_mech_for_saslname, 
 //GO(gss_inquire_mechs_for_name, 
@@ -134,7 +134,7 @@ GO(gss_release_cred, uFpp)
 GO(gss_release_iov_buffer, uFppi)
 GO(gss_release_name, uFpp)
 //GO(gss_release_oid, 
-//GO(gss_release_oid_set, 
+GO(gss_release_oid_set, uFpp)
 //GO(gss_seal, 
 //GO(gss_set_cred_option, 
 //GO(gss_set_name_attribute, 
@@ -146,7 +146,7 @@ GO(gss_release_name, uFpp)
 //GO(gss_store_cred, 
 //GO(gss_store_cred_into, 
 //GO(gss_str_to_oid, 
-//GO(gss_test_oid_set_member, 
+GO(gss_test_oid_set_member, uFpupp)
 //GO(gss_unseal, 
 GO(gss_unwrap, uFpppppp)
 //GO(gss_unwrap_aead, 
diff --git a/src/wrapped/wrappedidn2_private.h b/src/wrapped/wrappedidn2_private.h
index 9ae28ea0..b69b45aa 100644
--- a/src/wrapped/wrappedidn2_private.h
+++ b/src/wrapped/wrappedidn2_private.h
@@ -2,15 +2,15 @@
 #error Meh....
 #endif
 
-//GO(idn2_check_version, 
-//GO(idn2_free, 
-//GO(idn2_lookup_u8, 
-//GO(idn2_lookup_ul, 
+GO(idn2_check_version, pFp)
+GO(idn2_free, vFp)
+GO(idn2_lookup_u8, iFppi)
+GO(idn2_lookup_ul, iFppi)
 //GO(_idn2_punycode_decode, 
 //GO(_idn2_punycode_encode, 
 //GO(idn2_register_u8, 
 //GO(idn2_register_ul, 
-//GO(idn2_strerror, 
+GO(idn2_strerror, pFi)
 //GO(idn2_strerror_name, 
 //GO(idn2_to_ascii_4i, 
 //GO(idn2_to_ascii_4i2, 
diff --git a/src/wrapped/wrappedlber.c b/src/wrapped/wrappedlber.c
index 16eefc5c..c52db302 100644
--- a/src/wrapped/wrappedlber.c
+++ b/src/wrapped/wrappedlber.c
@@ -6,10 +6,16 @@
 
 #include "wrappedlibs.h"
 
+#include "debug.h"
 #include "wrapper.h"
 #include "bridge.h"
 #include "librarian/library_private.h"
 #include "x64emu.h"
+#include "emu/x64emu_private.h"
+#include "box64context.h"
+#include "librarian.h"
+#include "callback.h"
+
 
 const char* lberName =
 #ifdef ANDROID
@@ -21,5 +27,177 @@ const char* lberName =
 #define ALTNAME "liblber-2.5.so.0"
 #define LIBNAME lber
 
+#define ADDED_FUNCTIONS()           \
+
+#include "generated/wrappedlbertypes.h"
+
+#include "wrappercallback.h"
+
+typedef struct my_sockbuf_io_s {
+    int (*sbi_setup)(void* sbiod, void* arg);
+    int (*sbi_remove)(void* sbiod);
+    int (*sbi_ctrl)(void* sbiod, int opt, void* arg);
+    size_t (*sbi_read)(void* sbiod, void* buf, size_t len);
+    size_t (*sbi_write)(void* sbiod, void* buf, size_t len);
+    int (*sbi_close)(void* sbiod);
+} my_sockbuf_io_t;
+
+#define SUPER() \
+GO(0)   \
+GO(1)   \
+GO(2)   \
+GO(3)   \
+GO(4)
+
+// sbi_setup ...
+#define GO(A)   \
+static uintptr_t my_sbi_setup_fct_##A = 0;                      \
+static int my_sbi_setup_##A(void* a, void* b)                   \
+{                                                               \
+    return RunFunctionFmt(my_sbi_setup_fct_##A, "pp", a, b);    \
+}
+SUPER()
+#undef GO
+static void* find_sbi_setup_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_sbi_setup_fct_##A == (uintptr_t)fct) return my_sbi_setup_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_sbi_setup_fct_##A == 0) {my_sbi_setup_fct_##A = (uintptr_t)fct; return my_sbi_setup_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for liblber sbi_setup callback\n");
+    return NULL;
+}
+// sbi_remove ...
+#define GO(A)   \
+static uintptr_t my_sbi_remove_fct_##A = 0;                     \
+static int my_sbi_remove_##A(void* a)                           \
+{                                                               \
+    return RunFunctionFmt(my_sbi_remove_fct_##A, "p", a);       \
+}
+SUPER()
+#undef GO
+static void* find_sbi_remove_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_sbi_remove_fct_##A == (uintptr_t)fct) return my_sbi_remove_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_sbi_remove_fct_##A == 0) {my_sbi_remove_fct_##A = (uintptr_t)fct; return my_sbi_remove_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for liblber sbi_remove callback\n");
+    return NULL;
+}
+// sbi_ctrl ...
+#define GO(A)   \
+static uintptr_t my_sbi_ctrl_fct_##A = 0;                       \
+static int my_sbi_ctrl_##A(void* a, int b, void* c)             \
+{                                                               \
+    return RunFunctionFmt(my_sbi_ctrl_fct_##A, "pip", a, b, c); \
+}
+SUPER()
+#undef GO
+static void* find_sbi_ctrl_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_sbi_ctrl_fct_##A == (uintptr_t)fct) return my_sbi_ctrl_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_sbi_ctrl_fct_##A == 0) {my_sbi_ctrl_fct_##A = (uintptr_t)fct; return my_sbi_ctrl_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for liblber sbi_ctrl callback\n");
+    return NULL;
+}
+// sbi_read ...
+#define GO(A)   \
+static uintptr_t my_sbi_read_fct_##A = 0;                       \
+static size_t my_sbi_read_##A(void* a, void* b, size_t c)       \
+{                                                               \
+    return RunFunctionFmt(my_sbi_read_fct_##A, "ppL", a, b, c); \
+}
+SUPER()
+#undef GO
+static void* find_sbi_read_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_sbi_read_fct_##A == (uintptr_t)fct) return my_sbi_read_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_sbi_read_fct_##A == 0) {my_sbi_read_fct_##A = (uintptr_t)fct; return my_sbi_read_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for liblber sbi_read callback\n");
+    return NULL;
+}
+// sbi_write ...
+#define GO(A)   \
+static uintptr_t my_sbi_write_fct_##A = 0;                          \
+static size_t my_sbi_write_##A(void* a, void* b, size_t c)          \
+{                                                                   \
+    return RunFunctionFmt(my_sbi_write_fct_##A, "ppL", a, b, c);    \
+}
+SUPER()
+#undef GO
+static void* find_sbi_write_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_sbi_write_fct_##A == (uintptr_t)fct) return my_sbi_write_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_sbi_write_fct_##A == 0) {my_sbi_write_fct_##A = (uintptr_t)fct; return my_sbi_write_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for liblber sbi_write callback\n");
+    return NULL;
+}// sbi_close ...
+#define GO(A)   \
+static uintptr_t my_sbi_close_fct_##A = 0;                  \
+static int my_sbi_close_##A(void* a)                        \
+{                                                           \
+    return RunFunctionFmt(my_sbi_close_fct_##A, "p", a);    \
+}
+SUPER()
+#undef GO
+static void* find_sbi_close_Fct(void* fct)
+{
+    if(!fct) return fct;
+    if(GetNativeFnc((uintptr_t)fct))  return GetNativeFnc((uintptr_t)fct);
+    #define GO(A) if(my_sbi_close_fct_##A == (uintptr_t)fct) return my_sbi_close_##A;
+    SUPER()
+    #undef GO
+    #define GO(A) if(my_sbi_close_fct_##A == 0) {my_sbi_close_fct_##A = (uintptr_t)fct; return my_sbi_close_##A; }
+    SUPER()
+    #undef GO
+    printf_log(LOG_NONE, "Warning, no more slot for liblber sbi_close callback\n");
+    return NULL;
+}
+
+#undef SUPER
+
+EXPORT int my_ber_sockbuf_add_io(x64emu_t* emu, void* sb, my_sockbuf_io_t* io, int layer, void* arg)
+{
+    my_sockbuf_io_t my_io = {0};
+    if(io) {
+        #define GO(A) my_io.A = find_##A##_Fct(io->A)
+        GO(sbi_setup);
+        GO(sbi_remove);
+        GO(sbi_ctrl);
+        GO(sbi_read);
+        GO(sbi_write);
+        GO(sbi_close);
+        #undef GO
+    }
+    return my->ber_sockbuf_add_io(sb, io?&my_io:NULL, layer, arg);
+}
+
 #include "wrappedlib_init.h"
 
diff --git a/src/wrapped/wrappedlber_private.h b/src/wrapped/wrappedlber_private.h
index 4f1b1d1a..105c47d1 100644
--- a/src/wrapped/wrappedlber_private.h
+++ b/src/wrapped/wrappedlber_private.h
@@ -72,7 +72,7 @@ GO(ber_init2, vFppi)
 //GO(ber_memalloc_x, 
 //GO(ber_memcalloc, 
 //GO(ber_memcalloc_x, 
-//GO(ber_memfree, 
+GO(ber_memfree, vFp)
 //GO(ber_memfree_x, 
 //GO(ber_memrealloc, 
 //GO(ber_memrealloc_x, 
@@ -114,7 +114,7 @@ GO(ber_scanf, LFpppppppppppppppppp) // VAArg
 //GO(ber_skip_data, 
 //GO(ber_skip_element, 
 GO(ber_skip_tag, LFpp)
-//GO(ber_sockbuf_add_io, 
+GOM(ber_sockbuf_add_io, iFEppip)
 //GO(ber_sockbuf_alloc, 
 //GO(ber_sockbuf_ctrl, 
 //GO(ber_sockbuf_free, 
diff --git a/src/wrapped/wrappedldapr_private.h b/src/wrapped/wrappedldapr_private.h
index 97ae8fe2..ddfbaede 100644
--- a/src/wrapped/wrappedldapr_private.h
+++ b/src/wrapped/wrappedldapr_private.h
@@ -60,7 +60,7 @@ GO(ldap_control_free, vFp)
 GO(ldap_controls_dup, pFp)
 GO(ldap_controls_free, vFp)
 GO(ldap_count_entries, iFpp)
-//GO(ldap_count_messages, 
+GO(ldap_count_messages, iFpp)
 GO(ldap_count_references, iFpp)
 GO(ldap_count_values, iFp)
 GO(ldap_count_values_len, iFp)
@@ -103,7 +103,7 @@ GO(ldap_dn2ufn, pFp)
 //GO(ldap_dump_connection, 
 //GO(ldap_dump_requests_and_responses, 
 //GO(ldap_dup, 
-//GO(ldap_err2string, 
+GO(ldap_err2string, pFi)
 GO(ldap_explode_dn, pFpi)
 GO(ldap_explode_rdn, pFpi)
 GO(ldap_extended_operation, iFpppppp)
@@ -112,17 +112,17 @@ GO(ldap_extended_operation_s, iFppppppp)
 //GO(ldap_find_request_by_msgid, 
 GO(ldap_first_attribute, pFppp)
 GO(ldap_first_entry, pFpp)
-//GO(ldap_first_message, 
+GO(ldap_first_message, pFpp)
 GO(ldap_first_reference, pFpp)
 //GO(ldap_free_connection, 
 //GO(ldap_free_request, 
 //GO(ldap_free_select_info, 
 //GO(ldap_free_sort_keylist, 
-//GO(ldap_free_urldesc, 
+GO(ldap_free_urldesc, vFp)
 //GO(ldap_free_urllist, 
-//GO(ldap_get_attribute_ber, 
+GO(ldap_get_attribute_ber, iFppppp)
 GO(ldap_get_dn, pFpp)
-//GO(ldap_get_dn_ber, 
+GO(ldap_get_dn_ber, iFpppp)
 //GO(ldap_get_entry_controls, 
 //GO(ldap_get_message_ber, 
 GO(ldap_get_option, iFpip)
@@ -178,7 +178,7 @@ GO(ldap_install_tls, iFp)
 //GO(ldap_int_utils_init, 
 //GO(ldap_is_ldapi_url, 
 //GO(ldap_is_ldaps_url, 
-//GO(ldap_is_ldap_url, 
+GO(ldap_is_ldap_url, iFp)
 //GO(ldap_is_read_ready, 
 //GO(ldap_is_write_ready, 
 //GO(ldap_ld_free, 
@@ -220,7 +220,7 @@ GO(ldap_msgtype, iFp)
 //GO(ldap_new_select_info, 
 GO(ldap_next_attribute, pFppp)
 GO(ldap_next_entry, pFpp)
-//GO(ldap_next_message, 
+GO(ldap_next_message, pFpp)
 GO(ldap_next_reference, pFpp)
 //GO(ldap_ntlm_bind, 
 //GO(ldap_objectclass2bv, 
@@ -368,7 +368,7 @@ GO(ldap_parse_vlvresponse_control, iFpppppp)
 //GO(ldap_pvt_tls_inplace, 
 //GO(ldap_pvt_tls_sb_ctx, 
 //GO(ldap_pvt_tls_set_option, 
-//GO(ldap_pvt_url_scheme2proto, 
+GO(ldap_pvt_url_scheme2proto, iFp)
 //GO(ldap_pvt_url_scheme2tls, 
 //GO(ldap_pvt_url_scheme_port, 
 //GO(ldap_rdn2bv, 
@@ -449,7 +449,7 @@ GO(ldap_unbind_s, iFp)
 //GO(ldap_url_duplist, 
 //GO(ldap_url_list2hosts, 
 //GO(ldap_url_list2urls, 
-//GO(ldap_url_parse, 
+GO(ldap_url_parse, iFpp)
 //GO(ldap_url_parse_ext, 
 //GO(ldap_url_parsehosts, 
 //GO(ldap_url_parselist, 
diff --git a/src/wrapped/wrappedlibxcbxinput_private.h b/src/wrapped/wrappedlibxcbxinput_private.h
index f41ed107..a7dd0ded 100644
--- a/src/wrapped/wrappedlibxcbxinput_private.h
+++ b/src/wrapped/wrappedlibxcbxinput_private.h
@@ -3,470 +3,474 @@
 #endif
 
 DATA(xcb_input_id, 2*sizeof(void*))
-// GO(xcb_input_input_info_info
-// GO(xcb_input_send_extension_event_sizeof
-// GO(xcb_input_device_class_data_sizeof
-// GO(xcb_input_close_device
-// GO(xcb_input_feedback_state_data
-// GO(xcb_input_feedback_ctl_data
-// GO(xcb_input_input_state_data
-// GO(xcb_input_device_state_data
-// GO(xcb_input_device_ctl_data
-// GO(xcb_input_hierarchy_change_data
-// GO(xcb_input_device_class_data
-// GO(xcb_input_event_class_next
-// GO(xcb_input_event_class_end
-// GO(xcb_input_key_code_next
-// GO(xcb_input_key_code_end
-// GO(xcb_input_device_id_next
-// GO(xcb_input_device_id_end
-// GO(xcb_input_fp1616_next
-// GO(xcb_input_fp1616_end
-// GO(xcb_input_fp3232_next
-// GO(xcb_input_fp3232_end
-// GO(xcb_input_get_extension_version_unchecked
-// GO(xcb_input_get_extension_version_reply
-// GO(xcb_input_device_info_next
-// GO(xcb_input_device_info_end
-// GO(xcb_input_key_info_next
-// GO(xcb_input_key_info_end
-// GO(xcb_input_button_info_next
-// GO(xcb_input_button_info_end
-// GO(xcb_input_axis_info_next
-// GO(xcb_input_axis_info_end
-// GO(xcb_input_valuator_info_axes
-// GO(xcb_input_valuator_info_axes_length
-// GO(xcb_input_valuator_info_axes_iterator
-// GO(xcb_input_valuator_info_next
-// GO(xcb_input_valuator_info_end
-// GO(xcb_input_input_info_info_valuator_axes
-// GO(xcb_input_input_info_info_valuator_axes_length
-// GO(xcb_input_input_info_info_valuator_axes_iterator
-// GO(xcb_input_input_info_info_serialize
-// GO(xcb_input_input_info_info_unpack
-// GO(xcb_input_input_state_data_sizeof
-// GO(xcb_input_input_info_next
-// GO(xcb_input_input_info_end
-// GO(xcb_input_device_name_string
-// GO(xcb_input_device_name_string_length
-// GO(xcb_input_device_name_string_end
-// GO(xcb_input_device_name_next
-// GO(xcb_input_device_name_end
-// GO(xcb_input_list_input_devices_unchecked
-// GO(xcb_input_list_input_devices_devices
-// GO(xcb_input_list_input_devices_names_length
-// GO(xcb_input_list_input_devices_devices_iterator
-// GO(xcb_input_list_input_devices_infos_iterator
-// GO(xcb_input_list_input_devices_names_iterator
-// GO(xcb_input_list_input_devices_reply
-// GO(xcb_input_event_type_base_next
-// GO(xcb_input_event_type_base_end
-// GO(xcb_input_input_class_info_next
-// GO(xcb_input_input_class_info_end
-// GO(xcb_input_open_device_unchecked
-// GO(xcb_input_open_device_class_info
-// GO(xcb_input_open_device_class_info_length
-// GO(xcb_input_open_device_class_info_iterator
-// GO(xcb_input_open_device_reply
-// GO(xcb_input_set_device_mode_unchecked
-// GO(xcb_input_set_device_mode_reply
-// GO(xcb_input_select_extension_event
-// GO(xcb_input_select_extension_event_classes
-// GO(xcb_input_select_extension_event_classes_length
-// GO(xcb_input_select_extension_event_classes_end
-// GO(xcb_input_get_selected_extension_events_unchecked
-// GO(xcb_input_get_selected_extension_events_all_classes
-// GO(xcb_input_get_selected_extension_events_all_classes_length
-// GO(xcb_input_get_selected_extension_events_all_classes_end
-// GO(xcb_input_get_selected_extension_events_reply
-// GO(xcb_input_change_device_dont_propagate_list
-// GO(xcb_input_change_device_dont_propagate_list_classes
-// GO(xcb_input_change_device_dont_propagate_list_classes_length
-// GO(xcb_input_change_device_dont_propagate_list_classes_end
-// GO(xcb_input_get_device_dont_propagate_list_unchecked
-// GO(xcb_input_get_device_dont_propagate_list_classes
-// GO(xcb_input_get_device_dont_propagate_list_classes_length
-// GO(xcb_input_get_device_dont_propagate_list_classes_end
-// GO(xcb_input_get_device_dont_propagate_list_reply
-// GO(xcb_input_device_time_coord_axisvalues
-// GO(xcb_input_device_time_coord_axisvalues_length
-// GO(xcb_input_device_time_coord_axisvalues_end
-// GO(xcb_input_device_time_coord_next
-// GO(xcb_input_device_time_coord_end
-// GO(xcb_input_get_device_motion_events_unchecked
-// GO(xcb_input_get_device_motion_events_events_length
-// GO(xcb_input_get_device_motion_events_events_iterator
-// GO(xcb_input_get_device_motion_events_reply
-// GO(xcb_input_change_keyboard_device_unchecked
-// GO(xcb_input_change_keyboard_device_reply
-// GO(xcb_input_change_pointer_device_unchecked
-// GO(xcb_input_change_pointer_device_reply
-// GO(xcb_input_grab_device_unchecked
-// GO(xcb_input_grab_device_reply
-// GO(xcb_input_ungrab_device
-// GO(xcb_input_grab_device_key
-// GO(xcb_input_grab_device_key_classes
-// GO(xcb_input_grab_device_key_classes_length
-// GO(xcb_input_grab_device_key_classes_end
-// GO(xcb_input_ungrab_device_button
-// GO(xcb_input_grab_device_button
-// GO(xcb_input_grab_device_button_classes
-// GO(xcb_input_grab_device_button_classes_length
-// GO(xcb_input_grab_device_button_classes_end
-// GO(xcb_input_allow_device_events
-// GO(xcb_input_get_device_focus_unchecked
-// GO(xcb_input_get_device_focus_reply
-// GO(xcb_input_set_device_focus
-// GO(xcb_input_kbd_feedback_state_next
-// GO(xcb_input_kbd_feedback_state_end
-// GO(xcb_input_ptr_feedback_state_next
-// GO(xcb_input_ptr_feedback_state_end
-// GO(xcb_input_integer_feedback_state_next
-// GO(xcb_input_integer_feedback_state_end
-// GO(xcb_input_string_feedback_state_keysyms
-// GO(xcb_input_string_feedback_state_keysyms_length
-// GO(xcb_input_string_feedback_state_keysyms_end
-// GO(xcb_input_string_feedback_state_next
-// GO(xcb_input_string_feedback_state_end
-// GO(xcb_input_bell_feedback_state_next
-// GO(xcb_input_bell_feedback_state_end
-// GO(xcb_input_led_feedback_state_next
-// GO(xcb_input_led_feedback_state_end
-// GO(xcb_input_feedback_state_data_string_keysyms
-// GO(xcb_input_feedback_state_data_string_keysyms_length
-// GO(xcb_input_feedback_state_data_string_keysyms_end
-// GO(xcb_input_feedback_state_data_serialize
-// GO(xcb_input_feedback_state_data_unpack
-// GO(xcb_input_feedback_state_next
-// GO(xcb_input_feedback_state_end
-// GO(xcb_input_get_feedback_control_unchecked
-// GO(xcb_input_get_feedback_control_feedbacks_length
-// GO(xcb_input_get_feedback_control_feedbacks_iterator
-// GO(xcb_input_get_feedback_control_reply
-// GO(xcb_input_kbd_feedback_ctl_next
-// GO(xcb_input_kbd_feedback_ctl_end
-// GO(xcb_input_ptr_feedback_ctl_next
-// GO(xcb_input_ptr_feedback_ctl_end
-// GO(xcb_input_integer_feedback_ctl_next
-// GO(xcb_input_integer_feedback_ctl_end
-// GO(xcb_input_string_feedback_ctl_keysyms
-// GO(xcb_input_string_feedback_ctl_keysyms_length
-// GO(xcb_input_string_feedback_ctl_keysyms_end
-// GO(xcb_input_string_feedback_ctl_next
-// GO(xcb_input_string_feedback_ctl_end
-// GO(xcb_input_bell_feedback_ctl_next
-// GO(xcb_input_bell_feedback_ctl_end
-// GO(xcb_input_led_feedback_ctl_next
-// GO(xcb_input_led_feedback_ctl_end
-// GO(xcb_input_feedback_ctl_data_string_keysyms
-// GO(xcb_input_feedback_ctl_data_string_keysyms_length
-// GO(xcb_input_feedback_ctl_data_string_keysyms_end
-// GO(xcb_input_feedback_ctl_data_serialize
-// GO(xcb_input_feedback_ctl_data_unpack
-// GO(xcb_input_feedback_ctl_next
-// GO(xcb_input_feedback_ctl_end
-// GO(xcb_input_change_feedback_control
-// GO(xcb_input_change_feedback_control_feedback
-// GO(xcb_input_get_device_key_mapping_unchecked
-// GO(xcb_input_get_device_key_mapping_keysyms
-// GO(xcb_input_get_device_key_mapping_keysyms_length
-// GO(xcb_input_get_device_key_mapping_keysyms_end
-// GO(xcb_input_get_device_key_mapping_reply
-// GO(xcb_input_change_device_key_mapping
-// GO(xcb_input_change_device_key_mapping_keysyms
-// GO(xcb_input_change_device_key_mapping_keysyms_length
-// GO(xcb_input_change_device_key_mapping_keysyms_end
-// GO(xcb_input_get_device_modifier_mapping_unchecked
-// GO(xcb_input_get_device_modifier_mapping_keymaps
-// GO(xcb_input_get_device_modifier_mapping_keymaps_length
-// GO(xcb_input_get_device_modifier_mapping_keymaps_end
-// GO(xcb_input_get_device_modifier_mapping_reply
-// GO(xcb_input_set_device_modifier_mapping_unchecked
-// GO(xcb_input_set_device_modifier_mapping_reply
-// GO(xcb_input_get_device_button_mapping_unchecked
-// GO(xcb_input_get_device_button_mapping_map
-// GO(xcb_input_get_device_button_mapping_map_length
-// GO(xcb_input_get_device_button_mapping_map_end
-// GO(xcb_input_get_device_button_mapping_reply
-// GO(xcb_input_set_device_button_mapping_unchecked
-// GO(xcb_input_set_device_button_mapping_reply
-// GO(xcb_input_key_state_next
-// GO(xcb_input_key_state_end
-// GO(xcb_input_button_state_next
-// GO(xcb_input_button_state_end
-// GO(xcb_input_valuator_state_valuators
-// GO(xcb_input_valuator_state_valuators_length
-// GO(xcb_input_valuator_state_valuators_end
-// GO(xcb_input_valuator_state_next
-// GO(xcb_input_valuator_state_end
-// GO(xcb_input_input_state_data_valuator_valuators
-// GO(xcb_input_input_state_data_valuator_valuators_length
-// GO(xcb_input_input_state_data_valuator_valuators_end
-// GO(xcb_input_input_state_data_serialize
-// GO(xcb_input_input_state_data_unpack
-// GO(xcb_input_input_state_next
-// GO(xcb_input_input_state_end
-// GO(xcb_input_query_device_state_unchecked
-// GO(xcb_input_query_device_state_classes_length
-// GO(xcb_input_query_device_state_classes_iterator
-// GO(xcb_input_query_device_state_reply
-// GO(xcb_input_device_bell
-// GO(xcb_input_set_device_valuators_unchecked
-// GO(xcb_input_set_device_valuators_reply
-// GO(xcb_input_device_resolution_state_resolution_max
-// GO(xcb_input_device_resolution_state_resolution_max_length
-// GO(xcb_input_device_resolution_state_resolution_max_end
-// GO(xcb_input_device_resolution_state_next
-// GO(xcb_input_device_resolution_state_end
-// GO(xcb_input_device_abs_calib_state_next
-// GO(xcb_input_device_abs_calib_state_end
-// GO(xcb_input_device_abs_area_state_next
-// GO(xcb_input_device_abs_area_state_end
-// GO(xcb_input_device_core_state_next
-// GO(xcb_input_device_core_state_end
-// GO(xcb_input_device_enable_state_next
-// GO(xcb_input_device_enable_state_end
-// GO(xcb_input_device_state_data_resolution_resolution_max
-// GO(xcb_input_device_state_data_resolution_resolution_max_length
-// GO(xcb_input_device_state_data_resolution_resolution_max_end
-// GO(xcb_input_device_state_data_serialize
-// GO(xcb_input_device_state_data_unpack
-// GO(xcb_input_device_state_next
-// GO(xcb_input_device_state_end
-// GO(xcb_input_get_device_control_unchecked
-// GO(xcb_input_get_device_control_control
-// GO(xcb_input_get_device_control_reply
-// GO(xcb_input_device_resolution_ctl_resolution_values
-// GO(xcb_input_device_resolution_ctl_resolution_values_length
-// GO(xcb_input_device_resolution_ctl_resolution_values_end
-// GO(xcb_input_device_resolution_ctl_next
-// GO(xcb_input_device_resolution_ctl_end
-// GO(xcb_input_device_abs_calib_ctl_next
-// GO(xcb_input_device_abs_calib_ctl_end
-// GO(xcb_input_device_abs_area_ctrl_next
-// GO(xcb_input_device_abs_area_ctrl_end
-// GO(xcb_input_device_core_ctrl_next
-// GO(xcb_input_device_core_ctrl_end
-// GO(xcb_input_device_enable_ctrl_next
-// GO(xcb_input_device_enable_ctrl_end
-// GO(xcb_input_device_ctl_data_resolution_resolution_values
-// GO(xcb_input_device_ctl_data_resolution_resolution_values_length
-// GO(xcb_input_device_ctl_data_resolution_resolution_values_end
-// GO(xcb_input_device_ctl_data_serialize
-// GO(xcb_input_device_ctl_data_unpack
-// GO(xcb_input_device_ctl_next
-// GO(xcb_input_device_ctl_end
-// GO(xcb_input_change_device_control_unchecked
-// GO(xcb_input_change_device_control_reply
-// GO(xcb_input_list_device_properties_unchecked
-// GO(xcb_input_list_device_properties_atoms
-// GO(xcb_input_list_device_properties_atoms_length
-// GO(xcb_input_list_device_properties_atoms_end
-// GO(xcb_input_list_device_properties_reply
-// GO(xcb_input_change_device_property_items_data_8
-// GO(xcb_input_change_device_property_items_data_32_length
-// GO(xcb_input_change_device_property_items_data_32_end
-// GO(xcb_input_change_device_property_items_data_16
-// GO(xcb_input_change_device_property_items_data_32
-// GO(xcb_input_change_device_property_items_serialize
-// GO(xcb_input_change_device_property_items_unpack
-// GO(xcb_input_xi_get_property_items_sizeof
-// GO(xcb_input_change_device_property
-// GO(xcb_input_change_device_property_aux
-// GO(xcb_input_change_device_property_items
-// GO(xcb_input_delete_device_property
-// GO(xcb_input_get_device_property_items_data_8
-// GO(xcb_input_get_device_property_items_data_32_length
-// GO(xcb_input_get_device_property_items_data_32_end
-// GO(xcb_input_get_device_property_items_data_16
-// GO(xcb_input_get_device_property_items_data_32
-// GO(xcb_input_get_device_property_items_serialize
-// GO(xcb_input_get_device_property_items_unpack
-// GO(xcb_input_get_device_property_unchecked
-// GO(xcb_input_get_device_property_items
-// GO(xcb_input_get_device_property_reply
-// GO(xcb_input_group_info_next
-// GO(xcb_input_group_info_end
-// GO(xcb_input_modifier_info_next
-// GO(xcb_input_modifier_info_end
-// GO(xcb_input_xi_query_pointer_unchecked
-// GO(xcb_input_xi_query_pointer_buttons
-// GO(xcb_input_xi_query_pointer_buttons_length
-// GO(xcb_input_xi_query_pointer_buttons_end
-// GO(xcb_input_xi_query_pointer_reply
-// GO(xcb_input_xi_warp_pointer
-// GO(xcb_input_xi_change_cursor
-// GO(xcb_input_add_master_name
-// GO(xcb_input_add_master_name_length
-// GO(xcb_input_add_master_name_end
-// GO(xcb_input_add_master_next
-// GO(xcb_input_add_master_end
-// GO(xcb_input_remove_master_next
-// GO(xcb_input_remove_master_end
-// GO(xcb_input_attach_slave_next
-// GO(xcb_input_attach_slave_end
-// GO(xcb_input_detach_slave_next
-// GO(xcb_input_detach_slave_end
-// GO(xcb_input_hierarchy_change_data_add_master_name
-// GO(xcb_input_hierarchy_change_data_add_master_name_length
-// GO(xcb_input_hierarchy_change_data_add_master_name_end
-// GO(xcb_input_hierarchy_change_data_serialize
-// GO(xcb_input_hierarchy_change_data_unpack
-// GO(xcb_input_hierarchy_change_next
-// GO(xcb_input_hierarchy_change_end
-// GO(xcb_input_xi_change_hierarchy
-// GO(xcb_input_xi_change_hierarchy_changes_length
-// GO(xcb_input_xi_change_hierarchy_changes_iterator
-// GO(xcb_input_xi_set_client_pointer
-// GO(xcb_input_xi_get_client_pointer_unchecked
-// GO(xcb_input_xi_get_client_pointer_reply
-// GO(xcb_input_event_mask_mask
-// GO(xcb_input_event_mask_mask_length
-// GO(xcb_input_event_mask_mask_end
-// GO(xcb_input_event_mask_next
-// GO(xcb_input_event_mask_end
-// GO(xcb_input_xi_select_events
-// GO(xcb_input_xi_select_events_masks_length
-// GO(xcb_input_xi_select_events_masks_iterator
-GO(xcb_input_xi_query_version_unchecked, uFpWW)
-GO(xcb_input_xi_query_version, uFpWW)
-// GO(xcb_input_xi_query_version_reply
-// GO(xcb_input_button_class_state
-// GO(xcb_input_button_class_labels_length
-// GO(xcb_input_button_class_labels_end
-// GO(xcb_input_button_class_labels
-// GO(xcb_input_button_class_next
-// GO(xcb_input_button_class_end
-// GO(xcb_input_key_class_keys
-// GO(xcb_input_key_class_keys_length
-// GO(xcb_input_key_class_keys_end
-// GO(xcb_input_key_class_next
-// GO(xcb_input_key_class_end
-// GO(xcb_input_scroll_class_next
-// GO(xcb_input_scroll_class_end
-// GO(xcb_input_touch_class_next
-// GO(xcb_input_touch_class_end
-// GO(xcb_input_gesture_class_next
-// GO(xcb_input_gesture_class_end
-// GO(xcb_input_valuator_class_next
-// GO(xcb_input_valuator_class_end
-// GO(xcb_input_device_class_data_button_state
-// GO(xcb_input_device_class_data_button_labels_length
-// GO(xcb_input_device_class_data_button_labels_end
-// GO(xcb_input_device_class_data_button_labels
-// GO(xcb_input_device_class_data_serialize
-// GO(xcb_input_device_class_data_unpack
-// GO(xcb_input_device_class_next
-// GO(xcb_input_device_class_end
-// GO(xcb_input_xi_device_info_name
-// GO(xcb_input_xi_device_info_classes_length
-// GO(xcb_input_xi_device_info_name_end
-// GO(xcb_input_xi_device_info_classes_iterator
-// GO(xcb_input_xi_device_info_next
-// GO(xcb_input_xi_device_info_end
-// GO(xcb_input_xi_query_device_unchecked
-// GO(xcb_input_xi_query_device_infos_length
-// GO(xcb_input_xi_query_device_infos_iterator
-// GO(xcb_input_xi_query_device_reply
-// GO(xcb_input_xi_set_focus
-// GO(xcb_input_xi_get_focus_unchecked
-// GO(xcb_input_xi_get_focus_reply
-// GO(xcb_input_xi_grab_device_unchecked
-// GO(xcb_input_xi_grab_device_reply
-// GO(xcb_input_xi_ungrab_device
-// GO(xcb_input_xi_allow_events
-// GO(xcb_input_grab_modifier_info_next
-// GO(xcb_input_grab_modifier_info_end
-// GO(xcb_input_xi_passive_grab_device_unchecked
-// GO(xcb_input_xi_passive_grab_device_modifiers
-// GO(xcb_input_xi_passive_grab_device_modifiers_length
-// GO(xcb_input_xi_passive_grab_device_modifiers_iterator
-// GO(xcb_input_xi_passive_grab_device_reply
-// GO(xcb_input_xi_passive_ungrab_device
-// GO(xcb_input_xi_passive_ungrab_device_modifiers
-// GO(xcb_input_xi_passive_ungrab_device_modifiers_length
-// GO(xcb_input_xi_passive_ungrab_device_modifiers_end
-// GO(xcb_input_xi_list_properties_unchecked
-// GO(xcb_input_xi_list_properties_properties
-// GO(xcb_input_xi_list_properties_properties_length
-// GO(xcb_input_xi_list_properties_properties_end
-// GO(xcb_input_xi_list_properties_reply
-// GO(xcb_input_xi_change_property_items_data_8
-// GO(xcb_input_xi_change_property_items_data_32_length
-// GO(xcb_input_xi_change_property_items_data_32_end
-// GO(xcb_input_xi_change_property_items_data_16
-// GO(xcb_input_xi_change_property_items_data_32
-// GO(xcb_input_xi_change_property_items_serialize
-// GO(xcb_input_xi_change_property_items_unpack
-// GO(xcb_input_xi_change_property
-// GO(xcb_input_xi_change_property_aux
-// GO(xcb_input_xi_change_property_items
-// GO(xcb_input_xi_delete_property
-// GO(xcb_input_xi_get_property_items_data_8
-// GO(xcb_input_xi_get_property_items_data_32_length
-// GO(xcb_input_xi_get_property_items_data_32_end
-// GO(xcb_input_xi_get_property_items_data_16
-// GO(xcb_input_xi_get_property_items_data_32
-// GO(xcb_input_xi_get_property_items_serialize
-// GO(xcb_input_xi_get_property_items_unpack
-// GO(xcb_input_xi_get_property_unchecked
-// GO(xcb_input_xi_get_property_items
-// GO(xcb_input_xi_get_property_reply
-// GO(xcb_input_xi_get_selected_events_unchecked
-// GO(xcb_input_xi_get_selected_events_masks_length
-// GO(xcb_input_xi_get_selected_events_masks_iterator
-// GO(xcb_input_xi_get_selected_events_reply
-// GO(xcb_input_barrier_release_pointer_info_next
-// GO(xcb_input_barrier_release_pointer_info_end
-// GO(xcb_input_xi_barrier_release_pointer
-// GO(xcb_input_xi_barrier_release_pointer_barriers
-// GO(xcb_input_xi_barrier_release_pointer_barriers_length
-// GO(xcb_input_xi_barrier_release_pointer_barriers_iterator
-// GO(xcb_input_device_changed_classes_length
-// GO(xcb_input_device_changed_classes_iterator
-// GO(xcb_input_key_press_valuator_mask
-// GO(xcb_input_key_press_axisvalues_length
-// GO(xcb_input_key_press_valuator_mask_end
-// GO(xcb_input_key_press_axisvalues
-// GO(xcb_input_key_press_axisvalues_iterator
-// GO(xcb_input_button_press_valuator_mask
-// GO(xcb_input_button_press_axisvalues_length
-// GO(xcb_input_button_press_valuator_mask_end
-// GO(xcb_input_button_press_axisvalues
-// GO(xcb_input_button_press_axisvalues_iterator
-// GO(xcb_input_enter_buttons
-// GO(xcb_input_enter_buttons_length
-// GO(xcb_input_enter_buttons_end
-// GO(xcb_input_hierarchy_info_next
-// GO(xcb_input_hierarchy_info_end
-// GO(xcb_input_hierarchy_infos
-// GO(xcb_input_hierarchy_infos_length
-// GO(xcb_input_hierarchy_infos_iterator
-// GO(xcb_input_raw_key_press_valuator_mask
-// GO(xcb_input_raw_key_press_axisvalues_raw_length
-// GO(xcb_input_raw_key_press_valuator_mask_end
-// GO(xcb_input_raw_key_press_axisvalues_raw
-// GO(xcb_input_raw_key_press_axisvalues_raw_iterator
-// GO(xcb_input_raw_button_press_valuator_mask
-// GO(xcb_input_raw_button_press_axisvalues_raw_length
-// GO(xcb_input_raw_button_press_valuator_mask_end
-// GO(xcb_input_raw_button_press_axisvalues_raw
-// GO(xcb_input_raw_button_press_axisvalues_raw_iterator
-// GO(xcb_input_touch_begin_valuator_mask
-// GO(xcb_input_touch_begin_axisvalues_length
-// GO(xcb_input_touch_begin_valuator_mask_end
-// GO(xcb_input_touch_begin_axisvalues
-// GO(xcb_input_touch_begin_axisvalues_iterator
-// GO(xcb_input_raw_touch_begin_valuator_mask
-// GO(xcb_input_raw_touch_begin_axisvalues_raw_length
-// GO(xcb_input_raw_touch_begin_valuator_mask_end
-// GO(xcb_input_raw_touch_begin_axisvalues_raw
-// GO(xcb_input_raw_touch_begin_axisvalues_raw_iterator
-// GO(xcb_input_event_for_send_next
-// GO(xcb_input_event_for_send_end
-// GO(xcb_input_send_extension_event
-// GO(xcb_input_send_extension_event_events
-// GO(xcb_input_send_extension_event_classes_length
-// GO(xcb_input_send_extension_event_events_iterator
-// GO(xcb_input_send_extension_event_classes
-// GO(xcb_input_send_extension_event_classes_end
+//GO(xcb_input_input_info_info, 
+//GO(xcb_input_send_extension_event_sizeof, 
+//GO(xcb_input_device_class_data_sizeof, 
+//GO(xcb_input_close_device, 
+//GO(xcb_input_feedback_state_data, 
+//GO(xcb_input_feedback_ctl_data, 
+//GO(xcb_input_input_state_data, 
+//GO(xcb_input_device_state_data, 
+//GO(xcb_input_device_ctl_data, 
+//GO(xcb_input_hierarchy_change_data, 
+//GO(xcb_input_device_class_data, 
+//GO(xcb_input_event_class_next, 
+//GO(xcb_input_event_class_end, 
+//GO(xcb_input_key_code_next, 
+//GO(xcb_input_key_code_end, 
+//GO(xcb_input_device_id_next, 
+//GO(xcb_input_device_id_end, 
+//GO(xcb_input_fp1616_next, 
+//GO(xcb_input_fp1616_end, 
+//GO(xcb_input_fp3232_next, 
+//GO(xcb_input_fp3232_end, 
+//GO(xcb_input_get_extension_version_unchecked, 
+//GO(xcb_input_get_extension_version_reply, 
+//GO(xcb_input_device_info_next, 
+//GO(xcb_input_device_info_end, 
+//GO(xcb_input_key_info_next, 
+//GO(xcb_input_key_info_end, 
+//GO(xcb_input_button_info_next, 
+//GO(xcb_input_button_info_end, 
+//GO(xcb_input_axis_info_next, 
+//GO(xcb_input_axis_info_end, 
+//GO(xcb_input_valuator_info_axes, 
+//GO(xcb_input_valuator_info_axes_length, 
+//GO(xcb_input_valuator_info_axes_iterator, 
+//GO(xcb_input_valuator_info_next, 
+//GO(xcb_input_valuator_info_end, 
+//GO(xcb_input_input_info_info_valuator_axes, 
+//GO(xcb_input_input_info_info_valuator_axes_length, 
+//GO(xcb_input_input_info_info_valuator_axes_iterator, 
+//GO(xcb_input_input_info_info_serialize, 
+//GO(xcb_input_input_info_info_unpack, 
+//GO(xcb_input_input_state_data_sizeof, 
+//GO(xcb_input_input_info_next, 
+//GO(xcb_input_input_info_end, 
+//GO(xcb_input_device_name_string, 
+//GO(xcb_input_device_name_string_length, 
+//GO(xcb_input_device_name_string_end, 
+//GO(xcb_input_device_name_next, 
+//GO(xcb_input_device_name_end, 
+//GO(xcb_input_list_input_devices_unchecked, 
+//GO(xcb_input_list_input_devices_devices, 
+//GO(xcb_input_list_input_devices_names_length, 
+//GO(xcb_input_list_input_devices_devices_iterator, 
+//GO(xcb_input_list_input_devices_infos_iterator, 
+//GO(xcb_input_list_input_devices_names_iterator, 
+//GO(xcb_input_list_input_devices_reply, 
+//GO(xcb_input_event_type_base_next, 
+//GO(xcb_input_event_type_base_end, 
+//GO(xcb_input_input_class_info_next, 
+//GO(xcb_input_input_class_info_end, 
+//GO(xcb_input_open_device_unchecked, 
+//GO(xcb_input_open_device_class_info, 
+//GO(xcb_input_open_device_class_info_length, 
+//GO(xcb_input_open_device_class_info_iterator, 
+//GO(xcb_input_open_device_reply, 
+//GO(xcb_input_set_device_mode_unchecked, 
+//GO(xcb_input_set_device_mode_reply, 
+//GO(xcb_input_select_extension_event, 
+//GO(xcb_input_select_extension_event_classes, 
+//GO(xcb_input_select_extension_event_classes_length, 
+//GO(xcb_input_select_extension_event_classes_end, 
+//GO(xcb_input_get_selected_extension_events_unchecked, 
+//GO(xcb_input_get_selected_extension_events_all_classes, 
+//GO(xcb_input_get_selected_extension_events_all_classes_length, 
+//GO(xcb_input_get_selected_extension_events_all_classes_end, 
+//GO(xcb_input_get_selected_extension_events_reply, 
+//GO(xcb_input_change_device_dont_propagate_list, 
+//GO(xcb_input_change_device_dont_propagate_list_classes, 
+//GO(xcb_input_change_device_dont_propagate_list_classes_length, 
+//GO(xcb_input_change_device_dont_propagate_list_classes_end, 
+//GO(xcb_input_get_device_dont_propagate_list_unchecked, 
+//GO(xcb_input_get_device_dont_propagate_list_classes, 
+//GO(xcb_input_get_device_dont_propagate_list_classes_length, 
+//GO(xcb_input_get_device_dont_propagate_list_classes_end, 
+//GO(xcb_input_get_device_dont_propagate_list_reply, 
+//GO(xcb_input_device_time_coord_axisvalues, 
+//GO(xcb_input_device_time_coord_axisvalues_length, 
+//GO(xcb_input_device_time_coord_axisvalues_end, 
+//GO(xcb_input_device_time_coord_next, 
+//GO(xcb_input_device_time_coord_end, 
+//GO(xcb_input_get_device_motion_events_unchecked, 
+//GO(xcb_input_get_device_motion_events_events_length, 
+//GO(xcb_input_get_device_motion_events_events_iterator, 
+//GO(xcb_input_get_device_motion_events_reply, 
+//GO(xcb_input_change_keyboard_device_unchecked, 
+//GO(xcb_input_change_keyboard_device_reply, 
+//GO(xcb_input_change_pointer_device_unchecked, 
+//GO(xcb_input_change_pointer_device_reply, 
+//GO(xcb_input_grab_device_unchecked, 
+//GO(xcb_input_grab_device_reply, 
+//GO(xcb_input_ungrab_device, 
+//GO(xcb_input_grab_device_key, 
+//GO(xcb_input_grab_device_key_classes, 
+//GO(xcb_input_grab_device_key_classes_length, 
+//GO(xcb_input_grab_device_key_classes_end, 
+//GO(xcb_input_ungrab_device_button, 
+//GO(xcb_input_grab_device_button, 
+//GO(xcb_input_grab_device_button_classes, 
+//GO(xcb_input_grab_device_button_classes_length, 
+//GO(xcb_input_grab_device_button_classes_end, 
+//GO(xcb_input_allow_device_events, 
+//GO(xcb_input_get_device_focus_unchecked, 
+//GO(xcb_input_get_device_focus_reply, 
+//GO(xcb_input_set_device_focus, 
+//GO(xcb_input_kbd_feedback_state_next, 
+//GO(xcb_input_kbd_feedback_state_end, 
+//GO(xcb_input_ptr_feedback_state_next, 
+//GO(xcb_input_ptr_feedback_state_end, 
+//GO(xcb_input_integer_feedback_state_next, 
+//GO(xcb_input_integer_feedback_state_end, 
+//GO(xcb_input_string_feedback_state_keysyms, 
+//GO(xcb_input_string_feedback_state_keysyms_length, 
+//GO(xcb_input_string_feedback_state_keysyms_end, 
+//GO(xcb_input_string_feedback_state_next, 
+//GO(xcb_input_string_feedback_state_end, 
+//GO(xcb_input_bell_feedback_state_next, 
+//GO(xcb_input_bell_feedback_state_end, 
+//GO(xcb_input_led_feedback_state_next, 
+//GO(xcb_input_led_feedback_state_end, 
+//GO(xcb_input_feedback_state_data_string_keysyms, 
+//GO(xcb_input_feedback_state_data_string_keysyms_length, 
+//GO(xcb_input_feedback_state_data_string_keysyms_end, 
+//GO(xcb_input_feedback_state_data_serialize, 
+//GO(xcb_input_feedback_state_data_unpack, 
+//GO(xcb_input_feedback_state_next, 
+//GO(xcb_input_feedback_state_end, 
+//GO(xcb_input_get_feedback_control_unchecked, 
+//GO(xcb_input_get_feedback_control_feedbacks_length, 
+//GO(xcb_input_get_feedback_control_feedbacks_iterator, 
+//GO(xcb_input_get_feedback_control_reply, 
+//GO(xcb_input_kbd_feedback_ctl_next, 
+//GO(xcb_input_kbd_feedback_ctl_end, 
+//GO(xcb_input_ptr_feedback_ctl_next, 
+//GO(xcb_input_ptr_feedback_ctl_end, 
+//GO(xcb_input_integer_feedback_ctl_next, 
+//GO(xcb_input_integer_feedback_ctl_end, 
+//GO(xcb_input_string_feedback_ctl_keysyms, 
+//GO(xcb_input_string_feedback_ctl_keysyms_length, 
+//GO(xcb_input_string_feedback_ctl_keysyms_end, 
+//GO(xcb_input_string_feedback_ctl_next, 
+//GO(xcb_input_string_feedback_ctl_end, 
+//GO(xcb_input_bell_feedback_ctl_next, 
+//GO(xcb_input_bell_feedback_ctl_end, 
+//GO(xcb_input_led_feedback_ctl_next, 
+//GO(xcb_input_led_feedback_ctl_end, 
+//GO(xcb_input_feedback_ctl_data_string_keysyms, 
+//GO(xcb_input_feedback_ctl_data_string_keysyms_length, 
+//GO(xcb_input_feedback_ctl_data_string_keysyms_end, 
+//GO(xcb_input_feedback_ctl_data_serialize, 
+//GO(xcb_input_feedback_ctl_data_unpack, 
+//GO(xcb_input_feedback_ctl_next, 
+//GO(xcb_input_feedback_ctl_end, 
+//GO(xcb_input_change_feedback_control, 
+//GO(xcb_input_change_feedback_control_feedback, 
+//GO(xcb_input_get_device_key_mapping_unchecked, 
+//GO(xcb_input_get_device_key_mapping_keysyms, 
+//GO(xcb_input_get_device_key_mapping_keysyms_length, 
+//GO(xcb_input_get_device_key_mapping_keysyms_end, 
+//GO(xcb_input_get_device_key_mapping_reply, 
+//GO(xcb_input_change_device_key_mapping, 
+//GO(xcb_input_change_device_key_mapping_keysyms, 
+//GO(xcb_input_change_device_key_mapping_keysyms_length, 
+//GO(xcb_input_change_device_key_mapping_keysyms_end, 
+//GO(xcb_input_get_device_modifier_mapping_unchecked, 
+//GO(xcb_input_get_device_modifier_mapping_keymaps, 
+//GO(xcb_input_get_device_modifier_mapping_keymaps_length, 
+//GO(xcb_input_get_device_modifier_mapping_keymaps_end, 
+//GO(xcb_input_get_device_modifier_mapping_reply, 
+//GO(xcb_input_set_device_modifier_mapping_unchecked, 
+//GO(xcb_input_set_device_modifier_mapping_reply, 
+//GO(xcb_input_get_device_button_mapping_unchecked, 
+//GO(xcb_input_get_device_button_mapping_map, 
+//GO(xcb_input_get_device_button_mapping_map_length, 
+//GO(xcb_input_get_device_button_mapping_map_end, 
+//GO(xcb_input_get_device_button_mapping_reply, 
+//GO(xcb_input_set_device_button_mapping_unchecked, 
+//GO(xcb_input_set_device_button_mapping_reply, 
+//GO(xcb_input_key_state_next, 
+//GO(xcb_input_key_state_end, 
+//GO(xcb_input_button_state_next, 
+//GO(xcb_input_button_state_end, 
+//GO(xcb_input_valuator_state_valuators, 
+//GO(xcb_input_valuator_state_valuators_length, 
+//GO(xcb_input_valuator_state_valuators_end, 
+//GO(xcb_input_valuator_state_next, 
+//GO(xcb_input_valuator_state_end, 
+//GO(xcb_input_input_state_data_valuator_valuators, 
+//GO(xcb_input_input_state_data_valuator_valuators_length, 
+//GO(xcb_input_input_state_data_valuator_valuators_end, 
+//GO(xcb_input_input_state_data_serialize, 
+//GO(xcb_input_input_state_data_unpack, 
+//GO(xcb_input_input_state_next, 
+//GO(xcb_input_input_state_end, 
+//GO(xcb_input_query_device_state_unchecked, 
+//GO(xcb_input_query_device_state_classes_length, 
+//GO(xcb_input_query_device_state_classes_iterator, 
+//GO(xcb_input_query_device_state_reply, 
+//GO(xcb_input_device_bell, 
+//GO(xcb_input_set_device_valuators_unchecked, 
+//GO(xcb_input_set_device_valuators_reply, 
+//GO(xcb_input_device_resolution_state_resolution_max, 
+//GO(xcb_input_device_resolution_state_resolution_max_length, 
+//GO(xcb_input_device_resolution_state_resolution_max_end, 
+//GO(xcb_input_device_resolution_state_next, 
+//GO(xcb_input_device_resolution_state_end, 
+//GO(xcb_input_device_abs_calib_state_next, 
+//GO(xcb_input_device_abs_calib_state_end, 
+//GO(xcb_input_device_abs_area_state_next, 
+//GO(xcb_input_device_abs_area_state_end, 
+//GO(xcb_input_device_core_state_next, 
+//GO(xcb_input_device_core_state_end, 
+//GO(xcb_input_device_enable_state_next, 
+//GO(xcb_input_device_enable_state_end, 
+//GO(xcb_input_device_state_data_resolution_resolution_max, 
+//GO(xcb_input_device_state_data_resolution_resolution_max_length, 
+//GO(xcb_input_device_state_data_resolution_resolution_max_end, 
+//GO(xcb_input_device_state_data_serialize, 
+//GO(xcb_input_device_state_data_unpack, 
+//GO(xcb_input_device_state_next, 
+//GO(xcb_input_device_state_end, 
+//GO(xcb_input_get_device_control_unchecked, 
+//GO(xcb_input_get_device_control_control, 
+//GO(xcb_input_get_device_control_reply, 
+//GO(xcb_input_device_resolution_ctl_resolution_values, 
+//GO(xcb_input_device_resolution_ctl_resolution_values_length, 
+//GO(xcb_input_device_resolution_ctl_resolution_values_end, 
+//GO(xcb_input_device_resolution_ctl_next, 
+//GO(xcb_input_device_resolution_ctl_end, 
+//GO(xcb_input_device_abs_calib_ctl_next, 
+//GO(xcb_input_device_abs_calib_ctl_end, 
+//GO(xcb_input_device_abs_area_ctrl_next, 
+//GO(xcb_input_device_abs_area_ctrl_end, 
+//GO(xcb_input_device_core_ctrl_next, 
+//GO(xcb_input_device_core_ctrl_end, 
+//GO(xcb_input_device_enable_ctrl_next, 
+//GO(xcb_input_device_enable_ctrl_end, 
+//GO(xcb_input_device_ctl_data_resolution_resolution_values, 
+//GO(xcb_input_device_ctl_data_resolution_resolution_values_length, 
+//GO(xcb_input_device_ctl_data_resolution_resolution_values_end, 
+//GO(xcb_input_device_ctl_data_serialize, 
+//GO(xcb_input_device_ctl_data_unpack, 
+//GO(xcb_input_device_ctl_next, 
+//GO(xcb_input_device_ctl_end, 
+//GO(xcb_input_change_device_control_unchecked, 
+//GO(xcb_input_change_device_control_reply, 
+//GO(xcb_input_list_device_properties_unchecked, 
+//GO(xcb_input_list_device_properties_atoms, 
+//GO(xcb_input_list_device_properties_atoms_length, 
+//GO(xcb_input_list_device_properties_atoms_end, 
+//GO(xcb_input_list_device_properties_reply, 
+//GO(xcb_input_change_device_property_items_data_8, 
+//GO(xcb_input_change_device_property_items_data_32_length, 
+//GO(xcb_input_change_device_property_items_data_32_end, 
+//GO(xcb_input_change_device_property_items_data_16, 
+//GO(xcb_input_change_device_property_items_data_32, 
+//GO(xcb_input_change_device_property_items_serialize, 
+//GO(xcb_input_change_device_property_items_unpack, 
+//GO(xcb_input_xi_get_property_items_sizeof, 
+//GO(xcb_input_change_device_property, 
+//GO(xcb_input_change_device_property_aux, 
+//GO(xcb_input_change_device_property_items, 
+//GO(xcb_input_delete_device_property, 
+//GO(xcb_input_get_device_property_items_data_8, 
+//GO(xcb_input_get_device_property_items_data_32_length, 
+//GO(xcb_input_get_device_property_items_data_32_end, 
+//GO(xcb_input_get_device_property_items_data_16, 
+//GO(xcb_input_get_device_property_items_data_32, 
+//GO(xcb_input_get_device_property_items_serialize, 
+//GO(xcb_input_get_device_property_items_unpack, 
+//GO(xcb_input_get_device_property_unchecked, 
+//GO(xcb_input_get_device_property_items, 
+//GO(xcb_input_get_device_property_reply, 
+//GO(xcb_input_group_info_next, 
+//GO(xcb_input_group_info_end, 
+//GO(xcb_input_modifier_info_next, 
+//GO(xcb_input_modifier_info_end, 
+//GO(xcb_input_xi_query_pointer_unchecked, 
+//GO(xcb_input_xi_query_pointer_buttons, 
+//GO(xcb_input_xi_query_pointer_buttons_length, 
+//GO(xcb_input_xi_query_pointer_buttons_end, 
+//GO(xcb_input_xi_query_pointer_reply, 
+//GO(xcb_input_xi_warp_pointer, 
+//GO(xcb_input_xi_change_cursor, 
+//GO(xcb_input_add_master_name, 
+//GO(xcb_input_add_master_name_length, 
+//GO(xcb_input_add_master_name_end, 
+//GO(xcb_input_add_master_next, 
+//GO(xcb_input_add_master_end, 
+//GO(xcb_input_remove_master_next, 
+//GO(xcb_input_remove_master_end, 
+//GO(xcb_input_attach_slave_next, 
+//GO(xcb_input_attach_slave_end, 
+//GO(xcb_input_detach_slave_next, 
+//GO(xcb_input_detach_slave_end, 
+//GO(xcb_input_hierarchy_change_data_add_master_name, 
+//GO(xcb_input_hierarchy_change_data_add_master_name_length, 
+//GO(xcb_input_hierarchy_change_data_add_master_name_end, 
+//GO(xcb_input_hierarchy_change_data_serialize, 
+//GO(xcb_input_hierarchy_change_data_unpack, 
+//GO(xcb_input_hierarchy_change_next, 
+//GO(xcb_input_hierarchy_change_end, 
+//GO(xcb_input_xi_change_hierarchy, 
+//GO(xcb_input_xi_change_hierarchy_changes_length, 
+//GO(xcb_input_xi_change_hierarchy_changes_iterator, 
+//GO(xcb_input_xi_set_client_pointer, 
+//GO(xcb_input_xi_get_client_pointer_unchecked, 
+//GO(xcb_input_xi_get_client_pointer_reply, 
+//GO(xcb_input_event_mask_mask, 
+//GO(xcb_input_event_mask_mask_length, 
+//GO(xcb_input_event_mask_mask_end, 
+//GO(xcb_input_event_mask_next, 
+//GO(xcb_input_event_mask_end, 
+GO(xcb_input_xi_select_events, uFbuWp)
+//GO(xcb_input_xi_select_events_masks_length, 
+//GO(xcb_input_xi_select_events_masks_iterator, 
+GO(xcb_input_xi_query_version_unchecked, uFbWW)
+GO(xcb_input_xi_query_version, uFbWW)
+GO(xcb_input_xi_query_version_reply, pFbup)
+//GO(xcb_input_button_class_state, 
+GO(xcb_input_button_class_labels_length, iFp)
+GO(xcb_input_button_class_labels_end, pFp)
+GO(xcb_input_button_class_labels, pFp)
+//GO(xcb_input_button_class_next, 
+//GO(xcb_input_button_class_end, 
+//GO(xcb_input_key_class_keys, 
+//GO(xcb_input_key_class_keys_length, 
+//GO(xcb_input_key_class_keys_end, 
+//GO(xcb_input_key_class_next, 
+//GO(xcb_input_key_class_end, 
+//GO(xcb_input_scroll_class_next, 
+//GO(xcb_input_scroll_class_end, 
+//GO(xcb_input_touch_class_next, 
+//GO(xcb_input_touch_class_end, 
+//GO(xcb_input_gesture_class_next, 
+//GO(xcb_input_gesture_class_end, 
+//GO(xcb_input_valuator_class_next, 
+//GO(xcb_input_valuator_class_end, 
+//GO(xcb_input_device_class_data_button_state, 
+//GO(xcb_input_device_class_data_button_labels_length, 
+//GO(xcb_input_device_class_data_button_labels_end, 
+//GO(xcb_input_device_class_data_button_labels, 
+//GO(xcb_input_device_class_data_serialize, 
+//GO(xcb_input_device_class_data_unpack, 
+GO(xcb_input_device_class_next, vFp)
+GO(xcb_input_device_class_end, pFp)
+GO(xcb_input_xi_device_info_classes_length, iFp)
+GO(xcb_input_xi_device_info_classes_iterator, pFp)
+GO(xcb_input_xi_device_info_name, pFp)
+GO(xcb_input_xi_device_info_name_length, iFp)
+GO(xcb_input_xi_device_info_name_end, pFp)
+GO(xcb_input_xi_device_info_next, vFp)
+GO(xcb_input_xi_device_info_end, pFp)
+GO(xcb_input_xi_query_device, uFbu)
+GO(xcb_input_xi_query_device_unchecked, uFbu)
+GO(xcb_input_xi_query_device_infos_length, iFp)
+GO(xcb_input_xi_query_device_infos_iterator, pFp)
+GO(xcb_input_xi_query_device_reply, pFbup)
+//GO(xcb_input_xi_set_focus, 
+//GO(xcb_input_xi_get_focus_unchecked, 
+//GO(xcb_input_xi_get_focus_reply, 
+//GO(xcb_input_xi_grab_device_unchecked, 
+//GO(xcb_input_xi_grab_device_reply, 
+//GO(xcb_input_xi_ungrab_device, 
+//GO(xcb_input_xi_allow_events, 
+//GO(xcb_input_grab_modifier_info_next, 
+//GO(xcb_input_grab_modifier_info_end, 
+//GO(xcb_input_xi_passive_grab_device_unchecked, 
+//GO(xcb_input_xi_passive_grab_device_modifiers, 
+//GO(xcb_input_xi_passive_grab_device_modifiers_length, 
+//GO(xcb_input_xi_passive_grab_device_modifiers_iterator, 
+//GO(xcb_input_xi_passive_grab_device_reply, 
+//GO(xcb_input_xi_passive_ungrab_device, 
+//GO(xcb_input_xi_passive_ungrab_device_modifiers, 
+//GO(xcb_input_xi_passive_ungrab_device_modifiers_length, 
+//GO(xcb_input_xi_passive_ungrab_device_modifiers_end, 
+//GO(xcb_input_xi_list_properties_unchecked, 
+//GO(xcb_input_xi_list_properties_properties, 
+//GO(xcb_input_xi_list_properties_properties_length, 
+//GO(xcb_input_xi_list_properties_properties_end, 
+//GO(xcb_input_xi_list_properties_reply, 
+//GO(xcb_input_xi_change_property_items_data_8, 
+//GO(xcb_input_xi_change_property_items_data_32_length, 
+//GO(xcb_input_xi_change_property_items_data_32_end, 
+//GO(xcb_input_xi_change_property_items_data_16, 
+//GO(xcb_input_xi_change_property_items_data_32, 
+//GO(xcb_input_xi_change_property_items_serialize, 
+//GO(xcb_input_xi_change_property_items_unpack, 
+//GO(xcb_input_xi_change_property, 
+//GO(xcb_input_xi_change_property_aux, 
+//GO(xcb_input_xi_change_property_items, 
+//GO(xcb_input_xi_delete_property, 
+//GO(xcb_input_xi_get_property_items_data_8, 
+//GO(xcb_input_xi_get_property_items_data_32_length, 
+//GO(xcb_input_xi_get_property_items_data_32_end, 
+//GO(xcb_input_xi_get_property_items_data_16, 
+//GO(xcb_input_xi_get_property_items_data_32, 
+//GO(xcb_input_xi_get_property_items_serialize, 
+//GO(xcb_input_xi_get_property_items_unpack, 
+//GO(xcb_input_xi_get_property_unchecked, 
+//GO(xcb_input_xi_get_property_items, 
+//GO(xcb_input_xi_get_property_reply, 
+//GO(xcb_input_xi_get_selected_events_unchecked, 
+//GO(xcb_input_xi_get_selected_events_masks_length, 
+//GO(xcb_input_xi_get_selected_events_masks_iterator, 
+//GO(xcb_input_xi_get_selected_events_reply, 
+//GO(xcb_input_barrier_release_pointer_info_next, 
+//GO(xcb_input_barrier_release_pointer_info_end, 
+//GO(xcb_input_xi_barrier_release_pointer, 
+//GO(xcb_input_xi_barrier_release_pointer_barriers, 
+//GO(xcb_input_xi_barrier_release_pointer_barriers_length, 
+//GO(xcb_input_xi_barrier_release_pointer_barriers_iterator, 
+GO(xcb_input_xi_select_events, uFbuWp)
+GO(xcb_input_xi_select_events_checked, uFbuWp)
+//GO(xcb_input_device_changed_classes_length, 
+//GO(xcb_input_device_changed_classes_iterator, 
+//GO(xcb_input_key_press_valuator_mask, 
+//GO(xcb_input_key_press_axisvalues_length, 
+//GO(xcb_input_key_press_valuator_mask_end, 
+//GO(xcb_input_key_press_axisvalues, 
+//GO(xcb_input_key_press_axisvalues_iterator, 
+//GO(xcb_input_button_press_valuator_mask, 
+//GO(xcb_input_button_press_axisvalues_length, 
+//GO(xcb_input_button_press_valuator_mask_end, 
+//GO(xcb_input_button_press_axisvalues, 
+//GO(xcb_input_button_press_axisvalues_iterator, 
+//GO(xcb_input_enter_buttons, 
+//GO(xcb_input_enter_buttons_length, 
+//GO(xcb_input_enter_buttons_end, 
+//GO(xcb_input_hierarchy_info_next, 
+//GO(xcb_input_hierarchy_info_end, 
+//GO(xcb_input_hierarchy_infos, 
+//GO(xcb_input_hierarchy_infos_length, 
+//GO(xcb_input_hierarchy_infos_iterator, 
+//GO(xcb_input_raw_key_press_valuator_mask, 
+//GO(xcb_input_raw_key_press_axisvalues_raw_length, 
+//GO(xcb_input_raw_key_press_valuator_mask_end, 
+//GO(xcb_input_raw_key_press_axisvalues_raw, 
+//GO(xcb_input_raw_key_press_axisvalues_raw_iterator, 
+//GO(xcb_input_raw_button_press_valuator_mask, 
+//GO(xcb_input_raw_button_press_axisvalues_raw_length, 
+//GO(xcb_input_raw_button_press_valuator_mask_end, 
+//GO(xcb_input_raw_button_press_axisvalues_raw, 
+//GO(xcb_input_raw_button_press_axisvalues_raw_iterator, 
+//GO(xcb_input_touch_begin_valuator_mask, 
+//GO(xcb_input_touch_begin_axisvalues_length, 
+//GO(xcb_input_touch_begin_valuator_mask_end, 
+//GO(xcb_input_touch_begin_axisvalues, 
+//GO(xcb_input_touch_begin_axisvalues_iterator, 
+//GO(xcb_input_raw_touch_begin_valuator_mask, 
+//GO(xcb_input_raw_touch_begin_axisvalues_raw_length, 
+//GO(xcb_input_raw_touch_begin_valuator_mask_end, 
+//GO(xcb_input_raw_touch_begin_axisvalues_raw, 
+//GO(xcb_input_raw_touch_begin_axisvalues_raw_iterator, 
+//GO(xcb_input_event_for_send_next, 
+//GO(xcb_input_event_for_send_end, 
+//GO(xcb_input_send_extension_event, 
+//GO(xcb_input_send_extension_event_events, 
+//GO(xcb_input_send_extension_event_classes_length, 
+//GO(xcb_input_send_extension_event_events_iterator, 
+//GO(xcb_input_send_extension_event_classes, 
+//GO(xcb_input_send_extension_event_classes_end, 
diff --git a/src/wrapped/wrappedpulse_private.h b/src/wrapped/wrappedpulse_private.h
index e3457184..d9e55623 100644
--- a/src/wrapped/wrappedpulse_private.h
+++ b/src/wrapped/wrappedpulse_private.h
@@ -187,6 +187,7 @@ GO(pa_proplist_unset_many, iFpp)
 GO(pa_proplist_update, vFpup)
 GO(pa_rtclock_now, UFv)
 GO(pa_sample_format_to_string, pFi)
+GO(pa_sample_format_valid, iFu)
 GO(pa_sample_size, LFp)
 GO(pa_sample_size_of_format, LFi)
 GO(pa_sample_spec_equal, iFpp)