ptitSeb/box64
1
0
Fork 0
mirror of https://github.com/ptitSeb/box64.git synced 2025-05-09 00:21:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

[WRAPPER] Added some missing function to wrapped libgio-2 (for #2575)

Browse Source
This commit is contained in:
ptitSeb 2025-04-26 10:12:28 +02:00
parent e4da025dc0
commit 6796b9ca02
7 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/emu/x64printer.c
View File

@ -2861,6 +2861,10 @@ void x64Print(x64emu_t* emu, char* buff, size_t buffsz, const char* func, int ti
snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIi64 ", %" PRIi64 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8);
} else if (w == vFpuipp) {
snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8);
} else if (w == vFpuipV) {
snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8));
} else if (w == vFpuipA) {
snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIi32 ", %" PRIp ", %" PRIp ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8);
} else if (w == vFpuuuu) {
snprintf(buff, buffsz, "%04d|%p: Calling %s(%" PRIp ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ", %" PRIu32 ")", tid, *(void**)(R_RSP), func, (void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8);
} else if (w == vFpuuup) {

4
src/wrapped/generated/functions_list.txt
View File

@ -1601,6 +1601,8 @@
#() vFpuiip
#() vFpuill
#() vFpuipp
#() vFpuipV
#() vFpuipA
#() vFpuuuu
#() vFpuuup
#() vFpuupp
@ -3820,9 +3822,11 @@ wrappedgio2:
- vFpippp:
- g_async_initable_init_async
- vFpuipV:
- g_dbus_method_invocation_return_error
- g_simple_async_result_set_error
- g_task_return_new_error
- vFpuipA:
- g_dbus_method_invocation_return_error_valist
- g_simple_async_result_set_error_va
- pFLpppV:
- g_initable_new

2
src/wrapped/generated/wrappedgio2types.h
View File

@ -60,8 +60,10 @@ typedef void (*vFpppppppuippp_t)(void*, void*, void*, void*, void*, void*, void*
GO(g_simple_async_result_new_take_error, pFpppp_t) \
GO(g_task_new, pFpppp_t) \
GO(g_async_initable_init_async, vFpippp_t) \
GO(g_dbus_method_invocation_return_error, vFpuipV_t) \
GO(g_simple_async_result_set_error, vFpuipV_t) \
GO(g_task_return_new_error, vFpuipV_t) \
GO(g_dbus_method_invocation_return_error_valist, vFpuipA_t) \
GO(g_simple_async_result_set_error_va, vFpuipA_t) \
GO(g_initable_new, pFLpppV_t) \
GO(g_initable_new_valist, pFLpApp_t) \

4
src/wrapped/generated/wrapper.c
View File

@ -1630,6 +1630,8 @@ typedef void (*vFpuiil_t)(void*, uint32_t, int32_t, int32_t, intptr_t);
typedef void (*vFpuiip_t)(void*, uint32_t, int32_t, int32_t, void*);
typedef void (*vFpuill_t)(void*, uint32_t, int32_t, intptr_t, intptr_t);
typedef void (*vFpuipp_t)(void*, uint32_t, int32_t, void*, void*);
typedef void (*vFpuipV_t)(void*, uint32_t, int32_t, void*, void*);
typedef void (*vFpuipA_t)(void*, uint32_t, int32_t, void*, void*);
typedef void (*vFpuuuu_t)(void*, uint32_t, uint32_t, uint32_t, uint32_t);
typedef void (*vFpuuup_t)(void*, uint32_t, uint32_t, uint32_t, void*);
typedef void (*vFpuupp_t)(void*, uint32_t, uint32_t, void*, void*);
@ -5131,6 +5133,8 @@ void vFpuiil(x64emu_t *emu, uintptr_t fcn) { vFpuiil_t fn = (vFpuiil_t)fcn; fn((
void vFpuiip(x64emu_t *emu, uintptr_t fcn) { vFpuiip_t fn = (vFpuiip_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
void vFpuill(x64emu_t *emu, uintptr_t fcn) { vFpuill_t fn = (vFpuill_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (intptr_t)R_RCX, (intptr_t)R_R8); }
void vFpuipp(x64emu_t *emu, uintptr_t fcn) { vFpuipp_t fn = (vFpuipp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
void vFpuipV(x64emu_t *emu, uintptr_t fcn) { vFpuipV_t fn = (vFpuipV_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)(R_RSP + 8)); }
void vFpuipA(x64emu_t *emu, uintptr_t fcn) { vFpuipA_t fn = (vFpuipA_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (int32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
void vFpuuuu(x64emu_t *emu, uintptr_t fcn) { vFpuuuu_t fn = (vFpuuuu_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); }
void vFpuuup(x64emu_t *emu, uintptr_t fcn) { vFpuuup_t fn = (vFpuuup_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (void*)R_R8); }
void vFpuupp(x64emu_t *emu, uintptr_t fcn) { vFpuupp_t fn = (vFpuupp_t)fcn; fn((void*)R_RDI, (uint32_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX, (void*)R_R8); }

2
src/wrapped/generated/wrapper.h
View File

@ -1638,6 +1638,8 @@ void vFpuiil(x64emu_t *emu, uintptr_t fnc);
void vFpuiip(x64emu_t *emu, uintptr_t fnc);
void vFpuill(x64emu_t *emu, uintptr_t fnc);
void vFpuipp(x64emu_t *emu, uintptr_t fnc);
void vFpuipV(x64emu_t *emu, uintptr_t fnc);
void vFpuipA(x64emu_t *emu, uintptr_t fnc);
void vFpuuuu(x64emu_t *emu, uintptr_t fnc);
void vFpuuup(x64emu_t *emu, uintptr_t fnc);
void vFpuupp(x64emu_t *emu, uintptr_t fnc);

16
src/wrapped/wrappedgio2.c
View File

@ -623,6 +623,22 @@ EXPORT void my_g_input_stream_read_async(x64emu_t* emu, void* stream, void* buff
my->g_input_stream_read_async(stream, buffer, count, io_prio, cancel, findGAsyncReadyCallbackFct(f), data);
}
EXPORT void my_g_dbus_method_invocation_return_error_valist(x64emu_t* emu, void* invocation, uint32_t domain, int code, void* fmt, x64_va_list_t V)
{
#ifdef CONVERT_VALIST
CONVERT_VALIST(V);
#else
CREATE_VALIST_FROM_VALIST(V, emu->scratch);
#endif
my->g_dbus_method_invocation_return_error_valist(invocation, domain, code, fmt, VARARGS);
}
EXPORT void my_g_dbus_method_invocation_return_error(x64emu_t* emu, void* invocation, uint32_t domain, int code, void* fmt, uintptr_t* b)
{
CREATE_VALIST_FROM_VAARG(b, emu->scratch, 4);
my->g_dbus_method_invocation_return_error(invocation, domain, code, fmt, VARARGS);
}
#define PRE_INIT \
if(BOX64ENV(nogtk)) \
return -1;

4
src/wrapped/wrappedgio2_private.h
View File

@ -458,9 +458,9 @@ GO(g_dbus_method_invocation_get_sender, pFp)
GO(g_dbus_method_invocation_get_type, LFv)
GO(g_dbus_method_invocation_get_user_data, pFp)
GO(g_dbus_method_invocation_return_dbus_error, vFppp)
//GOM(g_dbus_method_invocation_return_error, vFpuipV)
GOM(g_dbus_method_invocation_return_error, vFpuipV)
GO(g_dbus_method_invocation_return_error_literal, vFpuip)
//GOM(g_dbus_method_invocation_return_error_valist, vFpuipA)
GOM(g_dbus_method_invocation_return_error_valist, vFpuipA)
GO(g_dbus_method_invocation_return_gerror, vFpp)
GO(g_dbus_method_invocation_return_value, vFpp)
GO(g_dbus_method_invocation_return_value_with_unix_fd_list, vFppp)