Changeset 43790 in vbox for trunk/include

Timestamp:

Nov 1, 2012 1:23:10 PM (12 years ago)

Author:

vboxsync

Message:

VBox/dbus: Added some more defines and proxy stubs.

Location:

trunk/include/VBox

Files:

• dbus-calls.h (modified) (3 diffs)
• dbus.h (modified) (3 diffs)

trunk/include/VBox/dbus-calls.h

@@ -43 +43 @@
  RT_PROXY_STUB(dbus_error_free, void, (DBusError *error), \
                  (error)) \
+ RT_PROXY_STUB(dbus_free_string_array, void, (char **str_array), \
+                 (str_array)) \
  RT_PROXY_STUB(dbus_connection_unref, void, (DBusConnection *connection), \
                  (connection)) \
@@ -69 +71 @@
                  (DBusMessage *message, int first_arg_type, va_list var_args), \
                  (message, first_arg_type, var_args)) \
+ RT_PROXY_STUB(dbus_message_get_args_valist, dbus_bool_t, \
+                 (DBusMessage *message, DBusError *error, int first_arg_type, va_list var_args), \
+                 (message, error, first_arg_type, var_args)) \
+ RT_PROXY_STUB(dbus_message_get_type, int, \
+                 (DBusMessage *message), \
+                 (message)) \
  RT_PROXY_STUB(dbus_message_iter_open_container, dbus_bool_t, \
                  (DBusMessageIter *iter, int type, const char *contained_signature, DBusMessageIter *sub), \
@@ -124 +132 @@
                  (message, string1, string2)) \
  RT_PROXY_STUB(dbus_connection_pop_message, DBusMessage *, \
-                 (DBusConnection *connection), (connection))
+                 (DBusConnection *connection), (connection)) \
+ RT_PROXY_STUB(dbus_set_error_from_message, dbus_bool_t, \
+                 (DBusError *error, DBusMessage *message), (error, message))
 
 #ifdef VBOX_DBUS_GENERATE_HEADER

trunk/include/VBox/dbus.h

@@ -81 +81 @@
 #define DBUS_ERROR_NO_MEMORY                "org.freedesktop.DBus.Error.NoMemory"
 
-/* Primitive types */
+/* Message types. */
+#define DBUS_MESSAGE_TYPE_INVALID           0
+#define DBUS_MESSAGE_TYPE_METHOD_CALL       1
+#define DBUS_MESSAGE_TYPE_METHOD_RETURN     2
+#define DBUS_MESSAGE_TYPE_ERROR             3
+#define DBUS_MESSAGE_TYPE_SIGNAL            4
+
+/* Primitive types. */
 #define DBUS_TYPE_INVALID                   ((int) '\0')
 #define DBUS_TYPE_INT32                     ((int) 'i')
@@ -88 +95 @@
 #define DBUS_TYPE_STRING_AS_STRING          "s"
 
-/* Compound types */
+/* Compound types. */
+#define DBUS_TYPE_OBJECT_PATH               ((int) 'o')
 #define DBUS_TYPE_ARRAY                     ((int) 'a')
 #define DBUS_TYPE_ARRAY_AS_STRING           "a"
@@ -113 +121 @@
 
 #endif /* ___VBox_DBus_h not defined */
-/* vi: set tabstop=4 shiftwidth=4 expandtab: */