luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-10 19:36:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug552961-methods/wip'

Browse Source 
svn path=/trunk/; revision=647
This commit is contained in:
Colin Walters 2008-10-02 21:24:20 +00:00
parent d982b65391
commit ec679636ef
2 changed files with 44 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
ginvoke.c
View File

@ -158,7 +158,8 @@ g_function_info_invoke (GIFunctionInfo *info,
gpointer func; gpointer func;
GITypeInfo *tinfo; GITypeInfo *tinfo;
GIArgInfo *ainfo; GIArgInfo *ainfo;
gint n_args, in_pos, out_pos, i; gboolean is_method;
gint n_args, n_invoke_args, in_pos, out_pos, i;
gpointer *args; gpointer *args;
gboolean success = FALSE; gboolean success = FALSE;
@ -199,24 +200,49 @@ g_function_info_invoke (GIFunctionInfo *info,
g_module_close (entire_app); g_module_close (entire_app);
} }
is_method = (g_function_info_get_flags (info) & GI_FUNCTION_IS_METHOD) != 0
&& (g_function_info_get_flags (info) & GI_FUNCTION_IS_CONSTRUCTOR) == 0;
tinfo = g_callable_info_get_return_type ((GICallableInfo *)info); tinfo = g_callable_info_get_return_type ((GICallableInfo *)info);
rtype = get_ffi_type (tinfo); rtype = get_ffi_type (tinfo);
g_base_info_unref ((GIBaseInfo *)tinfo); g_base_info_unref ((GIBaseInfo *)tinfo);
n_args = g_callable_info_get_n_args ((GICallableInfo *)info);
atypes = g_new (ffi_type*, n_args);
args = g_new (gpointer, n_args);
in_pos = 0; in_pos = 0;
out_pos = 0; out_pos = 0;
n_args = g_callable_info_get_n_args ((GICallableInfo *)info);
if (is_method)
{
if (n_in_args == 0)
{
g_set_error (error,
G_INVOKE_ERROR,
G_INVOKE_ERROR_ARGUMENT_MISMATCH,
"Too few \"in\" arguments (handling this)");
goto out;
}
n_invoke_args = n_args+1;
in_pos++;
}
else
n_invoke_args = n_args;
atypes = g_new (ffi_type*, n_invoke_args);
args = g_new (gpointer, n_invoke_args);
if (is_method)
{
atypes[0] = &ffi_type_pointer;
args[0] = (gpointer) &in_args[0];
}
for (i = 0; i < n_args; i++) for (i = 0; i < n_args; i++)
{ {
int offset = (is_method ? 1 : 0);
ainfo = g_callable_info_get_arg ((GICallableInfo *)info, i); ainfo = g_callable_info_get_arg ((GICallableInfo *)info, i);
switch (g_arg_info_get_direction (ainfo)) switch (g_arg_info_get_direction (ainfo))
{ {
case GI_DIRECTION_IN: case GI_DIRECTION_IN:
tinfo = g_arg_info_get_type (ainfo); tinfo = g_arg_info_get_type (ainfo);
atypes[i] = get_ffi_type (tinfo); atypes[i+offset] = get_ffi_type (tinfo);
g_base_info_unref ((GIBaseInfo *)tinfo); g_base_info_unref ((GIBaseInfo *)tinfo);
if (in_pos >= n_in_args) if (in_pos >= n_in_args)
@ -224,38 +250,38 @@ g_function_info_invoke (GIFunctionInfo *info,
g_set_error (error, g_set_error (error,
G_INVOKE_ERROR, G_INVOKE_ERROR,
G_INVOKE_ERROR_ARGUMENT_MISMATCH, G_INVOKE_ERROR_ARGUMENT_MISMATCH,
"Too few \"in\" arguments"); "Too few \"in\" arguments (handling in)");
goto out; goto out;
} }
args[i] = (gpointer)&in_args[in_pos]; args[i+offset] = (gpointer)&in_args[in_pos];
in_pos++; in_pos++;
break; break;
case GI_DIRECTION_OUT: case GI_DIRECTION_OUT:
atypes[i] = &ffi_type_pointer; atypes[i+offset] = &ffi_type_pointer;
if (out_pos >= n_out_args) if (out_pos >= n_out_args)
{ {
g_set_error (error, g_set_error (error,
G_INVOKE_ERROR, G_INVOKE_ERROR,
G_INVOKE_ERROR_ARGUMENT_MISMATCH, G_INVOKE_ERROR_ARGUMENT_MISMATCH,
"Too few \"out\" arguments"); "Too few \"out\" arguments (handling out)");
goto out; goto out;
} }
args[i] = (gpointer)&out_args[out_pos]; args[i+offset] = (gpointer)&out_args[out_pos+offset];
out_pos++; out_pos++;
break; break;
case GI_DIRECTION_INOUT: case GI_DIRECTION_INOUT:
atypes[i] = &ffi_type_pointer; atypes[i+offset] = &ffi_type_pointer;
if (in_pos >= n_in_args) if (in_pos >= n_in_args)
{ {
g_set_error (error, g_set_error (error,
G_INVOKE_ERROR, G_INVOKE_ERROR,
G_INVOKE_ERROR_ARGUMENT_MISMATCH, G_INVOKE_ERROR_ARGUMENT_MISMATCH,
"Too few \"in\" arguments"); "Too few \"in\" arguments (handling inout)");
goto out; goto out;
} }
@ -264,11 +290,11 @@ g_function_info_invoke (GIFunctionInfo *info,
g_set_error (error, g_set_error (error,
G_INVOKE_ERROR, G_INVOKE_ERROR,
G_INVOKE_ERROR_ARGUMENT_MISMATCH, G_INVOKE_ERROR_ARGUMENT_MISMATCH,
"Too few \"in\" arguments"); "Too few \"out\" arguments (handling inout)");
goto out; goto out;
} }
args[i] = (gpointer)&in_args[in_pos]; args[i+offset] = (gpointer)&in_args[in_pos];
in_pos++; in_pos++;
out_pos++; out_pos++;
break; break;
@ -282,7 +308,7 @@ g_function_info_invoke (GIFunctionInfo *info,
g_set_error (error, g_set_error (error,
G_INVOKE_ERROR, G_INVOKE_ERROR,
G_INVOKE_ERROR_ARGUMENT_MISMATCH, G_INVOKE_ERROR_ARGUMENT_MISMATCH,
"Too many \"in\" arguments"); "Too many \"in\" arguments (at end)");
goto out; goto out;
} }
if (out_pos < n_out_args) if (out_pos < n_out_args)
@ -290,11 +316,11 @@ g_function_info_invoke (GIFunctionInfo *info,
g_set_error (error, g_set_error (error,
G_INVOKE_ERROR, G_INVOKE_ERROR,
G_INVOKE_ERROR_ARGUMENT_MISMATCH, G_INVOKE_ERROR_ARGUMENT_MISMATCH,
"Too many \"out\" arguments"); "Too many \"out\" arguments (at end)");
goto out; goto out;
} }
if (ffi_prep_cif (&cif, FFI_DEFAULT_ABI, n_args, rtype, atypes) != FFI_OK) if (ffi_prep_cif (&cif, FFI_DEFAULT_ABI, n_invoke_args, rtype, atypes) != FFI_OK)
goto out; goto out;
ffi_call (&cif, func, return_value, args); ffi_call (&cif, func, return_value, args);

