diff options
| author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-08-14 11:01:43 +0000 |
|---|---|---|
| committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-08-14 11:01:43 +0000 |
| commit | 360a9445e4f0429d04b3f25d0ff2cf7962d496a2 (patch) | |
| tree | 2258b2bc50385d81ab6da4e547c3efd8efe25dfd /ext/win32ole | |
| parent | aac268bf5f427ffbb3958f60c07a795f81921c4e (diff) | |
| download | ruby-360a9445e4f0429d04b3f25d0ff2cf7962d496a2.tar.gz ruby-360a9445e4f0429d04b3f25d0ff2cf7962d496a2.tar.xz ruby-360a9445e4f0429d04b3f25d0ff2cf7962d496a2.zip | |
* ext/win32ole/win32ole.c (OLE_FREE): should not call
ole_message_loop.
* ext/win32ole/win32ole.c (ole_event_free): ditto.
* ext/win32ole/win32ole.c (ole_initialize): stop calling
OleUninitialize at exit.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4384 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/win32ole')
| -rw-r--r-- | ext/win32ole/win32ole.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 2429663a5..e380df837 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -66,7 +66,6 @@ (x) = 0;\ }\ }\ - ole_msg_loop();\ CoFreeUnusedLibraries();\ } @@ -79,7 +78,7 @@ #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "0.5.4" +#define WIN32OLE_VERSION "0.5.5" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -463,7 +462,6 @@ static void ole_initialize() { HRESULT hr; - int rc; if(gOLEInitialized == Qfalse) { hr = OleInitialize(NULL); @@ -471,7 +469,12 @@ ole_initialize() ole_raise(hr, rb_eRuntimeError, "Fail : OLE initialize"); } gOLEInitialized = Qtrue; - rc = atexit((void (*)(void))ole_uninitialize); + /* + * In some situation, OleUninitialize does not work fine. ;-< + */ + /* + atexit((void (*)(void))ole_uninitialize); + */ } } @@ -5088,7 +5091,6 @@ ole_event_free(poleev) pcp->lpVtbl->Unadvise(pcp, poleev->pEvent->m_dwCookie); OLE_RELEASE(pcp); } - ole_msg_loop(); CoFreeUnusedLibraries(); } } |