ruby-changes:1954
From: ko1@a...
Date: 14 Sep 2007 22:25:57 +0900
Subject: [ruby-changes:1954] suke - Ruby:r13445 (trunk): * ext/win32ole/win32ole.c (fev_unadvise): no needs to reset
suke 2007-09-14 22:25:44 +0900 (Fri, 14 Sep 2007) New Revision: 13445 Modified files: trunk/ChangeLog trunk/ext/win32ole/win32ole.c Log: * ext/win32ole/win32ole.c (fev_unadvise): no needs to reset event handlers. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13445&r2=13444 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/win32ole/win32ole.c?r1=13445&r2=13444 Index: ChangeLog =================================================================== --- ChangeLog (revision 13444) +++ ChangeLog (revision 13445) @@ -1,3 +1,8 @@ +Fri Sep 14 22:20:01 2007 Masaki Suketa <masaki.suketa@n...> + + * ext/win32ole/win32ole.c (fev_unadvise): no needs to reset + event handlers. + Fri Sep 14 17:28:32 2007 Koichi Sasada <ko1@a...> * test/ruby/test_io.rb: tests which cause SEGV should not be Index: ext/win32ole/win32ole.c =================================================================== --- ext/win32ole/win32ole.c (revision 13444) +++ ext/win32ole/win32ole.c (revision 13445) @@ -116,7 +116,7 @@ #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "1.0.9" +#define WIN32OLE_VERSION "1.1.0" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -7562,13 +7562,11 @@ struct oleeventdata *poleev; Data_Get_Struct(self, struct oleeventdata, poleev); if (poleev->pConnectionPoint) { + ole_msg_loop(); + evs_delete(poleev->event_id); poleev->pConnectionPoint->lpVtbl->Unadvise(poleev->pConnectionPoint, poleev->dwCookie); OLE_RELEASE(poleev->pConnectionPoint); poleev->pConnectionPoint = NULL; - - rb_ivar_set(self, id_events, rb_ary_new()); - evs_delete(poleev->event_id); - ole_msg_loop(); } return Qnil; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml