summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ext/win32ole/win32ole.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 5062efe67fd..24adf6f9904 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 7bdd459a03a..3aa67bd112b 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -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;
}