fiddle 1.0.4 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7e244560b492c43b7458506409f4d624372766d882e306a48a08fc9ad32671b
-  data.tar.gz: 9a166eb1dded473780e8ea89d1240da28ff6be73e72f2026eff14f6e55f060b9
+  metadata.gz: 05f04e2fc988a1635621c537e5836231c2ae496ed45990523be623b44c8557be
+  data.tar.gz: b81aec1d67a6a08413245b483c6aed84052df7f5b907e8111bf1b8a47c2e69bd
 SHA512:
-  metadata.gz: 7c4509d95af60a2f16047e431580a3e6b1828b0bcf0820302d678c1b2f8e9462df767ce5a6c7e60ef728fa0d7a3afe667cbbe982e161802dafc49ed0a398bf2a
-  data.tar.gz: 00623b0e514fad355b76ec9d59273c15759d5991c2832c6df10c23ad06ef98f628d5d6381cfd75449ee0c2811b3f58d66b55824993c5d3aef1a2d2be1d79a8de
+  metadata.gz: 7b1c8640fb5a93f6b8c36eb3062f7b795cc10160176fe6d8e3f1370c5ce4ffd2e3036581ed4a3842a8eeb6d595219e8ee370c9c0d996e6213dfcb400fea10c58
+  data.tar.gz: fcd3f9cf4d08f760065770d2529f95c17dc8c95f889d691824f98bad1cb03fbeee20dcf005493b4bc9b66850b7fecdf022b13aaa6c359949a2266696a313619f

data/ext/fiddle/closure.c

@@ -130,6 +130,10 @@ with_gvl_callback(void *ptr)
 	    rb_ary_push(params, ULL2NUM(*(unsigned LONG_LONG *)x->args[i]));
 	    break;
 #endif
+	  case TYPE_CONST_STRING:
+	    rb_ary_push(params,
+                        rb_str_new_cstr(*((const char **)(x->args[i]))));
+	    break;
 	  default:
 	    rb_raise(rb_eRuntimeError, "closure args: %d", type);
         }
@@ -175,6 +179,10 @@ with_gvl_callback(void *ptr)
 	*(unsigned LONG_LONG *)x->resp = NUM2ULL(ret);
 	break;
 #endif
+      case TYPE_CONST_STRING:
+        /* Dangerous. Callback must keep reference of the String. */
+        *((const char **)(x->resp)) = StringValueCStr(ret);
+        break;
       default:
 	rb_raise(rb_eRuntimeError, "closure retval: %d", type);
     }
@@ -221,6 +229,7 @@ initialize(int rbargc, VALUE argv[], VALUE self)
 {
     VALUE ret;
     VALUE args;
+    VALUE normalized_args;
     VALUE abi;
     fiddle_closure * cl;
     ffi_cif * cif;
@@ -239,21 +248,26 @@ initialize(int rbargc, VALUE argv[], VALUE self)
 
     cl->argv = (ffi_type **)xcalloc(argc + 1, sizeof(ffi_type *));
 
+    normalized_args = rb_ary_new_capa(argc);
     for (i = 0; i < argc; i++) {
-        int type = NUM2INT(RARRAY_AREF(args, i));
-        cl->argv[i] = INT2FFI_TYPE(type);
+        VALUE arg = rb_fiddle_type_ensure(RARRAY_AREF(args, i));
+        rb_ary_push(normalized_args, arg);
+        cl->argv[i] = rb_fiddle_int_to_ffi_type(NUM2INT(arg));
     }
     cl->argv[argc] = NULL;
 
+    ret = rb_fiddle_type_ensure(ret);
     rb_iv_set(self, "@ctype", ret);
-    rb_iv_set(self, "@args", args);
+    rb_iv_set(self, "@args", normalized_args);
 
     cif = &cl->cif;
     pcl = cl->pcl;
 
-    result = ffi_prep_cif(cif, NUM2INT(abi), argc,
-                INT2FFI_TYPE(NUM2INT(ret)),
-		cl->argv);
+    result = ffi_prep_cif(cif,
+                          NUM2INT(abi),
+                          argc,
+                          rb_fiddle_int_to_ffi_type(NUM2INT(ret)),
+                          cl->argv);
 
     if (FFI_OK != result)
 	rb_raise(rb_eRuntimeError, "error prepping CIF %d", result);

data/ext/fiddle/conversions.h

@@ -24,7 +24,6 @@ typedef union
     void * pointer;        /* ffi_type_pointer */
 } fiddle_generic;
 
-/* Deprecated. Use rb_fiddle_*() version. */
 VALUE rb_fiddle_type_ensure(VALUE type);
 ffi_type * rb_fiddle_int_to_ffi_type(int type);
 void rb_fiddle_value_to_generic(int type, VALUE *src, fiddle_generic *dst);

