0
@@ -1,3 +1,10 @@
0
+Sun Jul 20 01:23:24 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
0
+
0
+	* ext/win32ole/win32ole.c (EVENTSINK_Invoke): little refactoring.
0
+
0
+	* ext/win32ole/win32ole.c (EVENTSINK_GetIDsOfNames): return
0
+	  ITypeInfo::GetIDsOfNames().
0
+
0
 Sat Jul 19 09:31:35 2008  Masaki Suketa  <masaki.suketa@nifty.ne.jp>
0
 
0
   * ext/win32ole/win32ole.c (EVENTSINK_Invoke): little refactoring.

0
@@ -118,7 +118,7 @@
0
 
0
 #define WC2VSTR(x) ole_wc2vstr((x), TRUE)
0
 
0
-#define WIN32OLE_VERSION "1.2.5"
0
+#define WIN32OLE_VERSION "1.2.6"
0
 
0
 typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
0
     (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
0
@@ -7353,13 +7353,19 @@ STDMETHODIMP EVENTSINK_GetTypeInfo(
0
 }
0
 
0
 STDMETHODIMP EVENTSINK_GetIDsOfNames(
0
-    PEVENTSINK pEV,
0
+    PEVENTSINK pEventSink,
0
     REFIID riid,
0
     OLECHAR **szNames,
0
     UINT cNames,
0
     LCID lcid,
0
     DISPID *pDispID
0
     ) {
0
+    ITypeInfo *pTypeInfo;
0
+    PIEVENTSINKOBJ pEV = (PIEVENTSINKOBJ)pEventSink;
0
+    pTypeInfo = pEV->pTypeInfo;
0
+    if (pTypeInfo) {
0
+	return pTypeInfo->lpVtbl->GetIDsOfNames(pTypeInfo, szNames, cNames, pDispID);
0
+    }
0
     return DISP_E_UNKNOWNNAME;
0
 }
0
 
0
@@ -7470,8 +7476,9 @@ ary2ptr_dispparams(VALUE ary, DISPPARAMS *pdispparams)
0
 static VALUE
0
 exec_callback(VALUE arg)
0
 {
0
-    VALUE handler = rb_ary_entry(arg, 0);
0
-    VALUE args = rb_ary_entry(arg, 1);
0
+    VALUE *parg = (VALUE *)arg;
0
+    VALUE handler = parg[0];
0
+    VALUE args = parg[1];
0
     return rb_apply(handler, rb_intern("call"), args);
0
 }
0
 
0
@@ -7512,7 +7519,7 @@ STDMETHODIMP EVENTSINK_Invoke(
0
     ITypeInfo *pTypeInfo;
0
     VARIANT *pvar;
0
     VALUE ary, obj, event, handler, args, outargv, ev, result;
0
-    VALUE arg;
0
+    VALUE arg[2];
0
     VALUE is_outarg;
0
     BOOL is_default_handler = FALSE;
0
 
0
@@ -7554,9 +7561,6 @@ STDMETHODIMP EVENTSINK_Invoke(
0
   outargv = rb_ary_new();
0
         rb_ary_push(args, outargv);
0
     }
0
-    arg = rb_ary_new();
0
-    rb_ary_push(arg, handler);
0
-    rb_ary_push(arg, args);
0
 
0
     /*
0
      * if exception raised in event callback,
0
@@ -7565,7 +7569,9 @@ STDMETHODIMP EVENTSINK_Invoke(
0
      * and the exception raised then error message print
0
      * and exit ruby process by Win32OLE itself.
0
      */
0
-    result = rb_rescue2(exec_callback, arg,
0
+    arg[0] = handler;
0
+    arg[1] = args;
0
+    result = rb_rescue2(exec_callback, (VALUE)arg,
0
                   rescue_callback, Qnil,
0
       rb_eException, (VALUE)0);
0
     if(TYPE(result) == T_HASH) {