diff options
Diffstat (limited to 'src/libtools/sdl2rwops.c')
| -rw-r--r-- | src/libtools/sdl2rwops.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/libtools/sdl2rwops.c b/src/libtools/sdl2rwops.c index 9b18dd8f..085c7837 100644 --- 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)RunFunction(my_context, (uintptr_t)context->hidden.my.orig->size, 1, 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)RunFunction(my_context, (uintptr_t)context->hidden.my.orig->seek, 3, 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)RunFunction(my_context, (uintptr_t)context->hidden.my.orig->read, 4, 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)RunFunction(my_context, (uintptr_t)context->hidden.my.orig->write, 4, 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)RunFunction(my_context, (uintptr_t)context->hidden.my.orig->close, 1, 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*)RunFunction(my_context, emulated_sdl2allocrw, 0); + return (SDL2_RWops_t*)RunFunctionFmt(emulated_sdl2allocrw, ""); } static uintptr_t emulated_sdl2freerw = 0; EXPORT void my_wrapped_sdl2freerw(SDL2_RWops_t* p) { - RunFunction(my_context, emulated_sdl2freerw, 1, p); + RunFunctionFmt(emulated_sdl2freerw, "p", p); } static void checkSDL2isNative() @@ -174,7 +174,7 @@ SDL2_RWops_t* RWNativeStart2(x64emu_t* emu, SDL2_RWops_t* ops) newrw->type = BOX64RW; newrw->hidden.my.orig = ops; newrw->hidden.my.custom_free = (sdl2_freerw)emu->context->sdl2freerw; - + // create wrapper #define GO(A, W) \ newrw->A = my2_emulated_##A; @@ -229,4 +229,4 @@ int32_t RWNativeWrite2(SDL2_RWops_t *ops, const void *ptr, int32_t size, int32_t int32_t RWNativeClose2(SDL2_RWops_t* ops) { return ops->close(ops); -} \ No newline at end of file +} |