diff options
Diffstat (limited to 'src')
78 files changed, 756 insertions, 766 deletions
diff --git a/src/elfs/elfloader.c b/src/elfs/elfloader.c index 7977b592..30f1a029 100755 --- a/src/elfs/elfloader.c +++ b/src/elfs/elfloader.c @@ -1277,14 +1277,14 @@ void RunElfInitPltResolver(elfheader_t* h, x64emu_t *emu) } printf_dump(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_dump(LOG_DEBUG, "Done Init for %s\n", ElfName(h)); // and check init array now Elf64_Addr *addr = (Elf64_Addr*)(h->initarray + h->delta); for (size_t i=0; i<h->initarray_sz; ++i) { if(addr[i]) { printf_dump(LOG_DEBUG, "Calling Init[%zu] 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); } } @@ -1604,7 +1604,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 box64 itself*/ \ return 0; \ - return (int)RunFunction(my_context, my_dl_iterate_phdr_fct_##A, 3, a, b, c); \ + return (int)RunFunction(my_dl_iterate_phdr_fct_##A, 3, a, b, c); \ } SUPER() #undef GO diff --git a/src/include/callback.h b/src/include/callback.h index 836c858c..48d360c5 100755 --- a/src/include/callback.h +++ b/src/include/callback.h @@ -5,14 +5,14 @@ typedef struct x64emu_s x64emu_t; -uint64_t RunFunction(box64context_t *context, uintptr_t fnc, int nargs, ...); -uint64_t RunFunctionFmt(box64context_t *context, uintptr_t fnc, const char* fmt, ...); +uint64_t RunFunction(uintptr_t fnc, int nargs, ...); +uint64_t RunFunctionFmt(uintptr_t fnc, const char* fmt, ...); // save all modified register -uint64_t RunSafeFunction(box64context_t *context, uintptr_t fnc, int nargs, ...); +uint64_t RunSafeFunction(uintptr_t fnc, int nargs, ...); // use emu state to run function uint64_t RunFunctionWithEmu(x64emu_t *emu, int QuitOnLongJumpExit, uintptr_t fnc, int nargs, ...); // using the Windows x64 calling convention -uint64_t RunFunctionWindows(box64context_t *context, uintptr_t fnc, int nargs, ...); +uint64_t RunFunctionWindows(uintptr_t fnc, int nargs, ...); #endif //__CALLBACK_H__ \ No newline at end of file diff --git a/src/libtools/obstack.c b/src/libtools/obstack.c index 42b93569..b3f2fc57 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*)RunFunction(my_context, my_chunkfun_fct_##A, 1, a); \ + return (void*)RunFunction(my_chunkfun_fct_##A, 1, 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) \ { \ - RunFunction(my_context, my_freefun_fct_##A, 1, a); \ + RunFunction(my_freefun_fct_##A, 1, a); \ } SUPER() #undef GO @@ -239,7 +239,7 @@ void actual_obstack_alloc_failed_handler() { if(ref_obstack_alloc_failed_handler == my_obstack_alloc_failed_handler) real_obstack_alloc_failed_handler(); - RunFunction(my_context, (uintptr_t)my_obstack_alloc_failed_handler, 0); + RunFunction((uintptr_t)my_obstack_alloc_failed_handler, 0); } void obstackSetup() { diff --git a/src/libtools/sdl1rwops.c b/src/libtools/sdl1rwops.c index 373600f3..ec3f8abd 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(x64emu_t* emu, SDL1_RWops_t* ops) diff --git a/src/libtools/sdl2rwops.c b/src/libtools/sdl2rwops.c index 9a1f4d07..085c7837 100755 --- a/src/libtools/sdl2rwops.c +++ b/src/libtools/sdl2rwops.c @@ -85,23 +85,23 @@ EXPORT int32_t my2_native_close(SDL2_RWops_t *context) } EXPORT int64_t my2_emulated_size(SDL2_RWops_t *context) { - return (int64_t)RunFunctionFmt(my_context, (uintptr_t)context->hidden.my.orig->size, "p", context->hidden.my.orig); + return (int64_t)RunFunctionFmt((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)RunFunctionFmt(my_context, (uintptr_t)context->hidden.my.orig->seek, "pIi", context->hidden.my.orig, offset, whence); + return (int64_t)RunFunctionFmt((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) { - int ret = (int32_t)RunFunctionFmt(my_context, (uintptr_t)context->hidden.my.orig->close, "p", context->hidden.my.orig); + int ret = (int32_t)RunFunctionFmt((uintptr_t)context->hidden.my.orig->close, "p", context->hidden.my.orig); context->hidden.my.custom_free(context); return ret; } @@ -109,12 +109,12 @@ EXPORT int32_t my2_emulated_close(SDL2_RWops_t *context) static uintptr_t emulated_sdl2allocrw = 0; EXPORT SDL2_RWops_t* my_wrapped_sdl2allocrw() { - return (SDL2_RWops_t*)RunFunctionFmt(my_context, emulated_sdl2allocrw, ""); + return (SDL2_RWops_t*)RunFunctionFmt(emulated_sdl2allocrw, ""); } static uintptr_t emulated_sdl2freerw = 0; EXPORT void my_wrapped_sdl2freerw(SDL2_RWops_t* p) { - RunFunctionFmt(my_context, emulated_sdl2freerw, "p", p); + RunFunctionFmt(emulated_sdl2freerw, "p", p); } static void checkSDL2isNative() diff --git a/src/libtools/threads.c b/src/libtools/threads.c index d70851f6..90c665e2 100755 --- a/src/libtools/threads.c +++ b/src/libtools/threads.c @@ -618,7 +618,7 @@ GO(29) static uintptr_t my_key_destructor_fct_##A = 0; \ static void my_key_destructor_##A(void* a) \ { \ - RunFunction(my_context, my_key_destructor_fct_##A, 1, a);\ + RunFunction(my_key_destructor_fct_##A, 1, a);\ } SUPER() #undef GO @@ -640,7 +640,7 @@ static void* findkey_destructorFct(void* fct) static uintptr_t my_cleanup_routine_fct_##A = 0; \ static void my_cleanup_routine_##A(void* a) \ { \ - RunFunction(my_context, my_cleanup_routine_fct_##A, 1, a);\ + RunFunction(my_cleanup_routine_fct_##A, 1, a);\ } SUPER() #undef GO diff --git a/src/mallochook.c b/src/mallochook.c index eb954efa..97897337 100644 --- a/src/mallochook.c +++ b/src/mallochook.c @@ -190,7 +190,7 @@ SUPER() EXPORT void* malloc(size_t l) { if(malloc_hack_2 && real_malloc) { - return (void*)RunFunctionFmt(my_context, real_malloc, "L", l); + return (void*)RunFunctionFmt(real_malloc, "L", l); } return box_calloc(1, l); } @@ -202,7 +202,7 @@ EXPORT void free(void* p) printf_log(LOG_DEBUG, "%04d|Malloc_Hack_2: not freeing %p\n", GetTID(), p); // Mmaped, free with original function if(real_free) - RunFunctionFmt(my_context, real_free, "p", p); + RunFunctionFmt(real_free, "p", p); return; } } @@ -212,7 +212,7 @@ EXPORT void free(void* p) EXPORT void* calloc(size_t n, size_t s) { if(malloc_hack_2 && real_calloc) { - return (void*)RunFunctionFmt(my_context, real_calloc, "LL", n,s); + return (void*)RunFunctionFmt(real_calloc, "LL", n,s); } return box_calloc(n, s); } @@ -223,7 +223,7 @@ EXPORT void* realloc(void* p, size_t s) if(getMmapped((uintptr_t)p) || (!p && real_realloc)) { void* ret = p; if(real_realloc) { - ret = (void*)RunFunctionFmt(my_context, real_realloc, "pL", p, s); + ret = (void*)RunFunctionFmt(real_realloc, "pL", p, s); } else { // found! Will realloc using regular malloc then copy from old address as much as possible, but need to check size first ret = box_malloc(s); @@ -233,7 +233,7 @@ EXPORT void* realloc(void* p, size_t s) printf_log(LOG_DEBUG, " -> %p (copied %zu from old)\n", ret, s); // Mmaped, free with original function if(real_free) - RunFunctionFmt(my_context, real_free, "p", p); + RunFunctionFmt(real_free, "p", p); } return ret; } @@ -243,7 +243,7 @@ EXPORT void* realloc(void* p, size_t s) EXPORT void* aligned_alloc(size_t align, size_t size) { if(malloc_hack_2 && real_aligned_alloc) { - return (void*)RunFunctionFmt(my_context, real_aligned_alloc, "LL", align, size); + return (void*)RunFunctionFmt(real_aligned_alloc, "LL", align, size); } return box_memalign(align, size); } @@ -251,7 +251,7 @@ EXPORT void* aligned_alloc(size_t align, size_t size) EXPORT void* memalign(size_t align, size_t size) { if(malloc_hack_2 && real_aligned_alloc) { - return (void*)RunFunctionFmt(my_context, real_aligned_alloc, "LL", align, size); + return (void*)RunFunctionFmt(real_aligned_alloc, "LL", align, size); } return box_memalign(align, size); } @@ -259,7 +259,7 @@ EXPORT void* memalign(size_t align, size_t size) EXPORT int posix_memalign(void** p, size_t align, size_t size) { if(malloc_hack_2 && real_posix_memalign) { - return RunFunctionFmt(my_context, real_posix_memalign, "pLL", p, align, size); + return RunFunctionFmt(real_posix_memalign, "pLL", p, align, size); } if(align%sizeof(void*) || pot(align)!=align) return EINVAL; @@ -273,7 +273,7 @@ EXPORT int posix_memalign(void** p, size_t align, size_t size) EXPORT void* valloc(size_t size) { if(malloc_hack_2 && real_valloc) { - return (void*)RunFunctionFmt(my_context, real_valloc, "L", size); + return (void*)RunFunctionFmt(real_valloc, "L", size); } return box_memalign(box64_pagesize, size); } @@ -281,7 +281,7 @@ EXPORT void* valloc(size_t size) EXPORT void* pvalloc(size_t size) { if(malloc_hack_2 && real_pvalloc) { - return (void*)RunFunctionFmt(my_context, real_pvalloc, "L", size); + return (void*)RunFunctionFmt(real_pvalloc, "L", size); } return box_memalign(box64_pagesize, (size+box64_pagesize-1)&~(box64_pagesize-1)); } @@ -293,7 +293,7 @@ EXPORT void cfree(void* p) printf_log(LOG_DEBUG, "%04d|Malloc_Hack_2: not freeing %p\n", GetTID(), p); // Mmaped, free with original function if(real_free) - RunFunctionFmt(my_context, real_free, "p", p); + RunFunctionFmt(real_free, "p", p); return; } } @@ -303,7 +303,7 @@ EXPORT void cfree(void* p) EXPORT size_t malloc_usable_size(void* p) { if(malloc_hack_2 && real_malloc_usable_size) { - return RunFunctionFmt(my_context, real_malloc_usable_size, "p", p); + return RunFunctionFmt(real_malloc_usable_size, "p", p); } return box_malloc_usable_size(p); } @@ -311,7 +311,7 @@ EXPORT size_t malloc_usable_size(void* p) EXPORT void* my__Znwm(size_t sz) //operator new(size_t) { if(malloc_hack_2 && real__Znwm) { - return (void*)RunFunctionFmt(my_context, real__Znwm, "L", sz); + return (void*)RunFunctionFmt(real__Znwm, "L", sz); } return box_malloc(sz); } @@ -319,7 +319,7 @@ EXPORT void* my__Znwm(size_t sz) //operator new(size_t) EXPORT void* my__ZnwmRKSt9nothrow_t(size_t sz, void* p) //operator new(size_t, std::nothrow_t const&) { if(malloc_hack_2 && real__ZnwmRKSt9nothrow_t) { - return (void*)RunFunctionFmt(my_context, real__ZnwmRKSt9nothrow_t, "Lp", sz, p); + return (void*)RunFunctionFmt(real__ZnwmRKSt9nothrow_t, "Lp", sz, p); } return box_malloc(sz); } @@ -327,7 +327,7 @@ EXPORT void* my__ZnwmRKSt9nothrow_t(size_t sz, void* p) //operator new(size_t, EXPORT void* my__Znam(size_t sz) //operator new[](size_t) { if(malloc_hack_2 && real__Znam) { - return (void*)RunFunctionFmt(my_context, real__Znam, "L", sz); + return (void*)RunFunctionFmt(real__Znam, "L", sz); } return box_malloc(sz); } @@ -335,7 +335,7 @@ EXPORT void* my__Znam(size_t sz) //operator new[](size_t) EXPORT void* my__ZnamRKSt9nothrow_t(size_t sz, void* p) //operator new[](size_t, std::nothrow_t const&) { if(malloc_hack_2 && real__ZnamRKSt9nothrow_t) { - return (void*)RunFunctionFmt(my_context, real__ZnamRKSt9nothrow_t, "Lp", sz, p); + return (void*)RunFunctionFmt(real__ZnamRKSt9nothrow_t, "Lp", sz, p); } return box_malloc(sz); } @@ -348,7 +348,7 @@ EXPORT void my__ZdaPv(void* p) //operator delete[](void*) printf_log(LOG_DEBUG, "%04d|Malloc_Hack_2: not freeing %p\n", GetTID(), p); // Mmaped, free with original function if(real__ZdaPv) - RunFunctionFmt(my_context, real__ZdaPv, "p", p); + RunFunctionFmt(real__ZdaPv, "p", p); return; } } @@ -362,7 +362,7 @@ EXPORT void my__ZdaPvm(void* p, size_t sz) //operator delete[](void*, size_t) printf_log(LOG_DEBUG, "%04d|Malloc_Hack_2: not freeing %p\n", GetTID(), p); // Mmaped, free with original function if(real__ZdaPvm) - RunFunctionFmt(my_context, real__ZdaPvm, "pL", p, sz); + RunFunctionFmt(real__ZdaPvm, "pL", p, sz); return; } } @@ -376,7 +376,7 @@ EXPORT void my__ZdaPvmSt11align_val_t(void* p, size_t sz, size_t align) //oper printf_log(LOG_DEBUG, "%04d|Malloc_Hack_2: not freeing %p\n", GetTID(), p); // Mmaped, free with original function if(real__ZdaPvmSt11align_val_t) - RunFunctionFmt(my_context, real__ZdaPvmSt11align_val_t, "pLL", p, sz, align); + RunFunctionFmt(real__ZdaPvmSt11align_val_t, "pLL", p, sz, align); return; } } @@ -390,7 +390,7 @@ EXPORT void my__ZdlPv(void* p) //operator delete(void*) printf_log(LOG_DEBUG, "%04d|Malloc_Hack_2: not freeing %p\n", GetTID(), p); // Mmaped, free with original function if(real__ZdlPv) - RunFunctionFmt(my_context, real__ZdlPv, "p", p); + RunFunctionFmt(real__ZdlPv, "p", p); return; } } @@ -404,7 +404,7 @@ EXPORT void my__ZdlPvm(void* p, size_t sz) //operator delete(void*, size_t) printf_log(LOG_DEBUG, "%04d|Malloc_Hack_2: not freeing %p\n", GetTID(), p); // Mmaped, free with original function if(real__ZdlPvm) - RunFunctionFmt(my_context, real__ZdlPvm, "pL", p, sz); + RunFunctionFmt(real__ZdlPvm, "pL", p, sz); return; } } @@ -414,7 +414,7 @@ EXPORT void my__ZdlPvm(void* p, size_t sz) //operator delete(void*, size_t) EXPORT void* my__ZnwmSt11align_val_t(size_t sz, size_t align) //// operator new(unsigned long, std::align_val_t) { if(malloc_hack_2 && real__ZnwmSt11align_val_t) { - return (void*)RunFunctionFmt(my_context, real__ZnwmSt11align_val_t, "LL", sz, align); + return (void*)RunFunctionFmt(real__ZnwmSt11align_val_t, "LL", sz, align); } return box_memalign(align, sz); } @@ -422,7 +422,7 @@ EXPORT void* my__ZnwmSt11align_val_t(size_t sz, size_t align) //// operator new EXPORT void* my__ZnwmSt11align_val_tRKSt9nothrow_t(size_t sz, size_t align, void* p) //// operator new(unsigned long, std::align_val_t, std::nothrow_t const&) { if(malloc_hack_2 && real__ZnwmSt11align_val_tRKSt9nothrow_t) { - return (void*)RunFunctionFmt(my_context, real__ZnwmSt11align_val_tRKSt9nothrow_t, "LLp", sz, align, p); + return (void*)RunFunctionFmt(real__ZnwmSt11align_val_tRKSt9nothrow_t, "LLp", sz, align, p); } return box_memalign(align, sz); } @@ -430,7 +430,7 @@ EXPORT void* my__ZnwmSt11align_val_tRKSt9nothrow_t(size_t sz, size_t align, void EXPORT void* my__ZnamSt11align_val_t(size_t sz, size_t align) //// operator new[](unsigned long, std::align_val_t) { if(malloc_hack_2 && real__ZnamSt11align_val_t) { - return (void*)RunFunctionFmt(my_context, real__ZnamSt11align_val_t, "LL", sz, align); + return (void*)RunFunctionFmt(real__ZnamSt11align_val_t, "LL", sz, align); } return box_memalign(align, sz); } @@ -438,7 +438,7 @@ EXPORT void* my__ZnamSt11align_val_t(size_t sz, size_t align) //// operator new EXPORT void* my__ZnamSt11align_val_tRKSt9nothrow_t(size_t sz, size_t align, void* p) //// operator new[](unsigned long, std::align_val_t, std::nothrow_t const&) { if(malloc_hack_2 && real__ZnamSt11align_val_tRKSt9nothrow_t) { - return (void*)RunFunctionFmt(my_context, real__ZnamSt11align_val_tRKSt9nothrow_t, "LLp", sz, align, p); + return (void*)RunFunctionFmt(real__ZnamSt11align_val_tRKSt9nothrow_t, "LLp", sz, align, p); } return box_memalign(align, sz); } @@ -450,7 +450,7 @@ EXPORT void my__ZdlPvRKSt9nothrow_t(void* p, void* n) //operator delete(void*, printf_log(LOG_DEBUG, "%04d|Malloc_Hack_2: not freeing %p\n", GetTID(), p); // Mmaped, free with original function if(real__ZdlPvRKSt9nothrow_t) - RunFunctionFmt(my_context, real__ZdlPvRKSt9nothrow_t, "pp", p, n); + RunFunctionFmt(real__ZdlPvRKSt9nothrow_t, "pp", p, n); return; } } @@ -464,7 +464,7 @@ EXPORT void my__ZdaPvSt11align_val_tRKSt9nothrow_t(void* p, size_t align, void* printf_log(LOG_DEBUG, "%04d|Malloc_Hack_2: not freeing %p\n", GetTID(), p); // Mmaped, free with original function if(real_free) - RunFunctionFmt(my_context, real_free, "p", p); + RunFunctionFmt(real_free, "p", p); return; } } @@ -478,7 +478,7 @@ EXPORT void my__ZdlPvmSt11align_val_t(void* p, size_t sz, size_t align) //oper printf_log(LOG_DEBUG, "%04d|Malloc_Hack_2: not freeing %p\n", GetTID(), p); // Mmaped, free with original function if(real_free) - RunFunctionFmt(my_context, real_free, "p", p); + RunFunctionFmt(real_free, "p", p); return; } } @@ -492,7 +492,7 @@ EXPORT void my__ZdaPvRKSt9nothrow_t(void* p, void* n) //operator delete[](void printf_log(LOG_DEBUG, "%04d|Malloc_Hack_2: not freeing %p\n", GetTID(), p); // Mmaped, free with original function if(real_free) - RunFunctionFmt(my_context, real_free, "p", p); + RunFunctionFmt(real_free, "p", p); return; } } @@ -506,7 +506,7 @@ EXPORT void my__ZdaPvSt11align_val_t(void* p, size_t align) //operator delete[ printf_log(LOG_DEBUG, "%04d|Malloc_Hack_2: not freeing %p\n", GetTID(), p); // Mmaped, free with original function if(real_free) - RunFunctionFmt(my_context, real_free, "p", p); + RunFunctionFmt(real_free, "p", p); return; } } @@ -520,7 +520,7 @@ EXPORT void my__ZdlPvSt11align_val_t(void* p, size_t align) //operator delete( printf_log(LOG_DEBUG, "%04d|Malloc_Hack_2: not freeing %p\n", GetTID(), p); // Mmaped, free with original function if(real_free) - RunFunctionFmt(my_context, real_free, "p", p); + RunFunctionFmt(real_free, "p", p); return; } } @@ -534,7 +534,7 @@ EXPORT void my__ZdlPvSt11align_val_tRKSt9nothrow_t(void* p, size_t align, void* printf_log(LOG_DEBUG, "%04d|Malloc_Hack_2: not freeing %p\n", GetTID(), p); // Mmaped, free with original function if(real__ZdlPvSt11align_val_tRKSt9nothrow_t) - RunFunctionFmt(my_context, real__ZdlPvSt11align_val_tRKSt9nothrow_t, "pLp", p, align, n); + RunFunctionFmt(real__ZdlPvSt11align_val_tRKSt9nothrow_t, "pLp", p, align, n); return; } } diff --git a/src/tools/callback.c b/src/tools/callback.c index f954869f..435ffbc7 100755 --- a/src/tools/callback.c +++ b/src/tools/callback.c @@ -14,11 +14,10 @@ #include "dynarec.h" EXPORTDYN -uint64_t RunFunction(box64context_t *context, uintptr_t fnc, int nargs, ...) +uint64_t RunFunction(x64emu_t *emu, uintptr_t fnc, int nargs, ...) { - (void)context; - - x64emu_t *emu = thread_get_emu(); + if(!emu) + emu = thread_get_emu(); int align = (nargs>6)?(((nargs-6)&1)):0; int stackn = align + ((nargs>6)?(nargs-6):0); @@ -56,10 +55,8 @@ uint64_t RunFunction(box64context_t *context, uintptr_t fnc, int nargs, ...) } EXPORTDYN -uint64_t RunFunctionFmt(box64context_t *context, uintptr_t fnc, const char* fmt, ...) +uint64_t RunFunctionFmt(uintptr_t fnc, const char* fmt, ...) { - (void)context; - x64emu_t *emu = thread_get_emu(); int nargs = 0; int ni = 0; @@ -149,11 +146,10 @@ uint64_t RunFunctionFmt(box64context_t *context, uintptr_t fnc, const char* fmt, } EXPORTDYN -uint64_t RunSafeFunction(box64context_t *context, uintptr_t fnc, int nargs, ...) +uint64_t RunSafeFunction(uintptr_t fnc, int nargs, ...) { - (void)context; + x64emu_t * emu = thread_get_emu(); - x64emu_t *emu = thread_get_emu(); int align = (nargs>6)?(((nargs-6)&1)):0; int stackn = align + ((nargs>6)?(nargs-6):0); @@ -258,10 +254,8 @@ uint64_t RunFunctionWithEmu(x64emu_t *emu, int QuitOnLongJump, uintptr_t fnc, in } EXPORTDYN -uint64_t RunFunctionWindows(box64context_t *context, uintptr_t fnc, int nargs, ...) +uint64_t RunFunctionWindows(uintptr_t fnc, int nargs, ...) { - (void)context; - x64emu_t *emu = thread_get_emu(); int align = (nargs>4)?(((nargs-4)&1)):0; int stackn = align + ((nargs>4)?(nargs-4):0); diff --git a/src/tools/gtkclass.c b/src/tools/gtkclass.c index 1e78450a..69a7cd22 100755 --- a/src/tools/gtkclass.c +++ b/src/tools/gtkclass.c @@ -63,7 +63,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, FMT, __VA_ARGS__);\ + return (RET)RunFunctionFmt(my_##NAME##_fct_##A, FMT, __VA_ARGS__);\ } #define FIND(A, NAME) \ @@ -2594,7 +2594,7 @@ SUPER() static uintptr_t my_value_init_fct_##A = 0; \ static void my_value_init_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_value_init_fct_##A, "p", a); \ + RunFunctionFmt(my_value_init_fct_##A, "p", a); \ } SUPER() #undef GO @@ -2616,7 +2616,7 @@ static void* find_value_init_Fct(void* fct) static uintptr_t my_value_free_fct_##A = 0; \ static void my_value_free_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_value_free_fct_##A, "p", a); \ + RunFunctionFmt(my_value_free_fct_##A, "p", a); \ } SUPER() #undef GO @@ -2638,7 +2638,7 @@ static void* find_value_free_Fct(void* fct) static uintptr_t my_value_copy_fct_##A = 0; \ static void my_value_copy_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_value_copy_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_value_copy_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -2660,7 +2660,7 @@ static void* find_value_copy_Fct(void* fct) static uintptr_t my_value_peek_pointer_fct_##A = 0; \ static void* my_value_peek_pointer_##A(void* a) \ { \ - return (void*)RunFunctionFmt(my_context, my_value_peek_pointer_fct_##A, "p", a);\ + return (void*)RunFunctionFmt(my_value_peek_pointer_fct_##A, "p", a);\ } SUPER() #undef GO @@ -2682,7 +2682,7 @@ static void* find_value_peek_pointer_Fct(void* fct) static uintptr_t my_collect_value_fct_##A = 0; \ static void* my_collect_value_##A(void* a, uint32_t b, void* c, uint32_t d) \ { \ - return (void*)RunFunctionFmt(my_context, my_collect_value_fct_##A, "pupu", a, b, c, d); \ + return (void*)RunFunctionFmt(my_collect_value_fct_##A, "pupu", a, b, c, d); \ } SUPER() #undef GO @@ -2704,7 +2704,7 @@ static void* find_collect_value_Fct(void* fct) static uintptr_t my_lcopy_value_fct_##A = 0; \ static void* my_lcopy_value_##A(void* a, uint32_t b, void* c, uint32_t d) \ { \ - return (void*)RunFunctionFmt(my_context, my_lcopy_value_fct_##A, "pupu", a, b, c, d); \ + return (void*)RunFunctionFmt(my_lcopy_value_fct_##A, "pupu", a, b, c, d); \ } SUPER() #undef GO @@ -2751,7 +2751,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 @@ -2773,7 +2773,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 @@ -2795,7 +2795,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 @@ -2817,7 +2817,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 @@ -2839,7 +2839,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 @@ -2861,7 +2861,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 @@ -2950,7 +2950,7 @@ SUPER() static uintptr_t my_base_init_fct_##A = 0; \ static int my_base_init_##A(void* a) \ { \ - return RunFunctionFmt(my_context, my_base_init_fct_##A, "p", a); \ + return RunFunctionFmt(my_base_init_fct_##A, "p", a); \ } SUPER() #undef GO @@ -2972,7 +2972,7 @@ static void* find_base_init_Fct(void* fct) static uintptr_t my_base_finalize_fct_##A = 0; \ static int my_base_finalize_##A(void* a) \ { \ - return RunFunctionFmt(my_context, my_base_finalize_fct_##A, "p", a); \ + return RunFunctionFmt(my_base_finalize_fct_##A, "p", a); \ } SUPER() #undef GO @@ -2996,7 +2996,7 @@ static size_t parent_class_init_##A = 0; \ static int my_class_init_##A(void* a, void* b) \ { \ printf_log(LOG_DEBUG, "Custom Class init %d for class %p (parent=%p:%s)\n", A, a, (void*)parent_class_init_##A, g_type_name(parent_class_init_##A));\ - int ret = RunFunctionFmt(my_context, my_class_init_fct_##A, "pp", a, b);\ + int ret = RunFunctionFmt(my_class_init_fct_##A, "pp", a, b);\ unwrapGTKClass(a, parent_class_init_##A); \ bridgeGTKClass(a, parent_class_init_##A); \ my_unwrap_signal_offset(a); \ @@ -3027,7 +3027,7 @@ static void* find_class_init_Fct(void* fct, size_t parent) static uintptr_t my_class_finalize_fct_##A = 0; \ static int my_class_finalize_##A(void* a, void* b) \ { \ - return RunFunctionFmt(my_context, my_class_finalize_fct_##A, "pp", a, b); \ + return RunFunctionFmt(my_class_finalize_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -3049,7 +3049,7 @@ static void* find_class_finalize_Fct(void* fct) static uintptr_t my_instance_init_fct_##A = 0; \ static int my_instance_init_##A(void* a, void* b) \ { \ - return RunFunctionFmt(my_context, my_instance_init_fct_##A, "pp", a, b);\ + return RunFunctionFmt(my_instance_init_fct_##A, "pp", a, b);\ } SUPER() #undef GO @@ -3109,7 +3109,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; \ @@ -3117,12 +3117,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() @@ -3238,7 +3238,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); @@ -3280,10 +3280,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/wrappedatk.c b/src/wrapped/wrappedatk.c index e1a23aef..773212d9 100755 --- a/src/wrapped/wrappedatk.c +++ b/src/wrapped/wrappedatk.c @@ -44,7 +44,7 @@ GO(4) static uintptr_t my_AtkEventListenerInit_fct_##A = 0; \ static void my_AtkEventListenerInit_##A() \ { \ - RunFunctionFmt(my_context, my_AtkEventListenerInit_fct_##A, "");\ + RunFunctionFmt(my_AtkEventListenerInit_fct_##A, ""); \ } SUPER() #undef GO @@ -66,7 +66,7 @@ static void* find_AtkEventListenerInit_Fct(void* fct) static uintptr_t my_AtkEventListener_fct_##A = 0; \ static void my_AtkEventListener_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_AtkEventListener_fct_##A, "p", a); \ + RunFunctionFmt(my_AtkEventListener_fct_##A, "p", a); \ } SUPER() #undef GO @@ -88,7 +88,7 @@ static void* find_AtkEventListener_Fct(void* fct) static uintptr_t my_AtkKeySnoopFunc_fct_##A = 0; \ static int my_AtkKeySnoopFunc_##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_AtkKeySnoopFunc_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_AtkKeySnoopFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -110,7 +110,7 @@ static void* find_AtkKeySnoopFunc_Fct(void* fct) static uintptr_t my_GSignalEmissionHook_fct_##A = 0; \ static int my_GSignalEmissionHook_##A(void* a, uint32_t b, void* c, void* d) \ { \ - return (int)RunFunctionFmt(my_context, my_GSignalEmissionHook_fct_##A, "pupp", a, b, c, d); \ + return (int)RunFunctionFmt(my_GSignalEmissionHook_fct_##A, "pupp", a, b, c, d); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedatspi.c b/src/wrapped/wrappedatspi.c index 59a07cce..ee1bd0d5 100755 --- a/src/wrapped/wrappedatspi.c +++ b/src/wrapped/wrappedatspi.c @@ -40,7 +40,7 @@ GO(4) 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 @@ -62,7 +62,7 @@ static void* find_GDestroyNotify_Fct(void* fct) static uintptr_t my_AtspiEventListenerCB_fct_##A = 0; \ static void my_AtspiEventListenerCB_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_AtspiEventListenerCB_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_AtspiEventListenerCB_fct_##A, "pp", a, b); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedbz2.c b/src/wrapped/wrappedbz2.c index bcf1477d..85033983 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/wrappedcrypto.c b/src/wrapped/wrappedcrypto.c index 8c5a1619..d768555d 100755 --- a/src/wrapped/wrappedcrypto.c +++ b/src/wrapped/wrappedcrypto.c @@ -40,7 +40,7 @@ GO(4) static uintptr_t my_BIO_meth_set_write_fct_##A = 0; \ static int my_BIO_meth_set_write_##A(void* a, void* b, int c) \ { \ - return (int)RunFunctionFmt(my_context, my_BIO_meth_set_write_fct_##A, "ppi", a, b, c); \ + return (int)RunFunctionFmt(my_BIO_meth_set_write_fct_##A, "ppi", a, b, c); \ } SUPER() #undef GO @@ -64,7 +64,7 @@ static void* find_BIO_meth_set_write_Fct(void* fct) static uintptr_t my_BIO_meth_set_read_fct_##A = 0; \ static int my_BIO_meth_set_read_##A(void* a, void* b, int c)\ { \ - return (int)RunFunctionFmt(my_context, my_BIO_meth_set_read_fct_##A, "ppi", a, b, c); \ + return (int)RunFunctionFmt(my_BIO_meth_set_read_fct_##A, "ppi", a, b, c); \ } SUPER() #undef GO @@ -88,7 +88,7 @@ static void* find_BIO_meth_set_read_Fct(void* fct) static uintptr_t my_BIO_meth_set_puts_fct_##A = 0; \ static int my_BIO_meth_set_puts_##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_BIO_meth_set_puts_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_BIO_meth_set_puts_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -112,7 +112,7 @@ static void* find_BIO_meth_set_puts_Fct(void* fct) static uintptr_t my_BIO_meth_set_gets_fct_##A = 0; \ static int my_BIO_meth_set_gets_##A(void* a, void* b, int c)\ { \ - return (int)RunFunctionFmt(my_context, my_BIO_meth_set_gets_fct_##A, "ppi", a, b, c); \ + return (int)RunFunctionFmt(my_BIO_meth_set_gets_fct_##A, "ppi", a, b, c); \ } SUPER() #undef GO @@ -136,7 +136,7 @@ static void* find_BIO_meth_set_gets_Fct(void* fct) static uintptr_t my_BIO_meth_set_ctrl_fct_##A = 0; \ static long my_BIO_meth_set_ctrl_##A(void* a, int b, long c, void* d) \ { \ - return (long)RunFunctionFmt(my_context, my_BIO_meth_set_ctrl_fct_##A, "pilp", a, b, c, d); \ + return (long)RunFunctionFmt(my_BIO_meth_set_ctrl_fct_##A, "pilp", a, b, c, d); \ } SUPER() #undef GO @@ -160,7 +160,7 @@ static void* find_BIO_meth_set_ctrl_Fct(void* fct) static uintptr_t my_BIO_meth_set_create_fct_##A = 0;\ static int my_BIO_meth_set_create_##A(void* a) \ { \ - return (int)RunFunctionFmt(my_context, my_BIO_meth_set_create_fct_##A, "p", a); \ + return (int)RunFunctionFmt(my_BIO_meth_set_create_fct_##A, "p", a); \ } SUPER() #undef GO @@ -184,7 +184,7 @@ static void* find_BIO_meth_set_create_Fct(void* fct) static uintptr_t my_BIO_meth_set_destroy_fct_##A = 0; \ static int my_BIO_meth_set_destroy_##A(void* a) \ { \ - return (int)RunFunctionFmt(my_context, my_BIO_meth_set_destroy_fct_##A, "p", a);\ + return (int)RunFunctionFmt(my_BIO_meth_set_destroy_fct_##A, "p", a);\ } SUPER() #undef GO @@ -208,7 +208,7 @@ static void* find_BIO_meth_set_destroy_Fct(void* fct) 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 @@ -232,7 +232,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 @@ -256,7 +256,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 @@ -280,7 +280,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 @@ -304,7 +304,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 @@ -328,7 +328,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 @@ -352,7 +352,7 @@ static void* find_passphrase_Fct(void* fct) static uintptr_t my_xnew_fct_##A = 0; \ static void* my_xnew_##A() \ { \ - return (void*)RunFunctionFmt(my_context, my_xnew_fct_##A, ""); \ + return (void*)RunFunctionFmt(my_xnew_fct_##A, ""); \ } SUPER() #undef GO @@ -376,7 +376,7 @@ static void* find_xnew_Fct(void* fct) static uintptr_t my_d2i_fct_##A = 0; \ static void* my_d2i_##A() \ { \ - return (void*)RunFunctionFmt(my_context, my_d2i_fct_##A, ""); \ + return (void*)RunFunctionFmt(my_d2i_fct_##A, ""); \ } SUPER() #undef GO @@ -400,7 +400,7 @@ static void* find_d2i_Fct(void* fct) static uintptr_t my_i2d_fct_##A = 0; \ static int my_i2d_##A() \ { \ - return (int)RunFunctionFmt(my_context, my_i2d_fct_##A, ""); \ + return (int)RunFunctionFmt(my_i2d_fct_##A, ""); \ } SUPER() #undef GO @@ -424,7 +424,7 @@ static void* find_i2d_Fct(void* fct) static uintptr_t my_pem_password_cb_fct_##A = 0; \ static int my_pem_password_cb_##A(void* a, int b, int c, void* d) \ { \ - return (int)RunFunctionFmt(my_context, my_pem_password_cb_fct_##A, "piip", a, b, c, d); \ + return (int)RunFunctionFmt(my_pem_password_cb_fct_##A, "piip", a, b, c, d); \ } SUPER() #undef GO @@ -448,7 +448,7 @@ static void* find_pem_password_cb_Fct(void* fct) static uintptr_t my_ctx_verify_cb_fct_##A = 0; \ static int my_ctx_verify_cb_##A(int a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_ctx_verify_cb_fct_##A, "ip", a, b); \ + return (int)RunFunctionFmt(my_ctx_verify_cb_fct_##A, "ip", a, b); \ } SUPER() #undef GO @@ -473,7 +473,7 @@ static void* find_ctx_verify_cb_Fct(void* fct) static uintptr_t my_verify_cb_fct_##A = 0; \ static int my_verify_cb_##A(int a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_verify_cb_fct_##A, "ip", a, b); \ + return (int)RunFunctionFmt(my_verify_cb_fct_##A, "ip", a, b); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedcrypto3.c b/src/wrapped/wrappedcrypto3.c index b86db838..a6317af8 100755 --- a/src/wrapped/wrappedcrypto3.c +++ b/src/wrapped/wrappedcrypto3.c @@ -36,10 +36,10 @@ GO(4) // ENGINE_ctrl_cb #define GO(A) \ -static uintptr_t my3_ENGINE_ctrl_cb_fct_##A = 0; \ -static void my3_ENGINE_ctrl_cb_##A() \ -{ \ - RunFunctionFmt(my_context, my3_ENGINE_ctrl_cb_fct_##A, ""); \ +static uintptr_t my3_ENGINE_ctrl_cb_fct_##A = 0; \ +static void my3_ENGINE_ctrl_cb_##A() \ +{ \ + RunFunctionFmt(my3_ENGINE_ctrl_cb_fct_##A, ""); \ } SUPER() #undef GO @@ -62,8 +62,8 @@ static void* find_ENGINE_ctrl_cb_Fct(void* fct) #define GO(A) \ static uintptr_t my3_cmp_fnc_fct_##A = 0; \ static int my3_cmp_fnc_##A(void* a, void* b) \ -{ \ - return (int)RunFunctionFmt(my_context, my3_cmp_fnc_fct_##A, "pp", a, b); \ +{ \ + return (int)RunFunctionFmt(my3_cmp_fnc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -87,7 +87,7 @@ static void* find_cmp_fnc_Fct(void* fct) static uintptr_t my3_free_fnc_fct_##A = 0; \ static void my3_free_fnc_##A(void* p) \ { \ - RunFunctionFmt(my_context, my3_free_fnc_fct_##A, "p", p); \ + RunFunctionFmt(my3_free_fnc_fct_##A, "p", p); \ } SUPER() #undef GO @@ -111,7 +111,7 @@ static void* find_free_fnc_Fct(void* fct) static uintptr_t my3_id_func_fct_##A = 0; \ static unsigned long my3_id_func_##A() \ { \ - return (unsigned long)RunFunctionFmt(my_context, my3_id_func_fct_##A, ""); \ + return (unsigned long)RunFunctionFmt(my3_id_func_fct_##A, ""); \ } SUPER() #undef GO @@ -135,7 +135,7 @@ static void* find_id_func_Fct(void* fct) static uintptr_t my3_lock_func_fct_##A = 0; \ static void my3_lock_func_##A(int mode, int n, void* f, int l) \ { \ - RunFunctionFmt(my_context, my3_lock_func_fct_##A, "iipi", mode, n, f, l); \ + RunFunctionFmt(my3_lock_func_fct_##A, "iipi", mode, n, f, l); \ } SUPER() #undef GO @@ -159,7 +159,7 @@ static void* find_lock_func_Fct(void* fct) static uintptr_t my3_passphrase_fct_##A = 0; \ static int my3_passphrase_##A(void* buff, int size, int rw, void* u) \ { \ - return (int)RunFunctionFmt(my_context, my3_passphrase_fct_##A, "piip", buff, size, rw, u); \ + return (int)RunFunctionFmt(my3_passphrase_fct_##A, "piip", buff, size, rw, u); \ } SUPER() #undef GO @@ -183,7 +183,7 @@ static void* find_passphrase_Fct(void* fct) static uintptr_t my3_xnew_fct_##A = 0; \ static void* my3_xnew_##A() \ { \ - return (void*)RunFunctionFmt(my_context, my3_xnew_fct_##A, ""); \ + return (void*)RunFunctionFmt(my3_xnew_fct_##A, ""); \ } SUPER() #undef GO @@ -207,7 +207,7 @@ static void* find_xnew_Fct(void* fct) static uintptr_t my3_d2i_fct_##A = 0; \ static void* my3_d2i_##A() \ { \ - return (void*)RunFunctionFmt(my_context, my3_d2i_fct_##A, ""); \ + return (void*)RunFunctionFmt(my3_d2i_fct_##A, ""); \ } SUPER() #undef GO @@ -231,7 +231,7 @@ static void* find_d2i_Fct(void* fct) static uintptr_t my3_i2d_fct_##A = 0; \ static int my3_i2d_##A() \ { \ - return (int)RunFunctionFmt(my_context, my3_i2d_fct_##A, ""); \ + return (int)RunFunctionFmt(my3_i2d_fct_##A, ""); \ } SUPER() #undef GO @@ -255,7 +255,7 @@ static void* find_i2d_Fct(void* fct) static uintptr_t my3_pem_password_cb_fct_##A = 0; \ static int my3_pem_password_cb_##A(void* a, int b, int c, void* d) \ { \ - return (int)RunFunctionFmt(my_context, my3_pem_password_cb_fct_##A, "piip", a, b, c, d); \ + return (int)RunFunctionFmt(my3_pem_password_cb_fct_##A, "piip", a, b, c, d); \ } SUPER() #undef GO @@ -279,7 +279,7 @@ static void* find_pem_password_cb_Fct(void* fct) static uintptr_t my3_verify_cb_fct_##A = 0; \ static int my3_verify_cb_##A(int a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my3_verify_cb_fct_##A, "ip", a, b); \ + return (int)RunFunctionFmt(my3_verify_cb_fct_##A, "ip", a, b); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedcurl.c b/src/wrapped/wrappedcurl.c index 873990f2..490d7f8d 100755 --- a/src/wrapped/wrappedcurl.c +++ b/src/wrapped/wrappedcurl.c @@ -346,7 +346,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 @@ -369,7 +369,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 @@ -392,7 +392,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 @@ -415,7 +415,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 @@ -438,7 +438,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 @@ -461,7 +461,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 @@ -484,7 +484,7 @@ static void* find_progress_Fct(void* fct) static uintptr_t my_progress_int_fct_##A = 0; \ static int my_progress_int_##A(void *clientp, uint64_t dltotal, uint64_t dlnow, uint64_t ultotal, uint64_t ulnow) \ { \ - return (int)RunFunctionFmt(my_context, my_progress_int_fct_##A, "pUUUU", clientp, dltotal, dlnow, ultotal, ulnow);\ + return (int)RunFunctionFmt(my_progress_int_fct_##A, "pUUUU", clientp, dltotal, dlnow, ultotal, ulnow);\ } SUPER() #undef GO @@ -507,7 +507,7 @@ static void* find_progress_int_Fct(void* fct) static uintptr_t my_socket_fct_##A = 0; \ static int my_socket_##A(void *a, int b, int c, void* d, void* e) \ { \ - return (int)RunFunctionFmt(my_context, my_socket_fct_##A, "piipp", a, b, c, d, e); \ + return (int)RunFunctionFmt(my_socket_fct_##A, "piipp", a, b, c, d, e); \ } SUPER() #undef GO @@ -530,7 +530,7 @@ static void* find_socket_Fct(void* fct) static uintptr_t my_timer_fct_##A = 0; \ static int my_timer_##A(void *a, long b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my_timer_fct_##A, "plp", a, b, c); \ + return (int)RunFunctionFmt(my_timer_fct_##A, "plp", a, b, c); \ } SUPER() #undef GO @@ -553,7 +553,7 @@ static void* find_timer_Fct(void* fct) static uintptr_t my_push_fct_##A = 0; \ static int my_push_##A(void *a, void* b, size_t c, void* d, void* e) \ { \ - return (int)RunFunctionFmt(my_context, my_push_fct_##A, "ppLpp", a, b, c, d, e); \ + return (int)RunFunctionFmt(my_push_fct_##A, "ppLpp", a, b, c, d, e); \ } SUPER() #undef GO @@ -576,7 +576,7 @@ static void* find_push_Fct(void* fct) static uintptr_t my_debug_fct_##A = 0; \ static int my_debug_##A(void *a, int b, void* c, size_t d, void* e) \ { \ - return (int)RunFunctionFmt(my_context, my_debug_fct_##A, "pipLp", a, b, c, d, e); \ + return (int)RunFunctionFmt(my_debug_fct_##A, "pipLp", a, b, c, d, e); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedd3dadapter9.c b/src/wrapped/wrappedd3dadapter9.c index 3629b52f..3701bbaa 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)RunFunctionWindows(my_context, my_##ns##_##fn##_fct, UNPACK call); \ + ret r = (ret)RunFunctionWindows(my_##ns##_##fn##_fct, UNPACK call); \ /* no closing brace */ #define GOV_1(ns, ret, fn, t1) \ @@ -319,13 +319,13 @@ typedef struct my_Direct3D9 { unsigned my_Direct3D9_AddRef(void *This) { my_Direct3D9 *my = This; - return RunFunctionWindows(my_context, (uintptr_t)(*my->real)->AddRef, 1, my->real); + return RunFunctionWindows((uintptr_t)(*my->real)->AddRef, 1, my->real); } unsigned my_Direct3D9_Release(void *This) { my_Direct3D9 *my = This; - return RunFunctionWindows(my_context, (uintptr_t)(*my->real)->Release, 1, my->real); + return RunFunctionWindows((uintptr_t)(*my->real)->Release, 1, 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 487d0c25..2f7fdcd4 100755 --- a/src/wrapped/wrappeddbus.c +++ b/src/wrapped/wrappeddbus.c @@ -38,7 +38,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 @@ -60,7 +60,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 @@ -82,7 +82,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 @@ -104,7 +104,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 @@ -126,7 +126,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 @@ -148,7 +148,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 @@ -171,7 +171,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 @@ -194,7 +194,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 @@ -217,7 +217,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 @@ -240,7 +240,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 @@ -263,7 +263,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 @@ -286,7 +286,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 @@ -309,7 +309,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 @@ -332,7 +332,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 @@ -355,7 +355,7 @@ static void* finddbus_internal_padFct(void* fct) static uintptr_t my_DBusNewConnectionFunction_fct_##A = 0; \ static void my_DBusNewConnectionFunction_##A(void* a, void* b, void* c) \ { \ - RunFunctionFmt(my_context, my_DBusNewConnectionFunction_fct_##A, "pppp", a, b, c); \ + RunFunctionFmt(my_DBusNewConnectionFunction_fct_##A, "pppp", a, b, c); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappeddbusglib1.c b/src/wrapped/wrappeddbusglib1.c index 61597d6b..6c9555a2 100755 --- a/src/wrapped/wrappeddbusglib1.c +++ b/src/wrapped/wrappeddbusglib1.c @@ -36,7 +36,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 @@ -59,7 +59,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 @@ -82,7 +82,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 @@ -105,7 +105,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 @@ -128,7 +128,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 @@ -150,7 +150,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/wrappedexpat.c b/src/wrapped/wrappedexpat.c index 936a53ca..783b0ca0 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 @@ -103,7 +103,7 @@ static void* find_CharData_Fct(void* fct) static uintptr_t my_StartNamespaceDecl_fct_##A = 0; \ static void my_StartNamespaceDecl_##A(void* data, void* name, void* attr) \ { \ - RunFunctionFmt(my_context, my_StartNamespaceDecl_fct_##A, "ppp", data, name, attr); \ + RunFunctionFmt(my_StartNamespaceDecl_fct_##A, "ppp", data, name, attr); \ } SUPER() #undef GO @@ -125,7 +125,7 @@ static void* find_StartNamespaceDecl_Fct(void* fct) static uintptr_t my_EndNamespaceDecl_fct_##A = 0; \ static void my_EndNamespaceDecl_##A(void* data, void* name) \ { \ - RunFunctionFmt(my_context, my_EndNamespaceDecl_fct_##A, "pp", data, name); \ + RunFunctionFmt(my_EndNamespaceDecl_fct_##A, "pp", data, name); \ } SUPER() #undef GO @@ -147,7 +147,7 @@ static void* find_EndNamespaceDecl_Fct(void* fct) static uintptr_t my_StartElement_fct_##A = 0; \ static void my_StartElement_##A(void* data, void* name, void* attr) \ { \ - RunFunctionFmt(my_context, my_StartElement_fct_##A, "ppp", data, name, attr); \ + RunFunctionFmt(my_StartElement_fct_##A, "ppp", data, name, attr); \ } SUPER() #undef GO @@ -169,7 +169,7 @@ static void* find_StartElement_Fct(void* fct) static uintptr_t my_EndElement_fct_##A = 0; \ static void my_EndElement_##A(void* data, void* name) \ { \ - RunFunctionFmt(my_context, my_EndElement_fct_##A, "pp", data, name); \ + RunFunctionFmt(my_EndElement_fct_##A, "pp", data, name); \ } SUPER() #undef GO @@ -191,7 +191,7 @@ static void* find_EndElement_Fct(void* fct) static uintptr_t my_CharacterData_fct_##A = 0; \ static void my_CharacterData_##A(void* data, void* name, int len) \ { \ - RunFunctionFmt(my_context, my_CharacterData_fct_##A, "ppi", data, name, len); \ + RunFunctionFmt(my_CharacterData_fct_##A, "ppi", data, name, len); \ } SUPER() #undef GO @@ -213,7 +213,7 @@ static void* find_CharacterData_Fct(void* fct) static uintptr_t my_ProcessingInstruction_fct_##A = 0; \ static void my_ProcessingInstruction_##A(void* a, void* b, void* c) \ { \ - RunFunctionFmt(my_context, my_ProcessingInstruction_fct_##A, "ppp", a, b, c); \ + RunFunctionFmt(my_ProcessingInstruction_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -235,7 +235,7 @@ static void* find_ProcessingInstruction_Fct(void* fct) static uintptr_t my_Comment_fct_##A = 0; \ static void my_Comment_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_Comment_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_Comment_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -257,7 +257,7 @@ static void* find_Comment_Fct(void* fct) static uintptr_t my_StartCdataSection_fct_##A = 0; \ static void my_StartCdataSection_##A(void* data) \ { \ - RunFunctionFmt(my_context, my_StartCdataSection_fct_##A, "p", data); \ + RunFunctionFmt(my_StartCdataSection_fct_##A, "p", data); \ } SUPER() #undef GO @@ -279,7 +279,7 @@ static void* find_StartCdataSection_Fct(void* fct) static uintptr_t my_EndCdataSection_fct_##A = 0; \ static void my_EndCdataSection_##A(void* data) \ { \ - RunFunctionFmt(my_context, my_EndCdataSection_fct_##A, "p", data); \ + RunFunctionFmt(my_EndCdataSection_fct_##A, "p", data); \ } SUPER() #undef GO @@ -301,7 +301,7 @@ static void* find_EndCdataSection_Fct(void* fct) static uintptr_t my_Default_fct_##A = 0; \ static void my_Default_##A(void* data, void* name, int len) \ { \ - RunFunctionFmt(my_context, my_Default_fct_##A, "ppi", data, name, len); \ + RunFunctionFmt(my_Default_fct_##A, "ppi", data, name, len); \ } SUPER() #undef GO @@ -323,7 +323,7 @@ static void* find_Default_Fct(void* fct) static uintptr_t my_StartDoctypeDecl_fct_##A = 0; \ static void my_StartDoctypeDecl_##A(void* a, void* b, void* c, void* d, int e) \ { \ - RunFunctionFmt(my_context, my_StartDoctypeDecl_fct_##A, "ppppi", a, b, c, d, e); \ + RunFunctionFmt(my_StartDoctypeDecl_fct_##A, "ppppi", a, b, c, d, e); \ } SUPER() #undef GO @@ -345,7 +345,7 @@ static void* find_StartDoctypeDecl_Fct(void* fct) static uintptr_t my_EndDoctypeDecl_fct_##A = 0; \ static void my_EndDoctypeDecl_##A(void* data) \ { \ - RunFunctionFmt(my_context, my_EndDoctypeDecl_fct_##A, "p", data); \ + RunFunctionFmt(my_EndDoctypeDecl_fct_##A, "p", data); \ } SUPER() #undef GO @@ -367,7 +367,7 @@ static void* find_EndDoctypeDecl_Fct(void* fct) static uintptr_t my_EntityDecl_fct_##A = 0; \ static void my_EntityDecl_##A(void* a, void* b, int c, void* d, int e, void* f, void* g, void* h, void* i) \ { \ - RunFunctionFmt(my_context, my_EntityDecl_fct_##A, "ppipipppp", a, b, c, d, e, f, g, h, i); \ + RunFunctionFmt(my_EntityDecl_fct_##A, "ppipipppp", a, b, c, d, e, f, g, h, i); \ } SUPER() #undef GO @@ -389,7 +389,7 @@ static void* find_EntityDecl_Fct(void* fct) static uintptr_t my_ElementDecl_fct_##A = 0; \ static void my_ElementDecl_##A(void* a, void* b, void* c) \ { \ - RunFunctionFmt(my_context, my_ElementDecl_fct_##A, "ppp", a, b, c); \ + RunFunctionFmt(my_ElementDecl_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -411,7 +411,7 @@ static void* find_ElementDecl_Fct(void* fct) static uintptr_t my_UnknownEncoding_fct_##A = 0; \ static int my_UnknownEncoding_##A(void* a, void* b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my_UnknownEncoding_fct_##A, "ppp", a, b, c); \ + return (int)RunFunctionFmt(my_UnknownEncoding_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -433,7 +433,7 @@ static void* find_UnknownEncoding_Fct(void* fct) static uintptr_t my_UnparsedEntityDecl_fct_##A = 0; \ static void my_UnparsedEntityDecl_##A(void* a, void* b, void* c, void* d, void* e, void* f) \ { \ - RunFunctionFmt(my_context, my_UnparsedEntityDecl_fct_##A, "pppppp", a, b, c, d, e, f); \ + RunFunctionFmt(my_UnparsedEntityDecl_fct_##A, "pppppp", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -455,7 +455,7 @@ static void* find_UnparsedEntityDecl_Fct(void* fct) static uintptr_t my_NotationDecl_fct_##A = 0; \ static void my_NotationDecl_##A(void* a, void* b, void* c, void* d, void* e) \ { \ - RunFunctionFmt(my_context, my_NotationDecl_fct_##A, "ppppp", a, b, c, d, e); \ + RunFunctionFmt(my_NotationDecl_fct_##A, "ppppp", a, b, c, d, e); \ } SUPER() #undef GO @@ -477,7 +477,7 @@ static void* find_NotationDecl_Fct(void* fct) static uintptr_t my_NotStandalone_fct_##A = 0; \ static int my_NotStandalone_##A(void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_NotStandalone_fct_##A, "p", data); \ + return (int)RunFunctionFmt(my_NotStandalone_fct_##A, "p", data); \ } SUPER() #undef GO @@ -499,7 +499,7 @@ static void* find_NotStandalone_Fct(void* fct) static uintptr_t my_ExternalEntityRef_fct_##A = 0; \ static int my_ExternalEntityRef_##A(void* a, void* b, void* c, void* d, void* e) \ { \ - return (int)RunFunctionFmt(my_context, my_ExternalEntityRef_fct_##A, "ppppp", a, b, c, d, e); \ + return (int)RunFunctionFmt(my_ExternalEntityRef_fct_##A, "ppppp", a, b, c, d, e); \ } SUPER() #undef GO @@ -521,7 +521,7 @@ static void* find_ExternalEntityRef_Fct(void* fct) static uintptr_t my_XmlDecl_fct_##A = 0; \ static void my_XmlDecl_##A(void* a, void* b, void* c, int d) \ { \ - RunFunctionFmt(my_context, my_XmlDecl_fct_##A, "pppi", a, b, c, d); \ + RunFunctionFmt(my_XmlDecl_fct_##A, "pppi", a, b, c, d); \ } SUPER() #undef GO @@ -543,7 +543,7 @@ static void* find_XmlDecl_Fct(void* fct) static uintptr_t my_AttlistDecl_fct_##A = 0; \ static void my_AttlistDecl_##A(void* a, void* b, void* c, void* d, void* e, int f) \ { \ - RunFunctionFmt(my_context, my_AttlistDecl_fct_##A, "pppppi", a, b, c, d, e, f); \ + RunFunctionFmt(my_AttlistDecl_fct_##A, "pppppi", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -565,7 +565,7 @@ static void* find_AttlistDecl_Fct(void* fct) static uintptr_t my_SkippedEntity_fct_##A = 0; \ static void my_SkippedEntity_##A(void* a, void* b, int c) \ { \ - RunFunctionFmt(my_context, my_SkippedEntity_fct_##A, "ppi", a, b, c); \ + RunFunctionFmt(my_SkippedEntity_fct_##A, "ppi", a, b, c); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedfaudio.c b/src/wrapped/wrappedfaudio.c index 13435027..619799ec 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/wrappedflac.c b/src/wrapped/wrappedflac.c index 45e8b059..bc1919ca 100755 --- a/src/wrapped/wrappedflac.c +++ b/src/wrapped/wrappedflac.c @@ -54,7 +54,7 @@ GO(7) static uintptr_t my_read_write_fct_##A = 0; \ static unsigned long my_read_write_##A(void* ptr, unsigned long size, unsigned long nmemb, void* handle) \ { \ - return RunFunctionFmt(my_context, my_read_write_fct_##A, "pLLp", ptr, size, nmemb, handle); \ + return RunFunctionFmt(my_read_write_fct_##A, "pLLp", ptr, size, nmemb, handle); \ } SUPER() #undef GO @@ -76,7 +76,7 @@ static void* findread_writeFct(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 @@ -98,7 +98,7 @@ static void* findseekFct(void* fct) static uintptr_t my_close_eof_fct_##A = 0; \ static int my_close_eof_##A(void* ptr) \ { \ - return (int)RunFunctionFmt(my_context, my_close_eof_fct_##A, "p", ptr); \ + return (int)RunFunctionFmt(my_close_eof_fct_##A, "p", ptr); \ } SUPER() #undef GO @@ -120,7 +120,7 @@ static void* findclose_eofFct(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 @@ -142,7 +142,7 @@ static void* findtellFct(void* fct) static uintptr_t my_Read_fct_##A = 0; \ static int my_Read_##A(void* decoder, void* buffer, size_t* bytes, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_Read_fct_##A, "pppp", decoder, buffer, bytes, data); \ + return (int)RunFunctionFmt(my_Read_fct_##A, "pppp", decoder, buffer, bytes, data); \ } SUPER() #undef GO @@ -164,7 +164,7 @@ static void* findReadFct(void* fct) static uintptr_t my_Seek_fct_##A = 0; \ static int my_Seek_##A(void* decoder, uint64_t offset, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_Seek_fct_##A, "pUp", decoder, offset, data); \ + return (int)RunFunctionFmt(my_Seek_fct_##A, "pUp", decoder, offset, data); \ } SUPER() #undef GO @@ -186,7 +186,7 @@ static void* findSeekFct(void* fct) static uintptr_t my_Tell_fct_##A = 0; \ static int my_Tell_##A(void* decoder, uint64_t *offset, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_Tell_fct_##A, "ppp", decoder, offset, data); \ + return (int)RunFunctionFmt(my_Tell_fct_##A, "ppp", decoder, offset, data); \ } SUPER() #undef GO @@ -208,7 +208,7 @@ static void* findTellFct(void* fct) static uintptr_t my_Length_fct_##A = 0; \ static int my_Length_##A(void* decoder, uint64_t *length, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_Length_fct_##A, "ppp", decoder, length, data); \ + return (int)RunFunctionFmt(my_Length_fct_##A, "ppp", decoder, length, data); \ } SUPER() #undef GO @@ -230,7 +230,7 @@ static void* findLengthFct(void* fct) static uintptr_t my_Eof_fct_##A = 0; \ static int my_Eof_##A(void* decoder, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_Eof_fct_##A, "pp", decoder, data); \ + return (int)RunFunctionFmt(my_Eof_fct_##A, "pp", decoder, data); \ } SUPER() #undef GO @@ -252,7 +252,7 @@ static void* findEofFct(void* fct) static uintptr_t my_Write_fct_##A = 0; \ static int my_Write_##A(void* decoder, void* frame, void* buffer, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_Write_fct_##A, "pppp", decoder, frame, buffer, data); \ + return (int)RunFunctionFmt(my_Write_fct_##A, "pppp", decoder, frame, buffer, data); \ } SUPER() #undef GO @@ -274,7 +274,7 @@ static void* findWriteFct(void* fct) static uintptr_t my_Metadata_fct_##A = 0; \ static int my_Metadata_##A(void* decoder, void* metadata, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_Metadata_fct_##A, "ppp", decoder, metadata, data); \ + return (int)RunFunctionFmt(my_Metadata_fct_##A, "ppp", decoder, metadata, data); \ } SUPER() #undef GO @@ -296,7 +296,7 @@ static void* findMetadataFct(void* fct) static uintptr_t my_Error_fct_##A = 0; \ static void my_Error_##A(void* decoder, int status, void* data) \ { \ - RunFunctionFmt(my_context, my_Error_fct_##A, "pip", decoder, status, data); \ + RunFunctionFmt(my_Error_fct_##A, "pip", decoder, status, data); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedfreetype.c b/src/wrapped/wrappedfreetype.c index 6088f033..4ced9be3 100755 --- a/src/wrapped/wrappedfreetype.c +++ b/src/wrapped/wrappedfreetype.c @@ -136,7 +136,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 @@ -159,7 +159,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); \ @@ -187,7 +187,7 @@ static void* find_FTC_Face_Requester_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 @@ -210,7 +210,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 @@ -233,7 +233,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 @@ -256,7 +256,7 @@ static void* find_FT_Realloc_Fct(void* fct) static uintptr_t my_FT_Outline_MoveToFunc_fct_##A = 0; \ static int my_FT_Outline_MoveToFunc_##A(void* to, void* user) \ { \ - return (int)RunFunctionFmt(my_context, my_FT_Outline_MoveToFunc_fct_##A, "pp", to, user); \ + return (int)RunFunctionFmt(my_FT_Outline_MoveToFunc_fct_##A, "pp", to, user); \ } SUPER() #undef GO @@ -280,7 +280,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* to, void* user) \ { \ - return (int)RunFunctionFmt(my_context, my_FT_Outline_LineToFunc_fct_##A, "pp", to, user); \ + return (int)RunFunctionFmt(my_FT_Outline_LineToFunc_fct_##A, "pp", to, user); \ } SUPER() #undef GO @@ -304,7 +304,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* ctl, void* to, void* user) \ { \ - return (int)RunFunctionFmt(my_context, my_FT_Outline_ConicToFunc_fct_##A, "ppp", ctl, to, user); \ + return (int)RunFunctionFmt(my_FT_Outline_ConicToFunc_fct_##A, "ppp", ctl, to, user); \ } SUPER() #undef GO @@ -328,7 +328,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* ctl1, void* ctl2, void* to, void* user) \ { \ - return (int)RunFunctionFmt(my_context, my_FT_Outline_CubicToFunc_fct_##A, "pppp", ctl1, ctl2, to, user); \ + return (int)RunFunctionFmt(my_FT_Outline_CubicToFunc_fct_##A, "pppp", ctl1, ctl2, to, user); \ } SUPER() #undef GO @@ -378,13 +378,13 @@ static FT_MemoryRec_t* find_FT_MemoryRec_Struct(FT_MemoryRec_t* s) static uintptr_t my_iofunc = 0; static unsigned long my_FT_Stream_IoFunc(FT_StreamRec_t* stream, unsigned long offset, unsigned char* buffer, unsigned long count ) { - return (unsigned long)RunFunctionFmt(my_context, my_iofunc, "pLpL", stream, offset, buffer, count); + return (unsigned long)RunFunctionFmt(my_iofunc, "pLpL", stream, offset, buffer, count) ; } static uintptr_t my_closefunc = 0; static void my_FT_Stream_CloseFunc(FT_StreamRec_t* stream) { - RunFunctionFmt(my_context, my_closefunc, "p", stream); + RunFunctionFmt(my_closefunc, "p", stream) ; } EXPORT int my_FT_Open_Face(x64emu_t* emu, void* library, FT_Open_Args_t* args, long face_index, void* aface) diff --git a/src/wrapped/wrappedgconf2.c b/src/wrapped/wrappedgconf2.c index 200f4750..ec651e6e 100644 --- a/src/wrapped/wrappedgconf2.c +++ b/src/wrapped/wrappedgconf2.c @@ -37,7 +37,7 @@ GO(3) static uintptr_t my_GFreeFct_fct_##A = 0; \ static void my_GFreeFct_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_GFreeFct_fct_##A, "p", a); \ + RunFunctionFmt(my_GFreeFct_fct_##A, "p", a); \ } SUPER() #undef GO @@ -59,7 +59,7 @@ static void* findGFreeFctFct(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 940d64ca..aea28c68 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 @@ -62,7 +62,7 @@ static void* findFilterFct(void* fct) static uintptr_t my_GSourceFunc_fct_##A = 0; \ static int my_GSourceFunc_##A(void* a) \ { \ - return (int)RunFunctionFmt(my_context, my_GSourceFunc_fct_##A, "p", a); \ + return (int)RunFunctionFmt(my_GSourceFunc_fct_##A, "p", a); \ } SUPER() #undef GO @@ -84,7 +84,7 @@ static void* findGSourceFunc(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 @@ -107,7 +107,7 @@ static void* findGDestroyNotifyFct(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(x64emu_t* emu, void* func, void* data, void* notify) @@ -122,7 +122,7 @@ EXPORT void my3_gdk_event_handler_set(x64emu_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(x64emu_t* emu, int source, int condition, void* f, void* data) diff --git a/src/wrapped/wrappedgdkpixbuf2.c b/src/wrapped/wrappedgdkpixbuf2.c index 09adebe7..34770c8c 100755 --- a/src/wrapped/wrappedgdkpixbuf2.c +++ b/src/wrapped/wrappedgdkpixbuf2.c @@ -35,7 +35,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 15a0ba41..cb627311 100755 --- a/src/wrapped/wrappedgdkx112.c +++ b/src/wrapped/wrappedgdkx112.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 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(x64emu_t* emu, void* func, void* data, void* notify) @@ -76,7 +76,7 @@ EXPORT void my_gdk_event_handler_set(x64emu_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(x64emu_t* emu, int source, int condition, void* f, void* data) diff --git a/src/wrapped/wrappedgio2.c b/src/wrapped/wrappedgio2.c index fd7380fb..30f7b683 100755 --- a/src/wrapped/wrappedgio2.c +++ b/src/wrapped/wrappedgio2.c @@ -43,7 +43,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 @@ -66,7 +66,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 @@ -89,7 +89,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 @@ -112,7 +112,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 @@ -135,7 +135,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 @@ -158,7 +158,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 @@ -181,7 +181,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 @@ -204,7 +204,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 @@ -227,7 +227,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 @@ -250,7 +250,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 @@ -273,7 +273,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 @@ -296,7 +296,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 @@ -331,15 +331,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* invocation, void* user_data) { \ - RunFunctionFmt(my_context, fct_funcs_method_call_##A, "ppppppp", connection, sender, object_path, interface_name, method_name, invocation, user_data); \ + RunFunctionFmt(fct_funcs_method_call_##A, "ppppppp", connection, sender, object_path, interface_name, method_name, 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* error, void* user_data) { \ - return (void*)RunFunctionFmt(my_context, fct_funcs_get_property_##A, "pppppp", connection, sender, object_path, interface_name, error, user_data); \ + return (void*)RunFunctionFmt(fct_funcs_get_property_##A, "pppppp", connection, sender, object_path, interface_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* value, void* error, void* user_data) { \ - return (int)RunFunctionFmt(my_context, fct_funcs_set_property_##A, "ppppppp", connection, sender, object_path, interface_name, value, error, user_data); \ + return (int)RunFunctionFmt(fct_funcs_set_property_##A, "ppppppp", connection, sender, object_path, interface_name, value, error, user_data); \ } SUPER() diff --git a/src/wrapped/wrappedglib2.c b/src/wrapped/wrappedglib2.c index 0c5c3101..5614314d 100755 --- a/src/wrapped/wrappedglib2.c +++ b/src/wrapped/wrappedglib2.c @@ -57,7 +57,7 @@ EXPORT void* my_g_build_filename(x64emu_t* emu, void* first, uintptr_t* 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(x64emu_t* emu, uint32_t interval, void* func, void* data) { @@ -92,7 +92,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 @@ -114,7 +114,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 @@ -136,7 +136,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 @@ -164,26 +164,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 @@ -217,7 +217,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 @@ -249,7 +249,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 @@ -271,7 +271,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 @@ -293,7 +293,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 @@ -315,7 +315,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 @@ -337,7 +337,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 @@ -359,7 +359,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 @@ -381,7 +381,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 @@ -403,7 +403,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 @@ -425,7 +425,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 @@ -447,7 +447,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 @@ -469,7 +469,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 @@ -491,7 +491,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 @@ -513,7 +513,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 @@ -535,7 +535,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 @@ -557,7 +557,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 @@ -579,7 +579,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 @@ -609,7 +609,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 @@ -639,7 +639,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 @@ -669,7 +669,7 @@ static void* reverseGOptionArgFct(void* fct) static uintptr_t my_GNodeTraverseFunc_fct_##A = 0; \ static int my_GNodeTraverseFunc_##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_GNodeTraverseFunc_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_GNodeTraverseFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -691,7 +691,7 @@ static void* findGNodeTraverseFuncFct(void* fct) static uintptr_t my_GThreadFunc_fct_##A = 0; \ static void* my_GThreadFunc_##A(void* a) \ { \ - return (void*)RunFunctionFmt(my_context, my_GThreadFunc_fct_##A, "p", a); \ + return (void*)RunFunctionFmt(my_GThreadFunc_fct_##A, "p", a); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedgnutls.c b/src/wrapped/wrappedgnutls.c index ce6fead1..dd4cde20 100755 --- a/src/wrapped/wrappedgnutls.c +++ b/src/wrapped/wrappedgnutls.c @@ -38,7 +38,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 @@ -62,7 +62,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 @@ -86,7 +86,7 @@ static void* find_pullpush_Fct(void* fct) static uintptr_t my_timeout_fct_##A = 0; \ static int my_timeout_##A(void* p, uint32_t t) \ { \ - return (int)RunFunctionFmt(my_context, my_timeout_fct_##A, "pu", p, t); \ + return (int)RunFunctionFmt(my_timeout_fct_##A, "pu", p, t); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedgobject2.c b/src/wrapped/wrappedgobject2.c index 9a9df389..d51a736f 100755 --- a/src/wrapped/wrappedgobject2.c +++ b/src/wrapped/wrappedgobject2.c @@ -67,11 +67,11 @@ static int signal_cb(void* a, void* b, void* c, void* d, void* e) } printf_log(LOG_DEBUG, "gobject2 Signal called, sig=%p, handler=%p, NArgs=%d\n", sig, sig?(void*)sig->c_handler:NULL, 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 5: return (int)RunFunctionFmt(my_context, sig->c_handler, "ppppp", a, b, c, d, 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); + case 5: return (int)RunFunctionFmt(sig->c_handler, "ppppp", a, b, c, d, sig->data); } printf_log(LOG_NONE, "Warning, GObject2 signal callback but no data found!\n"); return 0; @@ -80,47 +80,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); free(sig); @@ -270,7 +270,7 @@ GO(12) \ 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 @@ -291,7 +291,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 @@ -312,7 +312,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 @@ -335,7 +335,7 @@ static void* findAccumulatorFct(void* fct) 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) \ { \ - RunFunctionFmt(my_context, my_marshal_fct_##A, "ppuppp", closure, return_value, n, values, hint, data); \ + RunFunctionFmt(my_marshal_fct_##A, "ppuppp", closure, return_value, n, values, hint, data); \ } SUPER() #undef GO @@ -358,7 +358,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 @@ -381,7 +381,7 @@ static void* findGClosureNotify_Fct(void* fct) static uintptr_t my_valuetransform_fct_##A = 0; \ static void my_valuetransform_##A(void* src, void* dst) \ { \ - RunFunctionFmt(my_context, my_valuetransform_fct_##A, "pp", src, dst); \ + RunFunctionFmt(my_valuetransform_fct_##A, "pp", src, dst); \ } SUPER() #undef GO @@ -404,7 +404,7 @@ static void* findValueTransformFct(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 @@ -427,7 +427,7 @@ static void* findDestroyFct(void* fct) static uintptr_t my_weaknotifyfunc_fct_##A = 0; \ static int my_weaknotifyfunc_##A(void* a, void* b) \ { \ - return RunFunctionFmt(my_context, my_weaknotifyfunc_fct_##A, "pp", a, b); \ + return RunFunctionFmt(my_weaknotifyfunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -450,7 +450,7 @@ static void* findWeakNotifyFct(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 @@ -490,23 +490,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() @@ -543,7 +543,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 @@ -565,7 +565,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 @@ -587,7 +587,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 @@ -732,7 +732,7 @@ EXPORT void my_g_value_register_transform_func(x64emu_t* emu, size_t src, size_t static int my_signal_emission_hook(void* ihint, uint32_t n, void* values, my_signal_t* sig) { printf_log(LOG_DEBUG, "gobject2 Signal Emission Hook called, sig=%p\n", sig); - return (int)RunFunctionFmt(my_context, sig->c_handler, "pupp", ihint, n, values, sig->data); + return (int)RunFunctionFmt(sig->c_handler, "pupp", ihint, n, values, sig->data); } EXPORT unsigned long my_g_signal_add_emission_hook(x64emu_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 1e23a20e..8a279866 100644 --- a/src/wrapped/wrappedgstreamer.c +++ b/src/wrapped/wrappedgstreamer.c @@ -54,7 +54,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 @@ -78,7 +78,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 @@ -101,7 +101,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 @@ -124,7 +124,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 @@ -147,7 +147,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 @@ -170,7 +170,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 @@ -191,7 +191,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 @@ -213,7 +213,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 @@ -235,7 +235,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 3fdfaf79..87a7bd7a 100755 --- a/src/wrapped/wrappedgtk3.c +++ b/src/wrapped/wrappedgtk3.c @@ -102,7 +102,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 @@ -125,7 +125,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 @@ -148,7 +148,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 @@ -171,7 +171,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 @@ -194,7 +194,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 @@ -217,7 +217,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 @@ -240,7 +240,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 @@ -263,7 +263,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 @@ -286,7 +286,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 @@ -309,7 +309,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 @@ -331,7 +331,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 @@ -354,7 +354,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 @@ -377,7 +377,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 @@ -400,7 +400,7 @@ static void* findGtkTreeIterCompareFuncFct(void* fct) static uintptr_t my_GtkPrinterFunc_fct_##A = 0; \ static int my_GtkPrinterFunc_##A(void* printer, void* data) \ { \ - return RunFunctionFmt(my_context, my_GtkPrinterFunc_fct_##A, "pp", printer, data); \ + return RunFunctionFmt(my_GtkPrinterFunc_fct_##A, "pp", printer, data); \ } SUPER() #undef GO @@ -423,7 +423,7 @@ static void* findGtkPrinterFuncFct(void* fct) static uintptr_t my_GtkPrintJobCompleteHunc_fct_##A = 0; \ static void my_GtkPrintJobCompleteHunc_##A(void* job, void* data, void* error) \ { \ - RunFunctionFmt(my_context, my_GtkPrintJobCompleteHunc_fct_##A, "ppp", job, data, error); \ + RunFunctionFmt(my_GtkPrintJobCompleteHunc_fct_##A, "ppp", job, data, error); \ } SUPER() #undef GO @@ -447,7 +447,7 @@ static void* findGtkPrintJobCompleteHuncFct(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 @@ -557,7 +557,7 @@ EXPORT int my3_gtk_clipboard_set_with_owner(x64emu_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(x64emu_t* emu, void* domain, void* f, void* data, void* notify) diff --git a/src/wrapped/wrappedgtkx112.c b/src/wrapped/wrappedgtkx112.c index 7d6fdf3a..462f924f 100755 --- a/src/wrapped/wrappedgtkx112.c +++ b/src/wrapped/wrappedgtkx112.c @@ -153,7 +153,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 @@ -176,7 +176,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 @@ -199,7 +199,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 @@ -222,7 +222,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 @@ -245,7 +245,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 @@ -268,7 +268,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 @@ -291,7 +291,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 @@ -314,7 +314,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 @@ -337,7 +337,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 @@ -360,7 +360,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 @@ -383,7 +383,7 @@ static void* findGtkCellLayoutDataFuncFct(void* fct) static uintptr_t my_GtkTreeCellDataFunc_fct_##A = 0; \ static void my_GtkTreeCellDataFunc_##A(void* column, void* cell, void* tree, void* iter, void* data) \ { \ - RunFunctionFmt(my_context, my_GtkTreeCellDataFunc_fct_##A, "ppppp", column, cell, tree, iter, data); \ + RunFunctionFmt(my_GtkTreeCellDataFunc_fct_##A, "ppppp", column, cell, tree, iter, data); \ } SUPER() #undef GO @@ -407,7 +407,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 @@ -430,7 +430,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 @@ -453,7 +453,7 @@ static void* findGtkTreeModelForeachFuncFct(void* fct) static uintptr_t my_GtkTreeSelectionSelectedForeachFunc_fct_##A = 0; \ static int my_GtkTreeSelectionSelectedForeachFunc_##A(void* selection, void* path, void* iter, void* data) \ { \ - return (int)RunFunctionFmt(my_context, my_GtkTreeSelectionSelectedForeachFunc_fct_##A, "pppp", selection, path, iter, data); \ + return (int)RunFunctionFmt(my_GtkTreeSelectionSelectedForeachFunc_fct_##A, "pppp", selection, path, iter, data); \ } SUPER() #undef GO @@ -476,7 +476,7 @@ static void* findGtkTreeSelectionSelectedForeachFuncFct(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 @@ -499,7 +499,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 @@ -522,7 +522,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 @@ -545,7 +545,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 @@ -568,7 +568,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, "pii", data, source, cond); \ + RunFunctionFmt(my_GdkInputFunction_fct_##A, "pii", data, source, cond); \ } SUPER() #undef GO @@ -591,7 +591,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 @@ -613,7 +613,7 @@ static void* findGtkCallbackMarshalFct(void* fct) static uintptr_t my_GtkPrinterFunc_fct_##A = 0; \ static int my_GtkPrinterFunc_##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_GtkPrinterFunc_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_GtkPrinterFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -635,7 +635,7 @@ static void* find_GtkPrinterFunc_Fct(void* fct) static uintptr_t my_GtkFileFilterFunc_fct_##A = 0; \ static int my_GtkFileFilterFunc_##A(void* a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my_GtkFileFilterFunc_fct_##A, "pp", a, b); \ + return (int)RunFunctionFmt(my_GtkFileFilterFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -657,7 +657,7 @@ static void* find_GtkFileFilterFunc_Fct(void* fct) static uintptr_t my_GtkPrintJobCompleteFunc_fct_##A = 0; \ static void my_GtkPrintJobCompleteFunc_##A(void* a, void* b, void* c) \ { \ - RunFunctionFmt(my_context, my_GtkPrintJobCompleteFunc_fct_##A, "ppp", a, b, c); \ + RunFunctionFmt(my_GtkPrintJobCompleteFunc_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -680,7 +680,7 @@ static void* find_GtkPrintJobCompleteFunc_Fct(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 @@ -833,7 +833,7 @@ EXPORT int my_gtk_clipboard_set_with_owner(x64emu_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(x64emu_t* emu, void* domain, void* f, void* data, void* notify) diff --git a/src/wrapped/wrappedkrb5.c b/src/wrapped/wrappedkrb5.c index f703e549..abad8c5d 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, "ppppip", a, b, c, d, e, f); \ + return RunFunctionFmt(my_krb5_prompter_fct_##A, "ppppip", a, b, c, d, e, f); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedldapr.c b/src/wrapped/wrappedldapr.c index 3db8b0a8..fbaee982 100755 --- a/src/wrapped/wrappedldapr.c +++ b/src/wrapped/wrappedldapr.c @@ -44,7 +44,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 74910772..c49f3912 100755 --- a/src/wrapped/wrappedlibasound.c +++ b/src/wrapped/wrappedlibasound.c @@ -50,7 +50,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 @@ -72,7 +72,7 @@ static void* findAsyncFct(void* fct) static uintptr_t my_elem_fct_##A = 0; \ static int my_elem_##A(void* elem, uint32_t mask) \ { \ - return (int)RunFunctionFmt(my_context, my_elem_fct_##A, "pu", elem, mask); \ + return (int)RunFunctionFmt(my_elem_fct_##A, "pu", elem, mask); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c index ee580147..cb218412 100755 --- a/src/wrapped/wrappedlibc.c +++ b/src/wrapped/wrappedlibc.c @@ -134,7 +134,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 @@ -160,7 +160,7 @@ static int my_ftw64_##A(void* fpath, void* sb, int flag) \ { \ struct x64_stat64 x64st; \ UnalignStat64(sb, &x64st); \ - return (int)RunFunctionFmt(my_context, my_ftw64_fct_##A, "ppi", fpath, &x64st, flag); \ + return (int)RunFunctionFmt(my_ftw64_fct_##A, "ppi", fpath, &x64st, flag); \ } SUPER() #undef GO @@ -184,7 +184,7 @@ static int my_nftw64_##A(void* fpath, void* sb, int flag, void* ftwbuff) \ { \ struct x64_stat64 x64st; \ UnalignStat64(sb, &x64st); \ - return (int)RunFunctionFmt(my_context, my_nftw64_fct_##A, "ppip", fpath, &x64st, flag, ftwbuff); \ + return (int)RunFunctionFmt(my_nftw64_fct_##A, "ppip", fpath, &x64st, flag, ftwbuff); \ } SUPER() #undef GO @@ -205,7 +205,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 @@ -228,7 +228,7 @@ static void* findgloberrFct(void* fct) static uintptr_t my_free_fct_##A = 0; \ static void my_free_##A(void* p) \ { \ - RunFunctionFmt(my_context, my_free_fct_##A, "p", p); \ + RunFunctionFmt(my_free_fct_##A, "p", p); \ } SUPER() #undef GO @@ -254,7 +254,7 @@ static void* findfreeFct(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 @@ -277,7 +277,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 @@ -302,7 +302,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 @@ -325,7 +325,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 @@ -348,7 +348,7 @@ static void* findcompare64Fct(void* fct) static uintptr_t my_printf_output_fct_##A = 0; \ static int my_printf_output_##A(void* a, void* b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my_printf_output_fct_##A, "ppp", a, b, c); \ + return (int)RunFunctionFmt(my_printf_output_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -371,7 +371,7 @@ static void* findprintf_outputFct(void* fct) static uintptr_t my_printf_arginfo_fct_##A = 0; \ static int my_printf_arginfo_##A(void* a, size_t b, void* c, void* d) \ { \ - return (int)RunFunctionFmt(my_context, my_printf_arginfo_fct_##A, "pLpp", a, b, c, d); \ + return (int)RunFunctionFmt(my_printf_arginfo_fct_##A, "pLpp", a, b, c, d); \ } SUPER() #undef GO @@ -394,7 +394,7 @@ static void* findprintf_arginfoFct(void* fct) static uintptr_t my_printf_type_fct_##A = 0; \ static void my_printf_type_##A(void* a, va_list* b) \ { \ - RunFunctionFmt(my_context, my_printf_type_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_printf_type_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -2734,24 +2734,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) ; box_free(cookie); return ret; } diff --git a/src/wrapped/wrappedlibcups.c b/src/wrapped/wrappedlibcups.c index 478b5c06..16ea4725 100755 --- a/src/wrapped/wrappedlibcups.c +++ b/src/wrapped/wrappedlibcups.c @@ -39,7 +39,7 @@ GO(4) static uintptr_t my_cups_dest_cb_t_fct_##A = 0; \ static int my_cups_dest_cb_t_##A(void* a, uint32_t b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my_cups_dest_cb_t_fct_##A, "pup", a, b, c); \ + return (int)RunFunctionFmt(my_cups_dest_cb_t_fct_##A, "pup", a, b, c); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibfuse.c b/src/wrapped/wrappedlibfuse.c index b02468da..2bac5099 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, "pLL", a, b, c); \ + RunFunctionFmt(my_forget_fct_##A, "pLL", 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, "pLpuL", a, b, c, of_convert(d), e); \ + RunFunctionFmt(my_mknod_fct_##A, "pLpuL", 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, "pLpu", a, b, c, of_convert(d)); \ + RunFunctionFmt(my_mkdir_fct_##A, "pLpu", 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 x64_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 x64_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, "pippup", a, b, c, d, e, f); \ + return (int)RunFunctionFmt(my_ioctl_op_fct_##A, "pippup", 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 153190de..1d5eb930 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, "iiuiipp", a, b, c, d, e, f, g); \ + RunFunctionFmt(my_debug_callback_fct_##A, "iiuiipp", 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 839ef5d2..8c370876 100755 --- a/src/wrapped/wrappedlibglu.c +++ b/src/wrapped/wrappedlibglu.c @@ -42,7 +42,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 @@ -64,7 +64,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 @@ -86,7 +86,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/wrappedlibharfbuzz.c b/src/wrapped/wrappedlibharfbuzz.c index 479285df..8f4bb2c9 100644 --- a/src/wrapped/wrappedlibharfbuzz.c +++ b/src/wrapped/wrappedlibharfbuzz.c @@ -210,7 +210,7 @@ struct hb_unicode_funcs_t static uintptr_t my_buffer_message_fct_##A = 0; \ static int my_buffer_message_##A(void* a, void* b, void* c, void* d)\ { \ - return (int)RunFunctionFmt(my_context, my_buffer_message_fct_##A, "pppp", a, b, c, d); \ + return (int)RunFunctionFmt(my_buffer_message_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -233,7 +233,7 @@ static void* find_buffer_message_Fct(void* fct) static uintptr_t my_draw_close_path_fct_##A = 0; \ static void my_draw_close_path_##A(void* a, void* b, void* c, void* d) \ { \ - RunFunctionFmt(my_context, my_draw_close_path_fct_##A, "pppp", a, b, c, d); \ + RunFunctionFmt(my_draw_close_path_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -256,7 +256,7 @@ static void* find_draw_close_path_Fct(void* fct) static uintptr_t my_draw_cubic_to_fct_##A = 0; \ static void my_draw_cubic_to_##A(void* a, void* b, void* c, float d1, float d2, float d3, float d4, float d5, float d6, void* e) \ { \ - RunFunctionFmt(my_context, my_draw_cubic_to_fct_##A, "pppffffffp", a, b, c, d1, d2, d3, d4, d5, d6, e); \ + RunFunctionFmt(my_draw_cubic_to_fct_##A, "pppffffffp", a, b, c, d1, d2, d3, d4, d5, d6, e); \ } SUPER() #undef GO @@ -279,7 +279,7 @@ static void* find_draw_cubic_to_Fct(void* fct) static uintptr_t my_draw_line_or_move_to_fct_##A = 0; \ static void my_draw_line_or_move_to_##A(void* a, void* b, void* c, float d1, float d2, void* e) \ { \ - RunFunctionFmt(my_context, my_draw_line_or_move_to_fct_##A, "pppffp", a, b, c, d1, d2, e); \ + RunFunctionFmt(my_draw_line_or_move_to_fct_##A, "pppffp", a, b, c, d1, d2, e); \ } SUPER() #undef GO @@ -302,7 +302,7 @@ static void* find_draw_line_or_move_to_Fct(void* fct) static uintptr_t my_draw_quadratic_to_fct_##A = 0; \ static void my_draw_quadratic_to_##A(void* a, void* b, void* c, float d1, float d2, float d3, float d4, void* e) \ { \ - RunFunctionFmt(my_context, my_draw_quadratic_to_fct_##A, "pppffffp", a, b, c, d1, d2, d3, d4, e); \ + RunFunctionFmt(my_draw_quadratic_to_fct_##A, "pppffffp", a, b, c, d1, d2, d3, d4, e); \ } SUPER() #undef GO @@ -325,7 +325,7 @@ static void* find_draw_quadratic_to_Fct(void* fct) static uintptr_t my_reference_table_fct_##A = 0; \ static void* my_reference_table_##A(void* a, uint32_t b, void* c) \ { \ - return (void*)RunFunctionFmt(my_context, my_reference_table_fct_##A, "pup", a, b, c); \ + return (void*)RunFunctionFmt(my_reference_table_fct_##A, "pup", a, b, c); \ } SUPER() #undef GO @@ -348,7 +348,7 @@ static void* find_reference_table_Fct(void* fct) static uintptr_t my_unicode_combining_class_fct_##A = 0; \ static uint32_t my_unicode_combining_class_##A(void* a, uint32_t b, void* c)\ { \ - return (uint32_t)RunFunctionFmt(my_context, my_unicode_combining_class_fct_##A, "pup", a, b, c); \ + return (uint32_t)RunFunctionFmt(my_unicode_combining_class_fct_##A, "pup", a, b, c); \ } SUPER() #undef GO @@ -371,7 +371,7 @@ static void* find_unicode_combining_class_Fct(void* fct) static uintptr_t my_unicode_compose_fct_##A = 0; \ static int my_unicode_compose_##A(void* a, uint32_t b, uint32_t c, void* d, void* e)\ { \ - return (int)RunFunctionFmt(my_context, my_unicode_compose_fct_##A, "puupp", a, b, c, d, e); \ + return (int)RunFunctionFmt(my_unicode_compose_fct_##A, "puupp", a, b, c, d, e); \ } SUPER() #undef GO @@ -394,7 +394,7 @@ static void* find_unicode_compose_Fct(void* fct) static uintptr_t my_unicode_decompose_compatibility_fct_##A = 0; \ static uint32_t my_unicode_decompose_compatibility_##A(void* a, uint32_t b, void* c, void* d) \ { \ - return (uint32_t)RunFunctionFmt(my_context, my_unicode_decompose_compatibility_fct_##A, "pupp", a, b, c, d); \ + return (uint32_t)RunFunctionFmt(my_unicode_decompose_compatibility_fct_##A, "pupp", a, b, c, d); \ } SUPER() #undef GO @@ -417,7 +417,7 @@ static void* find_unicode_decompose_compatibility_Fct(void* fct) static uintptr_t my_unicode_decompose_fct_##A = 0; \ static int my_unicode_decompose_##A(void* a, uint32_t b, void* c, void* d, void* e) \ { \ - return (int)RunFunctionFmt(my_context, my_unicode_decompose_fct_##A, "puppp", a, b, c, d, e); \ + return (int)RunFunctionFmt(my_unicode_decompose_fct_##A, "puppp", a, b, c, d, e); \ } SUPER() #undef GO @@ -440,7 +440,7 @@ static void* find_unicode_decompose_Fct(void* fct) static uintptr_t my_unicode_eastasian_width_fct_##A = 0; \ static uint32_t my_unicode_eastasian_width_##A(void* a, uint32_t b, void* c) \ { \ - return (uint32_t)RunFunctionFmt(my_context, my_unicode_eastasian_width_fct_##A, "pup", a, b, c); \ + return (uint32_t)RunFunctionFmt(my_unicode_eastasian_width_fct_##A, "pup", a, b, c); \ } SUPER() #undef GO @@ -463,7 +463,7 @@ static void* find_unicode_eastasian_width_Fct(void* fct) static uintptr_t my_unicode_general_category_fct_##A = 0; \ static uint32_t my_unicode_general_category_##A(void* a, uint32_t b, void* c) \ { \ - return (uint32_t)RunFunctionFmt(my_context, my_unicode_general_category_fct_##A, "pup", a, b, c); \ + return (uint32_t)RunFunctionFmt(my_unicode_general_category_fct_##A, "pup", a, b, c); \ } SUPER() #undef GO @@ -486,7 +486,7 @@ static void* find_unicode_general_category_Fct(void* fct) static uintptr_t my_unicode_mirroring_fct_##A = 0; \ static uint32_t my_unicode_mirroring_##A(void* a, uint32_t b, void* c) \ { \ - return (uint32_t)RunFunctionFmt(my_context, my_unicode_mirroring_fct_##A, "pup", a, b, c); \ + return (uint32_t)RunFunctionFmt(my_unicode_mirroring_fct_##A, "pup", a, b, c); \ } SUPER() #undef GO @@ -509,7 +509,7 @@ static void* find_unicode_mirroring_Fct(void* fct) static uintptr_t my_unicode_script_fct_##A = 0; \ static uint32_t my_unicode_script_##A(void* a, uint32_t b, void* c) \ { \ - return (uint32_t)RunFunctionFmt(my_context, my_unicode_script_fct_##A, "pup", a, b, c); \ + return (uint32_t)RunFunctionFmt(my_unicode_script_fct_##A, "pup", a, b, c); \ } SUPER() #undef GO @@ -532,7 +532,7 @@ static void* find_unicode_script_Fct(void* fct) static uintptr_t my_font_extents_fct_##A = 0; \ static int my_font_extents_##A(void* a, void* b, void* c, void* d) \ { \ - return (int)RunFunctionFmt(my_context, my_font_extents_fct_##A, "pppp", a, b, c, d); \ + return (int)RunFunctionFmt(my_font_extents_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -555,7 +555,7 @@ static void* find_font_extents_Fct(void* fct) static uintptr_t my_glyph_advance_fct_##A = 0; \ static int my_glyph_advance_##A(void* a, void* b, uint32_t c, void* d) \ { \ - return (int)RunFunctionFmt(my_context, my_glyph_advance_fct_##A, "ppup", a, b, c, d); \ + return (int)RunFunctionFmt(my_glyph_advance_fct_##A, "ppup", a, b, c, d); \ } SUPER() #undef GO @@ -578,7 +578,7 @@ static void* find_glyph_advance_Fct(void* fct) static uintptr_t my_glyph_advances_fct_##A = 0; \ static void my_glyph_advances_##A(void* a, void* b, uint32_t c, void* d, uint32_t e, void* f, uint32_t g, void* h) \ { \ - RunFunctionFmt(my_context, my_glyph_advances_fct_##A, "ppupupup", a, b, c, d, e, f, g, h); \ + RunFunctionFmt(my_glyph_advances_fct_##A, "ppupupup", a, b, c, d, e, f, g, h); \ } SUPER() #undef GO @@ -601,7 +601,7 @@ static void* find_glyph_advances_Fct(void* fct) static uintptr_t my_glyph_kerning_fct_##A = 0; \ static int my_glyph_kerning_##A(void* a, void* b, uint32_t c, uint32_t d, void* e) \ { \ - return (int)RunFunctionFmt(my_context, my_glyph_kerning_fct_##A, "ppuup", a, b, c, d, e); \ + return (int)RunFunctionFmt(my_glyph_kerning_fct_##A, "ppuup", a, b, c, d, e); \ } SUPER() #undef GO @@ -624,7 +624,7 @@ static void* find_glyph_kerning_Fct(void* fct) static uintptr_t my_glyph_origin_fct_##A = 0; \ static int my_glyph_origin_##A(void* a, void* b, uint32_t c, void* d, void* e, void* f) \ { \ - return (int)RunFunctionFmt(my_context, my_glyph_origin_fct_##A, "ppuppp", a, b, c, d, e, f); \ + return (int)RunFunctionFmt(my_glyph_origin_fct_##A, "ppuppp", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -647,7 +647,7 @@ static void* find_glyph_origin_Fct(void* fct) static uintptr_t my_glyph_contour_pointfct_##A = 0; \ static int my_glyph_contour_point##A(void* a, void* b, uint32_t c, uint32_t d, void* e, void* f, void* g) \ { \ - return (int)RunFunctionFmt(my_context, my_glyph_contour_pointfct_##A, "ppuuppp", a, b, c, d, e, f, g); \ + return (int)RunFunctionFmt(my_glyph_contour_pointfct_##A, "ppuuppp", a, b, c, d, e, f, g); \ } SUPER() #undef GO @@ -670,7 +670,7 @@ static void* find_glyph_contour_point_Fct(void* fct) static uintptr_t my_glyph_extents_fct_##A = 0; \ static int my_glyph_extents_##A(void* a, void* b, uint32_t c, void* d, void* e) \ { \ - return (int)RunFunctionFmt(my_context, my_glyph_extents_fct_##A, "ppupp", a, b, c, d, e); \ + return (int)RunFunctionFmt(my_glyph_extents_fct_##A, "ppupp", a, b, c, d, e); \ } SUPER() #undef GO @@ -693,7 +693,7 @@ static void* find_glyph_extents_Fct(void* fct) static uintptr_t my_glyph_from_name_fct_##A = 0; \ static int my_glyph_from_name_##A(void* a, void* b, void* c, int d, void* e, void* f) \ { \ - return (int)RunFunctionFmt(my_context, my_glyph_from_name_fct_##A, "pppipp", a, b, c, d, e, f); \ + return (int)RunFunctionFmt(my_glyph_from_name_fct_##A, "pppipp", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -721,7 +721,7 @@ static void* find_glyph_from_name_Fct(void* fct) static uintptr_t my_glyph_fct_##A = 0; \ static int my_glyph_##A(void* a, void* b, uint32_t c, uint32_t d, void* e, void* f) \ { \ - return (int)RunFunctionFmt(my_context, my_glyph_fct_##A, "ppuupp", a, b, c, d, e, f); \ + return (int)RunFunctionFmt(my_glyph_fct_##A, "ppuupp", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -744,7 +744,7 @@ static void* find_glyph_Fct(void* fct) static uintptr_t my_glyph_name_fct_##A = 0; \ static int my_glyph_name_##A(void* a, void* b, uint32_t c, void* d, uint32_t e, void* f) \ { \ - return (int)RunFunctionFmt(my_context, my_glyph_name_fct_##A, "ppupup", a, b, c, d, e, f); \ + return (int)RunFunctionFmt(my_glyph_name_fct_##A, "ppupup", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -767,7 +767,7 @@ static void* find_glyph_name_Fct(void* fct) static uintptr_t my_glyph_shape_fct_##A = 0; \ static void my_glyph_shape_##A(void* a, void* b, uint32_t c, void* d, void* e, void* f) \ { \ - RunFunctionFmt(my_context, my_glyph_shape_fct_##A, "ppuppp", a, b, c, d, e, f); \ + RunFunctionFmt(my_glyph_shape_fct_##A, "ppuppp", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -790,7 +790,7 @@ static void* find_glyph_shape_Fct(void* fct) static uintptr_t my_nominal_glyph_fct_##A = 0; \ static int my_nominal_glyph_##A(void* a, void* b, uint32_t c, void* d, void* e) \ { \ - return (int)RunFunctionFmt(my_context, my_nominal_glyph_fct_##A, "ppupp", a, b, c, d, e); \ + return (int)RunFunctionFmt(my_nominal_glyph_fct_##A, "ppupp", a, b, c, d, e); \ } SUPER() #undef GO @@ -818,7 +818,7 @@ static void* find_nominal_glyph_Fct(void* fct) static uintptr_t my_nominal_glyphs_fct_##A = 0; \ static uint32_t my_nominal_glyphs_##A(void* a, void* b, uint32_t c, void* d, uint32_t e, void* f, uint32_t g, void* h) \ { \ - return (uint32_t)RunFunctionFmt(my_context, my_nominal_glyphs_fct_##A, "ppupupup", a, b, c, d, e, f, g, h); \ + return (uint32_t)RunFunctionFmt(my_nominal_glyphs_fct_##A, "ppupupup", a, b, c, d, e, f, g, h); \ } SUPER() #undef GO @@ -841,7 +841,7 @@ static void* find_nominal_glyphs_Fct(void* fct) static uintptr_t my_variation_glyph_fct_##A = 0;\ static int my_variation_glyph_##A(void* a, void* b, uint32_t c, uint32_t d, void* e, void* f) \ { \ - return (int)RunFunctionFmt(my_context, my_variation_glyph_fct_##A, "ppuupp", a, b, c, d, e, f); \ + return (int)RunFunctionFmt(my_variation_glyph_fct_##A, "ppuupp", a, b, c, d, e, f); \ } SUPER() #undef GO @@ -864,7 +864,7 @@ static void* find_variation_glyph_Fct(void* fct) static uintptr_t my_destroy_fct_##A = 0; \ static void my_destroy_##A(void* a) \ { \ - RunFunctionFmt(my_context, my_destroy_fct_##A, "p", a); \ + RunFunctionFmt(my_destroy_fct_##A, "p", a); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibibus.c b/src/wrapped/wrappedlibibus.c index 2b99bdec..22d83a2c 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/wrappedlibpcre.c b/src/wrapped/wrappedlibpcre.c index 88834ecf..9d3b606c 100755 --- a/src/wrapped/wrappedlibpcre.c +++ b/src/wrapped/wrappedlibpcre.c @@ -20,7 +20,7 @@ typedef void (*pcre_free_t)(void *); EXPORT uintptr_t my_pcre_free; void wrapped_pcre_free(void* p) { - RunFunctionFmt(my_context, my_pcre_free, "p", p); + RunFunctionFmt(my_pcre_free, "p", p); } EXPORT pcre_free_t pcre_free = wrapped_pcre_free; diff --git a/src/wrapped/wrappedlibrt.c b/src/wrapped/wrappedlibrt.c index c8fde49e..f89d353f 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, "p", sigval);\ + RunFunctionFmt(my_sigev_notify_fct_##A, "p", sigval);\ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibsm.c b/src/wrapped/wrappedlibsm.c index 8c46d241..1ab0c30f 100755 --- a/src/wrapped/wrappedlibsm.c +++ b/src/wrapped/wrappedlibsm.c @@ -54,25 +54,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); } @@ -102,7 +102,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 ac7ec35d..bbb11b56 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)RunFunctionFmt(my_context, my_sf_vio_get_filelen_fct_##A, "p", a); \ + return (int64_t)RunFunctionFmt(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)RunFunctionFmt(my_context, my_sf_vio_seek_fct_##A, "Iip", offset, whence, user_data); \ + return (int64_t)RunFunctionFmt(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)RunFunctionFmt(my_context, my_sf_vio_read_fct_##A, "pIp", ptr, count, user_data); \ + return (int64_t)RunFunctionFmt(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)RunFunctionFmt(my_context, my_sf_vio_write_fct_##A, "pIp", ptr, count, user_data); \ + return (int64_t)RunFunctionFmt(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)RunFunctionFmt(my_context, my_sf_vio_tell_fct_##A, "p", a); \ + return (int64_t)RunFunctionFmt(my_sf_vio_tell_fct_##A, "p", a); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibssl.c b/src/wrapped/wrappedlibssl.c index e60d2664..056c2ef9 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, "ip", a, b); \ + return (int)RunFunctionFmt(my_verify_fct_##A, "ip", a, b); \ } SUPER() #undef GO @@ -124,7 +124,7 @@ static void* reverse_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 @@ -148,7 +148,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, "pppilp", parent, ptr, ad, idx, argl, argp); \ + RunFunctionFmt(my_ex_free_fct_##A, "pppilp", parent, ptr, ad, idx, argl, argp); \ } SUPER() #undef GO @@ -172,7 +172,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 @@ -196,7 +196,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 @@ -221,7 +221,7 @@ static void* find_client_cb_Fct(void* fct) static uintptr_t my_server_cb_fct_##A = 0; \ static uint32_t my_server_cb_##A(void* ssl, void* identity, void* psk, uint32_t psk_len) \ { \ - return RunFunctionFmt(my_context, my_server_cb_fct_##A, "pppu", ssl, identity, psk, psk_len); \ + return RunFunctionFmt(my_server_cb_fct_##A, "pppu", ssl, identity, psk, psk_len); \ } SUPER() #undef GO @@ -246,7 +246,7 @@ static void* find_server_cb_Fct(void* fct) static uintptr_t my_use_session_cb_fct_##A = 0; \ static uint32_t my_use_session_cb_##A(void* ssl, void* md, void* id, void* id_len, void* sess) \ { \ - return RunFunctionFmt(my_context, my_use_session_cb_fct_##A, "ppppp", ssl, md, id, id_len, sess); \ + return RunFunctionFmt(my_use_session_cb_fct_##A, "ppppp", ssl, md, id, id_len, sess); \ } SUPER() #undef GO @@ -270,7 +270,7 @@ static void* find_use_session_cb_Fct(void* fct) static uintptr_t my_sess_fct_##A = 0; \ static uint32_t my_sess_##A(void* ssl, void* sess) \ { \ - return RunFunctionFmt(my_context, my_sess_fct_##A, "pp", ssl, sess);\ + return RunFunctionFmt(my_sess_fct_##A, "pp", ssl, sess);\ } SUPER() #undef GO @@ -294,7 +294,7 @@ static void* find_sess_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 @@ -318,7 +318,7 @@ static void* find_proto_select_Fct(void* fct) static uintptr_t my_client_cert_fct_##A = 0; \ static int my_client_cert_##A(void* a, void* b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my_client_cert_fct_##A, "ppp", a, b, c); \ + return (int)RunFunctionFmt(my_client_cert_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -342,7 +342,7 @@ static void* find_client_cert_Fct(void* fct) static uintptr_t my_cookie_generate_fct_##A = 0; \ static int my_cookie_generate_##A(void* a, void* b, void* c)\ { \ - return (int)RunFunctionFmt(my_context, my_cookie_generate_fct_##A, "ppp", a, b, c); \ + return (int)RunFunctionFmt(my_cookie_generate_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -367,7 +367,7 @@ static void* find_cookie_generate_Fct(void* fct) static uintptr_t my_cookie_verify_fct_##A = 0; \ static int my_cookie_verify_##A(void* a, void* b, uint32_t c) \ { \ - return (int)RunFunctionFmt(my_context, my_cookie_verify_fct_##A, "ppu", a, b, c); \ + return (int)RunFunctionFmt(my_cookie_verify_fct_##A, "ppu", a, b, c); \ } SUPER() #undef GO @@ -391,7 +391,7 @@ static void* find_cookie_verify_Fct(void* fct) static uintptr_t my_alpn_select_fct_##A = 0; \ static int my_alpn_select_##A(void* a, void* b, void* c, void* d, uint32_t e, void* f) \ { \ - return (int)RunFunctionFmt(my_context, my_alpn_select_fct_##A, "ppppup", a, b, c, d, e, f); \ + return (int)RunFunctionFmt(my_alpn_select_fct_##A, "ppppup", a, b, c, d, e, f); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibssl3.c b/src/wrapped/wrappedlibssl3.c index 38ba5444..23d2e3b5 100755 --- a/src/wrapped/wrappedlibssl3.c +++ b/src/wrapped/wrappedlibssl3.c @@ -37,7 +37,7 @@ GO(4) static uintptr_t my3_pem_passwd_cb_fct_##A = 0; \ static int my3_pem_passwd_cb_##A(void* buf, int size, int rwflag, void* password) \ { \ - return (int)RunFunctionFmt(my_context, my3_pem_passwd_cb_fct_##A, "piip", buf, size, rwflag, password); \ + return (int)RunFunctionFmt(my3_pem_passwd_cb_fct_##A, "piip", buf, size, rwflag, password); \ } SUPER() #undef GO @@ -61,7 +61,7 @@ static void* find_pem_passwd_cb_Fct(void* fct) static uintptr_t my3_anonymous_fct_##A = 0; \ static void* my3_anonymous_##A(void* a, void* b, void* c, void *d) \ { \ - return (void*)RunFunctionFmt(my_context, my3_anonymous_fct_##A, "pppp", a, b, c, d); \ + return (void*)RunFunctionFmt(my3_anonymous_fct_##A, "pppp", a, b, c, d); \ } SUPER() #undef GO @@ -86,7 +86,7 @@ static void* find_anonymous_Fct(void* fct) static uintptr_t my3_verify_fct_##A = 0; \ static int my3_verify_##A(int a, void* b) \ { \ - return (int)RunFunctionFmt(my_context, my3_verify_fct_##A, "ip", a, b); \ + return (int)RunFunctionFmt(my3_verify_fct_##A, "ip", a, b); \ } SUPER() #undef GO @@ -120,7 +120,7 @@ static void* reverse_verify_Fct(void* fct) static uintptr_t my3_ex_new_fct_##A = 0; \ static void my3_ex_new_##A(void* parent, void* ptr, void* ad, int idx, long argl, void* argp) \ { \ - RunFunctionFmt(my_context, my3_ex_new_fct_##A, "pppilp", parent, ptr, ad, idx, argl, argp); \ + RunFunctionFmt(my3_ex_new_fct_##A, "pppilp", parent, ptr, ad, idx, argl, argp); \ } SUPER() #undef GO @@ -144,7 +144,7 @@ static void* find_ex_new_Fct(void* fct) static uintptr_t my3_ex_free_fct_##A = 0; \ static void my3_ex_free_##A(void* parent, void* ptr, void* ad, int idx, long argl, void* argp) \ { \ - RunFunctionFmt(my_context, my3_ex_free_fct_##A, "pppilp", parent, ptr, ad, idx, argl, argp); \ + RunFunctionFmt(my3_ex_free_fct_##A, "pppilp", parent, ptr, ad, idx, argl, argp); \ } SUPER() #undef GO @@ -168,7 +168,7 @@ static void* find_ex_free_Fct(void* fct) static uintptr_t my3_ex_dup_fct_##A = 0; \ static int my3_ex_dup_##A(void* to, void* from, void* from_d, int idx, long argl, void* argp) \ { \ - return (int) RunFunctionFmt(my_context, my3_ex_dup_fct_##A, "pppilp", to, from, from_d, idx, argl, argp); \ + return (int) RunFunctionFmt(my3_ex_dup_fct_##A, "pppilp", to, from, from_d, idx, argl, argp); \ } SUPER() #undef GO @@ -192,7 +192,7 @@ static void* find_ex_dup_Fct(void* fct) static uintptr_t my3_client_cb_fct_##A = 0; \ static uint32_t my3_client_cb_##A(void* ssl, void* hint, void* identity, uint32_t id_len, void* psk, uint32_t psk_len) \ { \ - return RunFunctionFmt(my_context, my3_client_cb_fct_##A, "pppupu", ssl, hint, identity, id_len, psk, psk_len); \ + return RunFunctionFmt(my3_client_cb_fct_##A, "pppupu", ssl, hint, identity, id_len, psk, psk_len); \ } SUPER() #undef GO @@ -216,7 +216,7 @@ static void* find_client_cb_Fct(void* fct) static uintptr_t my3_proto_select_fct_##A = 0; \ static int my3_proto_select_##A(void* s, void* out, void* outlen, void* in, uint32_t inlen, void* arg) \ { \ - return (int)RunFunctionFmt(my_context, my3_proto_select_fct_##A, "ppppup", s, out, outlen, in, inlen, arg); \ + return (int)RunFunctionFmt(my3_proto_select_fct_##A, "ppppup", s, out, outlen, in, inlen, arg); \ } SUPER() #undef GO @@ -240,7 +240,7 @@ static void* find_proto_select_Fct(void* fct) static uintptr_t my3_client_cert_fct_##A = 0; \ static int my3_client_cert_##A(void* a, void* b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my3_client_cert_fct_##A, "ppp", a, b, c); \ + return (int)RunFunctionFmt(my3_client_cert_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -264,7 +264,7 @@ static void* find_client_cert_Fct(void* fct) static uintptr_t my3_alpn_select_cb_fct_##A = 0; \ static int my3_alpn_select_cb_##A(void* a, void* b, void* c, void* d, uint32_t e, void* f) \ { \ - return (int)RunFunctionFmt(my_context, my3_alpn_select_cb_fct_##A, "ppppup", a, b, c, d, e, f); \ + return (int)RunFunctionFmt(my3_alpn_select_cb_fct_##A, "ppppup", a, b, c, d, e, f); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibtinfo.c b/src/wrapped/wrappedlibtinfo.c index 125a60bd..1827bb0d 100755 --- a/src/wrapped/wrappedlibtinfo.c +++ b/src/wrapped/wrappedlibtinfo.c @@ -38,7 +38,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 da4af0d2..c14c8ae0 100755 --- a/src/wrapped/wrappedlibtinfo6.c +++ b/src/wrapped/wrappedlibtinfo6.c @@ -38,7 +38,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 38bef8ff..c5fea90b 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/wrappedlibva.c b/src/wrapped/wrappedlibva.c index ecfa33ca..8c331324 100644 --- a/src/wrapped/wrappedlibva.c +++ b/src/wrapped/wrappedlibva.c @@ -37,7 +37,7 @@ GO(3) static uintptr_t my_VAMessageCallback_fct_##A = 0; \ static void my_VAMessageCallback_##A(void* a, void* b) \ { \ - RunFunctionFmt(my_context, my_VAMessageCallback_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_VAMessageCallback_fct_##A, "pp", a, b); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibx11.c b/src/wrapped/wrappedlibx11.c index 12071a38..0ee5d083 100755 --- a/src/wrapped/wrappedlibx11.c +++ b/src/wrapped/wrappedlibx11.c @@ -116,7 +116,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 @@ -149,7 +149,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 @@ -182,7 +182,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 @@ -215,7 +215,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 @@ -248,7 +248,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 @@ -281,7 +281,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 @@ -314,7 +314,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 @@ -347,7 +347,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 @@ -369,7 +369,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 @@ -391,7 +391,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 @@ -414,7 +414,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 @@ -447,7 +447,7 @@ static void* reverse_XSynchronizeProcFct(library_t* lib, void* fct) static uintptr_t my_XLockDisplay_fct_##A = 0; \ static void my_XLockDisplay_##A(void* dpy) \ { \ - RunFunctionFmt(my_context, my_XLockDisplay_fct_##A, "p", dpy); \ + RunFunctionFmt(my_XLockDisplay_fct_##A, "p", dpy); \ } SUPER() #undef GO @@ -469,7 +469,7 @@ static void* findXLockDisplayFct(void* fct) static uintptr_t my_XUnlockDisplay_fct_##A = 0; \ static void my_XUnlockDisplay_##A(void* dpy) \ { \ - RunFunctionFmt(my_context, my_XUnlockDisplay_fct_##A, "p", dpy); \ + RunFunctionFmt(my_XUnlockDisplay_fct_##A, "p", dpy); \ } SUPER() #undef GO @@ -556,14 +556,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/wrappedlibxext.c b/src/wrapped/wrappedlibxext.c index aaeaf749..6f30d800 100755 --- a/src/wrapped/wrappedlibxext.c +++ b/src/wrapped/wrappedlibxext.c @@ -56,7 +56,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 @@ -123,7 +123,6 @@ EXPORT void* my_XSetExtensionErrorHandler(x64emu_t* emu, void* handler) return reverse_exterrorhandleFct(my->XSetExtensionErrorHandler(find_exterrorhandle_Fct(handler))); } -static box64context_t *context = NULL; static uintptr_t my_hook_create_gc_fnc = 0; static uintptr_t my_hook_copy_gc_fnc = 0; static uintptr_t my_hook_flush_gc_fnc = 0; @@ -137,65 +136,62 @@ static uintptr_t my_hook_error_fnc = 0; static uintptr_t my_hook_error_string_fnc = 0; static int my_hook_create_gc(void* a, uint32_t b, void* c) { if(my_hook_create_gc_fnc) - return (int)RunFunctionFmt(context, my_hook_create_gc_fnc, "pup", a, b, c); + return (int)RunFunctionFmt(my_hook_create_gc_fnc, "pup", a, b, c); return 0; } static int my_hook_copy_gc(void* a, uint32_t b, void* c) { if(my_hook_copy_gc_fnc) - return (int)RunFunctionFmt(context, my_hook_copy_gc_fnc, "pup", a, b, c); + return (int)RunFunctionFmt(my_hook_copy_gc_fnc, "pup", a, b, c); return 0; } static int my_hook_flush_gc(void* a, uint32_t b, void* c) { if(my_hook_flush_gc_fnc) - return (int)RunFunctionFmt(context, my_hook_flush_gc_fnc, "pup", a, b, c); + return (int)RunFunctionFmt(my_hook_flush_gc_fnc, "pup", a, b, c); return 0; } static int my_hook_free_gc(void* a, uint32_t b, void* c) { if(my_hook_free_gc_fnc) - return (int)RunFunctionFmt(context, my_hook_free_gc_fnc, "pup", a, b, c); + return (int)RunFunctionFmt(my_hook_free_gc_fnc, "pup", a, b, c); return 0; } static int my_hook_create_font(void* a, void* b, void* c) { if(my_hook_create_font_fnc) - return (int)RunFunctionFmt(context, my_hook_create_font_fnc, "ppp", a, b, c); + return (int)RunFunctionFmt(my_hook_create_font_fnc, "ppp", a, b, c); return 0; } static int my_hook_free_font(void* a, void* b, void* c) { if(my_hook_free_font_fnc) - return (int)RunFunctionFmt(context, my_hook_free_font_fnc, "ppp", a, b, c); + return (int)RunFunctionFmt(my_hook_free_font_fnc, "ppp", a, b, c); return 0; } static int my_hook_close_display(void* a, void* b) { if(my_hook_close_display_fnc) - return (int)RunFunctionFmt(context, my_hook_close_display_fnc, "pp", a, b); + return (int)RunFunctionFmt(my_hook_close_display_fnc, "pp", a, b); return 0; } static int my_hook_wire_to_event(void* a, void* b, void* c) { if(my_hook_wire_to_event_fnc) - return (int)RunFunctionFmt(context, my_hook_wire_to_event_fnc, "ppp", a, b, c); + return (int)RunFunctionFmt(my_hook_wire_to_event_fnc, "ppp", a, b, c); return 0; } static int my_hook_event_to_wire(void* a, void* b, void* c) { if(my_hook_event_to_wire_fnc) - return (int)RunFunctionFmt(context, my_hook_event_to_wire_fnc, "ppp", a, b, c); + return (int)RunFunctionFmt(my_hook_event_to_wire_fnc, "ppp", a, b, c); return 0; } static int my_hook_error(void* a, void* b, void* c, int* d) { if(my_hook_error_fnc) - return (int)RunFunctionFmt(context, my_hook_error_fnc, "pppp", a, b, c, d); + return (int)RunFunctionFmt(my_hook_error_fnc, "pppp", a, b, c, d); return 0; } static char* my_hook_error_string(void* a, int b, void* c, void* d, int e) { if(my_hook_error_string_fnc) - return (char*)RunFunctionFmt(context, my_hook_error_string_fnc, "pippi", a, b, c, d, e); + return (char*)RunFunctionFmt(my_hook_error_string_fnc, "pippi", a, b, c, d, e); return 0; } EXPORT void* my_XextAddDisplay(x64emu_t* emu, void* extinfo, void* dpy, void* extname, my_XExtensionHooks* hooks, int nevents, void* data) { - if(!context) - context = emu->context; - my_XExtensionHooks natives = {0}; #define GO(A) if(hooks->A) {my_hook_##A##_fnc = (uintptr_t)hooks->A; natives.A = my_hook_##A;} GO(create_gc) diff --git a/src/wrapped/wrappedlibxt.c b/src/wrapped/wrappedlibxt.c index 526f79ba..6a7180fd 100755 --- a/src/wrapped/wrappedlibxt.c +++ b/src/wrapped/wrappedlibxt.c @@ -39,7 +39,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 @@ -61,7 +61,7 @@ static void* findEventFct(void* fct) static uintptr_t my_WorkProc_fct_##A = 0; \ static int my_WorkProc_##A(void* p) \ { \ - return (int)RunFunctionFmt(my_context, my_WorkProc_fct_##A, "p", p);\ + return (int)RunFunctionFmt(my_WorkProc_fct_##A, "p", p);\ } SUPER() #undef GO @@ -83,7 +83,7 @@ static void* findWorkProcFct(void* fct) static uintptr_t my_InputCallback_fct_##A = 0; \ static void my_InputCallback_##A(void* p, void* s, void* id) \ { \ - RunFunctionFmt(my_context, my_InputCallback_fct_##A, "ppp", p, s, id); \ + RunFunctionFmt(my_InputCallback_fct_##A, "ppp", p, s, id); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedlibxtst.c b/src/wrapped/wrappedlibxtst.c index 6ba9ee66..4ae3a68b 100755 --- a/src/wrapped/wrappedlibxtst.c +++ b/src/wrapped/wrappedlibxtst.c @@ -36,7 +36,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 5934b27a..4613c47b 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/wrappedlzma.c b/src/wrapped/wrappedlzma.c index ed578b5a..8592037b 100755 --- a/src/wrapped/wrappedlzma.c +++ b/src/wrapped/wrappedlzma.c @@ -64,7 +64,7 @@ GO(4) static uintptr_t my_alloc_fct_##A = 0; \ static void* my_alloc_##A(void* opaque, size_t items, size_t size) \ { \ - return (void*)RunFunctionFmt(my_context, my_alloc_fct_##A, "pLL", opaque, items, size);\ + return (void*)RunFunctionFmt(my_alloc_fct_##A, "pLL", opaque, items, size);\ } SUPER() #undef GO @@ -96,7 +96,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 6aee0935..5b95749e 100755 --- a/src/wrapped/wrappedmpg123.c +++ b/src/wrapped/wrappedmpg123.c @@ -38,7 +38,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 @@ -60,7 +60,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)RunFunctionFmt(my_context, my_r_lseek_fct_##A, "pIi", a, b, n); \ + return (int64_t)RunFunctionFmt(my_r_lseek_fct_##A, "pIi", a, b, n); \ } SUPER() #undef GO @@ -82,7 +82,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/wrappednss3.c b/src/wrapped/wrappednss3.c index 4aedaf77..e64ac396 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_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 @@ -92,7 +92,7 @@ static void* reverse_CERT_StringFromCertFcn_Fct(library_t* lib, void* fct) static uintptr_t my_CERTChainVerifyCallbackFunc_fct_##A = 0; \ static int my_CERTChainVerifyCallbackFunc_##A(void* a, void* b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my_CERTChainVerifyCallbackFunc_fct_##A, "ppp", a, b, c); \ + return (int)RunFunctionFmt(my_CERTChainVerifyCallbackFunc_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -124,7 +124,7 @@ static void* reverse_CERTChainVerifyCallbackFunc_Fct(library_t* lib, void* fct) static uintptr_t my_PORTCharConversionWSwapFunc_fct_##A = 0; \ static int my_PORTCharConversionWSwapFunc_##A(int a, void* b, uint32_t c, void* d, uint32_t e, void* f, int g) \ { \ - return (int)RunFunctionFmt(my_context, my_PORTCharConversionWSwapFunc_fct_##A, "ipupupi", a, b, c, d, e, f, g); \ + return (int)RunFunctionFmt(my_PORTCharConversionWSwapFunc_fct_##A, "ipupupi", a, b, c, d, e, f, g); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedopenal.c b/src/wrapped/wrappedopenal.c index 4d65fdd8..01b8c8e2 100755 --- a/src/wrapped/wrappedopenal.c +++ b/src/wrapped/wrappedopenal.c @@ -38,7 +38,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 84cb8d60..438ab7d7 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 diff --git a/src/wrapped/wrappedpng16.c b/src/wrapped/wrappedpng16.c index 25989689..290162b9 100755 --- a/src/wrapped/wrappedpng16.c +++ b/src/wrapped/wrappedpng16.c @@ -41,7 +41,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 @@ -63,7 +63,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 @@ -85,7 +85,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 @@ -107,7 +107,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 @@ -129,7 +129,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 @@ -151,7 +151,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 @@ -173,7 +173,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 @@ -196,7 +196,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 @@ -219,7 +219,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 @@ -242,7 +242,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 @@ -266,7 +266,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 e80e2f91..f5ec5d43 100755 --- a/src/wrapped/wrappedpulse.c +++ b/src/wrapped/wrappedpulse.c @@ -91,7 +91,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 @@ -113,7 +113,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 @@ -136,7 +136,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 @@ -159,7 +159,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 @@ -183,7 +183,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 @@ -206,7 +206,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 @@ -229,7 +229,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 @@ -252,7 +252,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 @@ -275,7 +275,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 @@ -297,7 +297,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 @@ -319,7 +319,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 @@ -342,7 +342,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 @@ -364,7 +364,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 @@ -386,7 +386,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 @@ -408,7 +408,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 @@ -430,7 +430,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 @@ -452,7 +452,7 @@ static void* find_module_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 @@ -474,7 +474,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 @@ -496,7 +496,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 @@ -518,7 +518,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 @@ -541,7 +541,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 @@ -563,7 +563,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 @@ -585,7 +585,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 @@ -607,7 +607,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 @@ -629,7 +629,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 @@ -651,7 +651,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 @@ -673,7 +673,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 @@ -695,7 +695,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 @@ -717,7 +717,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 @@ -830,7 +830,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) { @@ -839,7 +839,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) { @@ -848,7 +848,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) { @@ -864,7 +864,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) @@ -882,7 +882,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) { @@ -891,7 +891,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) { @@ -900,7 +900,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) { @@ -913,7 +913,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) @@ -942,7 +942,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) { @@ -951,7 +951,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) { @@ -960,7 +960,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) { @@ -973,7 +973,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) @@ -986,7 +986,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 9750ba4b..50f3e1b2 100755 --- a/src/wrapped/wrappedsdl1.c +++ b/src/wrapped/wrappedsdl1.c @@ -73,7 +73,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, "pCi", userdata, stream, len); \ + RunFunctionFmt(my_AudioCallback_fct_##A, "pCi", userdata, stream, len); \ } SUPER() #undef GO @@ -95,7 +95,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 @@ -117,7 +117,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 5e9415fb..d9287be4 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 8c0b03bf..8f0710f5 100755 --- a/src/wrapped/wrappedsdl2.c +++ b/src/wrapped/wrappedsdl2.c @@ -104,7 +104,7 @@ GO(4) static uintptr_t my_Timer_fct_##A = 0; \ static uint64_t my_Timer_##A(uint64_t a, void* b) \ { \ - return (uint64_t)RunFunctionFmt(my_context, my_Timer_fct_##A, "Up", a, b); \ + return (uint64_t)RunFunctionFmt(my_Timer_fct_##A, "Up", a, b); \ } SUPER() #undef GO @@ -128,7 +128,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 @@ -152,7 +152,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 @@ -187,7 +187,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 @@ -667,7 +667,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 73ab0bf9..56a2a0e8 100755 --- a/src/wrapped/wrappedsdl2mixer.c +++ b/src/wrapped/wrappedsdl2mixer.c @@ -42,7 +42,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 @@ -66,7 +66,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 @@ -90,7 +90,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 @@ -114,7 +114,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 @@ -138,7 +138,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 0b4171a5..858c16b9 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 @@ -246,7 +246,7 @@ static void* find_NSSCMSGetDecryptKeyCallback_Fct(void* fct) static uintptr_t my_CERTImportCertificateFunc_fct_##A = 0; \ static int my_CERTImportCertificateFunc_##A(void* a, void* b, int c) \ { \ - return (int)RunFunctionFmt(my_context, my_CERTImportCertificateFunc_fct_##A, "ppi", a, b, c); \ + return (int)RunFunctionFmt(my_CERTImportCertificateFunc_fct_##A, "ppi", a, b, c); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedsmpeg.c b/src/wrapped/wrappedsmpeg.c index a9b2adca..c2bac565 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 e9ae86cf..e285c215 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/wrappedudev0.c b/src/wrapped/wrappedudev0.c index 47d650f5..4f2182a3 100755 --- a/src/wrapped/wrappedudev0.c +++ b/src/wrapped/wrappedudev0.c @@ -41,7 +41,7 @@ static uintptr_t my_log_fn_fct_##A = 0; static void my_log_fn_##A(void* udev, int p, void *f, int l, void* fn, void* fmt, x64_va_list_t args) \ { \ CONVERT_VALIST(args) \ - RunFunction(my_context, my_log_fn_fct_##A, 7, udev, p, f, l, fn, fmt, VARARGS); \ + RunFunction(my_log_fn_fct_##A, 7, udev, p, f, l, fn, fmt, VARARGS); \ } #else #define GO(A) \ @@ -49,7 +49,7 @@ static uintptr_t my_log_fn_fct_##A = 0; static void my_log_fn_##A(void* udev, int p, void *f, int l, void* fn, void* fmt, x64_va_list_t args) \ { \ CREATE_VALIST_FROM_VALIST(args, thread_get_emu()->scratch); \ - RunFunction(my_context, my_log_fn_fct_##A, 7, udev, p, f, l, fn, fmt, VARARGS); \ + RunFunction(my_log_fn_fct_##A, 7, udev, p, f, l, fn, fmt, VARARGS); \ } #endif SUPER() diff --git a/src/wrapped/wrappedudev1.c b/src/wrapped/wrappedudev1.c index 6c30a14c..a82b61c0 100755 --- a/src/wrapped/wrappedudev1.c +++ b/src/wrapped/wrappedudev1.c @@ -41,7 +41,7 @@ static uintptr_t my_log_fn_fct_##A = 0; static void my_log_fn_##A(void* udev, int p, void *f, int l, void* fn, void* fmt, x64_va_list_t args) \ { \ CONVERT_VALIST(args) \ - RunFunction(my_context, my_log_fn_fct_##A, 7, udev, p, f, l, fn, fmt, VARARGS); \ + RunFunction(my_log_fn_fct_##A, 7, udev, p, f, l, fn, fmt, VARARGS); \ } #else #define GO(A) \ @@ -49,7 +49,7 @@ static uintptr_t my_log_fn_fct_##A = 0; static void my_log_fn_##A(void* udev, int p, void *f, int l, void* fn, void* fmt, x64_va_list_t args) \ { \ CREATE_VALIST_FROM_VALIST(args, thread_get_emu()->scratch); \ - RunFunction(my_context, my_log_fn_fct_##A, 7, udev, p, f, l, fn, fmt, VARARGS); \ + RunFunction(my_log_fn_fct_##A, 7, udev, p, f, l, fn, fmt, VARARGS); \ } #endif SUPER() diff --git a/src/wrapped/wrappedvorbisfile.c b/src/wrapped/wrappedvorbisfile.c index 6c2d98c9..411a3ee3 100755 --- a/src/wrapped/wrappedvorbisfile.c +++ b/src/wrapped/wrappedvorbisfile.c @@ -51,7 +51,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 RunFunctionFmt(my_context, my_read_fct_##A, "pLLp", ptr, size, nmemb, datasource); \ + return RunFunctionFmt(my_read_fct_##A, "pLLp", ptr, size, nmemb, datasource); \ } SUPER() #undef GO @@ -73,7 +73,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 @@ -95,7 +95,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 @@ -117,7 +117,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 a8f694bb..8cba5772 100755 --- a/src/wrapped/wrappedvulkan.c +++ b/src/wrapped/wrappedvulkan.c @@ -194,7 +194,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 @@ -216,7 +216,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 @@ -238,7 +238,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 @@ -260,7 +260,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 @@ -282,7 +282,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 @@ -304,7 +304,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 ef5f6b48..cb7aef39 100755 --- a/src/wrapped/wrappedxml2.c +++ b/src/wrapped/wrappedxml2.c @@ -36,7 +36,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); @@ -44,21 +44,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); } @@ -101,7 +101,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 @@ -123,7 +123,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 @@ -145,7 +145,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 @@ -167,7 +167,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 @@ -189,7 +189,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 @@ -211,7 +211,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 @@ -233,7 +233,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 @@ -255,7 +255,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 @@ -277,7 +277,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 @@ -299,7 +299,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 @@ -321,7 +321,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 @@ -343,7 +343,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 @@ -365,7 +365,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 @@ -387,7 +387,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 @@ -409,7 +409,7 @@ static void* find_xmlSchemaValidityWarningFunc_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 @@ -431,7 +431,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 @@ -453,7 +453,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 @@ -475,7 +475,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 @@ -497,7 +497,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 @@ -519,7 +519,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 @@ -541,7 +541,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 @@ -563,7 +563,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 @@ -585,7 +585,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 @@ -607,7 +607,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 @@ -629,7 +629,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 @@ -651,7 +651,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 @@ -673,7 +673,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 @@ -695,7 +695,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 @@ -717,7 +717,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 @@ -739,7 +739,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 @@ -761,7 +761,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 @@ -783,7 +783,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 @@ -805,7 +805,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 @@ -827,7 +827,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 @@ -849,7 +849,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 @@ -871,7 +871,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 @@ -893,7 +893,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 @@ -915,7 +915,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 @@ -937,7 +937,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 @@ -959,7 +959,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 @@ -981,7 +981,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 @@ -1003,7 +1003,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 @@ -1025,7 +1025,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 @@ -1047,7 +1047,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 @@ -1070,7 +1070,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 @@ -1109,7 +1109,7 @@ static void my_xmlGenericErrorFunc_##A(void* a, const char* fmt, ...) va_start(args, fmt); \ vsnprintf(buf, 4096, fmt, args); \ va_end(args); \ - RunFunctionFmt(my_context, my_xmlGenericErrorFunc_fct_##A, "pp", a, buf); \ + RunFunctionFmt(my_xmlGenericErrorFunc_fct_##A, "pp", a, buf); \ } SUPER() #undef GO @@ -1142,7 +1142,7 @@ static void* reverse_xmlGenericErrorFunc_Fct(void* fct) static uintptr_t my_xmlStructuredErrorFunc_fct_##A = 0; \ static void my_xmlStructuredErrorFunc_##A(void* a, const char* b) \ { \ - RunFunctionFmt(my_context, my_xmlStructuredErrorFunc_fct_##A, "pp", a, b); \ + RunFunctionFmt(my_xmlStructuredErrorFunc_fct_##A, "pp", a, b); \ } SUPER() #undef GO @@ -1175,7 +1175,7 @@ static void* reverse_xmlStructuredErrorFunc_Fct(void* fct) static uintptr_t my_xmlOutputMatchCallback_fct_##A = 0; \ static int my_xmlOutputMatchCallback_##A(void* a) \ { \ - return (int)RunFunctionFmt(my_context, my_xmlOutputMatchCallback_fct_##A, "p", a); \ + return (int)RunFunctionFmt(my_xmlOutputMatchCallback_fct_##A, "p", a); \ } SUPER() #undef GO @@ -1198,7 +1198,7 @@ static void* find_xmlOutputMatchCallback_Fct(void* fct) // this one have a VAArg static uintptr_t my_xmlOutputOpenCallback_fct_##A = 0; \ static void* my_xmlOutputOpenCallback_##A(void* a) \ { \ - return (void*)RunFunctionFmt(my_context, my_xmlOutputOpenCallback_fct_##A, "p", a); \ + return (void*)RunFunctionFmt(my_xmlOutputOpenCallback_fct_##A, "p", a); \ } SUPER() #undef GO @@ -1221,7 +1221,7 @@ static void* find_xmlOutputOpenCallback_Fct(void* fct) // this one have a VAArg static uintptr_t my_xmlTextReaderErrorFunc_fct_##A = 0; \ static void my_xmlTextReaderErrorFunc_##A(void* a, void* b, int c, void* d) \ { \ - RunFunctionFmt(my_context, my_xmlTextReaderErrorFunc_fct_##A, "ppip", a, b, c, d); \ + RunFunctionFmt(my_xmlTextReaderErrorFunc_fct_##A, "ppip", a, b, c, d); \ } SUPER() #undef GO diff --git a/src/wrapped/wrappedxslt.c b/src/wrapped/wrappedxslt.c index 07639c21..ad145b2d 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 @@ -87,7 +87,7 @@ static void* find_xsltDocLoaderFunc_Fct(void* fct) static uintptr_t my_xsltSecurityCheck_fct_##A = 0; \ static int my_xsltSecurityCheck_##A(void* a, void* b, void* c) \ { \ - return (int)RunFunctionFmt(my_context, my_xsltSecurityCheck_fct_##A, "ppp", a, b, c); \ + return (int)RunFunctionFmt(my_xsltSecurityCheck_fct_##A, "ppp", a, b, c); \ } SUPER() #undef GO @@ -109,7 +109,7 @@ static void* find_xsltSecurityCheck_Fct(void* fct) static uintptr_t my_xsltSortFunc_fct_##A = 0; \ static void my_xsltSortFunc_##A(void* a, void* b, int c) \ { \ - RunFunctionFmt(my_context, my_xsltSortFunc_fct_##A, "ppi", a, b, c); \ + RunFunctionFmt(my_xsltSortFunc_fct_##A, "ppi", a, b, c); \ } SUPER() #undef GO |