Reduce invocations of CoInitializeEx

diff --git a/xkeymacsdll/TSFHandler.cpp b/xkeymacsdll/TSFHandler.cpp
index 2b54fa9..5392c4e 100644 (file)
--- a/xkeymacsdll/TSFHandler.cpp
+++ b/xkeymacsdll/TSFHandler.cpp
@@ -32,15 +32,19 @@ void TSFHandler::InitSink()
 {\r
        if (TLS::GetTSFHandler())\r
                return;\r
-       HRESULT hr = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);\r
-       if (FAILED(hr)) {\r
-               DebugLog("CoInitializeEx failed.");\r
-               return;\r
-       }\r
-       if (hr == S_FALSE)\r
-               CoUninitialize();\r
        ITfThreadMgr *thread;\r
-       if (FAILED(CoCreateInstance(CLSID_TF_ThreadMgr, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&thread)))) {\r
+       HRESULT hr = CoCreateInstance(CLSID_TF_ThreadMgr, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&thread));\r
+       if (hr == CO_E_NOTINITIALIZED) {\r
+               hr = CoInitializeEx(nullptr, COINIT_APARTMENTTHREADED);\r
+               if (FAILED(hr)) {\r
+                       DebugLog("CoInitializeEx failed.");\r
+                       return;\r
+               }\r
+               if (hr == S_FALSE)\r
+                       CoUninitialize();\r
+               hr = CoCreateInstance(CLSID_TF_ThreadMgr, nullptr, CLSCTX_INPROC_SERVER, IID_PPV_ARGS(&thread));\r
+       }\r
+       if (FAILED(hr)) {\r
                DebugLog("CoCreateInstance for ThreadMgr failed.");\r
                return;\r
        }\r

diff --git a/xkeymacsdll/xkeymacsdll.cpp b/xkeymacsdll/xkeymacsdll.cpp
index 45ddeab..df2d078 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -243,7 +243,6 @@ void CXkeymacsDll::ShowHookState()
 LRESULT CALLBACK CXkeymacsDll::CallWndProc(int nCode, WPARAM wParam, LPARAM lParam)\r
 {\r
        SetKeyboardHook();\r
-       TSFHandler::InitSink();\r
        if (nCode >= 0) {\r
                const CWPSTRUCT *cwps = reinterpret_cast<CWPSTRUCT *>(lParam);\r
                switch (cwps->message) {\r
@@ -341,6 +340,7 @@ LRESULT CALLBACK CXkeymacsDll::ShellProc(int nCode, WPARAM wParam, LPARAM lParam
 void CXkeymacsDll::InitKeyboardProc()\r
 {\r
        AppName::Init();\r
+       TSFHandler::InitSink();\r
        if (m_CurrentConfig == NULL ||\r
                        _tcsnicmp(m_CurrentConfig->AppName, AppName::GetAppName(), 0xF) ||      // PROCESSENTRY32 has only 0xF bytes of Name\r
                        !CUtils::IsMatchWindowText(m_CurrentConfig->WindowText)) {\r