suke	2007-08-27 20:38:29 +0900 (Mon, 27 Aug 2007)

  New Revision: 13286

  Modified files:
    trunk/ChangeLog
    trunk/ext/win32ole/win32ole.c
    trunk/test/win32ole/test_win32ole_type.rb

  Log:
    * ext/win32ole/win32ole.c (ole_type_progid): fix the bug.
      [ruby-dev:31576]
    
    * test/win32ole/test_win32ole_type.rb (test_initialize):
      remove duplicate assertions.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/win32ole/test_win32ole_type.rb?r1=13286&r2=13285
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13286&r2=13285
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/win32ole/win32ole.c?r1=13286&r2=13285

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13285)
+++ ChangeLog	(revision 13286)
@@ -1,3 +1,11 @@
+Mon Aug 27 20:27:59 2007  Masaki Suketa  <masaki.suketa@n...>
+
+	* ext/win32ole/win32ole.c (ole_type_progid): fix the bug.
+	  [ruby-dev:31576]
+
+	* test/win32ole/test_win32ole_type.rb (test_initialize):
+	  remove duplicate assertions.
+
 Mon Aug 27 19:10:50 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* ext/etc/etc.c (etc_getlogin): update documentation to note
Index: ext/win32ole/win32ole.c
===================================================================
--- ext/win32ole/win32ole.c	(revision 13285)
+++ ext/win32ole/win32ole.c	(revision 13286)
@@ -116,7 +116,7 @@
 
 #define WC2VSTR(x) ole_wc2vstr((x), TRUE)
 
-#define WIN32OLE_VERSION "1.0.5"
+#define WIN32OLE_VERSION "1.0.6"
 
 typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
     (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@@ -5193,7 +5193,7 @@
         return progid;
     hr = ProgIDFromCLSID(&pTypeAttr->guid, &pbuf);
     if (SUCCEEDED(hr)) 
-        progid = WC2VSTR(pbuf);
+        progid = ole_wc2vstr(pbuf, FALSE);
     OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
     return progid;
 }
Index: test/win32ole/test_win32ole_type.rb
===================================================================
--- test/win32ole/test_win32ole_type.rb	(revision 13285)
+++ test/win32ole/test_win32ole_type.rb	(revision 13286)
@@ -37,10 +37,6 @@
       assert_equal(ole_type.ole_type, ole_type2.ole_type)
       assert_equal(ole_type.guid, ole_type2.guid)
       assert_equal(ole_type.progid, ole_type2.progid)
-      assert_equal(ole_type.name, ole_type2.name)
-      assert_equal(ole_type.ole_type, ole_type2.ole_type)
-      assert_equal(ole_type.guid, ole_type2.guid)
-      assert_equal(ole_type.progid, ole_type2.progid)
       assert_equal(ole_type.visible?, ole_type2.visible?)
       assert_equal(ole_type.to_s, ole_type2.to_s)
       assert_equal(ole_type.major_version, ole_type2.major_version)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml