[WRAPPER] Reworked gstbase with new wrapperhelper

4 files changed, 286 insertions, 249 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 951a62d4..50a392dd 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -210,6 +210,7 @@
 #() iFLu
 #() iFLL
 #() iFLp
+#() iFpc
 #() iFpw
 #() iFpi
 #() iFpI
@@ -554,7 +555,9 @@
 #() iFpil
 #() iFpiL
 #() iFpip
+#() iFpCu
 #() iFpCp
+#() iFpWu
 #() iFpWp
 #() iFpui
 #() iFpuC
@@ -935,6 +938,7 @@
 #() vFpuup
 #() vFpufi
 #() vFpudd
+#() vFpuli
 #() vFpuLL
 #() vFpupu
 #() vFpupp
@@ -949,6 +953,7 @@
 #() vFpdup
 #() vFpddu
 #() vFpddd
+#() vFpdlL
 #() vFpldi
 #() vFplll
 #() vFpllL
@@ -1115,6 +1120,7 @@
 #() iFpdip
 #() iFplii
 #() iFplip
+#() iFplll
 #() iFpllp
 #() iFplpi
 #() iFplpp
@@ -1555,6 +1561,7 @@
 #() vFpLiii
 #() vFpLiiL
 #() vFpLLLL
+#() vFpLLLp
 #() vFpLLpp
 #() vFpLpiL
 #() vFpLppi
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index 2da45383..cdb2c89f 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -256,6 +256,7 @@ typedef int32_t (*iFLi_t)(uintptr_t, int32_t);
 typedef int32_t (*iFLu_t)(uintptr_t, uint32_t);
 typedef int32_t (*iFLL_t)(uintptr_t, uintptr_t);
 typedef int32_t (*iFLp_t)(uintptr_t, void*);
+typedef int32_t (*iFpc_t)(void*, int8_t);
 typedef int32_t (*iFpw_t)(void*, int16_t);
 typedef int32_t (*iFpi_t)(void*, int32_t);
 typedef int32_t (*iFpI_t)(void*, int64_t);
@@ -589,7 +590,9 @@ typedef int32_t (*iFpid_t)(void*, int32_t, double);
 typedef int32_t (*iFpil_t)(void*, int32_t, intptr_t);
 typedef int32_t (*iFpiL_t)(void*, int32_t, uintptr_t);
 typedef int32_t (*iFpip_t)(void*, int32_t, void*);
+typedef int32_t (*iFpCu_t)(void*, uint8_t, uint32_t);
 typedef int32_t (*iFpCp_t)(void*, uint8_t, void*);
+typedef int32_t (*iFpWu_t)(void*, uint16_t, uint32_t);
 typedef int32_t (*iFpWp_t)(void*, uint16_t, void*);
 typedef int32_t (*iFpui_t)(void*, uint32_t, int32_t);
 typedef int32_t (*iFpuC_t)(void*, uint32_t, uint8_t);
@@ -966,6 +969,7 @@ typedef void (*vFpuuu_t)(void*, uint32_t, uint32_t, uint32_t);
 typedef void (*vFpuup_t)(void*, uint32_t, uint32_t, void*);
 typedef void (*vFpufi_t)(void*, uint32_t, float, int32_t);
 typedef void (*vFpudd_t)(void*, uint32_t, double, double);
+typedef void (*vFpuli_t)(void*, uint32_t, intptr_t, int32_t);
 typedef void (*vFpuLL_t)(void*, uint32_t, uintptr_t, uintptr_t);
 typedef void (*vFpupu_t)(void*, uint32_t, void*, uint32_t);
 typedef void (*vFpupp_t)(void*, uint32_t, void*, void*);
@@ -980,6 +984,7 @@ typedef void (*vFpdii_t)(void*, double, int32_t, int32_t);
 typedef void (*vFpdup_t)(void*, double, uint32_t, void*);
 typedef void (*vFpddu_t)(void*, double, double, uint32_t);
 typedef void (*vFpddd_t)(void*, double, double, double);
+typedef void (*vFpdlL_t)(void*, double, intptr_t, uintptr_t);
 typedef void (*vFpldi_t)(void*, intptr_t, double, int32_t);
 typedef void (*vFplll_t)(void*, intptr_t, intptr_t, intptr_t);
 typedef void (*vFpllL_t)(void*, intptr_t, intptr_t, uintptr_t);
@@ -1146,6 +1151,7 @@ typedef int32_t (*iFpUpp_t)(void*, uint64_t, void*, void*);
 typedef int32_t (*iFpdip_t)(void*, double, int32_t, void*);
 typedef int32_t (*iFplii_t)(void*, intptr_t, int32_t, int32_t);
 typedef int32_t (*iFplip_t)(void*, intptr_t, int32_t, void*);
+typedef int32_t (*iFplll_t)(void*, intptr_t, intptr_t, intptr_t);
 typedef int32_t (*iFpllp_t)(void*, intptr_t, intptr_t, void*);
 typedef int32_t (*iFplpi_t)(void*, intptr_t, void*, int32_t);
 typedef int32_t (*iFplpp_t)(void*, intptr_t, void*, void*);
@@ -1584,6 +1590,7 @@ typedef void (*vFpluul_t)(void*, intptr_t, uint32_t, uint32_t, intptr_t);
 typedef void (*vFpLiii_t)(void*, uintptr_t, int32_t, int32_t, int32_t);
 typedef void (*vFpLiiL_t)(void*, uintptr_t, int32_t, int32_t, uintptr_t);
 typedef void (*vFpLLLL_t)(void*, uintptr_t, uintptr_t, uintptr_t, uintptr_t);
+typedef void (*vFpLLLp_t)(void*, uintptr_t, uintptr_t, uintptr_t, void*);
 typedef void (*vFpLLpp_t)(void*, uintptr_t, uintptr_t, void*, void*);
 typedef void (*vFpLpiL_t)(void*, uintptr_t, void*, int32_t, uintptr_t);
 typedef void (*vFpLppi_t)(void*, uintptr_t, void*, void*, int32_t);
@@ -3619,6 +3626,7 @@ void iFLi(x64emu_t *emu, uintptr_t fcn) { iFLi_t fn = (iFLi_t)fcn; R_RAX=(uint32
 void iFLu(x64emu_t *emu, uintptr_t fcn) { iFLu_t fn = (iFLu_t)fcn; R_RAX=(uint32_t)fn((uintptr_t)R_RDI, (uint32_t)R_RSI); }
 void iFLL(x64emu_t *emu, uintptr_t fcn) { iFLL_t fn = (iFLL_t)fcn; R_RAX=(uint32_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=(uint32_t)fn((uintptr_t)R_RDI, (void*)R_RSI); }
+void iFpc(x64emu_t *emu, uintptr_t fcn) { iFpc_t fn = (iFpc_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int8_t)R_RSI); }
 void iFpw(x64emu_t *emu, uintptr_t fcn) { iFpw_t fn = (iFpw_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int16_t)R_RSI); }
 void iFpi(x64emu_t *emu, uintptr_t fcn) { iFpi_t fn = (iFpi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI); }
 void iFpI(x64emu_t *emu, uintptr_t fcn) { iFpI_t fn = (iFpI_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int64_t)R_RSI); }
