From 9365d57edc9d3712796f55928ca51553e4725579 Mon Sep 17 00:00:00 2001 From: nathancorvussolis Date: Fri, 6 May 2016 14:44:20 +0900 Subject: [PATCH 1/3] Fix RegisterClassEx failure --- imcrvtip/DllMain.cpp | 12 ++++++++++++ imcrvtip/TextService.cpp | 8 -------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/imcrvtip/DllMain.cpp b/imcrvtip/DllMain.cpp index a01b1263..2c41c8bd 100644 --- a/imcrvtip/DllMain.cpp +++ b/imcrvtip/DllMain.cpp @@ -1,5 +1,7 @@  #include "imcrvtip.h" +#include "CandidateWindow.h" +#include "InputModeWindow.h" BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { @@ -7,9 +9,19 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) { 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 index 16ca94f3..b1612a72 100644 --- 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; From ebce948380b75bd376ea56c83e3218e70ac2d76e Mon Sep 17 00:00:00 2001 From: nathancorvussolis Date: Sat, 7 May 2016 18:38:54 +0900 Subject: [PATCH 2/3] 2.3.4 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ・ウィンドウクラスの登録が失敗することがあり候補ウィンドウが表示されるタイミングで入力をリセットしてしまう不具合を修正しました。 　・coexeさん、情報ありがとうございます。 ・SHA-1 の新しいコード署名証明書を取得できたので、Windows Vista の KB2763674 更新プログラムはとりあえず不要となります。 --- README.md | 3 +-- common/version.h | 6 +++--- installer/_version.cmd | 2 +- installer/config-lua/init.lua | 2 +- installer/installer-version.wxi | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f1f20b25..38c5c6c9 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# CorvusSKK ver. 2.3.3 +# CorvusSKK ver. 2.3.4 Windowsで動作するSKK風のIMEです。 @@ -13,7 +13,6 @@ Windowsで動作するSKK風のIMEです。 + 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/common/version.h b/common/version.h index c0cae3b2..7067e08e 100644 --- a/common/version.h +++ b/common/version.h @@ -10,12 +10,12 @@ #define TEXTSERVICE_DESC TEXTSERVICE_NAME L"_DEBUG" #endif -#define TEXTSERVICE_VER L"2.3.3" +#define TEXTSERVICE_VER L"2.3.4" //for resource #define RC_AUTHOR "nathancorvussolis" #define RC_PRODUCT "CorvusSKK" -#define RC_VERSION "2.3.3" -#define RC_VERSION_D 2,3,3,0 +#define RC_VERSION "2.3.4" +#define RC_VERSION_D 2,3,4,0 #endif diff --git a/installer/_version.cmd b/installer/_version.cmd index 70726d6a..3c05869e 100644 --- a/installer/_version.cmd +++ b/installer/_version.cmd @@ -1,4 +1,4 @@ -set VERSION=2.3.3 +set VERSION=2.3.4 set TARGETDIR=build diff --git a/installer/config-lua/init.lua b/installer/config-lua/init.lua index 2a8ed215..0e9b1654 100644 --- 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-version.wxi b/installer/installer-version.wxi index c0eab95f..5479f1c8 100644 --- a/installer/installer-version.wxi +++ b/installer/installer-version.wxi @@ -1,4 +1,4 @@ - + From c4bd393801416f27654343a9fc840f4d817af788 Mon Sep 17 00:00:00 2001 From: nathancorvussolis Date: Sat, 7 May 2016 21:22:25 +0900 Subject: [PATCH 3/3] Fix intermediate output path --- installer/installer.vcxproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/installer/installer.vcxproj b/installer/installer.vcxproj index e36f0dad..51f64176 100644 --- a/installer/installer.vcxproj +++ b/installer/installer.vcxproj @@ -138,7 +138,7 @@ copy /y "config-lua\init.lua" "$(SolutionDir)$(Platform)\$(Configuration)\" WIN32;_DEBUG;$(NMakePreprocessorDefinitions) build\ - $(IntermediateOutputPath)\ + obj\$(Platform)\$(Configuration)\ copy /y "config-lua\init.lua" "$(SolutionDir)$(Platform)\$(Configuration)\" @@ -146,7 +146,7 @@ copy /y "config-lua\init.lua" "$(SolutionDir)$(Platform)\$(Configuration)\" WIN32;_DEBUG;$(NMakePreprocessorDefinitions) build\ - $(IntermediateOutputPath)\ + obj\$(Platform)\$(Configuration)\ WIN32;NDEBUG;$(NMakePreprocessorDefinitions) @@ -154,7 +154,7 @@ echo rebuild echo clean build\ - $(IntermediateOutputPath)\ + obj\$(Platform)\$(Configuration)\ WIN32;NDEBUG;$(NMakePreprocessorDefinitions) @@ -162,7 +162,7 @@ echo rebuild echo clean build\ - $(IntermediateOutputPath)\ + obj\$(Platform)\$(Configuration)\