fiddle 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f60ecd26479775fa123a883a89a39ebae034c408e99bd0bc33a4d802cc04c648
-  data.tar.gz: 7466888aaca2242fd13af7c6663212d4c7404c4e5336626baea9c2519a068c7f
+  metadata.gz: 05f04e2fc988a1635621c537e5836231c2ae496ed45990523be623b44c8557be
+  data.tar.gz: b81aec1d67a6a08413245b483c6aed84052df7f5b907e8111bf1b8a47c2e69bd
 SHA512:
-  metadata.gz: bd4349a30d8aa6b0113261cb3f53e2dee46b56b1ea72617abfbf921f31b13161897f39277358aa8e1bf3d6329d41b4b260f198ac850916eb677e7a46a21ee299
-  data.tar.gz: 99dd69a25bb75de362d244ebc0d4d338710b93195ce417356e44e9d7415ec7a1c0e553da2406a3ae3c5d907d705ad40e9bb9ab46eb7c95fc2ddd0aee7ea42df5
+  metadata.gz: 7b1c8640fb5a93f6b8c36eb3062f7b795cc10160176fe6d8e3f1370c5ce4ffd2e3036581ed4a3842a8eeb6d595219e8ee370c9c0d996e6213dfcb400fea10c58
+  data.tar.gz: fcd3f9cf4d08f760065770d2529f95c17dc8c95f889d691824f98bad1cb03fbeee20dcf005493b4bc9b66850b7fecdf022b13aaa6c359949a2266696a313619f

data/ext/fiddle/function.c

@@ -378,9 +378,10 @@ function_call(int argc, VALUE argv[], VALUE self)
     {
         int errno_keep = errno;
 #if defined(_WIN32)
+        DWORD error = WSAGetLastError();
         int socket_error = WSAGetLastError();
         rb_funcall(mFiddle, rb_intern("win32_last_error="), 1,
-                   INT2NUM(errno_keep));
+                   ULONG2NUM(error));
         rb_funcall(mFiddle, rb_intern("win32_last_socket_error="), 1,
                    INT2NUM(socket_error));
 #endif

data/ext/fiddle/memory_view.c

@@ -1,5 +1,6 @@
 #include <stdbool.h>
 #include <ruby/ruby.h>
+#include <ruby/encoding.h>
 
 #ifdef HAVE_RUBY_MEMORY_VIEW_H
 # include <ruby/memory_view.h>
@@ -35,12 +36,25 @@ fiddle_memview_mark(void *ptr)
 }
 
 static void
-fiddle_memview_free(void *ptr)
+fiddle_memview_release(struct memview_data *data)
 {
-    struct memview_data *data = ptr;
+    if (NIL_P(data->view.obj)) return;
+
     rb_memory_view_release(&data->view);
-    if (data->members)
+    data->view.obj = Qnil;
+    data->view.byte_size = 0;
+    if (data->members) {
         xfree(data->members);
+        data->members = NULL;
+        data->n_members = 0;
+    }
+}
+
+static void
+fiddle_memview_free(void *ptr)
+{
+    struct memview_data *data = ptr;
+    fiddle_memview_release(data);
     xfree(ptr);
 }
 
@@ -62,11 +76,32 @@ rb_fiddle_memview_s_allocate(VALUE klass)
     struct memview_data *data;
     VALUE obj = TypedData_Make_Struct(klass, struct memview_data, &fiddle_memview_data_type, data);
     data->view.obj = Qnil;
+    data->view.byte_size = 0;
     data->members = NULL;
     data->n_members = 0;
     return obj;
 }
 
