From 983a3d9926be26b7c2c59fa359d9bc36082f293f Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Sun, 16 Jul 2023 14:37:29 +0200 Subject: [PATCH] Removed useless box86context_t parameter to RunFunction and friend --- src/elfs/elfloader.c | 6 +- src/include/callback.h | 10 +- src/libtools/myfts.c | 4 +- src/libtools/obstack.c | 6 +- src/libtools/sdl1rwops.c | 8 +- src/libtools/sdl2rwops.c | 10 +- src/libtools/threads.c | 4 +- src/libtools/vkalign.c | 2 +- src/tools/callback.c | 15 +-- src/tools/gtkclass.c | 52 ++++----- src/wrapped/wrappedbz2.c | 4 +- src/wrapped/wrappedcairo.c | 2 +- src/wrapped/wrappedcrypto.c | 12 +-- src/wrapped/wrappedcurl.c | 12 +-- src/wrapped/wrappedd3dadapter9.c | 10 +- src/wrapped/wrappeddbus.c | 28 ++--- src/wrapped/wrappeddbusglib1.c | 12 +-- src/wrapped/wrappeddbusmenuglib.c | 4 +- src/wrapped/wrappedexpat.c | 6 +- src/wrapped/wrappedfaudio.c | 30 +++--- src/wrapped/wrappedfreetype.c | 22 ++-- src/wrapped/wrappedgconf2.c | 4 +- src/wrapped/wrappedgdk3.c | 6 +- src/wrapped/wrappedgdkpixbuf2.c | 2 +- src/wrapped/wrappedgdkx112.c | 6 +- src/wrapped/wrappedgio2.c | 30 +++--- src/wrapped/wrappedglib2.c | 56 +++++----- src/wrapped/wrappedgnutls.c | 6 +- src/wrapped/wrappedgobject2.c | 56 +++++----- src/wrapped/wrappedgstreamer.c | 18 ++-- src/wrapped/wrappedgtk3.c | 28 ++--- src/wrapped/wrappedgtkx112.c | 46 ++++---- src/wrapped/wrappedkrb5.c | 2 +- src/wrapped/wrappedlcms2.c | 2 +- src/wrapped/wrappedldapr.c | 2 +- src/wrapped/wrappedlibasound.c | 2 +- src/wrapped/wrappedlibc.c | 30 +++--- src/wrapped/wrappedlibfuse.c | 172 +++++++++++++++--------------- src/wrapped/wrappedlibgl.c | 4 +- src/wrapped/wrappedlibglu.c | 6 +- src/wrapped/wrappedlibibus.c | 2 +- src/wrapped/wrappedlibjpeg.c | 2 +- src/wrapped/wrappedlibjpeg62.c | 46 ++++---- src/wrapped/wrappedlibnm.c | 2 +- src/wrapped/wrappedlibrt.c | 2 +- src/wrapped/wrappedlibsm.c | 10 +- src/wrapped/wrappedlibsndfile.c | 10 +- src/wrapped/wrappedlibssl.c | 18 ++-- src/wrapped/wrappedlibtiff.c | 12 +-- src/wrapped/wrappedlibtinfo.c | 2 +- src/wrapped/wrappedlibtinfo6.c | 2 +- src/wrapped/wrappedlibusb1.c | 4 +- src/wrapped/wrappedlibvkd3d.c | 6 +- src/wrapped/wrappedlibx11.c | 26 ++--- src/wrapped/wrappedlibxcb.c | 2 +- src/wrapped/wrappedlibxext.c | 24 ++--- src/wrapped/wrappedlibxt.c | 2 +- src/wrapped/wrappedlibxtst.c | 2 +- src/wrapped/wrappedlibz.c | 4 +- src/wrapped/wrappedmpg123.c | 6 +- src/wrapped/wrappednspr4.c | 4 +- src/wrapped/wrappednss3.c | 6 +- src/wrapped/wrappedopenal.c | 2 +- src/wrapped/wrappedpango.c | 12 +-- src/wrapped/wrappedpangocairo.c | 4 +- src/wrapped/wrappedpng12.c | 20 ++-- src/wrapped/wrappedpng16.c | 22 ++-- src/wrapped/wrappedpulse.c | 86 +++++++-------- src/wrapped/wrappedsdl1.c | 6 +- src/wrapped/wrappedsdl1mixer.c | 10 +- src/wrapped/wrappedsdl2.c | 10 +- src/wrapped/wrappedsdl2mixer.c | 10 +- src/wrapped/wrappedsmime3.c | 18 ++-- src/wrapped/wrappedsmpeg.c | 2 +- src/wrapped/wrappedsmpeg2.c | 2 +- src/wrapped/wrappedssl3.c | 4 +- src/wrapped/wrappedudev1.c | 2 +- src/wrapped/wrappedvorbisfile.c | 8 +- src/wrapped/wrappedvulkan.c | 12 +-- src/wrapped/wrappedxml2.c | 100 ++++++++--------- src/wrapped/wrappedxslt.c | 4 +- wrapperhelper/gen.cpp | 4 +- 82 files changed, 632 insertions(+), 637 deletions(-) diff --git a/src/elfs/elfloader.c b/src/elfs/elfloader.c index 8a0cd36e..51182064 100755 --- a/src/elfs/elfloader.c +++ b/src/elfs/elfloader.c @@ -1308,13 +1308,13 @@ void RunElfInitPltResolver(elfheader_t* h, x86emu_t *emu) } printf_log(LOG_DEBUG, "Calling Init for %s %p\n", ElfName(h), (void*)p); if(h->initentry) - RunSafeFunction(my_context, p, 3, my_context->argc, my_context->argv, my_context->envv); + RunSafeFunction(p, 3, my_context->argc, my_context->argv, my_context->envv); printf_log(LOG_DEBUG, "Done Init for %s\n", ElfName(h)); // and check init array now Elf32_Addr *addr = (Elf32_Addr*)(h->initarray + h->delta); for (int i=0; iinitarray_sz; ++i) { printf_log(LOG_DEBUG, "Calling Init[%d] for %s %p\n", i, ElfName(h), (void*)addr[i]); - RunSafeFunction(my_context, (uintptr_t)addr[i], 3, my_context->argc, my_context->argv, my_context->envv); + RunSafeFunction((uintptr_t)addr[i], 3, my_context->argc, my_context->argv, my_context->envv); } h->fini_done = 0; // can be fini'd now (in case it was re-inited) @@ -1678,7 +1678,7 @@ static int my_dl_iterate_phdr_##A(struct dl_phdr_info* a, size_t b, void* c) return 0; \ if(!a->dlpi_name[0]) /*don't send informations about box86 itself*/ \ return 0; \ - return RunFunctionFmt(my_context, my_dl_iterate_phdr_fct_##A, "pLp", a, b, c); \ + return RunFunctionFmt(my_dl_iterate_phdr_fct_##A, "pLp", a, b, c); \ } SUPER() #undef GO diff --git a/src/include/callback.h b/src/include/callback.h index a98f382f..19ca3f9d 100755 --- a/src/include/callback.h +++ b/src/include/callback.h @@ -5,15 +5,15 @@ typedef struct x86emu_s x86emu_t; -uint32_t RunFunction(box86context_t *context, uintptr_t fnc, int nargs, ...); +uint32_t RunFunction(uintptr_t fnc, int nargs, ...); // using a fmt description -uint32_t RunFunctionFmt(box86context_t *context, uintptr_t fnc, const char* fmt, ...); +uint32_t RunFunctionFmt(uintptr_t fnc, const char* fmt, ...); // use thread local emu to run the function (context is unused now) -uint64_t RunFunction64(box86context_t *context, uintptr_t fnc, int nargs, ...); +uint64_t RunFunction64(uintptr_t fnc, int nargs, ...); // using a fmt description and returning a 64bit value -uint64_t RunFunctionFmt64(box86context_t *context, uintptr_t fnc, const char* fmt, ...); +uint64_t RunFunctionFmt64(uintptr_t fnc, const char* fmt, ...); // use emu state to run function uint32_t RunFunctionWithEmu(x86emu_t *emu, int QuitOnLongJump, uintptr_t fnc, int nargs, ...); -uint32_t RunSafeFunction(box86context_t *context, uintptr_t fnc, int nargs, ...); +uint32_t RunSafeFunction(uintptr_t fnc, int nargs, ...); #endif //__CALLBACK_H__ \ No newline at end of file diff --git a/src/libtools/myfts.c b/src/libtools/myfts.c index a4822230..fc23d38f 100755 --- a/src/libtools/myfts.c +++ b/src/libtools/myfts.c @@ -44,7 +44,7 @@ GO(3) static uintptr_t my_compare_fct_##A = 0; \ static int my_compare_##A(FTSENT* a, FTSENT* b) \ { \ - return (int)RunFunctionFmt(my_context, my_compare_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_compare_fct_##A, "pp", a, b); \ } #else #define GO(A) \ @@ -54,7 +54,7 @@ static int my_compare_##A(FTSENT* a, FTSENT* b) x86_ftsent_t x86_a, x86_b; \ UnalignFTSENT(&x86_a, a); \ UnalignFTSENT(&x86_b, b); \ - return (int)RunFunctionFmt(my_context, my_compare_fct_##A, "pp", x86_a, x86_b); \ + return (int)RunFunctionFmt(my_compare_fct_##A, "pp", x86_a, x86_b); \ } #endif SUPER() diff --git a/src/libtools/obstack.c b/src/libtools/obstack.c index f5634559..a2bd4dac 100755 --- a/src/libtools/obstack.c +++ b/src/libtools/obstack.c @@ -44,7 +44,7 @@ GO(4) static uintptr_t my_chunkfun_fct_##A = 0; \ static void* my_chunkfun_##A(size_t a) \ { \ - return (void*)RunFunctionFmt(my_context, my_chunkfun_fct_##A, "L", a); \ + return (void*)RunFunctionFmt(my_chunkfun_fct_##A, "L", a); \ } SUPER() #undef GO @@ -77,7 +77,7 @@ static void* reverse_chunkfunFct(library_t* lib, void* fct) static uintptr_t my_freefun_fct_##A = 0; \ static void my_freefun_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_freefun_fct_##A, "p", a); \ + RunFunctionFmt(my_freefun_fct_##A, "p", a); \ } SUPER() #undef GO @@ -211,7 +211,7 @@ void actual_obstack_alloc_failed_handler() { if(ref_obstack_alloc_failed_handler == my_obstack_alloc_failed_handler) real_obstack_alloc_failed_handler(); - RunFunctionFmt(my_context, (uintptr_t)my_obstack_alloc_failed_handler, ""); + RunFunctionFmt((uintptr_t)my_obstack_alloc_failed_handler, ""); } void obstackSetup() { diff --git a/src/libtools/sdl1rwops.c b/src/libtools/sdl1rwops.c index d4ffc2ff..44e3f400 100755 --- a/src/libtools/sdl1rwops.c +++ b/src/libtools/sdl1rwops.c @@ -72,20 +72,20 @@ EXPORT int32_t my_native_close(SDL1_RWops_t *context) } EXPORT int32_t my_emulated_seek(SDL1_RWops_t *context, int32_t offset, int32_t whence) { - return (int32_t)RunFunctionFmt(my_context, (uintptr_t)context->hidden.my.orig->seek, "pii", context->hidden.my.orig, offset, whence); + return (int32_t)RunFunctionFmt((uintptr_t)context->hidden.my.orig->seek, "pii", context->hidden.my.orig, offset, whence); } EXPORT int32_t my_emulated_read(SDL1_RWops_t *context, void *ptr, int32_t size, int32_t maxnum) { - return (int32_t)RunFunctionFmt(my_context, (uintptr_t)context->hidden.my.orig->read, "ppii", context->hidden.my.orig, ptr, size, maxnum); + return (int32_t)RunFunctionFmt((uintptr_t)context->hidden.my.orig->read, "ppii", context->hidden.my.orig, ptr, size, maxnum); } EXPORT int32_t my_emulated_write(SDL1_RWops_t *context, const void *ptr, int32_t size, int32_t num) { - return (int32_t)RunFunctionFmt(my_context, (uintptr_t)context->hidden.my.orig->write, "ppii", context->hidden.my.orig, ptr, size, num); + return (int32_t)RunFunctionFmt((uintptr_t)context->hidden.my.orig->write, "ppii", context->hidden.my.orig, ptr, size, num); } EXPORT int32_t my_emulated_close(SDL1_RWops_t *context) { - return (int32_t)RunFunctionFmt(my_context, (uintptr_t)context->hidden.my.orig->close, "p", context->hidden.my.orig); + return (int32_t)RunFunctionFmt((uintptr_t)context->hidden.my.orig->close, "p", context->hidden.my.orig); } SDL1_RWops_t* AddNativeRW(x86emu_t* emu, SDL1_RWops_t* ops) diff --git a/src/libtools/sdl2rwops.c b/src/libtools/sdl2rwops.c index 51ca3790..16de2caa 100755 --- a/src/libtools/sdl2rwops.c +++ b/src/libtools/sdl2rwops.c @@ -77,23 +77,23 @@ EXPORT int32_t my2_native_close(SDL2_RWops_t *context) } EXPORT int64_t my2_emulated_size(SDL2_RWops_t *context) { - return (int64_t)RunFunctionFmt64(my_context, (uintptr_t)context->hidden.my.orig->size, "p", context->hidden.my.orig); + return (int64_t)RunFunctionFmt64((uintptr_t)context->hidden.my.orig->size, "p", context->hidden.my.orig); } EXPORT int64_t my2_emulated_seek(SDL2_RWops_t *context, int64_t offset, int32_t whence) { - return (int64_t)RunFunctionFmt64(my_context, (uintptr_t)context->hidden.my.orig->seek, "pIi", context->hidden.my.orig, offset, whence); + return (int64_t)RunFunctionFmt64((uintptr_t)context->hidden.my.orig->seek, "pIi", context->hidden.my.orig, offset, whence); } EXPORT int32_t my2_emulated_read(SDL2_RWops_t *context, void *ptr, int32_t size, int32_t maxnum) { - return (int32_t)RunFunctionFmt(my_context, (uintptr_t)context->hidden.my.orig->read, "ppii", context->hidden.my.orig, ptr, size, maxnum); + return (int32_t)RunFunctionFmt((uintptr_t)context->hidden.my.orig->read, "ppii", context->hidden.my.orig, ptr, size, maxnum); } EXPORT int32_t my2_emulated_write(SDL2_RWops_t *context, const void *ptr, int32_t size, int32_t num) { - return (int32_t)RunFunctionFmt(my_context, (uintptr_t)context->hidden.my.orig->write, "ppii", context->hidden.my.orig, ptr, size, num); + return (int32_t)RunFunctionFmt((uintptr_t)context->hidden.my.orig->write, "ppii", context->hidden.my.orig, ptr, size, num); } EXPORT int32_t my2_emulated_close(SDL2_RWops_t *context) { - return (int32_t)RunFunctionFmt(my_context, (uintptr_t)context->hidden.my.orig->close, "p", context->hidden.my.orig); + return (int32_t)RunFunctionFmt((uintptr_t)context->hidden.my.orig->close, "p", context->hidden.my.orig); } SDL2_RWops_t* AddNativeRW2(x86emu_t* emu, SDL2_RWops_t* ops) diff --git a/src/libtools/threads.c b/src/libtools/threads.c index ca1b9587..67ffbe5f 100755 --- a/src/libtools/threads.c +++ b/src/libtools/threads.c @@ -443,7 +443,7 @@ GO(29) static uintptr_t my_key_destructor_fct_##A = 0; \ static void my_key_destructor_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_key_destructor_fct_##A, "p", a); \ + RunFunctionFmt(my_key_destructor_fct_##A, "p", a); \ } SUPER() #undef GO @@ -465,7 +465,7 @@ static void* findkey_destructorFct(void* fct) static uintptr_t my_cleanup_routine_fct_##A = 0; \ static void my_cleanup_routine_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_cleanup_routine_fct_##A, "p", a); \ + RunFunctionFmt(my_cleanup_routine_fct_##A, "p", a); \ } SUPER() #undef GO diff --git a/src/libtools/vkalign.c b/src/libtools/vkalign.c index 06aa5346..c6da1acc 100644 --- a/src/libtools/vkalign.c +++ b/src/libtools/vkalign.c @@ -1138,7 +1138,7 @@ GO(4) static uintptr_t my_vkDebugReportCallback_fct_##A = 0; \ static int my_vkDebugReportCallback_##A(int a, int b, uint64_t c, size_t d, int e, void* f, void* g, void* h) \ { \ - return (int)RunFunctionFmt(my_context, my_vkDebugReportCallback_fct_##A, "iiULuppp", a, b, c, d, e, f, g, h); \ + return (int)RunFunctionFmt(my_vkDebugReportCallback_fct_##A, "iiULuppp", a, b, c, d, e, f, g, h); \ } SUPER() #undef GO diff --git a/src/tools/callback.c b/src/tools/callback.c index 2db1e247..ce4b70ac 100755 --- a/src/tools/callback.c +++ b/src/tools/callback.c @@ -14,9 +14,8 @@ #include "dynarec.h" EXPORTDYN -uint32_t RunSafeFunction(box86context_t *context, uintptr_t fnc, int nargs, ...) +uint32_t RunSafeFunction(uintptr_t fnc, int nargs, ...) { - (void)context; x86emu_t *emu = thread_get_emu(); Push(emu, R_EBP); // push rbp @@ -62,9 +61,8 @@ uint32_t RunSafeFunction(box86context_t *context, uintptr_t fnc, int nargs, ...) } EXPORTDYN -uint32_t RunFunction(box86context_t *context, uintptr_t fnc, int nargs, ...) +uint32_t RunFunction(uintptr_t fnc, int nargs, ...) { - (void)context; x86emu_t *emu = thread_get_emu(); R_ESP -= nargs*4; // need to push in reverse order @@ -88,9 +86,8 @@ uint32_t RunFunction(box86context_t *context, uintptr_t fnc, int nargs, ...) } EXPORTDYN -uint64_t RunFunction64(box86context_t *context, uintptr_t fnc, int nargs, ...) +uint64_t RunFunction64(uintptr_t fnc, int nargs, ...) { - (void)context; x86emu_t *emu = thread_get_emu(); R_ESP -= nargs*4; // need to push in reverse order @@ -114,9 +111,8 @@ uint64_t RunFunction64(box86context_t *context, uintptr_t fnc, int nargs, ...) } EXPORTDYN -uint32_t RunFunctionFmt(box86context_t *context, uintptr_t fnc, const char* fmt, ...) +uint32_t RunFunctionFmt(uintptr_t fnc, const char* fmt, ...) { - (void)context; x86emu_t *emu = thread_get_emu(); int nargs = 0; int ni = 0; @@ -192,9 +188,8 @@ uint32_t RunFunctionFmt(box86context_t *context, uintptr_t fnc, const char* fmt, } EXPORTDYN -uint64_t RunFunctionFmt64(box86context_t *context, uintptr_t fnc, const char* fmt, ...) +uint64_t RunFunctionFmt64(uintptr_t fnc, const char* fmt, ...) { - (void)context; x86emu_t *emu = thread_get_emu(); int nargs = 0; int ni = 0; diff --git a/src/tools/gtkclass.c b/src/tools/gtkclass.c index 9473b839..6da3711c 100755 --- a/src/tools/gtkclass.c +++ b/src/tools/gtkclass.c @@ -57,7 +57,7 @@ static uintptr_t my_##NAME##_fct_##A = 0; \ static RET my_##NAME##_##A DEF \ { \ printf_log(LOG_DEBUG, "Calling " #NAME "_" #A " wrapper\n"); \ - return (RET)RunFunctionFmt(my_context, my_##NAME##_fct_##A, N, __VA_ARGS__);\ + return (RET)RunFunctionFmt(my_##NAME##_fct_##A, N, __VA_ARGS__);\ } #define FIND(A, NAME) \ @@ -1636,32 +1636,32 @@ SUPER() static uintptr_t fct_funcs_value_init_##A = 0; \ static void my_funcs_value_init_##A(void* value) { \ printf_log(LOG_DEBUG, "Calling fct_funcs_value_init_" #A " wrapper\n"); \ - RunFunctionFmt(my_context, fct_funcs_value_init_##A, "p", value); \ + RunFunctionFmt(fct_funcs_value_init_##A, "p", value); \ } \ static uintptr_t fct_funcs_value_free_##A = 0; \ static void my_funcs_value_free_##A(void* value) { \ printf_log(LOG_DEBUG, "Calling fct_funcs_value_free_" #A " wrapper\n"); \ - RunFunctionFmt(my_context, fct_funcs_value_free_##A, "p", value); \ + RunFunctionFmt(fct_funcs_value_free_##A, "p", value); \ } \ static uintptr_t fct_funcs_value_copy_##A = 0; \ static void my_funcs_value_copy_##A(void* source, void* dest) { \ printf_log(LOG_DEBUG, "Calling fct_funcs_value_copy_" #A " wrapper\n"); \ - RunFunctionFmt(my_context, fct_funcs_value_copy_##A, "pp", source, dest); \ + RunFunctionFmt(fct_funcs_value_copy_##A, "pp", source, dest); \ } \ static uintptr_t fct_funcs_value_peek_pointer_##A = 0; \ static void* my_funcs_value_peek_pointer_##A(void* value) { \ printf_log(LOG_DEBUG, "Calling fct_funcs_value_peek_pointer_" #A " wrapper\n"); \ - return (void*)RunFunctionFmt(my_context, fct_funcs_value_peek_pointer_##A, "p", value); \ + return (void*)RunFunctionFmt(fct_funcs_value_peek_pointer_##A, "p", value); \ } \ static uintptr_t fct_funcs_collect_value_##A = 0; \ static void* my_funcs_collect_value_##A(void* value, uint32_t n, void* collect, uint32_t flags) { \ printf_log(LOG_DEBUG, "Calling fct_funcs_collect_value_" #A " wrapper\n"); \ - return (void*)RunFunctionFmt(my_context, fct_funcs_collect_value_##A, "pupu", value, n, collect, flags);\ + return (void*)RunFunctionFmt(fct_funcs_collect_value_##A, "pupu", value, n, collect, flags);\ } \ static uintptr_t fct_funcs_lcopy_value_##A = 0; \ static void* my_funcs_lcopy_value_##A(void* value, uint32_t n, void* collect, uint32_t flags) { \ printf_log(LOG_DEBUG, "Calling fct_funcs_lcopy_value_" #A " wrapper\n"); \ - return (void*)RunFunctionFmt(my_context, fct_funcs_lcopy_value_##A, "pupu", value, n, collect, flags); \ + return (void*)RunFunctionFmt(fct_funcs_lcopy_value_##A, "pupu", value, n, collect, flags); \ } SUPER() #undef GO @@ -1702,7 +1702,7 @@ my_GTypeValueTable_t* findFreeGTypeValueTable(my_GTypeValueTable_t* fcts) static uintptr_t my_signal2_fct_##A = 0; \ static void* my_signal2_##A(void* a, void* b) \ { \ - return (void*)RunFunctionFmt(my_context, my_signal2_fct_##A, "pp", a, b); \ + return (void*)RunFunctionFmt(my_signal2_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -1724,7 +1724,7 @@ static void* find_signal2_Fct(void* fct) static uintptr_t my_signal3_fct_##A = 0; \ static void* my_signal3_##A(void* a, void* b, void* c) \ { \ - return (void*)RunFunctionFmt(my_context, my_signal3_fct_##A, "ppp", a, b, c); \ + return (void*)RunFunctionFmt(my_signal3_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -1746,7 +1746,7 @@ static void* find_signal3_Fct(void* fct) static uintptr_t my_signal4_fct_##A = 0; \ static void* my_signal4_##A(void* a, void* b, void* c, void* d) \ { \ - return (void*)RunFunctionFmt(my_context, my_signal4_fct_##A, "pppp", a, b, c, d); \ + return (void*)RunFunctionFmt(my_signal4_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -1768,7 +1768,7 @@ static void* find_signal4_Fct(void* fct) static uintptr_t my_signal5_fct_##A = 0; \ static void* my_signal5_##A(void* a, void* b, void* c, void* d, void* e) \ { \ - return (void*)RunFunctionFmt(my_context, my_signal5_fct_##A, "ppppp", a, b, c, d, e); \ + return (void*)RunFunctionFmt(my_signal5_fct_##A, "ppppp", a, b, c, d, e); \ } SUPER() #undef GO @@ -1790,7 +1790,7 @@ static void* find_signal5_Fct(void* fct) static uintptr_t my_signal6_fct_##A = 0; \ static void* my_signal6_##A(void* a, void* b, void* c, void* d, void* e, void* f) \ { \ - return (void*)RunFunctionFmt(my_context, my_signal6_fct_##A, "pppppp", a, b, c, d, e, f); \ + return (void*)RunFunctionFmt(my_signal6_fct_##A, "pppppp", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -1812,7 +1812,7 @@ static void* find_signal6_Fct(void* fct) static uintptr_t my_signal7_fct_##A = 0; \ static void* my_signal7_##A(void* a, void* b, void* c, void* d, void* e, void* f, void* g) \ { \ - return (void*)RunFunctionFmt(my_context, my_signal7_fct_##A, "ppppppp", a, b, c, d, e, f, g); \ + return (void*)RunFunctionFmt(my_signal7_fct_##A, "ppppppp", a, b, c, d, e, f, g); \ } SUPER() #undef GO @@ -1900,18 +1900,18 @@ static int fct_parent_##A = 0 ; static uintptr_t fct_funcs_base_init_##A = 0; \ static int my_funcs_base_init_##A(void* g_class) { \ printf_log(LOG_DEBUG, "Calling fct_funcs_base_init_" #A " wrapper\n"); \ - return (int)RunFunctionFmt(my_context, fct_funcs_base_init_##A, "p", g_class); \ + return (int)RunFunctionFmt(fct_funcs_base_init_##A, "p", g_class); \ } \ static uintptr_t fct_funcs_base_finalize_##A = 0; \ static int my_funcs_base_finalize_##A(void* g_class) { \ printf_log(LOG_DEBUG, "Calling fct_funcs_base_finalize_" #A " wrapper\n"); \ - return (int)RunFunctionFmt(my_context, fct_funcs_base_finalize_##A, "p", g_class); \ + return (int)RunFunctionFmt(fct_funcs_base_finalize_##A, "p", g_class); \ } \ static uintptr_t fct_funcs_class_init_##A = 0; \ static int my_funcs_class_init_##A(void* g_class, void* data) { \ printf_log(LOG_DEBUG, "Calling fct_funcs_class_init_" #A " wrapper\n"); \ /*wrapGTKClass(g_class, fct_parent_##A);*/ \ - int ret = (int)RunFunctionFmt(my_context, fct_funcs_class_init_##A, "pp", g_class, data); \ + int ret = (int)RunFunctionFmt(fct_funcs_class_init_##A, "pp", g_class, data); \ unwrapGTKClass(g_class, fct_parent_##A); \ bridgeGTKClass(g_class, fct_parent_##A); \ my_unwrap_signal_offset(g_class); \ @@ -1921,7 +1921,7 @@ static uintptr_t fct_funcs_class_finalize_##A = 0; static int my_funcs_class_finalize_##A(void* g_class, void* data) { \ printf_log(LOG_DEBUG, "Calling fct_funcs_class_finalize_" #A " wrapper\n"); \ wrapGTKClass(g_class, fct_parent_##A); \ - int ret = (int)RunFunctionFmt(my_context, fct_funcs_class_finalize_##A, "pp", g_class, data); \ + int ret = (int)RunFunctionFmt(fct_funcs_class_finalize_##A, "pp", g_class, data); \ unwrapGTKClass(g_class, fct_parent_##A); \ bridgeGTKClass(g_class, fct_parent_##A); \ my_unwrap_signal_offset(g_class); \ @@ -1930,7 +1930,7 @@ static int my_funcs_class_finalize_##A(void* g_class, void* data) { static uintptr_t fct_funcs_instance_init_##A = 0; \ static int my_funcs_instance_init_##A(void* instance, void* data) { \ printf_log(LOG_DEBUG, "Calling fct_funcs_instance_init_" #A " wrapper\n"); \ - return (int)RunFunctionFmt(my_context, fct_funcs_instance_init_##A, "pp", instance, data); \ + return (int)RunFunctionFmt(fct_funcs_instance_init_##A, "pp", instance, data); \ } SUPER() @@ -1984,7 +1984,7 @@ static int fct_gtk_parent_##A = 0 ; \ static uintptr_t fct_gtk_class_init_##A = 0; \ static int my_gtk_class_init_##A(void* g_class) { \ printf_log(LOG_DEBUG, "Calling fct_gtk_class_init_" #A " wrapper\n"); \ - int ret = (int)RunFunctionFmt(my_context, fct_gtk_class_init_##A, "p", g_class);\ + int ret = (int)RunFunctionFmt(fct_gtk_class_init_##A, "p", g_class);\ unwrapGTKClass(g_class, fct_gtk_parent_##A); \ bridgeGTKClass(g_class, fct_gtk_parent_##A); \ return ret; \ @@ -1992,12 +1992,12 @@ static int my_gtk_class_init_##A(void* g_class) { \ static uintptr_t fct_gtk_object_init_##A = 0; \ static int my_gtk_object_init_##A(void* object, void* data) { \ printf_log(LOG_DEBUG, "Calling fct_gtk_object_init_" #A " wrapper\n"); \ - return (int)RunFunctionFmt(my_context, fct_gtk_object_init_##A, "pp", object, data); \ + return (int)RunFunctionFmt(fct_gtk_object_init_##A, "pp", object, data); \ } \ static uintptr_t fct_gtk_base_class_init_##A = 0; \ static int my_gtk_base_class_init_##A(void* instance, void* data) { \ printf_log(LOG_DEBUG, "Calling fct_gtk_base_class_init_" #A " wrapper\n"); \ - return (int)RunFunctionFmt(my_context, fct_gtk_base_class_init_##A, "pp", instance, data); \ + return (int)RunFunctionFmt(fct_gtk_base_class_init_##A, "pp", instance, data); \ } SUPER() @@ -2108,7 +2108,7 @@ void my_signal_delete(my_signal_t* sig) } uintptr_t d = sig->destroy; if(d) { - RunFunctionFmt(my_context, d, "p", sig->data); + RunFunctionFmt(d, "p", sig->data); } printf_log(LOG_DEBUG, "gtk Data deleted, sig=%p, data=%p, destroy=%p\n", sig, sig->data, (void*)d); box_free(sig); @@ -2150,10 +2150,10 @@ int my_signal_cb(void* a, void* b, void* c, void* d) } printf_log(LOG_DEBUG, "gtk Signal called, sig=%p, NArgs=%d\n", sig, i); switch(i) { - case 1: return (int)RunFunctionFmt(my_context, sig->c_handler, "p", sig->data); - case 2: return (int)RunFunctionFmt(my_context, sig->c_handler, "pp", a, sig->data); - case 3: return (int)RunFunctionFmt(my_context, sig->c_handler, "ppp", a, b, sig->data); - case 4: return (int)RunFunctionFmt(my_context, sig->c_handler, "pppp", a, b, c, sig->data); + case 1: return (int)RunFunctionFmt(sig->c_handler, "p", sig->data); + case 2: return (int)RunFunctionFmt(sig->c_handler, "pp", a, sig->data); + case 3: return (int)RunFunctionFmt(sig->c_handler, "ppp", a, b, sig->data); + case 4: return (int)RunFunctionFmt(sig->c_handler, "pppp", a, b, c, sig->data); } printf_log(LOG_NONE, "Warning, Gtk signal callback but no data found!"); return 0; diff --git a/src/wrapped/wrappedbz2.c b/src/wrapped/wrappedbz2.c index 8efd69a1..c867b439 100755 --- a/src/wrapped/wrappedbz2.c +++ b/src/wrapped/wrappedbz2.c @@ -37,7 +37,7 @@ GO(4) static uintptr_t my_alloc_fct_##A = 0; \ static void* my_alloc_##A(void* opaque, int m, int n) \ { \ - return (void*)RunFunctionFmt(my_context, my_alloc_fct_##A, "pii", opaque, m, n); \ + return (void*)RunFunctionFmt(my_alloc_fct_##A, "pii", opaque, m, n); \ } SUPER() #undef GO @@ -69,7 +69,7 @@ static void* reverse_alloc_Fct(void* fct) static uintptr_t my_free_fct_##A = 0; \ static void my_free_##A(void* opaque, void* p) \ { \ - RunFunctionFmt(my_context, my_free_fct_##A, "pp", opaque, p); \ + RunFunctionFmt(my_free_fct_##A, "pp", opaque, p); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedcairo.c b/src/wrapped/wrappedcairo.c index b7c45925..97ab56c6 100755 --- a/src/wrapped/wrappedcairo.c +++ b/src/wrapped/wrappedcairo.c @@ -32,7 +32,7 @@ GO(4) static uintptr_t my_cairo_destroy_fct_##A = 0; \ static void my_cairo_destroy_##A(void* data) \ { \ - RunFunctionFmt(my_context, my_cairo_destroy_fct_##A, "p", data); \ + RunFunctionFmt(my_cairo_destroy_fct_##A, "p", data); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedcrypto.c b/src/wrapped/wrappedcrypto.c index a975596b..b65352ea 100755 --- a/src/wrapped/wrappedcrypto.c +++ b/src/wrapped/wrappedcrypto.c @@ -40,7 +40,7 @@ GO(4) static uintptr_t my_ENGINE_ctrl_cb_fct_##A = 0; \ static void my_ENGINE_ctrl_cb_##A() \ { \ - RunFunctionFmt(my_context, my_ENGINE_ctrl_cb_fct_##A, ""); \ + RunFunctionFmt(my_ENGINE_ctrl_cb_fct_##A, ""); \ } SUPER() #undef GO @@ -64,7 +64,7 @@ static void* find_ENGINE_ctrl_cb_Fct(void* fct) static uintptr_t my_cmp_fnc_fct_##A = 0; \ static int my_cmp_fnc_##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_cmp_fnc_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_cmp_fnc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -88,7 +88,7 @@ static void* find_cmp_fnc_Fct(void* fct) static uintptr_t my_free_fnc_fct_##A = 0; \ static void my_free_fnc_##A(void* p) \ { \ - RunFunctionFmt(my_context, my_free_fnc_fct_##A, "p", p); \ + RunFunctionFmt(my_free_fnc_fct_##A, "p", p); \ } SUPER() #undef GO @@ -112,7 +112,7 @@ static void* find_free_fnc_Fct(void* fct) static uintptr_t my_id_func_fct_##A = 0; \ static unsigned long my_id_func_##A() \ { \ - return (unsigned long)RunFunctionFmt(my_context, my_id_func_fct_##A, ""); \ + return (unsigned long)RunFunctionFmt(my_id_func_fct_##A, ""); \ } SUPER() #undef GO @@ -136,7 +136,7 @@ static void* find_id_func_Fct(void* fct) static uintptr_t my_lock_func_fct_##A = 0; \ static void my_lock_func_##A(int mode, int n, void* f, int l) \ { \ - RunFunctionFmt(my_context, my_lock_func_fct_##A, "iipi", mode, n, f, l);\ + RunFunctionFmt(my_lock_func_fct_##A, "iipi", mode, n, f, l);\ } SUPER() #undef GO @@ -160,7 +160,7 @@ static void* find_lock_func_Fct(void* fct) static uintptr_t my_passphrase_fct_##A = 0; \ static int my_passphrase_##A(void* buff, int size, int rw, void* u) \ { \ - return (int)RunFunctionFmt(my_context, my_passphrase_fct_##A, "piip", buff, size, rw, u); \ + return (int)RunFunctionFmt(my_passphrase_fct_##A, "piip", buff, size, rw, u); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedcurl.c b/src/wrapped/wrappedcurl.c index 6e826b78..a75cba3c 100755 --- a/src/wrapped/wrappedcurl.c +++ b/src/wrapped/wrappedcurl.c @@ -326,7 +326,7 @@ typedef enum { static uintptr_t my_write_fct_##A = 0; \ static size_t my_write_##A(char* ptr, size_t size, size_t nmemb, void* userdata) \ { \ - return (size_t)RunFunctionFmt(my_context, my_write_fct_##A, "pLLp", ptr, size, nmemb, userdata);\ + return (size_t)RunFunctionFmt(my_write_fct_##A, "pLLp", ptr, size, nmemb, userdata);\ } SUPER() #undef GO @@ -349,7 +349,7 @@ static void* find_write_Fct(void* fct) static uintptr_t my_read_fct_##A = 0; \ static size_t my_read_##A(char* buffer, size_t size, size_t nitems, void* userdata) \ { \ - return (size_t)RunFunctionFmt(my_context, my_read_fct_##A, "pLLp", buffer, size, nitems, userdata); \ + return (size_t)RunFunctionFmt(my_read_fct_##A, "pLLp", buffer, size, nitems, userdata); \ } SUPER() #undef GO @@ -372,7 +372,7 @@ static void* find_read_Fct(void* fct) static uintptr_t my_ioctl_fct_##A = 0; \ static size_t my_ioctl_##A(void* handle, int32_t fnc, void* userdata) \ { \ - return (size_t)RunFunctionFmt(my_context, my_ioctl_fct_##A, "pip", handle, fnc, userdata); \ + return (size_t)RunFunctionFmt(my_ioctl_fct_##A, "pip", handle, fnc, userdata); \ } SUPER() #undef GO @@ -395,7 +395,7 @@ static void* find_ioctl_Fct(void* fct) static uintptr_t my_seek_fct_##A = 0; \ static int32_t my_seek_##A(void* userdata, int64_t off, int32_t origin) \ { \ - return (int32_t)RunFunctionFmt(my_context, my_seek_fct_##A, "pIi", userdata, off, origin); \ + return (int32_t)RunFunctionFmt(my_seek_fct_##A, "pIi", userdata, off, origin); \ } SUPER() #undef GO @@ -418,7 +418,7 @@ static void* find_seek_Fct(void* fct) static uintptr_t my_header_fct_##A = 0; \ static size_t my_header_##A(char* buffer, size_t size, size_t nitems, void* userdata) \ { \ - return (size_t)RunFunctionFmt(my_context, my_header_fct_##A, "pLLp", buffer, size, nitems, userdata); \ + return (size_t)RunFunctionFmt(my_header_fct_##A, "pLLp", buffer, size, nitems, userdata); \ } SUPER() #undef GO @@ -441,7 +441,7 @@ static void* find_header_Fct(void* fct) static uintptr_t my_progress_fct_##A = 0; \ static int my_progress_##A(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow) \ { \ - return (int)RunFunctionFmt(my_context, my_progress_fct_##A, "pdddd", clientp, dltotal, dlnow, ultotal, ulnow); \ + return (int)RunFunctionFmt(my_progress_fct_##A, "pdddd", clientp, dltotal, dlnow, ultotal, ulnow); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedd3dadapter9.c b/src/wrapped/wrappedd3dadapter9.c index fe962b4d..7b13da16 100644 --- a/src/wrapped/wrappedd3dadapter9.c +++ b/src/wrapped/wrappedd3dadapter9.c @@ -225,7 +225,7 @@ static void freeMy() #define GOV(ns, ret, fn, args, call) \ static uintptr_t my_##ns##_##fn##_fct = 0; \ static ret my_##ns##_##fn(UNPACK args) { \ - ret r = (ret)RunFunctionFmt(my_context, my_##ns##_##fn##_fct, UNPACK call); \ + ret r = (ret)RunFunctionFmt(my_##ns##_##fn##_fct, UNPACK call); \ /* no closing brace */ #define GOV_1(ns, ret, fn, fmt, t1) \ @@ -319,13 +319,13 @@ typedef struct my_Direct3D9 { unsigned my_Direct3D9_AddRef(void *This) { my_Direct3D9 *my = This; - return RunFunctionFmt(my_context, (uintptr_t)(*my->real)->AddRef, "p", my->real); + return RunFunctionFmt((uintptr_t)(*my->real)->AddRef, "p", my->real); } unsigned my_Direct3D9_Release(void *This) { my_Direct3D9 *my = This; - return RunFunctionFmt(my_context, (uintptr_t)(*my->real)->Release, "p", my->real); + return RunFunctionFmt((uintptr_t)(*my->real)->Release, "p", my->real); } IDirect3D9Vtbl my_Direct3D9_vtbl = { @@ -341,13 +341,13 @@ typedef struct my_Direct3D9Ex { unsigned my_Direct3D9Ex_AddRef(void *This) { my_Direct3D9Ex *my = This; - return RunFunctionFmt(my_context, (uintptr_t)(*my->real)->AddRef, "p", my->real); + return RunFunctionFmt((uintptr_t)(*my->real)->AddRef, "p", my->real); } unsigned my_Direct3D9Ex_Release(void *This) { my_Direct3D9Ex *my = This; - return RunFunctionFmt(my_context, (uintptr_t)(*my->real)->Release, "p", my->real); + return RunFunctionFmt((uintptr_t)(*my->real)->Release, "p", my->real); } IDirect3D9ExVtbl my_Direct3D9Ex_vtbl = { diff --git a/src/wrapped/wrappeddbus.c b/src/wrapped/wrappeddbus.c index 68e60d94..d4d9b233 100755 --- a/src/wrapped/wrappeddbus.c +++ b/src/wrapped/wrappeddbus.c @@ -39,7 +39,7 @@ GO(3) static uintptr_t my_DBusFreeFunction_fct_##A = 0; \ static void my_DBusFreeFunction_##A(void* p) \ { \ - RunFunctionFmt(my_context, my_DBusFreeFunction_fct_##A, "p", p);\ + RunFunctionFmt(my_DBusFreeFunction_fct_##A, "p", p);\ } SUPER() #undef GO @@ -61,7 +61,7 @@ static void* find_DBusFreeFunction_Fct(void* fct) static uintptr_t my_DBusHandleMessageFunction_fct_##A = 0; \ static int my_DBusHandleMessageFunction_##A(void* a, void* b, void* c) \ { \ - return RunFunctionFmt(my_context, my_DBusHandleMessageFunction_fct_##A, "ppp", a, b, c);\ + return RunFunctionFmt(my_DBusHandleMessageFunction_fct_##A, "ppp", a, b, c);\ } SUPER() #undef GO @@ -83,7 +83,7 @@ static void* find_DBusHandleMessageFunction_Fct(void* fct) static uintptr_t my_DBusAddTimeoutFunction_fct_##A = 0; \ static int my_DBusAddTimeoutFunction_##A(void* a, void* b) \ { \ - return RunFunctionFmt(my_context, my_DBusAddTimeoutFunction_fct_##A, "pp", a, b); \ + return RunFunctionFmt(my_DBusAddTimeoutFunction_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -105,7 +105,7 @@ static void* find_DBusAddTimeoutFunction_Fct(void* fct) static uintptr_t my_DBusRemoveTimeoutFunction_fct_##A = 0; \ static void my_DBusRemoveTimeoutFunction_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_DBusRemoveTimeoutFunction_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_DBusRemoveTimeoutFunction_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -127,7 +127,7 @@ static void* find_DBusRemoveTimeoutFunction_Fct(void* fct) static uintptr_t my_DBusTimeoutToggledFunction_fct_##A = 0; \ static void my_DBusTimeoutToggledFunction_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_DBusTimeoutToggledFunction_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_DBusTimeoutToggledFunction_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -149,7 +149,7 @@ static void* find_DBusTimeoutToggledFunction_Fct(void* fct) static uintptr_t my_DBusWakeupMainFunction_fct_##A = 0; \ static void my_DBusWakeupMainFunction_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_DBusWakeupMainFunction_fct_##A, "p", a); \ + RunFunctionFmt(my_DBusWakeupMainFunction_fct_##A, "p", a); \ } SUPER() #undef GO @@ -172,7 +172,7 @@ static void* find_DBusWakeupMainFunction_Fct(void* fct) static uintptr_t my_DBusPendingCallNotifyFunction_fct_##A = 0; \ static void my_DBusPendingCallNotifyFunction_##A(void* pending, void* data) \ { \ - RunFunctionFmt(my_context, my_DBusPendingCallNotifyFunction_fct_##A, "pp", pending, data); \ + RunFunctionFmt(my_DBusPendingCallNotifyFunction_fct_##A, "pp", pending, data); \ } SUPER() #undef GO @@ -195,7 +195,7 @@ static void* findDBusPendingCallNotifyFunctionFct(void* fct) static uintptr_t my_DBusDispatchStatusFunction_fct_##A = 0; \ static void my_DBusDispatchStatusFunction_##A(void* connection, int new_status, void* data) \ { \ - RunFunctionFmt(my_context, my_DBusDispatchStatusFunction_fct_##A, "pip", connection, new_status, data); \ + RunFunctionFmt(my_DBusDispatchStatusFunction_fct_##A, "pip", connection, new_status, data); \ } SUPER() #undef GO @@ -218,7 +218,7 @@ static void* findDBusDispatchStatusFunctionFct(void* fct) static uintptr_t my_DBusAddWatchFunction_fct_##A = 0; \ static int my_DBusAddWatchFunction_##A(void* watch, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_DBusAddWatchFunction_fct_##A, "pp", watch, data); \ + return (int)RunFunctionFmt(my_DBusAddWatchFunction_fct_##A, "pp", watch, data); \ } SUPER() #undef GO @@ -241,7 +241,7 @@ static void* findDBusAddWatchFunctionFct(void* fct) static uintptr_t my_DBusRemoveWatchFunction_fct_##A = 0; \ static void my_DBusRemoveWatchFunction_##A(void* watch, void* data) \ { \ - RunFunctionFmt(my_context, my_DBusRemoveWatchFunction_fct_##A, "pp", watch, data); \ + RunFunctionFmt(my_DBusRemoveWatchFunction_fct_##A, "pp", watch, data); \ } SUPER() #undef GO @@ -264,7 +264,7 @@ static void* findDBusRemoveWatchFunctionFct(void* fct) static uintptr_t my_DBusWatchToggledFunction_fct_##A = 0; \ static void my_DBusWatchToggledFunction_##A(void* watch, void* data) \ { \ - RunFunctionFmt(my_context, my_DBusWatchToggledFunction_fct_##A, "pp", watch, data); \ + RunFunctionFmt(my_DBusWatchToggledFunction_fct_##A, "pp", watch, data); \ } SUPER() #undef GO @@ -287,7 +287,7 @@ static void* findDBusWatchToggledFunctionFct(void* fct) static uintptr_t my_DBusObjectPathUnregisterFunction_fct_##A = 0; \ static void my_DBusObjectPathUnregisterFunction_##A(void* connection, void* data) \ { \ - RunFunctionFmt(my_context, my_DBusObjectPathUnregisterFunction_fct_##A, "pp", connection, data); \ + RunFunctionFmt(my_DBusObjectPathUnregisterFunction_fct_##A, "pp", connection, data); \ } SUPER() #undef GO @@ -310,7 +310,7 @@ static void* findDBusObjectPathUnregisterFunctionFct(void* fct) static uintptr_t my_DBusObjectPathMessageFunction_fct_##A = 0; \ static void my_DBusObjectPathMessageFunction_##A(void* connection, void* message, void* data) \ { \ - RunFunctionFmt(my_context, my_DBusObjectPathMessageFunction_fct_##A, "ppp", connection, message, data); \ + RunFunctionFmt(my_DBusObjectPathMessageFunction_fct_##A, "ppp", connection, message, data); \ } SUPER() #undef GO @@ -333,7 +333,7 @@ static void* findDBusObjectPathMessageFunctionFct(void* fct) static uintptr_t my_dbus_internal_pad_fct_##A = 0; \ static void my_dbus_internal_pad_##A(void* a, void* b, void* c, void* d) \ { \ - RunFunctionFmt(my_context, my_dbus_internal_pad_fct_##A, "pppp", a, b, c, d); \ + RunFunctionFmt(my_dbus_internal_pad_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappeddbusglib1.c b/src/wrapped/wrappeddbusglib1.c index 3fcdfcc3..f8c79153 100755 --- a/src/wrapped/wrappeddbusglib1.c +++ b/src/wrapped/wrappeddbusglib1.c @@ -38,7 +38,7 @@ const char* dbusglib1Name = "libdbus-glib-1.so.2"; static uintptr_t my_GDestroyNotify_fct_##A = 0; \ static void my_GDestroyNotify_##A(void* data) \ { \ - RunFunctionFmt(my_context, my_GDestroyNotify_fct_##A, "p", data); \ + RunFunctionFmt(my_GDestroyNotify_fct_##A, "p", data); \ } SUPER() #undef GO @@ -61,7 +61,7 @@ static void* findGDestroyNotifyFct(void* fct) static uintptr_t my_GClosureNotify_fct_##A = 0; \ static void my_GClosureNotify_##A(void* data, void* closure) \ { \ - RunFunctionFmt(my_context, my_GClosureNotify_fct_##A, "pp", data, closure); \ + RunFunctionFmt(my_GClosureNotify_fct_##A, "pp", data, closure); \ } SUPER() #undef GO @@ -84,7 +84,7 @@ static void* findGClosureNotifyFct(void* fct) static uintptr_t my_DBusGProxyCallNotify_fct_##A = 0; \ static void my_DBusGProxyCallNotify_##A(void* proxy, void* call_id, void* data) \ { \ - RunFunctionFmt(my_context, my_DBusGProxyCallNotify_fct_##A, "ppp", proxy, call_id, data); \ + RunFunctionFmt(my_DBusGProxyCallNotify_fct_##A, "ppp", proxy, call_id, data); \ } SUPER() #undef GO @@ -107,7 +107,7 @@ static void* findDBusGProxyCallNotifyFct(void* fct) static uintptr_t my_GCallback_fct_##A = 0; \ static void my_GCallback_##A(void* a, void* b, void* c, void* d) \ { \ - RunFunctionFmt(my_context, my_GCallback_fct_##A, "pppp", a, b, c, d); \ + RunFunctionFmt(my_GCallback_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -130,7 +130,7 @@ static void* findGCallbackFct(void* fct) static uintptr_t my_DBusGTypeSpecializedCollectionIterator_fct_##A = 0; \ static void my_DBusGTypeSpecializedCollectionIterator_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_DBusGTypeSpecializedCollectionIterator_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_DBusGTypeSpecializedCollectionIterator_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -152,7 +152,7 @@ static void* findDBusGTypeSpecializedCollectionIteratorFct(void* fct) static uintptr_t my_DBusGTypeSpecializedMapIterator_fct_##A = 0; \ static void my_DBusGTypeSpecializedMapIterator_##A(void* a, void* b, void* c) \ { \ - RunFunctionFmt(my_context, my_DBusGTypeSpecializedMapIterator_fct_##A, "ppp", a, b, c); \ + RunFunctionFmt(my_DBusGTypeSpecializedMapIterator_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappeddbusmenuglib.c b/src/wrapped/wrappeddbusmenuglib.c index b763a1b8..60553e5f 100755 --- a/src/wrapped/wrappeddbusmenuglib.c +++ b/src/wrapped/wrappeddbusmenuglib.c @@ -38,7 +38,7 @@ GO(3) static uintptr_t my_DbusmenuClientTypeHandler_fct_##A = 0; \ static int my_DbusmenuClientTypeHandler_##A(void* a, void* b, void* c, void* d) \ { \ - return RunFunctionFmt(my_context, my_DbusmenuClientTypeHandler_fct_##A, "pppp", a, b, c, d);\ + return RunFunctionFmt(my_DbusmenuClientTypeHandler_fct_##A, "pppp", a, b, c, d);\ } SUPER() #undef GO @@ -61,7 +61,7 @@ static void* findDbusmenuClientTypeHandlerFct(void* fct) static uintptr_t my_DbusmenuMenuitem_fct_##A = 0; \ static void my_DbusmenuMenuitem_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_DbusmenuMenuitem_fct_##A, "pp", a, b);\ + RunFunctionFmt(my_DbusmenuMenuitem_fct_##A, "pp", a, b);\ } SUPER() #undef GO diff --git a/src/wrapped/wrappedexpat.c b/src/wrapped/wrappedexpat.c index dd53eae2..a853a956 100755 --- a/src/wrapped/wrappedexpat.c +++ b/src/wrapped/wrappedexpat.c @@ -37,7 +37,7 @@ GO(4) static uintptr_t my_Start_fct_##A = 0; \ static void* my_Start_##A(void* data, void* name, void* attr) \ { \ - return (void*)RunFunctionFmt(my_context, my_Start_fct_##A, "ppp", data, name, attr);\ + return (void*)RunFunctionFmt(my_Start_fct_##A, "ppp", data, name, attr);\ } SUPER() #undef GO @@ -59,7 +59,7 @@ static void* find_Start_Fct(void* fct) static uintptr_t my_End_fct_##A = 0; \ static void my_End_##A(void* data, void* name) \ { \ - RunFunctionFmt(my_context, my_End_fct_##A, "pp", data, name); \ + RunFunctionFmt(my_End_fct_##A, "pp", data, name); \ } SUPER() #undef GO @@ -81,7 +81,7 @@ static void* find_End_Fct(void* fct) static uintptr_t my_CharData_fct_##A = 0; \ static void my_CharData_##A(void* data, void* s, int l) \ { \ - RunFunctionFmt(my_context, my_CharData_fct_##A, "ppi", data, s, l); \ + RunFunctionFmt(my_CharData_fct_##A, "ppi", data, s, l); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedfaudio.c b/src/wrapped/wrappedfaudio.c index 9bc57296..e5310864 100644 --- a/src/wrapped/wrappedfaudio.c +++ b/src/wrapped/wrappedfaudio.c @@ -37,7 +37,7 @@ GO(4) static uintptr_t my_FAudioMalloc_fct_##A = 0; \ static void* my_FAudioMalloc_##A(size_t a) \ { \ - return (void*)RunFunctionFmt(my_context, my_FAudioMalloc_fct_##A, "L", a); \ + return (void*)RunFunctionFmt(my_FAudioMalloc_fct_##A, "L", a); \ } SUPER() #undef GO @@ -59,7 +59,7 @@ static void* find_FAudioMalloc_Fct(void* fct) static uintptr_t my_FAudioFree_fct_##A = 0; \ static void my_FAudioFree_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_FAudioFree_fct_##A, "p", a); \ + RunFunctionFmt(my_FAudioFree_fct_##A, "p", a); \ } SUPER() #undef GO @@ -81,7 +81,7 @@ static void* find_FAudioFree_Fct(void* fct) static uintptr_t my_FAudioRealloc_fct_##A = 0; \ static void* my_FAudioRealloc_##A(void* a, size_t b) \ { \ - return (void*)RunFunctionFmt(my_context, my_FAudioRealloc_fct_##A, "pL", a, b); \ + return (void*)RunFunctionFmt(my_FAudioRealloc_fct_##A, "pL", a, b); \ } SUPER() #undef GO @@ -103,7 +103,7 @@ static void* find_FAudioRealloc_Fct(void* fct) static uintptr_t my_OnCriticalErrorFunc_fct_##A = 0; \ static void my_OnCriticalErrorFunc_##A(void* a, uint32_t b) \ { \ - RunFunctionFmt(my_context, my_OnCriticalErrorFunc_fct_##A, "pu", a, b); \ + RunFunctionFmt(my_OnCriticalErrorFunc_fct_##A, "pu", a, b); \ } SUPER() #undef GO @@ -125,7 +125,7 @@ static void* find_OnCriticalErrorFunc_Fct(void* fct) static uintptr_t my_OnProcessingPassEndFunc_fct_##A = 0; \ static void my_OnProcessingPassEndFunc_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_OnProcessingPassEndFunc_fct_##A, "p", a); \ + RunFunctionFmt(my_OnProcessingPassEndFunc_fct_##A, "p", a); \ } SUPER() #undef GO @@ -147,7 +147,7 @@ static void* find_OnProcessingPassEndFunc_Fct(void* fct) static uintptr_t my_OnProcessingPassStartFunc_fct_##A = 0; \ static void my_OnProcessingPassStartFunc_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_OnProcessingPassStartFunc_fct_##A, "p", a); \ + RunFunctionFmt(my_OnProcessingPassStartFunc_fct_##A, "p", a); \ } SUPER() #undef GO @@ -175,7 +175,7 @@ typedef struct my_FAudioEngineCallback_s static uintptr_t my_OnBufferEndFunc_fct_##A = 0; \ static void my_OnBufferEndFunc_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_OnBufferEndFunc_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_OnBufferEndFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -197,7 +197,7 @@ static void* find_OnBufferEndFunc_Fct(void* fct) static uintptr_t my_OnBufferStartFunc_fct_##A = 0; \ static void my_OnBufferStartFunc_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_OnBufferStartFunc_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_OnBufferStartFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -219,7 +219,7 @@ static void* find_OnBufferStartFunc_Fct(void* fct) static uintptr_t my_OnLoopEndFunc_fct_##A = 0; \ static void my_OnLoopEndFunc_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_OnLoopEndFunc_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_OnLoopEndFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -241,7 +241,7 @@ static void* find_OnLoopEndFunc_Fct(void* fct) static uintptr_t my_OnStreamEndFunc_fct_##A = 0; \ static void my_OnStreamEndFunc_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_OnStreamEndFunc_fct_##A, "p", a); \ + RunFunctionFmt(my_OnStreamEndFunc_fct_##A, "p", a); \ } SUPER() #undef GO @@ -263,7 +263,7 @@ static void* find_OnStreamEndFunc_Fct(void* fct) static uintptr_t my_OnVoiceErrorFunc_fct_##A = 0; \ static void my_OnVoiceErrorFunc_##A(void* a, void* b, uint32_t c) \ { \ - RunFunctionFmt(my_context, my_OnVoiceErrorFunc_fct_##A, "ppu", a, b, c); \ + RunFunctionFmt(my_OnVoiceErrorFunc_fct_##A, "ppu", a, b, c); \ } SUPER() #undef GO @@ -285,7 +285,7 @@ static void* find_OnVoiceErrorFunc_Fct(void* fct) static uintptr_t my_OnVoiceProcessingPassEndFunc_fct_##A = 0; \ static void my_OnVoiceProcessingPassEndFunc_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_OnVoiceProcessingPassEndFunc_fct_##A, "p", a);\ + RunFunctionFmt(my_OnVoiceProcessingPassEndFunc_fct_##A, "p", a);\ } SUPER() #undef GO @@ -307,7 +307,7 @@ static void* find_OnVoiceProcessingPassEndFunc_Fct(void* fct) static uintptr_t my_OnVoiceProcessingPassStartFunc_fct_##A = 0; \ static void my_OnVoiceProcessingPassStartFunc_##A(void* a, uint32_t b) \ { \ - RunFunctionFmt(my_context, my_OnVoiceProcessingPassStartFunc_fct_##A, "pu", a, b); \ + RunFunctionFmt(my_OnVoiceProcessingPassStartFunc_fct_##A, "pu", a, b); \ } SUPER() #undef GO @@ -339,7 +339,7 @@ typedef struct my_FAudioVoiceCallback_s static uintptr_t my_FAudioEngineCallEXT_fct_##A = 0; \ static void my_FAudioEngineCallEXT_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_FAudioEngineCallEXT_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_FAudioEngineCallEXT_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -361,7 +361,7 @@ static void* find_FAudioEngineCallEXT_Fct(void* fct) static uintptr_t my_FAudioEngineProcedureEXT_fct_##A = 0; \ static void my_FAudioEngineProcedureEXT_##A(void* a, void* b, void* c, void* d) \ { \ - RunFunctionFmt(my_context, my_FAudioEngineProcedureEXT_fct_##A, "pppp", find_FAudioEngineCallEXT_Fct(a), b, c, d); \ + RunFunctionFmt(my_FAudioEngineProcedureEXT_fct_##A, "pppp", find_FAudioEngineCallEXT_Fct(a), b, c, d); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedfreetype.c b/src/wrapped/wrappedfreetype.c index 62db8270..4d33aa26 100755 --- a/src/wrapped/wrappedfreetype.c +++ b/src/wrapped/wrappedfreetype.c @@ -180,7 +180,7 @@ GO(4) static uintptr_t my_FT_Generic_Finalizer_fct_##A = 0; \ static void my_FT_Generic_Finalizer_##A(void* object) \ { \ - RunFunctionFmt(my_context, my_FT_Generic_Finalizer_fct_##A, "p", object); \ + RunFunctionFmt(my_FT_Generic_Finalizer_fct_##A, "p", object); \ } SUPER() #undef GO @@ -203,7 +203,7 @@ static void* find_FT_Generic_Finalizer_Fct(void* fct) static uintptr_t my_FTC_Face_Requester_fct_##A = 0; \ static int my_FTC_Face_Requester_##A(void* face_id, void* lib, void* req, void* aface) \ { \ - int ret = (int)RunFunctionFmt(my_context, my_FTC_Face_Requester_fct_##A, "pppp", face_id, lib, req, aface); \ + int ret = (int)RunFunctionFmt(my_FTC_Face_Requester_fct_##A, "pppp", face_id, lib, req, aface); \ if(aface && *(void**)aface) { \ FT_FaceRec_t *f = *(FT_FaceRec_t**)aface; \ f->generic.finalizer = find_FT_Generic_Finalizer_Fct(f->generic.finalizer); \ @@ -232,7 +232,7 @@ static void* find_FTC_Face_Requester_Fct(void* fct) static uintptr_t my_FT_Stream_IoFunc_fct_##A = 0; \ static unsigned long my_FT_Stream_IoFunc_##A(void* a, unsigned long b, void* c, unsigned long d) \ { \ - return (unsigned long)RunFunctionFmt(my_context, my_FT_Stream_IoFunc_fct_##A, "pLpL", a, b, c, d); \ + return (unsigned long)RunFunctionFmt(my_FT_Stream_IoFunc_fct_##A, "pLpL", a, b, c, d); \ } SUPER() #undef GO @@ -256,7 +256,7 @@ static void* find_FT_Stream_IoFunc_Fct(void* fct) static uintptr_t my_FT_Stream_CloseFunc_fct_##A = 0; \ static int my_FT_Stream_CloseFunc_##A(void* a) \ { \ - return (int)RunFunctionFmt(my_context, my_FT_Stream_CloseFunc_fct_##A, "p", a); \ + return (int)RunFunctionFmt(my_FT_Stream_CloseFunc_fct_##A, "p", a); \ } SUPER() #undef GO @@ -280,7 +280,7 @@ static void* find_FT_Stream_CloseFunc_Fct(void* fct) static uintptr_t my_FT_Outline_MoveToFunc_fct_##A = 0; \ static int my_FT_Outline_MoveToFunc_##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_FT_Outline_MoveToFunc_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_FT_Outline_MoveToFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -304,7 +304,7 @@ static void* find_FT_Outline_MoveToFunc_Fct(void* fct) static uintptr_t my_FT_Outline_LineToFunc_fct_##A = 0; \ static int my_FT_Outline_LineToFunc_##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_FT_Outline_LineToFunc_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_FT_Outline_LineToFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -328,7 +328,7 @@ static void* find_FT_Outline_LineToFunc_Fct(void* fct) static uintptr_t my_FT_Outline_ConicToFunc_fct_##A = 0; \ static int my_FT_Outline_ConicToFunc_##A(void* a, void* b, void * c) \ { \ - return (int)RunFunctionFmt(my_context, my_FT_Outline_ConicToFunc_fct_##A, "ppp", a, b, c); \ + return (int)RunFunctionFmt(my_FT_Outline_ConicToFunc_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -352,7 +352,7 @@ static void* find_FT_Outline_ConicToFunc_Fct(void* fct) static uintptr_t my_FT_Outline_CubicToFunc_fct_##A = 0; \ static int my_FT_Outline_CubicToFunc_##A(void* a, void* b, void * c, void* d) \ { \ - return (int)RunFunctionFmt(my_context, my_FT_Outline_CubicToFunc_fct_##A, "pppp", a, b, c, d); \ + return (int)RunFunctionFmt(my_FT_Outline_CubicToFunc_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -376,7 +376,7 @@ static void* find_FT_Outline_CubicToFunc_Fct(void* fct) static uintptr_t my_FT_Alloc_fct_##A = 0; \ static void* my_FT_Alloc_##A(void* memory, long size) \ { \ - return (void*)RunFunctionFmt(my_context, my_FT_Alloc_fct_##A, "pl", memory, size); \ + return (void*)RunFunctionFmt(my_FT_Alloc_fct_##A, "pl", memory, size); \ } SUPER() #undef GO @@ -399,7 +399,7 @@ static void* find_FT_Alloc_Fct(void* fct) static uintptr_t my_FT_Free_fct_##A = 0; \ static void my_FT_Free_##A(void* memory, void* p) \ { \ - RunFunctionFmt(my_context, my_FT_Free_fct_##A, "pp", memory, p); \ + RunFunctionFmt(my_FT_Free_fct_##A, "pp", memory, p); \ } SUPER() #undef GO @@ -422,7 +422,7 @@ static void* find_FT_Free_Fct(void* fct) static uintptr_t my_FT_Realloc_fct_##A = 0; \ static void* my_FT_Realloc_##A(void* memory, long cur, long size, void* p) \ { \ - return (void*)RunFunctionFmt(my_context, my_FT_Realloc_fct_##A, "pllp", memory, cur, size, p); \ + return (void*)RunFunctionFmt(my_FT_Realloc_fct_##A, "pllp", memory, cur, size, p); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedgconf2.c b/src/wrapped/wrappedgconf2.c index 189cfd7c..2767bf56 100644 --- a/src/wrapped/wrappedgconf2.c +++ b/src/wrapped/wrappedgconf2.c @@ -38,7 +38,7 @@ GO(4) static uintptr_t my_GFreeFunc_fct_##A = 0; \ static void my_GFreeFunc_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_GFreeFunc_fct_##A, "p", a); \ + RunFunctionFmt(my_GFreeFunc_fct_##A, "p", a); \ } SUPER() #undef GO @@ -60,7 +60,7 @@ static void* find_GFreeFunc_Fct(void* fct) static uintptr_t my_GConfClientNotifyFunc_fct_##A = 0; \ static void my_GConfClientNotifyFunc_##A(void* a, uint32_t b, void* c, void* d) \ { \ - RunFunctionFmt(my_context, my_GConfClientNotifyFunc_fct_##A, "pupp", a, b, c, d); \ + RunFunctionFmt(my_GConfClientNotifyFunc_fct_##A, "pupp", a, b, c, d); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedgdk3.c b/src/wrapped/wrappedgdk3.c index ad8e2858..5f84caaa 100755 --- a/src/wrapped/wrappedgdk3.c +++ b/src/wrapped/wrappedgdk3.c @@ -40,7 +40,7 @@ GO(3) static uintptr_t my_filter_fct_##A = 0; \ static int my_filter_##A(void* xevent, void* event, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_filter_fct_##A, "ppp", xevent, event, data); \ + return (int)RunFunctionFmt(my_filter_fct_##A, "ppp", xevent, event, data); \ } SUPER() #undef GO @@ -61,7 +61,7 @@ static void* findFilterFct(void* fct) static void my3_event_handler(void* event, my_signal_t* sig) { - RunFunctionFmt(my_context, sig->c_handler, "pp", event, sig->data); + RunFunctionFmt(sig->c_handler, "pp", event, sig->data); } EXPORT void my3_gdk_event_handler_set(x86emu_t* emu, void* func, void* data, void* notify) @@ -77,7 +77,7 @@ EXPORT void my3_gdk_event_handler_set(x86emu_t* emu, void* func, void* data, voi static void my3_input_function(my_signal_t* sig, int source, int condition) { - RunFunctionFmt(my_context, sig->c_handler, "pii", sig->data, source, condition); + RunFunctionFmt(sig->c_handler, "pii", sig->data, source, condition); } EXPORT int my3_gdk_input_add(x86emu_t* emu, int source, int condition, void* f, void* data) diff --git a/src/wrapped/wrappedgdkpixbuf2.c b/src/wrapped/wrappedgdkpixbuf2.c index f66d193e..a4788839 100755 --- a/src/wrapped/wrappedgdkpixbuf2.c +++ b/src/wrapped/wrappedgdkpixbuf2.c @@ -37,7 +37,7 @@ GO(3) static uintptr_t my_destroy_pixbuf_fct_##A = 0; \ static void my_destroy_pixbuf_##A(void* pixels, void* data) \ { \ - RunFunctionFmt(my_context, my_destroy_pixbuf_fct_##A, "pp", pixels, data); \ + RunFunctionFmt(my_destroy_pixbuf_fct_##A, "pp", pixels, data); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedgdkx112.c b/src/wrapped/wrappedgdkx112.c index 446aaf15..50498938 100755 --- a/src/wrapped/wrappedgdkx112.c +++ b/src/wrapped/wrappedgdkx112.c @@ -42,7 +42,7 @@ GO(3) static uintptr_t my_filter_fct_##A = 0; \ static int my_filter_##A(void* xevent, void* event, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_filter_fct_##A, "ppp", xevent, event, data); \ + return (int)RunFunctionFmt(my_filter_fct_##A, "ppp", xevent, event, data); \ } SUPER() #undef GO @@ -63,7 +63,7 @@ static void* findFilterFct(void* fct) static void my_event_handler(void* event, my_signal_t* sig) { - RunFunctionFmt(my_context, sig->c_handler, "pp", event, sig->data); + RunFunctionFmt(sig->c_handler, "pp", event, sig->data); } EXPORT void my_gdk_event_handler_set(x86emu_t* emu, void* func, void* data, void* notify) @@ -79,7 +79,7 @@ EXPORT void my_gdk_event_handler_set(x86emu_t* emu, void* func, void* data, void static void my_input_function(my_signal_t* sig, int source, int condition) { - RunFunctionFmt(my_context, sig->c_handler, "pii", sig->data, source, condition); + RunFunctionFmt(sig->c_handler, "pii", sig->data, source, condition); } EXPORT int my_gdk_input_add(x86emu_t* emu, int source, int condition, void* f, void* data) diff --git a/src/wrapped/wrappedgio2.c b/src/wrapped/wrappedgio2.c index 4913ec53..24957280 100755 --- a/src/wrapped/wrappedgio2.c +++ b/src/wrapped/wrappedgio2.c @@ -47,7 +47,7 @@ GO(3) static uintptr_t my_GAsyncReadyCallback_fct_##A = 0; \ static void my_GAsyncReadyCallback_##A(void* source, void* res, void* data) \ { \ - RunFunctionFmt(my_context, my_GAsyncReadyCallback_fct_##A, "ppp", source, res, data); \ + RunFunctionFmt(my_GAsyncReadyCallback_fct_##A, "ppp", source, res, data); \ } SUPER() #undef GO @@ -70,7 +70,7 @@ static void* findGAsyncReadyCallbackFct(void* fct) static uintptr_t my_GDestroyNotify_fct_##A = 0; \ static void my_GDestroyNotify_##A(void* data) \ { \ - RunFunctionFmt(my_context, my_GDestroyNotify_fct_##A, "p", data); \ + RunFunctionFmt(my_GDestroyNotify_fct_##A, "p", data); \ } SUPER() #undef GO @@ -93,7 +93,7 @@ static void* findGDestroyNotifyFct(void* fct) static uintptr_t my_GDBusProxyTypeFunc_fct_##A = 0; \ static int my_GDBusProxyTypeFunc_##A(void* manager, void* path, void* name, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_GDBusProxyTypeFunc_fct_##A, "pppp", manager, path, name, data); \ + return (int)RunFunctionFmt(my_GDBusProxyTypeFunc_fct_##A, "pppp", manager, path, name, data); \ } SUPER() #undef GO @@ -116,7 +116,7 @@ static void* findGDBusProxyTypeFuncFct(void* fct) static uintptr_t my_GSimpleAsyncThreadFunc_fct_##A = 0; \ static void my_GSimpleAsyncThreadFunc_##A(void* res, void* object, void* cancellable) \ { \ - RunFunctionFmt(my_context, my_GSimpleAsyncThreadFunc_fct_##A, "ppp", res, object, cancellable); \ + RunFunctionFmt(my_GSimpleAsyncThreadFunc_fct_##A, "ppp", res, object, cancellable); \ } SUPER() #undef GO @@ -139,7 +139,7 @@ static void* findGSimpleAsyncThreadFuncFct(void* fct) static uintptr_t my_GCallback_fct_##A = 0; \ static void my_GCallback_##A(void* a, void* b, void* c, void* d) \ { \ - RunFunctionFmt(my_context, my_GCallback_fct_##A, "pppp", a, b, c, d); \ + RunFunctionFmt(my_GCallback_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -162,7 +162,7 @@ static void* findGCallbackFct(void* fct) static uintptr_t my_GDBusSignalCallback_fct_##A = 0; \ static void my_GDBusSignalCallback_##A(void* connection, void* sender, void* object, void* interface, void* signal, void* param, void* data) \ { \ - RunFunctionFmt(my_context, my_GDBusSignalCallback_fct_##A, "ppppppp", connection, sender, object, interface, signal, param, data); \ + RunFunctionFmt(my_GDBusSignalCallback_fct_##A, "ppppppp", connection, sender, object, interface, signal, param, data); \ } SUPER() #undef GO @@ -185,7 +185,7 @@ static void* findGDBusSignalCallbackFct(void* fct) static uintptr_t my_GDBusMessageFilterFunction_fct_##A = 0; \ static void my_GDBusMessageFilterFunction_##A(void* connection, void* message, int incoming, void* data) \ { \ - RunFunctionFmt(my_context, my_GDBusMessageFilterFunction_fct_##A, "ppip", connection, message, incoming, data); \ + RunFunctionFmt(my_GDBusMessageFilterFunction_fct_##A, "ppip", connection, message, incoming, data); \ } SUPER() #undef GO @@ -208,7 +208,7 @@ static void* findGDBusMessageFilterFunctionFct(void* fct) static uintptr_t my_GBusNameAppearedCallback_fct_##A = 0; \ static void my_GBusNameAppearedCallback_##A(void* connection, void* name, void* owner, void* data) \ { \ - RunFunctionFmt(my_context, my_GBusNameAppearedCallback_fct_##A, "pppp", connection, name, owner, data); \ + RunFunctionFmt(my_GBusNameAppearedCallback_fct_##A, "pppp", connection, name, owner, data); \ } SUPER() #undef GO @@ -231,7 +231,7 @@ static void* findGBusNameAppearedCallbackFct(void* fct) static uintptr_t my_GBusNameVanishedCallback_fct_##A = 0; \ static void my_GBusNameVanishedCallback_##A(void* connection, void* name, void* data) \ { \ - RunFunctionFmt(my_context, my_GBusNameVanishedCallback_fct_##A, "ppp", connection, name, data); \ + RunFunctionFmt(my_GBusNameVanishedCallback_fct_##A, "ppp", connection, name, data); \ } SUPER() #undef GO @@ -254,7 +254,7 @@ static void* findGBusNameVanishedCallbackFct(void* fct) static uintptr_t my_GBusAcquiredCallback_fct_##A = 0; \ static void my_GBusAcquiredCallback_##A(void* connection, void* name, void* data) \ { \ - RunFunctionFmt(my_context, my_GBusAcquiredCallback_fct_##A, "ppp", connection, name, data); \ + RunFunctionFmt(my_GBusAcquiredCallback_fct_##A, "ppp", connection, name, data); \ } SUPER() #undef GO @@ -277,7 +277,7 @@ static void* findGBusAcquiredCallbackFct(void* fct) static uintptr_t my_GBusNameAcquiredCallback_fct_##A = 0; \ static void my_GBusNameAcquiredCallback_##A(void* connection, void* name, void* data) \ { \ - RunFunctionFmt(my_context, my_GBusNameAcquiredCallback_fct_##A, "ppp", connection, name, data); \ + RunFunctionFmt(my_GBusNameAcquiredCallback_fct_##A, "ppp", connection, name, data); \ } SUPER() #undef GO @@ -300,7 +300,7 @@ static void* findGBusNameAcquiredCallbackFct(void* fct) static uintptr_t my_GBusNameLostCallback_fct_##A = 0; \ static void my_GBusNameLostCallback_##A(void* connection, void* name, void* data) \ { \ - RunFunctionFmt(my_context, my_GBusNameLostCallback_fct_##A, "ppp", connection, name, data); \ + RunFunctionFmt(my_GBusNameLostCallback_fct_##A, "ppp", connection, name, data); \ } SUPER() #undef GO @@ -335,15 +335,15 @@ SUPER() #define GO(A) \ static uintptr_t fct_funcs_method_call_##A = 0; \ static void my_funcs_method_call_##A(void* connection, void* sender, void* object_path, void* interface_name, void* method_name, void* parameters, void* invocation, void* user_data) { \ - RunFunctionFmt(my_context, fct_funcs_method_call_##A, "pppppppp", connection, sender, object_path, interface_name, method_name, parameters, invocation, user_data); \ + RunFunctionFmt(fct_funcs_method_call_##A, "pppppppp", connection, sender, object_path, interface_name, method_name, parameters, invocation, user_data); \ } \ static uintptr_t fct_funcs_get_property_##A = 0; \ static void* my_funcs_get_property_##A(void* connection, void* sender, void* object_path, void* interface_name, void* property_name, void* error, void* user_data) { \ - return (void*)RunFunctionFmt(my_context, fct_funcs_get_property_##A, "ppppppp", connection, sender, object_path, interface_name, property_name, error, user_data); \ + return (void*)RunFunctionFmt(fct_funcs_get_property_##A, "ppppppp", connection, sender, object_path, interface_name, property_name, error, user_data); \ } \ static uintptr_t fct_funcs_set_property_##A = 0; \ static int my_funcs_set_property_##A(void* connection, void* sender, void* object_path, void* interface_name, void* property_name, void* value, void* error, void* user_data) { \ - return (int)RunFunctionFmt(my_context, fct_funcs_set_property_##A, "pppppppp", connection, sender, object_path, interface_name, property_name, value, error, user_data); \ + return (int)RunFunctionFmt(fct_funcs_set_property_##A, "pppppppp", connection, sender, object_path, interface_name, property_name, value, error, user_data); \ } SUPER() diff --git a/src/wrapped/wrappedglib2.c b/src/wrapped/wrappedglib2.c index 85ca3e64..28725275 100755 --- a/src/wrapped/wrappedglib2.c +++ b/src/wrapped/wrappedglib2.c @@ -67,7 +67,7 @@ EXPORT void* my_g_build_filename(x86emu_t* emu, void* first, void** b) static int my_timeout_cb(my_signal_t* sig) { - return (int)RunFunctionFmt(my_context, sig->c_handler, "p", sig->data); + return (int)RunFunctionFmt(sig->c_handler, "p", sig->data); } EXPORT uint32_t my_g_timeout_add(x86emu_t* emu, uint32_t interval, void* func, void* data) { @@ -103,7 +103,7 @@ GO(9) \ static uintptr_t my_copy_fct_##A = 0; \ static void* my_copy_##A(void* data) \ { \ - return (void*)RunFunctionFmt(my_context, my_copy_fct_##A, "p", data);\ + return (void*)RunFunctionFmt(my_copy_fct_##A, "p", data);\ } SUPER() #undef GO @@ -125,7 +125,7 @@ static void* findCopyFct(void* fct) static uintptr_t my_free_fct_##A = 0; \ static void my_free_##A(void* data) \ { \ - RunFunctionFmt(my_context, my_free_fct_##A, "p", data); \ + RunFunctionFmt(my_free_fct_##A, "p", data); \ } SUPER() #undef GO @@ -147,7 +147,7 @@ static void* findFreeFct(void* fct) static uintptr_t my_duplicate_fct_##A = 0; \ static void* my_duplicate_##A(void* data) \ { \ - return (void*)RunFunctionFmt(my_context, my_duplicate_fct_##A, "p", data); \ + return (void*)RunFunctionFmt(my_duplicate_fct_##A, "p", data); \ } SUPER() #undef GO @@ -175,26 +175,26 @@ SUPER() #define GO(A) \ static uintptr_t fct_funcs_prepare_##A = 0; \ static int my_funcs_prepare_##A(void* source, int* timeout_) { \ - return (int)RunFunctionFmt(my_context, fct_funcs_prepare_##A, "pp", source, timeout_); \ + return (int)RunFunctionFmt(fct_funcs_prepare_##A, "pp", source, timeout_); \ } \ static uintptr_t fct_funcs_check_##A = 0; \ static int my_funcs_check_##A(void* source) { \ - return (int)RunFunctionFmt(my_context, fct_funcs_check_##A, "p", source); \ + return (int)RunFunctionFmt(fct_funcs_check_##A, "p", source); \ } \ static uintptr_t fct_funcs_dispatch_cb_##A = 0; \ static int my_funcs_dispatch_cb_##A(void* a, void* b, void* c, void* d) { \ - return (int)RunFunctionFmt(my_context, fct_funcs_dispatch_cb_##A, "pppp", a, b, c, d); \ + return (int)RunFunctionFmt(fct_funcs_dispatch_cb_##A, "pppp", a, b, c, d); \ } \ static uintptr_t fct_funcs_dispatch_##A = 0; \ static int my_funcs_dispatch_##A(void* source, void* cb, void* data) { \ uintptr_t old = fct_funcs_dispatch_cb_##A; \ fct_funcs_dispatch_cb_##A = (uintptr_t)cb; \ - return (int)RunFunctionFmt(my_context, fct_funcs_dispatch_##A, "ppp", source, cb?my_funcs_dispatch_cb_##A:NULL, data); \ + return (int)RunFunctionFmt(fct_funcs_dispatch_##A, "ppp", source, cb?my_funcs_dispatch_cb_##A:NULL, data); \ fct_funcs_dispatch_cb_##A = old; \ } \ static uintptr_t fct_funcs_finalize_##A = 0; \ static int my_funcs_finalize_##A(void* source) { \ - return (int)RunFunctionFmt(my_context, fct_funcs_finalize_##A, "p", source);\ + return (int)RunFunctionFmt(fct_funcs_finalize_##A, "p", source);\ } SUPER() #undef GO @@ -228,7 +228,7 @@ static my_GSourceFuncs_t* findFreeGSourceFuncs(my_GSourceFuncs_t* fcts) static uintptr_t my_poll_fct_##A = 0; \ static int my_poll_##A(void* ufds, uint32_t nfsd, int32_t timeout_) \ { \ - return RunFunctionFmt(my_context, my_poll_fct_##A, "pui", ufds, nfsd, timeout_);\ + return RunFunctionFmt(my_poll_fct_##A, "pui", ufds, nfsd, timeout_);\ } SUPER() #undef GO @@ -260,7 +260,7 @@ static void* reversePollFct(void* fct) static uintptr_t my_hashfunc_fct_##A = 0; \ static uint32_t my_hashfunc_##A(void* key) \ { \ - return (uint32_t)RunFunctionFmt(my_context, my_hashfunc_fct_##A, "p", key); \ + return (uint32_t)RunFunctionFmt(my_hashfunc_fct_##A, "p", key); \ } SUPER() #undef GO @@ -282,7 +282,7 @@ static void* findHashFct(void* fct) static uintptr_t my_equalfunc_fct_##A = 0; \ static int my_equalfunc_##A(void* a, void* b) \ { \ - return RunFunctionFmt(my_context, my_equalfunc_fct_##A, "pp", a, b);\ + return RunFunctionFmt(my_equalfunc_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -304,7 +304,7 @@ static void* findEqualFct(void* fct) static uintptr_t my_destroyfunc_fct_##A = 0; \ static int my_destroyfunc_##A(void* a, void* b) \ { \ - return RunFunctionFmt(my_context, my_destroyfunc_fct_##A, "pp", a, b); \ + return RunFunctionFmt(my_destroyfunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -326,7 +326,7 @@ static void* findDestroyFct(void* fct) static uintptr_t my_spwnchildsetup_fct_##A = 0; \ static void my_spwnchildsetup_##A(void* data) \ { \ - RunFunctionFmt(my_context, my_spwnchildsetup_fct_##A, "p", data); \ + RunFunctionFmt(my_spwnchildsetup_fct_##A, "p", data); \ } SUPER() #undef GO @@ -348,7 +348,7 @@ static void* findSpawnChildSetupFct(void* fct) static uintptr_t my_GSourceFunc_fct_##A = 0; \ static void my_GSourceFunc_##A(void* a, void* b, void* c, void* d) \ { \ - RunFunctionFmt(my_context, my_GSourceFunc_fct_##A, "pppp", a, b, c, d); \ + RunFunctionFmt(my_GSourceFunc_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -370,7 +370,7 @@ static void* findGSourceFuncFct(void* fct) static uintptr_t my_GCompareFunc_fct_##A = 0; \ static int my_GCompareFunc_##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_GCompareFunc_fct_##A, "pp", a, b);\ + return (int)RunFunctionFmt(my_GCompareFunc_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -392,7 +392,7 @@ static void* findGCompareFuncFct(void* fct) static uintptr_t my_GCompareDataFunc_fct_##A = 0; \ static int my_GCompareDataFunc_##A(void* a, void* b, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_GCompareDataFunc_fct_##A, "ppp", a, b, data); \ + return (int)RunFunctionFmt(my_GCompareDataFunc_fct_##A, "ppp", a, b, data); \ } SUPER() #undef GO @@ -414,7 +414,7 @@ static void* findGCompareDataFuncFct(void* fct) static uintptr_t my_GCompletionFunc_fct_##A = 0; \ static void* my_GCompletionFunc_##A(void* a) \ { \ - return (void*)RunFunctionFmt(my_context, my_GCompletionFunc_fct_##A, "p", a); \ + return (void*)RunFunctionFmt(my_GCompletionFunc_fct_##A, "p", a); \ } SUPER() #undef GO @@ -436,7 +436,7 @@ static void* findGCompletionFct(void* fct) static uintptr_t my_GCompletionStrncmpFunc_fct_##A = 0; \ static int my_GCompletionStrncmpFunc_##A(void* a, void* b, unsigned long n) \ { \ - return (int)RunFunctionFmt(my_context, my_GCompletionStrncmpFunc_fct_##A, "ppL", a, b, n); \ + return (int)RunFunctionFmt(my_GCompletionStrncmpFunc_fct_##A, "ppL", a, b, n); \ } SUPER() #undef GO @@ -458,7 +458,7 @@ static void* findGCompletionStrncmpFuncFct(void* fct) static uintptr_t my_GIOFunc_fct_##A = 0; \ static int my_GIOFunc_##A(void* a, int b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my_GIOFunc_fct_##A, "pip", a, b, c); \ + return (int)RunFunctionFmt(my_GIOFunc_fct_##A, "pip", a, b, c); \ } SUPER() #undef GO @@ -480,7 +480,7 @@ static void* findGIOFuncFct(void* fct) static uintptr_t my_GDestroyNotify_fct_##A = 0; \ static void my_GDestroyNotify_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_GDestroyNotify_fct_##A, "p", a); \ + RunFunctionFmt(my_GDestroyNotify_fct_##A, "p", a); \ } SUPER() #undef GO @@ -502,7 +502,7 @@ static void* findGDestroyNotifyFct(void* fct) static uintptr_t my_GFunc_fct_##A = 0; \ static void my_GFunc_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_GFunc_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_GFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -524,7 +524,7 @@ static void* findGFuncFct(void* fct) static uintptr_t my_GHFunc_fct_##A = 0; \ static void my_GHFunc_##A(void* a, void* b, void* c) \ { \ - RunFunctionFmt(my_context, my_GHFunc_fct_##A, "ppp", a, b, c); \ + RunFunctionFmt(my_GHFunc_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -546,7 +546,7 @@ static void* findGHFuncFct(void* fct) static uintptr_t my_GHRFunc_fct_##A = 0; \ static int my_GHRFunc_##A(void* a, void* b, void* c) \ { \ - return RunFunctionFmt(my_context, my_GHRFunc_fct_##A, "ppp", a, b, c); \ + return RunFunctionFmt(my_GHRFunc_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -568,7 +568,7 @@ static void* findGHRFuncFct(void* fct) static uintptr_t my_GChildWatchFunc_fct_##A = 0; \ static void my_GChildWatchFunc_##A(int a, int b, void* c) \ { \ - RunFunctionFmt(my_context, my_GChildWatchFunc_fct_##A, "iip", a, b, c); \ + RunFunctionFmt(my_GChildWatchFunc_fct_##A, "iip", a, b, c); \ } SUPER() #undef GO @@ -590,7 +590,7 @@ static void* findGChildWatchFuncFct(void* fct) static uintptr_t my_GLogFunc_fct_##A = 0; \ static void my_GLogFunc_##A(void* a, int b, void* c, void* d) \ { \ - RunFunctionFmt(my_context, my_GLogFunc_fct_##A, "pipp", a, b, c, d);\ + RunFunctionFmt(my_GLogFunc_fct_##A, "pipp", a, b, c, d);\ } SUPER() #undef GO @@ -620,7 +620,7 @@ static void* reverseGLogFuncFct(void* fct) static uintptr_t my_GPrintFunc_fct_##A = 0; \ static void my_GPrintFunc_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_GPrintFunc_fct_##A, "p", a); \ + RunFunctionFmt(my_GPrintFunc_fct_##A, "p", a); \ } SUPER() #undef GO @@ -651,7 +651,7 @@ static void* reverseGPrintFuncFct(void* fct) static uintptr_t my_GOptionArg_fct_##A = 0; \ static int my_GOptionArg_##A(void* a, void* b, void* c, void* d) \ { \ - return (int)RunFunctionFmt(my_context, my_GOptionArg_fct_##A, "pppp", a, b, c, d); \ + return (int)RunFunctionFmt(my_GOptionArg_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedgnutls.c b/src/wrapped/wrappedgnutls.c index 6c759da6..6af0dc1f 100755 --- a/src/wrapped/wrappedgnutls.c +++ b/src/wrapped/wrappedgnutls.c @@ -50,7 +50,7 @@ GO(4) static uintptr_t my_gnutls_log_fct_##A = 0; \ static void my_gnutls_log_##A(int level, const char* p) \ { \ - RunFunctionFmt(my_context, my_gnutls_log_fct_##A, "ip", level, p); \ + RunFunctionFmt(my_gnutls_log_fct_##A, "ip", level, p); \ } SUPER() #undef GO @@ -74,7 +74,7 @@ static void* find_gnutls_log_Fct(void* fct) static uintptr_t my_pullpush_fct_##A = 0; \ static long my_pullpush_##A(void* p, void* d, size_t l) \ { \ - return (long)RunFunctionFmt(my_context, my_pullpush_fct_##A, "ppL", p, d, l); \ + return (long)RunFunctionFmt(my_pullpush_fct_##A, "ppL", p, d, l); \ } SUPER() #undef GO @@ -99,7 +99,7 @@ static void* find_pullpush_Fct(void* fct) static uintptr_t my_pulltimeout_fct_##A = 0; \ static int my_pulltimeout_##A(void* p, uint32_t t) \ { \ - return (int)RunFunctionFmt(my_context, my_pulltimeout_fct_##A, "pu", p, t); \ + return (int)RunFunctionFmt(my_pulltimeout_fct_##A, "pu", p, t); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedgobject2.c b/src/wrapped/wrappedgobject2.c index d0afbf46..227f16cb 100755 --- a/src/wrapped/wrappedgobject2.c +++ b/src/wrapped/wrappedgobject2.c @@ -63,10 +63,10 @@ static int signal_cb(void* a, void* b, void* c, void* d) } printf_log(LOG_DEBUG, "gobject2 Signal called, sig=%p, handler=%p, NArgs=%d\n", sig, (void*)sig->c_handler, i); switch(i) { - case 1: return (int)RunFunctionFmt(my_context, sig->c_handler, "p", sig->data); - case 2: return (int)RunFunctionFmt(my_context, sig->c_handler, "pp", a, sig->data); - case 3: return (int)RunFunctionFmt(my_context, sig->c_handler, "ppp", a, b, sig->data); - case 4: return (int)RunFunctionFmt(my_context, sig->c_handler, "pppp", a, b, c, sig->data); + case 1: return (int)RunFunctionFmt(sig->c_handler, "p", sig->data); + case 2: return (int)RunFunctionFmt(sig->c_handler, "pp", a, sig->data); + case 3: return (int)RunFunctionFmt(sig->c_handler, "ppp", a, b, sig->data); + case 4: return (int)RunFunctionFmt(sig->c_handler, "pppp", a, b, c, sig->data); } printf_log(LOG_NONE, "Warning, GObject2 signal callback but no data found!"); return 0; @@ -75,47 +75,47 @@ static int signal_cb_swapped(my_signal_t* sig, void* b, void* c, void* d) { // data is in front here... printf_log(LOG_DEBUG, "gobject2 swaped4 Signal called, sig=%p\n", sig); - return (int)RunFunctionFmt(my_context, sig->c_handler, "pppp", sig->data, b, c, d); + return (int)RunFunctionFmt(sig->c_handler, "pppp", sig->data, b, c, d); } static int signal_cb_5(void* a, void* b, void* c, void* d, my_signal_t* sig) { printf_log(LOG_DEBUG, "gobject2 5 Signal called, sig=%p\n", sig); - return (int)RunFunctionFmt(my_context, sig->c_handler, "ppppp", a, b, c, d, sig->data); + return (int)RunFunctionFmt(sig->c_handler, "ppppp", a, b, c, d, sig->data); } static int signal_cb_swapped_5(my_signal_t* sig, void* b, void* c, void* d, void* e) { // data is in front here... printf_log(LOG_DEBUG, "gobject2 swaped5 Signal called, sig=%p\n", sig); - return (int)RunFunctionFmt(my_context, sig->c_handler, "ppppp", sig->data, b, c, d, e); + return (int)RunFunctionFmt(sig->c_handler, "ppppp", sig->data, b, c, d, e); } static int signal_cb_6(void* a, void* b, void* c, void* d, void* e, my_signal_t* sig) { printf_log(LOG_DEBUG, "gobject2 6 Signal called, sig=%p\n", sig); - return (int)RunFunctionFmt(my_context, sig->c_handler, "pppppp", a, b, c, d, e, sig->data); + return (int)RunFunctionFmt(sig->c_handler, "pppppp", a, b, c, d, e, sig->data); } static int signal_cb_swapped_6(my_signal_t* sig, void* b, void* c, void* d, void* e, void* f) { // data is in front here... printf_log(LOG_DEBUG, "gobject2 swaped6 Signal called, sig=%p\n", sig); - return (int)RunFunctionFmt(my_context, sig->c_handler, "pppppp", sig->data, b, c, d, e, f); + return (int)RunFunctionFmt(sig->c_handler, "pppppp", sig->data, b, c, d, e, f); } static int signal_cb_8(void* a, void* b, void* c, void* d, void* e, void* f, void* g, my_signal_t* sig) { printf_log(LOG_DEBUG, "gobject2 8 Signal called, sig=%p\n", sig); - return (int)RunFunctionFmt(my_context, sig->c_handler, "pppppppp", a, b, c, d, e, f, g, sig->data); + return (int)RunFunctionFmt(sig->c_handler, "pppppppp", a, b, c, d, e, f, g, sig->data); } static int signal_cb_swapped_8(my_signal_t* sig, void* b, void* c, void* d, void* e, void* f, void* g, void* h) { // data is in front here... printf_log(LOG_DEBUG, "gobject2 swaped8 Signal called, sig=%p\n", sig); - return (int)RunFunctionFmt(my_context, sig->c_handler, "pppppppp", sig->data, b, c, d, e, f, g, h); + return (int)RunFunctionFmt(sig->c_handler, "pppppppp", sig->data, b, c, d, e, f, g, h); } static void signal_delete(my_signal_t* sig, void* b) { uintptr_t d = sig->destroy; if(d) { - RunFunctionFmt(my_context, d, "pp", sig->data, b); + RunFunctionFmt(d, "pp", sig->data, b); } printf_log(LOG_DEBUG, "gobject2 Signal deleted, sig=%p, destroy=%p\n", sig, (void*)d); box_free(sig); @@ -353,7 +353,7 @@ GO(99) \ static uintptr_t my_copy_fct_##A = 0; \ static void* my_copy_##A(void* data) \ { \ - return (void*)RunFunctionFmt(my_context, my_copy_fct_##A, "p", data); \ + return (void*)RunFunctionFmt(my_copy_fct_##A, "p", data); \ } SUPER() #undef GO @@ -374,7 +374,7 @@ static void* findCopyFct(void* fct) static uintptr_t my_free_fct_##A = 0; \ static void my_free_##A(void* data) \ { \ - RunFunctionFmt(my_context, my_free_fct_##A, "p", data); \ + RunFunctionFmt(my_free_fct_##A, "p", data); \ } SUPER() #undef GO @@ -395,7 +395,7 @@ static void* findFreeFct(void* fct) static uintptr_t my_accumulator_fct_##A = 0; \ static int my_accumulator_##A(void* ihint, void* return_accu, void* handler_return, void* data) \ { \ - return RunFunctionFmt(my_context, my_accumulator_fct_##A, "pppp", ihint, return_accu, handler_return, data);\ + return RunFunctionFmt(my_accumulator_fct_##A, "pppp", ihint, return_accu, handler_return, data);\ } SUPER() #undef GO @@ -419,7 +419,7 @@ static uintptr_t my_marshal_fct_##A = 0; \ static void my_marshal_##A(void* closure, void* return_value, uint32_t n, void* values, void* hint, void* data) \ { \ void* newvalues = vkStructUnalign(values, "idd", n); \ - RunFunctionFmt(my_context, my_marshal_fct_##A, "ppuppp", closure, return_value, n, newvalues, hint, data); \ + RunFunctionFmt(my_marshal_fct_##A, "ppuppp", closure, return_value, n, newvalues, hint, data); \ box_free(newvalues); \ } SUPER() @@ -443,7 +443,7 @@ static void* findMarshalFct(void* fct) static uintptr_t my_GClosureNotify_fct_##A = 0; \ static int my_GClosureNotify_func_##A(void* a, void* b) \ { \ - return RunFunctionFmt(my_context, my_GClosureNotify_fct_##A, "pp", a, b); \ + return RunFunctionFmt(my_GClosureNotify_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -468,7 +468,7 @@ static void my_valuetransform_##A(void* src, void* dst) { \ my_GValue_t asrc, adst; \ alignNGValue(&asrc, src, 1); \ - RunFunctionFmt(my_context, my_valuetransform_fct_##A, "pp", &asrc, &adst); \ + RunFunctionFmt(my_valuetransform_fct_##A, "pp", &asrc, &adst); \ unalignNGValue(dst, &adst, 1); \ } SUPER() @@ -491,7 +491,7 @@ static void* findValueTransformFct(void* fct) static uintptr_t my_GCallback_fct_##A = 0; \ static void* my_GCallback_##A(void* a, void* b, void* c, void* d, void* e, void* f) \ { \ - return (void*)RunFunctionFmt(my_context, my_GCallback_fct_##A, "pppppp", a, b, c, d, e, f); \ + return (void*)RunFunctionFmt(my_GCallback_fct_##A, "pppppp", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -531,23 +531,23 @@ SUPER() #define GO(A) \ static uintptr_t fct_funcs_instance_init_##A = 0; \ static void my_funcs_instance_init_##A(void* pspec) { \ - RunFunctionFmt(my_context, fct_funcs_instance_init_##A, "p", pspec);\ + RunFunctionFmt(fct_funcs_instance_init_##A, "p", pspec);\ } \ static uintptr_t fct_funcs_finalize_##A = 0; \ static void my_funcs_finalize_##A(void* pspec) { \ - RunFunctionFmt(my_context, fct_funcs_finalize_##A, "p", pspec); \ + RunFunctionFmt(fct_funcs_finalize_##A, "p", pspec); \ } \ static uintptr_t fct_funcs_value_set_default_##A = 0; \ static void my_funcs_value_set_default_##A(void* pspec, void* value) { \ - RunFunctionFmt(my_context, fct_funcs_value_set_default_##A, "pp", pspec, value); \ + RunFunctionFmt(fct_funcs_value_set_default_##A, "pp", pspec, value); \ } \ static uintptr_t fct_funcs_value_validate_##A = 0; \ static int my_funcs_value_validate_##A(void* pspec, void* value) { \ - return (int)RunFunctionFmt(my_context, fct_funcs_value_validate_##A, "pp", pspec, value); \ + return (int)RunFunctionFmt(fct_funcs_value_validate_##A, "pp", pspec, value); \ } \ static uintptr_t fct_funcs_values_cmp_##A = 0; \ static int my_funcs_values_cmp_##A(void* pspec, void* value1, void* value2) { \ - return (int)RunFunctionFmt(my_context, fct_funcs_values_cmp_##A, "ppp", pspec, value1, value2); \ + return (int)RunFunctionFmt(fct_funcs_values_cmp_##A, "ppp", pspec, value1, value2); \ } SUPER() @@ -584,7 +584,7 @@ static my_GParamSpecTypeInfo_t* findFreeGParamSpecTypeInfo(my_GParamSpecTypeInfo static uintptr_t my_GInterfaceInitFunc_fct_##A = 0; \ static void my_GInterfaceInitFunc_##A(void* src, void* dst) \ { \ - RunFunctionFmt(my_context, my_GInterfaceInitFunc_fct_##A, "pp", src, dst); \ + RunFunctionFmt(my_GInterfaceInitFunc_fct_##A, "pp", src, dst); \ } SUPER() #undef GO @@ -606,7 +606,7 @@ static void* findGInterfaceInitFuncFct(void* fct) static uintptr_t my_GInterfaceFinalizeFunc_fct_##A = 0; \ static void my_GInterfaceFinalizeFunc_##A(void* src, void* dst) \ { \ - RunFunctionFmt(my_context, my_GInterfaceFinalizeFunc_fct_##A, "pp", src, dst); \ + RunFunctionFmt(my_GInterfaceFinalizeFunc_fct_##A, "pp", src, dst); \ } SUPER() #undef GO @@ -628,7 +628,7 @@ static void* findGInterfaceFinalizeFuncFct(void* fct) static uintptr_t my_compare_fct_##A = 0; \ static int my_compare_##A(void* a, void* b, void* data) \ { \ - return RunFunctionFmt(my_context, my_compare_fct_##A, "ppp", a, b, data); \ + return RunFunctionFmt(my_compare_fct_##A, "ppp", a, b, data); \ } SUPER() #undef GO @@ -769,7 +769,7 @@ static int my_signal_emission_hook(void* ihint, uint32_t n, my_GValue_t* values, printf_log(LOG_DEBUG, "gobject2 Signal Emission Hook called, sig=%p\n", sig); void* my_values = alloca(n*(4+2*8)); unalignNGValue(my_values, values, n); - return (int)RunFunctionFmt(my_context, sig->c_handler, "pupp", ihint, n, my_values, sig->data); + return (int)RunFunctionFmt(sig->c_handler, "pupp", ihint, n, my_values, sig->data); } EXPORT unsigned long my_g_signal_add_emission_hook(x86emu_t* emu, uint32_t signal, void* detail, void* f, void* data, void* notify) { diff --git a/src/wrapped/wrappedgstreamer.c b/src/wrapped/wrappedgstreamer.c index 8d7ddeab..c40de997 100644 --- a/src/wrapped/wrappedgstreamer.c +++ b/src/wrapped/wrappedgstreamer.c @@ -53,7 +53,7 @@ GO(3) \ static uintptr_t my_destroyfunc_fct_##A = 0; \ static int my_destroyfunc_##A(void* a, void* b) \ { \ - return RunFunctionFmt(my_context, my_destroyfunc_fct_##A, "pp", a, b); \ + return RunFunctionFmt(my_destroyfunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -77,7 +77,7 @@ static void* findDestroyFct(void* fct) static uintptr_t my_GstPadActivateModeFunction_fct_##A = 0; \ static int my_GstPadActivateModeFunction_##A(void* a, void* b, int c, int d) \ { \ - return (int)RunFunctionFmt(my_context, my_GstPadActivateModeFunction_fct_##A, "ppii", a, b, c, d); \ + return (int)RunFunctionFmt(my_GstPadActivateModeFunction_fct_##A, "ppii", a, b, c, d); \ } SUPER() #undef GO @@ -100,7 +100,7 @@ static void* findGstPadActivateModeFunctionFct(void* fct) static uintptr_t my_GstPadQueryFunction_fct_##A = 0; \ static int my_GstPadQueryFunction_##A(void* a, void* b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my_GstPadQueryFunction_fct_##A, "ppp", a, b, c); \ + return (int)RunFunctionFmt(my_GstPadQueryFunction_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -123,7 +123,7 @@ static void* findGstPadQueryFunctionFct(void* fct) static uintptr_t my_GstPadGetRangeFunction_fct_##A = 0; \ static int my_GstPadGetRangeFunction_##A(void* a, void* b, uint64_t c, uint32_t d, void* e) \ { \ - return (int)RunFunctionFmt(my_context, my_GstPadGetRangeFunction_fct_##A, "ppUup", a, b, c, d, e); \ + return (int)RunFunctionFmt(my_GstPadGetRangeFunction_fct_##A, "ppUup", a, b, c, d, e); \ } SUPER() #undef GO @@ -146,7 +146,7 @@ static void* findGstPadGetRangeFunctionFct(void* fct) static uintptr_t my_GstPadChainFunction_fct_##A = 0; \ static int my_GstPadChainFunction_##A(void* a, void* b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my_GstPadChainFunction_fct_##A, "ppp", a, b, c); \ + return (int)RunFunctionFmt(my_GstPadChainFunction_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -169,7 +169,7 @@ static void* findGstPadChainFunctionFct(void* fct) static uintptr_t my_GstPadEventFunction_fct_##A = 0; \ static int my_GstPadEventFunction_##A(void* a, void* b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my_GstPadEventFunction_fct_##A, "ppp", a, b, c); \ + return (int)RunFunctionFmt(my_GstPadEventFunction_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -190,7 +190,7 @@ static void* findGstPadEventFunctionFct(void* fct) static uintptr_t my_GstBusSyncHandler_fct_##A = 0; \ static int my_GstBusSyncHandler_##A(void* a, void* b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my_GstBusSyncHandler_fct_##A, "ppp", a, b, c); \ + return (int)RunFunctionFmt(my_GstBusSyncHandler_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -212,7 +212,7 @@ static void* findGstBusSyncHandlerFct(void* fct) static uintptr_t my_GstPluginFeatureFilter_fct_##A = 0; \ static int my_GstPluginFeatureFilter_##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_GstPluginFeatureFilter_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_GstPluginFeatureFilter_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -234,7 +234,7 @@ static void* findGstPluginFeatureFilterFct(void* fct) static uintptr_t my_GstCapsFilterMapFunc_fct_##A = 0; \ static int my_GstCapsFilterMapFunc_##A(void* a, void* b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my_GstCapsFilterMapFunc_fct_##A, "ppp", a, b, c);\ + return (int)RunFunctionFmt(my_GstCapsFilterMapFunc_fct_##A, "ppp", a, b, c);\ } SUPER() #undef GO diff --git a/src/wrapped/wrappedgtk3.c b/src/wrapped/wrappedgtk3.c index 51a6caee..9bafb123 100755 --- a/src/wrapped/wrappedgtk3.c +++ b/src/wrapped/wrappedgtk3.c @@ -93,7 +93,7 @@ GO(3) static uintptr_t my_menudetach_fct_##A = 0; \ static void my_menudetach_##A(void* widget, void* menu) \ { \ - RunFunctionFmt(my_context, my_menudetach_fct_##A, "pp", widget, menu); \ + RunFunctionFmt(my_menudetach_fct_##A, "pp", widget, menu); \ } SUPER() #undef GO @@ -116,7 +116,7 @@ static void* findMenuDetachFct(void* fct) static uintptr_t my_menuposition_fct_##A = 0; \ static void my_menuposition_##A(void* menu, void* x, void* y, void* push_in, void* data) \ { \ - RunFunctionFmt(my_context, my_menuposition_fct_##A, "ppppp", menu, x, y, push_in, data);\ + RunFunctionFmt(my_menuposition_fct_##A, "ppppp", menu, x, y, push_in, data);\ } SUPER() #undef GO @@ -139,7 +139,7 @@ static void* findMenuPositionFct(void* fct) static uintptr_t my3_gtkfunction_fct_##A = 0; \ static int my3_gtkfunction_##A(void* data) \ { \ - return RunFunctionFmt(my_context, my3_gtkfunction_fct_##A, "p", data); \ + return RunFunctionFmt(my3_gtkfunction_fct_##A, "p", data); \ } SUPER() #undef GO @@ -162,7 +162,7 @@ static void* findGtkFunctionFct(void* fct) static uintptr_t my_clipboardget_fct_##A = 0; \ static void my_clipboardget_##A(void* clipboard, void* selection, uint32_t info, void* data) \ { \ - RunFunctionFmt(my_context, my_clipboardget_fct_##A, "ppup", clipboard, selection, info, data); \ + RunFunctionFmt(my_clipboardget_fct_##A, "ppup", clipboard, selection, info, data); \ } SUPER() #undef GO @@ -185,7 +185,7 @@ static void* findClipboadGetFct(void* fct) static uintptr_t my_clipboardclear_fct_##A = 0; \ static void my_clipboardclear_##A(void* clipboard, void* data) \ { \ - RunFunctionFmt(my_context, my_clipboardclear_fct_##A, "pp", clipboard, data); \ + RunFunctionFmt(my_clipboardclear_fct_##A, "pp", clipboard, data); \ } SUPER() #undef GO @@ -208,7 +208,7 @@ static void* findClipboadClearFct(void* fct) static uintptr_t my3_gtkcallback_fct_##A = 0; \ static void my3_gtkcallback_##A(void* widget, void* data) \ { \ - RunFunctionFmt(my_context, my3_gtkcallback_fct_##A, "pp", widget, data);\ + RunFunctionFmt(my3_gtkcallback_fct_##A, "pp", widget, data);\ } SUPER() #undef GO @@ -231,7 +231,7 @@ static void* findGtkCallbackFct(void* fct) static uintptr_t my_textcharpredicate_fct_##A = 0; \ static int my_textcharpredicate_##A(uint32_t ch, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_textcharpredicate_fct_##A, "up", ch, data); \ + return (int)RunFunctionFmt(my_textcharpredicate_fct_##A, "up", ch, data); \ } SUPER() #undef GO @@ -254,7 +254,7 @@ static void* findGtkTextCharPredicateFct(void* fct) static uintptr_t my_toolbar_fct_##A = 0; \ static void my_toolbar_##A(void* widget, void* data) \ { \ - RunFunctionFmt(my_context, my_toolbar_fct_##A, "pp", widget, data); \ + RunFunctionFmt(my_toolbar_fct_##A, "pp", widget, data); \ } SUPER() #undef GO @@ -277,7 +277,7 @@ static void* findToolbarFct(void* fct) static uintptr_t my_builderconnect_fct_##A = 0; \ static void my_builderconnect_##A(void* builder, void* object, void* signal, void* handler, void* connect, int flags, void* data) \ { \ - RunFunctionFmt(my_context, my_builderconnect_fct_##A, "pppppip", builder, object, signal, handler, connect, flags, data); \ + RunFunctionFmt(my_builderconnect_fct_##A, "pppppip", builder, object, signal, handler, connect, flags, data); \ } SUPER() #undef GO @@ -300,7 +300,7 @@ static void* findBuilderConnectFct(void* fct) static uintptr_t my_GtkTreeViewSearchEqualFunc_fct_##A = 0; \ static int my_GtkTreeViewSearchEqualFunc_##A(void* model, int column, void* key, void* iter, void* data) \ { \ - return RunFunctionFmt(my_context, my_GtkTreeViewSearchEqualFunc_fct_##A, "pippp", model, column, key, iter, data); \ + return RunFunctionFmt(my_GtkTreeViewSearchEqualFunc_fct_##A, "pippp", model, column, key, iter, data); \ } SUPER() #undef GO @@ -322,7 +322,7 @@ static void* findGtkTreeViewSearchEqualFuncFct(void* fct) static uintptr_t my_GtkTreeCellDataFunc_fct_##A = 0; \ static void my_GtkTreeCellDataFunc_##A(void* tree, void* cell, void* model, void* iter, void* data) \ { \ - RunFunctionFmt(my_context, my_GtkTreeCellDataFunc_fct_##A, "ppppp", tree, cell, model, iter, data); \ + RunFunctionFmt(my_GtkTreeCellDataFunc_fct_##A, "ppppp", tree, cell, model, iter, data); \ } SUPER() #undef GO @@ -345,7 +345,7 @@ static void* findGtkTreeCellDataFuncFct(void* fct) static uintptr_t my_GDestroyNotify_fct_##A = 0; \ static void my_GDestroyNotify_##A(void* data) \ { \ - RunFunctionFmt(my_context, my_GDestroyNotify_fct_##A, "p", data); \ + RunFunctionFmt(my_GDestroyNotify_fct_##A, "p", data); \ } SUPER() #undef GO @@ -368,7 +368,7 @@ static void* findGDestroyNotifyFct(void* fct) static uintptr_t my_GtkTreeIterCompareFunc_fct_##A = 0; \ static int my_GtkTreeIterCompareFunc_##A(void* model, void* a, void* b, void* data) \ { \ - return RunFunctionFmt(my_context, my_GtkTreeIterCompareFunc_fct_##A, "pppp", model, a, b, data);\ + return RunFunctionFmt(my_GtkTreeIterCompareFunc_fct_##A, "pppp", model, a, b, data);\ } SUPER() #undef GO @@ -499,7 +499,7 @@ EXPORT int my3_gtk_clipboard_set_with_owner(x86emu_t* emu, void* clipboard, void static void* my_translate_func(void* path, my_signal_t* sig) { - return (void*)RunFunctionFmt(my_context, sig->c_handler, "pp", path, sig->data); + return (void*)RunFunctionFmt(sig->c_handler, "pp", path, sig->data); } EXPORT void my3_gtk_stock_set_translate_func(x86emu_t* emu, void* domain, void* f, void* data, void* notify) diff --git a/src/wrapped/wrappedgtkx112.c b/src/wrapped/wrappedgtkx112.c index 99551661..548909ff 100755 --- a/src/wrapped/wrappedgtkx112.c +++ b/src/wrapped/wrappedgtkx112.c @@ -143,7 +143,7 @@ GO(39) \ static uintptr_t my_menudetach_fct_##A = 0; \ static void my_menudetach_##A(void* widget, void* menu) \ { \ - RunFunctionFmt(my_context, my_menudetach_fct_##A, "pp", widget, menu); \ + RunFunctionFmt(my_menudetach_fct_##A, "pp", widget, menu); \ } SUPER() #undef GO @@ -166,7 +166,7 @@ static void* findMenuDetachFct(void* fct) static uintptr_t my_menuposition_fct_##A = 0; \ static void my_menuposition_##A(void* menu, void* x, void* y, void* push_in, void* data) \ { \ - RunFunctionFmt(my_context, my_menuposition_fct_##A, "ppppp", menu, x, y, push_in, data);\ + RunFunctionFmt(my_menuposition_fct_##A, "ppppp", menu, x, y, push_in, data);\ } SUPER() #undef GO @@ -189,7 +189,7 @@ static void* findMenuPositionFct(void* fct) static uintptr_t my_gtkfunction_fct_##A = 0; \ static int my_gtkfunction_##A(void* data) \ { \ - return RunFunctionFmt(my_context, my_gtkfunction_fct_##A, "p", data); \ + return RunFunctionFmt(my_gtkfunction_fct_##A, "p", data); \ } SUPER() #undef GO @@ -212,7 +212,7 @@ static void* findGtkFunctionFct(void* fct) static uintptr_t my_clipboardget_fct_##A = 0; \ static void my_clipboardget_##A(void* clipboard, void* selection, uint32_t info, void* data) \ { \ - RunFunctionFmt(my_context, my_clipboardget_fct_##A, "ppup", clipboard, selection, info, data); \ + RunFunctionFmt(my_clipboardget_fct_##A, "ppup", clipboard, selection, info, data); \ } SUPER() #undef GO @@ -235,7 +235,7 @@ static void* findClipboadGetFct(void* fct) static uintptr_t my_clipboardclear_fct_##A = 0; \ static void my_clipboardclear_##A(void* clipboard, void* data) \ { \ - RunFunctionFmt(my_context, my_clipboardclear_fct_##A, "pp", clipboard, data); \ + RunFunctionFmt(my_clipboardclear_fct_##A, "pp", clipboard, data); \ } SUPER() #undef GO @@ -258,7 +258,7 @@ static void* findClipboadClearFct(void* fct) static uintptr_t my_gtkcallback_fct_##A = 0; \ static void my_gtkcallback_##A(void* widget, void* data) \ { \ - RunFunctionFmt(my_context, my_gtkcallback_fct_##A, "pp", widget, data); \ + RunFunctionFmt(my_gtkcallback_fct_##A, "pp", widget, data); \ } SUPER() #undef GO @@ -281,7 +281,7 @@ static void* findGtkCallbackFct(void* fct) static uintptr_t my_textcharpredicate_fct_##A = 0; \ static int my_textcharpredicate_##A(uint32_t ch, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_textcharpredicate_fct_##A, "up", ch, data); \ + return (int)RunFunctionFmt(my_textcharpredicate_fct_##A, "up", ch, data); \ } SUPER() #undef GO @@ -304,7 +304,7 @@ static void* findGtkTextCharPredicateFct(void* fct) static uintptr_t my_toolbar_fct_##A = 0; \ static void my_toolbar_##A(void* widget, void* data) \ { \ - RunFunctionFmt(my_context, my_toolbar_fct_##A, "pp", widget, data); \ + RunFunctionFmt(my_toolbar_fct_##A, "pp", widget, data); \ } SUPER() #undef GO @@ -327,7 +327,7 @@ static void* findToolbarFct(void* fct) static uintptr_t my_builderconnect_fct_##A = 0; \ static void my_builderconnect_##A(void* builder, void* object, void* signal, void* handler, void* connect, int flags, void* data) \ { \ - RunFunctionFmt(my_context, my_builderconnect_fct_##A, "pppppip", builder, object, signal, handler, connect, flags, data); \ + RunFunctionFmt(my_builderconnect_fct_##A, "pppppip", builder, object, signal, handler, connect, flags, data); \ } SUPER() #undef GO @@ -350,7 +350,7 @@ static void* findBuilderConnectFct(void* fct) static uintptr_t my_GtkCellLayoutDataFunc_fct_##A = 0; \ static void my_GtkCellLayoutDataFunc_##A(void* layout, void* cell, void* tree, void* iter, void* data) \ { \ - RunFunctionFmt(my_context, my_GtkCellLayoutDataFunc_fct_##A, "ppppp", layout, cell, tree, iter, data); \ + RunFunctionFmt(my_GtkCellLayoutDataFunc_fct_##A, "ppppp", layout, cell, tree, iter, data); \ } SUPER() #undef GO @@ -373,7 +373,7 @@ static void* findGtkCellLayoutDataFuncFct(void* fct) static uintptr_t my_GDestroyNotify_fct_##A = 0; \ static void my_GDestroyNotify_##A(void* data) \ { \ - RunFunctionFmt(my_context, my_GDestroyNotify_fct_##A, "p", data); \ + RunFunctionFmt(my_GDestroyNotify_fct_##A, "p", data); \ } SUPER() #undef GO @@ -396,7 +396,7 @@ static void* findGDestroyNotifyFct(void* fct) static uintptr_t my_GtkTreeModelForeachFunc_fct_##A = 0; \ static int my_GtkTreeModelForeachFunc_##A(void* model, void* path, void* iter, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_GtkTreeModelForeachFunc_fct_##A, "pppp", model, path, iter, data);\ + return (int)RunFunctionFmt(my_GtkTreeModelForeachFunc_fct_##A, "pppp", model, path, iter, data);\ } SUPER() #undef GO @@ -419,7 +419,7 @@ static void* findGtkTreeModelForeachFuncFct(void* fct) static uintptr_t my_GtkClipboardReceivedFunc_fct_##A = 0; \ static void my_GtkClipboardReceivedFunc_##A(void* clipboard, void* sel, void* data) \ { \ - RunFunctionFmt(my_context, my_GtkClipboardReceivedFunc_fct_##A, "ppp", clipboard, sel, data); \ + RunFunctionFmt(my_GtkClipboardReceivedFunc_fct_##A, "ppp", clipboard, sel, data); \ } SUPER() #undef GO @@ -442,7 +442,7 @@ static void* findGtkClipboardReceivedFuncFct(void* fct) static uintptr_t my_GtkClipboardTextReceivedFunc_fct_##A = 0; \ static void my_GtkClipboardTextReceivedFunc_##A(void* clipboard, void* text, void* data) \ { \ - RunFunctionFmt(my_context, my_GtkClipboardTextReceivedFunc_fct_##A, "ppp", clipboard, text, data); \ + RunFunctionFmt(my_GtkClipboardTextReceivedFunc_fct_##A, "ppp", clipboard, text, data); \ } SUPER() #undef GO @@ -465,7 +465,7 @@ static void* findGtkClipboardTextReceivedFuncFct(void* fct) static uintptr_t my_GtkTreeViewSearchEqualFunc_fct_##A = 0; \ static int my_GtkTreeViewSearchEqualFunc_##A(void* model, int column, void* key, void* iter, void* data) \ { \ - return RunFunctionFmt(my_context, my_GtkTreeViewSearchEqualFunc_fct_##A, "pippp", model, column, key, iter, data); \ + return RunFunctionFmt(my_GtkTreeViewSearchEqualFunc_fct_##A, "pippp", model, column, key, iter, data); \ } SUPER() #undef GO @@ -488,7 +488,7 @@ static void* findGtkTreeViewSearchEqualFuncFct(void* fct) static uintptr_t my_GtkTreeIterCompareFunc_fct_##A = 0; \ static int my_GtkTreeIterCompareFunc_##A(void* model, void* a, void* b, void* data) \ { \ - return RunFunctionFmt(my_context, my_GtkTreeIterCompareFunc_fct_##A, "pppp", model, a, b, data);\ + return RunFunctionFmt(my_GtkTreeIterCompareFunc_fct_##A, "pppp", model, a, b, data);\ } SUPER() #undef GO @@ -511,7 +511,7 @@ static void* findGtkTreeIterCompareFuncFct(void* fct) static uintptr_t my_GdkInputFunction_fct_##A = 0; \ static void my_GdkInputFunction_##A(void* data, int source, int cond) \ { \ - RunFunctionFmt(my_context, my_GdkInputFunction_fct_##A, "pip", data, source, cond); \ + RunFunctionFmt(my_GdkInputFunction_fct_##A, "pip", data, source, cond); \ } SUPER() #undef GO @@ -534,7 +534,7 @@ static void* findGdkInputFunctionFct(void* fct) static uintptr_t my_GtkCallbackMarshal_fct_##A = 0; \ static void my_GtkCallbackMarshal_##A(void* obj, void* data, uint32_t n, void* args) \ { \ - RunFunctionFmt(my_context, my_GtkCallbackMarshal_fct_##A, "ppup", obj, data, n, args); \ + RunFunctionFmt(my_GtkCallbackMarshal_fct_##A, "ppup", obj, data, n, args); \ } SUPER() #undef GO @@ -557,7 +557,7 @@ static void* findGtkCallbackMarshalFct(void* fct) static uintptr_t my_GtkLinkButtonUri_fct_##A = 0; \ static void my_GtkLinkButtonUri_##A(void* a, void* b, void* c) \ { \ - RunFunctionFmt(my_context, my_GtkLinkButtonUri_fct_##A, "ppp", a, b, c); \ + RunFunctionFmt(my_GtkLinkButtonUri_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -590,7 +590,7 @@ static void* reverse_GtkLinkButtonUri_Fct(void* fct) static uintptr_t my_GtkAccelGroupFind_fct_##A = 0; \ static int my_GtkAccelGroupFind_##A(void* a, void* b, void* c) \ { \ - return RunFunctionFmt(my_context, my_GtkAccelGroupFind_fct_##A, "ppp", a, b, c); \ + return RunFunctionFmt(my_GtkAccelGroupFind_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -613,7 +613,7 @@ static void* find_GtkAccelGroupFind_Fct(void* fct) static uintptr_t my_GCallback_fct_##A = 0; \ static uint32_t my_GCallback_##A(void* a, void* b, void* c, void* d) \ { \ - return RunFunctionFmt(my_context, my_GCallback_fct_##A, "pppp", a, b, c, d);\ + return RunFunctionFmt(my_GCallback_fct_##A, "pppp", a, b, c, d);\ } SUPER() #undef GO @@ -635,7 +635,7 @@ static void* findGCallbackFct(void* fct) static uintptr_t my_GtkPrinterFunc_fct_##A = 0; \ static int my_GtkPrinterFunc_##A(void* a, void* b) \ { \ - return RunFunctionFmt(my_context, my_GtkPrinterFunc_fct_##A, "pp", a, b); \ + return RunFunctionFmt(my_GtkPrinterFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -767,7 +767,7 @@ EXPORT int my_gtk_clipboard_set_with_owner(x86emu_t* emu, void* clipboard, void* static void* my_translate_func(void* path, my_signal_t* sig) { - return (void*)RunFunctionFmt(my_context, sig->c_handler, "pp", path, sig->data); + return (void*)RunFunctionFmt(sig->c_handler, "pp", path, sig->data); } EXPORT void my_gtk_stock_set_translate_func(x86emu_t* emu, void* domain, void* f, void* data, void* notify) diff --git a/src/wrapped/wrappedkrb5.c b/src/wrapped/wrappedkrb5.c index b0f1d93b..d8d2a902 100755 --- a/src/wrapped/wrappedkrb5.c +++ b/src/wrapped/wrappedkrb5.c @@ -37,7 +37,7 @@ GO(4) static uintptr_t my_krb5_prompter_fct_##A = 0; \ static int my_krb5_prompter_##A(void* a, void* b, void* c, void* d, int e, void* f) \ { \ - return RunFunctionFmt(my_context, my_krb5_prompter_fct_##A, "pppip", a, b, c, d, e, f); \ + return RunFunctionFmt(my_krb5_prompter_fct_##A, "pppip", a, b, c, d, e, f); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlcms2.c b/src/wrapped/wrappedlcms2.c index 50c47216..1793b34a 100755 --- a/src/wrapped/wrappedlcms2.c +++ b/src/wrapped/wrappedlcms2.c @@ -43,7 +43,7 @@ GO(4) static uintptr_t my_cmsLogErrorHandlerFunction_fct_##A = 0; \ static void my_cmsLogErrorHandlerFunction_##A(void* a, uint32_t b, void* c) \ { \ - RunFunctionFmt(my_context, my_cmsLogErrorHandlerFunction_fct_##A, "pup", a, b, c); \ + RunFunctionFmt(my_cmsLogErrorHandlerFunction_fct_##A, "pup", a, b, c); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedldapr.c b/src/wrapped/wrappedldapr.c index 458c1354..bc405aff 100755 --- a/src/wrapped/wrappedldapr.c +++ b/src/wrapped/wrappedldapr.c @@ -43,7 +43,7 @@ GO(4) static uintptr_t my_LDAP_SASL_INTERACT_PROC_fct_##A = 0; \ static int my_LDAP_SASL_INTERACT_PROC_##A(void* a, unsigned b, void* c, void* d) \ { \ - return RunFunctionFmt(my_context, my_LDAP_SASL_INTERACT_PROC_fct_##A, "pupp", a, b, c, d); \ + return RunFunctionFmt(my_LDAP_SASL_INTERACT_PROC_fct_##A, "pupp", a, b, c, d); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibasound.c b/src/wrapped/wrappedlibasound.c index e83c835e..3257acb4 100755 --- a/src/wrapped/wrappedlibasound.c +++ b/src/wrapped/wrappedlibasound.c @@ -54,7 +54,7 @@ GO(3) static uintptr_t my_async_fct_##A = 0; \ static void* my_async_##A(void* handler) \ { \ - return (void*)RunFunctionFmt(my_context, my_async_fct_##A, "p", handler); \ + return (void*)RunFunctionFmt(my_async_fct_##A, "p", handler); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c index 7048219e..2d6c97b9 100755 --- a/src/wrapped/wrappedlibc.c +++ b/src/wrapped/wrappedlibc.c @@ -204,7 +204,7 @@ GO(15) static uintptr_t my_compare_fct_##A = 0; \ static int my_compare_##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_compare_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_compare_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -228,7 +228,7 @@ static void* findcompareFct(void* fct) static uintptr_t my_ftw_fct_##A = 0; \ static int my_ftw_##A(void* fpath, void* sb, int flag) \ { \ - return (int)RunFunctionFmt(my_context, my_ftw_fct_##A, "ppi", fpath, sb, flag); \ + return (int)RunFunctionFmt(my_ftw_fct_##A, "ppi", fpath, sb, flag); \ } SUPER() #undef GO @@ -254,7 +254,7 @@ static int my_ftw64_##A(void* fpath, void* sb, int flag) { \ struct i386_stat64 i386st; \ UnalignStat64(sb, &i386st); \ - return (int)RunFunctionFmt(my_context, my_ftw64_fct_##A, "ppi", fpath, &i386st, flag); \ + return (int)RunFunctionFmt(my_ftw64_fct_##A, "ppi", fpath, &i386st, flag); \ } SUPER() #undef GO @@ -276,7 +276,7 @@ static void* findftw64Fct(void* fct) static uintptr_t my_nftw_fct_##A = 0; \ static int my_nftw_##A(void* fpath, void* sb, int flag, void* ftwbuff) \ { \ - return (int)RunFunctionFmt(my_context, my_nftw_fct_##A, "ppip", fpath, sb, flag, ftwbuff); \ + return (int)RunFunctionFmt(my_nftw_fct_##A, "ppip", fpath, sb, flag, ftwbuff); \ } SUPER() #undef GO @@ -302,7 +302,7 @@ static int my_nftw64_##A(void* fpath, void* sb, int flag, void* ftwbuff) { \ struct i386_stat64 i386st; \ UnalignStat64(sb, &i386st); \ - return (int)RunFunctionFmt(my_context, my_nftw64_fct_##A, "ppip", fpath, &i386st, flag, ftwbuff); \ + return (int)RunFunctionFmt(my_nftw64_fct_##A, "ppip", fpath, &i386st, flag, ftwbuff); \ } SUPER() #undef GO @@ -324,7 +324,7 @@ static void* findnftw64Fct(void* fct) static uintptr_t my_globerr_fct_##A = 0; \ static int my_globerr_##A(void* epath, int eerrno) \ { \ - return (int)RunFunctionFmt(my_context, my_globerr_fct_##A, "pi", epath, eerrno);\ + return (int)RunFunctionFmt(my_globerr_fct_##A, "pi", epath, eerrno);\ } SUPER() #undef GO @@ -348,7 +348,7 @@ static void* findgloberrFct(void* fct) static uintptr_t my_filter_dir_fct_##A = 0; \ static int my_filter_dir_##A(const struct dirent* a) \ { \ - return (int)RunFunctionFmt(my_context, my_filter_dir_fct_##A, "p", a); \ + return (int)RunFunctionFmt(my_filter_dir_fct_##A, "p", a); \ } SUPER() #undef GO @@ -371,7 +371,7 @@ static void* findfilter_dirFct(void* fct) static uintptr_t my_compare_dir_fct_##A = 0; \ static int my_compare_dir_##A(const struct dirent* a, const struct dirent* b) \ { \ - return (int)RunFunctionFmt(my_context, my_compare_dir_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_compare_dir_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -395,7 +395,7 @@ static void* findcompare_dirFct(void* fct) static uintptr_t my_filter64_fct_##A = 0; \ static int my_filter64_##A(const struct dirent64* a) \ { \ - return (int)RunFunctionFmt(my_context, my_filter64_fct_##A, "p", a);\ + return (int)RunFunctionFmt(my_filter64_fct_##A, "p", a);\ } SUPER() #undef GO @@ -418,7 +418,7 @@ static void* findfilter64Fct(void* fct) static uintptr_t my_compare64_fct_##A = 0; \ static int my_compare64_##A(const struct dirent64* a, const struct dirent64* b) \ { \ - return (int)RunFunctionFmt(my_context, my_compare64_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_compare64_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -441,7 +441,7 @@ static void* findcompare64Fct(void* fct) static uintptr_t my_on_exit_fct_##A = 0; \ static void my_on_exit_##A(int a, const void* b) \ { \ - RunFunctionFmt(my_context, my_on_exit_fct_##A, "ip", a, b); \ + RunFunctionFmt(my_on_exit_fct_##A, "ip", a, b); \ } SUPER() #undef GO @@ -3073,24 +3073,24 @@ typedef struct my_cookie_s { static ssize_t my_cookie_read(void *p, char *buf, size_t size) { my_cookie_t* cookie = (my_cookie_t*)p; - return (ssize_t)RunFunctionFmt(my_context, cookie->r, "ppL", cookie->cookie, buf, size); + return (ssize_t)RunFunctionFmt(cookie->r, "ppL", cookie->cookie, buf, size); } static ssize_t my_cookie_write(void *p, const char *buf, size_t size) { my_cookie_t* cookie = (my_cookie_t*)p; - return (ssize_t)RunFunctionFmt(my_context, cookie->w, "ppL", cookie->cookie, buf, size); + return (ssize_t)RunFunctionFmt(cookie->w, "ppL", cookie->cookie, buf, size); } static int my_cookie_seek(void *p, off64_t *offset, int whence) { my_cookie_t* cookie = (my_cookie_t*)p; - return RunFunctionFmt(my_context, cookie->s, "ppi", cookie->cookie, offset, whence); + return RunFunctionFmt(cookie->s, "ppi", cookie->cookie, offset, whence); } static int my_cookie_close(void *p) { my_cookie_t* cookie = (my_cookie_t*)p; int ret = 0; if(cookie->c) - ret = RunFunctionFmt(my_context, cookie->c, "p", cookie->cookie); + ret = RunFunctionFmt(cookie->c, "p", cookie->cookie); free(cookie); return ret; } diff --git a/src/wrapped/wrappedlibfuse.c b/src/wrapped/wrappedlibfuse.c index 7ef69892..2b31f713 100755 --- a/src/wrapped/wrappedlibfuse.c +++ b/src/wrapped/wrappedlibfuse.c @@ -143,7 +143,7 @@ GO(3) static uintptr_t my_fuse_opt_proc_fct_##A = 0; \ static int my_fuse_opt_proc_##A(void* a, void* b, int c, void* d) \ { \ - return (int)RunFunctionFmt(my_context, my_fuse_opt_proc_fct_##A, "ppip", a, b, c, d); \ + return (int)RunFunctionFmt(my_fuse_opt_proc_fct_##A, "ppip", a, b, c, d); \ } SUPER() #undef GO @@ -167,7 +167,7 @@ static uintptr_t my_init_fct_##A = 0; \ static void my_init_##A(void* a, void* b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "init"); \ - RunFunctionFmt(my_context, my_init_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_init_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -191,7 +191,7 @@ static uintptr_t my_destroy_fct_##A = 0; \ static void my_destroy_##A(void* a) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "destroy"); \ - RunFunctionFmt(my_context, my_destroy_fct_##A, "p", a); \ + RunFunctionFmt(my_destroy_fct_##A, "p", a); \ } SUPER() #undef GO @@ -215,7 +215,7 @@ static uintptr_t my_lookup_fct_##A = 0; static void my_lookup_##A(void* a, unsigned long b, const char* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s(%p, %lu, %s)\n", "lookup", a, b, c); \ - RunFunctionFmt(my_context, my_lookup_fct_##A, "pLp", a, b, c); \ + RunFunctionFmt(my_lookup_fct_##A, "pLp", a, b, c); \ } SUPER() #undef GO @@ -239,7 +239,7 @@ static uintptr_t my_forget_fct_##A = 0; \ static void my_forget_##A(void* a, unsigned long b, unsigned long c)\ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "forget"); \ - RunFunctionFmt(my_context, my_forget_fct_##A, "pLp", a, b, c); \ + RunFunctionFmt(my_forget_fct_##A, "pLp", a, b, c); \ } SUPER() #undef GO @@ -263,7 +263,7 @@ static uintptr_t my_getattr_fct_##A = 0; \ static void my_getattr_##A(void* a, unsigned long b, void* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "getattr"); \ - RunFunctionFmt(my_context, my_getattr_fct_##A, "pLp", a, b, c); \ + RunFunctionFmt(my_getattr_fct_##A, "pLp", a, b, c); \ } SUPER() #undef GO @@ -289,7 +289,7 @@ static void my_setattr_##A(void* a, unsigned long b, struct stat* c, int d, void struct stat c_; \ AlignStat64(c, &c_); \ printf_log(LOG_DEBUG, "fuse: call %s\n", "setattr"); \ - RunFunctionFmt(my_context, my_setattr_fct_##A, "pLpip", a, b, &c_, d, e); \ + RunFunctionFmt(my_setattr_fct_##A, "pLpip", a, b, &c_, d, e); \ } SUPER() #undef GO @@ -313,7 +313,7 @@ static uintptr_t my_readlink_fct_##A = 0; \ static void my_readlink_##A(void* a, unsigned long b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "readlink"); \ - RunFunctionFmt(my_context, my_readlink_fct_##A, "pL", a, b); \ + RunFunctionFmt(my_readlink_fct_##A, "pL", a, b); \ } SUPER() #undef GO @@ -337,7 +337,7 @@ static uintptr_t my_mknod_fct_##A = 0; static void my_mknod_##A(void* a, unsigned long b, const char* c, mode_t d, dev_t e) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "mknod"); \ - RunFunctionFmt(my_context, my_mknod_fct_##A, "pLpuU", a, b, c, of_convert(d), e); \ + RunFunctionFmt(my_mknod_fct_##A, "pLpuU", a, b, c, of_convert(d), e); \ } SUPER() #undef GO @@ -361,7 +361,7 @@ static uintptr_t my_mkdir_fct_##A = 0; static void my_mkdir_##A(void* a, unsigned long b, const char* c, mode_t d) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "mkdir"); \ - RunFunctionFmt(my_context, my_mkdir_fct_##A, "pupu", a, b, c, of_convert(d)); \ + RunFunctionFmt(my_mkdir_fct_##A, "pupu", a, b, c, of_convert(d)); \ } SUPER() #undef GO @@ -385,7 +385,7 @@ static uintptr_t my_unlink_fct_##A = 0; \ static void my_unlink_##A(void* a, unsigned long b, const char* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "unlink"); \ - RunFunctionFmt(my_context, my_unlink_fct_##A, "pLp", a, b, c); \ + RunFunctionFmt(my_unlink_fct_##A, "pLp", a, b, c); \ } SUPER() #undef GO @@ -409,7 +409,7 @@ static uintptr_t my_rmdir_fct_##A = 0; \ static void my_rmdir_##A(void* a, unsigned long b, const char* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "rmdir"); \ - RunFunctionFmt(my_context, my_rmdir_fct_##A, "pLp", a, b, c); \ + RunFunctionFmt(my_rmdir_fct_##A, "pLp", a, b, c); \ } SUPER() #undef GO @@ -433,7 +433,7 @@ static uintptr_t my_symlink_fct_##A = 0; static void my_symlink_##A(void* a, const char* b, unsigned long c, const char* d) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "symlink"); \ - RunFunctionFmt(my_context, my_symlink_fct_##A, "ppLp", a, b, c, d); \ + RunFunctionFmt(my_symlink_fct_##A, "ppLp", a, b, c, d); \ } SUPER() #undef GO @@ -457,7 +457,7 @@ static uintptr_t my_rename_fct_##A = 0; static void my_rename_##A(void* a, unsigned long b, const char* c, unsigned long d, const char* e) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "rename"); \ - RunFunctionFmt(my_context, my_rename_fct_##A, "pLpLp", a, b, c, d, e); \ + RunFunctionFmt(my_rename_fct_##A, "pLpLp", a, b, c, d, e); \ } SUPER() #undef GO @@ -481,7 +481,7 @@ static uintptr_t my_link_fct_##A = 0; static void my_link_##A(void* a, unsigned long b, unsigned long c, const char* d) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "link"); \ - RunFunctionFmt(my_context, my_link_fct_##A, "pLLp", a, b, c, d); \ + RunFunctionFmt(my_link_fct_##A, "pLLp", a, b, c, d); \ } SUPER() #undef GO @@ -505,7 +505,7 @@ static uintptr_t my_open_fct_##A = 0; \ static void my_open_##A(void* a, unsigned long b, const char* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "open"); \ - RunFunctionFmt(my_context, my_open_fct_##A, "pLp", a, b, c); \ + RunFunctionFmt(my_open_fct_##A, "pLp", a, b, c); \ } SUPER() #undef GO @@ -529,7 +529,7 @@ static uintptr_t my_read_fct_##A = 0; static void my_read_##A(void* a, unsigned long b, const char* c, size_t d, off_t e, void* f) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "read"); \ - RunFunctionFmt(my_context, my_read_fct_##A, "pLpLlp", a, b, c, d, e, f); \ + RunFunctionFmt(my_read_fct_##A, "pLpLlp", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -553,7 +553,7 @@ static uintptr_t my_write_fct_##A = 0; static void my_write_##A(void* a, unsigned long b, const char* c, size_t d, off_t e, void* f) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "write"); \ - RunFunctionFmt(my_context, my_write_fct_##A, "pLpLlp", a, b, c, d, e, f); \ + RunFunctionFmt(my_write_fct_##A, "pLpLlp", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -577,7 +577,7 @@ static uintptr_t my_flush_fct_##A = 0; \ static void my_flush_##A(void* a, unsigned long b, const char* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "flush"); \ - RunFunctionFmt(my_context, my_flush_fct_##A, "pLp", a, b, c); \ + RunFunctionFmt(my_flush_fct_##A, "pLp", a, b, c); \ } SUPER() #undef GO @@ -601,7 +601,7 @@ static uintptr_t my_release_fct_##A = 0; \ static void my_release_##A(void* a, unsigned long b, const char* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "release"); \ - RunFunctionFmt(my_context, my_release_fct_##A, "pLp", a, b, c); \ + RunFunctionFmt(my_release_fct_##A, "pLp", a, b, c); \ } SUPER() #undef GO @@ -625,7 +625,7 @@ static uintptr_t my_fsync_fct_##A = 0; \ static void my_fsync_##A(void* a, unsigned long b, int c, void* d) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "fsync"); \ - RunFunctionFmt(my_context, my_fsync_fct_##A, "pLip", a, b, c, d); \ + RunFunctionFmt(my_fsync_fct_##A, "pLip", a, b, c, d); \ } SUPER() #undef GO @@ -649,7 +649,7 @@ static uintptr_t my_opendir_fct_##A = 0; static void my_opendir_##A(void* a, unsigned long b, void* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s(%p, %lu, %p)\n", "opendir", a, b, c); \ - RunFunctionFmt(my_context, my_opendir_fct_##A, "pLp", a, b, c); \ + RunFunctionFmt(my_opendir_fct_##A, "pLp", a, b, c); \ } SUPER() #undef GO @@ -673,7 +673,7 @@ static uintptr_t my_readdir_fct_##A = 0; static void my_readdir_##A(void* a, unsigned long b, size_t c, off_t d, void* e) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "readdir"); \ - RunFunctionFmt(my_context, my_readdir_fct_##A, "pLLlp", a, b, c, d, e); \ + RunFunctionFmt(my_readdir_fct_##A, "pLLlp", a, b, c, d, e); \ } SUPER() #undef GO @@ -697,7 +697,7 @@ static uintptr_t my_releasedir_fct_##A = 0; static void my_releasedir_##A(void* a, unsigned long b, void* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s(%p, %lu, %p)\n", "releasedir", a, b, c); \ - RunFunctionFmt(my_context, my_releasedir_fct_##A, "pLp", a, b, c); \ + RunFunctionFmt(my_releasedir_fct_##A, "pLp", a, b, c); \ } SUPER() #undef GO @@ -721,7 +721,7 @@ static uintptr_t my_fsyncdir_fct_##A = 0; \ static void my_fsyncdir_##A(void* a, unsigned long b, int c, void* d) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "fsyncdir"); \ - RunFunctionFmt(my_context, my_fsyncdir_fct_##A, "pLip", a, b, c, d);\ + RunFunctionFmt(my_fsyncdir_fct_##A, "pLip", a, b, c, d);\ } SUPER() #undef GO @@ -745,7 +745,7 @@ static uintptr_t my_statfs_fct_##A = 0; \ static void my_statfs_##A(void* a, unsigned long b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "statfs"); \ - RunFunctionFmt(my_context, my_statfs_fct_##A, "pL", a, b); \ + RunFunctionFmt(my_statfs_fct_##A, "pL", a, b); \ } SUPER() #undef GO @@ -769,7 +769,7 @@ static uintptr_t my_setxattr_fct_##A = 0; static void my_setxattr_##A(void* a, unsigned long b, const char* c, const char* d, size_t e, int f) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "setxattr"); \ - RunFunctionFmt(my_context, my_setxattr_fct_##A, "pLppLi", a, b, c, d, e, f); \ + RunFunctionFmt(my_setxattr_fct_##A, "pLppLi", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -793,7 +793,7 @@ static uintptr_t my_getxattr_fct_##A = 0; static void my_getxattr_##A(void* a, unsigned long b, const char* c, const char* d, size_t e) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "getxattr"); \ - RunFunctionFmt(my_context, my_getxattr_fct_##A, "pLppL", a, b, c, d, e); \ + RunFunctionFmt(my_getxattr_fct_##A, "pLppL", a, b, c, d, e); \ } SUPER() #undef GO @@ -817,7 +817,7 @@ static uintptr_t my_listxattr_fct_##A = 0; \ static void my_listxattr_##A(void* a, unsigned long b, size_t c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "listxattr"); \ - RunFunctionFmt(my_context, my_listxattr_fct_##A, "pLL", a, b, c); \ + RunFunctionFmt(my_listxattr_fct_##A, "pLL", a, b, c); \ } SUPER() #undef GO @@ -841,7 +841,7 @@ static uintptr_t my_removexattr_fct_##A = 0; \ static void my_removexattr_##A(void* a, unsigned long b, const char* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "removexattr"); \ - RunFunctionFmt(my_context, my_removexattr_fct_##A, "pLp", a, b, c); \ + RunFunctionFmt(my_removexattr_fct_##A, "pLp", a, b, c); \ } SUPER() #undef GO @@ -865,7 +865,7 @@ static uintptr_t my_access_fct_##A = 0; \ static void my_access_##A(void* a, unsigned long b, int c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "access"); \ - RunFunctionFmt(my_context, my_access_fct_##A, "pLi", a, b, c); \ + RunFunctionFmt(my_access_fct_##A, "pLi", a, b, c); \ } SUPER() #undef GO @@ -889,7 +889,7 @@ static uintptr_t my_create_fct_##A = 0; static void my_create_##A(void* a, unsigned long b, const char* c, mode_t d, void* e) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "create"); \ - RunFunctionFmt(my_context, my_create_fct_##A, "pLpup", a, b, c, of_convert(d), e); \ + RunFunctionFmt(my_create_fct_##A, "pLpup", a, b, c, of_convert(d), e); \ } SUPER() #undef GO @@ -913,7 +913,7 @@ static uintptr_t my_getlk_fct_##A = 0; \ static void my_getlk_##A(void* a, unsigned long b, void* c, void* d) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "getlk"); \ - RunFunctionFmt(my_context, my_getlk_fct_##A, "pLpp", a, b, c, d); \ + RunFunctionFmt(my_getlk_fct_##A, "pLpp", a, b, c, d); \ } SUPER() #undef GO @@ -937,7 +937,7 @@ static uintptr_t my_setlk_fct_##A = 0; \ static void my_setlk_##A(void* a, unsigned long b, void* c, void* d, int e) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "setlk"); \ - RunFunctionFmt(my_context, my_setlk_fct_##A, "pLppi", a, b, c, d, e); \ + RunFunctionFmt(my_setlk_fct_##A, "pLppi", a, b, c, d, e); \ } SUPER() #undef GO @@ -961,7 +961,7 @@ static uintptr_t my_bmap_fct_##A = 0; \ static void my_bmap_##A(void* a, unsigned long b, size_t c, uint64_t d) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "bmap"); \ - RunFunctionFmt(my_context, my_bmap_fct_##A, "pLLU", a, b, c, d); \ + RunFunctionFmt(my_bmap_fct_##A, "pLLU", a, b, c, d); \ } SUPER() #undef GO @@ -985,7 +985,7 @@ static uintptr_t my_ioctl_fct_##A = 0; static void my_ioctl_##A(void* a, unsigned long b, int c, void* d, void* e, unsigned f, void* g, size_t h, size_t i)\ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "ioctl"); \ - RunFunctionFmt(my_context, my_ioctl_fct_##A, "pLippupLL", a, b, c, d, e, f, g, h, i); \ + RunFunctionFmt(my_ioctl_fct_##A, "pLippupLL", a, b, c, d, e, f, g, h, i); \ } SUPER() #undef GO @@ -1009,7 +1009,7 @@ static uintptr_t my_poll_fct_##A = 0; \ static void my_poll_##A(void* a, unsigned long b, void* c, void* d) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "poll"); \ - RunFunctionFmt(my_context, my_poll_fct_##A, "pLpp", a, b, c, d); \ + RunFunctionFmt(my_poll_fct_##A, "pLpp", a, b, c, d); \ } SUPER() #undef GO @@ -1033,7 +1033,7 @@ static uintptr_t my_write_buf_fct_##A = 0; static void my_write_buf_##A(void* a, unsigned long b, void* c, off_t d, void* e) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "write_buf"); \ - RunFunctionFmt(my_context, my_write_buf_fct_##A, "pLplp", a, b, c, d, e); \ + RunFunctionFmt(my_write_buf_fct_##A, "pLplp", a, b, c, d, e); \ } SUPER() #undef GO @@ -1057,7 +1057,7 @@ static uintptr_t my_retrieve_reply_fct_##A = 0; static void my_retrieve_reply_##A(void* a, void* b, unsigned long c, off_t d, void* e) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "retrieve_reply"); \ - RunFunctionFmt(my_context, my_retrieve_reply_fct_##A, "ppLlp", a, b, c, d, e); \ + RunFunctionFmt(my_retrieve_reply_fct_##A, "ppLlp", a, b, c, d, e); \ } SUPER() #undef GO @@ -1081,7 +1081,7 @@ static uintptr_t my_forget_multi_fct_##A = 0; \ static void my_forget_multi_##A(void* a, size_t b, void* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "forget_multi"); \ - RunFunctionFmt(my_context, my_forget_multi_fct_##A, "pLp", a, b, c); \ + RunFunctionFmt(my_forget_multi_fct_##A, "pLp", a, b, c); \ } SUPER() #undef GO @@ -1105,7 +1105,7 @@ static uintptr_t my_flock_fct_##A = 0; \ static void my_flock_##A(void* a, unsigned long b, void* c, int d) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "flock"); \ - RunFunctionFmt(my_context, my_flock_fct_##A, "pLpi", a, b, c, d); \ + RunFunctionFmt(my_flock_fct_##A, "pLpi", a, b, c, d); \ } SUPER() #undef GO @@ -1129,7 +1129,7 @@ static uintptr_t my_fallocate_fct_##A = 0; static void my_fallocate_##A(void* a, unsigned long b, int c, off_t d, off_t e, void* f) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "fallocate"); \ - RunFunctionFmt(my_context, my_fallocate_fct_##A, "pLillp", a, b, c, d, e, f); \ + RunFunctionFmt(my_fallocate_fct_##A, "pLillp", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -1155,7 +1155,7 @@ static int my_getattr_op_##A(const char * a, struct stat * b) printf_log(LOG_DEBUG, "fuse: call %s\n", "getattr_op"); \ struct i386_stat64 b_; \ UnalignStat64(b, &b_); \ - int ret = (int)RunFunctionFmt(my_context, my_getattr_op_fct_##A, "pp", a, &b_); \ + int ret = (int)RunFunctionFmt(my_getattr_op_fct_##A, "pp", a, &b_); \ AlignStat64(&b_, b); \ return ret; \ } @@ -1181,7 +1181,7 @@ static uintptr_t my_readlink_op_fct_##A = 0; static int my_readlink_op_##A(const char * a, char * b, size_t c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "readlink_op"); \ - return (int)RunFunctionFmt(my_context, my_readlink_op_fct_##A, "ppL", a, b, c); \ + return (int)RunFunctionFmt(my_readlink_op_fct_##A, "ppL", a, b, c); \ } SUPER() #undef GO @@ -1205,7 +1205,7 @@ static uintptr_t my_getdir_op_fct_##A = 0; static int my_getdir_op_##A(const char * a, void* b, void* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "getdir_op"); \ - return (int)RunFunctionFmt(my_context, my_getdir_op_fct_##A, "ppp", a, b, AddCheckBridge(my_lib->w.bridge, iFppiU, c, 0, NULL)); \ + return (int)RunFunctionFmt(my_getdir_op_fct_##A, "ppp", a, b, AddCheckBridge(my_lib->w.bridge, iFppiU, c, 0, NULL)); \ } SUPER() #undef GO @@ -1229,7 +1229,7 @@ static uintptr_t my_mknod_op_fct_##A = 0; static int my_mknod_op_##A(const char * a, mode_t b, dev_t c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "mknod_op"); \ - return (int)RunFunctionFmt(my_context, my_mknod_op_fct_##A, "puU", a, b, c); \ + return (int)RunFunctionFmt(my_mknod_op_fct_##A, "puU", a, b, c); \ } SUPER() #undef GO @@ -1253,7 +1253,7 @@ static uintptr_t my_mkdir_op_fct_##A = 0; \ static int my_mkdir_op_##A(const char * a, mode_t b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "mkdir_op"); \ - return (int)RunFunctionFmt(my_context, my_mkdir_op_fct_##A, "pu", a, b);\ + return (int)RunFunctionFmt(my_mkdir_op_fct_##A, "pu", a, b);\ } SUPER() #undef GO @@ -1277,7 +1277,7 @@ static uintptr_t my_unlink_op_fct_##A = 0; \ static int my_unlink_op_##A(const char * a) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "unlink_op"); \ - return (int)RunFunctionFmt(my_context, my_unlink_op_fct_##A, "p", a); \ + return (int)RunFunctionFmt(my_unlink_op_fct_##A, "p", a); \ } SUPER() #undef GO @@ -1301,7 +1301,7 @@ static uintptr_t my_rmdir_op_fct_##A = 0; \ static int my_rmdir_op_##A(const char * a) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "rmdir_op"); \ - return (int)RunFunctionFmt(my_context, my_rmdir_op_fct_##A, "p", a);\ + return (int)RunFunctionFmt(my_rmdir_op_fct_##A, "p", a);\ } SUPER() #undef GO @@ -1325,7 +1325,7 @@ static uintptr_t my_symlink_op_fct_##A = 0; static int my_symlink_op_##A(const char * a, const char * b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "symlink_op"); \ - return (int)RunFunctionFmt(my_context, my_symlink_op_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_symlink_op_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -1349,7 +1349,7 @@ static uintptr_t my_rename_op_fct_##A = 0; static int my_rename_op_##A(const char * a, const char * b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "rename_op"); \ - return (int)RunFunctionFmt(my_context, my_rename_op_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_rename_op_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -1373,7 +1373,7 @@ static uintptr_t my_link_op_fct_##A = 0; \ static int my_link_op_##A(const char * a, const char * b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "link_op"); \ - return (int)RunFunctionFmt(my_context, my_link_op_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_link_op_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -1397,7 +1397,7 @@ static uintptr_t my_chmod_op_fct_##A = 0; static int my_chmod_op_##A(const char * a, mode_t b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "chmod_op"); \ - return (int)RunFunctionFmt(my_context, my_chmod_op_fct_##A, "pu", a, b); \ + return (int)RunFunctionFmt(my_chmod_op_fct_##A, "pu", a, b); \ } SUPER() #undef GO @@ -1421,7 +1421,7 @@ static uintptr_t my_chown_op_fct_##A = 0; static int my_chown_op_##A(const char * a, uid_t b, gid_t c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "chown_op"); \ - return (int)RunFunctionFmt(my_context, my_chown_op_fct_##A, "puu", a, b, c);\ + return (int)RunFunctionFmt(my_chown_op_fct_##A, "puu", a, b, c);\ } SUPER() #undef GO @@ -1445,7 +1445,7 @@ static uintptr_t my_truncate_op_fct_##A = 0; static int my_truncate_op_##A(const char * a, off_t b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "truncate_op"); \ - return (int)RunFunctionFmt(my_context, my_truncate_op_fct_##A, "pl", a, b); \ + return (int)RunFunctionFmt(my_truncate_op_fct_##A, "pl", a, b); \ } SUPER() #undef GO @@ -1469,7 +1469,7 @@ static uintptr_t my_utime_op_fct_##A = 0; \ static int my_utime_op_##A(const char * a, void* b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "utime_op"); \ - return (int)RunFunctionFmt(my_context, my_utime_op_fct_##A, "pp", a, b);\ + return (int)RunFunctionFmt(my_utime_op_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -1493,7 +1493,7 @@ static uintptr_t my_open_op_fct_##A = 0; \ static int my_open_op_##A(const char * a, void* b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "open_op"); \ - return (int)RunFunctionFmt(my_context, my_open_op_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_open_op_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -1517,7 +1517,7 @@ static uintptr_t my_read_op_fct_##A = 0; static int my_read_op_##A(const char * a, char * b, size_t c, off_t d, void* e) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "read_op"); \ - return (int)RunFunctionFmt(my_context, my_read_op_fct_##A, "ppLlp", a, b, c, d, e); \ + return (int)RunFunctionFmt(my_read_op_fct_##A, "ppLlp", a, b, c, d, e); \ } SUPER() #undef GO @@ -1541,7 +1541,7 @@ static uintptr_t my_write_op_fct_##A = 0; static int my_write_op_##A(const char * a, const char * b, size_t c, off_t d, void* e) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "write_op"); \ - return (int)RunFunctionFmt(my_context, my_write_op_fct_##A, "ppLlp", a, b, c, d, e);\ + return (int)RunFunctionFmt(my_write_op_fct_##A, "ppLlp", a, b, c, d, e);\ } SUPER() #undef GO @@ -1565,7 +1565,7 @@ static uintptr_t my_statfs_op_fct_##A = 0; static int my_statfs_op_##A(const char * a, void* b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "statfs_op"); \ - return (int)RunFunctionFmt(my_context, my_statfs_op_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_statfs_op_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -1589,7 +1589,7 @@ static uintptr_t my_flush_op_fct_##A = 0; \ static int my_flush_op_##A(const char * a, void* b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "flush_op"); \ - return (int)RunFunctionFmt(my_context, my_flush_op_fct_##A, "pp", a, b);\ + return (int)RunFunctionFmt(my_flush_op_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -1613,7 +1613,7 @@ static uintptr_t my_release_op_fct_##A = 0; static int my_release_op_##A(const char * a, void* b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "release_op"); \ - return (int)RunFunctionFmt(my_context, my_release_op_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_release_op_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -1637,7 +1637,7 @@ static uintptr_t my_fsync_op_fct_##A = 0; static int my_fsync_op_##A(const char * a, int b, void* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "fsync_op"); \ - return (int)RunFunctionFmt(my_context, my_fsync_op_fct_##A, "pip", a, b, c);\ + return (int)RunFunctionFmt(my_fsync_op_fct_##A, "pip", a, b, c);\ } SUPER() #undef GO @@ -1661,7 +1661,7 @@ static uintptr_t my_setxattr_op_fct_##A = 0; static int my_setxattr_op_##A(const char * a, const char * b, const char * c, size_t d, int e) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "setxattr_op"); \ - return (int)RunFunctionFmt(my_context, my_setxattr_op_fct_##A, "pppLi", a, b, c, d, e); \ + return (int)RunFunctionFmt(my_setxattr_op_fct_##A, "pppLi", a, b, c, d, e); \ } SUPER() #undef GO @@ -1685,7 +1685,7 @@ static uintptr_t my_getxattr_op_fct_##A = 0; static int my_getxattr_op_##A(const char * a, const char * b, char * c, size_t d) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "getxattr_op"); \ - return (int)RunFunctionFmt(my_context, my_getxattr_op_fct_##A, "pppL", a, b, c, d); \ + return (int)RunFunctionFmt(my_getxattr_op_fct_##A, "pppL", a, b, c, d); \ } SUPER() #undef GO @@ -1709,7 +1709,7 @@ static uintptr_t my_listxattr_op_fct_##A = 0; static int my_listxattr_op_##A(const char * a, char * b, size_t c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "listxattr_op"); \ - return (int)RunFunctionFmt(my_context, my_listxattr_op_fct_##A, "ppL", a, b, c);\ + return (int)RunFunctionFmt(my_listxattr_op_fct_##A, "ppL", a, b, c);\ } SUPER() #undef GO @@ -1733,7 +1733,7 @@ static uintptr_t my_removexattr_op_fct_##A = 0; static int my_removexattr_op_##A(const char * a, const char * b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "removexattr_op"); \ - return (int)RunFunctionFmt(my_context, my_removexattr_op_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_removexattr_op_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -1757,7 +1757,7 @@ static uintptr_t my_opendir_op_fct_##A = 0; static int my_opendir_op_##A(const char * a, void* b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "opendir_op"); \ - return (int)RunFunctionFmt(my_context, my_opendir_op_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_opendir_op_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -1781,7 +1781,7 @@ static uintptr_t my_readdir_op_fct_##A = 0; static int my_readdir_op_##A(const char * a, void * b, fuse_fill_dir_t c, off_t d, void* e) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "readdir_op"); \ - return (int)RunFunctionFmt(my_context, my_readdir_op_fct_##A, "pppLp", a, b, AddCheckBridge(my_lib->w.bridge, iFpppUi, c, 0, NULL), d, e); \ + return (int)RunFunctionFmt(my_readdir_op_fct_##A, "pppLp", a, b, AddCheckBridge(my_lib->w.bridge, iFpppUi, c, 0, NULL), d, e); \ } SUPER() #undef GO @@ -1805,7 +1805,7 @@ static uintptr_t my_releasedir_op_fct_##A = 0; static int my_releasedir_op_##A(const char * a, void* b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "releasedir_op"); \ - return (int)RunFunctionFmt(my_context, my_releasedir_op_fct_##A,"pp", a, b);\ + return (int)RunFunctionFmt(my_releasedir_op_fct_##A,"pp", a, b);\ } SUPER() #undef GO @@ -1829,7 +1829,7 @@ static uintptr_t my_fsyncdir_op_fct_##A = 0; static int my_fsyncdir_op_##A(const char * a, int b, void* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "fsyncdir_op"); \ - return (int)RunFunctionFmt(my_context, my_fsyncdir_op_fct_##A, "pip", a, b, c); \ + return (int)RunFunctionFmt(my_fsyncdir_op_fct_##A, "pip", a, b, c); \ } SUPER() #undef GO @@ -1853,7 +1853,7 @@ static uintptr_t my_init_op_fct_##A = 0; \ static void* my_init_op_##A(void* a) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "init_op"); \ - return (void*)RunFunctionFmt(my_context, my_init_op_fct_##A, "p", a); \ + return (void*)RunFunctionFmt(my_init_op_fct_##A, "p", a); \ } SUPER() #undef GO @@ -1877,7 +1877,7 @@ static uintptr_t my_destroy_op_fct_##A = 0; \ static void my_destroy_op_##A(void * a) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "destroy_op"); \ - RunFunctionFmt(my_context, my_destroy_op_fct_##A, "p", a); \ + RunFunctionFmt(my_destroy_op_fct_##A, "p", a); \ } SUPER() #undef GO @@ -1901,7 +1901,7 @@ static uintptr_t my_access_op_fct_##A = 0; static int my_access_op_##A(const char * a, int b) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "access_op"); \ - return (int)RunFunctionFmt(my_context, my_access_op_fct_##A, "pi", a, b); \ + return (int)RunFunctionFmt(my_access_op_fct_##A, "pi", a, b); \ } SUPER() #undef GO @@ -1925,7 +1925,7 @@ static uintptr_t my_create_op_fct_##A = 0; static int my_create_op_##A(const char * a, mode_t b, void* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "create_op"); \ - return (int)RunFunctionFmt(my_context, my_create_op_fct_##A, "pup", a, b, c); \ + return (int)RunFunctionFmt(my_create_op_fct_##A, "pup", a, b, c); \ } SUPER() #undef GO @@ -1949,7 +1949,7 @@ static uintptr_t my_ftruncate_op_fct_##A = 0; static int my_ftruncate_op_##A(const char * a, off_t b, void* c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "ftruncate_op"); \ - return (int)RunFunctionFmt(my_context, my_ftruncate_op_fct_##A, "plp", a, b, c);\ + return (int)RunFunctionFmt(my_ftruncate_op_fct_##A, "plp", a, b, c);\ } SUPER() #undef GO @@ -1975,7 +1975,7 @@ static int my_fgetattr_op_##A(const char * a, struct stat* b, void* c) printf_log(LOG_DEBUG, "fuse: call %s\n", "fgetattr_op"); \ struct i386_stat64 b_; \ UnalignStat64(b, &b_); \ - int ret = (int)RunFunctionFmt(my_context, my_fgetattr_op_fct_##A, "ppp", a, &b_, c);\ + int ret = (int)RunFunctionFmt(my_fgetattr_op_fct_##A, "ppp", a, &b_, c);\ AlignStat64(&b_, b); \ return ret; \ } @@ -2001,7 +2001,7 @@ static uintptr_t my_lock_op_fct_##A = 0; static int my_lock_op_##A(const char * a, void* b, int c, void* d) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "lock_op"); \ - return (int)RunFunctionFmt(my_context, my_lock_op_fct_##A, "ppip", a, b, c, d); \ + return (int)RunFunctionFmt(my_lock_op_fct_##A, "ppip", a, b, c, d); \ } SUPER() #undef GO @@ -2025,7 +2025,7 @@ static uintptr_t my_utimens_op_fct_##A = 0; static int my_utimens_op_##A(const char * a, const struct timespec b[2]) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "utimens_op"); \ - return (int)RunFunctionFmt(my_context, my_utimens_op_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_utimens_op_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -2049,7 +2049,7 @@ static uintptr_t my_bmap_op_fct_##A = 0; static int my_bmap_op_##A(const char * a, size_t b, uint64_t *c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "bmap_op"); \ - return (int)RunFunctionFmt(my_context, my_bmap_op_fct_##A, "pLp", a, b, c); \ + return (int)RunFunctionFmt(my_bmap_op_fct_##A, "pLp", a, b, c); \ } SUPER() #undef GO @@ -2073,7 +2073,7 @@ static uintptr_t my_ioctl_op_fct_##A = 0; static int my_ioctl_op_##A(const char * a, int b, void* c, void* d, unsigned int e, void* f) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "ioctl_op"); \ - return (int)RunFunctionFmt(my_context, my_ioctl_op_fct_##A, "pi", a, b, c, d, e, f); \ + return (int)RunFunctionFmt(my_ioctl_op_fct_##A, "pi", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -2097,7 +2097,7 @@ static uintptr_t my_poll_op_fct_##A = 0; static int my_poll_op_##A(const char * a, void* b, void* c, unsigned * d) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "poll_op"); \ - return (int)RunFunctionFmt(my_context, my_poll_op_fct_##A, "pppp", a, b, c, d); \ + return (int)RunFunctionFmt(my_poll_op_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -2121,7 +2121,7 @@ static uintptr_t my_write_buf_op_fct_##A = 0; static int my_write_buf_op_##A(const char * a, void* b, off_t c, void* d) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "write_buf_op"); \ - return (int)RunFunctionFmt(my_context, my_write_buf_op_fct_##A, "pplp", a, b, c, d);\ + return (int)RunFunctionFmt(my_write_buf_op_fct_##A, "pplp", a, b, c, d);\ } SUPER() #undef GO @@ -2145,7 +2145,7 @@ static uintptr_t my_read_buf_op_fct_##A = 0; static int my_read_buf_op_##A(const char * a, void* b, size_t c, off_t d, void* e) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "read_buf_op"); \ - return (int)RunFunctionFmt(my_context, my_read_buf_op_fct_##A, "ppLlp", a, b, c, d, e); \ + return (int)RunFunctionFmt(my_read_buf_op_fct_##A, "ppLlp", a, b, c, d, e); \ } SUPER() #undef GO @@ -2169,7 +2169,7 @@ static uintptr_t my_flock_op_fct_##A = 0; static int my_flock_op_##A(const char * a, void* b, int c) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "flock_op"); \ - return (int)RunFunctionFmt(my_context, my_flock_op_fct_##A, "ppi", a, b, c);\ + return (int)RunFunctionFmt(my_flock_op_fct_##A, "ppi", a, b, c);\ } SUPER() #undef GO @@ -2193,7 +2193,7 @@ static uintptr_t my_fallocate_op_fct_##A = 0; static int my_fallocate_op_##A(const char * a, int b, off_t c, off_t d, void* e) \ { \ printf_log(LOG_DEBUG, "fuse: call %s\n", "fallocate_op"); \ - return (int)RunFunctionFmt(my_context, my_fallocate_op_fct_##A, "pillp", a, b, c, d, e);\ + return (int)RunFunctionFmt(my_fallocate_op_fct_##A, "pillp", a, b, c, d, e);\ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibgl.c b/src/wrapped/wrappedlibgl.c index 92789fef..040dcef1 100755 --- a/src/wrapped/wrappedlibgl.c +++ b/src/wrapped/wrappedlibgl.c @@ -58,7 +58,7 @@ GO(4) static uintptr_t my_debug_callback_fct_##A = 0; \ static void my_debug_callback_##A(int32_t a, int32_t b, uint32_t c, int32_t d, int32_t e, const char* f, const void* g) \ { \ - RunFunctionFmt(my_context, my_debug_callback_fct_##A, "iiiiipp", a, b, c, d, e, f, g); \ + RunFunctionFmt(my_debug_callback_fct_##A, "iiiiipp", a, b, c, d, e, f, g); \ } SUPER() #undef GO @@ -80,7 +80,7 @@ static void* find_debug_callback_Fct(void* fct) static uintptr_t my_program_callback_fct_##A = 0; \ static void my_program_callback_##A(int32_t a, void* b) \ { \ - RunFunctionFmt(my_context, my_program_callback_fct_##A, "ip", a, b);\ + RunFunctionFmt(my_program_callback_fct_##A, "ip", a, b);\ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibglu.c b/src/wrapped/wrappedlibglu.c index 8d41e7d8..ee624fbe 100755 --- a/src/wrapped/wrappedlibglu.c +++ b/src/wrapped/wrappedlibglu.c @@ -44,7 +44,7 @@ GO(9) \ static uintptr_t my_glu_callback_fct_##A = 0; \ static void my_glu_callback_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_glu_callback_fct_##A, "pp", a, b);\ + RunFunctionFmt(my_glu_callback_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -66,7 +66,7 @@ static void* findglu_callbackFct(void* fct) static uintptr_t my_glu_callback4_fct_##A = 0; \ static void my_glu_callback4_##A(void* a, void* b, void* c, void* d) \ { \ - RunFunctionFmt(my_context, my_glu_callback4_fct_##A, "pppp", a, b, c, d); \ + RunFunctionFmt(my_glu_callback4_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -88,7 +88,7 @@ static void* findglu_callback4Fct(void* fct) static uintptr_t my_glu_callback5_fct_##A = 0; \ static void my_glu_callback5_##A(void* a, void* b, void* c, void* d, void* e) \ { \ - RunFunctionFmt(my_context, my_glu_callback5_fct_##A, "ppppp", a, b, c, d, e); \ + RunFunctionFmt(my_glu_callback5_fct_##A, "ppppp", a, b, c, d, e); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibibus.c b/src/wrapped/wrappedlibibus.c index 8e9755d5..512a12b0 100644 --- a/src/wrapped/wrappedlibibus.c +++ b/src/wrapped/wrappedlibibus.c @@ -38,7 +38,7 @@ GO(3) static uintptr_t my_GAsyncReadyCallback_fct_##A = 0; \ static void my_GAsyncReadyCallback_##A(void* source, void* res, void* data) \ { \ - RunFunctionFmt(my_context, my_GAsyncReadyCallback_fct_##A, "ppp", source, res, data); \ + RunFunctionFmt(my_GAsyncReadyCallback_fct_##A, "ppp", source, res, data); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibjpeg.c b/src/wrapped/wrappedlibjpeg.c index ed07c27a..79740518 100755 --- a/src/wrapped/wrappedlibjpeg.c +++ b/src/wrapped/wrappedlibjpeg.c @@ -295,7 +295,7 @@ static void* is_reset_error_mgrFct(void* fct) static uintptr_t my_jpeg_marker_parser_method_fct_##A = 0; \ static int my_jpeg_marker_parser_method_##A(void* cinfo) \ { \ - RunFunction_helper(my_context, my_jpeg_marker_parser_method_fct_##A, "p", cinfo);\ + RunFunction_helper(my_jpeg_marker_parser_method_fct_##A, "p", cinfo);\ return (int)ret; \ } SUPER() diff --git a/src/wrapped/wrappedlibjpeg62.c b/src/wrapped/wrappedlibjpeg62.c index bef97865..586ea323 100755 --- a/src/wrapped/wrappedlibjpeg62.c +++ b/src/wrapped/wrappedlibjpeg62.c @@ -497,7 +497,7 @@ static void* reverse_reset_error_mgrFct(void* fct) static uintptr_t my_jpeg_marker_parser_method_fct_##A = 0; \ static int my_jpeg_marker_parser_method_##A(void* cinfo) \ { \ - RunFunction_helper(my_context, my_jpeg_marker_parser_method_fct_##A, "p", cinfo);\ + RunFunction_helper(my_jpeg_marker_parser_method_fct_##A, "p", cinfo);\ return (int)ret; \ } SUPER() @@ -531,7 +531,7 @@ static void* findjpeg_marker_parser_methodFct(void* fct) static uintptr_t my_alloc_small_fct_##A = 0; \ static void* my_alloc_small_##A(void* cinfo, int pool_id, size_t sizeofobject) \ { \ - RunFunction_helper(my_context, my_alloc_small_fct_##A, "piL", cinfo, pool_id, sizeofobject);\ + RunFunction_helper(my_alloc_small_fct_##A, "piL", cinfo, pool_id, sizeofobject);\ return (void*)ret; \ } SUPER() @@ -565,7 +565,7 @@ static void* reverse_alloc_smallFct(void* fct) static uintptr_t my_alloc_large_fct_##A = 0; \ static void* my_alloc_large_##A(void* cinfo, int pool_id, size_t sizeofobject) \ { \ - RunFunction_helper(my_context, my_alloc_large_fct_##A, "piL", cinfo, pool_id, sizeofobject);\ + RunFunction_helper(my_alloc_large_fct_##A, "piL", cinfo, pool_id, sizeofobject);\ return (void*)ret; \ } SUPER() @@ -599,7 +599,7 @@ static void* reverse_alloc_largeFct(void* fct) static uintptr_t my_alloc_sarray_fct_##A = 0; \ static void* my_alloc_sarray_##A(void* cinfo, int pool_id, uint32_t samplesperrow, uint32_t numrows) \ { \ - RunFunction_helper(my_context, my_alloc_sarray_fct_##A, "piuu", cinfo, pool_id, samplesperrow, numrows);\ + RunFunction_helper(my_alloc_sarray_fct_##A, "piuu", cinfo, pool_id, samplesperrow, numrows);\ return (void*)ret; \ } SUPER() @@ -633,7 +633,7 @@ static void* reverse_alloc_sarrayFct(void* fct) static uintptr_t my_alloc_barray_fct_##A = 0; \ static void* my_alloc_barray_##A(void* cinfo, int pool_id, uint32_t samplesperrow, uint32_t numrows) \ { \ - RunFunction_helper(my_context, my_alloc_barray_fct_##A, "piuu", cinfo, pool_id, samplesperrow, numrows);\ + RunFunction_helper(my_alloc_barray_fct_##A, "piuu", cinfo, pool_id, samplesperrow, numrows);\ return (void*)ret; \ } SUPER() @@ -667,7 +667,7 @@ static void* reverse_alloc_barrayFct(void* fct) static uintptr_t my_request_virt_sarray_fct_##A = 0; \ static void* my_request_virt_sarray_##A(void* cinfo, int pool_id, int pre_zero, uint32_t samplesperrow,uint32_t numrows, uint32_t maxaccess) \ { \ - RunFunction_helper(my_context, my_request_virt_sarray_fct_##A, "piiuuu", cinfo, pool_id, pre_zero, samplesperrow, numrows, maxaccess);\ + RunFunction_helper(my_request_virt_sarray_fct_##A, "piiuuu", cinfo, pool_id, pre_zero, samplesperrow, numrows, maxaccess);\ return (void*)ret; \ } SUPER() @@ -701,7 +701,7 @@ static void* reverse_request_virt_sarrayFct(void* fct) static uintptr_t my_request_virt_barray_fct_##A = 0; \ static void* my_request_virt_barray_##A(void* cinfo, int pool_id, int pre_zero, uint32_t samplesperrow,uint32_t numrows, uint32_t maxaccess) \ { \ - RunFunction_helper(my_context, my_request_virt_barray_fct_##A, "piiuuu", cinfo, pool_id, pre_zero, samplesperrow, numrows, maxaccess);\ + RunFunction_helper(my_request_virt_barray_fct_##A, "piiuuu", cinfo, pool_id, pre_zero, samplesperrow, numrows, maxaccess);\ return (void*)ret; \ } SUPER() @@ -735,7 +735,7 @@ static void* reverse_request_virt_barrayFct(void* fct) static uintptr_t my_realize_virt_arrays_fct_##A = 0; \ static void my_realize_virt_arrays_##A(void* cinfo) \ { \ - RunFunction_helper(my_context, my_realize_virt_arrays_fct_##A, "p", cinfo);\ + RunFunction_helper(my_realize_virt_arrays_fct_##A, "p", cinfo);\ } SUPER() #undef GO @@ -768,7 +768,7 @@ static void* reverse_realize_virt_arraysFct(void* fct) static uintptr_t my_access_virt_sarray_fct_##A = 0; \ static void* my_access_virt_sarray_##A(void* cinfo, void* ptr, uint32_t start_row, uint32_t num_rows, int writable) \ { \ - RunFunction_helper(my_context, my_access_virt_sarray_fct_##A, "ppuui", cinfo, ptr, start_row, num_rows, writable);\ + RunFunction_helper(my_access_virt_sarray_fct_##A, "ppuui", cinfo, ptr, start_row, num_rows, writable);\ return (void*)ret; \ } SUPER() @@ -802,7 +802,7 @@ static void* reverse_access_virt_sarrayFct(void* fct) static uintptr_t my_access_virt_barray_fct_##A = 0; \ static void* my_access_virt_barray_##A(void* cinfo, void* ptr, uint32_t start_row, uint32_t num_rows, int writable) \ { \ - RunFunction_helper(my_context, my_access_virt_barray_fct_##A, "ppuui", cinfo, ptr, start_row, num_rows, writable);\ + RunFunction_helper(my_access_virt_barray_fct_##A, "ppuui", cinfo, ptr, start_row, num_rows, writable);\ return (void*)ret; \ } SUPER() @@ -836,7 +836,7 @@ static void* reverse_access_virt_barrayFct(void* fct) static uintptr_t my_free_pool_fct_##A = 0; \ static void my_free_pool_##A(void* cinfo, int pool_id) \ { \ - RunFunction_helper(my_context, my_free_pool_fct_##A, "pi", cinfo, pool_id);\ + RunFunction_helper(my_free_pool_fct_##A, "pi", cinfo, pool_id);\ } SUPER() #undef GO @@ -869,7 +869,7 @@ static void* reverse_free_poolFct(void* fct) static uintptr_t my_self_destruct_fct_##A = 0; \ static void my_self_destruct_##A(void* cinfo) \ { \ - RunFunction_helper(my_context, my_self_destruct_fct_##A, "p", cinfo);\ + RunFunction_helper(my_self_destruct_fct_##A, "p", cinfo);\ } SUPER() #undef GO @@ -902,7 +902,7 @@ static void* reverse_self_destructFct(void* fct) static uintptr_t my_init_source_fct_##A = 0; \ static void my_init_source_##A(void* cinfo) \ { \ - RunFunction_helper(my_context, my_init_source_fct_##A, "p", cinfo);\ + RunFunction_helper(my_init_source_fct_##A, "p", cinfo);\ } SUPER() #undef GO @@ -935,7 +935,7 @@ static void* reverse_init_sourceFct(void* fct) static uintptr_t my_fill_input_buffer_fct_##A = 0; \ static int my_fill_input_buffer_##A(void* cinfo) \ { \ - RunFunction_helper(my_context, my_fill_input_buffer_fct_##A, "p", cinfo);\ + RunFunction_helper(my_fill_input_buffer_fct_##A, "p", cinfo);\ return (int)ret; \ } SUPER() @@ -969,7 +969,7 @@ static void* reverse_fill_input_bufferFct(void* fct) static uintptr_t my_skip_input_data_fct_##A = 0; \ static void my_skip_input_data_##A(void* cinfo, long num_bytes) \ { \ - RunFunction_helper(my_context, my_skip_input_data_fct_##A, "pl", cinfo, num_bytes);\ + RunFunction_helper(my_skip_input_data_fct_##A, "pl", cinfo, num_bytes);\ } SUPER() #undef GO @@ -1002,7 +1002,7 @@ static void* reverse_skip_input_dataFct(void* fct) static uintptr_t my_resync_to_restart_fct_##A = 0; \ static int my_resync_to_restart_##A(void* cinfo, int desired) \ { \ - RunFunction_helper(my_context, my_resync_to_restart_fct_##A, "pi", cinfo, desired);\ + RunFunction_helper(my_resync_to_restart_fct_##A, "pi", cinfo, desired);\ return (int)ret; \ } SUPER() @@ -1036,7 +1036,7 @@ static void* reverse_resync_to_restartFct(void* fct) static uintptr_t my_term_source_fct_##A = 0; \ static void my_term_source_##A(void* cinfo) \ { \ - RunFunction_helper(my_context, my_term_source_fct_##A, "p", cinfo);\ + RunFunction_helper(my_term_source_fct_##A, "p", cinfo);\ } SUPER() #undef GO @@ -1071,7 +1071,7 @@ static void my_init_destination_##A(j62_compress_ptr_t* cinfo) \ { \ i386_compress_ptr_t* tmp = ((jmpbuf_helper*)cinfo->client_data)->compress; \ wrapCompressStruct(tmp, cinfo); \ - RunFunction_helper2(my_context, my_init_destination_fct_##A, "p", tmp); \ + RunFunction_helper2(my_init_destination_fct_##A, "p", tmp); \ unwrapCompressStruct(cinfo, tmp); \ tmp->client_data = ((jmpbuf_helper*)cinfo->client_data)->client_data; \ } @@ -1107,7 +1107,7 @@ static void my_empty_output_buffer_##A(j62_compress_ptr_t* cinfo) { \ i386_compress_ptr_t* tmp = ((jmpbuf_helper*)cinfo->client_data)->compress; \ wrapCompressStruct(tmp, cinfo); \ - RunFunction_helper2(my_context, my_empty_output_buffer_fct_##A, "p", tmp); \ + RunFunction_helper2(my_empty_output_buffer_fct_##A, "p", tmp); \ unwrapCompressStruct(cinfo, tmp); \ tmp->client_data = ((jmpbuf_helper*)cinfo->client_data)->client_data; \ } @@ -1143,7 +1143,7 @@ static void my_term_destination_##A(j62_compress_ptr_t* cinfo) \ { \ i386_compress_ptr_t* tmp = ((jmpbuf_helper*)cinfo->client_data)->compress; \ wrapCompressStruct(tmp, cinfo); \ - RunFunction_helper2(my_context, my_term_destination_fct_##A, "p", tmp); \ + RunFunction_helper2(my_term_destination_fct_##A, "p", tmp); \ unwrapCompressStruct(cinfo, tmp); \ tmp->client_data = ((jmpbuf_helper*)cinfo->client_data)->client_data; \ } @@ -1180,7 +1180,7 @@ static void my_prepare_for_pass_##A(j62_compress_ptr_t* cinfo) \ { \ i386_compress_ptr_t* tmp = ((jmpbuf_helper*)cinfo->client_data)->compress; \ wrapCompressStruct(tmp, cinfo); \ - RunFunction_helper2(my_context, my_prepare_for_pass_fct_##A, "p", tmp); \ + RunFunction_helper2(my_prepare_for_pass_fct_##A, "p", tmp); \ unwrapCompressStruct(cinfo, tmp); \ tmp->client_data = ((jmpbuf_helper*)cinfo->client_data)->client_data; \ } @@ -1217,7 +1217,7 @@ static void my_pass_startup_##A(j62_compress_ptr_t* cinfo) \ { \ i386_compress_ptr_t* tmp = ((jmpbuf_helper*)cinfo->client_data)->compress; \ wrapCompressStruct(tmp, cinfo); \ - RunFunction_helper2(my_context, my_pass_startup_fct_##A, "p", tmp); \ + RunFunction_helper2(my_pass_startup_fct_##A, "p", tmp); \ unwrapCompressStruct(cinfo, tmp); \ tmp->client_data = ((jmpbuf_helper*)cinfo->client_data)->client_data; \ } @@ -1254,7 +1254,7 @@ static void my_finish_pass_##A(j62_compress_ptr_t* cinfo) \ { \ i386_compress_ptr_t* tmp = ((jmpbuf_helper*)cinfo->client_data)->compress; \ wrapCompressStruct(tmp, cinfo); \ - RunFunction_helper2(my_context, my_finish_pass_fct_##A, "p", tmp); \ + RunFunction_helper2(my_finish_pass_fct_##A, "p", tmp); \ unwrapCompressStruct(cinfo, tmp); \ tmp->client_data = ((jmpbuf_helper*)cinfo->client_data)->client_data; \ } diff --git a/src/wrapped/wrappedlibnm.c b/src/wrapped/wrappedlibnm.c index 2a03c085..26ed8943 100755 --- a/src/wrapped/wrappedlibnm.c +++ b/src/wrapped/wrappedlibnm.c @@ -35,7 +35,7 @@ GO(4) static uintptr_t my_GAsyncReadyCallback_fct_##A = 0; \ static void my_GAsyncReadyCallback_##A(void* a, void* b, void* c) \ { \ - RunFunctionFmt(my_context, my_GAsyncReadyCallback_fct_##A, "ppp", a, b, c); \ + RunFunctionFmt(my_GAsyncReadyCallback_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibrt.c b/src/wrapped/wrappedlibrt.c index 086abbdf..b371d157 100755 --- a/src/wrapped/wrappedlibrt.c +++ b/src/wrapped/wrappedlibrt.c @@ -40,7 +40,7 @@ GO(3) static uintptr_t my_sigev_notify_fct_##A = 0; \ static void my_sigev_notify_##A(void* sigval) \ { \ - RunFunctionFmt(my_context, my_sigev_notify_fct_##A, "pp", sigval); \ + RunFunctionFmt(my_sigev_notify_fct_##A, "pp", sigval); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibsm.c b/src/wrapped/wrappedlibsm.c index fca50212..d36ddce6 100755 --- a/src/wrapped/wrappedlibsm.c +++ b/src/wrapped/wrappedlibsm.c @@ -56,25 +56,25 @@ typedef struct my_SmcCallbacks_s { static uintptr_t my_save_yourself_fct = 0; static void my_save_yourself(void* smcConn, void* clientData, int saveType, int shutdown, int interactStyle, int fast) { - RunFunctionFmt(my_context, my_save_yourself_fct, "ppiiii", smcConn, clientData, saveType, shutdown, interactStyle, fast); + RunFunctionFmt(my_save_yourself_fct, "ppiiii", smcConn, clientData, saveType, shutdown, interactStyle, fast); } static uintptr_t my_die_fct = 0; static void my_die(void* smcConn, void* clientData) { - RunFunctionFmt(my_context, my_die_fct, "pp", smcConn, clientData); + RunFunctionFmt(my_die_fct, "pp", smcConn, clientData); } static uintptr_t my_shutdown_cancelled_fct = 0; static void my_shutdown_cancelled(void* smcConn, void* clientData) { - RunFunctionFmt(my_context, my_shutdown_cancelled_fct, "pp", smcConn, clientData); + RunFunctionFmt(my_shutdown_cancelled_fct, "pp", smcConn, clientData); } static uintptr_t my_save_complete_fct = 0; static void my_save_complete(void* smcConn, void* clientData) { - RunFunctionFmt(my_context, my_save_complete_fct, "pp", smcConn, clientData); + RunFunctionFmt(my_save_complete_fct, "pp", smcConn, clientData); } @@ -104,7 +104,7 @@ GO(4) static uintptr_t my_Request_fct_##A = 0; \ static void my_Request_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_Request_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_Request_fct_##A, "pp", a, b); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibsndfile.c b/src/wrapped/wrappedlibsndfile.c index f4c50492..ba86e174 100755 --- a/src/wrapped/wrappedlibsndfile.c +++ b/src/wrapped/wrappedlibsndfile.c @@ -38,7 +38,7 @@ GO(4) static uintptr_t my_sf_vio_get_filelen_fct_##A = 0; \ static int64_t my_sf_vio_get_filelen_##A(void* a) \ { \ - return (int64_t)RunFunctionFmt64(my_context, my_sf_vio_get_filelen_fct_##A, "p", a);\ + return (int64_t)RunFunctionFmt64(my_sf_vio_get_filelen_fct_##A, "p", a);\ } SUPER() #undef GO @@ -60,7 +60,7 @@ static void* find_sf_vio_get_filelen_Fct(void* fct) static uintptr_t my_sf_vio_seek_fct_##A = 0; \ static int64_t my_sf_vio_seek_##A(int64_t offset, int whence, void *user_data) \ { \ - return (int64_t)RunFunctionFmt64(my_context, my_sf_vio_seek_fct_##A, "Iip", offset, whence, user_data); \ + return (int64_t)RunFunctionFmt64(my_sf_vio_seek_fct_##A, "Iip", offset, whence, user_data); \ } SUPER() #undef GO @@ -82,7 +82,7 @@ static void* find_sf_vio_seek_Fct(void* fct) static uintptr_t my_sf_vio_read_fct_##A = 0; \ static int64_t my_sf_vio_read_##A(void* ptr, int64_t count, void *user_data) \ { \ - return (int64_t)RunFunctionFmt64(my_context, my_sf_vio_read_fct_##A, "pIp", ptr, count, user_data); \ + return (int64_t)RunFunctionFmt64(my_sf_vio_read_fct_##A, "pIp", ptr, count, user_data); \ } SUPER() #undef GO @@ -104,7 +104,7 @@ static void* find_sf_vio_read_Fct(void* fct) static uintptr_t my_sf_vio_write_fct_##A = 0; \ static int64_t my_sf_vio_write_##A(const void* ptr, int64_t count, void *user_data) \ { \ - return (int64_t)RunFunctionFmt64(my_context, my_sf_vio_write_fct_##A, "pIp", ptr, count, user_data);\ + return (int64_t)RunFunctionFmt64(my_sf_vio_write_fct_##A, "pIp", ptr, count, user_data);\ } SUPER() #undef GO @@ -126,7 +126,7 @@ static void* find_sf_vio_write_Fct(void* fct) static uintptr_t my_sf_vio_tell_fct_##A = 0; \ static int64_t my_sf_vio_tell_##A(void* a) \ { \ - return (int64_t)RunFunctionFmt64(my_context, my_sf_vio_tell_fct_##A, "p", a); \ + return (int64_t)RunFunctionFmt64(my_sf_vio_tell_fct_##A, "p", a); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibssl.c b/src/wrapped/wrappedlibssl.c index cda67ebf..9f0f336a 100755 --- a/src/wrapped/wrappedlibssl.c +++ b/src/wrapped/wrappedlibssl.c @@ -41,7 +41,7 @@ GO(4) static uintptr_t my_pem_passwd_cb_fct_##A = 0; \ static int my_pem_passwd_cb_##A(void* buf, int size, int rwflag, void* password) \ { \ - return (int)RunFunctionFmt(my_context, my_pem_passwd_cb_fct_##A, "piip", buf, size, rwflag, password); \ + return (int)RunFunctionFmt(my_pem_passwd_cb_fct_##A, "piip", buf, size, rwflag, password); \ } SUPER() #undef GO @@ -65,7 +65,7 @@ static void* find_pem_passwd_cb_Fct(void* fct) static uintptr_t my_anonymous_fct_##A = 0; \ static void* my_anonymous_##A(void* a, void* b, void* c, void *d) \ { \ - return (void*)RunFunctionFmt(my_context, my_anonymous_fct_##A, "pppp", a, b, c, d); \ + return (void*)RunFunctionFmt(my_anonymous_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -90,7 +90,7 @@ static void* find_anonymous_Fct(void* fct) static uintptr_t my_verify_fct_##A = 0; \ static int my_verify_##A(int a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_verify_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_verify_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -114,7 +114,7 @@ static void* find_verify_Fct(void* fct) static uintptr_t my_ex_new_fct_##A = 0; \ static void my_ex_new_##A(void* parent, void* ptr, void* ad, int idx, long argl, void* argp) \ { \ - RunFunctionFmt(my_context, my_ex_new_fct_##A, "pppilp", parent, ptr, ad, idx, argl, argp); \ + RunFunctionFmt(my_ex_new_fct_##A, "pppilp", parent, ptr, ad, idx, argl, argp); \ } SUPER() #undef GO @@ -138,7 +138,7 @@ static void* find_ex_new_Fct(void* fct) static uintptr_t my_ex_free_fct_##A = 0; \ static void my_ex_free_##A(void* parent, void* ptr, void* ad, int idx, long argl, void* argp) \ { \ - RunFunctionFmt(my_context, my_ex_free_fct_##A, "ppilp", parent, ptr, ad, idx, argl, argp); \ + RunFunctionFmt(my_ex_free_fct_##A, "ppilp", parent, ptr, ad, idx, argl, argp); \ } SUPER() #undef GO @@ -162,7 +162,7 @@ static void* find_ex_free_Fct(void* fct) static uintptr_t my_ex_dup_fct_##A = 0; \ static int my_ex_dup_##A(void* to, void* from, void* from_d, int idx, long argl, void* argp) \ { \ - return (int) RunFunctionFmt(my_context, my_ex_dup_fct_##A, "pppilp", to, from, from_d, idx, argl, argp);\ + return (int) RunFunctionFmt(my_ex_dup_fct_##A, "pppilp", to, from, from_d, idx, argl, argp);\ } SUPER() #undef GO @@ -186,7 +186,7 @@ static void* find_ex_dup_Fct(void* fct) static uintptr_t my_client_cb_fct_##A = 0; \ static uint32_t my_client_cb_##A(void* ssl, void* hint, void* identity, uint32_t id_len, void* psk, uint32_t psk_len) \ { \ - return RunFunctionFmt(my_context, my_client_cb_fct_##A, "pppupu", ssl, hint, identity, id_len, psk, psk_len); \ + return RunFunctionFmt(my_client_cb_fct_##A, "pppupu", ssl, hint, identity, id_len, psk, psk_len); \ } SUPER() #undef GO @@ -210,7 +210,7 @@ static void* find_client_cb_Fct(void* fct) static uintptr_t my_proto_select_fct_##A = 0; \ static int my_proto_select_##A(void* s, void* out, void* outlen, void* in, uint32_t inlen, void* arg) \ { \ - return (int)RunFunctionFmt(my_context, my_proto_select_fct_##A, "ppppup", s, out, outlen, in, inlen, arg); \ + return (int)RunFunctionFmt(my_proto_select_fct_##A, "ppppup", s, out, outlen, in, inlen, arg); \ } SUPER() #undef GO @@ -233,7 +233,7 @@ static void* find_proto_select_Fct(void* fct) static uintptr_t my_new_session_cb_fct_##A = 0; \ static int my_new_session_cb_##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_new_session_cb_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_new_session_cb_fct_##A, "pp", a, b); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibtiff.c b/src/wrapped/wrappedlibtiff.c index f3724b00..45382048 100755 --- a/src/wrapped/wrappedlibtiff.c +++ b/src/wrapped/wrappedlibtiff.c @@ -45,7 +45,7 @@ GO(3) \ static uintptr_t my_TIFFReadWriteProc_fct_##A = 0; \ static int my_TIFFReadWriteProc_##A(void* a, void* b, int c) \ { \ - return (int)RunFunctionFmt(my_context, my_TIFFReadWriteProc_fct_##A, "ppi", a, b, c); \ + return (int)RunFunctionFmt(my_TIFFReadWriteProc_fct_##A, "ppi", a, b, c); \ } SUPER() #undef GO @@ -67,7 +67,7 @@ static void* find_TIFFReadWriteProc_Fct(void* fct) static uintptr_t my_TIFFSeekProc_fct_##A = 0; \ static int64_t my_TIFFSeekProc_##A(void* a, int64_t b, int c) \ { \ - return (int64_t)RunFunctionFmt64(my_context, my_TIFFSeekProc_fct_##A, "pIi", a, b, c); \ + return (int64_t)RunFunctionFmt64(my_TIFFSeekProc_fct_##A, "pIi", a, b, c); \ } SUPER() #undef GO @@ -89,7 +89,7 @@ static void* find_TIFFSeekProc_Fct(void* fct) static uintptr_t my_TIFFCloseProc_fct_##A = 0; \ static int my_TIFFCloseProc_##A(void* a) \ { \ - return (int)RunFunctionFmt(my_context, my_TIFFCloseProc_fct_##A, "p", a); \ + return (int)RunFunctionFmt(my_TIFFCloseProc_fct_##A, "p", a); \ } SUPER() #undef GO @@ -111,7 +111,7 @@ static void* find_TIFFCloseProc_Fct(void* fct) static uintptr_t my_TIFFSizeProc_fct_##A = 0; \ static int64_t my_TIFFSizeProc_##A(void* a) \ { \ - return (int64_t)RunFunctionFmt64(my_context, my_TIFFSizeProc_fct_##A, "p", a); \ + return (int64_t)RunFunctionFmt64(my_TIFFSizeProc_fct_##A, "p", a); \ } SUPER() #undef GO @@ -133,7 +133,7 @@ static void* find_TIFFSizeProc_Fct(void* fct) static uintptr_t my_TIFFMapFileProc_fct_##A = 0; \ static int my_TIFFMapFileProc_##A(void* a, void* b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my_TIFFMapFileProc_fct_##A, "ppp", a, b, c); \ + return (int)RunFunctionFmt(my_TIFFMapFileProc_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -155,7 +155,7 @@ static void* find_TIFFMapFileProc_Fct(void* fct) static uintptr_t my_TIFFUnmapFileProc_fct_##A = 0; \ static void my_TIFFUnmapFileProc_##A(void* a, void* b, int64_t c) \ { \ - RunFunctionFmt(my_context, my_TIFFUnmapFileProc_fct_##A, "ppI", a, b, c); \ + RunFunctionFmt(my_TIFFUnmapFileProc_fct_##A, "ppI", a, b, c); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibtinfo.c b/src/wrapped/wrappedlibtinfo.c index dfc16c96..f258d5fc 100755 --- a/src/wrapped/wrappedlibtinfo.c +++ b/src/wrapped/wrappedlibtinfo.c @@ -40,7 +40,7 @@ GO(4) static uintptr_t my_putc_fct_##A = 0; \ static int my_putc_##A(char c) \ { \ - return (int)RunFunctionFmt(my_context, my_putc_fct_##A, "c", c);\ + return (int)RunFunctionFmt(my_putc_fct_##A, "c", c);\ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibtinfo6.c b/src/wrapped/wrappedlibtinfo6.c index 12c794c8..2432144c 100755 --- a/src/wrapped/wrappedlibtinfo6.c +++ b/src/wrapped/wrappedlibtinfo6.c @@ -40,7 +40,7 @@ GO(4) static uintptr_t my_putc_fct_##A = 0; \ static int my_putc_##A(char c) \ { \ - return (int)RunFunctionFmt(my_context, my_putc_fct_##A, "c", c);\ + return (int)RunFunctionFmt(my_putc_fct_##A, "c", c);\ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibusb1.c b/src/wrapped/wrappedlibusb1.c index 9a6dc073..17e62ee4 100755 --- a/src/wrapped/wrappedlibusb1.c +++ b/src/wrapped/wrappedlibusb1.c @@ -45,7 +45,7 @@ GO(9) \ static uintptr_t my_hotplug_fct_##A = 0; \ static int my_hotplug_##A(void* ctx, void* device, int event, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_hotplug_fct_##A, "ppip", ctx, device, event, data); \ + return (int)RunFunctionFmt(my_hotplug_fct_##A, "ppip", ctx, device, event, data); \ } SUPER() #undef GO @@ -67,7 +67,7 @@ static void* findhotplugFct(void* fct) static uintptr_t my_transfert_fct_##A = 0; \ static void my_transfert_##A(void* ctx) \ { \ - RunFunctionFmt(my_context, my_transfert_fct_##A, "p", ctx); \ + RunFunctionFmt(my_transfert_fct_##A, "p", ctx); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibvkd3d.c b/src/wrapped/wrappedlibvkd3d.c index ea3f05f0..8184683a 100644 --- a/src/wrapped/wrappedlibvkd3d.c +++ b/src/wrapped/wrappedlibvkd3d.c @@ -43,17 +43,17 @@ typedef struct vkd3d_instance_create_info static uintptr_t origin_signal_event = 0; static int my_signal_event(void *event) { - return (int)RunFunctionFmt(my_context, origin_signal_event, "p", event); + return (int)RunFunctionFmt(origin_signal_event, "p", event); } static uintptr_t origin_create_thread = 0; static void* my_create_thread(PFN_vkd3d_thread thread_main, void *data) { - return (void*)RunFunctionFmt(my_context, origin_create_thread, "pp", thread_main, data); + return (void*)RunFunctionFmt(origin_create_thread, "pp", thread_main, data); } static uintptr_t origin_join_thread = 0; static int my_join_thread(void *thread) { - return (int)RunFunctionFmt(my_context, origin_join_thread, "p", thread); + return (int)RunFunctionFmt(origin_join_thread, "p", thread); } EXPORT int my_vkd3d_create_instance(x86emu_t* emu, void *create_info, void *instance) { diff --git a/src/wrapped/wrappedlibx11.c b/src/wrapped/wrappedlibx11.c index 38c9e624..8a86391a 100755 --- a/src/wrapped/wrappedlibx11.c +++ b/src/wrapped/wrappedlibx11.c @@ -114,7 +114,7 @@ GO(15) static uintptr_t my_wire_to_event_fct_##A = 0; \ static int my_wire_to_event_##A(void* dpy, void* re, void* event) \ { \ - return (int)RunFunctionFmt(my_context, my_wire_to_event_fct_##A, "ppp", dpy, re, event);\ + return (int)RunFunctionFmt(my_wire_to_event_fct_##A, "ppp", dpy, re, event);\ } SUPER() #undef GO @@ -147,7 +147,7 @@ static void* reverse_wire_to_eventFct(library_t* lib, void* fct) static uintptr_t my_event_to_wire_fct_##A = 0; \ static int my_event_to_wire_##A(void* dpy, void* re, void* event) \ { \ - return (int)RunFunctionFmt(my_context, my_event_to_wire_fct_##A, "ppp", dpy, re, event);\ + return (int)RunFunctionFmt(my_event_to_wire_fct_##A, "ppp", dpy, re, event);\ } SUPER() #undef GO @@ -180,7 +180,7 @@ static void* reverse_event_to_wireFct(library_t* lib, void* fct) static uintptr_t my_error_handler_fct_##A = 0; \ static int my_error_handler_##A(void* dpy, void* error) \ { \ - return (int)RunFunctionFmt(my_context, my_error_handler_fct_##A, "pp", dpy, error); \ + return (int)RunFunctionFmt(my_error_handler_fct_##A, "pp", dpy, error); \ } SUPER() #undef GO @@ -213,7 +213,7 @@ static void* reverse_error_handlerFct(library_t* lib, void* fct) static uintptr_t my_ioerror_handler_fct_##A = 0; \ static int my_ioerror_handler_##A(void* dpy) \ { \ - return (int)RunFunctionFmt(my_context, my_ioerror_handler_fct_##A, "p", dpy); \ + return (int)RunFunctionFmt(my_ioerror_handler_fct_##A, "p", dpy); \ } SUPER() #undef GO @@ -246,7 +246,7 @@ static void* reverse_ioerror_handlerFct(library_t* lib, void* fct) static uintptr_t my_exterror_handler_fct_##A = 0; \ static int my_exterror_handler_##A(void* dpy, void* err, void* codes, int* ret_code) \ { \ - return (int)RunFunctionFmt(my_context, my_exterror_handler_fct_##A, "pppp", dpy, err, codes, ret_code); \ + return (int)RunFunctionFmt(my_exterror_handler_fct_##A, "pppp", dpy, err, codes, ret_code); \ } SUPER() #undef GO @@ -279,7 +279,7 @@ static void* reverse_exterror_handlerFct(library_t* lib, void* fct) static uintptr_t my_close_display_fct_##A = 0; \ static int my_close_display_##A(void* dpy, void* codes) \ { \ - return (int)RunFunctionFmt(my_context, my_close_display_fct_##A, "pp", dpy, codes); \ + return (int)RunFunctionFmt(my_close_display_fct_##A, "pp", dpy, codes); \ } SUPER() #undef GO @@ -312,7 +312,7 @@ static void* reverse_close_displayFct(library_t* lib, void* fct) static uintptr_t my_register_im_fct_##A = 0; \ static void my_register_im_##A(void* dpy, void* u, void* d) \ { \ - RunFunctionFmt(my_context, my_register_im_fct_##A, "ppp", dpy, u, d); \ + RunFunctionFmt(my_register_im_fct_##A, "ppp", dpy, u, d); \ } SUPER() #undef GO @@ -345,7 +345,7 @@ static void* reverse_register_imFct(library_t* lib, void* fct) static uintptr_t my_XConnectionWatchProc_fct_##A = 0; \ static void my_XConnectionWatchProc_##A(void* dpy, void* data, int op, void* d) \ { \ - RunFunctionFmt(my_context, my_XConnectionWatchProc_fct_##A, "ppip", dpy, data, op, d); \ + RunFunctionFmt(my_XConnectionWatchProc_fct_##A, "ppip", dpy, data, op, d); \ } SUPER() #undef GO @@ -367,7 +367,7 @@ static void* findXConnectionWatchProcFct(void* fct) static uintptr_t my_xifevent_fct_##A = 0; \ static int my_xifevent_##A(void* dpy, void* event, void* d) \ { \ - return RunFunctionFmt(my_context, my_xifevent_fct_##A, "ppp", dpy, event, d); \ + return RunFunctionFmt(my_xifevent_fct_##A, "ppp", dpy, event, d); \ } SUPER() #undef GO @@ -389,7 +389,7 @@ static void* findxifeventFct(void* fct) static uintptr_t my_XInternalAsyncHandler_fct_##A = 0; \ static int my_XInternalAsyncHandler_##A(void* dpy, void* rep, void* buf, int len, void* data) \ { \ - return RunFunctionFmt(my_context, my_XInternalAsyncHandler_fct_##A, "pppip", dpy, rep, buf, len, data); \ + return RunFunctionFmt(my_XInternalAsyncHandler_fct_##A, "pppip", dpy, rep, buf, len, data); \ } SUPER() #undef GO @@ -412,7 +412,7 @@ static void* findXInternalAsyncHandlerFct(void* fct) static uintptr_t my_XSynchronizeProc_fct_##A = 0; \ static int my_XSynchronizeProc_##A() \ { \ - return (int)RunFunctionFmt(my_context, my_XSynchronizeProc_fct_##A, "");\ + return (int)RunFunctionFmt(my_XSynchronizeProc_fct_##A, "");\ } SUPER() #undef GO @@ -510,14 +510,14 @@ static int my_XICProc_##A(void* a, void* b, void* c) { \ if (my_XICProc_fct_##A == 0) \ printf_log(LOG_NONE, "%s cannot find XICProc callback\n", __func__); \ - return (int)RunFunctionFmt(my_context, my_XICProc_fct_##A, "ppp", a, b, c); \ + return (int)RunFunctionFmt(my_XICProc_fct_##A, "ppp", a, b, c); \ } \ static uintptr_t my_XIMProc_fct_##A = 0; \ static void my_XIMProc_##A(void* a, void* b, void* c) \ { \ if (my_XIMProc_fct_##A == 0) \ printf_log(LOG_NONE, "%s cannot find XIMProc callback\n", __func__); \ - RunFunctionFmt(my_context, my_XIMProc_fct_##A, "ppp", a, b, c); \ + RunFunctionFmt(my_XIMProc_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibxcb.c b/src/wrapped/wrappedlibxcb.c index 13f78ac7..46ab2092 100755 --- a/src/wrapped/wrappedlibxcb.c +++ b/src/wrapped/wrappedlibxcb.c @@ -183,7 +183,7 @@ GO(3) \ static uintptr_t my_return_socket_fct_##A = 0; \ static void my_return_socket_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_return_socket_fct_##A, "p", a); \ + RunFunctionFmt(my_return_socket_fct_##A, "p", a); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibxext.c b/src/wrapped/wrappedlibxext.c index 9fa5e921..6e3f8938 100755 --- a/src/wrapped/wrappedlibxext.c +++ b/src/wrapped/wrappedlibxext.c @@ -57,7 +57,7 @@ GO(4) static uintptr_t my_exterrorhandle_fct_##A = 0; \ static int my_exterrorhandle_##A(void* display, void* ext_name, void* reason) \ { \ - return RunFunctionFmt(my_context, my_exterrorhandle_fct_##A, "ppp", display, ext_name, reason); \ + return RunFunctionFmt(my_exterrorhandle_fct_##A, "ppp", display, ext_name, reason); \ } SUPER() #undef GO @@ -89,7 +89,7 @@ static void* reverse_exterrorhandleFct(void* fct) static uintptr_t my_create_gc_fct_##A = 0; \ static int my_create_gc_##A(void* a, uint32_t b, void* c) \ { \ - return RunFunctionFmt(my_context, my_create_gc_fct_##A, "pup", a, b, c); \ + return RunFunctionFmt(my_create_gc_fct_##A, "pup", a, b, c); \ } SUPER() #undef GO @@ -111,7 +111,7 @@ static void* find_create_gc_Fct(void* fct) static uintptr_t my_copy_gc_fct_##A = 0; \ static int my_copy_gc_##A(void* a, uint32_t b, void* c) \ { \ - return RunFunctionFmt(my_context, my_copy_gc_fct_##A, "pup", a, b, c); \ + return RunFunctionFmt(my_copy_gc_fct_##A, "pup", a, b, c); \ } SUPER() #undef GO @@ -133,7 +133,7 @@ static void* find_copy_gc_Fct(void* fct) static uintptr_t my_flush_gc_fct_##A = 0; \ static int my_flush_gc_##A(void* a, uint32_t b, void* c) \ { \ - return RunFunctionFmt(my_context, my_flush_gc_fct_##A, "pup", a, b, c); \ + return RunFunctionFmt(my_flush_gc_fct_##A, "pup", a, b, c); \ } SUPER() #undef GO @@ -155,7 +155,7 @@ static void* find_flush_gc_Fct(void* fct) static uintptr_t my_free_gc_fct_##A = 0; \ static int my_free_gc_##A(void* a, uint32_t b, void* c) \ { \ - return RunFunctionFmt(my_context, my_free_gc_fct_##A, "pup", a, b, c); \ + return RunFunctionFmt(my_free_gc_fct_##A, "pup", a, b, c); \ } SUPER() #undef GO @@ -177,7 +177,7 @@ static void* find_free_gc_Fct(void* fct) static uintptr_t my_create_font_fct_##A = 0; \ static int my_create_font_##A(void* a, void* b, void* c) \ { \ - return RunFunctionFmt(my_context, my_create_font_fct_##A, "ppp", a, b, c); \ + return RunFunctionFmt(my_create_font_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -199,7 +199,7 @@ static void* find_create_font_Fct(void* fct) static uintptr_t my_free_font_fct_##A = 0; \ static int my_free_font_##A(void* a, void* b, void* c) \ { \ - return RunFunctionFmt(my_context, my_free_font_fct_##A, "ppp", a, b, c); \ + return RunFunctionFmt(my_free_font_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -221,7 +221,7 @@ static void* find_free_font_Fct(void* fct) static uintptr_t my_close_display_fct_##A = 0; \ static int my_close_display_##A(void* a, void* b) \ { \ - return RunFunctionFmt(my_context, my_close_display_fct_##A, "pp", a, b);\ + return RunFunctionFmt(my_close_display_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -243,7 +243,7 @@ static void* find_close_display_Fct(void* fct) static uintptr_t my_wire_to_event_fct_##A = 0; \ static int my_wire_to_event_##A(void* a, void* b, void* c) \ { \ - return RunFunctionFmt(my_context, my_wire_to_event_fct_##A, "ppp", a, b, c); \ + return RunFunctionFmt(my_wire_to_event_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -265,7 +265,7 @@ static void* find_wire_to_event_Fct(void* fct) static uintptr_t my_event_to_wire_fct_##A = 0; \ static int my_event_to_wire_##A(void* a, void* b, void* c) \ { \ - return RunFunctionFmt(my_context, my_event_to_wire_fct_##A, "ppp", a, b, c); \ + return RunFunctionFmt(my_event_to_wire_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -287,7 +287,7 @@ static void* find_event_to_wire_Fct(void* fct) static uintptr_t my_error_fct_##A = 0; \ static int my_error_##A(void* a, void* b, void* c, int* d) \ { \ - return RunFunctionFmt(my_context, my_error_fct_##A, "pppp", a, b, c, d); \ + return RunFunctionFmt(my_error_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -309,7 +309,7 @@ static void* find_error_Fct(void* fct) static uintptr_t my_error_string_fct_##A = 0; \ static int my_error_string_##A(void* a, int b, void* c, void* d, int e) \ { \ - return RunFunctionFmt(my_context, my_error_string_fct_##A, "pippi", a, b, c, d, e); \ + return RunFunctionFmt(my_error_string_fct_##A, "pippi", a, b, c, d, e); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibxt.c b/src/wrapped/wrappedlibxt.c index b541bc74..7bd803df 100755 --- a/src/wrapped/wrappedlibxt.c +++ b/src/wrapped/wrappedlibxt.c @@ -40,7 +40,7 @@ GO(7) static uintptr_t my_Event_fct_##A = 0; \ static void my_Event_##A(void* w, void* data, void* event) \ { \ - RunFunctionFmt(my_context, my_Event_fct_##A, "ppp", w, data, event);\ + RunFunctionFmt(my_Event_fct_##A, "ppp", w, data, event);\ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibxtst.c b/src/wrapped/wrappedlibxtst.c index 34cbcbd5..5932d5db 100755 --- a/src/wrapped/wrappedlibxtst.c +++ b/src/wrapped/wrappedlibxtst.c @@ -38,7 +38,7 @@ GO(4) static uintptr_t my_XRecordInterceptProc_fct_##A = 0; \ static void my_XRecordInterceptProc_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_XRecordInterceptProc_fct_##A, "pp", a, b);\ + RunFunctionFmt(my_XRecordInterceptProc_fct_##A, "pp", a, b);\ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibz.c b/src/wrapped/wrappedlibz.c index 4ec46e82..f5cbcd10 100755 --- a/src/wrapped/wrappedlibz.c +++ b/src/wrapped/wrappedlibz.c @@ -34,7 +34,7 @@ GO(4) static uintptr_t my_alloc_fct_##A = 0; \ static void* my_alloc_##A(void* opaque, uint32_t items, uint32_t size) \ { \ - return (void*)RunFunctionFmt(my_context, my_alloc_fct_##A, "puu", opaque, items, size); \ + return (void*)RunFunctionFmt(my_alloc_fct_##A, "puu", opaque, items, size); \ } SUPER() #undef GO @@ -66,7 +66,7 @@ static void* reverse_alloc_Fct(void* fct) static uintptr_t my_free_fct_##A = 0; \ static void my_free_##A(void* opaque, void* address) \ { \ - RunFunctionFmt(my_context, my_free_fct_##A, "pp", opaque, address); \ + RunFunctionFmt(my_free_fct_##A, "pp", opaque, address); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedmpg123.c b/src/wrapped/wrappedmpg123.c index 4ed1ae55..329689f4 100755 --- a/src/wrapped/wrappedmpg123.c +++ b/src/wrapped/wrappedmpg123.c @@ -44,7 +44,7 @@ GO(4) static uintptr_t my_r_read_fct_##A = 0; \ static ssize_t my_r_read_##A(void* a, void* b, size_t n) \ { \ - return (ssize_t)RunFunctionFmt(my_context, my_r_read_fct_##A, "ppL", a, b, n); \ + return (ssize_t)RunFunctionFmt(my_r_read_fct_##A, "ppL", a, b, n); \ } SUPER() #undef GO @@ -66,7 +66,7 @@ static void* find_r_read_Fct(void* fct) static uintptr_t my_r_lseek_fct_##A = 0; \ static int64_t my_r_lseek_##A(void* a, int64_t b, int n) \ { \ - return (int64_t)RunFunctionFmt64(my_context, my_r_lseek_fct_##A, "pIi", a, b, n); \ + return (int64_t)RunFunctionFmt64(my_r_lseek_fct_##A, "pIi", a, b, n); \ } SUPER() #undef GO @@ -88,7 +88,7 @@ static void* find_r_lseek_Fct(void* fct) static uintptr_t my_cleanup_fct_##A = 0; \ static void my_cleanup_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_cleanup_fct_##A, "p", a); \ + RunFunctionFmt(my_cleanup_fct_##A, "p", a); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappednspr4.c b/src/wrapped/wrappednspr4.c index 1a0b0ccb..b9a4b7df 100755 --- a/src/wrapped/wrappednspr4.c +++ b/src/wrapped/wrappednspr4.c @@ -41,7 +41,7 @@ GO(4) static uintptr_t my_PRCallOnceWithArg_fct_##A = 0; \ static int my_PRCallOnceWithArg_##A(void* a) \ { \ - return (int)RunFunctionFmt(my_context, my_PRCallOnceWithArg_fct_##A, "p", a); \ + return (int)RunFunctionFmt(my_PRCallOnceWithArg_fct_##A, "p", a); \ } SUPER() #undef GO @@ -63,7 +63,7 @@ static void* find_PRCallOnceWithArg_Fct(void* fct) static uintptr_t my_PRCallOnce_fct_##A = 0; \ static int my_PRCallOnce_##A() \ { \ - return (int)RunFunctionFmt(my_context, my_PRCallOnce_fct_##A, ""); \ + return (int)RunFunctionFmt(my_PRCallOnce_fct_##A, ""); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappednss3.c b/src/wrapped/wrappednss3.c index d4de888d..6f485b5a 100755 --- a/src/wrapped/wrappednss3.c +++ b/src/wrapped/wrappednss3.c @@ -37,7 +37,7 @@ GO(4) static uintptr_t my_PK11PasswordFunc_fct_##A = 0; \ static void* my_PK11PasswordFunc_##A(void* a, int b, void* c) \ { \ - return (void*)RunFunctionFmt(my_context, my_PK11PasswordFunc_fct_##A, "pip", a, b, c); \ + return (void*)RunFunctionFmt(my_PK11PasswordFunc_fct_##A, "pip", a, b, c); \ } SUPER() #undef GO @@ -60,7 +60,7 @@ static void* find_PK11PasswordFunc_Fct(void* fct) static uintptr_t my_NSS_ShutdownFunc_fct_##A = 0; \ static int my_NSS_ShutdownFunc_##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_NSS_ShutdownFunc_fct_##A, "pp", a, b);\ + return (int)RunFunctionFmt(my_NSS_ShutdownFunc_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -83,7 +83,7 @@ static void* find_NSS_ShutdownFunc_Fct(void* fct) static uintptr_t my_CERT_StringFromCertFcn_fct_##A = 0; \ static void* my_CERT_StringFromCertFcn_##A(void* a) \ { \ - return (void*)RunFunctionFmt(my_context, my_CERT_StringFromCertFcn_fct_##A, "p", a);\ + return (void*)RunFunctionFmt(my_CERT_StringFromCertFcn_fct_##A, "p", a);\ } SUPER() #undef GO diff --git a/src/wrapped/wrappedopenal.c b/src/wrapped/wrappedopenal.c index cbaa361a..539e3e6a 100755 --- a/src/wrapped/wrappedopenal.c +++ b/src/wrapped/wrappedopenal.c @@ -39,7 +39,7 @@ GO(4) static uintptr_t my_Request_fct_##A = 0; \ static void my_Request_##A(int32_t a, int32_t b) \ { \ - RunFunctionFmt(my_context, my_Request_fct_##A, "ii", a, b); \ + RunFunctionFmt(my_Request_fct_##A, "ii", a, b); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedpango.c b/src/wrapped/wrappedpango.c index 267752b8..b5e176f4 100755 --- a/src/wrapped/wrappedpango.c +++ b/src/wrapped/wrappedpango.c @@ -46,17 +46,17 @@ static my_PangoAttrClass_t my_PangoAttrClass_struct_##A = {0}; \ static uintptr_t my_PangoAttrClass_copy_##A = 0; \ static void* my_PangoAttrClass_copyfct##A(void* attr) \ { \ - return (void*)RunFunctionFmt(my_context, my_PangoAttrClass_copy_##A, "p", attr); \ + return (void*)RunFunctionFmt(my_PangoAttrClass_copy_##A, "p", attr); \ } \ static uintptr_t my_PangoAttrClass_del_##A = 0; \ static void my_PangoAttrClass_delfct##A(void* attr) \ { \ - RunFunctionFmt(my_context, my_PangoAttrClass_del_##A, "p", attr);\ + RunFunctionFmt(my_PangoAttrClass_del_##A, "p", attr);\ } \ static uintptr_t my_PangoAttrClass_equal_##A = 0; \ static int my_PangoAttrClass_equalfct##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_PangoAttrClass_equal_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_PangoAttrClass_equal_##A, "pp", a, b); \ } SUPER() #undef GO @@ -88,7 +88,7 @@ static void* find_PangoAttrClass_Fct(my_PangoAttrClass_t* klass) static uintptr_t my_AttrFilter_fct_##A = 0; \ static int my_AttrFilter_##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_AttrFilter_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_AttrFilter_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -110,7 +110,7 @@ static void* find_AttrFilter_Fct(void* fct) static uintptr_t my_AttrDataCopy_fct_##A = 0; \ static void* my_AttrDataCopy_##A(void* a) \ { \ - return (void*)RunFunctionFmt(my_context, my_AttrDataCopy_fct_##A, "p", a); \ + return (void*)RunFunctionFmt(my_AttrDataCopy_fct_##A, "p", a); \ } SUPER() #undef GO @@ -132,7 +132,7 @@ static void* find_AttrDataCopy_Fct(void* fct) static uintptr_t my_GDestroyNotify_fct_##A = 0; \ static void my_GDestroyNotify_##A(void* data) \ { \ - RunFunctionFmt(my_context, my_GDestroyNotify_fct_##A, "p", data); \ + RunFunctionFmt(my_GDestroyNotify_fct_##A, "p", data); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedpangocairo.c b/src/wrapped/wrappedpangocairo.c index fb10c9cf..f4c07e0e 100755 --- a/src/wrapped/wrappedpangocairo.c +++ b/src/wrapped/wrappedpangocairo.c @@ -47,7 +47,7 @@ GO(4) static uintptr_t my_ShapeRenderer_fct_##A = 0; \ static void my_ShapeRenderer_##A(void* a, void* b, int c, void* d) \ { \ - RunFunctionFmt(my_context, my_ShapeRenderer_fct_##A, "ppip", a, b, c, d); \ + RunFunctionFmt(my_ShapeRenderer_fct_##A, "ppip", a, b, c, d); \ } SUPER() #undef GO @@ -79,7 +79,7 @@ static void* reverse_ShapeRenderer_Fct(void* fct) static uintptr_t my_GDestroyNotify_fct_##A = 0; \ static void my_GDestroyNotify_##A(void* data) \ { \ - RunFunctionFmt(my_context, my_GDestroyNotify_fct_##A, "p", data); \ + RunFunctionFmt(my_GDestroyNotify_fct_##A, "p", data); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedpng12.c b/src/wrapped/wrappedpng12.c index 4b5628d6..fd17c4ae 100755 --- a/src/wrapped/wrappedpng12.c +++ b/src/wrapped/wrappedpng12.c @@ -37,7 +37,7 @@ GO(3) static uintptr_t my_user_write_fct_##A = 0; \ static void my_user_write_##A(void* png_ptr, void* data, int32_t length) \ { \ - RunFunctionFmt(my_context, my_user_write_fct_##A, "ppi", png_ptr, data, length);\ + RunFunctionFmt(my_user_write_fct_##A, "ppi", png_ptr, data, length);\ } SUPER() #undef GO @@ -59,7 +59,7 @@ static void* finduser_writeFct(void* fct) static uintptr_t my_user_flush_fct_##A = 0; \ static void my_user_flush_##A(void* png_ptr) \ { \ - RunFunctionFmt(my_context, my_user_flush_fct_##A, "p", png_ptr);\ + RunFunctionFmt(my_user_flush_fct_##A, "p", png_ptr);\ } SUPER() #undef GO @@ -81,7 +81,7 @@ static void* finduser_flushFct(void* fct) static uintptr_t my_user_read_fct_##A = 0; \ static void my_user_read_##A(void* png_ptr, void* data, int32_t length) \ { \ - RunFunctionFmt(my_context, my_user_read_fct_##A, "ppi", png_ptr, data, length); \ + RunFunctionFmt(my_user_read_fct_##A, "ppi", png_ptr, data, length); \ } SUPER() #undef GO @@ -103,7 +103,7 @@ static void* finduser_readFct(void* fct) static uintptr_t my_error_fct_##A = 0; \ static void my_error_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_error_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_error_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -125,7 +125,7 @@ static void* finderrorFct(void* fct) static uintptr_t my_warning_fct_##A = 0; \ static void my_warning_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_warning_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_warning_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -147,7 +147,7 @@ static void* findwarningFct(void* fct) static uintptr_t my_malloc_fct_##A = 0; \ static void my_malloc_##A(void* a, unsigned long b) \ { \ - RunFunctionFmt(my_context, my_malloc_fct_##A, "pL", a, b); \ + RunFunctionFmt(my_malloc_fct_##A, "pL", a, b); \ } SUPER() #undef GO @@ -169,7 +169,7 @@ static void* findmallocFct(void* fct) static uintptr_t my_free_fct_##A = 0; \ static void my_free_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_free_fct_##A, "pp", a, b);\ + RunFunctionFmt(my_free_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -192,7 +192,7 @@ static void* findfreeFct(void* fct) static uintptr_t my_progressive_info_fct_##A = 0; \ static void my_progressive_info_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_progressive_info_fct_##A, "pp", a, b);\ + RunFunctionFmt(my_progressive_info_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -215,7 +215,7 @@ static void* findprogressive_infoFct(void* fct) static uintptr_t my_progressive_end_fct_##A = 0; \ static void my_progressive_end_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_progressive_end_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_progressive_end_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -238,7 +238,7 @@ static void* findprogressive_endFct(void* fct) static uintptr_t my_progressive_row_fct_##A = 0; \ static void my_progressive_row_##A(void* a, void* b, uint32_t c, int d) \ { \ - RunFunctionFmt(my_context, my_progressive_row_fct_##A, "ppui", a, b, c, d); \ + RunFunctionFmt(my_progressive_row_fct_##A, "ppui", a, b, c, d); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedpng16.c b/src/wrapped/wrappedpng16.c index ce723e3a..e3957db8 100755 --- a/src/wrapped/wrappedpng16.c +++ b/src/wrapped/wrappedpng16.c @@ -47,7 +47,7 @@ GO(3) static uintptr_t my_user_write_fct_##A = 0; \ static void my_user_write_##A(void* png_ptr, void* data, int32_t length) \ { \ - RunFunctionFmt(my_context, my_user_write_fct_##A, "ppi", png_ptr, data, length);\ + RunFunctionFmt(my_user_write_fct_##A, "ppi", png_ptr, data, length);\ } SUPER() #undef GO @@ -69,7 +69,7 @@ static void* finduser_writeFct(void* fct) static uintptr_t my_user_flush_fct_##A = 0; \ static void my_user_flush_##A(void* png_ptr) \ { \ - RunFunctionFmt(my_context, my_user_flush_fct_##A, "p", png_ptr);\ + RunFunctionFmt(my_user_flush_fct_##A, "p", png_ptr);\ } SUPER() #undef GO @@ -91,7 +91,7 @@ static void* finduser_flushFct(void* fct) static uintptr_t my_user_read_fct_##A = 0; \ static void my_user_read_##A(void* png_ptr, void* data, size_t length) \ { \ - RunFunctionFmt(my_context, my_user_read_fct_##A, "ppL", png_ptr, data, length); \ + RunFunctionFmt(my_user_read_fct_##A, "ppL", png_ptr, data, length); \ } SUPER() #undef GO @@ -113,7 +113,7 @@ static void* finduser_readFct(void* fct) static uintptr_t my_error_fct_##A = 0; \ static void my_error_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_error_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_error_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -135,7 +135,7 @@ static void* finderrorFct(void* fct) static uintptr_t my_warning_fct_##A = 0; \ static void my_warning_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_warning_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_warning_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -157,7 +157,7 @@ static void* findwarningFct(void* fct) static uintptr_t my_malloc_fct_##A = 0; \ static void my_malloc_##A(void* a, unsigned long b) \ { \ - RunFunctionFmt(my_context, my_malloc_fct_##A, "pL", a, b); \ + RunFunctionFmt(my_malloc_fct_##A, "pL", a, b); \ } SUPER() #undef GO @@ -179,7 +179,7 @@ static void* findmallocFct(void* fct) static uintptr_t my_free_fct_##A = 0; \ static void my_free_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_free_fct_##A, "pp", a, b);\ + RunFunctionFmt(my_free_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -202,7 +202,7 @@ static void* findfreeFct(void* fct) static uintptr_t my_progressive_info_fct_##A = 0; \ static void my_progressive_info_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_progressive_info_fct_##A, "pp", a, b);\ + RunFunctionFmt(my_progressive_info_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -225,7 +225,7 @@ static void* findprogressive_infoFct(void* fct) static uintptr_t my_progressive_end_fct_##A = 0; \ static void my_progressive_end_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_progressive_end_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_progressive_end_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -248,7 +248,7 @@ static void* findprogressive_endFct(void* fct) static uintptr_t my_progressive_row_fct_##A = 0; \ static void my_progressive_row_##A(void* a, void* b, uint32_t c, int d) \ { \ - RunFunctionFmt(my_context, my_progressive_row_fct_##A, "ppui", a, b, c, d); \ + RunFunctionFmt(my_progressive_row_fct_##A, "ppui", a, b, c, d); \ } SUPER() #undef GO @@ -272,7 +272,7 @@ static void* findprogressive_rowFct(void* fct) static uintptr_t my_user_transform_fct_##A = 0; \ static void my_user_transform_##A(void* ptr, void* row, void* data) \ { \ - RunFunctionFmt(my_context, my_user_transform_fct_##A, "ppp", ptr, row, data); \ + RunFunctionFmt(my_user_transform_fct_##A, "ppp", ptr, row, data); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedpulse.c b/src/wrapped/wrappedpulse.c index 78a3cf18..68a7d154 100755 --- a/src/wrapped/wrappedpulse.c +++ b/src/wrapped/wrappedpulse.c @@ -184,7 +184,7 @@ GO(15) \ static uintptr_t my_free_fct_##A = 0; \ static void my_free_##A(void* data) \ { \ - RunFunctionFmt(my_context, my_free_fct_##A, "p", data); \ + RunFunctionFmt(my_free_fct_##A, "p", data); \ } SUPER() #undef GO @@ -206,7 +206,7 @@ static void* findFreeFct(void* fct) static uintptr_t my_free_api_fct_##A = 0; \ static void my_free_api_##A(my_pa_mainloop_api_t* api, void* p, void* data) \ { \ - RunFunctionFmt(my_context, my_free_api_fct_##A, "ppp", api, p, data); \ + RunFunctionFmt(my_free_api_fct_##A, "ppp", api, p, data); \ } SUPER() #undef GO @@ -229,7 +229,7 @@ static uintptr_t my_io_event_fct_##A = 0; static void my_io_event_##A(my_pa_mainloop_api_t* api, void* e, int fd, int events, void* data) \ { \ if(api==my_mainloop_orig) api=my_mainloop_ref; \ - RunFunctionFmt(my_context, my_io_event_fct_##A, "ppiip", api, e, fd, events, data); \ + RunFunctionFmt(my_io_event_fct_##A, "ppiip", api, e, fd, events, data); \ } SUPER() #undef GO @@ -252,7 +252,7 @@ static uintptr_t my_time_event_fct_##A = 0; static void my_time_event_##A(my_pa_mainloop_api_t* api, void* e, void* tv, void* data) \ { \ if(api==my_mainloop_orig) api=my_mainloop_ref; \ - RunFunctionFmt(my_context, my_time_event_fct_##A, "pppp", api, e, tv, data); \ + RunFunctionFmt(my_time_event_fct_##A, "pppp", api, e, tv, data); \ } SUPER() #undef GO @@ -276,7 +276,7 @@ static uintptr_t my_defer_event_fct_##A = 0; static void my_defer_event_##A(my_pa_mainloop_api_t* api, void* e, void* data) \ { \ if(api==my_mainloop_orig) api=my_mainloop_ref; \ - RunFunctionFmt(my_context, my_defer_event_fct_##A, "ppp", api, e, data); \ + RunFunctionFmt(my_defer_event_fct_##A, "ppp", api, e, data); \ } SUPER() #undef GO @@ -299,7 +299,7 @@ static void* findDeferEventFct(void* fct) static uintptr_t my_poll_fct_##A = 0; \ static int my_poll_##A(void* ufds, unsigned long nfds, int timeout, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_poll_fct_##A, "pLip", ufds, nfds, timeout, data); \ + return (int)RunFunctionFmt(my_poll_fct_##A, "pLip", ufds, nfds, timeout, data); \ } SUPER() #undef GO @@ -322,7 +322,7 @@ static uintptr_t my_signal_fct_##A = 0; \ static void my_signal_##A(my_pa_mainloop_api_t* api, void* e, int sig, void *data) \ { \ if(api==my_mainloop_orig) api=my_mainloop_ref; \ - RunFunctionFmt(my_context, my_signal_fct_##A, "ppip", api, e, sig, data); \ + RunFunctionFmt(my_signal_fct_##A, "ppip", api, e, sig, data); \ } SUPER() #undef GO @@ -345,7 +345,7 @@ static uintptr_t my_signal_destroy_fct_##A = 0; \ static void my_signal_destroy_##A(my_pa_mainloop_api_t* api, void* e, void *data) \ { \ if(api==my_mainloop_orig) api=my_mainloop_ref; \ - RunFunctionFmt(my_context, my_signal_destroy_fct_##A, "ppp", api, e, data); \ + RunFunctionFmt(my_signal_destroy_fct_##A, "ppp", api, e, data); \ } SUPER() #undef GO @@ -368,7 +368,7 @@ static void* find_signal_destroy_Fct(void* fct) static uintptr_t my_prefork_fct_##A = 0; \ static void my_prefork_##A() \ { \ - RunFunctionFmt(my_context, my_prefork_fct_##A, ""); \ + RunFunctionFmt(my_prefork_fct_##A, ""); \ } SUPER() #undef GO @@ -390,7 +390,7 @@ static void* find_prefork_Fct(void* fct) static uintptr_t my_postfork_fct_##A = 0; \ static void my_postfork_##A() \ { \ - RunFunctionFmt(my_context, my_postfork_fct_##A, "");\ + RunFunctionFmt(my_postfork_fct_##A, "");\ } SUPER() #undef GO @@ -412,7 +412,7 @@ static void* find_postfork_Fct(void* fct) static uintptr_t my_atfork_fct_##A = 0; \ static void my_atfork_##A() \ { \ - RunFunctionFmt(my_context, my_atfork_fct_##A, ""); \ + RunFunctionFmt(my_atfork_fct_##A, ""); \ } SUPER() #undef GO @@ -435,7 +435,7 @@ static void* find_atfork_Fct(void* fct) static uintptr_t my_state_context_fct_##A = 0; \ static void my_state_context_##A(void* context, void* data) \ { \ - RunFunctionFmt(my_context, my_state_context_fct_##A, "pp", context, data); \ + RunFunctionFmt(my_state_context_fct_##A, "pp", context, data); \ } SUPER() #undef GO @@ -457,7 +457,7 @@ static void* find_state_context_Fct(void* fct) static uintptr_t my_notify_context_fct_##A = 0; \ static void my_notify_context_##A(void* context, void* data) \ { \ - RunFunctionFmt(my_context, my_notify_context_fct_##A, "pp", context, data); \ + RunFunctionFmt(my_notify_context_fct_##A, "pp", context, data); \ } SUPER() #undef GO @@ -479,7 +479,7 @@ static void* find_notify_context_Fct(void* fct) static uintptr_t my_success_context_fct_##A = 0; \ static void my_success_context_##A(void* context, int success, void* data) \ { \ - RunFunctionFmt(my_context, my_success_context_fct_##A, "pip", context, success, data); \ + RunFunctionFmt(my_success_context_fct_##A, "pip", context, success, data); \ } SUPER() #undef GO @@ -501,7 +501,7 @@ static void* find_success_context_Fct(void* fct) static uintptr_t my_event_context_fct_##A = 0; \ static void my_event_context_##A(void* context, void* name, void* p, void* data) \ { \ - RunFunctionFmt(my_context, my_event_context_fct_##A, "pppp", context, name, p, data); \ + RunFunctionFmt(my_event_context_fct_##A, "pppp", context, name, p, data); \ } SUPER() #undef GO @@ -523,7 +523,7 @@ static void* find_event_context_Fct(void* fct) static uintptr_t my_module_info_fct_##A = 0; \ static void my_module_info_##A(void* context, void* i, int eol, void* data) \ { \ - RunFunctionFmt(my_context, my_module_info_fct_##A, "ppip", context, i, eol, data); \ + RunFunctionFmt(my_module_info_fct_##A, "ppip", context, i, eol, data); \ } SUPER() #undef GO @@ -547,7 +547,7 @@ static void my_sink_info_##A(void* context, my_pa_sink_info_t* i, int eol, void* { \ x86_pa_sink_info_t info = {0}; \ unalign_pa_sink_info(&info, i); \ - RunFunctionFmt(my_context, my_sink_info_fct_##A, "ppip", context, i?&info:NULL, eol, data); \ + RunFunctionFmt(my_sink_info_fct_##A, "ppip", context, i?&info:NULL, eol, data); \ } SUPER() #undef GO @@ -569,7 +569,7 @@ static void* find_sink_info_Fct(void* fct) static uintptr_t my_server_info_fct_##A = 0; \ static void my_server_info_##A(void* context, void* i, void* data) \ { \ - RunFunctionFmt(my_context, my_server_info_fct_##A, "ppp", context, i, data);\ + RunFunctionFmt(my_server_info_fct_##A, "ppp", context, i, data);\ } SUPER() #undef GO @@ -591,7 +591,7 @@ static void* find_server_info_Fct(void* fct) static uintptr_t my_client_info_fct_##A = 0; \ static void my_client_info_##A(void* context, void* i, int eol, void* data) \ { \ - RunFunctionFmt(my_context, my_client_info_fct_##A, "ppip", context, i, eol, data); \ + RunFunctionFmt(my_client_info_fct_##A, "ppip", context, i, eol, data); \ } SUPER() #undef GO @@ -613,7 +613,7 @@ static void* find_client_info_Fct(void* fct) static uintptr_t my_context_index_fct_##A = 0; \ static void my_context_index_##A(void* context, uint32_t idx, void* data) \ { \ - RunFunctionFmt(my_context, my_context_index_fct_##A, "pup", context, idx, data);\ + RunFunctionFmt(my_context_index_fct_##A, "pup", context, idx, data);\ } SUPER() #undef GO @@ -635,7 +635,7 @@ static void* find_context_index_Fct(void* fct) static uintptr_t my_subscribe_context_fct_##A = 0; \ static void my_subscribe_context_##A(void* context, int evt, uint32_t idx, void* data) \ { \ - RunFunctionFmt(my_context, my_subscribe_context_fct_##A, "piup", context, evt, idx, data); \ + RunFunctionFmt(my_subscribe_context_fct_##A, "piup", context, evt, idx, data); \ } SUPER() #undef GO @@ -658,7 +658,7 @@ static void* find_subscribe_context_Fct(void* fct) static uintptr_t my_stream_state_fct_##A = 0; \ static void my_stream_state_##A(void* s, void* data) \ { \ - RunFunctionFmt(my_context, my_stream_state_fct_##A, "pp", s, data); \ + RunFunctionFmt(my_stream_state_fct_##A, "pp", s, data); \ } SUPER() #undef GO @@ -680,7 +680,7 @@ static void* find_stream_state_Fct(void* fct) static uintptr_t my_stream_success_fct_##A = 0; \ static void my_stream_success_##A(void* s, int success, void* data) \ { \ - RunFunctionFmt(my_context, my_stream_success_fct_##A, "pip", s, success, data); \ + RunFunctionFmt(my_stream_success_fct_##A, "pip", s, success, data); \ } SUPER() #undef GO @@ -702,7 +702,7 @@ static void* find_stream_success_Fct(void* fct) static uintptr_t my_stream_notify_fct_##A = 0; \ static void my_stream_notify_##A(void* s, void* data) \ { \ - RunFunctionFmt(my_context, my_stream_notify_fct_##A, "pp", s, data);\ + RunFunctionFmt(my_stream_notify_fct_##A, "pp", s, data);\ } SUPER() #undef GO @@ -724,7 +724,7 @@ static void* find_stream_notify_Fct(void* fct) static uintptr_t my_stream_event_fct_##A = 0; \ static void my_stream_event_##A(void* s, void* name, void* pl, void* data) \ { \ - RunFunctionFmt(my_context, my_stream_event_fct_##A, "pppp", s, name, pl, data); \ + RunFunctionFmt(my_stream_event_fct_##A, "pppp", s, name, pl, data); \ } SUPER() #undef GO @@ -746,7 +746,7 @@ static void* find_stream_event_Fct(void* fct) static uintptr_t my_stream_request_fct_##A = 0; \ static void my_stream_request_##A(void* s, size_t nbytes, void* data) \ { \ - RunFunctionFmt(my_context, my_stream_request_fct_##A, "pLp", s, nbytes, data); \ + RunFunctionFmt(my_stream_request_fct_##A, "pLp", s, nbytes, data); \ } SUPER() #undef GO @@ -768,7 +768,7 @@ static void* find_stream_request_Fct(void* fct) static uintptr_t my_device_restore_read_device_formats_fct_##A = 0; \ static void my_device_restore_read_device_formats_##A(void* a, void* b, int c, void* d) \ { \ - RunFunctionFmt(my_context, my_device_restore_read_device_formats_fct_##A, "ppip", a, b, c, d); \ + RunFunctionFmt(my_device_restore_read_device_formats_fct_##A, "ppip", a, b, c, d); \ } SUPER() #undef GO @@ -790,7 +790,7 @@ static void* find_device_restore_read_device_formats_Fct(void* fct) static uintptr_t my_card_info_fct_##A = 0; \ static void my_card_info_##A(void* a, void* b, int c, void* d) \ { \ - RunFunctionFmt(my_context, my_card_info_fct_##A, "ppip", a, b, c, d); \ + RunFunctionFmt(my_card_info_fct_##A, "ppip", a, b, c, d); \ } SUPER() #undef GO @@ -812,7 +812,7 @@ static void* find_card_info_Fct(void* fct) static uintptr_t my_source_output_info_fct_##A = 0; \ static void my_source_output_info_##A(void* a, void* b, int c, void* d) \ { \ - RunFunctionFmt(my_context, my_source_output_info_fct_##A, "ppip", a, b, c, d); \ + RunFunctionFmt(my_source_output_info_fct_##A, "ppip", a, b, c, d); \ } SUPER() #undef GO @@ -834,7 +834,7 @@ static void* find_source_output_info_Fct(void* fct) static uintptr_t my_device_restore_subscribe_fct_##A = 0; \ static void my_device_restore_subscribe_##A(void* a, int b, uint32_t c, void* d) \ { \ - RunFunctionFmt(my_context, my_device_restore_subscribe_fct_##A, "piup", a, b, c, d);\ + RunFunctionFmt(my_device_restore_subscribe_fct_##A, "piup", a, b, c, d);\ } SUPER() #undef GO @@ -947,7 +947,7 @@ static void* my_io_new(void* api, int fd, int events, void* cb, void *userdata) if(cb) b = AddCheckBridge(bridge, vFppiip, cb, 0, NULL); if(api==my_mainloop_orig) api=my_mainloop_ref; // need emulated version - return (void*)RunFunctionFmt(my_context, (uintptr_t)my_mainloop_ref->io_new, "piipp", api, fd, events, b, userdata); + return (void*)RunFunctionFmt((uintptr_t)my_mainloop_ref->io_new, "piipp", api, fd, events, b, userdata); } static void my_io_enable(void* e, int events) { @@ -956,7 +956,7 @@ static void my_io_enable(void* e, int events) if(fnc) return ((vFpi_t)fnc)(e, events); - RunFunctionFmt(my_context, (uintptr_t)my_mainloop_ref->io_enable, "pi", e, events); + RunFunctionFmt((uintptr_t)my_mainloop_ref->io_enable, "pi", e, events); } static void my_io_free(void* e) { @@ -965,7 +965,7 @@ static void my_io_free(void* e) if(fnc) return ((vFp_t)fnc)(e); - RunFunctionFmt(my_context, (uintptr_t)my_mainloop_ref->io_free, "p", e); + RunFunctionFmt((uintptr_t)my_mainloop_ref->io_free, "p", e); } static void my_io_set_destroy(void* e, void* cb) { @@ -981,7 +981,7 @@ static void my_io_set_destroy(void* e, void* cb) if(!b) b = AddBridge(bridge, vFppp, cb, 0, NULL); } - RunFunctionFmt(my_context, (uintptr_t)my_mainloop_ref->io_set_destroy, "pp", e, b); + RunFunctionFmt((uintptr_t)my_mainloop_ref->io_set_destroy, "pp", e, b); } static void* my_time_new(void* api, void* tv, void* cb, void* data) @@ -999,7 +999,7 @@ static void* my_time_new(void* api, void* tv, void* cb, void* data) if(cb) b = AddCheckBridge(bridge, vFpppp, cb, 0, NULL); if(api==my_mainloop_orig) api=my_mainloop_ref; // need emulated version - return (void*)RunFunctionFmt(my_context, (uintptr_t)my_mainloop_ref->time_new, "pppp", api, tv, b, data); + return (void*)RunFunctionFmt((uintptr_t)my_mainloop_ref->time_new, "pppp", api, tv, b, data); } static void my_time_restart(void* e, void* tv) { @@ -1008,7 +1008,7 @@ static void my_time_restart(void* e, void* tv) if(fnc) return ((vFpp_t)fnc)(e, tv); - RunFunctionFmt(my_context, (uintptr_t)my_mainloop_ref->time_restart, "pp", e, tv); + RunFunctionFmt((uintptr_t)my_mainloop_ref->time_restart, "pp", e, tv); } static void my_time_free(void* e) { @@ -1017,7 +1017,7 @@ static void my_time_free(void* e) if(fnc) return ((vFp_t)fnc)(e); - RunFunctionFmt(my_context, (uintptr_t)my_mainloop_ref->time_free, "p", e); + RunFunctionFmt((uintptr_t)my_mainloop_ref->time_free, "p", e); } static void my_time_set_destroy(void* e, void* cb) { @@ -1030,7 +1030,7 @@ static void my_time_set_destroy(void* e, void* cb) uintptr_t b = 0; if(cb) b = AddCheckBridge(bridge, vFppp, cb, 0, NULL); - RunFunctionFmt(my_context, (uintptr_t)my_mainloop_ref->time_set_destroy, "pp", e, b); + RunFunctionFmt((uintptr_t)my_mainloop_ref->time_set_destroy, "pp", e, b); } static void* my_defer_new(void* api, void* cb, void* data) @@ -1051,7 +1051,7 @@ static void* my_defer_new(void* api, void* cb, void* data) b = AddBridge(bridge, vFppp, cb, 0, NULL); } if(api==my_mainloop_orig) api=my_mainloop_ref; // need emulated version - return (void*)RunFunctionFmt(my_context, (uintptr_t)my_mainloop_ref->defer_new, "ppp", api, b, data); + return (void*)RunFunctionFmt((uintptr_t)my_mainloop_ref->defer_new, "ppp", api, b, data); } static void my_defer_enable(void* e, int b) { @@ -1060,7 +1060,7 @@ static void my_defer_enable(void* e, int b) if(fnc) return ((vFpi_t)fnc)(e, b); - RunFunctionFmt(my_context, (uintptr_t)my_mainloop_ref->defer_enable, "pi", e, b); + RunFunctionFmt((uintptr_t)my_mainloop_ref->defer_enable, "pi", e, b); } static void my_defer_free(void* e) { @@ -1069,7 +1069,7 @@ static void my_defer_free(void* e) if(fnc) return ((vFp_t)fnc)(e); - RunFunctionFmt(my_context, (uintptr_t)my_mainloop_ref->defer_free, "p", e); + RunFunctionFmt((uintptr_t)my_mainloop_ref->defer_free, "p", e); } static void my_defer_set_destroy(void* e, void* cb) { @@ -1082,7 +1082,7 @@ static void my_defer_set_destroy(void* e, void* cb) uintptr_t b = 0; if(cb) b = AddCheckBridge(bridge, vFppp, cb, 0, NULL); - RunFunctionFmt(my_context, (uintptr_t)my_mainloop_ref->defer_set_destroy, "pp", e, b); + RunFunctionFmt((uintptr_t)my_mainloop_ref->defer_set_destroy, "pp", e, b); } static void my_quit(void* api, int retval) @@ -1095,7 +1095,7 @@ static void my_quit(void* api, int retval) } if(api==my_mainloop_orig) api=my_mainloop_ref; // need emulated version - RunFunctionFmt(my_context, (uintptr_t)my_mainloop_ref->quit, "pi", api, retval); + RunFunctionFmt((uintptr_t)my_mainloop_ref->quit, "pi", api, retval); } static void bridgeMainloopAPI(bridge_t* bridge, my_pa_mainloop_api_t* api) diff --git a/src/wrapped/wrappedsdl1.c b/src/wrapped/wrappedsdl1.c index 7a6cddbb..774dfa85 100755 --- a/src/wrapped/wrappedsdl1.c +++ b/src/wrapped/wrappedsdl1.c @@ -69,7 +69,7 @@ GO(4) static uintptr_t my_AudioCallback_fct_##A = 0; \ static void my_AudioCallback_##A(void *userdata, uint8_t *stream, int32_t len) \ { \ - RunFunctionFmt(my_context, my_AudioCallback_fct_##A, "ppi", userdata, stream, len); \ + RunFunctionFmt(my_AudioCallback_fct_##A, "ppi", userdata, stream, len); \ } SUPER() #undef GO @@ -91,7 +91,7 @@ static void* find_AudioCallback_Fct(void* fct) static uintptr_t my_TimerCallback_fct_##A = 0; \ static uint32_t my_TimerCallback_##A(uint32_t interval, void *userdata) \ { \ - return (uint32_t)RunFunctionFmt(my_context, my_TimerCallback_fct_##A, "up", interval, userdata);\ + return (uint32_t)RunFunctionFmt(my_TimerCallback_fct_##A, "up", interval, userdata);\ } SUPER() #undef GO @@ -113,7 +113,7 @@ static void* find_TimerCallback_Fct(void* fct) static uintptr_t my_EvtFilter_fct_##A = 0; \ static int my_EvtFilter_##A(void* p) \ { \ - return RunFunctionFmt(my_context, my_EvtFilter_fct_##A, "p", p);\ + return RunFunctionFmt(my_EvtFilter_fct_##A, "p", p);\ } SUPER() #undef GO diff --git a/src/wrapped/wrappedsdl1mixer.c b/src/wrapped/wrappedsdl1mixer.c index f3678364..f7a06655 100755 --- a/src/wrapped/wrappedsdl1mixer.c +++ b/src/wrapped/wrappedsdl1mixer.c @@ -37,7 +37,7 @@ GO(4) static uintptr_t my_EffectFunc_fct_##A = 0; \ static void my_EffectFunc_##A(int chan, void *stream, int len, void *udata) \ { \ - RunFunctionFmt(my_context, my_EffectFunc_fct_##A, "ipip", chan, stream, len, udata);\ + RunFunctionFmt(my_EffectFunc_fct_##A, "ipip", chan, stream, len, udata);\ } SUPER() #undef GO @@ -61,7 +61,7 @@ static void* find_EffectFunc_Fct(void* fct) static uintptr_t my_EffectDone_fct_##A = 0; \ static void my_EffectDone_##A(int chan, void *udata) \ { \ - RunFunctionFmt(my_context, my_EffectDone_fct_##A, "ip", chan, udata); \ + RunFunctionFmt(my_EffectDone_fct_##A, "ip", chan, udata); \ } SUPER() #undef GO @@ -85,7 +85,7 @@ static void* find_EffectDone_Fct(void* fct) static uintptr_t my_MixFunc_fct_##A = 0; \ static void my_MixFunc_##A(void *udata, uint8_t *stream, int len) \ { \ - RunFunctionFmt(my_context, my_MixFunc_fct_##A, "ppi", udata, stream, len); \ + RunFunctionFmt(my_MixFunc_fct_##A, "ppi", udata, stream, len); \ } SUPER() #undef GO @@ -109,7 +109,7 @@ static void* find_MixFunc_Fct(void* fct) static uintptr_t my_ChannelFinished_fct_##A = 0; \ static void my_ChannelFinished_##A(int channel) \ { \ - RunFunctionFmt(my_context, my_ChannelFinished_fct_##A, "i", channel); \ + RunFunctionFmt(my_ChannelFinished_fct_##A, "i", channel); \ } SUPER() #undef GO @@ -133,7 +133,7 @@ static void* find_ChannelFinished_Fct(void* fct) static uintptr_t my_MusicFinished_fct_##A = 0; \ static void my_MusicFinished_##A() \ { \ - RunFunctionFmt(my_context, my_MusicFinished_fct_##A, ""); \ + RunFunctionFmt(my_MusicFinished_fct_##A, ""); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedsdl2.c b/src/wrapped/wrappedsdl2.c index 5c4427ef..201fc684 100755 --- a/src/wrapped/wrappedsdl2.c +++ b/src/wrapped/wrappedsdl2.c @@ -108,7 +108,7 @@ GO(4) static uintptr_t my_Timer_fct_##A = 0; \ static uint32_t my_Timer_##A(uint32_t a, void* b) \ { \ - return (uint32_t)RunFunctionFmt(my_context, my_Timer_fct_##A, "up", a, b); \ + return (uint32_t)RunFunctionFmt(my_Timer_fct_##A, "up", a, b); \ } SUPER() #undef GO @@ -132,7 +132,7 @@ static void* find_Timer_Fct(void* fct) static uintptr_t my_AudioCallback_fct_##A = 0; \ static void my_AudioCallback_##A(void* a, void* b, int c) \ { \ - RunFunctionFmt(my_context, my_AudioCallback_fct_##A, "ppi", a, b, c); \ + RunFunctionFmt(my_AudioCallback_fct_##A, "ppi", a, b, c); \ } SUPER() #undef GO @@ -156,7 +156,7 @@ static void* find_AudioCallback_Fct(void* fct) static uintptr_t my_eventfilter_fct_##A = 0; \ static int my_eventfilter_##A(void* userdata, void* event) \ { \ - return (int)RunFunctionFmt(my_context, my_eventfilter_fct_##A, "pp", userdata, event); \ + return (int)RunFunctionFmt(my_eventfilter_fct_##A, "pp", userdata, event); \ } SUPER() #undef GO @@ -191,7 +191,7 @@ static void* reverse_eventfilter_Fct(void* fct) static uintptr_t my_LogOutput_fct_##A = 0; \ static void my_LogOutput_##A(void* a, int b, int c, void* d) \ { \ - RunFunctionFmt(my_context, my_LogOutput_fct_##A, "piip", a, b, c, d); \ + RunFunctionFmt(my_LogOutput_fct_##A, "piip", a, b, c, d); \ } SUPER() #undef GO @@ -755,7 +755,7 @@ static uintptr_t dtor_emu[nb_once] = {0}; static void tls_dtor_callback(int n, void* a) { if(dtor_emu[n]) { - RunFunctionFmt(my_context, dtor_emu[n], "p", a); + RunFunctionFmt(dtor_emu[n], "p", a); } } #define GO(N) \ diff --git a/src/wrapped/wrappedsdl2mixer.c b/src/wrapped/wrappedsdl2mixer.c index 5f59a38b..983dc9db 100755 --- a/src/wrapped/wrappedsdl2mixer.c +++ b/src/wrapped/wrappedsdl2mixer.c @@ -40,7 +40,7 @@ GO(4) static uintptr_t my_EffectFunc_fct_##A = 0; \ static void my_EffectFunc_##A(int chan, void *stream, int len, void *udata) \ { \ - RunFunctionFmt(my_context, my_EffectFunc_fct_##A, "ipip", chan, stream, len, udata);\ + RunFunctionFmt(my_EffectFunc_fct_##A, "ipip", chan, stream, len, udata);\ } SUPER() #undef GO @@ -64,7 +64,7 @@ static void* find_EffectFunc_Fct(void* fct) static uintptr_t my_EffectDone_fct_##A = 0; \ static void my_EffectDone_##A(int chan, void *udata) \ { \ - RunFunctionFmt(my_context, my_EffectDone_fct_##A, "ip", chan, udata); \ + RunFunctionFmt(my_EffectDone_fct_##A, "ip", chan, udata); \ } SUPER() #undef GO @@ -88,7 +88,7 @@ static void* find_EffectDone_Fct(void* fct) static uintptr_t my_MixFunc_fct_##A = 0; \ static void my_MixFunc_##A(void *udata, uint8_t *stream, int len) \ { \ - RunFunctionFmt(my_context, my_MixFunc_fct_##A, "ppi", udata, stream, len); \ + RunFunctionFmt(my_MixFunc_fct_##A, "ppi", udata, stream, len); \ } SUPER() #undef GO @@ -112,7 +112,7 @@ static void* find_MixFunc_Fct(void* fct) static uintptr_t my_ChannelFinished_fct_##A = 0; \ static void my_ChannelFinished_##A(int channel) \ { \ - RunFunctionFmt(my_context, my_ChannelFinished_fct_##A, "i", channel); \ + RunFunctionFmt(my_ChannelFinished_fct_##A, "i", channel); \ } SUPER() #undef GO @@ -136,7 +136,7 @@ static void* find_ChannelFinished_Fct(void* fct) static uintptr_t my_MusicFinished_fct_##A = 0; \ static void my_MusicFinished_##A() \ { \ - RunFunctionFmt(my_context, my_MusicFinished_fct_##A, ""); \ + RunFunctionFmt(my_MusicFinished_fct_##A, ""); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedsmime3.c b/src/wrapped/wrappedsmime3.c index d6624e50..0d1832b5 100755 --- a/src/wrapped/wrappedsmime3.c +++ b/src/wrapped/wrappedsmime3.c @@ -39,7 +39,7 @@ GO(4) static uintptr_t my_SECKEYGetPasswordKey_fct_##A = 0; \ static void* my_SECKEYGetPasswordKey_##A(void* a, void* b) \ { \ - return (void*)RunFunctionFmt(my_context, my_SECKEYGetPasswordKey_fct_##A, "pp", a, b); \ + return (void*)RunFunctionFmt(my_SECKEYGetPasswordKey_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -62,7 +62,7 @@ static void* find_SECKEYGetPasswordKey_Fct(void* fct) static uintptr_t my_digestOpenFn_fct_##A = 0; \ static int my_digestOpenFn_##A(void* a, int b) \ { \ - return RunFunctionFmt(my_context, my_digestOpenFn_fct_##A, "pi", a, b); \ + return RunFunctionFmt(my_digestOpenFn_fct_##A, "pi", a, b); \ } SUPER() #undef GO @@ -85,7 +85,7 @@ static void* find_digestOpenFn_Fct(void* fct) static uintptr_t my_digestCloseFn_fct_##A = 0; \ static int my_digestCloseFn_##A(void* a, int b) \ { \ - return RunFunctionFmt(my_context, my_digestCloseFn_fct_##A, "pi", a, b);\ + return RunFunctionFmt(my_digestCloseFn_fct_##A, "pi", a, b);\ } SUPER() #undef GO @@ -108,7 +108,7 @@ static void* find_digestCloseFn_Fct(void* fct) static uintptr_t my_digestIOFn_fct_##A = 0; \ static int my_digestIOFn_##A(void* a, void* b, unsigned long c) \ { \ - return RunFunctionFmt(my_context, my_digestIOFn_fct_##A, "ppL", a, b, c); \ + return RunFunctionFmt(my_digestIOFn_fct_##A, "ppL", a, b, c); \ } SUPER() #undef GO @@ -131,7 +131,7 @@ static void* find_digestIOFn_Fct(void* fct) static uintptr_t my_SEC_PKCS12NicknameCollisionCallback_fct_##A = 0; \ static void* my_SEC_PKCS12NicknameCollisionCallback_##A(void* a, void* b, void* c) \ { \ - return (void*)RunFunctionFmt(my_context, my_SEC_PKCS12NicknameCollisionCallback_fct_##A, "ppp", a, b, c); \ + return (void*)RunFunctionFmt(my_SEC_PKCS12NicknameCollisionCallback_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -154,7 +154,7 @@ static void* find_SEC_PKCS12NicknameCollisionCallback_Fct(void* fct) static uintptr_t my_SEC_PKCS12EncoderOutputCallback_fct_##A = 0; \ static void my_SEC_PKCS12EncoderOutputCallback_##A(void* a, void* b, unsigned long c) \ { \ - RunFunctionFmt(my_context, my_SEC_PKCS12EncoderOutputCallback_fct_##A, "ppL", a, b, c); \ + RunFunctionFmt(my_SEC_PKCS12EncoderOutputCallback_fct_##A, "ppL", a, b, c); \ } SUPER() #undef GO @@ -177,7 +177,7 @@ static void* find_SEC_PKCS12EncoderOutputCallback_Fct(void* fct) static uintptr_t my_NSSCMSContentCallback_fct_##A = 0; \ static void my_NSSCMSContentCallback_##A(void* a, void* b, unsigned long c) \ { \ - RunFunctionFmt(my_context, my_NSSCMSContentCallback_fct_##A, "ppL", a, b, c); \ + RunFunctionFmt(my_NSSCMSContentCallback_fct_##A, "ppL", a, b, c); \ } SUPER() #undef GO @@ -200,7 +200,7 @@ static void* find_NSSCMSContentCallback_Fct(void* fct) static uintptr_t my_PK11PasswordFunc_fct_##A = 0; \ static void* my_PK11PasswordFunc_##A(void* a, int b, void* c) \ { \ - return (void*)RunFunctionFmt(my_context, my_PK11PasswordFunc_fct_##A, "pip", a, b, c); \ + return (void*)RunFunctionFmt(my_PK11PasswordFunc_fct_##A, "pip", a, b, c); \ } SUPER() #undef GO @@ -223,7 +223,7 @@ static void* find_PK11PasswordFunc_Fct(void* fct) static uintptr_t my_NSSCMSGetDecryptKeyCallback_fct_##A = 0; \ static void* my_NSSCMSGetDecryptKeyCallback_##A(void* a, void* b) \ { \ - return (void*)RunFunctionFmt(my_context, my_NSSCMSGetDecryptKeyCallback_fct_##A, "pp", a, b); \ + return (void*)RunFunctionFmt(my_NSSCMSGetDecryptKeyCallback_fct_##A, "pp", a, b); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedsmpeg.c b/src/wrapped/wrappedsmpeg.c index a0bf948f..4d946b21 100755 --- a/src/wrapped/wrappedsmpeg.c +++ b/src/wrapped/wrappedsmpeg.c @@ -38,7 +38,7 @@ GO(4) static uintptr_t my_dispcallback_fct_##A = 0; \ static void my_dispcallback_##A(void* dst, int32_t x, int32_t y, unsigned int w, unsigned int h)\ { \ - RunFunctionFmt(my_context, my_dispcallback_fct_##A, "piiuu", dst, x, y, w, h); \ + RunFunctionFmt(my_dispcallback_fct_##A, "piiuu", dst, x, y, w, h); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedsmpeg2.c b/src/wrapped/wrappedsmpeg2.c index 91b0fcc3..1331eed8 100755 --- a/src/wrapped/wrappedsmpeg2.c +++ b/src/wrapped/wrappedsmpeg2.c @@ -38,7 +38,7 @@ GO(4) static uintptr_t my_dispcallback_fct_##A = 0; \ static void my_dispcallback_##A(void* data, void* frame) \ { \ - RunFunctionFmt(my_context, my_dispcallback_fct_##A, "pp", data, frame); \ + RunFunctionFmt(my_dispcallback_fct_##A, "pp", data, frame); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedssl3.c b/src/wrapped/wrappedssl3.c index 9f13c403..b9670be1 100755 --- a/src/wrapped/wrappedssl3.c +++ b/src/wrapped/wrappedssl3.c @@ -37,7 +37,7 @@ GO(4) static uintptr_t my_SSLBadCertHandler_fct_##A = 0; \ static int my_SSLBadCertHandler_##A(void* a, void* b) \ { \ - return RunFunctionFmt(my_context, my_SSLBadCertHandler_fct_##A, "pp", a, b);\ + return RunFunctionFmt(my_SSLBadCertHandler_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -60,7 +60,7 @@ static void* find_SSLBadCertHandler_Fct(void* fct) static uintptr_t my_SSLAuthCertificate_fct_##A = 0; \ static int my_SSLAuthCertificate_##A(void* a, void* b, int c, int d) \ { \ - return RunFunctionFmt(my_context, my_SSLAuthCertificate_fct_##A, "ppii", a, b, c, d); \ + return RunFunctionFmt(my_SSLAuthCertificate_fct_##A, "ppii", a, b, c, d); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedudev1.c b/src/wrapped/wrappedudev1.c index b8212579..70e9d900 100755 --- a/src/wrapped/wrappedudev1.c +++ b/src/wrapped/wrappedudev1.c @@ -39,7 +39,7 @@ GO(4) static uintptr_t my_log_fn_fct_##A = 0; \ static void my_log_fn_##A(void* a, int b, void* c, int d, void* e, void* f, void* va) \ { \ - RunFunctionFmt(my_context, my_log_fn_fct_##A, "pipippp", a, b, c, d, e, f, va); \ + RunFunctionFmt(my_log_fn_fct_##A, "pipippp", a, b, c, d, e, f, va); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedvorbisfile.c b/src/wrapped/wrappedvorbisfile.c index 5510003e..868bcf27 100755 --- a/src/wrapped/wrappedvorbisfile.c +++ b/src/wrapped/wrappedvorbisfile.c @@ -331,7 +331,7 @@ GO(7) static uintptr_t my_read_fct_##A = 0; \ static unsigned long my_read_##A(void* ptr, unsigned long size, unsigned long nmemb, void* datasource) \ { \ - return (unsigned long)RunFunctionFmt(my_context, my_read_fct_##A, "pLLp", ptr, size, nmemb, datasource);\ + return (unsigned long)RunFunctionFmt(my_read_fct_##A, "pLLp", ptr, size, nmemb, datasource);\ } SUPER() #undef GO @@ -353,7 +353,7 @@ static void* findreadFct(void* fct) static uintptr_t my_seek_fct_##A = 0; \ static int my_seek_##A(void* ptr, int64_t offset, int whence) \ { \ - return (int)RunFunctionFmt(my_context, my_seek_fct_##A, "pIi", ptr, offset, whence);\ + return (int)RunFunctionFmt(my_seek_fct_##A, "pIi", ptr, offset, whence);\ } SUPER() #undef GO @@ -375,7 +375,7 @@ static void* findseekFct(void* fct) static uintptr_t my_close_fct_##A = 0; \ static int my_close_##A(void* ptr) \ { \ - return (int)RunFunctionFmt(my_context, my_close_fct_##A, "p", ptr); \ + return (int)RunFunctionFmt(my_close_fct_##A, "p", ptr); \ } SUPER() #undef GO @@ -397,7 +397,7 @@ static void* findcloseFct(void* fct) static uintptr_t my_tell_fct_##A = 0; \ static long my_tell_##A(void* ptr) \ { \ - return (long)RunFunctionFmt(my_context, my_tell_fct_##A, "p", ptr); \ + return (long)RunFunctionFmt(my_tell_fct_##A, "p", ptr); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedvulkan.c b/src/wrapped/wrappedvulkan.c index f2903735..56eafde0 100755 --- a/src/wrapped/wrappedvulkan.c +++ b/src/wrapped/wrappedvulkan.c @@ -193,7 +193,7 @@ GO(4) static uintptr_t my_Allocation_fct_##A = 0; \ static void* my_Allocation_##A(void* a, size_t b, size_t c, int d) \ { \ - return (void*)RunFunctionFmt(my_context, my_Allocation_fct_##A, "pLLi", a, b, c, d);\ + return (void*)RunFunctionFmt(my_Allocation_fct_##A, "pLLi", a, b, c, d);\ } SUPER() #undef GO @@ -215,7 +215,7 @@ static void* find_Allocation_Fct(void* fct) static uintptr_t my_Reallocation_fct_##A = 0; \ static void* my_Reallocation_##A(void* a, void* b, size_t c, size_t d, int e) \ { \ - return (void*)RunFunctionFmt(my_context, my_Reallocation_fct_##A, "ppLLi", a, b, c, d, e); \ + return (void*)RunFunctionFmt(my_Reallocation_fct_##A, "ppLLi", a, b, c, d, e); \ } SUPER() #undef GO @@ -237,7 +237,7 @@ static void* find_Reallocation_Fct(void* fct) static uintptr_t my_Free_fct_##A = 0; \ static void my_Free_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_Free_fct_##A, "pp", a, b);\ + RunFunctionFmt(my_Free_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -259,7 +259,7 @@ static void* find_Free_Fct(void* fct) static uintptr_t my_InternalAllocNotification_fct_##A = 0; \ static void my_InternalAllocNotification_##A(void* a, size_t b, int c, int d) \ { \ - RunFunctionFmt(my_context, my_InternalAllocNotification_fct_##A, "pLii", a, b, c, d); \ + RunFunctionFmt(my_InternalAllocNotification_fct_##A, "pLii", a, b, c, d); \ } SUPER() #undef GO @@ -281,7 +281,7 @@ static void* find_InternalAllocNotification_Fct(void* fct) static uintptr_t my_InternalFreeNotification_fct_##A = 0; \ static void my_InternalFreeNotification_##A(void* a, size_t b, int c, int d) \ { \ - RunFunctionFmt(my_context, my_InternalFreeNotification_fct_##A, "pLii", a, b, c, d);\ + RunFunctionFmt(my_InternalFreeNotification_fct_##A, "pLii", a, b, c, d);\ } SUPER() #undef GO @@ -303,7 +303,7 @@ static void* find_InternalFreeNotification_Fct(void* fct) static uintptr_t my_DebugReportCallbackEXT_fct_##A = 0; \ static int my_DebugReportCallbackEXT_##A(int a, int b, uint64_t c, size_t d, int e, void* f, void* g, void* h) \ { \ - return RunFunctionFmt(my_context, my_DebugReportCallbackEXT_fct_##A, "iiULippp", a, b, c, d, e, f, g, h); \ + return RunFunctionFmt(my_DebugReportCallbackEXT_fct_##A, "iiULippp", a, b, c, d, e, f, g, h); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedxml2.c b/src/wrapped/wrappedxml2.c index 4b2c40f9..196306d5 100755 --- a/src/wrapped/wrappedxml2.c +++ b/src/wrapped/wrappedxml2.c @@ -33,7 +33,7 @@ EXPORT uintptr_t my_xmlMemStrdup = 0; void my_wrap_xmlFree(void* p) { if(my_xmlFree){ - RunFunctionFmt(my_context, my_xmlFree, "p", p); + RunFunctionFmt(my_xmlFree, "p", p); return; } free(p); @@ -41,21 +41,21 @@ void my_wrap_xmlFree(void* p) void* my_wrap_xmlMalloc(size_t s) { if(my_xmlMalloc) - return (void*)RunFunctionFmt(my_context, my_xmlMalloc, "L", s); + return (void*)RunFunctionFmt(my_xmlMalloc, "L", s); else return malloc(s); } void* my_wrap_xmlRealloc(void* p, size_t s) { if(my_xmlRealloc) - return (void*)RunFunctionFmt(my_context, my_xmlRealloc, "pL", p, s); + return (void*)RunFunctionFmt(my_xmlRealloc, "pL", p, s); else return realloc(p, s); } void* my_wrap_xmlMemStrdup(void* p) { if(my_xmlMemStrdup) - return (void*)RunFunctionFmt(my_context, my_xmlMemStrdup, "p", p); + return (void*)RunFunctionFmt(my_xmlMemStrdup, "p", p); else return strdup(p); } @@ -98,7 +98,7 @@ GO(9) static uintptr_t my_xmlHashCopier_fct_##A = 0; \ static void* my_xmlHashCopier_##A(void* a, void* b) \ { \ - return (void*)RunFunctionFmt(my_context, my_xmlHashCopier_fct_##A, "pp", a, b); \ + return (void*)RunFunctionFmt(my_xmlHashCopier_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -120,7 +120,7 @@ static void* find_xmlHashCopier_Fct(void* fct) static uintptr_t my_xmlHashDeallocator_fct_##A = 0; \ static void my_xmlHashDeallocator_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_xmlHashDeallocator_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_xmlHashDeallocator_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -142,7 +142,7 @@ static void* find_xmlHashDeallocator_Fct(void* fct) static uintptr_t my_xmlHashScanner_fct_##A = 0; \ static void my_xmlHashScanner_##A(void* a, void* b, void* c) \ { \ - RunFunctionFmt(my_context, my_xmlHashScanner_fct_##A, "ppp", a, b, c); \ + RunFunctionFmt(my_xmlHashScanner_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -164,7 +164,7 @@ static void* find_xmlHashScanner_Fct(void* fct) static uintptr_t my_xmlHashScannerFull_fct_##A = 0; \ static void my_xmlHashScannerFull_##A(void* a, void* b, void* c, void* c2, void* c3) \ { \ - RunFunctionFmt(my_context, my_xmlHashScannerFull_fct_##A, "ppppp", a, b, c, c2, c3);\ + RunFunctionFmt(my_xmlHashScannerFull_fct_##A, "ppppp", a, b, c, c2, c3);\ } SUPER() #undef GO @@ -186,7 +186,7 @@ static void* find_xmlHashScannerFull_Fct(void* fct) static uintptr_t my_xmlCharEncodingInputFunc_fct_##A = 0; \ static int my_xmlCharEncodingInputFunc_##A(void* a, void* b, void* c, void* d) \ { \ - return RunFunctionFmt(my_context, my_xmlCharEncodingInputFunc_fct_##A, "pppp", a, b, c, d); \ + return RunFunctionFmt(my_xmlCharEncodingInputFunc_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -208,7 +208,7 @@ static void* find_xmlCharEncodingInputFunc_Fct(void* fct) static uintptr_t my_xmlCharEncodingOutputFunc_fct_##A = 0; \ static int my_xmlCharEncodingOutputFunc_##A(void* a, void* b, void* c, void* d) \ { \ - return RunFunctionFmt(my_context, my_xmlCharEncodingOutputFunc_fct_##A, "pppp", a, b, c, d);\ + return RunFunctionFmt(my_xmlCharEncodingOutputFunc_fct_##A, "pppp", a, b, c, d);\ } SUPER() #undef GO @@ -230,7 +230,7 @@ static void* find_xmlCharEncodingOutputFunc_Fct(void* fct) static uintptr_t my_xmlOutputWriteCallback_fct_##A = 0; \ static int my_xmlOutputWriteCallback_##A(void* a, void* b, int c) \ { \ - return RunFunctionFmt(my_context, my_xmlOutputWriteCallback_fct_##A, "ppi", a, b, c); \ + return RunFunctionFmt(my_xmlOutputWriteCallback_fct_##A, "ppi", a, b, c); \ } SUPER() #undef GO @@ -252,7 +252,7 @@ static void* find_xmlOutputWriteCallback_Fct(void* fct) static uintptr_t my_xmlOutputCloseCallback_fct_##A = 0; \ static int my_xmlOutputCloseCallback_##A(void* a) \ { \ - return RunFunctionFmt(my_context, my_xmlOutputCloseCallback_fct_##A, "p", a); \ + return RunFunctionFmt(my_xmlOutputCloseCallback_fct_##A, "p", a); \ } SUPER() #undef GO @@ -274,7 +274,7 @@ static void* find_xmlOutputCloseCallback_Fct(void* fct) static uintptr_t my_xmlInputMatchCallback_fct_##A = 0; \ static int my_xmlInputMatchCallback_##A(void* a) \ { \ - return RunFunctionFmt(my_context, my_xmlInputMatchCallback_fct_##A, "p", a);\ + return RunFunctionFmt(my_xmlInputMatchCallback_fct_##A, "p", a);\ } SUPER() #undef GO @@ -296,7 +296,7 @@ static void* find_xmlInputMatchCallback_Fct(void* fct) static uintptr_t my_xmlInputOpenCallback_fct_##A = 0; \ static void* my_xmlInputOpenCallback_##A(void* a) \ { \ - return (void*)RunFunctionFmt(my_context, my_xmlInputOpenCallback_fct_##A, "p", a); \ + return (void*)RunFunctionFmt(my_xmlInputOpenCallback_fct_##A, "p", a); \ } SUPER() #undef GO @@ -318,7 +318,7 @@ static void* find_xmlInputOpenCallback_Fct(void* fct) static uintptr_t my_xmlInputReadCallback_fct_##A = 0; \ static int my_xmlInputReadCallback_##A(void* a, void* b, int c) \ { \ - return RunFunctionFmt(my_context, my_xmlInputReadCallback_fct_##A, "ppi", a, b, c); \ + return RunFunctionFmt(my_xmlInputReadCallback_fct_##A, "ppi", a, b, c); \ } SUPER() #undef GO @@ -340,7 +340,7 @@ static void* find_xmlInputReadCallback_Fct(void* fct) static uintptr_t my_xmlInputCloseCallback_fct_##A = 0; \ static int my_xmlInputCloseCallback_##A(void* a) \ { \ - return RunFunctionFmt(my_context, my_xmlInputCloseCallback_fct_##A, "p", a);\ + return RunFunctionFmt(my_xmlInputCloseCallback_fct_##A, "p", a);\ } SUPER() #undef GO @@ -362,7 +362,7 @@ static void* find_xmlInputCloseCallback_Fct(void* fct) static uintptr_t my_xmlSchemaValidityErrorFunc_fct_##A = 0; \ static void my_xmlSchemaValidityErrorFunc_##A(void* a, void* b, void* c, void* d, void* e, void* f, void* g, void* h, void* i) \ { \ - RunFunctionFmt(my_context, my_xmlSchemaValidityErrorFunc_fct_##A, "ppppppppp", a, b, c, d, e, f, g, h, i); \ + RunFunctionFmt(my_xmlSchemaValidityErrorFunc_fct_##A, "ppppppppp", a, b, c, d, e, f, g, h, i); \ } SUPER() #undef GO @@ -384,7 +384,7 @@ static void* find_xmlSchemaValidityErrorFunc_Fct(void* fct) static uintptr_t my_xmlSchemaValidityWarningFunc_fct_##A = 0; \ static void my_xmlSchemaValidityWarningFunc_##A(void* a, void* b, void* c, void* d, void* e, void* f, void* g, void* h, void* i) \ { \ - RunFunctionFmt(my_context, my_xmlSchemaValidityWarningFunc_fct_##A, "ppppppppp", a, b, c, d, e, f, g, h, i); \ + RunFunctionFmt(my_xmlSchemaValidityWarningFunc_fct_##A, "ppppppppp", a, b, c, d, e, f, g, h, i); \ } SUPER() #undef GO @@ -406,7 +406,7 @@ static void* find_xmlSchemaValidityWarningFunc_Fct(void* fct) static uintptr_t my_xmlStructuredErrorFunc_fct_##A = 0; \ static void my_xmlStructuredErrorFunc_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_xmlStructuredErrorFunc_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_xmlStructuredErrorFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -428,7 +428,7 @@ static void* find_xmlStructuredErrorFunc_Fct(void* fct) static uintptr_t my_xmlXPathFunction_fct_##A = 0; \ static void my_xmlXPathFunction_##A(void* a, int b) \ { \ - RunFunctionFmt(my_context, my_xmlXPathFunction_fct_##A, "pi", a, b);\ + RunFunctionFmt(my_xmlXPathFunction_fct_##A, "pi", a, b);\ } SUPER() #undef GO @@ -450,7 +450,7 @@ static void* find_xmlXPathFunction_Fct(void* fct) static uintptr_t my_internalSubsetSAXFunc_fct_##A = 0; \ static void my_internalSubsetSAXFunc_##A(void* a, void* b, void* c, void* d) \ { \ - RunFunctionFmt(my_context, my_internalSubsetSAXFunc_fct_##A, "pppp", a, b, c, d); \ + RunFunctionFmt(my_internalSubsetSAXFunc_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -472,7 +472,7 @@ static void* find_internalSubsetSAXFunc_Fct(void* fct) static uintptr_t my_isStandaloneSAXFunc_fct_##A = 0; \ static int my_isStandaloneSAXFunc_##A(void* a) \ { \ - return RunFunctionFmt(my_context, my_isStandaloneSAXFunc_fct_##A, "p", a); \ + return RunFunctionFmt(my_isStandaloneSAXFunc_fct_##A, "p", a); \ } SUPER() #undef GO @@ -494,7 +494,7 @@ static void* find_isStandaloneSAXFunc_Fct(void* fct) static uintptr_t my_hasInternalSubsetSAXFunc_fct_##A = 0; \ static int my_hasInternalSubsetSAXFunc_##A(void* a) \ { \ - return RunFunctionFmt(my_context, my_hasInternalSubsetSAXFunc_fct_##A, "p", a); \ + return RunFunctionFmt(my_hasInternalSubsetSAXFunc_fct_##A, "p", a); \ } SUPER() #undef GO @@ -516,7 +516,7 @@ static void* find_hasInternalSubsetSAXFunc_Fct(void* fct) static uintptr_t my_hasExternalSubsetSAXFunc_fct_##A = 0; \ static int my_hasExternalSubsetSAXFunc_##A(void* a) \ { \ - return RunFunctionFmt(my_context, my_hasExternalSubsetSAXFunc_fct_##A, "p", a); \ + return RunFunctionFmt(my_hasExternalSubsetSAXFunc_fct_##A, "p", a); \ } SUPER() #undef GO @@ -538,7 +538,7 @@ static void* find_hasExternalSubsetSAXFunc_Fct(void* fct) static uintptr_t my_resolveEntitySAXFunc_fct_##A = 0; \ static void* my_resolveEntitySAXFunc_##A(void* a, void* b, void* c) \ { \ - return (void*)RunFunctionFmt(my_context, my_resolveEntitySAXFunc_fct_##A, "ppp", a, b, c); \ + return (void*)RunFunctionFmt(my_resolveEntitySAXFunc_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -560,7 +560,7 @@ static void* find_resolveEntitySAXFunc_Fct(void* fct) static uintptr_t my_getEntitySAXFunc_fct_##A = 0; \ static void* my_getEntitySAXFunc_##A(void* a, void* b) \ { \ - return (void*)RunFunctionFmt(my_context, my_getEntitySAXFunc_fct_##A, "pp", a, b); \ + return (void*)RunFunctionFmt(my_getEntitySAXFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -582,7 +582,7 @@ static void* find_getEntitySAXFunc_Fct(void* fct) static uintptr_t my_entityDeclSAXFunc_fct_##A = 0; \ static void my_entityDeclSAXFunc_##A(void* a, void* b, int c, void* d, void* e, void* f) \ { \ - RunFunctionFmt(my_context, my_entityDeclSAXFunc_fct_##A, "ppippp", a, b, c, d, e, f); \ + RunFunctionFmt(my_entityDeclSAXFunc_fct_##A, "ppippp", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -604,7 +604,7 @@ static void* find_entityDeclSAXFunc_Fct(void* fct) static uintptr_t my_notationDeclSAXFunc_fct_##A = 0; \ static void my_notationDeclSAXFunc_##A(void* a, void* b, void* c, void* d) \ { \ - RunFunctionFmt(my_context, my_notationDeclSAXFunc_fct_##A, "pppp", a, b, c, d); \ + RunFunctionFmt(my_notationDeclSAXFunc_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -626,7 +626,7 @@ static void* find_notationDeclSAXFunc_Fct(void* fct) static uintptr_t my_attributeDeclSAXFunc_fct_##A = 0; \ static void my_attributeDeclSAXFunc_##A(void* a, void* b, void* c, int d, int e, void* f, void* g) \ { \ - RunFunctionFmt(my_context, my_attributeDeclSAXFunc_fct_##A, "pppiipp", a, b, c, d, e, f, g); \ + RunFunctionFmt(my_attributeDeclSAXFunc_fct_##A, "pppiipp", a, b, c, d, e, f, g); \ } SUPER() #undef GO @@ -648,7 +648,7 @@ static void* find_attributeDeclSAXFunc_Fct(void* fct) static uintptr_t my_elementDeclSAXFunc_fct_##A = 0; \ static void my_elementDeclSAXFunc_##A(void* a, void* b, int c, void* d) \ { \ - RunFunctionFmt(my_context, my_elementDeclSAXFunc_fct_##A, "ppip", a, b, c, d); \ + RunFunctionFmt(my_elementDeclSAXFunc_fct_##A, "ppip", a, b, c, d); \ } SUPER() #undef GO @@ -670,7 +670,7 @@ static void* find_elementDeclSAXFunc_Fct(void* fct) static uintptr_t my_unparsedEntityDeclSAXFunc_fct_##A = 0; \ static void my_unparsedEntityDeclSAXFunc_##A(void* a, void* b, void* c, void* d, void* e) \ { \ - RunFunctionFmt(my_context, my_unparsedEntityDeclSAXFunc_fct_##A, "ppppp", a, b, c, d, e); \ + RunFunctionFmt(my_unparsedEntityDeclSAXFunc_fct_##A, "ppppp", a, b, c, d, e); \ } SUPER() #undef GO @@ -692,7 +692,7 @@ static void* find_unparsedEntityDeclSAXFunc_Fct(void* fct) static uintptr_t my_setDocumentLocatorSAXFunc_fct_##A = 0; \ static void my_setDocumentLocatorSAXFunc_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_setDocumentLocatorSAXFunc_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_setDocumentLocatorSAXFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -714,7 +714,7 @@ static void* find_setDocumentLocatorSAXFunc_Fct(void* fct) static uintptr_t my_startDocumentSAXFunc_fct_##A = 0; \ static void my_startDocumentSAXFunc_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_startDocumentSAXFunc_fct_##A, "p", a);\ + RunFunctionFmt(my_startDocumentSAXFunc_fct_##A, "p", a);\ } SUPER() #undef GO @@ -736,7 +736,7 @@ static void* find_startDocumentSAXFunc_Fct(void* fct) static uintptr_t my_endDocumentSAXFunc_fct_##A = 0; \ static void my_endDocumentSAXFunc_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_endDocumentSAXFunc_fct_##A, "p", a); \ + RunFunctionFmt(my_endDocumentSAXFunc_fct_##A, "p", a); \ } SUPER() #undef GO @@ -758,7 +758,7 @@ static void* find_endDocumentSAXFunc_Fct(void* fct) static uintptr_t my_startElementSAXFunc_fct_##A = 0; \ static void my_startElementSAXFunc_##A(void* a, void* b, void* c) \ { \ - RunFunctionFmt(my_context, my_startElementSAXFunc_fct_##A, "ppp", a, b, c); \ + RunFunctionFmt(my_startElementSAXFunc_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -780,7 +780,7 @@ static void* find_startElementSAXFunc_Fct(void* fct) static uintptr_t my_endElementSAXFunc_fct_##A = 0; \ static void my_endElementSAXFunc_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_endElementSAXFunc_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_endElementSAXFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -802,7 +802,7 @@ static void* find_endElementSAXFunc_Fct(void* fct) static uintptr_t my_referenceSAXFunc_fct_##A = 0; \ static void my_referenceSAXFunc_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_referenceSAXFunc_fct_##A, "pp", a, b);\ + RunFunctionFmt(my_referenceSAXFunc_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -824,7 +824,7 @@ static void* find_referenceSAXFunc_Fct(void* fct) static uintptr_t my_charactersSAXFunc_fct_##A = 0; \ static void my_charactersSAXFunc_##A(void* a, void* b, int c) \ { \ - RunFunctionFmt(my_context, my_charactersSAXFunc_fct_##A, "ppi", a, b, c); \ + RunFunctionFmt(my_charactersSAXFunc_fct_##A, "ppi", a, b, c); \ } SUPER() #undef GO @@ -846,7 +846,7 @@ static void* find_charactersSAXFunc_Fct(void* fct) static uintptr_t my_ignorableWhitespaceSAXFunc_fct_##A = 0; \ static void my_ignorableWhitespaceSAXFunc_##A(void* a, void* b, int c) \ { \ - RunFunctionFmt(my_context, my_ignorableWhitespaceSAXFunc_fct_##A, "ppi", a, b, c); \ + RunFunctionFmt(my_ignorableWhitespaceSAXFunc_fct_##A, "ppi", a, b, c); \ } SUPER() #undef GO @@ -868,7 +868,7 @@ static void* find_ignorableWhitespaceSAXFunc_Fct(void* fct) static uintptr_t my_processingInstructionSAXFunc_fct_##A = 0; \ static void my_processingInstructionSAXFunc_##A(void* a, void* b, void* c) \ { \ - RunFunctionFmt(my_context, my_processingInstructionSAXFunc_fct_##A, "ppp", a, b, c);\ + RunFunctionFmt(my_processingInstructionSAXFunc_fct_##A, "ppp", a, b, c);\ } SUPER() #undef GO @@ -890,7 +890,7 @@ static void* find_processingInstructionSAXFunc_Fct(void* fct) static uintptr_t my_commentSAXFunc_fct_##A = 0; \ static void my_commentSAXFunc_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_commentSAXFunc_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_commentSAXFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -912,7 +912,7 @@ static void* find_commentSAXFunc_Fct(void* fct) static uintptr_t my_warningSAXFunc_fct_##A = 0; \ static void my_warningSAXFunc_##A(void* a, void* b, void* c, void* d, void* e, void* f, void* g, void* h, void* i, void* j) \ { \ - RunFunctionFmt(my_context, my_warningSAXFunc_fct_##A, "pppppppppp", a, b, c, d, e, f, g, h, i, j); \ + RunFunctionFmt(my_warningSAXFunc_fct_##A, "pppppppppp", a, b, c, d, e, f, g, h, i, j); \ } SUPER() #undef GO @@ -934,7 +934,7 @@ static void* find_warningSAXFunc_Fct(void* fct) // this one have a VAArg static uintptr_t my_errorSAXFunc_fct_##A = 0; \ static void my_errorSAXFunc_##A(void* a, void* b, void* c, void* d, void* e, void* f, void* g, void* h, void* i, void* j) \ { \ - RunFunctionFmt(my_context, my_errorSAXFunc_fct_##A, "pppppppppp", a, b, c, d, e, f, g, h, i, j); \ + RunFunctionFmt(my_errorSAXFunc_fct_##A, "pppppppppp", a, b, c, d, e, f, g, h, i, j); \ } SUPER() #undef GO @@ -956,7 +956,7 @@ static void* find_errorSAXFunc_Fct(void* fct) // this one have a VAArg static uintptr_t my_fatalErrorSAXFunc_fct_##A = 0; \ static void my_fatalErrorSAXFunc_##A(void* a, void* b, void* c, void* d, void* e, void* f, void* g, void* h, void* i, void* j) \ { \ - RunFunctionFmt(my_context, my_fatalErrorSAXFunc_fct_##A, "pppppppppp", a, b, c, d, e, f, g, h, i, j); \ + RunFunctionFmt(my_fatalErrorSAXFunc_fct_##A, "pppppppppp", a, b, c, d, e, f, g, h, i, j); \ } SUPER() #undef GO @@ -978,7 +978,7 @@ static void* find_fatalErrorSAXFunc_Fct(void* fct) // this one have a VAArg static uintptr_t my_getParameterEntitySAXFunc_fct_##A = 0; \ static void* my_getParameterEntitySAXFunc_##A(void* a, void* b) \ { \ - return (void*)RunFunctionFmt(my_context, my_getParameterEntitySAXFunc_fct_##A, "pp", a, b); \ + return (void*)RunFunctionFmt(my_getParameterEntitySAXFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -1000,7 +1000,7 @@ static void* find_getParameterEntitySAXFunc_Fct(void* fct) // this one have a VA static uintptr_t my_cdataBlockSAXFunc_fct_##A = 0; \ static void my_cdataBlockSAXFunc_##A(void* a, void* b, int c) \ { \ - RunFunctionFmt(my_context, my_cdataBlockSAXFunc_fct_##A, "ppi", a, b, c); \ + RunFunctionFmt(my_cdataBlockSAXFunc_fct_##A, "ppi", a, b, c); \ } SUPER() #undef GO @@ -1022,7 +1022,7 @@ static void* find_cdataBlockSAXFunc_Fct(void* fct) // this one have a VAArg static uintptr_t my_externalSubsetSAXFunc_fct_##A = 0; \ static void my_externalSubsetSAXFunc_##A(void* a, void* b, void* c, void* d) \ { \ - RunFunctionFmt(my_context, my_externalSubsetSAXFunc_fct_##A, "pppp", a, b, c, d); \ + RunFunctionFmt(my_externalSubsetSAXFunc_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -1044,7 +1044,7 @@ static void* find_externalSubsetSAXFunc_Fct(void* fct) // this one have a VAArg static uintptr_t my_xmlSAX2StartElementNs_fct_##A = 0; \ static void my_xmlSAX2StartElementNs_##A(void* a, void* b, void* c, void* d, int e, void* f, int g, int h, void* i) \ { \ - RunFunctionFmt(my_context, my_xmlSAX2StartElementNs_fct_##A, "ppppipiip", a, b, c, d, e, f, g, h, i); \ + RunFunctionFmt(my_xmlSAX2StartElementNs_fct_##A, "ppppipiip", a, b, c, d, e, f, g, h, i); \ } SUPER() #undef GO @@ -1066,7 +1066,7 @@ static void* find_xmlSAX2StartElementNs_Fct(void* fct) // this one have a VAArg static uintptr_t my_xmlSAX2EndElementNs_fct_##A = 0; \ static void my_xmlSAX2EndElementNs_##A(void* a, void* b, void* c, void* d) \ { \ - RunFunctionFmt(my_context, my_xmlSAX2EndElementNs_fct_##A, "pppp", a, b, c, d); \ + RunFunctionFmt(my_xmlSAX2EndElementNs_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -1089,7 +1089,7 @@ static void* find_xmlSAX2EndElementNs_Fct(void* fct) // this one have a VAArg static uintptr_t my_xmlExternalEntityLoader_fct_##A = 0; \ static void* my_xmlExternalEntityLoader_##A(void* a, void* b, void* c) \ { \ - return (void*)RunFunctionFmt(my_context, my_xmlExternalEntityLoader_fct_##A, "ppp", a, b, c); \ + return (void*)RunFunctionFmt(my_xmlExternalEntityLoader_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedxslt.c b/src/wrapped/wrappedxslt.c index 1f6b6462..9f100066 100755 --- a/src/wrapped/wrappedxslt.c +++ b/src/wrapped/wrappedxslt.c @@ -43,7 +43,7 @@ GO(4) static uintptr_t my_xmlXPathFunction_fct_##A = 0; \ static void my_xmlXPathFunction_##A(void* a, int b) \ { \ - RunFunctionFmt(my_context, my_xmlXPathFunction_fct_##A, "pi", a, b);\ + RunFunctionFmt(my_xmlXPathFunction_fct_##A, "pi", a, b);\ } SUPER() #undef GO @@ -65,7 +65,7 @@ static void* find_xmlXPathFunction_Fct(void* fct) static uintptr_t my_xsltDocLoaderFunc_fct_##A = 0; \ static void* my_xsltDocLoaderFunc_##A(void* a, void* b, int c, void* d, int e) \ { \ - return (void*)RunFunctionFmt(my_context, my_xsltDocLoaderFunc_fct_##A, "ppipi", a, b, c, d, e); \ + return (void*)RunFunctionFmt(my_xsltDocLoaderFunc_fct_##A, "ppipi", a, b, c, d, e); \ } SUPER() #undef GO diff --git a/wrapperhelper/gen.cpp b/wrapperhelper/gen.cpp index 0bf6904b..2c63a415 100644 --- a/wrapperhelper/gen.cpp +++ b/wrapperhelper/gen.cpp @@ -206,7 +206,7 @@ std::string WrapperGenerator::GenCallbackWrap(clang::ASTContext *Ctx, res += ") {\\\n"; res += " "; res += - "return RunFunction(my_context, " + my_funcname + "_fct_##A" + ", ", + "return RunFunction(" + my_funcname + "_fct_##A" + ", ", std::to_string(arg_size); if (arg_size) { for (int i = 0; i < arg_size; i++) { @@ -266,7 +266,7 @@ std::string WrapperGenerator::GenCallbackWrap(clang::ASTContext *Ctx, } res += ") {\\\n"; res += " "; - res += "return RunFunction(my_context, " + my_funcname + "_fct_##A" + + res += "return RunFunction(" + my_funcname + "_fct_##A" + ", " + std::to_string(arg_size); if (arg_size) { for (int i = 0; i < arg_size; i++) {