47
gtypelib.c
View File

@ -821,53 +821,6 @@ validate_function_blob (ValidateContext *ctx,
return FALSE; return FALSE;
} }
} }
else if (is_method)
{
guint32 this_offset;
guint32 this_type_offset;
ArgBlob *this;
SimpleTypeBlob *thistype;
InterfaceTypeBlob *thistype_iface;
if (sigblob->n_arguments == 0)
{
g_set_error (error,
G_TYPELIB_ERROR,
G_TYPELIB_ERROR_INVALID,
"Invalid 0-argument method");
}
this_offset = blob->signature + sizeof (SignatureBlob);
this = (ArgBlob*) &typelib->data[this_offset];
this_type_offset = this_offset + G_STRUCT_OFFSET (ArgBlob, arg_type);
thistype = (SimpleTypeBlob *)&typelib->data[this_type_offset];
if (thistype->reserved == 0 &&
thistype->reserved2 == 0)
{
g_set_error (error,
G_TYPELIB_ERROR,
G_TYPELIB_ERROR_INVALID_BLOB,
"Non-reference type tag %d found for \"this\" argument",
thistype->tag);
return FALSE;
}
thistype_iface = (InterfaceTypeBlob*)&typelib->data[thistype->offset];
switch (thistype_iface->tag)
{
case GI_TYPE_TAG_INTERFACE:
break;
default:
g_set_error (error,
G_TYPELIB_ERROR,
G_TYPELIB_ERROR_INVALID_BLOB,
"Invalid type tag %d found for \"this\" argument",
thistype_iface->tag);
return FALSE;
}
}
pop_context (ctx); pop_context (ctx);