data/ext/fiddle/extconf.rb

@@ -3,6 +3,47 @@ require 'mkmf'
 
 # :stopdoc:
 
+def gcc?
+  RbConfig::CONFIG["GCC"] == "yes"
+end
+
+def disable_optimization_build_flag(flags)
+  if gcc?
+    expanded_flags = RbConfig.expand(flags.dup)
+    optimization_option_pattern = /(^|\s)?-O\d(\s|$)?/
+    if optimization_option_pattern.match?(expanded_flags)
+      expanded_flags.gsub(optimization_option_pattern, '\\1-Og\\2')
+    else
+      flags + " -Og"
+    end
+  else
+    flags
+  end
+end
+
+def enable_debug_build_flag(flags)
+  if gcc?
+    expanded_flags = RbConfig.expand(flags.dup)
+    debug_option_pattern = /(^|\s)-g(?:gdb)?\d?(\s|$)/
+    if debug_option_pattern.match?(expanded_flags)
+      expanded_flags.gsub(debug_option_pattern, '\\1-ggdb3\\2')
+    else
+      flags + " -ggdb3"
+    end
+  else
+    flags
+  end
+end
+
+checking_for(checking_message("--enable-debug-build option")) do
+  enable_debug_build = enable_config("debug-build", false)
+  if enable_debug_build
+    $CFLAGS = disable_optimization_build_flag($CFLAGS)
+    $CFLAGS = enable_debug_build_flag($CFLAGS)
+  end
+  enable_debug_build
+end
+
 libffi_version = nil
 have_libffi = false
 bundle = enable_config('bundled-libffi')
@@ -137,8 +178,10 @@ else
   have_func('ffi_closure_alloc', ffi_header)
 end
 
-if libffi
-  $defs << "-DHAVE_FFI_PREP_CIF_VAR"
+if libffi_version
+  if (libffi_version <=> [3, 0, 11]) >= 0
+    $defs << "-DHAVE_FFI_PREP_CIF_VAR"
+  end
 else
   have_func('ffi_prep_cif_var', ffi_header)
 end
@@ -157,6 +200,8 @@ elsif have_header "windows.h"
   %w{ LoadLibrary FreeLibrary GetProcAddress }.each do |func|
     abort "missing function #{func}" unless have_func(func)
   end
+
+  have_library "ws2_32"
 end
 
 have_const('FFI_STDCALL', ffi_header)

data/ext/fiddle/function.c

@@ -375,10 +375,18 @@ function_call(int argc, VALUE argv[], VALUE self)
         (void)rb_thread_call_without_gvl(nogvl_ffi_call, &args, 0, 0);
     }
 
-    rb_funcall(mFiddle, rb_intern("last_error="), 1, INT2NUM(errno));
+    {
+        int errno_keep = errno;
 #if defined(_WIN32)
-    rb_funcall(mFiddle, rb_intern("win32_last_error="), 1, INT2NUM(errno));
+        DWORD error = WSAGetLastError();
+        int socket_error = WSAGetLastError();
+        rb_funcall(mFiddle, rb_intern("win32_last_error="), 1,
+                   ULONG2NUM(error));
+        rb_funcall(mFiddle, rb_intern("win32_last_socket_error="), 1,
+                   INT2NUM(socket_error));
 #endif
+        rb_funcall(mFiddle, rb_intern("last_error="), 1, INT2NUM(errno_keep));
+    }
 
     ALLOCV_END(alloc_buffer);
 

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);
 }
 
@@ -48,7 +62,7 @@ static size_t
 fiddle_memview_memsize(const void *ptr)
 {
     const struct memview_data *data = ptr;
-    return sizeof(*data) + sizeof(rb_memory_view_item_component_t)*data->n_members + (size_t)data->view.len;
+    return sizeof(*data) + sizeof(rb_memory_view_item_component_t)*data->n_members + (size_t)data->view.byte_size;
 }
 
 static const rb_data_type_t fiddle_memview_data_type = {
@@ -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);
     }
 
@@ -90,13 +126,13 @@ rb_fiddle_memview_get_obj(VALUE obj)
 }
 
 static VALUE
-rb_fiddle_memview_get_length(VALUE obj)
+rb_fiddle_memview_get_byte_size(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;
-    return SSIZET2NUM(data->view.len);
+    return SSIZET2NUM(data->view.byte_size);
 }
 
 static VALUE
