Added wrapped dbus_message_get_args and a generic mothod to convert VAARG '...' to valist (helps wine64)

5 files changed, 43 insertions, 10 deletions

diff --git a/src/include/myalign.h b/src/include/myalign.h
index bd46908f..29550942 100755
--- a/src/include/myalign.h
+++ b/src/include/myalign.h
@@ -35,6 +35,20 @@ typedef struct {
   sysv_varargs->reg_save_area=A->reg_save_area;  \
   sysv_varargs->overflow_arg_area=A->overflow_arg_area;
 
+#define CREATE_VALIST_FROM_VAARG(STACK, SCRATCH, N) \
+  va_list sysv_varargs;                     \
+  sysv_varargs->gp_offset=(6-((N<6)?N:6))*8;\
+  sysv_varargs->fp_offset=(6*8);            \
+  sysv_varargs->reg_save_area=SCRATCH;      \
+  sysv_varargs->overflow_arg_area=STACK;    \
+  {                                         \
+    uint64_t *p = (uint64_t*)SCRATCH;       \
+    p[0]=R_RDI; p[1]=R_RSI; p[2]=R_RDX;     \
+    p[3]=R_RCX; p[4]=R_R8; p[5]=R_R9;       \
+    memcpy(&p[6], emu->xmm, 8*16);          \
+  }
+
+
 
 #elif defined(__aarch64__)
 // aarch64: 8 64bits general regs and 8 128bits float regs
@@ -54,14 +68,28 @@ typedef struct  va_list {
   sysv_varargs.__vr_offs=(8*16); \
   sysv_varargs.__stack=A;
 
-#define CONVERT_VALIST(A) \
-  va_list sysv_varargs; \
-  sysv_varargs.__gr_offs=-(6*8)+A->gp_offset;  \
-  sysv_varargs.__vr_offs=-(8*16)+(A->fp_offset-X64_VA_MAX_REG);        \
-  sysv_varargs.__stack=A->overflow_arg_area;    \
-  sysv_varargs.__gr_top=A->reg_save_area + X64_VA_MAX_REG;  \
+#define CONVERT_VALIST(A)                                       \
+  va_list sysv_varargs;                                         \
+  sysv_varargs.__gr_offs=-(6*8)+A->gp_offset;                   \
+  sysv_varargs.__vr_offs=-(8*16)+(A->fp_offset-X64_VA_MAX_REG); \
+  sysv_varargs.__stack=A->overflow_arg_area;                    \
+  sysv_varargs.__gr_top=A->reg_save_area + X64_VA_MAX_REG;      \
   sysv_varargs.__vr_top=A->reg_save_area + X64_VA_MAX_XMM;
 
+#define CREATE_VALIST_FROM_VAARG(STACK, SCRATCH, N)   \
+  va_list sysv_varargs;                               \
+  sysv_varargs.__gr_offs=(8*(2+((N<6)?N:6)));         \
+  sysv_varargs.__vr_offs=0;                           \
+  sysv_varargs.__stack=STACK;                         \
+  sysv_varargs.__gr_top=SCRATCH + X64_VA_MAX_REG;     \
+  sysv_varargs.__vr_top=SCRATCH + X64_VA_MAX_XMM;     \
+  {                                                   \
+    uint64_t *p = (uint64_t*)SCRATCH;                 \
+    p[0]=R_RDI; p[1]=R_RSI; p[2]=R_RDX;               \
+    p[3]=R_RCX; p[4]=R_R8; p[5]=R_R9;                 \
+    memcpy(&p[6], emu->xmm, 8*16);                    \
+  }
+
 #elif defined(__powerpc64__)
 // TODO, is this correct?
 #define CREATE_SYSV_VALIST(A) \
diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index bb214580..1d0f75af 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -1482,6 +1482,8 @@ wrappeddbus:
   - dbus_connection_set_data
   - dbus_message_set_data
   - dbus_pending_call_set_data
+- iFppip:
+  - dbus_message_get_args
 - iFppiA:
   - dbus_message_get_args_valist
 - iFpppp:
diff --git a/src/wrapped/generated/wrappeddbustypes.h b/src/wrapped/generated/wrappeddbustypes.h
index b4a2c73b..a4e785b0 100644
--- a/src/wrapped/generated/wrappeddbustypes.h
+++ b/src/wrapped/generated/wrappeddbustypes.h
@@ -14,6 +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*);
@@ -28,6 +29,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, 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) \
diff --git a/src/wrapped/wrappeddbus.c b/src/wrapped/wrappeddbus.c
index dacae925..9599894d 100755
--- a/src/wrapped/wrappeddbus.c
+++ b/src/wrapped/wrappeddbus.c
@@ -415,13 +415,14 @@ EXPORT int my_dbus_message_get_args_valist(x64emu_t* emu, void* message, void* e
     return my->dbus_message_get_args_valist(message, e, arg, VARARGS);
 }
 
-/*EXPORT int my_dbus_message_get_args(x64emu_t* emu, void* message, void* e, int arg, uint64_t* V)
+EXPORT int my_dbus_message_get_args(x64emu_t* emu, void* message, void* e, int arg, uint64_t* V)
 {
     (void)emu;
     dbus_my_t *my = (dbus_my_t*)my_lib->priv.w.p2;
 
-    return my->dbus_message_get_args_valist(message, e, arg, V);
-}*/
+    CREATE_VALIST_FROM_VAARG(V, emu->scratch, 3);
+    return my->dbus_message_get_args_valist(message, e, arg, VARARGS);
+}
 
 EXPORT int my_dbus_message_set_data(x64emu_t* emu, void* message, int32_t slot, void* data, void* free_func)
 {
diff --git a/src/wrapped/wrappeddbus_private.h b/src/wrapped/wrappeddbus_private.h
index bb3b5321..1b4fa60d 100755
--- a/src/wrapped/wrappeddbus_private.h
+++ b/src/wrapped/wrappeddbus_private.h
@@ -99,7 +99,7 @@ GO(dbus_message_copy, pFp)
 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, iFEppip)
 GO(dbus_message_get_allow_interactive_authorization, iFp)
 GOM(dbus_message_get_args_valist, iFEppiA)
 GO(dbus_message_get_auto_start, iFp)