diff options
| author | ptitSeb <sebastien.chev@gmail.com> | 2024-10-13 11:20:25 +0200 |
|---|---|---|
| committer | ptitSeb <sebastien.chev@gmail.com> | 2024-10-13 11:20:25 +0200 |
| commit | d31b9c9caa6b28e5c9246dcffc88367ef9d4e8f6 (patch) | |
| tree | 6bd6fcabb367ee7979ddf1fa0422f0609c81d10a /src/libtools | |
| parent | 2670d37542ddb7b03cc4e12b610f2b686562ee58 (diff) | |
| download | box64-d31b9c9caa6b28e5c9246dcffc88367ef9d4e8f6.tar.gz box64-d31b9c9caa6b28e5c9246dcffc88367ef9d4e8f6.zip | |
[BOX32] Allow internal memory to be in 32bits space if needed
Diffstat (limited to 'src/libtools')
| -rw-r--r-- | src/libtools/libc_net32.c | 4 | ||||
| -rwxr-xr-x | src/libtools/myalign32.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libtools/libc_net32.c b/src/libtools/libc_net32.c index 35e1e6a4..c06472fc 100644 --- a/src/libtools/libc_net32.c +++ b/src/libtools/libc_net32.c @@ -84,7 +84,7 @@ EXPORT int my32_getaddrinfo(x64emu_t* emu, void* node, void* service, struct i38 int idx = 0; while(p2) {++idx; p2 = p2->ai_next;} // doing the malloc! - void* r = box_malloc(idx*sizeof(struct i386_addrinfo)+sizeof(void*)); + void* r = actual_malloc(idx*sizeof(struct i386_addrinfo)+sizeof(void*)); ptr_t p3 = to_ptrv(r); *res = p3; p2 = p; @@ -114,7 +114,7 @@ EXPORT void my32_freeaddrinfo(x64emu_t* emu, void* a) { if(!a) return; void* orig = *(void**)(a+sizeof(struct i386_addrinfo)); freeaddrinfo(orig); - box_free(a); + actual_free(a); } EXPORT void* my32_gethostbyname(x64emu_t* emu, const char* a) diff --git a/src/libtools/myalign32.c b/src/libtools/myalign32.c index d16b8f28..7f41aa68 100755 --- a/src/libtools/myalign32.c +++ b/src/libtools/myalign32.c @@ -1494,7 +1494,7 @@ void AlignMsgHdr_32(void* dest, void* dest_iov, void* dest_cmsg, void* source, i struct i386_cmsghdr* cmsg = from_ptrv(s->msg_control); struct cmsghdr* dcmsg = dest_cmsg; while(cmsg) { - dcmsg->cmsg_len = to_ulong(cmsg->cmsg_len); + dcmsg->cmsg_len = from_ulong(cmsg->cmsg_len); dcmsg->cmsg_level = cmsg->cmsg_level; dcmsg->cmsg_type = cmsg->cmsg_type; if(cmsg->cmsg_len) { @@ -1533,7 +1533,7 @@ void UnalignMsgHdr_32(void* dest, void* source) struct i386_cmsghdr* dcmsg = from_ptrv(d->msg_control); struct cmsghdr* scmsg = s->msg_control; while(scmsg) { - dcmsg->cmsg_len = from_ulong(scmsg->cmsg_len); + dcmsg->cmsg_len = to_ulong(scmsg->cmsg_len); dcmsg->cmsg_level = scmsg->cmsg_level; dcmsg->cmsg_type = scmsg->cmsg_type; if(dcmsg->cmsg_len) { |