diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2024-10-13 10:01:06 +0200 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2024-10-13 10:01:06 +0200 |
| commit | 5fcd9d45a3e6f35a197d2c6be951b811cb1cb36c (patch) | |
| tree | b3e35d8d440a6a660add3df80b4035058abbd5a2 /src | |
| parent | b6cd19b78bf3cce7cdc55c4210f5174eb8b76e28 (diff) | |
| download | box64-5fcd9d45a3e6f35a197d2c6be951b811cb1cb36c.tar.gz box64-5fcd9d45a3e6f35a197d2c6be951b811cb1cb36c.zip | |
[BOX32] Added a few 32bits wrapped function libSDL2
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapped32/generated/functions_list.txt | 1 | ||||
| -rw-r--r-- | src/wrapped32/generated/wrapper32.c | 2 | ||||
| -rw-r--r-- | src/wrapped32/generated/wrapper32.h | 1 | ||||
| -rw-r--r-- | src/wrapped32/wrappedsdl2_private.h | 14 |
4 files changed, 11 insertions, 7 deletions
diff --git a/src/wrapped32/generated/functions_list.txt b/src/wrapped32/generated/functions_list.txt index 2c75c3cc..554e0d8b 100644 --- a/src/wrapped32/generated/functions_list.txt +++ b/src/wrapped32/generated/functions_list.txt @@ -735,6 +735,7 @@ #() iFipup -> iFipup #() iFippi -> iFippi #() iFippL -> iFippL +#() iFippp -> iFippp #() iFipON -> iFipON #() iFuiup -> iFuiup #() iFuupi -> iFuupi diff --git a/src/wrapped32/generated/wrapper32.c b/src/wrapped32/generated/wrapper32.c index a4fa97fd..1392307c 100644 --- a/src/wrapped32/generated/wrapper32.c +++ b/src/wrapped32/generated/wrapper32.c @@ -825,6 +825,7 @@ typedef int32_t (*iFipui_t)(int32_t, void*, uint32_t, int32_t); typedef int32_t (*iFipup_t)(int32_t, void*, uint32_t, void*); typedef int32_t (*iFippi_t)(int32_t, void*, void*, int32_t); typedef int32_t (*iFippL_t)(int32_t, void*, void*, uintptr_t); +typedef int32_t (*iFippp_t)(int32_t, void*, void*, void*); typedef int32_t (*iFipON_t)(int32_t, void*, int32_t, ...); typedef int32_t (*iFuiup_t)(uint32_t, int32_t, uint32_t, void*); typedef int32_t (*iFuupi_t)(uint32_t, uint32_t, void*, int32_t); @@ -2322,6 +2323,7 @@ void iFipui_32(x64emu_t *emu, uintptr_t fcn) { iFipui_t fn = (iFipui_t)fcn; R_EA void iFipup_32(x64emu_t *emu, uintptr_t fcn) { iFipup_t fn = (iFipup_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptri(uint32_t, R_ESP + 12), from_ptriv(R_ESP + 16)); } void iFippi_32(x64emu_t *emu, uintptr_t fcn) { iFippi_t fn = (iFippi_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptri(int32_t, R_ESP + 16)); } void iFippL_32(x64emu_t *emu, uintptr_t fcn) { iFippL_t fn = (iFippL_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ulong(from_ptri(ulong_t, R_ESP + 16))); } +void iFippp_32(x64emu_t *emu, uintptr_t fcn) { iFippp_t fn = (iFippp_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), from_ptriv(R_ESP + 12), from_ptriv(R_ESP + 16)); } void iFipON_32(x64emu_t *emu, uintptr_t fcn) { iFipON_t fn = (iFipON_t)fcn; R_EAX = fn(from_ptri(int32_t, R_ESP + 4), from_ptriv(R_ESP + 8), of_convert32(from_ptri(int32_t, R_ESP + 12)), from_ptriv(R_ESP + 16)); } void iFuiup_32(x64emu_t *emu, uintptr_t fcn) { iFuiup_t fn = (iFuiup_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(int32_t, R_ESP + 8), from_ptri(uint32_t, R_ESP + 12), from_ptriv(R_ESP + 16)); } void iFuupi_32(x64emu_t *emu, uintptr_t fcn) { iFuupi_t fn = (iFuupi_t)fcn; R_EAX = fn(from_ptri(uint32_t, R_ESP + 4), from_ptri(uint32_t, R_ESP + 8), from_ptriv(R_ESP + 12), from_ptri(int32_t, R_ESP + 16)); } diff --git a/src/wrapped32/generated/wrapper32.h b/src/wrapped32/generated/wrapper32.h index a34df650..9d547f20 100644 --- a/src/wrapped32/generated/wrapper32.h +++ b/src/wrapped32/generated/wrapper32.h @@ -776,6 +776,7 @@ void iFipui_32(x64emu_t *emu, uintptr_t fnc); void iFipup_32(x64emu_t *emu, uintptr_t fnc); void iFippi_32(x64emu_t *emu, uintptr_t fnc); void iFippL_32(x64emu_t *emu, uintptr_t fnc); +void iFippp_32(x64emu_t *emu, uintptr_t fnc); void iFipON_32(x64emu_t *emu, uintptr_t fnc); void iFuiup_32(x64emu_t *emu, uintptr_t fnc); void iFuupi_32(x64emu_t *emu, uintptr_t fnc); diff --git a/src/wrapped32/wrappedsdl2_private.h b/src/wrapped32/wrappedsdl2_private.h index 0d97a1bb..9129c6bf 100644 --- a/src/wrapped32/wrappedsdl2_private.h +++ b/src/wrapped32/wrappedsdl2_private.h @@ -89,8 +89,8 @@ GO(SDL_Delay, vFu) GOM(SDL_DelEventWatch, vFEpp) // SDL_DelHintCallback //GO(SDL_DequeueAudio, uFupu) -//GO(SDL_DestroyCond, vFp) -//GO(SDL_DestroyMutex, vFp) +GO(SDL_DestroyCond, vFp) +GO(SDL_DestroyMutex, vFp) GO(SDL_DestroyRenderer, vFp) GO(SDL_DestroySemaphore, vFp) GO(SDL_DestroyTexture, vFp) @@ -198,7 +198,7 @@ GO(SDL_GetCurrentVideoDriver, pFv) //GO(SDL_GetDefaultCursor, pFv) GOM(SDL_GetDesktopDisplayMode, iFEip) GO(SDL_GetDisplayBounds, iFip) -//GO(SDL_GetDisplayDPI, iFippp) +GO(SDL_GetDisplayDPI, iFippp) GOM(SDL_GetDisplayMode, iFiip) //%noE GO(SDL_GetDisplayName, pFi) //GO(SDL_GetDisplayOrientation, uFi) @@ -389,10 +389,10 @@ GO(SDL_JoystickClose, vFp) GO(SDL_JoystickEventState, iFi) //GO(SDL_JoystickFromInstanceID, pFi) //GO(SDL_JoystickGetAttached, iFp) -//GO(SDL_JoystickGetAxis, wFpi) +GO(SDL_JoystickGetAxis, wFpi) //GO(SDL_JoystickGetAxisInitialState, uFpip) //GO(SDL_JoystickGetBall, iFpipp) -//GO(SDL_JoystickGetButton, CFpi) +GO(SDL_JoystickGetButton, CFpi) GOS(SDL_JoystickGetDeviceGUID, JFEi) // return a struct that is "uint8_t data[16]" //GO(SDL_JoystickGetDeviceInstanceID, iFi) //GO(SDL_JoystickGetDevicePlayerIndex, iFi) @@ -424,7 +424,7 @@ GO(SDL_JoystickOpen, pFi) //GO(SDL_JoystickPathForIndex, pFi) //GO(SDL_JoystickRumble, iFpWWu) //GO(SDL_JoystickRumbleTriggers, iFpWWu) -//GO(SDL_JoystickUpdate, vFv) +GO(SDL_JoystickUpdate, vFv) //GO(SDL_LinuxSetThreadPriority, iFli) //GO(SDL_lltoa, pFlpi) GOM(SDL_LoadBMP_RW, pFEpi) @@ -554,7 +554,7 @@ GO(SDL_RenderSetLogicalSize, iFpii) //GO(SDL_ResetAssertionReport, vFv) //GO(SDL_ResetHints, vFv) //GO(SDL_ResetKeyboard, vFv) -//GO(SDL_RestoreWindow, vFp) +GO(SDL_RestoreWindow, vFp) //GOM(SDL_RWFromConstMem, pFEpi) //GOM(SDL_RWFromFP, pFEpi) GOM(SDL_RWFromFile, pFEpp) |