fxruby 1.6.39-x64-mingw32 → 1.6.44-x64-mingw32

data/ext/fox16_c/extconf.rb

@@ -24,51 +24,36 @@ end
 LIBZ_VERSION = ENV['LIBZ_VERSION'] || '1.2.7.3'
 LIBZ_SOURCE_URI = "http://zlib.net/fossils/zlib-#{LIBZ_VERSION}.tar.gz"
 
-LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.29'
+LIBPNG_VERSION = ENV['LIBPNG_VERSION'] || '1.6.37'
 LIBPNG_SOURCE_URI = "http://prdownloads.sourceforge.net/libpng/libpng-#{LIBPNG_VERSION}.tar.gz"
 
 # LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '9b'
 # LIBJPEG_SOURCE_URI = "http://www.ijg.org/files/jpegsrc.v#{LIBJPEG_VERSION}.tar.gz"
 
-LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '1.5.2'
+LIBJPEG_VERSION = ENV['LIBJPEG_VERSION'] || '2.0.6'
 LIBJPEG_SOURCE_URI = "https://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-#{LIBJPEG_VERSION}.tar.gz"
 
-LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.0.8'
+LIBTIFF_VERSION = ENV['LIBTIFF_VERSION'] || '4.1.0'
 LIBTIFF_SOURCE_URI = "http://download.osgeo.org/libtiff/tiff-#{LIBTIFF_VERSION}.tar.gz"
 
-LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.55'
-LIBFOX_SOURCE_URI         = "http://ftp.fox-toolkit.org/pub/fox-#{LIBFOX_VERSION}.tar.gz"
+LIBFOX_VERSION            = ENV['LIBFOX_VERSION'] || '1.6.57'
+LIBFOX_SOURCE_URI         = "http://fox-toolkit.org/ftp/fox-#{LIBFOX_VERSION}.tar.gz"
 
 LIBFXSCINTILLA_VERSION            = ENV['LIBFXSCINTILLA_VERSION'] || '2.28.0'
 LIBFXSCINTILLA_SOURCE_URI         = "http://download.savannah.gnu.org/releases/fxscintilla/fxscintilla-#{LIBFXSCINTILLA_VERSION}.tar.gz"
 # LIBFXSCINTILLA_VERSION            = ENV['LIBFXSCINTILLA_VERSION'] || '3.5.2'
 # LIBFXSCINTILLA_SOURCE_URI         = "https://github.com/yetanothergeek/fxscintilla/archive/FXSCINTILLA-#{LIBFXSCINTILLA_VERSION.gsub(".","_")}.tar.gz"
 
-
-class BuildRecipe < MiniPortile
+module BuildRecipeCommons
   def initialize(name, version, files)
     super(name, version)
     self.files = files
     rootdir = File.expand_path('../../..', __FILE__)
     self.target = File.join(rootdir, "ports")
