gobject-introspection 3.4.9 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46669e91b4af175368180fc2152330751da6a7a240f942e6d7acef846822fdf7
-  data.tar.gz: 0456bafef2aca2d5c43dff46556b11d181251bc95e455b3de4b12d9ddc298f87
+  metadata.gz: 54062f046bb51a2e07d28faa23e18411b178410186c51ef6d5f233e4a9192af8
+  data.tar.gz: 83e81475c6625c0765a309bfaac9cde57e156a6916bdee19a29eb3b52eaeb0e0
 SHA512:
-  metadata.gz: a5a15ad2b14adf1be44f0924eb002c24256c77c30016f5fa0734d0035e1a5842ca70edb624614da61c8f3065bcf1f4bc832685cfc383a0e3daa5e5aa020bb312
-  data.tar.gz: e5e058654ef3ac94dd75dd1c247ee3c68fcda15eb7996f9523688ae77f6f5a7e7d3943f450864aa4acbc94cefa6da6da0a6aec221eaca9bba8de3087a853ad4d
+  metadata.gz: fb439ff8c2eb5aead6a768ea4b68b65d9c7f6fa36c7fdc027ec3b184578eeb5471e81c45e752922cfdd1a2ecd4a752ffe111c0af89d96e1105e5a385f775550f
+  data.tar.gz: b285185c0bedfc226e8cefd3c31b929254dc33addf84756f5d83d9e01b3bb1a2c15da3d5600531159ab2e2dd1c27988e9146816fb30c12911c3cfa512b5e2ea1

data/ext/gobject-introspection/rb-gi-arg-info.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2019  Ruby-GNOME Project Team
+ *  Copyright (C) 2012-2022  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -23,6 +23,41 @@
 #define RG_TARGET_NAMESPACE rb_cGIArgInfo
 #define SELF(self) (RVAL2GI_ARG_INFO(self))
 
+gboolean
+rb_gi_arg_info_is_input_buffer(GIArgInfo *info)
+{
+    if (g_arg_info_get_direction(info) != GI_DIRECTION_IN) {
+        return FALSE;
+    }
+
+    /* Heuristic */
+    const gchar *name = g_base_info_get_name((GIBaseInfo *)info);
+    if (strcmp(name, "buffer") != 0) {
+        return FALSE;
+    }
+
+    GITypeInfo type_info;
+    g_arg_info_load_type(info, &type_info);
+    if (g_type_info_get_tag(&type_info) != GI_TYPE_TAG_ARRAY) {
+        return FALSE;
+    }
+
+    GIArrayType array_type = g_type_info_get_array_type(&type_info);
+    if (array_type != GI_ARRAY_TYPE_C) {
+        return FALSE;
+    }
+
+    gint length_index = g_type_info_get_array_length(&type_info);
+    if (length_index == -1) {
+        return FALSE;
+    }
+
+    GITypeInfo *element_type_info = g_type_info_get_param_type(&type_info, 0);
+    GITypeTag element_type_tag = g_type_info_get_tag(element_type_info);
+    g_base_info_unref(element_type_info);
+    return element_type_tag == GI_TYPE_TAG_UINT8;
+}
+
 gboolean
 rb_gi_arg_info_is_output_buffer(GIArgInfo *info)
 {
@@ -148,6 +183,13 @@ rg_type(VALUE self)
     return GI_BASE_INFO2RVAL_WITH_UNREF(g_arg_info_get_type(info));
 }
 
