From 1f895ea893c5c4544cd70ec96f3af9003101b5cf Mon Sep 17 00:00:00 2001
From: suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 17 Oct 2004 04:02:16 +0000
Subject: 	* 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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/win32ole/tests/testWIN32OLE.rb | 22 ++++++++++++++++++----
 ext/win32ole/win32ole.c            | 14 ++++----------
 2 files changed, 22 insertions(+), 14 deletions(-)

(limited to 'ext/win32ole')

diff --git a/ext/win32ole/tests/testWIN32OLE.rb b/ext/win32ole/tests/testWIN32OLE.rb
index 7907fe36a9..c8df97f6f7 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 a24023f34b..f1b0a6c766 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*);
@@ -2718,9 +2718,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);
@@ -2732,9 +2730,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);
@@ -2746,9 +2742,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);
-- 
cgit v1.2.3