about summary refs log tree commit diff stats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/wrapped32/generated/functions_list.txt8
-rw-r--r--src/wrapped32/generated/wrappedlibctypes32.h8
-rwxr-xr-xsrc/wrapped32/wrappedlibc_private.h20
3 files changed, 26 insertions, 10 deletions
diff --git a/src/wrapped32/generated/functions_list.txt b/src/wrapped32/generated/functions_list.txt
index 22b7296b..a57644dc 100644
--- a/src/wrapped32/generated/functions_list.txt
+++ b/src/wrapped32/generated/functions_list.txt
@@ -2361,6 +2361,7 @@ wrappedlibc:
 - vFi:
   - exit
 - vEp:
+  - __libc_free
   - freeaddrinfo
   - regfree
 - vFp:
@@ -2404,6 +2405,9 @@ wrappedlibc:
 - pFu:
   - _ZGTtnaj
 - pEL:
+  - __libc_malloc
+  - __libc_pvalloc
+  - __libc_valloc
 - pFL:
   - _ZGTtnaX
   - _ZGTtnam
@@ -2470,9 +2474,13 @@ wrappedlibc:
 - pEip:
   - signal
 - pELL:
+  - __libc_calloc
+  - __libc_memalign
   - aligned_alloc
 - pEpi:
   - backtrace_symbols
+- pEpL:
+  - __libc_realloc
 - pEpp:
   - __cmsg_nxthdr
   - __gmtime_r
diff --git a/src/wrapped32/generated/wrappedlibctypes32.h b/src/wrapped32/generated/wrappedlibctypes32.h
index f7940d3f..a28f590d 100644
--- a/src/wrapped32/generated/wrappedlibctypes32.h
+++ b/src/wrapped32/generated/wrappedlibctypes32.h
@@ -63,6 +63,7 @@ typedef intptr_t (*lEuV_t)(uint32_t, ...);
 typedef void* (*pEip_t)(int32_t, void*);
 typedef void* (*pELL_t)(uintptr_t, uintptr_t);
 typedef void* (*pEpi_t)(void*, int32_t);
+typedef void* (*pEpL_t)(void*, uintptr_t);
 typedef void* (*pEpp_t)(void*, void*);
 typedef void* (*SEpp_t)(void*, void*);
 typedef int32_t (*iErLL_BLL__t)(struct_LL_t*, struct_LL_t*);
