summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorsuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-04-30 23:37:54 +0000
committersuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-04-30 23:37:54 +0000
commit9154b19baeef87742e2f854bce091f98fdd00809 (patch)
treeaa370a84f07e24001a1382af7ab318a90314a867 /ext
parent5c1ae872f40be7c33033cf2b45d7c8a929860a7f (diff)
ole_param_ole_type should return "unknown type" string when ITypeInfo::GetFuncDesc failed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10121 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/win32ole/tests/testVARIANT.rb32
-rw-r--r--ext/win32ole/tests/testall.rb1
-rw-r--r--ext/win32ole/win32ole.c4
3 files changed, 2 insertions, 35 deletions
diff --git a/ext/win32ole/tests/testVARIANT.rb b/ext/win32ole/tests/testVARIANT.rb
deleted file mode 100644
index f274778f27..0000000000
--- a/ext/win32ole/tests/testVARIANT.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-# You need RubyUnit and MS Excel and MSI to run this test script
-
-require 'rubyunit'
-
-require 'win32ole'
-
-class TestWin32OLE_VARIANT < RUNIT::TestCase
- include WIN32OLE::VARIANT
- def test_variant
- assert_equal(2, VT_I2)
- assert_equal(3, VT_I4)
- assert_equal(4, VT_R4)
- assert_equal(5, VT_R8)
- assert_equal(6, VT_CY)
- assert_equal(7, VT_DATE)
- assert_equal(8, VT_BSTR)
- assert_equal(9, VT_DISPATCH)
- assert_equal(10, VT_ERROR)
- assert_equal(11, VT_BOOL)
- assert_equal(12, VT_VARIANT)
- assert_equal(13, VT_UNKNOWN)
- assert_equal(16, VT_I1)
- assert_equal(17, VT_UI1)
- assert_equal(18, VT_UI2)
- assert_equal(19, VT_UI4)
- assert_equal(22, VT_INT)
- assert_equal(23, VT_UINT)
- assert_equal(0x2000, VT_ARRAY)
- assert_equal(0x4000, VT_BYREF)
- end
-end
-
diff --git a/ext/win32ole/tests/testall.rb b/ext/win32ole/tests/testall.rb
index bf04d9d844..e5dad78684 100644
--- a/ext/win32ole/tests/testall.rb
+++ b/ext/win32ole/tests/testall.rb
@@ -2,7 +2,6 @@ require 'test/unit'
require 'win32ole'
puts "Now Test Win32OLE version #{WIN32OLE::VERSION}"
require "testWIN32OLE"
-require "testVARIANT"
require "testOLEEVENT"
require "testNIL2VTEMPTY"
require "testINVOKEVERB"
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index ab35a204f1..2a89dfb8a6 100644
--- a/ext/win32ole/win32ole.c
+++ b/ext/win32ole/win32ole.c
@@ -79,7 +79,7 @@
#define WC2VSTR(x) ole_wc2vstr((x), TRUE)
-#define WIN32OLE_VERSION "0.7.5"
+#define WIN32OLE_VERSION "0.7.6"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@@ -5910,7 +5910,7 @@ ole_param_ole_type(ITypeInfo *pTypeInfo, UINT method_index, UINT index)
{
FUNCDESC *pFuncDesc;
HRESULT hr;
- VALUE type = rb_str_new2("UNKNOWN");
+ VALUE type = rb_str_new2("unknown type");
hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
if (FAILED(hr))
return type;