mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/win32ole/win32ole.c (fev_unadvise): no needs to reset
event handlers. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13445 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
64221159aa
commit
b528261ad8
2 changed files with 8 additions and 5 deletions
|
@ -1,3 +1,8 @@
|
|||
Fri Sep 14 22:20:01 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
|
||||
|
||||
* ext/win32ole/win32ole.c (fev_unadvise): no needs to reset
|
||||
event handlers.
|
||||
|
||||
Fri Sep 14 17:28:32 2007 Koichi Sasada <ko1@atdot.net>
|
||||
|
||||
* test/ruby/test_io.rb: tests which cause SEGV should not be
|
||||
|
|
|
@ -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 @@ fev_unadvise(VALUE self)
|
|||
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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue