[WRAPPER] Reworked wrapping of gstallocators with new wrapperhelper

4 files changed, 15 insertions, 10 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index b46240ef..a03a306d 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -1323,6 +1323,7 @@
 #() pFpiip
 #() pFpiuu
 #() pFpiLi
+#() pFpiLu
 #() pFpiLL
 #() pFpipc
 #() pFpipi
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index e53ccfed..7ad42fec 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -1352,6 +1352,7 @@ typedef void* (*pFpiiu_t)(void*, int32_t, int32_t, uint32_t);
 typedef void* (*pFpiip_t)(void*, int32_t, int32_t, void*);
 typedef void* (*pFpiuu_t)(void*, int32_t, uint32_t, uint32_t);
 typedef void* (*pFpiLi_t)(void*, int32_t, uintptr_t, int32_t);
+typedef void* (*pFpiLu_t)(void*, int32_t, uintptr_t, uint32_t);
 typedef void* (*pFpiLL_t)(void*, int32_t, uintptr_t, uintptr_t);
 typedef void* (*pFpipc_t)(void*, int32_t, void*, int8_t);
 typedef void* (*pFpipi_t)(void*, int32_t, void*, int32_t);
@@ -4712,6 +4713,7 @@ void pFpiiu(x64emu_t *emu, uintptr_t fcn) { pFpiiu_t fn = (pFpiiu_t)fcn; R_RAX=(
 void pFpiip(x64emu_t *emu, uintptr_t fcn) { pFpiip_t fn = (pFpiip_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void pFpiuu(x64emu_t *emu, uintptr_t fcn) { pFpiuu_t fn = (pFpiuu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
 void pFpiLi(x64emu_t *emu, uintptr_t fcn) { pFpiLi_t fn = (pFpiLi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (int32_t)R_RCX); }
+void pFpiLu(x64emu_t *emu, uintptr_t fcn) { pFpiLu_t fn = (pFpiLu_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (uint32_t)R_RCX); }
 void pFpiLL(x64emu_t *emu, uintptr_t fcn) { pFpiLL_t fn = (pFpiLL_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (uintptr_t)R_RDX, (uintptr_t)R_RCX); }
 void pFpipc(x64emu_t *emu, uintptr_t fcn) { pFpipc_t fn = (pFpipc_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int8_t)R_RCX); }
 void pFpipi(x64emu_t *emu, uintptr_t fcn) { pFpipi_t fn = (pFpipi_t)fcn; R_RAX=(uintptr_t)fn((void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (int32_t)R_RCX); }
@@ -7820,6 +7822,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &pFpiip) return 1;
 	if (fun == &pFpiuu) return 1;
 	if (fun == &pFpiLi) return 1;
+	if (fun == &pFpiLu) return 1;
 	if (fun == &pFpiLL) return 1;
 	if (fun == &pFpipc) return 1;
 	if (fun == &pFpipi) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 72c21252..3945944a 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -1360,6 +1360,7 @@ void pFpiiu(x64emu_t *emu, uintptr_t fnc);
 void pFpiip(x64emu_t *emu, uintptr_t fnc);
 void pFpiuu(x64emu_t *emu, uintptr_t fnc);
 void pFpiLi(x64emu_t *emu, uintptr_t fnc);
+void pFpiLu(x64emu_t *emu, uintptr_t fnc);
 void pFpiLL(x64emu_t *emu, uintptr_t fnc);
 void pFpipc(x64emu_t *emu, uintptr_t fnc);
 void pFpipi(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedgstallocators_private.h b/src/wrapped/wrappedgstallocators_private.h
index 18c71e14..f906e7f3 100644
--- a/src/wrapped/wrappedgstallocators_private.h
+++ b/src/wrapped/wrappedgstallocators_private.h
@@ -1,18 +1,18 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
 GO(gst_dmabuf_allocator_alloc, pFpiL)
-//GO(gst_dmabuf_allocator_alloc_with_flags, 
+GO(gst_dmabuf_allocator_alloc_with_flags, pFpiLu)
 GO(gst_dmabuf_allocator_get_type, LFv)
 GO(gst_dmabuf_allocator_new, pFv)
-//GO(gst_dmabuf_memory_get_fd, 
-//GO(gst_fd_allocator_alloc, 
+GO(gst_dmabuf_memory_get_fd, iFp)
+GO(gst_fd_allocator_alloc, pFpiLu)
 GO(gst_fd_allocator_get_type, LFv)
-//GO(gst_fd_allocator_new, 
-//GO(gst_fd_memory_get_fd, 
-//GO(gst_is_dmabuf_memory, 
-//GO(gst_is_fd_memory, 
-//GO(gst_is_phys_memory, 
+GO(gst_fd_allocator_new, pFv)
+GO(gst_fd_memory_get_fd, iFp)
+GO(gst_is_dmabuf_memory, iFp)
+GO(gst_is_fd_memory, iFp)
+GO(gst_is_phys_memory, iFp)
 GO(gst_phys_memory_allocator_get_type, LFv)
-//GO(gst_phys_memory_get_phys_addr, 
\ No newline at end of file
+GO(gst_phys_memory_get_phys_addr, LFp)