winwindow 0.4.0 → 0.4.1

data/lib/winwindow.rb

@@ -47,7 +47,6 @@ class WinWindow
   module AttachLib # :nodoc: all
     IsWin64=nil # TODO/FIX: detect this! 
 
-#=begin
     # here begins the FFI version. this one needs to hack improperly into FFI's internals, bypassing its
     # broken API for #callback which doesn't set the calling convention, causing segfaults. 
     begin
@@ -103,14 +102,15 @@ class WinWindow
 
         cb = FFI::CallbackInfo.new(find_type(types[return_type]), arg_types.map{|e| find_type(types[e]) }, options)
 
+        # the below is for ffi < 1.0; @ffi_callbacks goes away in the future. it's ignored by 
+        # newer versions of ffi. so no harm in continuing to set it here. 
         @ffi_callbacks = Hash.new unless defined?(@ffi_callbacks)
         @ffi_callbacks[callback_type_name] = cb
+        # and the below is for newer versions of ffi (1.0.*). of course, @ffi_module.callback 
+        # works in newer. at some point I'll drop support for older broken versions and just 
+        # use ffi's #callback. 
+        typedef cb, callback_type_name
       end
-      #options[:convention] = @ffi_module.instance_variable_defined?('@ffi_convention') ? @ffi_module.instance_variable_get('@ffi_convention') : :default
-      #options[:enums] = @ffi_module.instance_variable_get('@ffi_enums') if @ffi_module.instance_variable_defined?('@ffi_enums')
-      #unless @ffi_module.instance_variable_defined?('@ffi_callbacks')
-      #  @ffi_module.instance_variable_set('@ffi_callbacks', cb)
-      #end
       
       # perform some hideous class_eval'ing to dynamically define the callback method such that it will take a block 
       metaclass=class << self;self;end
@@ -129,61 +129,6 @@ class WinWindow
       #end
       nil
     end
-#=end
-=begin
-    # here begins the Win32::API version. this one doesn't work because of a hard-coded limit on 
-    # callbacks in win32/api.c combined with a lack of any capacity to remove any callbacks. 
-    require 'win32/api'
-
-    # basic types that Win32::API recognizes
-    Types={ :char => 'I', # no 8-bit type in Win32::API?
-            :uchar => 'I', # no unsigned types in Win32::API?
-            :int => 'I',
-            :uint => 'I',
-            :long => 'L',
-            :ulong => 'L',
-            :void => 'V',
-            :pointer => 'P',
-            :callback => 'K',
-            :string => 'P', # 'S' works here on mingw32, but not on mswin32 
-          }
-    
-    def use_lib(lib)
-      @lib=lib
-    end
-    # this takes arguments in the order that they're given in c/c++ so that signatures look kind of like the source
-    def attach(return_type, function_name, *arg_types)
-      the_function=Win32::API.new(function_name.to_s, arg_types.map{|arg_type| Types[arg_type] }.join(''), Types[return_type], @lib)
-      metaclass=class << self;self;end
-      metaclass.send(:define_method, function_name) do |*args|
-        the_function.call(*args)
-      end
-      nil
-    end
-    # this takes arguments like #attach, but with a name for the callback's type on the front. 
-    def callback(callback_type_name, return_type, callback_method_name, *arg_types)
-      Types[callback_type_name]=Types[:callback]
-      
-      # perform some hideous class_eval'ing to dynamically define the callback method such that it will take a block 
-      metaclass=class << self;self;end
-      metaclass.class_eval("def #{callback_method_name}(&block)
-        #{callback_method_name}_with_arg_stuff_in_scope(block)
-      end")
-      types=Types
-      metaclass.send(:define_method, callback_method_name.to_s+"_with_arg_stuff_in_scope") do |block|
-        return Win32::API::Callback.new(arg_types.map{|t| types[t]}.join(''), types[return_type], &block)
-      end
-      def remove_#{callback_method_name}(callback_method)
-        # Win32::API has no support for removing callbacks? 
-        nil
-      end")
-      # don't use define_method as this will be called from an ensure block which segfaults ruby 1.9.1. see http://redmine.ruby-lang.org/issues/show/2728
-      #metaclass.send(:define_method, "remove_"+callback_method_name.to_s) do |callback_method|
-      #  nil
-      #end
-      nil
-    end
-=end
     def self.add_type(hash)
       hash.each_pair do |key, value|
         unless Types.key?(value)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: winwindow
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Ethan
@@ -14,21 +15,31 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-01 00:00:00 -04:00
+date: 2011-02-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         - 5
         - 4
         version: 0.5.4
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
+        version: 1.1.0
   type: :runtime
   version_requirements: *id001
 description: A Ruby library to wrap windows API calls relating to hWnd window handles.
@@ -42,6 +53,7 @@ extra_rdoc_files: []
 files: 
 - lib/winwindow.rb
 - lib/winwindow/ext.rb
+- test/winwindow_test.rb
 has_rdoc: true
 homepage: http://winwindow.vapir.org/
 licenses: []
@@ -62,23 +74,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - Microsoft Windows, probably with some sort of NT kernel
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A Ruby library to wrap windows API calls relating to hWnd window handles.