| Revisão | 0f23935791570d87cb69dc7463e826dbaa72343e (tree) |
|---|---|
| Hora | 2018-04-01 16:34:34 |
| Autor | Kazuhiro Fujieda <fujieda@user...> |
| Commiter | Kazuhiro Fujieda |
Retry CoInitializeEx on its failure
xkeymacsdll/TSFHandler.cpp (diff)| @@ -32,9 +32,6 @@ void TSFHandler::InitSink() | ||
| 32 | 32 | { |
| 33 | 33 | if (TLS::GetTSFHandler()) |
| 34 | 34 | return; |
| 35 | - TSFHandler *tsfh = new TSFHandler(); | |
| 36 | - TLS::PutTSFHandler(tsfh); | |
| 37 | - | |
| 38 | 35 | HRESULT hr = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED); |
| 39 | 36 | if (FAILED(hr)) { |
| 40 | 37 | DebugLog(_T("CoInitializeEx failed.")); |
| @@ -47,6 +44,8 @@ void TSFHandler::InitSink() | ||
| 47 | 44 | DebugLog(_T("CoCreateInstance for ThreadMgr failed.")); |
| 48 | 45 | return; |
| 49 | 46 | } |
| 47 | + TSFHandler *tsfh = new TSFHandler(); | |
| 48 | + TLS::PutTSFHandler(tsfh); | |
| 50 | 49 | tsfh->m_ThreadMgr = thread; |
| 51 | 50 | ITfSource *src; |
| 52 | 51 | if (FAILED(thread->QueryInterface(&src))) { |
Fork