Skip to content

Commit

Permalink
1.9.2
Browse files Browse the repository at this point in the history
・ユーザー入力による辞書登録において確定入力の文字列が二重に入力されてしまうバグを修正しました。
 ・version 1.9.1 で仕込んだバグです。
 ・sgurさん、情報ありがとうございます。

・WiX Toolset を v3.9R2 から v3.10 にバージョンアップしました。
  • Loading branch information
nathancorvussolis committed Sep 8, 2015
1 parent f02bc80 commit 782d846
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 16 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# CorvusSKK ver. 1.9.1
# CorvusSKK ver. 1.9.2

Windowsで動作するSKK風のIMEです。

Expand Down Expand Up @@ -564,4 +564,4 @@ ASCII, JIS X 0201, JIS X 0213に変換できない文字が含まれていた場

Visual Studio Express 2013 for Windows Desktop Update 5

WiX Toolset v3.9 R2
WiX Toolset v3.10
6 changes: 3 additions & 3 deletions common/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#define VERSION_H

#define TEXTSERVICE_NAME L"CorvusSKK"
#define TEXTSERVICE_VER L"1.9.1"
#define TEXTSERVICE_VER L"1.9.2"

#ifndef _DEBUG
#define TEXTSERVICE_DESC TEXTSERVICE_NAME
Expand All @@ -14,7 +14,7 @@
//for resource
#define RC_AUTHOR "nathancorvussolis"
#define RC_PRODUCT "CorvusSKK"
#define RC_VERSION "1.9.1"
#define RC_VERSION_D 1,9,1,0
#define RC_VERSION "1.9.2"
#define RC_VERSION_D 1,9,2,0

#endif
21 changes: 15 additions & 6 deletions imcrvtip/KeyHandlerChar.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,11 @@ HRESULT CTextService::_HandleChar(TfEditCookie ec, ITfContext *pContext, WPARAM
}
else
{
cursoridx = kana.size();
_Update(ec, pContext, TRUE);
if(pContext != NULL)
{
cursoridx = kana.size();
_Update(ec, pContext, TRUE);
}
_HandleCharReturn(ec, pContext);
}
}
Expand Down Expand Up @@ -251,8 +254,11 @@ HRESULT CTextService::_HandleChar(TfEditCookie ec, ITfContext *pContext, WPARAM
{
case S_OK: //一致
kana.assign(ajc.jlatin);
cursoridx = kana.size();
_Update(ec, pContext, TRUE);
if(pContext != NULL)
{
cursoridx = kana.size();
_Update(ec, pContext, TRUE);
}
_HandleCharReturn(ec, pContext);
break;
case E_PENDING: //途中まで一致
Expand All @@ -269,8 +275,11 @@ HRESULT CTextService::_HandleChar(TfEditCookie ec, ITfContext *pContext, WPARAM
ajc.ascii[0] = ch;
ajc.ascii[1] = L'\0';
kana.assign(ajc.ascii);
cursoridx = kana.size();
_Update(ec, pContext, TRUE);
if(pContext != NULL)
{
cursoridx = kana.size();
_Update(ec, pContext, TRUE);
}
_HandleCharReturn(ec, pContext);
break;

Expand Down
4 changes: 2 additions & 2 deletions installer/README.TXT
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

==============================================================================

CorvusSKK ver. 1.9.1
CorvusSKK ver. 1.9.2

https://nathancorvussolis.github.io/
[email protected]
Expand All @@ -23,6 +23,6 @@

マニュアル

https://github.com/nathancorvussolis/corvusskk/blob/1.9.1/README.md
https://github.com/nathancorvussolis/corvusskk/blob/1.9.2/README.md

==============================================================================
2 changes: 1 addition & 1 deletion installer/_version.cmd
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@

set VERSION=1.9.1
set VERSION=1.9.2
2 changes: 1 addition & 1 deletion installer/corvusskk-x64.wxs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

<?define version="1.9.1" ?>
<?define version="1.9.2" ?>

<Product Id="*" Name="CorvusSKK" Version="$(var.version)" Manufacturer="nathancorvussolis"
Language="1033" UpgradeCode="DBDB315C-1F74-4051-8A67-705D0FD16497">
Expand Down
2 changes: 1 addition & 1 deletion installer/corvusskk-x86.wxs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">

<?define version="1.9.1" ?>
<?define version="1.9.2" ?>

<Product Id="*" Name="CorvusSKK" Version="$(var.version)" Manufacturer="nathancorvussolis"
Language="1033" UpgradeCode="3F1244EC-9A5C-4041-9A33-E26B03C63C9B">
Expand Down

0 comments on commit 782d846

Please sign in to comment.