diff options
author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-22 12:22:01 +0000 |
---|---|---|
committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-06-22 12:22:01 +0000 |
commit | 29904b93f4e001150e63a77f08cac8574d2c0307 (patch) | |
tree | 2a0b03d24559e2928c4b8d3c66ce0cf5df9ad4e4 | |
parent | ba5b04cd1b94a9d83bbac0bec430fd6066258cb0 (diff) | |
download | ruby-29904b93f4e001150e63a77f08cac8574d2c0307.tar.gz |
* ext/win32ole/win32ole.c (OLE_FREE): should not call CoFreeUnuse-
dLibraries().
* ext/win32ole/win32ole.c (ole_event_free): ditto.
* ext/win32ole/win32ole.c (ole_hresult2msg): truncate error message
before CR.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6493 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | ext/win32ole/win32ole.c | 17 |
2 files changed, 18 insertions, 9 deletions
@@ -1,3 +1,13 @@ +Tue Jun 22 21:11:36 2004 Masaki Suketa <masaki.suketa@nifty.ne.jp> + + * ext/win32ole/win32ole.c (OLE_FREE): should not call CoFreeUnuse- + dLibraries(). + + * ext/win32ole/win32ole.c (ole_event_free): ditto. + + * ext/win32ole/win32ole.c (ole_hresult2msg): truncate error message + before CR. + Tue Jun 22 19:24:59 2004 NAKAMURA Usaku <usa@ruby-lang.org> * sprintf.c (rb_f_sprintf): unify output of NaN, Inf and -Inf with diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 2cbf7a90f9..f856cd2516 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -67,7 +67,6 @@ (x) = 0;\ }\ }\ - CoFreeUnusedLibraries();\ } #define OLEData_Get_Struct(obj, pole) {\ @@ -79,7 +78,7 @@ #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "0.5.6" +#define WIN32OLE_VERSION "0.5.7" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -488,7 +487,8 @@ ole_hresult2msg(hr) HRESULT hr; { VALUE msg = Qnil; - char *p_msg; + char *p_msg = NULL; + char *term = NULL; DWORD dwCount; char strhr[100]; @@ -501,15 +501,15 @@ ole_hresult2msg(hr) NULL, hr, LOCALE_SYSTEM_DEFAULT, (LPTSTR)&p_msg, 0, NULL); if (dwCount > 0) { - /* remove dots and CRs/LFs */ - while (dwCount > 0 && - (p_msg[dwCount-1] < ' ' || p_msg[dwCount-1] == '.')) { - p_msg[--dwCount] = '\0'; - } + term = strrchr(p_msg, '\r'); + if (term) { + *term = '\0'; + } if (p_msg[0] != '\0') { rb_str_cat2(msg, p_msg); } } + LocalFree(p_msg); return msg; } @@ -5341,7 +5341,6 @@ ole_event_free(poleev) pcp->lpVtbl->Unadvise(pcp, poleev->pEvent->m_dwCookie); OLE_RELEASE(pcp); } - CoFreeUnusedLibraries(); } } |