summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-09 22:21:59 +0000
committersuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-03-09 22:21:59 +0000
commitc769454c0e17fce28a18b73e1800c49edea6fc7d (patch)
tree86793519358305c473b5dbf297ae4446de175a8d
parentc49418522dec35ce043e0a9736fae32217002384 (diff)
* ext/win32ole/win32ole.c: add WIN32OLE_TYPELIB#library_name,
WIN32OLE_TYPELIB#visible?. * test/win32ole/test_win32ole_typelib.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12022 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/win32ole/win32ole.c116
-rw-r--r--test/win32ole/test_win32ole_typelib.rb10
3 files changed, 114 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index 742b5a7fb5..302ab5140d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Mar 10 07:20:28 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c: add WIN32OLE_TYPELIB#library_name,
+ WIN32OLE_TYPELIB#visible?.
+
+ * test/win32ole/test_win32ole_typelib.rb: ditto.
+
Thu Mar 8 09:17:59 2007 Minero Aoki <aamine@loveruby.net>
* compile.c: iseq_compile -> rb_iseq_compile.
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 5a06d2b967..5d8c59dbf4 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -116,7 +116,7 @@
#define WC2VSTR(x) ole_wc2vstr((x), TRUE)
-#define WIN32OLE_VERSION "1.0.0"
+#define WIN32OLE_VERSION "1.0.1"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@@ -382,6 +382,9 @@ static VALUE foletypelib_major_version(VALUE self);
static VALUE foletypelib_minor_version(VALUE self);
static VALUE oletypelib_path(VALUE guid, VALUE version);
static VALUE foletypelib_path(VALUE self);
+static void oletypelib2itypelib(VALUE self, ITypeLib **ppTypeLib);
+static VALUE foletypelib_visible(VALUE self);
+static VALUE foletypelib_library_name(VALUE self);
static VALUE foletypelib_ole_classes(VALUE self);
static VALUE foletypelib_inspect(VALUE self);
static VALUE foletype_initialize(VALUE self, VALUE typelib, VALUE oleclass);
@@ -1169,7 +1172,6 @@ ole_val_ary2variant_ary(VALUE val, VARIANT *var, VARTYPE vt)
pub[i] = psab[i].cElements - 1;
pid[i] = 0;
}
-
/* Create and fill VARIANT array */
if ((vt & ~VT_BYREF) == VT_ARRAY) {
vt = (vt | VT_VARIANT);
@@ -4841,6 +4843,93 @@ foletypelib_path(VALUE self)
return oletypelib_path(guid, version);
}
+static void
+oletypelib2itypelib(VALUE self, ITypeLib **ppTypeLib)
+{
+ VALUE path = Qnil;
+ OLECHAR *pbuf;
+ HRESULT hr = S_OK;
+ path = rb_funcall(self, rb_intern("path"), 0);
+ if (path != Qnil) {
+ pbuf = ole_mb2wc(StringValuePtr(path), -1);
+ hr = LoadTypeLibEx(pbuf, REGKIND_NONE, ppTypeLib);
+ SysFreeString(pbuf);
+ if (FAILED(hr))
+ ole_raise(hr, eWIN32OLERuntimeError, "failed to LoadTypeLibEx from `%s'",
+ StringValuePtr(path));
+ } else {
+ rb_raise(eWIN32OLERuntimeError, "failed to get type library path");
+ }
+}
+
+/*
+ * call-seq:
+ * WIN32OLE_TYPELIB#visible?
+ *
+ * Returns true if the type library information is not hidden.
+ * If wLibFlags of TLIBATTR is 0 or LIBFLAG_FRESTRICTED or LIBFLAG_FHIDDEN,
+ * the method returns false, otherwise, returns true.
+ * If the method fails to access the TLIBATTR information, then
+ * WIN32OLERuntimeError is raised.
+ *
+ * tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
+ * tlib.visible? # => true
+ */
+static VALUE
+foletypelib_visible(VALUE self)
+{
+ HRESULT hr;
+ ITypeLib *pTypeLib = NULL;
+ VALUE visible = Qtrue;
+ TLIBATTR *pTLibAttr;
+
+ oletypelib2itypelib(self, &pTypeLib);
+
+ hr = pTypeLib->lpVtbl->GetLibAttr(pTypeLib, &pTLibAttr);
+ if (FAILED(hr)) {
+ OLE_RELEASE(pTypeLib);
+ ole_raise(hr, eWIN32OLERuntimeError, "failed to get TLIBATTR information");
+ }
+ if ((pTLibAttr->wLibFlags == 0) ||
+ (pTLibAttr->wLibFlags & LIBFLAG_FRESTRICTED) ||
+ (pTLibAttr->wLibFlags & LIBFLAG_FHIDDEN)) {
+ visible = Qfalse;
+ }
+ pTypeLib->lpVtbl->ReleaseTLibAttr(pTypeLib, pTLibAttr);
+ OLE_RELEASE(pTypeLib);
+ return visible;
+}
+
+/*
+ * call-seq:
+ * WIN32OLE_TYPELIB#library_name
+ *
+ * Returns library name.
+ * If the method fails to access library name, WIN32OLERuntimeError is raised.
+ *
+ * tlib = WIN32OLE_TYPELIB.new('Microsoft Excel 9.0 Object Library')
+ * tlib.library_name # => Excel
+ */
+static VALUE
+foletypelib_library_name(VALUE self)
+{
+ HRESULT hr;
+ ITypeLib *pTypeLib = NULL;
+ VALUE libname = Qnil;
+ BSTR bstr;
+
+ oletypelib2itypelib(self, &pTypeLib);
+ hr = pTypeLib->lpVtbl->GetDocumentation(pTypeLib, -1,
+ &bstr, NULL, NULL, NULL);
+ if (FAILED(hr)) {
+ OLE_RELEASE(pTypeLib);
+ ole_raise(hr, eWIN32OLERuntimeError, "failed to get library name");
+ }
+ OLE_RELEASE(pTypeLib);
+ libname = WC2VSTR(bstr);
+ return libname;
+}
+
/*
* call-seq:
@@ -4854,24 +4943,11 @@ foletypelib_path(VALUE self)
static VALUE
foletypelib_ole_classes(VALUE self)
{
- OLECHAR * pbuf;
- HRESULT hr;
- ITypeLib *pTypeLib;
- VALUE path = Qnil;
+ ITypeLib *pTypeLib = NULL;
VALUE classes = rb_ary_new();
- path = rb_funcall(self, rb_intern("path"), 0);
- if (path != Qnil) {
- pbuf = ole_mb2wc(StringValuePtr(path), -1);
- hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
- SysFreeString(pbuf);
- if (FAILED(hr))
- ole_raise(hr, eWIN32OLERuntimeError, "failed to LoadTypeLibEx from `%s'",
- StringValuePtr(path));
- ole_classes_from_typelib(pTypeLib, classes);
- OLE_RELEASE(pTypeLib);
- } else {
- rb_raise(eWIN32OLERuntimeError, "failed to get type library path");
- }
+ oletypelib2itypelib(self, &pTypeLib);
+ ole_classes_from_typelib(pTypeLib, classes);
+ OLE_RELEASE(pTypeLib);
return classes;
}
@@ -7942,6 +8018,8 @@ Init_win32ole()
rb_define_method(cWIN32OLE_TYPELIB, "minor_version", foletypelib_minor_version, 0);
rb_define_method(cWIN32OLE_TYPELIB, "path", foletypelib_path, 0);
rb_define_method(cWIN32OLE_TYPELIB, "ole_classes", foletypelib_ole_classes, 0);
+ rb_define_method(cWIN32OLE_TYPELIB, "visible?", foletypelib_visible, 0);
+ rb_define_method(cWIN32OLE_TYPELIB, "library_name", foletypelib_library_name, 0);
rb_define_alias(cWIN32OLE_TYPELIB, "to_s", "name");
rb_define_method(cWIN32OLE_TYPELIB, "inspect", foletypelib_inspect, 0);
diff --git a/test/win32ole/test_win32ole_typelib.rb b/test/win32ole/test_win32ole_typelib.rb
index 7b83bf8bea..2da50d9299 100644
--- a/test/win32ole/test_win32ole_typelib.rb
+++ b/test/win32ole/test_win32ole_typelib.rb
@@ -73,6 +73,16 @@ if defined?(WIN32OLE_TYPELIB)
assert_match(/shell32\.dll$/i, tlib.path)
end
+ def test_visible?
+ tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
+ assert(tlib.visible?)
+ end
+
+ def test_library_name
+ tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
+ assert_equal("Shell32", tlib.library_name)
+ end
+
def test_to_s
tlib = WIN32OLE_TYPELIB.new("Microsoft Shell Controls And Automation")
assert_equal("Microsoft Shell Controls And Automation", tlib.to_s)