@@ -154,6 +155,7 @@ typedef int32_t (*iFpuippupp_t)(void*, uint32_t, int32_t, void*, void*, uint32_t
 
 #define SUPER() ADDED_FUNCTIONS() \
 	GO(exit, vFi_t) \
+	GO(__libc_free, vEp_t) \
 	GO(freeaddrinfo, vEp_t) \
 	GO(regfree, vEp_t) \
 	GO(_ZGTtdlPv, vFp_t) \
@@ -177,6 +179,9 @@ typedef int32_t (*iFpuippupp_t)(void*, uint32_t, int32_t, void*, void*, uint32_t
 	GO(__h_errno_location, pFv_t) \
 	GO(getpwuid, pEu_t) \
 	GO(_ZGTtnaj, pFu_t) \
+	GO(__libc_malloc, pEL_t) \
+	GO(__libc_pvalloc, pEL_t) \
+	GO(__libc_valloc, pEL_t) \
 	GO(_ZGTtnaX, pFL_t) \
 	GO(_ZGTtnam, pFL_t) \
 	GO(__ctime64, pEp_t) \
@@ -215,8 +220,11 @@ typedef int32_t (*iFpuippupp_t)(void*, uint32_t, int32_t, void*, void*, uint32_t
 	GO(ldexpl, KFKi_t) \
 	GO(frexpl, KFKp_t) \
 	GO(signal, pEip_t) \
+	GO(__libc_calloc, pELL_t) \
+	GO(__libc_memalign, pELL_t) \
 	GO(aligned_alloc, pELL_t) \
 	GO(backtrace_symbols, pEpi_t) \
+	GO(__libc_realloc, pEpL_t) \
 	GO(__cmsg_nxthdr, pEpp_t) \
 	GO(__gmtime_r, pEpp_t) \
 	GO(getservbyname, pEpp_t) \
diff --git a/src/wrapped32/wrappedlibc_private.h b/src/wrapped32/wrappedlibc_private.h
index 650b93b8..4e8bcd88 100755
--- a/src/wrapped32/wrappedlibc_private.h
+++ b/src/wrapped32/wrappedlibc_private.h
@@ -329,7 +329,7 @@ GOW(ferror, iES)
 //GO(ferror_unlocked, iEp)
 //GO(fexecve, iEipp)  //TODO: Check if needed to be wrapped, and target checked for x86 / native?
 GOW(fflush, iES)
-//GO(fflush_unlocked, iES)
+GO(fflush_unlocked, iES)
 GO(ffs, iEi)
 // __ffs
 GOW(ffsl, iEl)
@@ -395,7 +395,7 @@ GOW(fread, LEpLLS)
 //GO(__freadable, iEp)
 GO(__fread_chk, uEpLLLS)
 //GO(__freading, iEp)
-//GO(fread_unlocked, uEpuup)
+GO(fread_unlocked, LEpLLS)
 //GO(__fread_unlocked_chk, uEpuuup)
 GO(free, vEp)
 GOM(freeaddrinfo, vEEp)
@@ -454,7 +454,7 @@ GOWM(futimes, iEEip)
 //GOM(__fwprintf_chk, iEEpvpV) //%%
 //GO(__fwritable, iEp)
 GOW(fwrite, LEpLLS)
-//GO(fwrite_unlocked, uEpuup)
+GO(fwrite_unlocked, LEpLLS)
 //GO(__fwriting, iEp)
 // fwscanf
 GOM(__fxstat, iEEiip)       //%%
@@ -1020,7 +1020,7 @@ GO(lgetxattr, iEpppL)
 GOM(__libc_alloca_cutoff, iEEL) //%%
 // __libc_allocate_rtsig
 // __libc_allocate_rtsig_private
-//GO(__libc_calloc, pELL)
+GO2(__libc_calloc, pELL, calloc)
 // __libc_clntudp_bufcreate
 GO(__libc_current_sigrtmax, iEv)
 // __libc_current_sigrtmax_private
@@ -1032,28 +1032,28 @@ GO(__libc_current_sigrtmin, iEv)
 //GOM(__libc_dlsym, pEEpp)        //%%
 // __libc_fatal
 // __libc_fork
-//GO(__libc_free, vEp)
+GO2(__libc_free, vEp, free)
 // __libc_freeres
 GOM(__libc_init_first, vEEipV)  //%%
 DATAM(_libc_intl_domainname, 4)    // type R
 //GO2(__libc_open, iEEpOu, my_open)
 // __libc_longjmp
 // __libc_mallinfo
-//GO(__libc_malloc, pEL)
+GO2(__libc_malloc, pEL, malloc)
 // __libc_mallopt
-//GO(__libc_memalign, pELL)
+GO2(__libc_memalign, pELL, memalign)
 // __libc_pthread_init
-//GO(__libc_pvalloc, pEL)
+GO2(__libc_pvalloc, pEL, pvalloc)
 // __libc_pwrite
 //GO2(__libc_read, lEipL, my_read) //%%,noE
-//GO(__libc_realloc, pEpL)
+GO2(__libc_realloc, pEpL, realloc)
 // __libc_sa_len
 // __libc_siglongjmp
 GOM(__libc_start_main, iEEpippppp) //%%
 GO2(__libc_sigaction, iEEipp, my32_sigaction) //%%
 // __libc_system
 // __libc_thread_freeres
-//GO(__libc_valloc, pEL)
+GO2(__libc_valloc, pEL, valloc)
 GOW(link, iEpp)
 //GO(linkat, iEipipi)
 GOW(listen, iEii)