Fix RegisterClassEx failure

nathancorvussolis · May 6, 2016 · 9365d57 · 9365d57
1 parent 9f5ff91
commit 9365d57
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/imcrvtip/DllMain.cpp b/imcrvtip/DllMain.cpp
@@ -1,15 +1,27 @@
 
 #include "imcrvtip.h"
+#include "CandidateWindow.h"
+#include "InputModeWindow.h"
 
 BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
 {
 	switch(fdwReason)
 	{
 	case DLL_PROCESS_ATTACH:
 		g_hInst = hinstDLL;
+		if(!CCandidateWindow::_InitClass())
+		{
+			return FALSE;
+		}
+		if(!CInputModeWindow::_InitClass())
+		{
+			return FALSE;
+		}
 		break;
 
 	case DLL_PROCESS_DETACH:
+		CCandidateWindow::_UninitClass();
+		CInputModeWindow::_UninitClass();
 		break;
 
 	default:

diff --git a/imcrvtip/TextService.cpp b/imcrvtip/TextService.cpp
@@ -2,8 +2,6 @@
 #include "imcrvtip.h"
 #include "TextService.h"
 #include "CandidateList.h"
-#include "CandidateWindow.h"
-#include "InputModeWindow.h"
 
 CTextService::CTextService()
 {
@@ -153,9 +151,6 @@ STDAPI CTextService::ActivateEx(ITfThreadMgr *ptim, TfClientId tid, DWORD dwFlag
 	_pThreadMgr->AddRef();
 	_ClientId = tid;
 
-	CCandidateWindow::_InitClass();
-	CInputModeWindow::_InitClass();
-
 	if (!_IsKeyboardOpen())
 	{
 		_KeyboardSetDefaultMode();
@@ -244,9 +239,6 @@ STDAPI CTextService::Deactivate()
 
 	_UninitFont();
 
-	CCandidateWindow::_UninitClass();
-	CInputModeWindow::_UninitClass();
-
 	SafeRelease(&_pThreadMgr);
 
 	_ClientId = TF_CLIENTID_NULL;