@@ -3952,7 +3960,9 @@ void iFpid(x64emu_t *emu, uintptr_t fcn) { iFpid_t fn = (iFpid_t)fcn; R_RAX=(uin
 void iFpil(x64emu_t *emu, uintptr_t fcn) { iFpil_t fn = (iFpil_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (intptr_t)R_RDX); }
 void iFpiL(x64emu_t *emu, uintptr_t fcn) { iFpiL_t fn = (iFpiL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX); }
 void iFpip(x64emu_t *emu, uintptr_t fcn) { iFpip_t fn = (iFpip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX); }
+void iFpCu(x64emu_t *emu, uintptr_t fcn) { iFpCu_t fn = (iFpCu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (uint32_t)R_RDX); }
 void iFpCp(x64emu_t *emu, uintptr_t fcn) { iFpCp_t fn = (iFpCp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX); }
+void iFpWu(x64emu_t *emu, uintptr_t fcn) { iFpWu_t fn = (iFpWu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (uint32_t)R_RDX); }
 void iFpWp(x64emu_t *emu, uintptr_t fcn) { iFpWp_t fn = (iFpWp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint16_t)R_RSI, (void*)R_RDX); }
 void iFpui(x64emu_t *emu, uintptr_t fcn) { iFpui_t fn = (iFpui_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX); }
 void iFpuC(x64emu_t *emu, uintptr_t fcn) { iFpuC_t fn = (iFpuC_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (uint8_t)R_RDX); }
@@ -4329,6 +4339,7 @@ void vFpuuu(x64emu_t *emu, uintptr_t fcn) { vFpuuu_t fn = (vFpuuu_t)fcn; fn((voi
 void vFpuup(x64emu_t *emu, uintptr_t fcn) { vFpuup_t fn = (vFpuup_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
 void vFpufi(x64emu_t *emu, uintptr_t fcn) { vFpufi_t fn = (vFpufi_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].f[0], (int32_t)R_RDX); }
 void vFpudd(x64emu_t *emu, uintptr_t fcn) { vFpudd_t fn = (vFpudd_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, emu->xmm[0].d[0], emu->xmm[1].d[0]); }
+void vFpuli(x64emu_t *emu, uintptr_t fcn) { vFpuli_t fn = (vFpuli_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX); }
 void vFpuLL(x64emu_t *emu, uintptr_t fcn) { vFpuLL_t fn = (vFpuLL_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
 void vFpupu(x64emu_t *emu, uintptr_t fcn) { vFpupu_t fn = (vFpupu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (uint32_t)R_RCX); }
 void vFpupp(x64emu_t *emu, uintptr_t fcn) { vFpupp_t fn = (vFpupp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -4343,6 +4354,7 @@ void vFpdii(x64emu_t *emu, uintptr_t fcn) { vFpdii_t fn = (vFpdii_t)fcn; fn((voi
 void vFpdup(x64emu_t *emu, uintptr_t fcn) { vFpdup_t fn = (vFpdup_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], (uint32_t)R_RSI, (void*)R_RDX); }
 void vFpddu(x64emu_t *emu, uintptr_t fcn) { vFpddu_t fn = (vFpddu_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], (uint32_t)R_RSI); }
 void vFpddd(x64emu_t *emu, uintptr_t fcn) { vFpddd_t fn = (vFpddd_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], emu->xmm[1].d[0], emu->xmm[2].d[0]); }
+void vFpdlL(x64emu_t *emu, uintptr_t fcn) { vFpdlL_t fn = (vFpdlL_t)fcn; fn((void*)R_RDI, emu->xmm[0].d[0], (intptr_t)R_RSI, (uintptr_t)R_RDX); }
 void vFpldi(x64emu_t *emu, uintptr_t fcn) { vFpldi_t fn = (vFpldi_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, emu->xmm[0].d[0], (int32_t)R_RDX); }
 void vFplll(x64emu_t *emu, uintptr_t fcn) { vFplll_t fn = (vFplll_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX); }
 void vFpllL(x64emu_t *emu, uintptr_t fcn) { vFpllL_t fn = (vFpllL_t)fcn; fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (uintptr_t)R_RCX); }
@@ -4509,6 +4521,7 @@ void iFpUpp(x64emu_t *emu, uintptr_t fcn) { iFpUpp_t fn = (iFpUpp_t)fcn; R_RAX=(
 void iFpdip(x64emu_t *emu, uintptr_t fcn) { iFpdip_t fn = (iFpdip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, emu->xmm[0].d[0], (int32_t)R_RSI, (void*)R_RDX); }
 void iFplii(x64emu_t *emu, uintptr_t fcn) { iFplii_t fn = (iFplii_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void iFplip(x64emu_t *emu, uintptr_t fcn) { iFplip_t fn = (iFplip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
+void iFplll(x64emu_t *emu, uintptr_t fcn) { iFplll_t fn = (iFplll_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (intptr_t)R_RCX); }
 void iFpllp(x64emu_t *emu, uintptr_t fcn) { iFpllp_t fn = (iFpllp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (intptr_t)R_RDX, (void*)R_RCX); }
 void iFplpi(x64emu_t *emu, uintptr_t fcn) { iFplpi_t fn = (iFplpi_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
 void iFplpp(x64emu_t *emu, uintptr_t fcn) { iFplpp_t fn = (iFplpp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
@@ -4947,6 +4960,7 @@ void vFpluul(x64emu_t *emu, uintptr_t fcn) { vFpluul_t fn = (vFpluul_t)fcn; fn((
 void vFpLiii(x64emu_t *emu, uintptr_t fcn) { vFpLiii_t fn = (vFpLiii_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (int32_t)R_R8); }
 void vFpLiiL(x64emu_t *emu, uintptr_t fcn) { vFpLiiL_t fn = (vFpLiiL_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8); }
 void vFpLLLL(x64emu_t *emu, uintptr_t fcn) { vFpLLLL_t fn = (vFpLLLL_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (uintptr_t)R_R8); }
+void vFpLLLp(x64emu_t *emu, uintptr_t fcn) { vFpLLLp_t fn = (vFpLLLp_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX, (void*)R_R8); }
 void vFpLLpp(x64emu_t *emu, uintptr_t fcn) { vFpLLpp_t fn = (vFpLLpp_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void vFpLpiL(x64emu_t *emu, uintptr_t fcn) { vFpLpiL_t fn = (vFpLpiL_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (uintptr_t)R_R8); }
 void vFpLppi(x64emu_t *emu, uintptr_t fcn) { vFpLppi_t fn = (vFpLppi_t)fcn; fn((void*)R_RDI, (uintptr_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); }
@@ -6951,6 +6965,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFLu) return 1;
 	if (fun == &iFLL) return 1;
 	if (fun == &iFLp) return 1;
+	if (fun == &iFpc) return 1;
 	if (fun == &iFpw) return 1;
 	if (fun == &iFpi) return 1;
 	if (fun == &iFpI) return 1;
@@ -7217,7 +7232,9 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpil) return 1;
 	if (fun == &iFpiL) return 1;
 	if (fun == &iFpip) return 1;
+	if (fun == &iFpCu) return 1;
 	if (fun == &iFpCp) return 1;
+	if (fun == &iFpWu) return 1;
 	if (fun == &iFpWp) return 1;
 	if (fun == &iFpui) return 1;
 	if (fun == &iFpuC) return 1;
@@ -7510,6 +7527,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpuup) return 1;
 	if (fun == &vFpufi) return 2;
 	if (fun == &vFpudd) return 3;
+	if (fun == &vFpuli) return 1;
 	if (fun == &vFpuLL) return 1;
 	if (fun == &vFpupu) return 1;
 	if (fun == &vFpupp) return 1;
@@ -7524,6 +7542,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpdup) return 2;
 	if (fun == &vFpddu) return 3;
 	if (fun == &vFpddd) return 4;
+	if (fun == &vFpdlL) return 2;
 	if (fun == &vFpldi) return 2;
 	if (fun == &vFplll) return 1;
 	if (fun == &vFpllL) return 1;
@@ -7659,6 +7678,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &iFpdip) return 2;
 	if (fun == &iFplii) return 1;
 	if (fun == &iFplip) return 1;
+	if (fun == &iFplll) return 1;
 	if (fun == &iFpllp) return 1;
 	if (fun == &iFplpi) return 1;
 	if (fun == &iFplpp) return 1;
@@ -8010,6 +8030,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpLiii) return 1;
 	if (fun == &vFpLiiL) return 1;
 	if (fun == &vFpLLLL) return 1;
+	if (fun == &vFpLLLp) return 1;
 	if (fun == &vFpLLpp) return 1;
 	if (fun == &vFpLpiL) return 1;
 	if (fun == &vFpLppi) return 1;
@@ -9102,6 +9123,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpdup) return 2;
 	if (fun == &vFpddu) return 3;
 	if (fun == &vFpddd) return 4;
+	if (fun == &vFpdlL) return 2;
 	if (fun == &vFplll) return 1;
 	if (fun == &vFpllL) return 1;
 	if (fun == &vFplpp) return 1;
@@ -9237,6 +9259,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &vFpddpp) return 3;
 	if (fun == &vFpluul) return 1;
 	if (fun == &vFpLLLL) return 1;
+	if (fun == &vFpLLLp) return 1;
 	if (fun == &vFpLLpp) return 1;
 	if (fun == &vFpLppp) return 1;
 	if (fun == &vFppuuu) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index f68b5d39..2e63be55 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -247,6 +247,7 @@ void iFLi(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 iFpc(x64emu_t *emu, uintptr_t fnc);
 void iFpw(x64emu_t *emu, uintptr_t fnc);
 void iFpi(x64emu_t *emu, uintptr_t fnc);
 void iFpI(x64emu_t *emu, uintptr_t fnc);
@@ -591,7 +592,9 @@ void iFpid(x64emu_t *emu, uintptr_t fnc);
 void iFpil(x64emu_t *emu, uintptr_t fnc);
 void iFpiL(x64emu_t *emu, uintptr_t fnc);
 void iFpip(x64emu_t *emu, uintptr_t fnc);
+void iFpCu(x64emu_t *emu, uintptr_t fnc);
 void iFpCp(x64emu_t *emu, uintptr_t fnc);
+void iFpWu(x64emu_t *emu, uintptr_t fnc);
 void iFpWp(x64emu_t *emu, uintptr_t fnc);
 void iFpui(x64emu_t *emu, uintptr_t fnc);
 void iFpuC(x64emu_t *emu, uintptr_t fnc);
@@ -972,6 +975,7 @@ void vFpuuu(x64emu_t *emu, uintptr_t fnc);
 void vFpuup(x64emu_t *emu, uintptr_t fnc);
 void vFpufi(x64emu_t *emu, uintptr_t fnc);
 void vFpudd(x64emu_t *emu, uintptr_t fnc);
+void vFpuli(x64emu_t *emu, uintptr_t fnc);
 void vFpuLL(x64emu_t *emu, uintptr_t fnc);
 void vFpupu(x64emu_t *emu, uintptr_t fnc);
 void vFpupp(x64emu_t *emu, uintptr_t fnc);
@@ -986,6 +990,7 @@ void vFpdii(x64emu_t *emu, uintptr_t fnc);
 void vFpdup(x64emu_t *emu, uintptr_t fnc);
 void vFpddu(x64emu_t *emu, uintptr_t fnc);
 void vFpddd(x64emu_t *emu, uintptr_t fnc);
+void vFpdlL(x64emu_t *emu, uintptr_t fnc);
 void vFpldi(x64emu_t *emu, uintptr_t fnc);
 void vFplll(x64emu_t *emu, uintptr_t fnc);
 void vFpllL(x64emu_t *emu, uintptr_t fnc);
@@ -1152,6 +1157,7 @@ void iFpUpp(x64emu_t *emu, uintptr_t fnc);
 void iFpdip(x64emu_t *emu, uintptr_t fnc);
 void iFplii(x64emu_t *emu, uintptr_t fnc);
 void iFplip(x64emu_t *emu, uintptr_t fnc);
+void iFplll(x64emu_t *emu, uintptr_t fnc);
 void iFpllp(x64emu_t *emu, uintptr_t fnc);
 void iFplpi(x64emu_t *emu, uintptr_t fnc);
 void iFplpp(x64emu_t *emu, uintptr_t fnc);
@@ -1592,6 +1598,7 @@ void vFpluul(x64emu_t *emu, uintptr_t fnc);
 void vFpLiii(x64emu_t *emu, uintptr_t fnc);
 void vFpLiiL(x64emu_t *emu, uintptr_t fnc);
 void vFpLLLL(x64emu_t *emu, uintptr_t fnc);
+void vFpLLLp(x64emu_t *emu, uintptr_t fnc);
 void vFpLLpp(x64emu_t *emu, uintptr_t fnc);
 void vFpLpiL(x64emu_t *emu, uintptr_t fnc);
 void vFpLppi(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedgstbase_private.h b/src/wrapped/wrappedgstbase_private.h
index 68b52422..0b6b9afa 100644
--- a/src/wrapped/wrappedgstbase_private.h
+++ b/src/wrapped/wrappedgstbase_private.h
@@ -1,5 +1,5 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(gst_adapter_available, LFp)
@@ -10,7 +10,7 @@ GO(gst_adapter_copy_bytes, pFpLL)
 GO(gst_adapter_distance_from_discont, LFp)
 GO(gst_adapter_dts_at_discont, LFp)
 GO(gst_adapter_flush, vFpL)
-//GO(gst_adapter_get_buffer, 
+GO(gst_adapter_get_buffer, pFpL)
 GO(gst_adapter_get_buffer_fast, pFpL)
 GO(gst_adapter_get_buffer_list, pFpL)
 GO(gst_adapter_get_list, pFpL)
@@ -19,245 +19,245 @@ GO(gst_adapter_map, pFpL)
 GO(gst_adapter_masked_scan_uint32, lFpuuLL)
 GO(gst_adapter_masked_scan_uint32_peek, lFpuuLLp)
 GO(gst_adapter_new, pFv)
-//GO(gst_adapter_offset_at_discont, 
+GO(gst_adapter_offset_at_discont, LFp)
 GO(gst_adapter_prev_dts, LFpp)
 GO(gst_adapter_prev_dts_at_offset, LFpLp)
 GO(gst_adapter_prev_offset, LFpp)
-//GO(gst_adapter_prev_pts, 
-//GO(gst_adapter_prev_pts_at_offset, 
-//GO(gst_adapter_pts_at_discont, 
+GO(gst_adapter_prev_pts, LFpp)
+GO(gst_adapter_prev_pts_at_offset, LFpLp)
+GO(gst_adapter_pts_at_discont, LFp)
 GO(gst_adapter_push, vFpp)
 GO(gst_adapter_take, pFpL)
 GO(gst_adapter_take_buffer, pFpL)
-//GO(gst_adapter_take_buffer_fast, 
-//GO(gst_adapter_take_buffer_list, 
-//GO(gst_adapter_take_list, 
+GO(gst_adapter_take_buffer_fast, pFpL)
+GO(gst_adapter_take_buffer_list, pFpL)
+GO(gst_adapter_take_list, pFpL)
 GO(gst_adapter_unmap, vFp)
 GO(gst_aggregator_finish_buffer, iFpp)
-//GO(gst_aggregator_finish_buffer_list, 
-//GO(gst_aggregator_get_allocator, 
-//GO(gst_aggregator_get_buffer_pool, 
-//GO(gst_aggregator_get_latency, 
+GO(gst_aggregator_finish_buffer_list, iFpp)
+GO(gst_aggregator_get_allocator, vFppp)
+GO(gst_aggregator_get_buffer_pool, pFp)
+GO(gst_aggregator_get_latency, LFp)
 GO(gst_aggregator_get_type, LFv)
-//GO(gst_aggregator_negotiate, 
-//GO(gst_aggregator_pad_drop_buffer, 
+GO(gst_aggregator_negotiate, iFp)
+GO(gst_aggregator_pad_drop_buffer, iFp)
 GO(gst_aggregator_pad_get_type, LFv)
-//GO(gst_aggregator_pad_has_buffer, 
-//GO(gst_aggregator_pad_is_eos, 
-//GO(gst_aggregator_pad_peek_buffer, 
-//GO(gst_aggregator_pad_pop_buffer, 
-//GO(gst_aggregator_peek_next_sample, 
-//GO(gst_aggregator_selected_samples, 
-//GO(gst_aggregator_set_latency, 
-//GO(gst_aggregator_set_src_caps, 
-//GO(gst_aggregator_simple_get_next_time, 
-//GO(gst_aggregator_start_time_selection_get_type, 
-//GO(gst_aggregator_update_segment, 
-//GO(gst_base_parse_add_index_entry, 
-//GO(gst_base_parse_convert_default, 
-//GO(gst_base_parse_drain, 
-//GO(gst_base_parse_finish_frame, 
-//GO(gst_base_parse_frame_copy, 
-//GO(gst_base_parse_frame_free, 
-//GO(gst_base_parse_frame_get_type, 
-//GO(gst_base_parse_frame_init, 
-//GO(gst_base_parse_frame_new, 
-//GO(gst_base_parse_get_type, 
-//GO(gst_base_parse_merge_tags, 
-//GO(gst_base_parse_push_frame, 
-//GO(gst_base_parse_set_average_bitrate, 
-//GO(gst_base_parse_set_duration, 
-//GO(gst_base_parse_set_frame_rate, 
-//GO(gst_base_parse_set_has_timing_info, 
-//GO(gst_base_parse_set_infer_ts, 
-//GO(gst_base_parse_set_latency, 
-//GO(gst_base_parse_set_min_frame_size, 
-//GO(gst_base_parse_set_passthrough, 
-//GO(gst_base_parse_set_pts_interpolation, 
-//GO(gst_base_parse_set_syncable, 
-//GO(gst_base_parse_set_ts_at_offset, 
-//GO(gst_base_sink_do_preroll, 
-//GO(gst_base_sink_get_blocksize, 
-//GO(gst_base_sink_get_drop_out_of_segment, 
-//GO(gst_base_sink_get_last_sample, 
-//GO(gst_base_sink_get_latency, 
-//GO(gst_base_sink_get_max_bitrate, 
-//GO(gst_base_sink_get_max_lateness, 
-//GO(gst_base_sink_get_processing_deadline, 
-//GO(gst_base_sink_get_render_delay, 
-//GO(gst_base_sink_get_stats, 
-//GO(gst_base_sink_get_sync, 
-//GO(gst_base_sink_get_throttle_time, 
-//GO(gst_base_sink_get_ts_offset, 
+GO(gst_aggregator_pad_has_buffer, iFp)
+GO(gst_aggregator_pad_is_eos, iFp)
+GO(gst_aggregator_pad_peek_buffer, pFp)
+GO(gst_aggregator_pad_pop_buffer, pFp)
+GO(gst_aggregator_peek_next_sample, pFpp)
+GO(gst_aggregator_selected_samples, vFpLLLp)
+GO(gst_aggregator_set_latency, vFpLL)
+GO(gst_aggregator_set_src_caps, vFpp)
+GO(gst_aggregator_simple_get_next_time, LFp)
+GO(gst_aggregator_start_time_selection_get_type, LFv)
+GO(gst_aggregator_update_segment, vFpp)
+GO(gst_base_parse_add_index_entry, iFpLLii)
+GO(gst_base_parse_convert_default, iFpulup)
+GO(gst_base_parse_drain, vFp)
+GO(gst_base_parse_finish_frame, iFppi)
+GO(gst_base_parse_frame_copy, pFp)
+GO(gst_base_parse_frame_free, vFp)
+GO(gst_base_parse_frame_get_type, LFv)
+GO(gst_base_parse_frame_init, vFp)
+GO(gst_base_parse_frame_new, pFpui)
+GO(gst_base_parse_get_type, LFv)
+GO(gst_base_parse_merge_tags, vFppu)
+GO(gst_base_parse_push_frame, iFpp)
+GO(gst_base_parse_set_average_bitrate, vFpu)
+GO(gst_base_parse_set_duration, vFpuli)
+GO(gst_base_parse_set_frame_rate, vFpuuuu)
+GO(gst_base_parse_set_has_timing_info, vFpi)
+GO(gst_base_parse_set_infer_ts, vFpi)
+GO(gst_base_parse_set_latency, vFpLL)
+GO(gst_base_parse_set_min_frame_size, vFpu)
+GO(gst_base_parse_set_passthrough, vFpi)
+GO(gst_base_parse_set_pts_interpolation, vFpi)
+GO(gst_base_parse_set_syncable, vFpi)
+GO(gst_base_parse_set_ts_at_offset, vFpL)
+GO(gst_base_sink_do_preroll, iFpp)
+GO(gst_base_sink_get_blocksize, uFp)
+GO(gst_base_sink_get_drop_out_of_segment, iFp)
+GO(gst_base_sink_get_last_sample, pFp)
+GO(gst_base_sink_get_latency, LFp)
+GO(gst_base_sink_get_max_bitrate, LFp)
+GO(gst_base_sink_get_max_lateness, lFp)
+GO(gst_base_sink_get_processing_deadline, LFp)
+GO(gst_base_sink_get_render_delay, LFp)
+GO(gst_base_sink_get_stats, pFp)
+GO(gst_base_sink_get_sync, iFp)
+GO(gst_base_sink_get_throttle_time, LFp)
+GO(gst_base_sink_get_ts_offset, lFp)
 GO(gst_base_sink_get_type, LFv)
-//GO(gst_base_sink_is_async_enabled, 
-//GO(gst_base_sink_is_last_sample_enabled, 
-//GO(gst_base_sink_is_qos_enabled, 
-//GO(gst_base_sink_query_latency, 
-//GO(gst_base_sink_set_async_enabled, 
-//GO(gst_base_sink_set_blocksize, 
-//GO(gst_base_sink_set_drop_out_of_segment, 
-//GO(gst_base_sink_set_last_sample_enabled, 
-//GO(gst_base_sink_set_max_bitrate, 
-//GO(gst_base_sink_set_max_lateness, 
-//GO(gst_base_sink_set_processing_deadline, 
-//GO(gst_base_sink_set_qos_enabled, 
-//GO(gst_base_sink_set_render_delay, 
-//GO(gst_base_sink_set_sync, 
-//GO(gst_base_sink_set_throttle_time, 
-//GO(gst_base_sink_set_ts_offset, 
-//GO(gst_base_sink_wait, 
-//GO(gst_base_sink_wait_clock, 
-//GO(gst_base_sink_wait_preroll, 
-//GO(gst_base_src_get_allocator, 
+GO(gst_base_sink_is_async_enabled, iFp)
+GO(gst_base_sink_is_last_sample_enabled, iFp)
+GO(gst_base_sink_is_qos_enabled, iFp)
+GO(gst_base_sink_query_latency, iFppppp)
+GO(gst_base_sink_set_async_enabled, vFpi)
+GO(gst_base_sink_set_blocksize, vFpu)
+GO(gst_base_sink_set_drop_out_of_segment, vFpi)
+GO(gst_base_sink_set_last_sample_enabled, vFpi)
+GO(gst_base_sink_set_max_bitrate, vFpL)
+GO(gst_base_sink_set_max_lateness, vFpl)
+GO(gst_base_sink_set_processing_deadline, vFpL)
+GO(gst_base_sink_set_qos_enabled, vFpi)
+GO(gst_base_sink_set_render_delay, vFpL)
+GO(gst_base_sink_set_sync, vFpi)
+GO(gst_base_sink_set_throttle_time, vFpL)
+GO(gst_base_sink_set_ts_offset, vFpl)
+GO(gst_base_sink_wait, iFpLp)
+GO(gst_base_sink_wait_clock, uFpLp)
+GO(gst_base_sink_wait_preroll, iFp)
+GO(gst_base_src_get_allocator, vFppp)
 GO(gst_base_src_get_blocksize, uFp)
-//GO(gst_base_src_get_buffer_pool, 
-//GO(gst_base_src_get_do_timestamp, 
+GO(gst_base_src_get_buffer_pool, pFp)
+GO(gst_base_src_get_do_timestamp, iFp)
 GO(gst_base_src_get_type, LFv)
-//GO(gst_base_src_is_async, 
+GO(gst_base_src_is_async, iFp)
 GO(gst_base_src_is_live, iFp)
-//GO(gst_base_src_negotiate, 
-//GO(gst_base_src_new_seamless_segment, 
-//GO(gst_base_src_new_segment, 
-//GO(gst_base_src_query_latency, 
-//GO(gst_base_src_set_async, 
+GO(gst_base_src_negotiate, iFp)
+GO(gst_base_src_new_seamless_segment, iFplll)
+GO(gst_base_src_new_segment, iFpp)
+GO(gst_base_src_query_latency, iFpppp)
+GO(gst_base_src_set_async, vFpi)
 GO(gst_base_src_set_automatic_eos, vFpi)
 GO(gst_base_src_set_blocksize, vFpu)
 GO(gst_base_src_set_caps, iFpp)
-//GO(gst_base_src_set_do_timestamp, 
-//GO(gst_base_src_set_dynamic_size, 
-//GO(gst_base_src_set_format, 
+GO(gst_base_src_set_do_timestamp, vFpi)
+GO(gst_base_src_set_dynamic_size, vFpi)
+GO(gst_base_src_set_format, vFpu)
 GO(gst_base_src_set_live, vFpi)
-//GO(gst_base_src_start_complete, 
-//GO(gst_base_src_start_wait, 
-//GO(gst_base_src_submit_buffer_list, 
-//GO(gst_base_src_wait_playing, 
-//GO(gst_base_transform_get_allocator, 
-//GO(gst_base_transform_get_buffer_pool, 
+GO(gst_base_src_start_complete, vFpi)
+GO(gst_base_src_start_wait, iFp)
+GO(gst_base_src_submit_buffer_list, vFpp)
+GO(gst_base_src_wait_playing, iFp)
+GO(gst_base_transform_get_allocator, vFppp)
+GO(gst_base_transform_get_buffer_pool, pFp)
 GO(gst_base_transform_get_type, LFv)
-//GO(gst_base_transform_is_in_place, 
+GO(gst_base_transform_is_in_place, iFp)
 GO(gst_base_transform_is_passthrough, iFp)
-//GO(gst_base_transform_is_qos_enabled, 
-//GO(gst_base_transform_reconfigure, 
-//GO(gst_base_transform_reconfigure_sink, 
+GO(gst_base_transform_is_qos_enabled, iFp)
+GO(gst_base_transform_reconfigure, iFp)
+GO(gst_base_transform_reconfigure_sink, vFp)
 GO(gst_base_transform_reconfigure_src, vFp)
 GO(gst_base_transform_set_gap_aware, vFpi)
 GO(gst_base_transform_set_in_place, vFpi)
 GO(gst_base_transform_set_passthrough, vFpi)
 GO(gst_base_transform_set_prefer_passthrough, vFpi)
-//GO(gst_base_transform_set_qos_enabled, 
-//GO(gst_base_transform_update_qos, 
+GO(gst_base_transform_set_qos_enabled, vFpi)
+GO(gst_base_transform_update_qos, vFpdlL)
 GO(gst_base_transform_update_src_caps, iFpp)
-//GO(gst_bit_reader_free, 
-//GO(gst_bit_reader_get_bits_uint16, 
-//GO(gst_bit_reader_get_bits_uint32, 
-//GO(gst_bit_reader_get_bits_uint64, 
-//GO(gst_bit_reader_get_bits_uint8, 
-//GO(gst_bit_reader_get_pos, 
-//GO(gst_bit_reader_get_remaining, 
-//GO(gst_bit_reader_get_size, 
+GO(gst_bit_reader_free, vFp)
+GO(gst_bit_reader_get_bits_uint16, iFppu)
+GO(gst_bit_reader_get_bits_uint32, iFppu)
+GO(gst_bit_reader_get_bits_uint64, iFppu)
+GO(gst_bit_reader_get_bits_uint8, iFppu)
+GO(gst_bit_reader_get_pos, uFp)
+GO(gst_bit_reader_get_remaining, uFp)
+GO(gst_bit_reader_get_size, uFp)
 GO(gst_bit_reader_init, vFppu)
 GO(gst_bit_reader_new, pFpu)
-//GO(gst_bit_reader_peek_bits_uint16, 
-//GO(gst_bit_reader_peek_bits_uint32, 
-//GO(gst_bit_reader_peek_bits_uint64, 
-//GO(gst_bit_reader_peek_bits_uint8, 
-//GO(gst_bit_reader_set_pos, 
-//GO(gst_bit_reader_skip, 
-//GO(gst_bit_reader_skip_to_byte, 
-//GO(gst_bit_writer_align_bytes, 
-//GO(gst_bit_writer_free, 
-//GO(gst_bit_writer_free_and_get_buffer, 
-//GO(gst_bit_writer_free_and_get_data, 
-//GO(gst_bit_writer_get_data, 
-//GO(gst_bit_writer_get_size, 
-//GO(gst_bit_writer_init, 
+GO(gst_bit_reader_peek_bits_uint16, iFppu)
+GO(gst_bit_reader_peek_bits_uint32, iFppu)
+GO(gst_bit_reader_peek_bits_uint64, iFppu)
+GO(gst_bit_reader_peek_bits_uint8, iFppu)
+GO(gst_bit_reader_set_pos, iFpu)
+GO(gst_bit_reader_skip, iFpu)
+GO(gst_bit_reader_skip_to_byte, iFp)
+GO(gst_bit_writer_align_bytes, iFpC)
+GO(gst_bit_writer_free, vFp)
+GO(gst_bit_writer_free_and_get_buffer, pFp)
+GO(gst_bit_writer_free_and_get_data, pFp)
+GO(gst_bit_writer_get_data, pFp)
+GO(gst_bit_writer_get_size, uFp)
+GO(gst_bit_writer_init, vFp)
 GO(gst_bit_writer_init_with_data, vFppui)
 GO(gst_bit_writer_init_with_size, vFpui)
 GO(gst_bit_writer_new, pFv)
 GO(gst_bit_writer_new_with_data, pFpui)
 GO(gst_bit_writer_new_with_size, pFui)
-//GO(gst_bit_writer_put_bits_uint16, 
-//GO(gst_bit_writer_put_bits_uint32, 
-//GO(gst_bit_writer_put_bits_uint64, 
-//GO(gst_bit_writer_put_bits_uint8, 
-//GO(gst_bit_writer_put_bytes, 
+GO(gst_bit_writer_put_bits_uint16, iFpWu)
+GO(gst_bit_writer_put_bits_uint32, iFpuu)
+GO(gst_bit_writer_put_bits_uint64, iFpLu)
+GO(gst_bit_writer_put_bits_uint8, iFpCu)
+GO(gst_bit_writer_put_bytes, iFppu)
 GO(gst_bit_writer_reset, vFp)
 GO(gst_bit_writer_reset_and_get_buffer, pFp)
 GO(gst_bit_writer_reset_and_get_data, pFp)
-//GO(gst_bit_writer_set_pos, 
-//GO(gst_byte_reader_dup_data, 
+GO(gst_bit_writer_set_pos, iFpu)
+GO(gst_byte_reader_dup_data, iFpup)
 GO(gst_byte_reader_dup_string_utf16, iFpp)
 GO(gst_byte_reader_dup_string_utf32, iFpp)
 GO(gst_byte_reader_dup_string_utf8, iFpp)
 GO(gst_byte_reader_free, vFp)
-//GO(gst_byte_reader_get_data, 
-//GO(gst_byte_reader_get_float32_be, 
-//GO(gst_byte_reader_get_float32_le, 
-//GO(gst_byte_reader_get_float64_be, 
-//GO(gst_byte_reader_get_float64_le, 
-//GO(gst_byte_reader_get_int16_be, 
-//GO(gst_byte_reader_get_int16_le, 
-//GO(gst_byte_reader_get_int24_be, 
-//GO(gst_byte_reader_get_int24_le, 
-//GO(gst_byte_reader_get_int32_be, 
-//GO(gst_byte_reader_get_int32_le, 
-//GO(gst_byte_reader_get_int64_be, 
-//GO(gst_byte_reader_get_int64_le, 
-//GO(gst_byte_reader_get_int8, 
-//GO(gst_byte_reader_get_pos, 
-//GO(gst_byte_reader_get_remaining, 
-//GO(gst_byte_reader_get_size, 
+GO(gst_byte_reader_get_data, iFpup)
+GO(gst_byte_reader_get_float32_be, iFpp)
+GO(gst_byte_reader_get_float32_le, iFpp)
+GO(gst_byte_reader_get_float64_be, iFpp)
+GO(gst_byte_reader_get_float64_le, iFpp)
+GO(gst_byte_reader_get_int16_be, iFpp)
+GO(gst_byte_reader_get_int16_le, iFpp)
+GO(gst_byte_reader_get_int24_be, iFpp)
+GO(gst_byte_reader_get_int24_le, iFpp)
+GO(gst_byte_reader_get_int32_be, iFpp)
+GO(gst_byte_reader_get_int32_le, iFpp)
+GO(gst_byte_reader_get_int64_be, iFpp)
+GO(gst_byte_reader_get_int64_le, iFpp)
+GO(gst_byte_reader_get_int8, iFpp)
+GO(gst_byte_reader_get_pos, uFp)
+GO(gst_byte_reader_get_remaining, uFp)
+GO(gst_byte_reader_get_size, uFp)
 GO(gst_byte_reader_get_string_utf8, iFpp)
-//GO(gst_byte_reader_get_sub_reader, 
-//GO(gst_byte_reader_get_uint16_be, 
-//GO(gst_byte_reader_get_uint16_le, 
-//GO(gst_byte_reader_get_uint24_be, 
-//GO(gst_byte_reader_get_uint24_le, 
-//GO(gst_byte_reader_get_uint32_be, 
-//GO(gst_byte_reader_get_uint32_le, 
-//GO(gst_byte_reader_get_uint64_be, 
-//GO(gst_byte_reader_get_uint64_le, 
-//GO(gst_byte_reader_get_uint8, 
-//GO(gst_byte_reader_init, 
+GO(gst_byte_reader_get_sub_reader, iFppu)
+GO(gst_byte_reader_get_uint16_be, iFpp)
+GO(gst_byte_reader_get_uint16_le, iFpp)
+GO(gst_byte_reader_get_uint24_be, iFpp)
+GO(gst_byte_reader_get_uint24_le, iFpp)
+GO(gst_byte_reader_get_uint32_be, iFpp)
+GO(gst_byte_reader_get_uint32_le, iFpp)
+GO(gst_byte_reader_get_uint64_be, iFpp)
+GO(gst_byte_reader_get_uint64_le, iFpp)
+GO(gst_byte_reader_get_uint8, iFpp)
+GO(gst_byte_reader_init, vFppu)
 GO(gst_byte_reader_masked_scan_uint32, uFpuuuu)
 GO(gst_byte_reader_masked_scan_uint32_peek, uFpuuuup)
 GO(gst_byte_reader_new, pFpu)
-//GO(gst_byte_reader_peek_data, 
-//GO(gst_byte_reader_peek_float32_be, 
-//GO(gst_byte_reader_peek_float32_le, 
-//GO(gst_byte_reader_peek_float64_be, 
-//GO(gst_byte_reader_peek_float64_le, 
-//GO(gst_byte_reader_peek_int16_be, 
-//GO(gst_byte_reader_peek_int16_le, 
-//GO(gst_byte_reader_peek_int24_be, 
-//GO(gst_byte_reader_peek_int24_le, 
-//GO(gst_byte_reader_peek_int32_be, 
-//GO(gst_byte_reader_peek_int32_le, 
-//GO(gst_byte_reader_peek_int64_be, 
-//GO(gst_byte_reader_peek_int64_le, 
-//GO(gst_byte_reader_peek_int8, 
+GO(gst_byte_reader_peek_data, iFpup)
+GO(gst_byte_reader_peek_float32_be, iFpp)
+GO(gst_byte_reader_peek_float32_le, iFpp)
+GO(gst_byte_reader_peek_float64_be, iFpp)
+GO(gst_byte_reader_peek_float64_le, iFpp)
+GO(gst_byte_reader_peek_int16_be, iFpp)
+GO(gst_byte_reader_peek_int16_le, iFpp)
+GO(gst_byte_reader_peek_int24_be, iFpp)
+GO(gst_byte_reader_peek_int24_le, iFpp)
+GO(gst_byte_reader_peek_int32_be, iFpp)
+GO(gst_byte_reader_peek_int32_le, iFpp)
+GO(gst_byte_reader_peek_int64_be, iFpp)
+GO(gst_byte_reader_peek_int64_le, iFpp)
+GO(gst_byte_reader_peek_int8, iFpp)
 GO(gst_byte_reader_peek_string_utf8, iFpp)
-//GO(gst_byte_reader_peek_sub_reader, 
-//GO(gst_byte_reader_peek_uint16_be, 
-//GO(gst_byte_reader_peek_uint16_le, 
-//GO(gst_byte_reader_peek_uint24_be, 
-//GO(gst_byte_reader_peek_uint24_le, 
-//GO(gst_byte_reader_peek_uint32_be, 
-//GO(gst_byte_reader_peek_uint32_le, 
-//GO(gst_byte_reader_peek_uint64_be, 
-//GO(gst_byte_reader_peek_uint64_le, 
-//GO(gst_byte_reader_peek_uint8, 
+GO(gst_byte_reader_peek_sub_reader, iFppu)
+GO(gst_byte_reader_peek_uint16_be, iFpp)
+GO(gst_byte_reader_peek_uint16_le, iFpp)
+GO(gst_byte_reader_peek_uint24_be, iFpp)
+GO(gst_byte_reader_peek_uint24_le, iFpp)
+GO(gst_byte_reader_peek_uint32_be, iFpp)
+GO(gst_byte_reader_peek_uint32_le, iFpp)
+GO(gst_byte_reader_peek_uint64_be, iFpp)
+GO(gst_byte_reader_peek_uint64_le, iFpp)
+GO(gst_byte_reader_peek_uint8, iFpp)
 GO(gst_byte_reader_set_pos, iFpu)
-//GO(gst_byte_reader_skip, 
-//GO(gst_byte_reader_skip_string_utf16, 
+GO(gst_byte_reader_skip, iFpu)
+GO(gst_byte_reader_skip_string_utf16, iFp)
 GO(gst_byte_reader_skip_string_utf32, iFp)
-//GO(gst_byte_reader_skip_string_utf8, 
-//GO(gst_byte_writer_ensure_free_space, 
-//GO(gst_byte_writer_fill, 
+GO(gst_byte_reader_skip_string_utf8, iFp)
+GO(gst_byte_writer_ensure_free_space, iFpu)
+GO(gst_byte_writer_fill, iFpCu)
 GO(gst_byte_writer_free, vFp)
 GO(gst_byte_writer_free_and_get_buffer, pFp)
-//GO(gst_byte_writer_free_and_get_data, 
+GO(gst_byte_writer_free_and_get_data, pFp)
 GO(gst_byte_writer_get_remaining, uFp)
 GO(gst_byte_writer_init, vFp)
 GO(gst_byte_writer_init_with_data, vFppui)
@@ -265,32 +265,32 @@ GO(gst_byte_writer_init_with_size, vFpui)
 GO(gst_byte_writer_new, pFv)
 GO(gst_byte_writer_new_with_data, pFpui)
 GO(gst_byte_writer_new_with_size, pFui)
-//GO(gst_byte_writer_put_data, 
-//GO(gst_byte_writer_put_float32_be, 
-//GO(gst_byte_writer_put_float32_le, 
-//GO(gst_byte_writer_put_float64_be, 
-//GO(gst_byte_writer_put_float64_le, 
-//GO(gst_byte_writer_put_int16_be, 
-//GO(gst_byte_writer_put_int16_le, 
-//GO(gst_byte_writer_put_int24_be, 
-//GO(gst_byte_writer_put_int24_le, 
-//GO(gst_byte_writer_put_int32_be, 
-//GO(gst_byte_writer_put_int32_le, 
-//GO(gst_byte_writer_put_int64_be, 
-//GO(gst_byte_writer_put_int64_le, 
-//GO(gst_byte_writer_put_int8, 
+GO(gst_byte_writer_put_data, iFppu)
+GO(gst_byte_writer_put_float32_be, iFpf)
+GO(gst_byte_writer_put_float32_le, iFpf)
+GO(gst_byte_writer_put_float64_be, iFpd)
+GO(gst_byte_writer_put_float64_le, iFpd)
+GO(gst_byte_writer_put_int16_be, iFpw)
+GO(gst_byte_writer_put_int16_le, iFpw)
+GO(gst_byte_writer_put_int24_be, iFpi)
+GO(gst_byte_writer_put_int24_le, iFpi)
+GO(gst_byte_writer_put_int32_be, iFpi)
+GO(gst_byte_writer_put_int32_le, iFpi)
+GO(gst_byte_writer_put_int64_be, iFpl)
+GO(gst_byte_writer_put_int64_le, iFpl)
+GO(gst_byte_writer_put_int8, iFpc)
 GO(gst_byte_writer_put_string_utf16, iFpp)
 GO(gst_byte_writer_put_string_utf32, iFpp)
 GO(gst_byte_writer_put_string_utf8, iFpp)
-//GO(gst_byte_writer_put_uint16_be, 
-//GO(gst_byte_writer_put_uint16_le, 
-//GO(gst_byte_writer_put_uint24_be, 
-//GO(gst_byte_writer_put_uint24_le, 
-//GO(gst_byte_writer_put_uint32_be, 
-//GO(gst_byte_writer_put_uint32_le, 
-//GO(gst_byte_writer_put_uint64_be, 
-//GO(gst_byte_writer_put_uint64_le, 
-//GO(gst_byte_writer_put_uint8, 
+GO(gst_byte_writer_put_uint16_be, iFpW)
+GO(gst_byte_writer_put_uint16_le, iFpW)
+GO(gst_byte_writer_put_uint24_be, iFpu)
+GO(gst_byte_writer_put_uint24_le, iFpu)
+GO(gst_byte_writer_put_uint32_be, iFpu)
+GO(gst_byte_writer_put_uint32_le, iFpu)
+GO(gst_byte_writer_put_uint64_be, iFpL)
+GO(gst_byte_writer_put_uint64_le, iFpL)
+GO(gst_byte_writer_put_uint8, iFpC)
 GO(gst_byte_writer_reset, vFp)
 GO(gst_byte_writer_reset_and_get_buffer, pFp)
 GO(gst_byte_writer_reset_and_get_data, pFp)
@@ -298,39 +298,39 @@ GOM(gst_collect_pads_add_pad, pFEppupi)
 GO(gst_collect_pads_available, uFp)
 GO(gst_collect_pads_clip_running_time, iFppppp)
 GO(gst_collect_pads_event_default, iFpppi)
-//GO(gst_collect_pads_flush, 
-//GO(gst_collect_pads_get_type, 
+GO(gst_collect_pads_flush, uFppu)
+GO(gst_collect_pads_get_type, LFv)
 GO(gst_collect_pads_new, pFv)
 GO(gst_collect_pads_peek, pFpp)
 GO(gst_collect_pads_pop, pFpp)
 GO(gst_collect_pads_query_default, iFpppi)
-//GO(gst_collect_pads_read_buffer, 
+GO(gst_collect_pads_read_buffer, pFppu)
 GO(gst_collect_pads_remove_pad, iFpp)
 GOM(gst_collect_pads_set_buffer_function, vFEppp)
 GOM(gst_collect_pads_set_clip_function, vFEppp)
-//GO(gst_collect_pads_set_compare_function, 
+//GOM(gst_collect_pads_set_compare_function, vFEppp)
 GOM(gst_collect_pads_set_event_function, vFEppp)
-//GO(gst_collect_pads_set_flush_function, 
+//GOM(gst_collect_pads_set_flush_function, vFEppp)
 GO(gst_collect_pads_set_flushing, vFpi)
 GOM(gst_collect_pads_set_function, vFEppp)
 GOM(gst_collect_pads_set_query_function, vFEppp)
 GO(gst_collect_pads_set_waiting, vFppi)
-//GO(gst_collect_pads_src_event_default, 
+GO(gst_collect_pads_src_event_default, iFppp)
 GO(gst_collect_pads_start, vFp)
 GO(gst_collect_pads_stop, vFp)
 GO(gst_collect_pads_take_buffer, pFppu)
 GO(gst_data_queue_drop_head, iFpL)
-//GO(gst_data_queue_flush, 
+GO(gst_data_queue_flush, vFp)
 GO(gst_data_queue_get_level, vFpp)
-//GO(gst_data_queue_get_type, 
+GO(gst_data_queue_get_type, LFv)
 GO(gst_data_queue_is_empty, iFp)
-//GO(gst_data_queue_is_full, 
-//GO(gst_data_queue_limits_changed, 
-//GO(gst_data_queue_new, 
+GO(gst_data_queue_is_full, iFp)
+GO(gst_data_queue_limits_changed, vFp)
+//GOM(gst_data_queue_new, pFEpppp)
 GO(gst_data_queue_peek, iFpp)
-//GO(gst_data_queue_pop, 
-//GO(gst_data_queue_push, 
-//GO(gst_data_queue_push_force, 
+GO(gst_data_queue_pop, iFpp)
+GO(gst_data_queue_push, iFpp)
+GO(gst_data_queue_push_force, iFpp)
 GO(gst_data_queue_set_flushing, vFpi)
 GO(gst_flow_combiner_add_pad, vFpp)
 GO(gst_flow_combiner_clear, vFp)
@@ -340,37 +340,37 @@ GO(gst_flow_combiner_new, pFv)
 GO(gst_flow_combiner_ref, pFp)
 GO(gst_flow_combiner_remove_pad, vFpp)
 GO(gst_flow_combiner_reset, vFp)
-//GO(gst_flow_combiner_unref, 
+GO(gst_flow_combiner_unref, vFp)
 GO(gst_flow_combiner_update_flow, iFpi)
 GO(gst_flow_combiner_update_pad_flow, iFppi)
 GO(gst_push_src_get_type, LFv)
 GO(gst_queue_array_clear, vFp)
-//GO(gst_queue_array_drop_element, 
+GO(gst_queue_array_drop_element, pFpu)
 GO(gst_queue_array_drop_struct, iFpup)
-//GO(gst_queue_array_find, 
-//GO(gst_queue_array_free, 
+//GOM(gst_queue_array_find, uFEppp)
+GO(gst_queue_array_free, vFp)
 GO(gst_queue_array_get_length, uFp)
 GO(gst_queue_array_is_empty, iFp)
 GO(gst_queue_array_new, pFu)
 GO(gst_queue_array_new_for_struct, pFLu)
-//GO(gst_queue_array_peek_head, 
-//GO(gst_queue_array_peek_head_struct, 
-//GO(gst_queue_array_peek_nth, 
+GO(gst_queue_array_peek_head, pFp)
+GO(gst_queue_array_peek_head_struct, pFp)
+GO(gst_queue_array_peek_nth, pFpu)
 GO(gst_queue_array_peek_nth_struct, pFpu)
-//GO(gst_queue_array_peek_tail, 
+GO(gst_queue_array_peek_tail, pFp)
 GO(gst_queue_array_peek_tail_struct, pFp)
-//GO(gst_queue_array_pop_head, 
-//GO(gst_queue_array_pop_head_struct, 
-//GO(gst_queue_array_pop_tail, 
-//GO(gst_queue_array_pop_tail_struct, 
-//GO(gst_queue_array_push_tail, 
+GO(gst_queue_array_pop_head, pFp)
+GO(gst_queue_array_pop_head_struct, pFp)
+GO(gst_queue_array_pop_tail, pFp)
+GO(gst_queue_array_pop_tail_struct, pFp)
+GO(gst_queue_array_push_tail, vFpp)
 GO(gst_queue_array_push_tail_struct, vFpp)
-//GO(gst_queue_array_set_clear_func, 
-//GO(gst_type_find_helper, 
+//GOM(gst_queue_array_set_clear_func, vFEpp)
+GO(gst_type_find_helper, pFpL)
 GO(gst_type_find_helper_for_buffer, pFppp)
-//GO(gst_type_find_helper_for_buffer_with_extension, 
-//GO(gst_type_find_helper_for_data, 
+GO(gst_type_find_helper_for_buffer_with_extension, pFpppp)
+GO(gst_type_find_helper_for_data, pFppLp)
 GO(gst_type_find_helper_for_data_with_extension, pFppLpp)
-//GO(gst_type_find_helper_for_extension, 
-//GO(gst_type_find_helper_get_range, 
-//GO(gst_type_find_helper_get_range_full, 
+GO(gst_type_find_helper_for_extension, pFpp)
+//GOM(gst_type_find_helper_get_range, pFEpppLpp)
+//GOM(gst_type_find_helper_get_range_full, iFEpppLppp)