diff options
Diffstat (limited to 'src/wrapped')
| -rw-r--r-- | src/wrapped/generated/functions_list.txt | 3 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappedsdl2types.h | 4 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.c | 2 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.h | 1 | ||||
| -rw-r--r-- | src/wrapped/wrappedsdl2.c | 14 | ||||
| -rw-r--r-- | src/wrapped/wrappedsdl2_private.h | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index 1a694209..b3db228d 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -2183,6 +2183,7 @@ #() iFpppppp #() uFEiippp #() uFEiuppp +#() uFEpippi #() uFEpippp #() uFEpCppp #() uFEpuppp @@ -5581,7 +5582,7 @@ wrappedsdl2: - SDL_RWwrite - vFGpppp: - SDL_GetJoystickGUIDInfo -- iFpippi: +- uFpippi: - SDL_OpenAudioDevice - pFpippp: - SDL_LoadWAV_RW diff --git a/src/wrapped/generated/wrappedsdl2types.h b/src/wrapped/generated/wrappedsdl2types.h index e0cf1884..4f2ef49f 100644 --- a/src/wrapped/generated/wrappedsdl2types.h +++ b/src/wrapped/generated/wrappedsdl2types.h @@ -46,7 +46,7 @@ typedef int32_t (*iFpLpp_t)(void*, uintptr_t, void*, void*); typedef int32_t (*iFpLpV_t)(void*, uintptr_t, void*, ...); typedef uint32_t (*uFppuu_t)(void*, void*, uint32_t, uint32_t); typedef void (*vFGpppp_t)(SDL_JoystickGUID, void*, void*, void*, void*); -typedef int32_t (*iFpippi_t)(void*, int32_t, void*, void*, int32_t); +typedef uint32_t (*uFpippi_t)(void*, int32_t, void*, void*, int32_t); typedef void* (*pFpippp_t)(void*, int32_t, void*, void*, void*); #define SUPER() ADDED_FUNCTIONS() \ @@ -130,7 +130,7 @@ typedef void* (*pFpippp_t)(void*, int32_t, void*, void*, void*); GO(SDL_RWread, uFppuu_t) \ GO(SDL_RWwrite, uFppuu_t) \ GO(SDL_GetJoystickGUIDInfo, vFGpppp_t) \ - GO(SDL_OpenAudioDevice, iFpippi_t) \ + GO(SDL_OpenAudioDevice, uFpippi_t) \ GO(SDL_LoadWAV_RW, pFpippp_t) #endif // __wrappedsdl2TYPES_H_ diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c index 1ff9f2c7..9f2f0b6b 100644 --- a/src/wrapped/generated/wrapper.c +++ b/src/wrapped/generated/wrapper.c @@ -2211,6 +2211,7 @@ typedef int32_t (*iFpppppL_t)(void*, void*, void*, void*, void*, uintptr_t); typedef int32_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*); typedef uint32_t (*uFEiippp_t)(x64emu_t*, int32_t, int32_t, void*, void*, void*); typedef uint32_t (*uFEiuppp_t)(x64emu_t*, int32_t, uint32_t, void*, void*, void*); +typedef uint32_t (*uFEpippi_t)(x64emu_t*, void*, int32_t, void*, void*, int32_t); typedef uint32_t (*uFEpippp_t)(x64emu_t*, void*, int32_t, void*, void*, void*); typedef uint32_t (*uFEpCppp_t)(x64emu_t*, void*, uint8_t, void*, void*, void*); typedef uint32_t (*uFEpuppp_t)(x64emu_t*, void*, uint32_t, void*, void*, void*); @@ -5444,6 +5445,7 @@ void iFpppppL(x64emu_t *emu, uintptr_t fcn) { iFpppppL_t fn = (iFpppppL_t)fcn; R void iFpppppp(x64emu_t *emu, uintptr_t fcn) { iFpppppp_t fn = (iFpppppp_t)fcn; R_RAX=(int32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8, (void*)R_R9); } void uFEiippp(x64emu_t *emu, uintptr_t fcn) { uFEiippp_t fn = (uFEiippp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); } void uFEiuppp(x64emu_t *emu, uintptr_t fcn) { uFEiuppp_t fn = (uFEiuppp_t)fcn; R_RAX=(uint32_t)fn(emu, (int32_t)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); } +void uFEpippi(x64emu_t *emu, uintptr_t fcn) { uFEpippi_t fn = (uFEpippi_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (int32_t)R_R8); } void uFEpippp(x64emu_t *emu, uintptr_t fcn) { uFEpippp_t fn = (uFEpippp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (int32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); } void uFEpCppp(x64emu_t *emu, uintptr_t fcn) { uFEpCppp_t fn = (uFEpCppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint8_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); } void uFEpuppp(x64emu_t *emu, uintptr_t fcn) { uFEpuppp_t fn = (uFEpuppp_t)fcn; R_RAX=(uint32_t)fn(emu, (void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); } diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h index 556c90d4..9b603b1e 100644 --- a/src/wrapped/generated/wrapper.h +++ b/src/wrapped/generated/wrapper.h @@ -2220,6 +2220,7 @@ void iFpppppL(x64emu_t *emu, uintptr_t fnc); void iFpppppp(x64emu_t *emu, uintptr_t fnc); void uFEiippp(x64emu_t *emu, uintptr_t fnc); void uFEiuppp(x64emu_t *emu, uintptr_t fnc); +void uFEpippi(x64emu_t *emu, uintptr_t fnc); void uFEpippp(x64emu_t *emu, uintptr_t fnc); void uFEpCppp(x64emu_t *emu, uintptr_t fnc); void uFEpuppp(x64emu_t *emu, uintptr_t fnc); diff --git a/src/wrapped/wrappedsdl2.c b/src/wrapped/wrappedsdl2.c index d0a933d7..a59ec93a 100644 --- a/src/wrapped/wrappedsdl2.c +++ b/src/wrapped/wrappedsdl2.c @@ -237,19 +237,15 @@ EXPORT int64_t my2_SDL_OpenAudio(x64emu_t* emu, void* d, void* o) return ret; } -EXPORT int64_t my2_SDL_OpenAudioDevice(x64emu_t* emu, void* device, int64_t iscapture, void* d, void* o, int64_t allowed) +EXPORT uint32_t my2_SDL_OpenAudioDevice(x64emu_t* emu, void* device, int iscapture, void* d, void* o, int allowed) { - SDL2_AudioSpec *desired = (SDL2_AudioSpec*)d; + SDL2_AudioSpec* desired = (SDL2_AudioSpec*)d; // create a callback - void *fnc = (void*)desired->callback; + void* fnc = (void*)desired->callback; desired->callback = find_AudioCallback_Fct(fnc); - int ret = my->SDL_OpenAudioDevice(device, iscapture, desired, (SDL2_AudioSpec*)o, allowed); - if (ret<=0) { - // error, clean the callback... - desired->callback = fnc; - return ret; - } + uint32_t ret = my->SDL_OpenAudioDevice(device, iscapture, desired, (SDL2_AudioSpec*)o, allowed); + // put back stuff in place? desired->callback = fnc; diff --git a/src/wrapped/wrappedsdl2_private.h b/src/wrapped/wrappedsdl2_private.h index b3c100ca..fd700a46 100644 --- a/src/wrapped/wrappedsdl2_private.h +++ b/src/wrapped/wrappedsdl2_private.h @@ -483,7 +483,7 @@ GO(SDL_NumHaptics, iFv) GO(SDL_NumJoysticks, iFv) GO(SDL_NumSensors, iFv) GOM(SDL_OpenAudio, iFEpp) -GOM(SDL_OpenAudioDevice, iFEpippi) +GOM(SDL_OpenAudioDevice, uFEpippi) GO(SDL_PauseAudio, vFi) GO(SDL_PauseAudioDevice, vFui) GO(SDL_PeepEvents, iFpiuuu) |