diff --git a/common/version.h b/common/version.h index 07ad364f..664a0240 100644 --- a/common/version.h +++ b/common/version.h @@ -3,7 +3,7 @@ #define VERSION_H #define TEXTSERVICE_NAME L"CorvusSKK" -#define TEXTSERVICE_VER L"1.8.5" +#define TEXTSERVICE_VER L"1.8.6" #ifndef _DEBUG #define TEXTSERVICE_DESC TEXTSERVICE_NAME @@ -14,7 +14,7 @@ //for resource #define RC_AUTHOR "nathancorvussolis" #define RC_PRODUCT "CorvusSKK" -#define RC_VERSION "1.8.5" -#define RC_VERSION_D 1,8,5,0 +#define RC_VERSION "1.8.6" +#define RC_VERSION_D 1,8,6,0 #endif diff --git a/imcrvcnf/ConfigCnf.cpp b/imcrvcnf/ConfigCnf.cpp index 25f73e5e..7a1ab0a6 100644 --- a/imcrvcnf/ConfigCnf.cpp +++ b/imcrvcnf/ConfigCnf.cpp @@ -60,6 +60,7 @@ BOOL SetFileDacl(LPCWSTR path) if(GetUserSid(&pszUserSid)) { + // SDDL_ALL_APP_PACKAGES / SDDL_RESTRICTED_CODE / SDDL_LOCAL_SYSTEM / SDDL_BUILTIN_ADMINISTRATORS / User SID _snwprintf_s(sddl, _TRUNCATE, L"D:%s(A;;FR;;;RC)(A;;FA;;;SY)(A;;FA;;;BA)(A;;FA;;;%s)", (IsVersion62AndOver() ? L"(A;;FR;;;AC)" : L""), pszUserSid); LocalFree(pszUserSid); diff --git a/imcrvmgr/ConfigMgr.cpp b/imcrvmgr/ConfigMgr.cpp index 5b7e50d1..ccc08b68 100644 --- a/imcrvmgr/ConfigMgr.cpp +++ b/imcrvmgr/ConfigMgr.cpp @@ -79,6 +79,7 @@ void CreateConfigPath() if(GetUserSid(&pszUserSid)) { + // SDDL_ALL_APP_PACKAGES / SDDL_RESTRICTED_CODE / SDDL_LOCAL_SYSTEM / SDDL_BUILTIN_ADMINISTRATORS / User SID _snwprintf_s(krnlobjsddl, _TRUNCATE, L"D:%s(A;;GA;;;RC)(A;;GA;;;SY)(A;;GA;;;BA)(A;;GA;;;%s)", (IsVersion62AndOver() ? L"(A;;GA;;;AC)" : L""), pszUserSid); diff --git a/imcrvtip/KeyHandlerChar.cpp b/imcrvtip/KeyHandlerChar.cpp index 4005b003..49980dc3 100644 --- a/imcrvtip/KeyHandlerChar.cpp +++ b/imcrvtip/KeyHandlerChar.cpp @@ -220,11 +220,6 @@ HRESULT CTextService::_HandleChar(TfEditCookie ec, ITfContext *pContext, WPARAM case E_ABORT: //不一致 _HandleCharShift(ec, pContext); - roman.clear(); - if(okuriidx != 0 && okuriidx + 1 == cursoridx) - { - kana.replace(okuriidx, 1, 1, CHAR_SKK_OKURI); //送りローマ字 - } _Update(ec, pContext); break; diff --git a/imcrvtip/KeyHandlerConv.cpp b/imcrvtip/KeyHandlerConv.cpp index 5cdd0842..d6abaa23 100644 --- a/imcrvtip/KeyHandlerConv.cpp +++ b/imcrvtip/KeyHandlerConv.cpp @@ -714,7 +714,7 @@ BOOL CTextService::_ConvShift(WCHAR ch) { case S_OK: //一致 case E_PENDING: //途中まで一致 - if(rkc.roman != L'\0' && rkc.wait) //待機 + if(rkc.roman[0] != L'\0' && rkc.wait) //待機 { if(okuriidx != 0 && okuriidx + 1 == cursoridx) { @@ -799,7 +799,7 @@ BOOL CTextService::_ConvShift(WCHAR ch) { case S_OK: //一致 case E_PENDING: //途中まで一致 - if(rkc.roman != L'\0' && rkc.soku) + if(rkc.roman[0] != L'\0' && rkc.soku) { std::wstring kana_ins; switch(inputmode) diff --git a/installer/README.TXT b/installer/README.TXT index 4ede354b..da9c93a8 100644 --- a/installer/README.TXT +++ b/installer/README.TXT @@ -1,6 +1,6 @@  ============================================================================== - CorvusSKK version 1.8.5 + CorvusSKK version 1.8.6 https://github.com/nathancorvussolis/corvusskk nathancorvussolis@gmail.com @@ -73,9 +73,9 @@ 許可の付加が自動的に行われます。 -・Adobe Reader X, XI +・Adobe Reader X, XI, Acrobat Reader DC - Adobe Reader X または XI で使用するには、設定ファイル（config.xml）に + Adobe Reader X 以降で使用するには、設定ファイル（config.xml）に Adobe Reader へのアクセス許可を付加させる必要があります。 設定ダイアログでOKボタンを押して保存を行うとアクセス許可の付加が自動的に 行われます。 diff --git a/installer/config-lua/init.lua b/installer/config-lua/init.lua index ccb7f40a..5326c0fd 100644 --- a/installer/config-lua/init.lua +++ b/installer/config-lua/init.lua @@ -696,16 +696,16 @@ local function skk_relative_date(t) local d = os.date("*t", skk_gadget_time) if (ymd == ":yy") then - d["year"] = d["year"] + tonumber(diff); + d["year"] = d["year"] + tonumber(diff) elseif (ymd == ":mm") then - d["month"] = d["month"] + tonumber(diff); + d["month"] = d["month"] + tonumber(diff) elseif (ymd == ":dd") then - d["day"] = d["day"] + tonumber(diff); + d["day"] = d["day"] + tonumber(diff) else end - local skk_gadget_time_bak = skk_gadget_time; - skk_gadget_time = os.time(d); + local skk_gadget_time_bak = skk_gadget_time + skk_gadget_time = os.time(d) if (pp_function == "nil") then ret = skk_default_current_date(nil) @@ -713,7 +713,7 @@ local function skk_relative_date(t) ret = skk_convert_gadget_interpret(pp_function) end - skk_gadget_time = skk_gadget_time_bak; + skk_gadget_time = skk_gadget_time_bak return ret end @@ -1037,7 +1037,7 @@ local function skk_convert_key(key, okuri) -- 文字コード表記変換のとき見出し語変換しない local cccplen = string.len(charcode_conv_prefix) if (cccplen < string.len(key) and string.sub(key, 1, cccplen) == charcode_conv_prefix) then - return ""; + return "" end -- 数値変換 diff --git a/installer/corvusskk-x64.wxs b/installer/corvusskk-x64.wxs index daf413fc..e767e106 100644 --- a/installer/corvusskk-x64.wxs +++ b/installer/corvusskk-x64.wxs @@ -1,7 +1,7 @@ - + diff --git a/installer/corvusskk-x86.wxs b/installer/corvusskk-x86.wxs index 76a2e542..d8dd926e 100644 --- a/installer/corvusskk-x86.wxs +++ b/installer/corvusskk-x86.wxs @@ -1,7 +1,7 @@ - +