windows_com 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bea6d25055bb37d4aa2c16bd5da878bd8917b815
-  data.tar.gz: ede87f79a9b521ad64dd83a0b022e3ba37952a92
+  metadata.gz: 9cd9c67d4242830c8724e54bbcb687ab72c9f156
+  data.tar.gz: 9adf8c76beffe573a5787b49b8d81e2c801618b2
 SHA512:
-  metadata.gz: 64a0ff1e78884ca62f39e4016cf66cc1be78a26a5e71d61831fa6219c11d4a8473b98f74c38939caba893026d02d927b70757bfecf6a11463207c80a41702be6
-  data.tar.gz: 2ad4eda66fb2a0ad4759552d02b651a9dbc090c4b40b261cf5941fe3088ca7e91a4c842ccedc26323a29617380d49320562f4a5df71c0a8a77c037d5689d5a3e
+  metadata.gz: 47aa923cfadab2b1573e2dfb038ed4a4852cebedbf54a916aadb5bdf5d98bb3ff61affe7c3acd2abd61bbc7140ba36791b0f2624d3570e7fe09f7e0492532e51
+  data.tar.gz: 7e434696d7c42f29696e7cbf6668f1d46613caa70e2d96e99c6f1507f87f74aa05f2bcc9118104cf33cc8e68c89d4d2413f9fb960aab6d3544232d80686edb1f

data/RELNOTES.md

@@ -1,16 +1,20 @@
 # Release Notes
 
+## 2.1.0
+
+`COMVtbl_` doesn't prepend `this` pointers to vtbl specs
+
 ## 2.0.2
 
-Implement the ability to trace COM call arguments (set WINDOWS_COM_TRACE_CALL_ARGS)
+Implement the ability to trace COM call arguments (set `WINDOWS_COM_TRACE_CALL_ARGS`)
 
 ## 2.0.1
 
-Allow COMInterface_ instances to be passed to code expecting pointers without calling #vptr
+Allow `COMInterface_` instances to be passed to code expecting pointers without calling `#vptr`
 
 ## 2.0.0
 
-- Add COMCallback module for implementing COM objects on the Ruby/FFI side
+- Add `COMCallback` module for __implementing__ COM objects in Ruby
 - enhance some bound FFI structs with useful methods
 - improve code
 

data/lib/windows_com/common.rb

@@ -1,6 +1,6 @@
 require 'ffi'
 
-WINDOWS_COM_VERSION = '2.0.2'
+WINDOWS_COM_VERSION = '2.1.0'
 
 WINDOWS_COM_OLE_INIT = true unless defined?(WINDOWS_COM_OLE_INIT)
 
@@ -152,10 +152,15 @@ module WindowsCOM
 
 	module COMVtbl_
 		def self.[](parent_vtbl, spec)
-			spec.each { |name, sig|
-				sig[0].unshift(:pointer) # prepend *this* to FFI func signature
-			}
-
+=begin
+	IUnknown::Vtbl::Spec example (*this* ptr is NOT included in spec signature):
+
+	{
+		QueryInterface: [[:pointer, :pointer], :long],
+		AddRef: [[], :ulong],
+		Release: [[], :ulong]
+	}
+=end
 			Class.new(FFI::Struct) {
 				const_set :ParentVtbl, parent_vtbl
 
@@ -165,7 +170,9 @@ module WindowsCOM
 
 				layout_args = self::Spec.map { |name, sig|
 					params, ret = sig
-					[name, callback(params, ret)]
+					ffi_params = [:pointer, *params] # prepend *this* ptr to FFI func signature
+
+					[name, callback(ffi_params, ret)]
 				}
 				layout_args.flatten!
 				layout(*layout_args)
@@ -192,7 +199,7 @@ module WindowsCOM
 
 				self::Vtbl.members.each { |name, sig|
 					define_method(name) { |*args|
-						args.unshift(@vptr) # prepend *this* for Vtbl meth call
+						args.unshift(@vptr) # prepend *this* ptr for FFI func call
 
 						STDERR.puts [:vt_call, self.class, name, args].inspect if
 							WINDOWS_COM_TRACE_CALL_ARGS
@@ -237,10 +244,11 @@ module WindowsCOM
 					@vtbl = self.class::Vtbl.new
 					@vtbl.members.each { |name|
 						params, ret = @vtbl.class::Spec[name]
+						ffi_params = [:pointer, *params] # prepend *this* ptr to FFI func signature
 
 						@vtbl[name] = instance_variable_set("@__ffi_func__#{name}",
-							FFI::Function.new(ret, params, convention: :stdcall) { |*args|
-								args.shift # remove *this* for Ruby meth call
+							FFI::Function.new(ret, ffi_params, convention: :stdcall) { |*args|
+								args.shift # remove *this* ptr for Ruby meth call
 
 								STDERR.puts [:rb_call, self.class, name, args].inspect if
 									WINDOWS_COM_TRACE_CALL_ARGS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: windows_com
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.1.0
 platform: ruby
 authors:
 - Radoslav Peev