windows_com 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79365cec9cf59dcbbfa1e01800a75d4da9ac1823
-  data.tar.gz: 5a5b303116664c5be8fd5f010066e226d2f35082
+  metadata.gz: bea6d25055bb37d4aa2c16bd5da878bd8917b815
+  data.tar.gz: ede87f79a9b521ad64dd83a0b022e3ba37952a92
 SHA512:
-  metadata.gz: b73bae98990bbd2dd412d1d4bdd0db6c36126015db6ea9051ea1fde0739a8188f54482c15fc034fdd010bfa636198b729c4b3d39533abb3dc711903c6a8f30a9
-  data.tar.gz: ebbba18335f2adc9152950c2ba421f97cd9a2f12297c7d5fa0d8e2c9b37fb9a8b2574b355587584daa39b103845f3ba1e5be82a7a5d09e20942f9edd0a570ad3
+  metadata.gz: 64a0ff1e78884ca62f39e4016cf66cc1be78a26a5e71d61831fa6219c11d4a8473b98f74c38939caba893026d02d927b70757bfecf6a11463207c80a41702be6
+  data.tar.gz: 2ad4eda66fb2a0ad4759552d02b651a9dbc090c4b40b261cf5941fe3088ca7e91a4c842ccedc26323a29617380d49320562f4a5df71c0a8a77c037d5689d5a3e

data/RELNOTES.md

@@ -1,5 +1,9 @@
 # Release Notes
 
+## 2.0.2
+
+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

data/examples/DesktopGadget.rbw

@@ -1,3 +1,5 @@
+#WINDOWS_COM_TRACE_CALL_ARGS = true
+
 require 'windows_com'
 
 include WindowsCOM

data/examples/UIRibbon/Command.rbw

@@ -1,7 +1,8 @@
 #WINDOWS_COM_TRACE_CALLBACK_REFCOUNT = true
+#WINDOWS_COM_TRACE_CALL_ARGS = true
 
 require 'windows_gui'
-require 'windows_gui/uiribbon' # requires windows_com gem
+require 'windows_gui/uiribbon'
 
 include WindowsGUI
 include UIRibbon

data/lib/windows_com/common.rb

@@ -1,9 +1,11 @@
 require 'ffi'
 
-WINDOWS_COM_VERSION = '2.0.1'
+WINDOWS_COM_VERSION = '2.0.2'
 
 WINDOWS_COM_OLE_INIT = true unless defined?(WINDOWS_COM_OLE_INIT)
+
 WINDOWS_COM_TRACE_CALLBACK_REFCOUNT = false unless defined?(WINDOWS_COM_TRACE_CALLBACK_REFCOUNT)
+WINDOWS_COM_TRACE_CALL_ARGS = false unless defined?(WINDOWS_COM_TRACE_CALL_ARGS)
 
 module WindowsCOM
 	extend FFI::Library
@@ -17,7 +19,7 @@ module WindowsCOM
 	end
 
 	def DetonateHresult(name, *args)
-		hresult = send(name, *args)
+		hresult = __send__(name, *args)
 		failed = FAILED(hresult)
 
 		raise "#{name} failed (hresult: #{format('%#08x', hresult)})" if failed
@@ -151,7 +153,7 @@ module WindowsCOM
 	module COMVtbl_
 		def self.[](parent_vtbl, spec)
 			spec.each { |name, sig|
-				sig[0].unshift(:pointer) # prepend *this* pointer to FFI func signature
+				sig[0].unshift(:pointer) # prepend *this* to FFI func signature
 			}
 
 			Class.new(FFI::Struct) {
@@ -190,12 +192,12 @@ module WindowsCOM
 
 				self::Vtbl.members.each { |name, sig|
 					define_method(name) { |*args|
-						hresult = @vtbl[name].call(@vptr, *args)
+						args.unshift(@vptr) # prepend *this* for Vtbl meth call
 
-						raise "#{self}.#{name} failed (hresult: #{format('%#08x', hresult)})" if
-							WindowsCOM::FAILED(hresult)
+						STDERR.puts [:vt_call, self.class, name, args].inspect if
+							WINDOWS_COM_TRACE_CALL_ARGS
 
-						hresult
+						@vtbl[name].call(*args)
 					}
 				}
 			}
@@ -234,9 +236,16 @@ module WindowsCOM
 				def initialize
 					@vtbl = self.class::Vtbl.new
 					@vtbl.members.each { |name|
+						params, ret = @vtbl.class::Spec[name]
+
 						@vtbl[name] = instance_variable_set("@__ffi_func__#{name}",
-							FFI::Function.new(*@vtbl.class::Spec[name].reverse, convention: :stdcall) { |*args|
-								__send__(name, *args[1..-1]) # remove *this* pointer from Ruby meth call
+							FFI::Function.new(ret, params, convention: :stdcall) { |*args|
+								args.shift # remove *this* for Ruby meth call
+
+								STDERR.puts [:rb_call, self.class, name, args].inspect if
+									WINDOWS_COM_TRACE_CALL_ARGS
+
+								__send__(name, *args)
 							}
 						)
 					}
@@ -282,7 +291,7 @@ module WindowsCOM
 						@vtbl.pointer.free
 						@vptr.pointer.free
 
-						STDERR.puts "#{self} refcount is 0, #{@vtbl} and #{@vptr} freed" if
+						STDERR.puts "#{self}.@#{@vtbl} freed\n#{self}.@#{@vptr} freed" if
 							$DEBUG || WINDOWS_COM_TRACE_CALLBACK_REFCOUNT
 					end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: windows_com
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Radoslav Peev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-02 00:00:00.000000000 Z
+date: 2017-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi