From af2a0c974770d60fdb4d1289477833883ddb7117 Mon Sep 17 00:00:00 2001 From: ptitSeb Date: Sun, 13 Oct 2024 18:39:13 +0200 Subject: [PATCH] [BOX32] Some more 32bits wrapped symbols --- src/wrapped32/generated/functions_list.txt | 2 ++ src/wrapped32/generated/wrappedlibctypes32.h | 2 ++ src/wrapped32/wrappedlibc_private.h | 10 +++++----- src/wrapped32/wrappedsdl2_private.h | 12 ++++++------ 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/wrapped32/generated/functions_list.txt b/src/wrapped32/generated/functions_list.txt index 933b1175e..793db7267 100644 --- a/src/wrapped32/generated/functions_list.txt +++ b/src/wrapped32/generated/functions_list.txt @@ -1664,6 +1664,8 @@ wrappedlibc: - UFUU: - pFip: - signal +- pFLL: + - aligned_alloc - pFpi: - backtrace_symbols - pFpp: diff --git a/src/wrapped32/generated/wrappedlibctypes32.h b/src/wrapped32/generated/wrappedlibctypes32.h index ae96c8852..3ee8fcef4 100644 --- a/src/wrapped32/generated/wrappedlibctypes32.h +++ b/src/wrapped32/generated/wrappedlibctypes32.h @@ -46,6 +46,7 @@ typedef int32_t (*iFpV_t)(void*, ...); typedef int64_t (*IFII_t)(int64_t, int64_t); typedef uint64_t (*UFUU_t)(uint64_t, uint64_t); typedef void* (*pFip_t)(int32_t, void*); +typedef void* (*pFLL_t)(uintptr_t, uintptr_t); typedef void* (*pFpi_t)(void*, int32_t); typedef void* (*pFpp_t)(void*, void*); typedef void* (*SFpp_t)(void*, void*); @@ -149,6 +150,7 @@ typedef int32_t (*iFpLiLppp_t)(void*, uintptr_t, int32_t, uintptr_t, void*, void GO(execl, iFpV_t) \ GO(execlp, iFpV_t) \ GO(signal, pFip_t) \ + GO(aligned_alloc, pFLL_t) \ GO(backtrace_symbols, pFpi_t) \ GO(__cmsg_nxthdr, pFpp_t) \ GO(__gmtime_r, pFpp_t) \ diff --git a/src/wrapped32/wrappedlibc_private.h b/src/wrapped32/wrappedlibc_private.h index e30a9ce9f..47c2ae8de 100755 --- a/src/wrapped32/wrappedlibc_private.h +++ b/src/wrapped32/wrappedlibc_private.h @@ -48,7 +48,7 @@ GOW(access, iFpi) // __aeabi_memset8 //DATAV(__after_morecore_hook, 4) GO(alarm, uFu) -//GO2(aligned_alloc, pFuu, memalign) +GO2(aligned_alloc, pFLL, memalign) GO(alphasort, iFpp) GOM(alphasort64, iFEpp) //DATA(argp_err_exit_status, 4) @@ -1056,7 +1056,7 @@ GOM(__lxstat, iFEipp) //%% GOM(__lxstat64, iFEipp) //%% GO(madvise, iFpLi) GOWM(makecontext, vFEppiV) //%% -//GOW(mallinfo, pFv) +GOW(mallinfo, pFv) GOM(malloc, pFL) //%%,noE // malloc_get_state // Weak //DATAV(__malloc_hook, 4) @@ -1201,7 +1201,7 @@ GOW(ntohs, WFW) //GO2(__on_exit, iFEpp, my_on_exit) //%% GOW2(open, iFEpON, my_open) //%% GOW2(__open, iFEpON, my_open) //%% -//GO(__open_2, iFpO) +GO(__open_2, iFpO) GOW2(open64, iFEpON, my_open64) //%% // __open64 // Weak //GO(__open64_2, iFpO) @@ -1338,7 +1338,7 @@ GO(raise, iFi) GO(rand, iFv) GOW(random, lFv) //GOW(random_r, iFpp) -//GO(rand_r, iFp) +GO(rand_r, iFp) GOW(rawmemchr, pFpi) GO(__rawmemchr, pFpi) // rcmd @@ -1875,7 +1875,7 @@ GOM(utimensat, iFippi) //%noE GOWM(utimes, iFEpp) //GOW(utmpname, iFp) // utmpxname -//GOW(valloc, pFu) +GOW(valloc, pFL) GOM(vasprintf, iFEppp) //%% GOM(__vasprintf_chk, iFEpipp) //%% // vdprintf // Weak diff --git a/src/wrapped32/wrappedsdl2_private.h b/src/wrapped32/wrappedsdl2_private.h index 9129c6bf3..9dc5b16e2 100644 --- a/src/wrapped32/wrappedsdl2_private.h +++ b/src/wrapped32/wrappedsdl2_private.h @@ -214,8 +214,8 @@ GO(SDL_GetHintBoolean, uFpu) GO(SDL_GetKeyboardFocus, pFv) GO(SDL_GetKeyboardState, pFp) //GO(SDL_GetKeyFromName, iFp) -//GO(SDL_GetKeyFromScancode, iFu) -//GO(SDL_GetKeyName, pFi) +GO(SDL_GetKeyFromScancode, iFu) +GO(SDL_GetKeyName, pFi) //GO(SDL_GetMemoryFunctions, vFpppp) GO(SDL_GetModState, uFv) GO(SDL_GetMouseFocus, pFv) @@ -254,7 +254,7 @@ GO(SDL_GetRelativeMouseState, uFpp) //GO(SDL_GetRevisionNumber, iFv) //GO(SDL_GetRGB, vFupppp) //GO(SDL_GetRGBA, vFuppppp) -//GO(SDL_GetScancodeFromKey, uFi) +GO(SDL_GetScancodeFromKey, uFi) //GO(SDL_GetScancodeFromName, uFp) //GO(SDL_GetScancodeName, pFu) //GO(SDL_GetShapedWindowMode, iFpp) @@ -300,7 +300,7 @@ GO(SDL_GetYUVConversionModeForResolution, uFii) GO(SDL_GL_CreateContext, pFp) GO(SDL_GL_DeleteContext, vFp) //GO(SDL_GL_ExtensionSupported, iFp) -//GO(SDL_GL_GetAttribute, iFup) +GO(SDL_GL_GetAttribute, iFup) GO(SDL_GL_GetCurrentContext, pFv) GO(SDL_GL_GetCurrentWindow, pFv) GO(SDL_GL_GetDrawableSize, vFppp) @@ -650,8 +650,8 @@ GOM(SDL_snprintf, iFEpLpV) GO(SDL_sqrt, dFd) GO(SDL_sqrtf, fFf) GO2(SDL_sscanf, iFEppV, my_sscanf) -//GO(SDL_StartTextInput, vFv) -//GO(SDL_StopTextInput, vFv) +GO(SDL_StartTextInput, vFv) +GO(SDL_StopTextInput, vFv) GO(SDL_strcasecmp, iFpp) GO(SDL_strchr, pFpi) GO(SDL_strcmp, iFpp)