+static VALUE
+rg_input_buffer_p(VALUE self)
+{
+    GIArgInfo *info = SELF(self);
+    return CBOOL2RVAL(rb_gi_arg_info_is_input_buffer(info));
+}
+
 static VALUE
 rg_output_buffer_p(VALUE self)
 {
@@ -175,6 +217,7 @@ rb_gi_arg_info_init(VALUE rb_mGI, VALUE rb_cGIBaseInfo)
     RG_DEF_METHOD(destroy, 0);
     RG_DEF_METHOD(type, 0);
 
+    RG_DEF_METHOD_P(input_buffer, 0);
     RG_DEF_METHOD_P(output_buffer, 0);
 
     G_DEF_CLASS(G_TYPE_I_DIRECTION, "Direction", rb_mGI);

data/ext/gobject-introspection/rb-gi-arguments-in.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2021  Ruby-GNOME Project Team
+ *  Copyright (C) 2012-2022  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -36,7 +36,6 @@ rb_gi_arguments_in_to_ruby(RBGIArguments *args)
     rb_in_args = rb_ary_new_capa(args->metadata->len);
     for (i = 0; i < args->metadata->len; i++) {
         RBGIArgMetadata *metadata;
-        GITypeInfo *type_info;
         VALUE rb_arg;
 
         metadata = g_ptr_array_index(args->metadata, i);
@@ -47,15 +46,14 @@ rb_gi_arguments_in_to_ruby(RBGIArguments *args)
         if (metadata->closure_p) {
             continue;
         }
+        if (metadata->array_length_p) {
+            continue;
+        }
 
-        type_info = g_arg_info_get_type(&(metadata->arg_info));
-        /* TODO */
-        rb_arg = GI_ARGUMENT2RVAL(metadata->in_arg,
-                                  FALSE,
-                                  type_info,
-                                  args->in_args,
-                                  args->out_args,
-                                  args->metadata);
+        rb_arg = rb_gi_arguments_convert_arg(args,
+                                             metadata->in_arg,
+                                             metadata,
+                                             FALSE);
         rb_ary_push(rb_in_args, rb_arg);
     }
 
@@ -1203,10 +1201,14 @@ rb_gi_arguments_in_init_arg_ruby_interface(RBGIArguments *args,
                     rb_gi_arguments_in_free_interface_struct_gbytes;
             }
         } else if (metadata->type.interface_gtype == G_TYPE_CLOSURE) {
-            GClosure *rclosure = NULL;
-
-            rclosure = g_rclosure_new(metadata->rb_arg, Qnil, NULL);
-            g_rclosure_attach(rclosure, args->rb_receiver);
+            GClosure *rclosure = g_rclosure_new(metadata->rb_arg, Qnil, NULL);
+            if (RVAL2CBOOL(rb_obj_is_kind_of(args->rb_receiver,
+                                             rbg_cGLibObject()))) {
+                g_rclosure_attach_gobject(rclosure, args->rb_receiver);
+                g_closure_unref(rclosure);
+            } else {
+                g_rclosure_attach(rclosure, args->rb_receiver);
+            }
             metadata->in_arg->v_pointer = rclosure;
         } else {
             metadata->in_arg->v_pointer =
@@ -1503,7 +1505,7 @@ rb_gi_arguments_in_init_arg_ruby_ghash_convert(VALUE rb_key,
     data->key_ruby_to_c_data->rb_value = rb_key;
     key = data->key_ruby_to_c_func(data->key_ruby_to_c_data);
     data->value_ruby_to_c_data->rb_value = rb_value;
-    value = data->key_ruby_to_c_func(data->value_ruby_to_c_data);
+    value = data->value_ruby_to_c_func(data->value_ruby_to_c_data);
     g_hash_table_insert(data->hash_table, key, value);
     return ST_CONTINUE;
 }
@@ -2023,16 +2025,18 @@ rb_gi_arguments_in_init_arg_raw_interface(RBGIArguments *args,
       metadata->in_arg->v_pointer = *((gpointer *)(args->raw_args[metadata->index]));
       break;
     case GI_INFO_TYPE_BOXED:
+      rb_raise(rb_eNotImpError,
+               "TODO: %s::%s: raw argument -> GIArgument(interface)[%s]: <%s>",
+               g_base_info_get_namespace(args->info),
+               g_base_info_get_name(args->info),
+               g_info_type_to_string(metadata->type.interface_type),
+               g_base_info_get_name(metadata->type.interface_info));
+      break;
     case GI_INFO_TYPE_ENUM:
-        rb_raise(rb_eNotImpError,
-                 "TODO: %s::%s: raw argument -> GIArgument(interface)[%s]: <%s>",
-                 g_base_info_get_namespace(args->info),
-                 g_base_info_get_name(args->info),
-                 g_info_type_to_string(metadata->type.interface_type),
-                 g_base_info_get_name(metadata->type.interface_info));
-        break;
+      metadata->in_arg->v_int32 = *((gint32 *)(args->raw_args[metadata->index]));
+      break;
     case GI_INFO_TYPE_FLAGS:
-      metadata->in_arg->v_int32= *((gint32 *)(args->raw_args[metadata->index]));
+      metadata->in_arg->v_int32 = *((gint32 *)(args->raw_args[metadata->index]));
       break;
     case GI_INFO_TYPE_OBJECT:
     case GI_INFO_TYPE_INTERFACE:
@@ -2164,12 +2168,15 @@ rb_gi_arguments_in_init(RBGIArguments *args)
 void
 rb_gi_arguments_in_clear(RBGIArguments *args)
 {
-    guint i;
+    if (!args->metadata) {
+        return;
+    }
 
     if (!args->rb_mode_p) {
         return;
     }
 
+    guint i;
     for (i = 0; i < args->metadata->len; i++) {
         RBGIArgMetadata *metadata;
 

data/ext/gobject-introspection/rb-gi-arguments-out.c

@@ -1,6 +1,6 @@
 /* -*- c-file-style: "ruby"; indent-tabs-mode: nil -*- */
 /*
- *  Copyright (C) 2012-2019  Ruby-GNOME Project Team
+ *  Copyright (C) 2012-2022  Ruby-GNOME Project Team
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
@@ -140,6 +140,7 @@ rb_gi_arguments_out_free_array_array_interface_struct(RBGIArguments *args,
              */
             break;
         }
+        G_GNUC_FALLTHROUGH;
       default:
         rb_raise(rb_eNotImpError,
                  "TODO: [%s] %s free GIArgument(%s/%s)[interface(%s)](%s)[%s]",
@@ -150,6 +151,7 @@ rb_gi_arguments_out_free_array_array_interface_struct(RBGIArguments *args,
                  g_info_type_to_string(metadata->element_type.interface_type),
                  g_type_name(metadata->element_type.interface_gtype),
                  rb_gi_transfer_to_string(metadata->transfer));
+        break;
     }
     g_array_free(target, TRUE);
 }
@@ -264,14 +266,6 @@ rb_gi_arguments_out_free_error(RBGIArguments *args,
                                gpointer user_data)
 {
     GError **target = metadata->out_arg->v_pointer;
-    if (metadata->transfer != GI_TRANSFER_NOTHING) {
-        rb_raise(rb_eNotImpError,
-                 "TODO: [%s] %s free GIArgument(%s)[%s]",
-                 metadata->name,
-                 rb_gi_direction_to_string(metadata->direction),
-                 g_type_tag_to_string(metadata->type.tag),
-                 rb_gi_transfer_to_string(metadata->transfer));
-    }
     xfree(target);
 }
 
@@ -315,7 +309,12 @@ rb_gi_arguments_out_init_arg_array_c(RBGIArguments *args,
                          rb_gi_transfer_to_string(metadata->transfer));
             }
             argument->v_pointer = RSTRING_PTR(metadata->rb_arg);
-            length_metadata->out_arg->v_size = RSTRING_LEN(metadata->rb_arg);
+            if (length_metadata->in_arg) {
+                length_metadata->in_arg->v_size = RSTRING_LEN(metadata->rb_arg);
+            }
+            if (length_metadata->out_arg) {
+                length_metadata->out_arg->v_size = RSTRING_LEN(metadata->rb_arg);
+            }
         } else {
             argument->v_pointer = ALLOC(guint8 *);
             metadata->free_func = rb_gi_arguments_out_free_array_c_uint8;
@@ -788,8 +787,11 @@ rb_gi_arguments_out_init(RBGIArguments *args)
 void
 rb_gi_arguments_out_clear(RBGIArguments *args)
 {
-    guint i;
+    if (!args->metadata) {
+        return;
+    }
 
+    guint i;
     for (i = 0; i < args->metadata->len; i++) {
         RBGIArgMetadata *metadata;
 
@@ -887,12 +889,10 @@ rb_gi_arguments_out_to_ruby_arg(RBGIArguments *args,
         break;
     }
 
-    return rb_gi_argument_to_ruby(&normalized_argument,
-                                  duplicate,
-                                  metadata->type.info,
-                                  args->in_args,
-                                  args->out_args,
-                                  args->metadata);
+    return rb_gi_arguments_convert_arg(args,
+                                       &normalized_argument,
+                                       metadata,
+                                       duplicate);
 }
 
 VALUE