diff options
| author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-27 11:38:29 +0000 |
|---|---|---|
| committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-08-27 11:38:29 +0000 |
| commit | a1a618ead1bf6559cffb903b1d34e05a442957b0 (patch) | |
| tree | 5501b6bc8a23b40d9232332575339d626f6fc839 | |
| parent | fd618e22343d82f5ca5ec0d21a476c0a534220d9 (diff) | |
* ext/win32ole/win32ole.c (ole_type_progid): fix the bug.
[ruby-dev:31576]
* test/win32ole/test_win32ole_type.rb (test_initialize):
remove duplicate assertions.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ext/win32ole/win32ole.c | 4 | ||||
| -rw-r--r-- | test/win32ole/test_win32ole_type.rb | 4 |
3 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,11 @@ +Mon Aug 27 20:27:59 2007 Masaki Suketa <masaki.suketa@nifty.ne.jp> + + * 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@ruby-lang.org> * ext/etc/etc.c (etc_getlogin): update documentation to note diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 28a6ec79f7..329dd9be25 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -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 @@ ole_type_progid(ITypeInfo *pTypeInfo) 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; } diff --git a/test/win32ole/test_win32ole_type.rb b/test/win32ole/test_win32ole_type.rb index ce4d731114..1674604fce 100644 --- a/test/win32ole/test_win32ole_type.rb +++ b/test/win32ole/test_win32ole_type.rb @@ -37,10 +37,6 @@ if defined?(WIN32OLE_TYPE) 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) |