summaryrefslogtreecommitdiff
path: root/ext/win32ole
diff options
context:
space:
mode:
authorsuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-06-22 12:28:07 +0000
committersuke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-06-22 12:28:07 +0000
commit1dcf2fe8543eae5400c8b395e091c1f6e56d5cd5 (patch)
tree3e79509ce1ad83f44ffa004cb3b89da63c361a12 /ext/win32ole
parent1752ed37439c01bdf55c45fe5262c7cca452b705 (diff)
* 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/branches/ruby_1_8@6494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/win32ole')
-rw-r--r--ext/win32ole/win32ole.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c
index 020105791b..6ca0668039 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;
}
@@ -5230,7 +5230,6 @@ ole_event_free(poleev)
pcp->lpVtbl->Unadvise(pcp, poleev->pEvent->m_dwCookie);
OLE_RELEASE(pcp);
}
- CoFreeUnusedLibraries();
}
}