1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ext/win32ole/win32ole.c(ole_invoke): retry after converting Qnil

Browse Source 
to VT_EMPTY.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8333 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2005-04-15 13:05:01 +00:00
parent dd82fb6393
commit 6a63e942ba
2 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Apr 15 22:04:07 2005 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c(ole_invoke): retry after converting Qnil
to VT_EMPTY.
Thu Apr 14 19:05:06 2005 Minero Aoki <aamine@loveruby.net> Thu Apr 14 19:05:06 2005 Minero Aoki <aamine@loveruby.net>
* parse.y [ripper] (regexp): dispatch regexp option. * parse.y [ripper] (regexp): dispatch regexp option.

43
ext/win32ole/win32ole.c
View File

@ -79,7 +79,7 @@
#define WC2VSTR(x) ole_wc2vstr((x), TRUE) #define WC2VSTR(x) ole_wc2vstr((x), TRUE)
#define WIN32OLE_VERSION "0.6.3" #define WIN32OLE_VERSION "0.6.4"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@ -156,6 +156,7 @@ static FNCOCREATEINSTANCEEX *gCoCreateInstanceEx = NULL;
static VALUE com_hash; static VALUE com_hash;
static IDispatchVtbl com_vtbl; static IDispatchVtbl com_vtbl;
static UINT cWIN32OLE_cp = CP_ACP; static UINT cWIN32OLE_cp = CP_ACP;
static VARTYPE g_nil_to = VT_ERROR;
struct oledata { struct oledata {
IDispatch *pDispatch; IDispatch *pDispatch;
@ -834,8 +835,12 @@ ole_val2variant(val, var)
V_BOOL(var) = VARIANT_FALSE; V_BOOL(var) = VARIANT_FALSE;
break; break;
case T_NIL: case T_NIL:
V_VT(var) = VT_ERROR; if (g_nil_to == VT_ERROR) {
V_ERROR(var) = DISP_E_PARAMNOTFOUND; V_VT(var) = VT_ERROR;
V_ERROR(var) = DISP_E_PARAMNOTFOUND;
}else {
V_VT(var) = VT_EMPTY;
}
break; break;
default: default:
V_VT(var) = VT_DISPATCH; V_VT(var) = VT_DISPATCH;
@ -844,6 +849,16 @@ ole_val2variant(val, var)
} }
} }
static void
ole_val2variant2(val, var)
VALUE val;
VARIANT *var;
{
g_nil_to = VT_EMPTY;
ole_val2variant(val, var);
g_nil_to = VT_ERROR;
}
static VALUE static VALUE
ole_set_member(self, dispatch) ole_set_member(self, dispatch)
VALUE self; VALUE self;
@ -2103,6 +2118,28 @@ ole_invoke(argc, argv, self, wFlags)
VariantClear(&op.dp.rgvarg[n]); VariantClear(&op.dp.rgvarg[n]);
} }
} }
if (FAILED(hr)) {
/* retry after converting nil to VT_EMPTY */
if (op.dp.cArgs > cNamedArgs) {
for(i = cNamedArgs; i < op.dp.cArgs; i++) {
n = op.dp.cArgs - i + cNamedArgs - 1;
param = rb_ary_entry(paramS, i-cNamedArgs);
ole_val2variant2(param, &op.dp.rgvarg[n]);
}
memset(&excepinfo, 0, sizeof(EXCEPINFO));
VariantInit(&result);
hr = pole->pDispatch->lpVtbl->Invoke(pole->pDispatch, DispID,
&IID_NULL, lcid, wFlags,
&op.dp, &result,
&excepinfo, &argErr);
for(i = cNamedArgs; i < op.dp.cArgs; i++) {
n = op.dp.cArgs - i + cNamedArgs - 1;
VariantClear(&op.dp.rgvarg[n]);
}
}
}
/* mega kludge. if a method in WORD is called and we ask /* mega kludge. if a method in WORD is called and we ask
* for a result when one is not returned then * for a result when one is not returned then
* hResult == DISP_E_EXCEPTION. this only happens on * hResult == DISP_E_EXCEPTION. this only happens on