* ext/win32ole/win32ole.c (ole_event_free): invoke IConnectionPoint::Unadvise

  before invoking IConnectionPoint::Release.

* test/win32ole/test_win32ole_event.rb, test/win32ole/err_in_callback.rb,
  test/win32ole/test_err_in_callback.rb: Use ActiveX Data Object
  Library instead of InternetExplorer.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 12 deletions

diff --git a/test/win32ole/err_in_callback.rb b/test/win32ole/err_in_callback.rb
index 6a0b711403..fabb7bef0e 100644
--- a/test/win32ole/err_in_callback.rb
+++ b/test/win32ole/err_in_callback.rb
@@ -1,15 +1,9 @@
 require 'win32ole'
-ie = WIN32OLE.new('InternetExplorer.Application')
-ie.visible = true
-WIN32OLE_EVENT.message_loop
-sleep 0.2
-ev = WIN32OLE_EVENT.new(ie)
-
-ev.on_event('NavigateComplete2') {|*args|
+db = WIN32OLE.new('ADODB.Connection')
+db.connectionString = "Driver={Microsoft Text Driver (*.txt; *.csv)};DefaultDir=.;"
+ev = WIN32OLE_EVENT.new(db)
+ev.on_event('WillConnect') {|*args|
   foo
 }
-ie.navigate(ARGV.shift)
-while ie.readystate != 4
-  WIN32OLE_EVENT.message_loop
-  sleep 0.2
-end
+db.open
+WIN32OLE_EVENT.message_loop