-    # Prefer host_alias over host in order to use i586-mingw32msvc as
-    # correct compiler prefix for cross build, but use host if not set.
-    self.host = consolidated_host(RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"])
+    self.host = RbConfig::CONFIG["host"]
     self.patch_files = Dir[File.join(rootdir, "patches", self.name, self.version, "*.diff")].sort
   end
 
-  def consolidated_host(name)
-    name.gsub('i686-pc-mingw32', 'i586-mingw32msvc')
-  end
-
-  def configure_defaults
-    [
-      "--host=#{host}",    # build for specific target (host)
-      "--disable-static",
-      "--enable-shared",
-    ]
-  end
-
   def port_path
     "#{target}/#{host}"
   end
@@ -96,6 +81,44 @@ class BuildRecipe < MiniPortile
   end
 end
 
+class BuildRecipe < MiniPortile
+  include BuildRecipeCommons
+
+  def configure_defaults
+    [
+      "--host=#{host}",    # build for specific target (host)
+      "--disable-static",
+      "--enable-shared",
+    ]
+  end
+end
+class BuildRecipeCMake < MiniPortileCMake
+  include BuildRecipeCommons
+
+  def system_processor
+    case host
+    when /x86_64/ then "amd64"
+    when /i686/ then "x86"
+    else raise "unknown host #{host}"
+    end
+  end
+
+  def configure_defaults
+    [
+      "-DENABLE_STATIC=0",
+      "-DENABLE_SHARED=1",
+      "-DCMAKE_SYSTEM_NAME=Windows",
+      "-DCMAKE_C_COMPILER=#{host}-gcc",
+      "-DCMAKE_CXX_COMPILER=#{host}-g++",
+      "-DCMAKE_SYSTEM_PROCESSOR=#{system_processor}",
+    ]
+  end
+
+  def make_cmd
+    ENV["MAKE"] || "make"
+  end
+end
+
 def do_rake_compiler_setup
   if enable_config("win32-cross")
     dir_config("installed")
@@ -141,7 +164,7 @@ def do_rake_compiler_setup
       recipe.cook_and_activate
     end
 
-    libjpeg_recipe = BuildRecipe.new("libjpeg", LIBJPEG_VERSION, [LIBJPEG_SOURCE_URI]).tap do |recipe|
+    libjpeg_recipe = BuildRecipeCMake.new("libjpeg", LIBJPEG_VERSION, [LIBJPEG_SOURCE_URI]).tap do |recipe|
       recipe.cook_and_activate
     end
 
@@ -158,13 +181,6 @@ def do_rake_compiler_setup
         "CPPFLAGS=-I#{libjpeg_recipe.path}/include -I#{libpng_recipe.path}/include -I#{libtiff_recipe.path}/include -I#{libz_recipe.path}/include -DUNICODE=1 #{debug ? "-ggdb" : ""}",
         "LDFLAGS=-L#{libjpeg_recipe.path}/lib -L#{libpng_recipe.path}/lib -L#{libtiff_recipe.path}/lib -L#{libz_recipe.path}/lib #{debug ? "-ggdb" : ""}",
       ]
-      class << recipe
-        def compile
-          # Add param -no-undefined to libtool to build a win32 shared lib
-          execute "compile", "#{ENV['MAKE'] || "make"} libFOX_1_6_la_LDFLAGS='-version-info 0:49:0 -export-dynamic -no-undefined'"
-        end
-      end
-
       recipe.cook_and_activate
     end
 
@@ -312,14 +328,14 @@ if enable_config("debug")
 else
   $CPPFLAGS += " -DNDEBUG"
 end
-$CPPFLAGS += " -Wno-unused-function"
 
 # Platform-specific modifications
 do_rake_compiler_setup
 
-$CFLAGS += " -DRUBY_1_8" if RUBY_VERSION =~ /1\.8\./
-$CFLAGS += " -DRUBY_1_9" if RUBY_VERSION =~ /1\.9\./
-$CFLAGS += " -DRUBY_2_0" if RUBY_VERSION =~ /2\.0\./
+if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc/
+  $CXXFLAGS += " -Wno-unused-function"
+  $CXXFLAGS += " -Wno-maybe-uninitialized"
+end
 
 # Last step: build the makefile
 create_header

data/ext/fox16_c/impl.cpp

@@ -1026,7 +1026,7 @@ IMPLEMENT_FXID_STUBS(FXRbText)
 IMPLEMENT_FXDRAWABLE_STUBS(FXRbText)
 IMPLEMENT_FXWINDOW_STUBS(FXRbText)
 IMPLEMENT_FXSCROLLAREA_STUBS(FXRbText)
-IMPLEMENT_FXTEXT_STUBS(FXRbText)
+IMPLEMENT_FXTEXT_STUBS(FXRbText,FXText)
 
 /* Start stub implementations for class FXRbTextField */
 IMPLEMENT_FXOBJECT_STUBS(FXRbTextField)

data/ext/fox16_c/include/FXRbApp.h

@@ -73,7 +73,7 @@ static void cls ## _init(cls* self,VALUE ary,bool connect){ \
     argv[0]=const_cast<char *>("foo"); \
     for(i=1;i<argc;i++){ \
       VALUE e=rb_ary_entry(ary,i-1); \
-      argv[i]=StringValuePtr(e); \
+      argv[i]=StringValueCStr(e); \
       } \
     argv[argc]=0; \
     self->cls::init(argc,argv,connect); \
@@ -127,7 +127,7 @@ inline void cls ## _exit(cls *self,FXint code){ \
     argc=static_cast<int>(RARRAY_LEN(ary)+1); \
     for(i=1; i<argc; i++){ \
       VALUE e=rb_ary_entry(ary,i-1); \
-      argv[i]=StringValuePtr(e); \
+      argv[i]=StringValueCStr(e); \
       } \
     } \
   void cls::exit(FXint code){ \

data/ext/fox16_c/include/FXRbCommon.h

@@ -24,7 +24,6 @@
  * $Id: FXRbCommon.h 2303 2005-12-09 03:17:28Z lyle $
  ***********************************************************************/
 
-extern "C" {
 #include "ruby.h"
 
 #include "extconf.h"
@@ -32,7 +31,6 @@ extern "C" {
 #ifdef HAVE_RUBY_ENCODING_H
 #include "ruby/encoding.h"
 #endif
-}
 
 /**
  * The Ruby header files for Win32 redefine the symbol "select", which

data/ext/fox16_c/include/FXRbText.h

@@ -27,7 +27,39 @@
 #ifndef FXRBTEXT_H
 #define FXRBTEXT_H
 
-#define DECLARE_FXTEXT_STUBS(klass) \
+#define DECLARE_FXTEXT_STUBS(klass,subklass) \
+inline void klass ## _eraseCursorOverhang(klass* self){ \
+  FXASSERT(self->isMemberOf(FXMETACLASS(subklass))); \
+  dynamic_cast<subklass*>(self)->public_eraseCursorOverhang(); \
+  } \
+inline void klass ## _drawCursor(klass* self,FXuint state){ \
+  FXASSERT(self->isMemberOf(FXMETACLASS(subklass))); \
+  dynamic_cast<subklass*>(self)->public_drawCursor(state); \
+  } \
+inline FXuint klass ## _style(klass* self,FXint row,FXint beg,FXint end,FXint pos){ \
+  FXASSERT(self->isMemberOf(FXMETACLASS(subklass))); \
+  return dynamic_cast<subklass*>(self)->public_style(row, beg, end, pos); \
+  } \
+inline void klass ## _drawBufferText(klass* self,FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXint pos,FXint n,FXuint style){ \
+  FXASSERT(self->isMemberOf(FXMETACLASS(subklass))); \
+  dynamic_cast<subklass*>(self)->public_drawBufferText(dc, x, y, w, h, pos, n, style); \
+  } \
+inline void klass ## _fillBufferRect(klass* self,FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXuint style){ \
+  FXASSERT(self->isMemberOf(FXMETACLASS(subklass))); \
+  dynamic_cast<subklass*>(self)->public_fillBufferRect(dc, x, y, w, h, style); \
+  } \
+inline void klass ## _drawTextRow(klass* self,FXDCWindow& dc,FXint line,FXint left,FXint right){ \
+  FXASSERT(self->isMemberOf(FXMETACLASS(subklass))); \
+  dynamic_cast<subklass*>(self)->public_drawTextRow(dc, line, left, right); \
+  } \
+inline void klass ## _drawContents(klass* self,FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h){ \
+  FXASSERT(self->isMemberOf(FXMETACLASS(subklass))); \
+  dynamic_cast<subklass*>(self)->public_drawContents(dc, x, y, w, h); \
+  } \
+inline void klass ## _drawNumbers(klass* self,FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h){ \
+  FXASSERT(self->isMemberOf(FXMETACLASS(subklass))); \
+  dynamic_cast<subklass*>(self)->public_drawNumbers(dc, x, y, w, h); \
+  } \
 inline void klass ## _setCursorPos(klass* self,FXint pos,FXbool notify){ \
   self->klass::setCursorPos(pos,notify); \
   } \
@@ -72,7 +104,55 @@ inline void klass ## _setStyledText(klass* self,const FXString& text,FXint style
   }
 
 
-#define IMPLEMENT_FXTEXT_STUBS(cls) \
+#define IMPLEMENT_FXTEXT_STUBS(cls,superklass) \
+  void cls::eraseCursorOverhang(){ \
+    FXRbCallVoidMethod(this,"eraseCursorOverhang"); \
+    } \
+  void cls::public_eraseCursorOverhang(){ \
+    superklass::eraseCursorOverhang(); \
+    } \
+  void cls::drawCursor(FXuint state){ \
+    FXRbCallVoidMethod(this,"drawCursor", state); \
+    } \
+  void cls::public_drawCursor(FXuint state){ \
+    superklass::drawCursor(state); \
+    } \
+  FXuint cls::style(FXint row,FXint beg,FXint end,FXint pos){ \
+    return FXRbCallUIntMethod(this,"style", row, beg, end, pos); \
+    } \
+  FXuint cls::public_style(FXint row,FXint beg,FXint end,FXint pos){ \
+    return superklass::style(row, beg, end, pos); \
+    } \
+  void cls::drawBufferText(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXint pos,FXint n,FXuint style){ \
+    FXRbCallVoidMethod(this,"drawBufferText", dc, x, y, w, h, pos, n, style); \
+    } \
+  void cls::public_drawBufferText(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXint pos,FXint n,FXuint style){ \
+    superklass::drawBufferText(dc, x, y, w, h, pos, n, style); \
+    } \
+  void cls::fillBufferRect(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXuint style){ \
+    FXRbCallVoidMethod(this,"fillBufferRect", dc, x, y, w, h, style); \
+    } \
+  void cls::public_fillBufferRect(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXuint style){ \
+    superklass::fillBufferRect(dc, x, y, w, h, style); \
+    } \
+  void cls::drawTextRow(FXDCWindow& dc,FXint line,FXint left,FXint right){ \
+    FXRbCallVoidMethod(this,"drawTextRow", dc, line, left, right); \
+    } \
+  void cls::public_drawTextRow(FXDCWindow& dc,FXint line,FXint left,FXint right){ \
+    superklass::drawTextRow(dc, line, left, right); \
+    } \
+  void cls::drawContents(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h){ \
+    FXRbCallVoidMethod(this,"drawContents", dc, x, y, w, h); \
+    } \
+  void cls::public_drawContents(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h){ \
+    superklass::drawContents(dc, x, y, w, h); \
+    } \
+  void cls::drawNumbers(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h){ \
+    FXRbCallVoidMethod(this,"drawNumbers", dc, x, y, w, h); \
+    } \
+  void cls::public_drawNumbers(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h){ \
+    superklass::drawNumbers(dc, x, y, w, h); \
+    } \
   void cls::setCursorPos(FXint pos,FXbool notify){ \
     FXRbCallVoidMethod(this,"setCursorPos",pos,notify); \
     } \

data/ext/fox16_c/include/FXRbTextVirtuals.h

@@ -1,3 +1,25 @@
+protected:
+  // Overrides the base class versions of these virtual functions
+  virtual void eraseCursorOverhang();
+  virtual void drawCursor(FXuint state);
+  virtual FXuint style(FXint row,FXint beg,FXint end,FXint pos);
+  virtual void drawBufferText(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXint pos,FXint n,FXuint style);
+  virtual void fillBufferRect(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXuint style);
+  virtual void drawTextRow(FXDCWindow& dc,FXint line,FXint left,FXint right);
+  virtual void drawContents(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
+  virtual void drawNumbers(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
+
+public:
+  // Publically accessible versions of those protected functions
+  void public_eraseCursorOverhang();
+  void public_drawCursor(FXuint state);
+  FXuint public_style(FXint row,FXint beg,FXint end,FXint pos);
+  void public_drawBufferText(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXint pos,FXint n,FXuint style);
+  void public_fillBufferRect(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h,FXuint style);
+  void public_drawTextRow(FXDCWindow& dc,FXint line,FXint left,FXint right);
+  void public_drawContents(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
+  void public_drawNumbers(FXDCWindow& dc,FXint x,FXint y,FXint w,FXint h);
+
 public:
   // Overrides the base class version of setCursorPos()
   virtual void setCursorPos(FXint pos,FXbool notify=FALSE);

data/ext/fox16_c/include/FXRuby.h

@@ -359,6 +359,9 @@ inline VALUE to_ruby_cb(const FXFontDesc& fontdesc){
 inline VALUE to_ruby_cb(FXDC& dc){
   return FXRbGetRubyObjCb(reinterpret_cast<void*>(&dc), FXRbTypeQuery("FXDC *"));
 }
+inline VALUE to_ruby_cb(FXDCWindow& dc){
+  return FXRbGetRubyObjCb(reinterpret_cast<void*>(&dc), FXRbTypeQuery("FXDCWindow *"));
+}
 
 template<class TYPE>
 VALUE to_ruby_cb(TYPE obj){
@@ -466,7 +469,7 @@ void FXRbCallVoidMethod_gvlcb(FXDC* recv,const char *func,TYPE1 arg1,TYPE2 arg2,
 
 /* Four arguments */
 template<class TYPE1, class TYPE2, class TYPE3, class TYPE4>
-void FXRbCallVoidMethod_gvlcb(FXObject* recv,const char *func, TYPE1 arg1, TYPE2 arg2, TYPE3 arg3, TYPE4 arg4){
+void FXRbCallVoidMethod_gvlcb(FXObject* recv,const char *func, TYPE1& arg1, TYPE2 arg2, TYPE3 arg3, TYPE4 arg4){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   rb_funcall(obj,rb_intern(func),4,to_ruby_cb(arg1),to_ruby_cb(arg2),to_ruby_cb(arg3),to_ruby_cb(arg4));
@@ -496,7 +499,7 @@ void FXRbCallVoidMethod_gvlcb(FXDC* recv, const char *func, TYPE1 arg1, TYPE2 ar
 
 /* Six arguments */
 template<class TYPE1, class TYPE2, class TYPE3, class TYPE4, class TYPE5, class TYPE6>
-void FXRbCallVoidMethod_gvlcb(const FXObject* recv, const char *func, TYPE1 arg1, TYPE2& arg2, TYPE3 arg3, TYPE4 arg4, TYPE5 arg5, TYPE6 arg6){
+void FXRbCallVoidMethod_gvlcb(const FXObject* recv, const char *func, TYPE1& arg1, TYPE2& arg2, TYPE3 arg3, TYPE4 arg4, TYPE5 arg5, TYPE6 arg6){
   VALUE obj=FXRbGetRubyObj(recv,false);
   FXASSERT(!NIL_P(obj));
   rb_funcall(obj,rb_intern(func),6,to_ruby_cb(arg1),to_ruby_cb(arg2),to_ruby_cb(arg3),to_ruby_cb(arg4),to_ruby_cb(arg5),to_ruby_cb(arg6));
@@ -517,6 +520,13 @@ void FXRbCallVoidMethod_gvlcb(FXDC* recv, const char *func, TYPE1 arg1, TYPE2 ar
   rb_funcall(obj,rb_intern(func),7,to_ruby_cb(arg1),to_ruby_cb(arg2),to_ruby_cb(arg3),to_ruby_cb(arg4),to_ruby_cb(arg5),to_ruby_cb(arg6),to_ruby_cb(arg7));
   }
 
+template<class TYPE1, class TYPE2, class TYPE3, class TYPE4, class TYPE5, class TYPE6, class TYPE7, class TYPE8>
+void FXRbCallVoidMethod_gvlcb(FXObject* recv, const char *func, TYPE1& arg1, TYPE2 arg2, TYPE3 arg3, TYPE4 arg4, TYPE5 arg5, TYPE6 arg6, TYPE7 arg7, TYPE8 arg8){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  rb_funcall(obj,rb_intern(func),8,to_ruby_cb(arg1),to_ruby_cb(arg2),to_ruby_cb(arg3),to_ruby_cb(arg4),to_ruby_cb(arg5),to_ruby_cb(arg6),to_ruby_cb(arg7), to_ruby_cb(arg8));
+  }
+
 /* Nine arguments */
 template<class TYPE1, class TYPE2, class TYPE3, class TYPE4, class TYPE5, class TYPE6, class TYPE7, class TYPE8, class TYPE9>
 void FXRbCallVoidMethod_gvlcb(FXDC* recv, const char *func, TYPE1 arg1, TYPE2 arg2, TYPE3 arg3, TYPE4 arg4, TYPE5 arg5, TYPE6 arg6, TYPE7 arg7, TYPE8 arg8, TYPE9 arg9){
@@ -535,7 +545,7 @@ void FXRbCallVoidMethod_gvlcb(FXObject* recv,const char *func,TYPE1& arg1,TYPE2
 
 // Call function with "FXbool" return value
 inline bool FXRbCallBoolMethod_gvlcb(FXStream* recv,const char *func){
-  VALUE v=rb_funcall(FXRbGetRubyObj(recv,false),rb_intern(func),0,NULL);
+  VALUE v=rb_funcall(FXRbGetRubyObj(recv,false),rb_intern(func),0);
   return (v==Qtrue);
   }
 
@@ -644,6 +654,14 @@ FXuint FXRbCallUIntMethod_gvlcb(FXObject* recv, const char *func, TYPE arg){
   return static_cast<FXuint>(NUM2UINT(v));
   }
 
+template<class TYPE1, class TYPE2, class TYPE3, class TYPE4>
+FXuint FXRbCallUIntMethod_gvlcb(FXObject* recv, const char *func, TYPE1 arg1, TYPE2 arg2, TYPE3 arg3, TYPE4 arg4){
+  VALUE obj=FXRbGetRubyObj(recv,false);
+  FXASSERT(!NIL_P(obj));
+  VALUE v=rb_funcall(obj,rb_intern(func),4,to_ruby_cb(arg1),to_ruby_cb(arg2),to_ruby_cb(arg3),to_ruby_cb(arg4));
+  return static_cast<FXuint>(NUM2UINT(v));
+  }
+
 // Call functions with FXString return value
 FXString FXRbCallStringMethod_gvlcb(const FXObject* recv, const char *func);
 

data/ext/fox16_c/include/gvl_wrappers.h

@@ -15,16 +15,14 @@
 #ifndef __gvl_wrappers_h
 #define __gvl_wrappers_h
 
-extern "C" {
-  #if defined(HAVE_RB_THREAD_CALL_WITH_GVL)
-  extern void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
-  #endif
+#if defined(HAVE_RB_THREAD_CALL_WITH_GVL)
+extern "C" void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
+#endif
 
-  #if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
-  extern "C" void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
-          rb_unblock_function_t *ubf, void *data2);
-  #endif
-}
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+extern "C" void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
+        rb_unblock_function_t *ubf, void *data2);
+#endif
 
 void fxrb_wakeup_fox(void *);
 
@@ -287,7 +285,7 @@ FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB_DECL )
 
 #define FOR_EACH_PARAM_OF_FXRbCallVoidMethod_6(param) \
   param(ID, , func) \
-  param(TYPE1, , arg1) \
+  param(TYPE1, &, arg1) \
   param(TYPE2, , arg2) \
   param(TYPE3, , arg3) \
   param(TYPE4, , arg4)
@@ -302,7 +300,7 @@ FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB_DECL )
 
 #define FOR_EACH_PARAM_OF_FXRbCallVoidMethod_8(param) \
   param(ID, , func) \
-  param(TYPE1, , arg1) \
+  param(TYPE1, &, arg1) \
   param(TYPE2, &, arg2) \
   param(TYPE3, , arg3) \
   param(TYPE4, , arg4) \
@@ -319,6 +317,17 @@ FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB_DECL )
   param(TYPE6, , arg6) \
   param(TYPE7, , arg7)
 
+#define FOR_EACH_PARAM_OF_FXRbCallVoidMethod_10(param) \
+  param(ID, , func) \
+  param(TYPE1, &, arg1) \
+  param(TYPE2, , arg2) \
+  param(TYPE3, , arg3) \
+  param(TYPE4, , arg4) \
+  param(TYPE5, , arg5) \
+  param(TYPE6, , arg6) \
+  param(TYPE7, , arg7) \
+  param(TYPE8, , arg8)
+
 #define FOR_EACH_PARAM_OF_FXRbCallVoidMethod_11(param) \
   param(ID, , func) \
   param(TYPE1, , arg1) \
@@ -387,6 +396,13 @@ FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB_DECL )
   param(ID, , func) \
   param(TYPE1, , arg1)
 
+#define FOR_EACH_PARAM_OF_FXRbCallUIntMethod_6(param) \
+  param(ID, , func) \
+  param(TYPE1, , arg1) \
+  param(TYPE2, , arg2) \
+  param(TYPE3, , arg3) \
+  param(TYPE4, , arg4)
+
 #define FOR_EACH_PARAM_OF_FXRbCallGLObjectMethod_2(param) \
   param(ID, , func)
 
@@ -544,6 +560,7 @@ FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB_DECL )
   function(FXRbCallVoidMethod, GVL_TYPE_VOID, void, RECV, recv, 7) \
   function(FXRbCallVoidMethod, GVL_TYPE_VOID, void, RECV, recv, 8) \
   function(FXRbCallVoidMethod, GVL_TYPE_VOID, void, RECV, recv, 9) \
+  function(FXRbCallVoidMethod, GVL_TYPE_VOID, void, RECV, recv, 10) \
   function(FXRbCallVoidMethod, GVL_TYPE_VOID, void, RECV, recv, 11) \
   function(FXRbCallBoolMethod, GVL_TYPE_NONVOID, bool, RECV, recv, 2) \
   function(FXRbCallBoolMethod, GVL_TYPE_NONVOID, bool, RECV, recv, 3) \
@@ -556,6 +573,7 @@ FOR_EACH_BLOCKING_FUNCTION( DEFINE_GVL_STUB_DECL )
   function(FXRbCallIntMethod, GVL_TYPE_NONVOID, FXint, RECV, recv, 7) \
   function(FXRbCallLongMethod, GVL_TYPE_NONVOID, FXint, RECV, recv, 5) \
   function(FXRbCallUIntMethod, GVL_TYPE_NONVOID, FXint, RECV, recv, 3) \
+  function(FXRbCallUIntMethod, GVL_TYPE_NONVOID, FXint, RECV, recv, 6) \
   function(FXRbCallGLObjectMethod, GVL_TYPE_NONVOID, FXGLObject*, RECV, recv, 2) \
   function(FXRbCallGLObjectMethod, GVL_TYPE_NONVOID, FXGLObject*, RECV, recv, 3) \
   function(FXRbCallGLObjectMethod, GVL_TYPE_NONVOID, FXGLObject*, RECV, recv, 4) \