@@ -233,14 +269,46 @@ 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, "length", rb_fiddle_memview_get_length, 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);
     rb_define_method(rb_cMemoryView, "format", rb_fiddle_memview_get_format, 0);
     rb_define_method(rb_cMemoryView, "item_size", rb_fiddle_memview_get_item_size, 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

@@ -102,19 +102,19 @@ fiddle_ptr_check_memory_view(VALUE obj)
     return data;
 }
 
-static int
+static bool
 fiddle_ptr_memory_view_available_p(VALUE obj)
 {
     return fiddle_ptr_check_memory_view(obj) != NULL;
 }
 
-static int
+static bool
 fiddle_ptr_get_memory_view(VALUE obj, rb_memory_view_t *view, int flags)
 {
     struct ptr_data *data = fiddle_ptr_check_memory_view(obj);
     rb_memory_view_init_as_byte_array(view, obj, data->ptr, data->size, true);
 
-    return 1;
+    return true;
 }
 
 static const rb_memory_view_entry_t fiddle_ptr_memory_view_entry = {
@@ -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.rb

@@ -17,6 +17,18 @@ module Fiddle
     def self.win32_last_error= error
       Thread.current[:__FIDDLE_WIN32_LAST_ERROR__] = error
     end
+
+    # Returns the last win32 socket +Error+ of the current executing
+    # +Thread+ or nil if none
+    def self.win32_last_socket_error
+      Thread.current[:__FIDDLE_WIN32_LAST_SOCKET_ERROR__]
+    end
+
+    # Sets the last win32 socket +Error+ of the current executing
+    # +Thread+ to +error+
+    def self.win32_last_socket_error= error
+      Thread.current[:__FIDDLE_WIN32_LAST_SOCKET_ERROR__] = error
+    end
   end
 
   # Returns the last +Error+ of the current executing +Thread+ or nil if none

data/lib/fiddle/cparser.rb

@@ -148,9 +148,11 @@ module Fiddle
     #
     def parse_ctype(ty, tymap=nil)
       tymap ||= {}
-      case ty
-      when Array
+      if ty.is_a?(Array)
         return [parse_ctype(ty[0], tymap), ty[1]]
+      end
+      ty = ty.gsub(/\Aconst\s+/, "")
+      case ty
       when 'void'
         return TYPE_VOID
       when /\A(?:(?:signed\s+)?long\s+long(?:\s+int\s+)?|int64_t)(?:\s+\w+)?\z/

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/types.rb

@@ -27,28 +27,29 @@ module Fiddle
   # * WORD
   module Win32Types
     def included(m) # :nodoc:
+      # https://docs.microsoft.com/en-us/windows/win32/winprog/windows-data-types
       m.module_eval{
-        typealias "DWORD", "unsigned long"
-        typealias "PDWORD", "unsigned long *"
-        typealias "DWORD32", "unsigned long"
-        typealias "DWORD64", "unsigned long long"
-        typealias "WORD", "unsigned short"
-        typealias "PWORD", "unsigned short *"
+        typealias "ATOM", "WORD"
         typealias "BOOL", "int"
-        typealias "ATOM", "int"
         typealias "BYTE", "unsigned char"
-        typealias "PBYTE", "unsigned char *"
+        typealias "DWORD", "unsigned long"
+        typealias "DWORD32", "uint32_t"
+        typealias "DWORD64", "uint64_t"
+        typealias "HANDLE", "PVOID"
+        typealias "HDC", "HANDLE"
+        typealias "HINSTANCE", "HANDLE"
+        typealias "HWND", "HANDLE"
+        typealias "LPCSTR", "const char *"
+        typealias "LPSTR", "char *"
+        typealias "PBYTE", "BYTE *"
+        typealias "PDWORD", "DWORD *"
+        typealias "PHANDLE", "HANDLE *"
+        typealias "PVOID", "void *"
+        typealias "PWORD", "WORD *"
+        typealias "UCHAR", "unsigned char"
         typealias "UINT", "unsigned int"
         typealias "ULONG", "unsigned long"
-        typealias "UCHAR", "unsigned char"
-        typealias "HANDLE", "uintptr_t"
-        typealias "PHANDLE", "void*"
-        typealias "PVOID", "void*"
-        typealias "LPCSTR", "char*"
-        typealias "LPSTR", "char*"
-        typealias "HINSTANCE", "unsigned int"
-        typealias "HDC", "unsigned int"
-        typealias "HWND", "unsigned int"
+        typealias "WORD", "unsigned short"
       }
     end
     module_function :included

data/lib/fiddle/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fiddle
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.9
 platform: ruby
 authors:
 - Aaron Patterson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-10 00:00:00.000000000 Z
+date: 2021-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.0.dev
 signing_key: 
 specification_version: 4
 summary: A libffi wrapper for Ruby.