mirror of
https://gitlab.freedesktop.org/dbus/dbus.git
synced 2026-05-26 08:48:12 +02:00
74b1b35402
* glib/dbus-gproxy.c (dbus_g_proxy_invoke): New method; calls to this are generated for client-side wrappers. Invokes a D-BUS method and returns reply values. * glib/dbus-binding-tool-glib.c (write_args_sig_for_direction): New function; writes signature string for argument direction. (write_args_for_direction): Change to pass input values directly instead of via address, and fix indentation. (generate_client_glue): Change to invoke dbus_g_proxy_invoke. Also make generated wrappers inlineable. * dbus/dbus-message.c (dbus_message_iter_get_fixed_array): Add note about using dbus_type_is_fixed. * dbus/dbus-marshal-basic.c (_dbus_type_is_fixed): Moved to dbus/dbus-signature.c as dbus_type_is_fixed. All callers updated. * dbus/dbus-signature.c (dbus_type_is_fixed): Moved here from dbus/dbus-marshal-basic.c:_dbus_type_is_fixed. * dbus/dbus-signature.h: Prototype. * glib/dbus-binding-tool-glib.c (compute_marshaller_name): Fix error printf code. * test/glib/test-dbus-glib.c (main): Be sure to clear error as appropriate instead of just freeing it. (main): Free returned strings using g_free. * test/glib/Makefile.am (test-service-glib-glue.h) (test-service-glib-bindings.h): Add dependency on dbus-binding-tool. * glib/dbus-gvalue.c (MAP_BASIC): Refactored from MAP_BASIC_INIT; simply maps a simple D-BUS type to GType. (dbus_dbus_type_to_gtype): Function which maps D-BUS type to GType. (dbus_gvalue_init): Just invoke dbus_dbus_type_to_gtype and initialize the value with it. (dbus_gvalue_binding_type_from_type): Unused, delete. (dbus_gvalue_demarshal): Switch to hardcoding demarshalling for various types instead of unmarshalling to value data directly. Remove can_convert boolean. (dbus_gvalue_marshal): Remove duplicate initialization; switch to returning directly instead of using can_convert boolean. (dbus_gvalue_store): New function; not related to D-BUS per-se. Stores a GValue in a pointer to a value of its corresponding C type. * glib/dbus-gvalue.h: Remove dbus_gvalue_binding_type_from_type, add dbus_gvalue_store.
482 lines
12 KiB
C
482 lines
12 KiB
C
/* -*- mode: C; c-file-style: "gnu" -*- */
|
|
/* dbus-gvalue.c GValue to-from DBusMessageIter
|
|
*
|
|
* Copyright (C) 2004 Ximian, Inc.
|
|
* Copyright (C) 2005 Red Hat, Inc.
|
|
*
|
|
* Licensed under the Academic Free License version 2.1
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
*/
|
|
|
|
#include <dbus-gvalue.h>
|
|
#include "dbus/dbus-signature.h"
|
|
|
|
/* This is slightly evil, we don't use g_value_set_foo() functions */
|
|
#define MAP_BASIC(d_t, g_t) \
|
|
case DBUS_TYPE_##d_t: \
|
|
return G_TYPE_##g_t;
|
|
|
|
static GType
|
|
dbus_dbus_type_to_gtype (int type)
|
|
{
|
|
switch (type)
|
|
{
|
|
MAP_BASIC (BOOLEAN, BOOLEAN);
|
|
MAP_BASIC (BYTE, UCHAR);
|
|
MAP_BASIC (INT32, INT);
|
|
MAP_BASIC (UINT32, UINT);
|
|
MAP_BASIC (INT64, INT64);
|
|
MAP_BASIC (UINT64, UINT64);
|
|
MAP_BASIC (DOUBLE, DOUBLE);
|
|
case DBUS_TYPE_INT16:
|
|
return G_TYPE_INT;
|
|
case DBUS_TYPE_UINT16:
|
|
return G_TYPE_UINT;
|
|
case DBUS_TYPE_STRING:
|
|
case DBUS_TYPE_OBJECT_PATH:
|
|
case DBUS_TYPE_SIGNATURE:
|
|
return G_TYPE_STRING;
|
|
case DBUS_TYPE_STRUCT:
|
|
case DBUS_TYPE_ARRAY:
|
|
case DBUS_TYPE_VARIANT:
|
|
default:
|
|
return G_TYPE_INVALID;
|
|
}
|
|
}
|
|
|
|
#undef MAP_BASIC
|
|
|
|
gboolean
|
|
dbus_gvalue_init (int type,
|
|
GValue *value)
|
|
{
|
|
GType gtype;
|
|
|
|
gtype = dbus_dbus_type_to_gtype (type);
|
|
if (gtype == G_TYPE_INVALID)
|
|
return FALSE;
|
|
g_value_init (value, gtype);
|
|
return TRUE;
|
|
}
|
|
|
|
/* FIXME - broken for containers
|
|
*/
|
|
static int
|
|
base_type_from_signature (const char *signature)
|
|
{
|
|
DBusSignatureIter iter;
|
|
|
|
dbus_signature_iter_init (&iter, signature);
|
|
|
|
return dbus_signature_iter_get_current_type (&iter);
|
|
}
|
|
|
|
const char *
|
|
dbus_gvalue_genmarshal_name_from_type (const char *signature)
|
|
{
|
|
int type;
|
|
|
|
type = base_type_from_signature (signature);
|
|
switch (type)
|
|
{
|
|
case DBUS_TYPE_BOOLEAN:
|
|
return "BOOLEAN";
|
|
case DBUS_TYPE_BYTE:
|
|
return "UCHAR";
|
|
case DBUS_TYPE_INT32:
|
|
return "INT";
|
|
case DBUS_TYPE_UINT32:
|
|
return "UINT";
|
|
case DBUS_TYPE_INT64:
|
|
return "INT64";
|
|
case DBUS_TYPE_UINT64:
|
|
return "UINT64";
|
|
case DBUS_TYPE_DOUBLE:
|
|
return "DOUBLE";
|
|
case DBUS_TYPE_INT16:
|
|
return "INT";
|
|
break;
|
|
case DBUS_TYPE_UINT16:
|
|
return "UINT";
|
|
case DBUS_TYPE_STRING:
|
|
case DBUS_TYPE_OBJECT_PATH:
|
|
case DBUS_TYPE_SIGNATURE:
|
|
return "STRING";
|
|
|
|
case DBUS_TYPE_STRUCT:
|
|
case DBUS_TYPE_ARRAY:
|
|
case DBUS_TYPE_VARIANT:
|
|
return NULL;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
const char *
|
|
dbus_gvalue_ctype_from_type (const char *signature, gboolean in)
|
|
{
|
|
int type;
|
|
|
|
type = base_type_from_signature (signature);
|
|
|
|
switch (type)
|
|
{
|
|
case DBUS_TYPE_BOOLEAN:
|
|
return "gboolean";
|
|
case DBUS_TYPE_BYTE:
|
|
return "guchar";
|
|
case DBUS_TYPE_INT32:
|
|
return "gint32";
|
|
case DBUS_TYPE_UINT32:
|
|
return "guint32";
|
|
case DBUS_TYPE_INT64:
|
|
return "gint64";
|
|
case DBUS_TYPE_UINT64:
|
|
return "guint64";
|
|
case DBUS_TYPE_DOUBLE:
|
|
return "gdouble";
|
|
case DBUS_TYPE_INT16:
|
|
return "gint";
|
|
break;
|
|
case DBUS_TYPE_UINT16:
|
|
return "guint";
|
|
case DBUS_TYPE_STRING:
|
|
case DBUS_TYPE_OBJECT_PATH:
|
|
case DBUS_TYPE_SIGNATURE:
|
|
/* FIXME - kind of a hack */
|
|
if (in)
|
|
return "const char *";
|
|
else
|
|
return "char *";
|
|
case DBUS_TYPE_STRUCT:
|
|
case DBUS_TYPE_ARRAY:
|
|
case DBUS_TYPE_VARIANT:
|
|
return NULL;
|
|
}
|
|
return NULL;
|
|
}
|
|
|
|
const char *
|
|
dbus_gtype_to_dbus_type (GType type)
|
|
{
|
|
switch (type)
|
|
{
|
|
case G_TYPE_CHAR:
|
|
case G_TYPE_UCHAR:
|
|
return DBUS_TYPE_BYTE_AS_STRING;
|
|
|
|
case G_TYPE_BOOLEAN:
|
|
return DBUS_TYPE_BOOLEAN_AS_STRING;
|
|
|
|
/* long gets cut to 32 bits so the remote API is consistent
|
|
* on all architectures
|
|
*/
|
|
|
|
case G_TYPE_LONG:
|
|
case G_TYPE_INT:
|
|
return DBUS_TYPE_INT32_AS_STRING;
|
|
case G_TYPE_ULONG:
|
|
case G_TYPE_UINT:
|
|
return DBUS_TYPE_UINT32_AS_STRING;
|
|
|
|
case G_TYPE_INT64:
|
|
return DBUS_TYPE_INT64_AS_STRING;
|
|
|
|
case G_TYPE_UINT64:
|
|
return DBUS_TYPE_UINT64_AS_STRING;
|
|
|
|
case G_TYPE_FLOAT:
|
|
case G_TYPE_DOUBLE:
|
|
return DBUS_TYPE_DOUBLE_AS_STRING;
|
|
|
|
case G_TYPE_STRING:
|
|
return DBUS_TYPE_STRING_AS_STRING;
|
|
|
|
default:
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
gboolean
|
|
dbus_gvalue_demarshal (DBusMessageIter *iter, GValue *value)
|
|
{
|
|
g_assert (sizeof (dbus_bool_t) == sizeof (value->data[0].v_int));
|
|
|
|
dbus_gvalue_init (dbus_message_iter_get_arg_type (iter), value);
|
|
|
|
switch (dbus_message_iter_get_arg_type (iter))
|
|
{
|
|
case DBUS_TYPE_BOOLEAN:
|
|
{
|
|
dbus_bool_t bool;
|
|
dbus_message_iter_get_basic (iter, &bool);
|
|
g_value_set_boolean (value, bool);
|
|
return TRUE;
|
|
}
|
|
case DBUS_TYPE_BYTE:
|
|
{
|
|
unsigned char byte;
|
|
dbus_message_iter_get_basic (iter, &byte);
|
|
g_value_set_uchar (value, byte);
|
|
return TRUE;
|
|
}
|
|
case DBUS_TYPE_INT32:
|
|
{
|
|
dbus_int32_t intval;
|
|
dbus_message_iter_get_basic (iter, &intval);
|
|
g_value_set_int (value, intval);
|
|
return TRUE;
|
|
}
|
|
case DBUS_TYPE_UINT32:
|
|
{
|
|
dbus_uint32_t intval;
|
|
dbus_message_iter_get_basic (iter, &intval);
|
|
g_value_set_uint (value, intval);
|
|
return TRUE;
|
|
}
|
|
case DBUS_TYPE_INT64:
|
|
{
|
|
dbus_int64_t intval;
|
|
dbus_message_iter_get_basic (iter, &intval);
|
|
g_value_set_int64 (value, intval);
|
|
return TRUE;
|
|
}
|
|
case DBUS_TYPE_UINT64:
|
|
{
|
|
dbus_uint64_t intval;
|
|
dbus_message_iter_get_basic (iter, &intval);
|
|
g_value_set_uint64 (value, intval);
|
|
return TRUE;
|
|
}
|
|
case DBUS_TYPE_DOUBLE:
|
|
{
|
|
double dval;
|
|
dbus_message_iter_get_basic (iter, &dval);
|
|
g_value_set_double (value, dval);
|
|
return TRUE;
|
|
}
|
|
case DBUS_TYPE_INT16:
|
|
{
|
|
dbus_int16_t v;
|
|
dbus_message_iter_get_basic (iter, &v);
|
|
g_value_set_int (value, v);
|
|
return TRUE;
|
|
}
|
|
case DBUS_TYPE_UINT16:
|
|
{
|
|
dbus_uint16_t v;
|
|
dbus_message_iter_get_basic (iter, &v);
|
|
g_value_set_uint (value, v);
|
|
return TRUE;
|
|
}
|
|
case DBUS_TYPE_STRING:
|
|
case DBUS_TYPE_OBJECT_PATH:
|
|
case DBUS_TYPE_SIGNATURE:
|
|
{
|
|
const char *s;
|
|
dbus_message_iter_get_basic (iter, &s);
|
|
g_value_set_string (value, s);
|
|
return TRUE;
|
|
}
|
|
case DBUS_TYPE_STRUCT:
|
|
case DBUS_TYPE_ARRAY:
|
|
case DBUS_TYPE_VARIANT:
|
|
default:
|
|
return FALSE;
|
|
}
|
|
}
|
|
|
|
gboolean
|
|
dbus_gvalue_marshal (DBusMessageIter *iter, GValue *value)
|
|
{
|
|
GType value_type;
|
|
|
|
value_type = G_VALUE_TYPE (value);
|
|
|
|
switch (value_type)
|
|
{
|
|
case G_TYPE_CHAR:
|
|
{
|
|
char b = g_value_get_char (value);
|
|
if (!dbus_message_iter_append_basic (iter,
|
|
DBUS_TYPE_BYTE,
|
|
&b))
|
|
goto nomem;
|
|
}
|
|
return TRUE;
|
|
case G_TYPE_UCHAR:
|
|
{
|
|
unsigned char b = g_value_get_uchar (value);
|
|
if (!dbus_message_iter_append_basic (iter,
|
|
DBUS_TYPE_BYTE,
|
|
&b))
|
|
goto nomem;
|
|
}
|
|
return TRUE;
|
|
case G_TYPE_BOOLEAN:
|
|
{
|
|
dbus_bool_t b = g_value_get_boolean (value);
|
|
if (!dbus_message_iter_append_basic (iter,
|
|
DBUS_TYPE_BOOLEAN,
|
|
&b))
|
|
goto nomem;
|
|
}
|
|
return TRUE;
|
|
case G_TYPE_INT:
|
|
{
|
|
dbus_int32_t v = g_value_get_int (value);
|
|
if (!dbus_message_iter_append_basic (iter,
|
|
DBUS_TYPE_INT32,
|
|
&v))
|
|
goto nomem;
|
|
}
|
|
return TRUE;
|
|
case G_TYPE_UINT:
|
|
{
|
|
dbus_uint32_t v = g_value_get_uint (value);
|
|
if (!dbus_message_iter_append_basic (iter,
|
|
DBUS_TYPE_UINT32,
|
|
&v))
|
|
goto nomem;
|
|
}
|
|
return TRUE;
|
|
/* long gets cut to 32 bits so the remote API is consistent
|
|
* on all architectures
|
|
*/
|
|
case G_TYPE_LONG:
|
|
{
|
|
dbus_int32_t v = g_value_get_long (value);
|
|
if (!dbus_message_iter_append_basic (iter,
|
|
DBUS_TYPE_INT32,
|
|
&v))
|
|
goto nomem;
|
|
}
|
|
return TRUE;
|
|
case G_TYPE_ULONG:
|
|
{
|
|
dbus_uint32_t v = g_value_get_ulong (value);
|
|
if (!dbus_message_iter_append_basic (iter,
|
|
DBUS_TYPE_UINT32,
|
|
&v))
|
|
goto nomem;
|
|
}
|
|
return TRUE;
|
|
case G_TYPE_INT64:
|
|
{
|
|
gint64 v = g_value_get_int64 (value);
|
|
if (!dbus_message_iter_append_basic (iter,
|
|
DBUS_TYPE_INT64,
|
|
&v))
|
|
goto nomem;
|
|
}
|
|
return TRUE;
|
|
case G_TYPE_UINT64:
|
|
{
|
|
guint64 v = g_value_get_uint64 (value);
|
|
if (!dbus_message_iter_append_basic (iter,
|
|
DBUS_TYPE_UINT64,
|
|
&v))
|
|
goto nomem;
|
|
}
|
|
return TRUE;
|
|
case G_TYPE_FLOAT:
|
|
{
|
|
double v = g_value_get_float (value);
|
|
|
|
if (!dbus_message_iter_append_basic (iter,
|
|
DBUS_TYPE_DOUBLE,
|
|
&v))
|
|
goto nomem;
|
|
}
|
|
return TRUE;
|
|
case G_TYPE_DOUBLE:
|
|
{
|
|
double v = g_value_get_double (value);
|
|
|
|
if (!dbus_message_iter_append_basic (iter,
|
|
DBUS_TYPE_DOUBLE,
|
|
&v))
|
|
goto nomem;
|
|
}
|
|
return TRUE;
|
|
case G_TYPE_STRING:
|
|
/* FIXME, the GValue string may not be valid UTF-8 */
|
|
{
|
|
const char *v = g_value_get_string (value);
|
|
if (!dbus_message_iter_append_basic (iter,
|
|
DBUS_TYPE_STRING,
|
|
&v))
|
|
goto nomem;
|
|
}
|
|
return TRUE;
|
|
|
|
default:
|
|
/* FIXME: we need to define custom boxed types for arrays
|
|
etc. so we can map them transparently / pleasantly */
|
|
return FALSE;
|
|
}
|
|
|
|
nomem:
|
|
g_error ("no memory");
|
|
return FALSE;
|
|
}
|
|
|
|
/* FIXME is there a better way to do this? */
|
|
gboolean
|
|
dbus_gvalue_store (GValue *value,
|
|
gpointer storage)
|
|
{
|
|
switch (G_VALUE_TYPE (value))
|
|
{
|
|
case G_TYPE_CHAR:
|
|
*((gchar *) storage) = g_value_get_char (value);
|
|
return TRUE;
|
|
case G_TYPE_UCHAR:
|
|
*((guchar *) storage) = g_value_get_uchar (value);
|
|
return TRUE;
|
|
case G_TYPE_BOOLEAN:
|
|
*((gboolean *) storage) = g_value_get_boolean (value);
|
|
return TRUE;
|
|
case G_TYPE_LONG:
|
|
*((glong *) storage) = g_value_get_long (value);
|
|
return TRUE;
|
|
case G_TYPE_ULONG:
|
|
*((gulong *) storage) = g_value_get_ulong (value);
|
|
return TRUE;
|
|
case G_TYPE_INT:
|
|
*((gint *) storage) = g_value_get_int (value);
|
|
return TRUE;
|
|
case G_TYPE_UINT:
|
|
*((guint *) storage) = g_value_get_uint (value);
|
|
return TRUE;
|
|
case G_TYPE_INT64:
|
|
*((gint64 *) storage) = g_value_get_int64 (value);
|
|
return TRUE;
|
|
case G_TYPE_UINT64:
|
|
*((guint64 *) storage) = g_value_get_uint64 (value);
|
|
return TRUE;
|
|
case G_TYPE_FLOAT:
|
|
case G_TYPE_DOUBLE:
|
|
*((gdouble *) storage) = g_value_get_double (value);
|
|
return TRUE;
|
|
case G_TYPE_STRING:
|
|
/* FIXME - should optimize by not duping string twice */
|
|
*((gchar **) storage) = g_value_dup_string (value);
|
|
return TRUE;
|
|
default:
|
|
return FALSE;
|
|
}
|
|
}
|