diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/win32ole/win32ole.c | 16 | ||||
| -rw-r--r-- | ext/win32ole/win32ole.h | 1 | ||||
| -rw-r--r-- | ext/win32ole/win32ole_typelib.c | 16 | ||||
| -rw-r--r-- | ext/win32ole/win32ole_typelib.h | 1 |
5 files changed, 25 insertions, 17 deletions
@@ -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> * ext/win32ole/win32ole.c (ole_create_dcom): use the converted diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 8b00d871bf..fee388ba3c 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -3962,22 +3962,6 @@ fole_type(VALUE self) 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: * WIN32OLE#ole_typelib -> The WIN32OLE_TYPELIB object diff --git a/ext/win32ole/win32ole.h b/ext/win32ole/win32ole.h index cda45fd048..1ba6c6cf6e 100644 --- a/ext/win32ole/win32ole.h +++ b/ext/win32ole/win32ole.h @@ -115,7 +115,6 @@ VALUE ole_wc2vstr(LPWSTR pw, BOOL isfree); BOOL ole_initialized(); 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_typelib_from_itypeinfo(ITypeInfo *pTypeInfo); VALUE ole_type_from_itypeinfo(ITypeInfo *pTypeInfo); VALUE make_inspect(const char *class_name, VALUE detail); VALUE ole_variant2val(VARIANT *pvar); diff --git a/ext/win32ole/win32ole_typelib.c b/ext/win32ole/win32ole_typelib.c index fc164f2e02..f5ecd4c05c 100644 --- a/ext/win32ole/win32ole_typelib.c +++ b/ext/win32ole/win32ole_typelib.c @@ -103,6 +103,22 @@ itypelib(VALUE self) 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 * diff --git a/ext/win32ole/win32ole_typelib.h b/ext/win32ole/win32ole_typelib.h index 3d4169a740..160ed61743 100644 --- a/ext/win32ole/win32ole_typelib.h +++ b/ext/win32ole/win32ole_typelib.h @@ -7,4 +7,5 @@ void Init_win32ole_typelib(); ITypeLib * itypelib(VALUE self); VALUE typelib_file(VALUE ole); VALUE create_win32ole_typelib(ITypeLib *pTypeLib); +VALUE ole_typelib_from_itypeinfo(ITypeInfo *pTypeInfo); #endif |