kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

* ext/win32ole/win32ole.c (oletypelib_get_libattr): some refactoring 

by adding oletypelib_get_libattr

-This line, and those below, will be ignored--

M    ChangeLog
M    ext/win32ole/win32ole.c


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24901 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2009-09-13 12:28:00 +00:00
parent 6f0b0701d0
commit 476a0355db
2 changed files with 24 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Sep 13 21:25:01 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (oletypelib_get_libattr): some refactoring
by adding oletypelib_get_libattr.
Sun Sep 13 20:55:19 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp> Sun Sep 13 20:55:19 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (oletypelib_get_typelib): some refactoring * ext/win32ole/win32ole.c (oletypelib_get_typelib): some refactoring

50
ext/win32ole/win32ole.c
View File

@ -130,7 +130,7 @@ const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00,
#define WC2VSTR(x) ole_wc2vstr((x), TRUE) #define WC2VSTR(x) ole_wc2vstr((x), TRUE)
#define WIN32OLE_VERSION "1.4.5" #define WIN32OLE_VERSION "1.4.6"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@ -405,6 +405,7 @@ static VALUE oletype_set_member(VALUE self, ITypeInfo *pTypeInfo, VALUE name);
static VALUE oleclass_from_typelib(VALUE self, ITypeLib *pTypeLib, VALUE oleclass); static VALUE oleclass_from_typelib(VALUE self, ITypeLib *pTypeLib, VALUE oleclass);
static VALUE oletypelib_set_member(VALUE self, ITypeLib *pTypeLib); static VALUE oletypelib_set_member(VALUE self, ITypeLib *pTypeLib);
static ITypeLib * oletypelib_get_typelib(VALUE self); static ITypeLib * oletypelib_get_typelib(VALUE self);
static void oletypelib_get_libattr(ITypeLib *pTypeLib, TLIBATTR **ppTLibAttr);
static VALUE foletypelib_s_typelibs(VALUE self); static VALUE foletypelib_s_typelibs(VALUE self);
static VALUE make_version_str(VALUE major, VALUE minor); static VALUE make_version_str(VALUE major, VALUE minor);
static VALUE oletypelib_search_registry2(VALUE self, VALUE args); static VALUE oletypelib_search_registry2(VALUE self, VALUE args);
@ -4867,6 +4868,17 @@ oletypelib_get_typelib(VALUE self)
return ptlib->pTypeLib; return ptlib->pTypeLib;
} }
static void
oletypelib_get_libattr(ITypeLib *pTypeLib, TLIBATTR **ppTLibAttr)
{
HRESULT hr;
hr = pTypeLib->lpVtbl->GetLibAttr(pTypeLib, ppTLibAttr);
if (FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError,
"failed to get library attribute(TLIBATTR) from ITypeLib");
}
}
/* /*
* call-seq: * call-seq:
* *
@ -5151,17 +5163,13 @@ static VALUE
foletypelib_guid(VALUE self) foletypelib_guid(VALUE self)
{ {
ITypeLib *pTypeLib; ITypeLib *pTypeLib;
HRESULT hr;
OLECHAR bstr[80]; OLECHAR bstr[80];
VALUE guid = Qnil; VALUE guid = Qnil;
int len; int len;
TLIBATTR *pTLibAttr; TLIBATTR *pTLibAttr;
pTypeLib = oletypelib_get_typelib(self); pTypeLib = oletypelib_get_typelib(self);
hr = pTypeLib->lpVtbl->GetLibAttr(pTypeLib, &pTLibAttr); oletypelib_get_libattr(pTypeLib, &pTLibAttr);
if (FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError, "failed to GetLibAttr from ITypeLib");
}
len = StringFromGUID2(&pTLibAttr->guid, bstr, sizeof(bstr)/sizeof(OLECHAR)); len = StringFromGUID2(&pTLibAttr->guid, bstr, sizeof(bstr)/sizeof(OLECHAR));
if (len > 3) { if (len > 3) {
guid = ole_wc2vstr(bstr, FALSE); guid = ole_wc2vstr(bstr, FALSE);
@ -5212,14 +5220,10 @@ foletypelib_version(VALUE self)
TLIBATTR *pTLibAttr; TLIBATTR *pTLibAttr;
VALUE major; VALUE major;
VALUE minor; VALUE minor;
HRESULT hr = S_OK;
ITypeLib *pTypeLib; ITypeLib *pTypeLib;
pTypeLib = oletypelib_get_typelib(self); pTypeLib = oletypelib_get_typelib(self);
hr = pTypeLib->lpVtbl->GetLibAttr(pTypeLib, &pTLibAttr); oletypelib_get_libattr(pTypeLib, &pTLibAttr);
if (FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError, "failed to GetLibAttr from ITypeLib");
}
major = INT2NUM(pTLibAttr->wMajorVerNum); major = INT2NUM(pTLibAttr->wMajorVerNum);
minor = INT2NUM(pTLibAttr->wMinorVerNum); minor = INT2NUM(pTLibAttr->wMinorVerNum);
pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr); pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
@ -5240,14 +5244,10 @@ foletypelib_major_version(VALUE self)
{ {
TLIBATTR *pTLibAttr; TLIBATTR *pTLibAttr;
VALUE major; VALUE major;
HRESULT hr = S_OK;
ITypeLib *pTypeLib; ITypeLib *pTypeLib;
pTypeLib = oletypelib_get_typelib(self); pTypeLib = oletypelib_get_typelib(self);
oletypelib_get_libattr(pTypeLib, &pTLibAttr);
hr = pTypeLib->lpVtbl->GetLibAttr(pTypeLib, &pTLibAttr);
if (FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError, "failed to GetLibAttr from ITypeLib");
}
major = INT2NUM(pTLibAttr->wMajorVerNum); major = INT2NUM(pTLibAttr->wMajorVerNum);
pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr); pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
return major; return major;
@ -5267,14 +5267,9 @@ foletypelib_minor_version(VALUE self)
{ {
TLIBATTR *pTLibAttr; TLIBATTR *pTLibAttr;
VALUE minor; VALUE minor;
HRESULT hr = S_OK;
ITypeLib *pTypeLib; ITypeLib *pTypeLib;
pTypeLib = oletypelib_get_typelib(self); pTypeLib = oletypelib_get_typelib(self);
oletypelib_get_libattr(pTypeLib, &pTLibAttr);
hr = pTypeLib->lpVtbl->GetLibAttr(pTypeLib, &pTLibAttr);
if (FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError, "failed to GetLibAttr from ITypeLib");
}
minor = INT2NUM(pTLibAttr->wMinorVerNum); minor = INT2NUM(pTLibAttr->wMinorVerNum);
pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr); pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
return minor; return minor;
@ -5349,10 +5344,7 @@ foletypelib_path(VALUE self)
ITypeLib *pTypeLib; ITypeLib *pTypeLib;
pTypeLib = oletypelib_get_typelib(self); pTypeLib = oletypelib_get_typelib(self);
hr = pTypeLib->lpVtbl->GetLibAttr(pTypeLib, &pTLibAttr); oletypelib_get_libattr(pTypeLib, &pTLibAttr);
if (FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError, "failed to get TLIBATTR information");
}
hr = QueryPathOfRegTypeLib(&pTLibAttr->guid, hr = QueryPathOfRegTypeLib(&pTLibAttr->guid,
pTLibAttr->wMajorVerNum, pTLibAttr->wMajorVerNum,
pTLibAttr->wMinorVerNum, pTLibAttr->wMinorVerNum,
@ -5384,17 +5376,13 @@ foletypelib_path(VALUE self)
static VALUE static VALUE
foletypelib_visible(VALUE self) foletypelib_visible(VALUE self)
{ {
HRESULT hr;
ITypeLib *pTypeLib = NULL; ITypeLib *pTypeLib = NULL;
VALUE visible = Qtrue; VALUE visible = Qtrue;
TLIBATTR *pTLibAttr; TLIBATTR *pTLibAttr;
pTypeLib = oletypelib_get_typelib(self); pTypeLib = oletypelib_get_typelib(self);
oletypelib_get_libattr(pTypeLib, &pTLibAttr);
hr = pTypeLib->lpVtbl->GetLibAttr(pTypeLib, &pTLibAttr);
if (FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError, "failed to get TLIBATTR information");
}
if ((pTLibAttr->wLibFlags == 0) || if ((pTLibAttr->wLibFlags == 0) ||
(pTLibAttr->wLibFlags & LIBFLAG_FRESTRICTED) || (pTLibAttr->wLibFlags & LIBFLAG_FRESTRICTED) ||
(pTLibAttr->wLibFlags & LIBFLAG_FHIDDEN)) { (pTLibAttr->wLibFlags & LIBFLAG_FHIDDEN)) {