diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/wrapped/generated/functions_list.txt | 3 | ||||
| -rw-r--r-- | src/wrapped/generated/wrappeddbustypes.h | 4 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.c | 2 | ||||
| -rw-r--r-- | src/wrapped/generated/wrapper.h | 2 | ||||
| -rwxr-xr-x | src/wrapped/wrappeddbus_private.h | 2 |
5 files changed, 9 insertions, 4 deletions
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt index fc3754b4..a86bb76c 100644 --- a/src/wrapped/generated/functions_list.txt +++ b/src/wrapped/generated/functions_list.txt @@ -716,6 +716,7 @@ #() iFEppii #() iFEppip #() iFEppiV +#() iFEppiA #() iFEpplp #() iFEpppp #() iFEpppV @@ -1337,7 +1338,7 @@ wrappeddbus: - dbus_connection_set_data - dbus_message_set_data - dbus_pending_call_set_data -- iFppip: +- iFppiA: - dbus_message_get_args_valist - iFpppp: - dbus_connection_add_filter diff --git a/src/wrapped/generated/wrappeddbustypes.h b/src/wrapped/generated/wrappeddbustypes.h index 2f304395..b4a2c73b 100644 --- a/src/wrapped/generated/wrappeddbustypes.h +++ b/src/wrapped/generated/wrappeddbustypes.h @@ -14,7 +14,7 @@ typedef void (*vFppp_t)(void*, void*, void*); typedef void (*vFpppp_t)(void*, void*, void*, void*); typedef int64_t (*iFpipp_t)(void*, int64_t, void*, void*); -typedef int64_t (*iFppip_t)(void*, void*, int64_t, void*); +typedef int64_t (*iFppiA_t)(void*, void*, int64_t, va_list); typedef int64_t (*iFpppp_t)(void*, void*, void*, void*); typedef int64_t (*iFppppp_t)(void*, void*, void*, void*, void*); typedef int64_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*); @@ -28,7 +28,7 @@ typedef int64_t (*iFpppppp_t)(void*, void*, void*, void*, void*, void*); GO(dbus_connection_set_data, iFpipp_t) \ GO(dbus_message_set_data, iFpipp_t) \ GO(dbus_pending_call_set_data, iFpipp_t) \ - GO(dbus_message_get_args_valist, iFppip_t) \ + GO(dbus_message_get_args_valist, iFppiA_t) \ GO(dbus_connection_add_filter, iFpppp_t) \ GO(dbus_pending_call_set_notify, iFpppp_t) \ GO(dbus_connection_try_register_fallback, iFppppp_t) \ diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c index d8af237e..4df2b8ad 100644 --- a/src/wrapped/generated/wrapper.c +++ b/src/wrapped/generated/wrapper.c @@ -750,6 +750,7 @@ typedef int64_t (*iFEpLpV_t)(x64emu_t*, void*, uintptr_t, void*, void*); typedef int64_t (*iFEppii_t)(x64emu_t*, void*, void*, int64_t, int64_t); typedef int64_t (*iFEppip_t)(x64emu_t*, void*, void*, int64_t, void*); typedef int64_t (*iFEppiV_t)(x64emu_t*, void*, void*, int64_t, void*); +typedef int64_t (*iFEppiA_t)(x64emu_t*, void*, void*, int64_t, void*); typedef int64_t (*iFEpplp_t)(x64emu_t*, void*, void*, intptr_t, void*); typedef int64_t (*iFEpppp_t)(x64emu_t*, void*, void*, void*, void*); typedef int64_t (*iFEpppV_t)(x64emu_t*, void*, void*, void*, void*); @@ -2042,6 +2043,7 @@ void iFEpLpV(x64emu_t *emu, uintptr_t fcn) { iFEpLpV_t fn = (iFEpLpV_t)fcn; R_RA void iFEppii(x64emu_t *emu, uintptr_t fcn) { iFEppii_t fn = (iFEppii_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (int64_t)R_RCX); } void iFEppip(x64emu_t *emu, uintptr_t fcn) { iFEppip_t fn = (iFEppip_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX); } void iFEppiV(x64emu_t *emu, uintptr_t fcn) { iFEppiV_t fn = (iFEppiV_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)(R_RSP + 8)); } +void iFEppiA(x64emu_t *emu, uintptr_t fcn) { iFEppiA_t fn = (iFEppiA_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (int64_t)R_RDX, (void*)R_RCX); } void iFEpplp(x64emu_t *emu, uintptr_t fcn) { iFEpplp_t fn = (iFEpplp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX); } void iFEpppp(x64emu_t *emu, uintptr_t fcn) { iFEpppp_t fn = (iFEpppp_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX); } void iFEpppV(x64emu_t *emu, uintptr_t fcn) { iFEpppV_t fn = (iFEpppV_t)fcn; R_RAX=(int64_t)fn(emu, (void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)(R_RSP + 8)); } diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h index d7bfca86..b784d479 100644 --- a/src/wrapped/generated/wrapper.h +++ b/src/wrapped/generated/wrapper.h @@ -26,6 +26,7 @@ typedef void (*wrapper_t)(x64emu_t* emu, uintptr_t fnc); // N = ... automatically sending 1 arg // M = ... automatically sending 2 args // H = Huge 128bits value/struct +// A = va_list void vFE(x64emu_t *emu, uintptr_t fnc); void vFv(x64emu_t *emu, uintptr_t fnc); @@ -745,6 +746,7 @@ void iFEpLpV(x64emu_t *emu, uintptr_t fnc); void iFEppii(x64emu_t *emu, uintptr_t fnc); void iFEppip(x64emu_t *emu, uintptr_t fnc); void iFEppiV(x64emu_t *emu, uintptr_t fnc); +void iFEppiA(x64emu_t *emu, uintptr_t fnc); void iFEpplp(x64emu_t *emu, uintptr_t fnc); void iFEpppp(x64emu_t *emu, uintptr_t fnc); void iFEpppV(x64emu_t *emu, uintptr_t fnc); diff --git a/src/wrapped/wrappeddbus_private.h b/src/wrapped/wrappeddbus_private.h index 006874d3..3827fb50 100755 --- a/src/wrapped/wrappeddbus_private.h +++ b/src/wrapped/wrappeddbus_private.h @@ -100,7 +100,7 @@ GO(dbus_message_demarshal, pFpip) GO(dbus_message_demarshal_bytes_needed, iFpi) GO(dbus_message_free_data_slot, vFp) //GOM(dbus_message_get_args, iFEppiV) -GOM(dbus_message_get_args_valist, iFEppip) +GOM(dbus_message_get_args_valist, iFEppiA) GO(dbus_message_get_auto_start, iFp) GO(dbus_message_get_data, pFpi) GO(dbus_message_get_destination, pFp) |