From a782fa12681c106fe6516955f72ec048bb27bbc9 Mon Sep 17 00:00:00 2001 From: suke Date: Fri, 5 Jan 2007 23:38:15 +0000 Subject: add WIN32OLE::VARIANT::VT_NULL, WIN32OLE::VARIANT::VT_EMPTY. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11487 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ ext/win32ole/win32ole.c | 4 +++- test/win32ole/test_win32ole_variant_m.rb | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e7fc28d90e..1c5ecf3f06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Jan 6 08:29:17 2007 Masaki Suketa + + * ext/win32ole/win32ole.c (Init_win32ole): add + WIN32OLE::VARIANT::VT_EMPTY, WIN32OLE::VARIANT::VT_NULL + + * test/win32ole/test_win32ole_variant_m.rb (test_variant): ditto. + Sat Jan 6 03:49:22 2007 Koichi Sasada * benchmark/run.rb : change option format diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 04f55a3165..ea2fe62c4c 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.8.1" +#define WIN32OLE_VERSION "0.8.2" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -6923,6 +6923,8 @@ Init_win32ole() rb_define_const(cWIN32OLE, "CP_UTF8" ,INT2FIX(CP_UTF8)); mWIN32OLE_VARIANT = rb_define_module_under(cWIN32OLE, "VARIANT"); + rb_define_const(mWIN32OLE_VARIANT, "VT_EMPTY", INT2FIX(VT_EMPTY)); + rb_define_const(mWIN32OLE_VARIANT, "VT_NULL", INT2FIX(VT_NULL)); rb_define_const(mWIN32OLE_VARIANT, "VT_I2", INT2FIX(VT_I2)); rb_define_const(mWIN32OLE_VARIANT, "VT_I4", INT2FIX(VT_I4)); rb_define_const(mWIN32OLE_VARIANT, "VT_R4", INT2FIX(VT_R4)); diff --git a/test/win32ole/test_win32ole_variant_m.rb b/test/win32ole/test_win32ole_variant_m.rb index ac95b33f2d..b3e48c20f0 100644 --- a/test/win32ole/test_win32ole_variant_m.rb +++ b/test/win32ole/test_win32ole_variant_m.rb @@ -8,6 +8,8 @@ if defined?(WIN32OLE::VARIANT) class TestWin32OLE_VARIANT_MODULE < Test::Unit::TestCase include WIN32OLE::VARIANT def test_variant + assert_equal(0, VT_EMPTY) + assert_equal(1, VT_NULL) assert_equal(2, VT_I2) assert_equal(3, VT_I4) assert_equal(4, VT_R4) -- cgit v1.2.3