diff options
| author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-29 11:18:37 +0000 |
|---|---|---|
| committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-29 11:18:37 +0000 |
| commit | 06df4049ed811c50062fe4a3a8c342cb2caf2a27 (patch) | |
| tree | dfbac80cb9ecc8a37aa1c90f18c8f3bd05805cde | |
| parent | 8dcd42552feefe6b990763db0d9c24836a66da6f (diff) | |
* ext/win32ole/win32ole.c (fev_initialize): initialization
handler instance variable.
* test/win32ole/test_win32ole_typelib.rb (test_s_typelibs):
fix the warning of shadowing outer local variable.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19621 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/win32ole/win32ole.c | 3 | ||||
| -rw-r--r-- | test/win32ole/test_win32ole_typelib.rb | 2 |
3 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Mon Sep 29 20:13:05 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp> + + * ext/win32ole/win32ole.c (fev_initialize): initialization + handler instance variable. + + * test/win32ole/test_win32ole_typelib.rb (test_s_typelibs): + fix the warning of shadowing outer local variable. + Mon Sep 29 19:59:00 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp> * ext/win32ole/win32ole.c (rescue_callback): use rb_write_error diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 3d53e17a60..0f07844deb 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -118,7 +118,7 @@ #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "1.3.2" +#define WIN32OLE_VERSION "1.3.3" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -8116,6 +8116,7 @@ fev_initialize(int argc, VALUE *argv, VALUE self) ev_advise(argc, argv, self); evs_push(self); rb_ivar_set(self, id_events, rb_ary_new()); + fev_set_handler(self, Qnil); return self; } diff --git a/test/win32ole/test_win32ole_typelib.rb b/test/win32ole/test_win32ole_typelib.rb index a1c3891396..389a5e6fea 100644 --- a/test/win32ole/test_win32ole_typelib.rb +++ b/test/win32ole/test_win32ole_typelib.rb @@ -10,7 +10,7 @@ if defined?(WIN32OLE_TYPELIB) tlibs = WIN32OLE_TYPELIB.typelibs assert_instance_of(Array, tlibs) assert(tlibs.size > 0) - tlib = tlibs.find {|tlib| tlib.name == "Microsoft Shell Controls And Automation"} + tlib = tlibs.find {|t| t.name == "Microsoft Shell Controls And Automation"} assert(tlib) end |