diff options
| author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-17 04:02:16 +0000 |
|---|---|---|
| committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-10-17 04:02:16 +0000 |
| commit | 4661d3a459a7bc5367ef5d67452ef31714be23f2 (patch) | |
| tree | 9c7a319ac9914cbf9bc198effdd9867a624cd68f /ext | |
| parent | 6857f508aecfb4685cb2ded3fb76bdad57b7fffb (diff) | |
| download | ruby-4661d3a459a7bc5367ef5d67452ef31714be23f2.tar.gz ruby-4661d3a459a7bc5367ef5d67452ef31714be23f2.tar.xz ruby-4661d3a459a7bc5367ef5d67452ef31714be23f2.zip | |
* ext/win32ole/win32ole.c (fole_func_methods): correct argument mismatch.
* ext/win32ole/win32ole.c (fole_get_methods): ditto.
* ext/win32ole/win32ole.c (fole_put_methods): ditto.
* ext/win32ole/tests/testWIN32OLE.rb: add test for WIN32OLE#ole_func_methods
WIN32OLE#ole_get_methods, WIN32OLE#ole_put_methods
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/win32ole/tests/testWIN32OLE.rb | 22 | ||||
| -rw-r--r-- | ext/win32ole/win32ole.c | 14 |
2 files changed, 22 insertions, 14 deletions
diff --git a/ext/win32ole/tests/testWIN32OLE.rb b/ext/win32ole/tests/testWIN32OLE.rb index 7907fe36a..c8df97f6f 100644 --- a/ext/win32ole/tests/testWIN32OLE.rb +++ b/ext/win32ole/tests/testWIN32OLE.rb @@ -189,6 +189,24 @@ class TestWin32OLE < RUNIT::TestCase method_names = methods.collect{|m| m.name} assert(method_names.include?("Quit")) end + def test_ole_func_methods + methods = @excel.ole_func_methods + assert(methods.size > 0) + method_names = methods.collect{|m| m.name} + assert(method_names.include?("Quit")) + end + def test_ole_put_methods + methods = @excel.ole_put_methods + assert(methods.size > 0) + method_names = methods.collect{|m| m.name} + assert(method_names.include?("Visible")) + end + def test_ole_get_methods + methods = @excel.ole_get_methods + assert(methods.size > 0) + method_names = methods.collect{|m| m.name} + assert(method_names.include?("Visible")) + end def test_ole_method_help quit_info = @excel.ole_method_help("Quit") assert_equal(0, quit_info.size_params) @@ -202,10 +220,6 @@ class TestWin32OLE < RUNIT::TestCase assert(add_info.params[0].optional?) assert_equal('VARIANT', add_info.params[0].ole_type) end -# def test_ole_put_methods -# methods_list = @excel.ole_put_methods -# puts methods_list -# end def teardown @excel.quit @excel = nil diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 0e9c53f01..60c202769 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -78,7 +78,7 @@ #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "0.5.7" +#define WIN32OLE_VERSION "0.5.8" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -2755,9 +2755,7 @@ fole_methods( self ) * Returns get properties. */ static VALUE -fole_get_methods( argc, argv, self ) - int argc; - VALUE *argv; +fole_get_methods( self ) VALUE self; { return ole_methods( self, INVOKE_PROPERTYGET); @@ -2769,9 +2767,7 @@ fole_get_methods( argc, argv, self ) * Returns put properties. */ static VALUE -fole_put_methods( argc, argv, self ) - int argc; - VALUE *argv; +fole_put_methods( self ) VALUE self; { return ole_methods( self, INVOKE_PROPERTYPUT); @@ -2783,9 +2779,7 @@ fole_put_methods( argc, argv, self ) * Returns OLE func methods. */ static VALUE -fole_func_methods( argc, argv, self ) - int argc; - VALUE *argv; +fole_func_methods( self ) VALUE self; { return ole_methods( self, INVOKE_FUNC); |
