Merge CorvusSKK 2.3.4

deton · May 9, 2016 · 2812175 · 2812175
2 parents 247906b + c4bd393
commit 2812175
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/README.md b/README.md
@@ -22,7 +22,6 @@ CorvusSKK に手を入れて以下の機能を追加しています。
 
     + Service Pack 2
     + プラットフォーム更新プログラム ( [KB971644](https://support.microsoft.com/en-us/kb/971644) または [KB971512](https://support.microsoft.com/en-us/kb/971512) )
-    + 更新プログラム ( [KB2763674](https://support.microsoft.com/en-us/kb/2763674) )
 
 * Windows 7     (32-bit / 64-bit)
 

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;

diff --git a/installer/config-lua/init.lua b/installer/config-lua/init.lua
@@ -1,5 +1,5 @@
 --[[
-	 CorvusSKK ver.2.3.3   Lua拡張スクリプト
+	 CorvusSKK ver.2.3.4   Lua拡張スクリプト
 
 
 	 Cから呼ばれるLuaの関数

diff --git a/installer/installer.vcxproj b/installer/installer.vcxproj
@@ -133,31 +133,31 @@
     <NMakeReBuildCommandLine>copy /y "config-lua\init.lua" "$(SolutionDir)$(Platform)\$(Configuration)\"</NMakeReBuildCommandLine>
     <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <OutDir>build\</OutDir>
-    <IntDir>$(IntermediateOutputPath)\</IntDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <NMakeBuildCommandLine>copy /y "config-lua\init.lua" "$(SolutionDir)$(Platform)\$(Configuration)\"</NMakeBuildCommandLine>
     <NMakeCleanCommandLine>del /f "$(SolutionDir)$(Platform)\$(Configuration)\init.lua"</NMakeCleanCommandLine>
     <NMakeReBuildCommandLine>copy /y "config-lua\init.lua" "$(SolutionDir)$(Platform)\$(Configuration)\"</NMakeReBuildCommandLine>
     <NMakePreprocessorDefinitions>WIN32;_DEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <OutDir>build\</OutDir>
-    <IntDir>$(IntermediateOutputPath)\</IntDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <NMakeBuildCommandLine>echo build</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>echo rebuild</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>echo clean</NMakeCleanCommandLine>
     <OutDir>build\</OutDir>
-    <IntDir>$(IntermediateOutputPath)\</IntDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <NMakePreprocessorDefinitions>WIN32;NDEBUG;$(NMakePreprocessorDefinitions)</NMakePreprocessorDefinitions>
     <NMakeBuildCommandLine>echo build</NMakeBuildCommandLine>
     <NMakeReBuildCommandLine>echo rebuild</NMakeReBuildCommandLine>
     <NMakeCleanCommandLine>echo clean</NMakeCleanCommandLine>
     <OutDir>build\</OutDir>
-    <IntDir>$(IntermediateOutputPath)\</IntDir>
+    <IntDir>obj\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <ItemDefinitionGroup>
   </ItemDefinitionGroup>