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

win32ole.c(fole_each) : ensure to release IEnumVARIANT interface.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2776 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2002-09-01 08:14:11 +00:00
parent 4c3dc77fe6
commit 674f0aa478
1 changed files with 28 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
ext/win32ole/win32ole.c
View File

@ -2208,6 +2208,32 @@ fole_free(self)
return Qnil; return Qnil;
} }
static VALUE
ole_each_sub(pEnumV)
VALUE pEnumV;
{
VARIANT variant;
VALUE obj = Qnil;
IEnumVARIANT *pEnum = (IEnumVARIANT *)pEnumV;
VariantInit(&variant);
while(pEnum->lpVtbl->Next(pEnum, 1, &variant, NULL) == S_OK) {
obj = ole_variant2val(&variant);
VariantClear(&variant);
VariantInit(&variant);
rb_yield(obj);
}
return Qnil;
}
static VALUE
ole_ienum_free(pEnumV)
VALUE pEnumV;
{
IEnumVARIANT *pEnum = (IEnumVARIANT *)pEnumV;
OLE_RELEASE(pEnum);
return Qnil;
}
/* /*
* WIN32OLE#each {|i|...} * WIN32OLE#each {|i|...}
* ----- * -----
@ -2224,12 +2250,10 @@ fole_each(self)
unsigned int argErr; unsigned int argErr;
EXCEPINFO excepinfo; EXCEPINFO excepinfo;
DISPPARAMS dispParams; DISPPARAMS dispParams;
VARIANT result, variant; VARIANT result;
HRESULT hr; HRESULT hr;
IEnumVARIANT *pEnum = NULL; IEnumVARIANT *pEnum = NULL;
VALUE obj;
VariantInit(&result); VariantInit(&result);
dispParams.rgvarg = NULL; dispParams.rgvarg = NULL;
dispParams.rgdispidNamedArgs = NULL; dispParams.rgdispidNamedArgs = NULL;
@ -2262,15 +2286,8 @@ fole_each(self)
ole_raise(hr, rb_eRuntimeError, "Fail to get IEnum Interface"); ole_raise(hr, rb_eRuntimeError, "Fail to get IEnum Interface");
} }
VariantInit(&variant);
while(pEnum->lpVtbl->Next(pEnum, 1, &variant, NULL) == S_OK) {
obj = ole_variant2val(&variant);
rb_yield(obj);
VariantClear(&variant);
VariantInit(&variant);
}
VariantClear(&result); VariantClear(&result);
OLE_RELEASE(pEnum); rb_ensure(ole_each_sub, (VALUE)pEnum, ole_ienum_free, (VALUE)pEnum);
return Qnil; return Qnil;
} }