+static VALUE
+rb_fiddle_memview_release(VALUE obj)
+{
+    struct memview_data *data;
+    TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
+
+    if (NIL_P(data->view.obj)) return Qnil;
+    fiddle_memview_release(data);
+    return Qnil;
+}
+
+static VALUE
+rb_fiddle_memview_s_export(VALUE klass, VALUE target)
+{
+    ID id_new;
+    CONST_ID(id_new, "new");
+    VALUE memview = rb_funcall(klass, id_new, 1, target);
+    return rb_ensure(rb_yield, memview, rb_fiddle_memview_release, memview);
+}
+
 static VALUE
 rb_fiddle_memview_initialize(VALUE obj, VALUE target)
 {
@@ -74,6 +109,7 @@ rb_fiddle_memview_initialize(VALUE obj, VALUE target)
     TypedData_Get_Struct(obj, struct memview_data, &fiddle_memview_data_type, data);
 
     if (!rb_memory_view_get(target, &data->view, 0)) {
+        data->view.obj = Qnil;
         rb_raise(rb_eArgError, "Unable to get a memory view from %+"PRIsVALUE, target);
     }
 
@@ -233,12 +269,44 @@ rb_fiddle_memview_aref(int argc, VALUE *argv, VALUE obj)
     return rb_memory_view_extract_item_members(ptr, data->members, data->n_members);
 }
 
+static VALUE
+rb_fiddle_memview_to_s(VALUE self)
+{
+    struct memview_data *data;
+    const char *raw_data;
+    long byte_size;
+    VALUE string;
+
+    TypedData_Get_Struct(self,
+                         struct memview_data,
+                         &fiddle_memview_data_type,
+                         data);
+
+    if (NIL_P(data->view.obj)) {
+        raw_data = NULL;
+        byte_size = 0;
+    } else {
+        raw_data = data->view.data;
+        byte_size = data->view.byte_size;
+    }
+
+    string = rb_enc_str_new_static(raw_data, byte_size, rb_ascii8bit_encoding());
+    {
+        ID id_memory_view;
+        CONST_ID(id_memory_view, "memory_view");
+        rb_ivar_set(string, id_memory_view, self);
+    }
+    return rb_obj_freeze(string);
+}
+
 void
 Init_fiddle_memory_view(void)
 {
     rb_cMemoryView = rb_define_class_under(mFiddle, "MemoryView", rb_cObject);
     rb_define_alloc_func(rb_cMemoryView, rb_fiddle_memview_s_allocate);
+    rb_define_singleton_method(rb_cMemoryView, "export", rb_fiddle_memview_s_export, 1);
     rb_define_method(rb_cMemoryView, "initialize", rb_fiddle_memview_initialize, 1);
+    rb_define_method(rb_cMemoryView, "release", rb_fiddle_memview_release, 0);
     rb_define_method(rb_cMemoryView, "obj", rb_fiddle_memview_get_obj, 0);
     rb_define_method(rb_cMemoryView, "byte_size", rb_fiddle_memview_get_byte_size, 0);
     rb_define_method(rb_cMemoryView, "readonly?", rb_fiddle_memview_get_readonly, 0);
@@ -249,6 +317,7 @@ Init_fiddle_memory_view(void)
     rb_define_method(rb_cMemoryView, "strides", rb_fiddle_memview_get_strides, 0);
     rb_define_method(rb_cMemoryView, "sub_offsets", rb_fiddle_memview_get_sub_offsets, 0);
     rb_define_method(rb_cMemoryView, "[]", rb_fiddle_memview_aref, -1);
+    rb_define_method(rb_cMemoryView, "to_s", rb_fiddle_memview_to_s, 0);
 }
 
 #endif /* FIDDLE_MEMORY_VIEW */

data/ext/fiddle/pointer.c

@@ -770,6 +770,7 @@ rb_fiddle_ptr_s_to_ptr(VALUE self, VALUE val)
     }
     else if (RTEST(rb_obj_is_kind_of(val, rb_cString))){
 	char *str = StringValuePtr(val);
+        wrap = val;
 	ptr = rb_fiddle_ptr_new(str, RSTRING_LEN(val), NULL);
     }
     else if ((vptr = rb_check_funcall(val, id_to_ptr, 0, 0)) != Qundef){

data/lib/fiddle/function.rb

@@ -19,5 +19,11 @@ module Fiddle
     def to_i
       ptr.to_i
     end
+
+    # Turn this function in to a proc
+    def to_proc
+      this = self
+      lambda { |*args| this.call(*args) }
+    end
   end
 end

data/lib/fiddle/version.rb

@@ -1,3 +1,3 @@
 module Fiddle
-  VERSION = "1.0.8"
+  VERSION = "1.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fiddle
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Aaron Patterson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler