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 | ae18d4ceb653fd75cc07152973970129a6c2dc37 (patch) | |
| tree | 5501b6bc8a23b40d9232332575339d626f6fc839 /ext | |
| parent | 8e12dcbd7b14fbdef2ee100970cdf73c741fe324 (diff) | |
| download | ruby-ae18d4ceb653fd75cc07152973970129a6c2dc37.tar.gz ruby-ae18d4ceb653fd75cc07152973970129a6c2dc37.tar.xz ruby-ae18d4ceb653fd75cc07152973970129a6c2dc37.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@13286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/win32ole/win32ole.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 28a6ec79f..329dd9be2 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; } |