diff options
| author | rajdakin <rajdakin@gmail.com> | 2024-09-10 17:46:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-10 17:46:10 +0200 |
| commit | 8187c35ea8ffa4d115b53306f6d530cea47ea412 (patch) | |
| tree | 3af38a39a89abde4863706afbb8c0aedc26f3822 | |
| parent | 0d6028d83753ce93aff9aecc8443de657663071c (diff) | |
| download | box64-8187c35ea8ffa4d115b53306f6d530cea47ea412.tar.gz box64-8187c35ea8ffa4d115b53306f6d530cea47ea412.zip | |
[WRAPPERS] Fixed some wrong wrappings (#1814)
| -rw-r--r-- | src/wrapped/wrappedlibc.c | 12 | ||||
| -rw-r--r-- | src/wrapped/wrappedlibc_private.h | 26 | ||||
| -rw-r--r-- | src/wrapped/wrappedlibssl_private.h | 2 |
3 files changed, 26 insertions, 14 deletions
diff --git a/src/wrapped/wrappedlibc.c b/src/wrapped/wrappedlibc.c index fd0eb377..72de9c7d 100644 --- a/src/wrapped/wrappedlibc.c +++ b/src/wrapped/wrappedlibc.c @@ -1178,6 +1178,18 @@ EXPORT void my_vwarn(x64emu_t* emu, void* fmt, x64_va_list_t b) { #endif return vwarn(fmt, VARARGS); } +EXPORT void my_vwarnx(x64emu_t* emu, void* fmt, x64_va_list_t b) { + if (!fmt) + return warnx(NULL); + #ifdef CONVERT_VALIST + (void)emu; + CONVERT_VALIST(b); + #else + myStackAlignValist(emu, (const char*)fmt, emu->scratch, b); + PREPARE_VALIST; + #endif + return vwarnx(fmt, VARARGS); +} EXPORT void my_warn(x64emu_t *emu, void* fmt, void* b) { myStackAlign(emu, (const char*)fmt, b, emu->scratch, R_EAX, 1); PREPARE_VALIST; diff --git a/src/wrapped/wrappedlibc_private.h b/src/wrapped/wrappedlibc_private.h index 39cd116b..b4339643 100644 --- a/src/wrapped/wrappedlibc_private.h +++ b/src/wrapped/wrappedlibc_private.h @@ -1015,7 +1015,7 @@ GO(__isnanf, iFf) GOW(isnanf, iFf) GOD(__isnanl, iFD, __isnan) GOWD(isnanl, iFD, isnan) -GO2(__isoc23_fscanf, iFEppV, my___isoc99_fscanf) +GO2(__isoc23_fscanf, iFESpV, my___isoc99_fscanf) GO2(__isoc23_sscanf, iFEppV, my___isoc99_sscanf) GO2(__isoc23_strtol, lFppi, strtol) GO2(__isoc23_strtoll, IFppi, strtoll) @@ -2305,8 +2305,8 @@ GOM(vswscanf, iFEppA) GOM(vsyslog, vFEipA) GOM(__vsyslog_chk, vFEiipA) //GO(vtimes, -GO(vwarn, vFpA) -GO(vwarnx, vFpA) +GOM(vwarn, vFpA) +GOM(vwarnx, vFpA) GOM(vwprintf, iFEpA) //GO(__vwprintf_chk, GOM(vwscanf, iFpA) @@ -2526,29 +2526,29 @@ GOM(wscanf, iFEpV) //GOM(xdr_callhdr, iFpp) //GOM(xdr_callmsg, iFpp) //GOM(xdr_char, iFpp) -GO(xdr_cryptkeyarg, iFv) -GO(xdr_cryptkeyarg2, iFv) -GO(xdr_cryptkeyres, iFv) +//GOM(xdr_cryptkeyarg, iFpp) +//GOM(xdr_cryptkeyarg2, iFpp) +//GOM(xdr_cryptkeyres, iFpp) //GOM(xdr_des_block, iFpp) //GOM(xdr_double, iFpp) //GOM(xdr_enum, iFpp) //GOM(xdr_float, iFpp) //GOM(xdr_free, vFpp) -GO(xdr_getcredres, iFv) +//GOM(xdr_getcredres, iFpp) //GOM(xdr_hyper, iFpp) //GOM(xdr_int, iFpp) //GOM(xdr_int16_t, iFpp) //GOM(xdr_int32_t, iFpp) //GOM(xdr_int64_t, iFpp) //GOM(xdr_int8_t, iFpp) -GO(xdr_keybuf, iFv) -GO(xdr_key_netstarg, iFv) -GO(xdr_key_netstres, iFv) -GO(xdr_keystatus, iFv) +//GOM(xdr_keybuf, iFpp) +//GOM(xdr_key_netstarg, iFpp) +//GOM(xdr_key_netstres, iFpp) +//GOM(xdr_keystatus, iFpp) //GOM(xdr_long, iFpp) //GOM(xdr_longlong_t, iFpp) //GOM(xdrmem_create, vFppuu) -GO(xdr_netnamestr, iFv) +//GOM(xdr_netnamestr, iFpp) //GOM(xdr_netobj, iFpp) //GOM(xdr_opaque, iFppu) //GOM(xdr_opaque_auth, iFpp) @@ -2579,7 +2579,7 @@ GO(xdr_netnamestr, iFv) //GOM(xdr_u_long, iFpp) //GOM(xdr_u_longlong_t, iFpp) //GOM(xdr_union, iFppppp) -GO(xdr_unixcred, iFv) +//GOM(xdr_unixcred, iFpp) //GOM(xdr_u_quad_t, iFpp) //GOM(xdr_u_short, iFpp) //GOM(xdr_vector, iFppuup) diff --git a/src/wrapped/wrappedlibssl_private.h b/src/wrapped/wrappedlibssl_private.h index fa2a083b..9b86cc34 100644 --- a/src/wrapped/wrappedlibssl_private.h +++ b/src/wrapped/wrappedlibssl_private.h @@ -430,7 +430,7 @@ GO(SSL_get_version, pFp) //GO(SSL_get_wfd, //GO(SSL_has_matching_session_id, //GO(ssl_init_wbio_buffer, -GO(SSL_in_init, iFP) +GO(SSL_in_init, iFp) GO(SSL_is_init_finished, iFp) GO(SSL_is_server, iFp) GO(SSL_library_init, iFv) |