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

* ext/win32ole/win32ole.c: refactoring. move

Browse Source 
ole_typelib_from_itypeinfo into win32ole_typelib.c.
* ext/win32ole/win32ole.h: ditto.
* ext/win32ole/win32ole_typelib.h: ditto.
* ext/win32ole/win32ole_typelib.h: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2014-08-12 14:00:45 +00:00
parent eac5e58bb4
commit 7bf7bb84d3
5 changed files with 25 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Tue Aug 12 22:59:48 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c: refactoring. move
ole_typelib_from_itypeinfo into win32ole_typelib.c.
* ext/win32ole/win32ole.h: ditto.
* ext/win32ole/win32ole_typelib.h: ditto.
* ext/win32ole/win32ole_typelib.h: ditto.
Tue Aug 12 21:49:40 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp> Tue Aug 12 21:49:40 2014 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (ole_create_dcom): use the converted * ext/win32ole/win32ole.c (ole_create_dcom): use the converted

16
ext/win32ole/win32ole.c
View File

@ -3962,22 +3962,6 @@ fole_type(VALUE self)
return type; return type;
} }
VALUE
ole_typelib_from_itypeinfo(ITypeInfo *pTypeInfo)
{
HRESULT hr;
ITypeLib *pTypeLib;
unsigned int index;
VALUE retval = Qnil;
hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
if(FAILED(hr)) {
return Qnil;
}
retval = create_win32ole_typelib(pTypeLib);
return retval;
}
/* /*
* call-seq: * call-seq:
* WIN32OLE#ole_typelib -> The WIN32OLE_TYPELIB object * WIN32OLE#ole_typelib -> The WIN32OLE_TYPELIB object

1
ext/win32ole/win32ole.h
View File

@ -115,7 +115,6 @@ VALUE ole_wc2vstr(LPWSTR pw, BOOL isfree);
BOOL ole_initialized(); BOOL ole_initialized();
HRESULT ole_docinfo_from_type(ITypeInfo *pTypeInfo, BSTR *name, BSTR *helpstr, DWORD *helpcontext, BSTR *helpfile); HRESULT ole_docinfo_from_type(ITypeInfo *pTypeInfo, BSTR *name, BSTR *helpstr, DWORD *helpcontext, BSTR *helpfile);
VALUE ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails); VALUE ole_typedesc2val(ITypeInfo *pTypeInfo, TYPEDESC *pTypeDesc, VALUE typedetails);
VALUE ole_typelib_from_itypeinfo(ITypeInfo *pTypeInfo);
VALUE ole_type_from_itypeinfo(ITypeInfo *pTypeInfo); VALUE ole_type_from_itypeinfo(ITypeInfo *pTypeInfo);
VALUE make_inspect(const char *class_name, VALUE detail); VALUE make_inspect(const char *class_name, VALUE detail);
VALUE ole_variant2val(VARIANT *pvar); VALUE ole_variant2val(VARIANT *pvar);

16
ext/win32ole/win32ole_typelib.c
View File

@ -103,6 +103,22 @@ itypelib(VALUE self)
return ptlib->pTypeLib; return ptlib->pTypeLib;
} }
VALUE
ole_typelib_from_itypeinfo(ITypeInfo *pTypeInfo)
{
HRESULT hr;
ITypeLib *pTypeLib;
unsigned int index;
VALUE retval = Qnil;
hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
if(FAILED(hr)) {
return Qnil;
}
retval = create_win32ole_typelib(pTypeLib);
return retval;
}
/* /*
* Document-class: WIN32OLE_TYPELIB * Document-class: WIN32OLE_TYPELIB
* *

1
ext/win32ole/win32ole_typelib.h
View File

@ -7,4 +7,5 @@ void Init_win32ole_typelib();
ITypeLib * itypelib(VALUE self); ITypeLib * itypelib(VALUE self);
VALUE typelib_file(VALUE ole); VALUE typelib_file(VALUE ole);
VALUE create_win32ole_typelib(ITypeLib *pTypeLib); VALUE create_win32ole_typelib(ITypeLib *pTypeLib);
VALUE ole_typelib_from_itypeinfo(ITypeInfo *pTypeInfo);
#endif #endif