1.7.11

・実行変換もどきのskk-server-version関数で、辞書サーバーを使用しない設定でもサーバーに問い合わせしてしまう不具合を修正しました。
nathancorvussolis · Nov 9, 2014 · 0b29ed1 · 0b29ed1
1 parent cce4d8d
commit 0b29ed1
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 8 deletions.
diff --git a/common/common.h b/common/common.h
@@ -3,7 +3,7 @@
 #define COMMON_H
 
 #define TEXTSERVICE_NAME	L"CorvusSKK"
-#define TEXTSERVICE_VER		L"1.7.10"
+#define TEXTSERVICE_VER		L"1.7.11"
 
 #ifndef _DEBUG
 #define TEXTSERVICE_DESC	TEXTSERVICE_NAME
@@ -14,8 +14,8 @@
 //for resource
 #define RC_AUTHOR			"nathancorvussolis"
 #define RC_PRODUCT			"CorvusSKK"
-#define RC_VERSION			"1.7.10"
-#define RC_VERSION_D		1,7,10,0
+#define RC_VERSION			"1.7.11"
+#define RC_VERSION_D		1,7,11,0
 
 #define MAX_KRNLOBJNAME		256
 #define CONV_POINT_NUM		256

diff --git a/imcrvmgr/SearchCharacter.cpp b/imcrvmgr/SearchCharacter.cpp
@@ -130,7 +130,7 @@ std::wstring SearchCharacterCode(const std::wstring &searchkey)
 	CONST CHAR ss2 = 0x0E;
 	CONST CHAR ss3 = 0x0F;
 
-	//ASCII, JIS X 0201 (8bit), JIS X 0213 面区点番号
+	//ASCII, JIS X 0201 (片仮名, 8bit), JIS X 0213 面区点番号
 	len = -1;
 	if(WideCharToEucJis2004(searchkey.c_str(), NULL, NULL, &len))
 	{

diff --git a/imcrvmgr/SearchSKKServer.cpp b/imcrvmgr/SearchSKKServer.cpp
@@ -207,6 +207,11 @@ std::wstring GetSKKServerInfo(CHAR req)
 	CHAR rbuf[RECVBUFSIZE];
 	int n;
 
+	if(!serv)
+	{
+		return ret;
+	}
+
 	if(send(sock, &req, 1, 0) == SOCKET_ERROR)
 	{
 		DisconnectSKKServer();

diff --git a/installer/README.TXT b/installer/README.TXT
@@ -1,6 +1,6 @@
 
 ================================================================================
-     CorvusSKK version 1.7.10
+     CorvusSKK version 1.7.11
 
      https://code.google.com/p/corvus-skk/
      [email protected]

diff --git a/installer/config-lua/init.lua b/installer/config-lua/init.lua
@@ -68,7 +68,7 @@
 			crvmgr.search_jisx0213(key)
 				key : 見出し語 string
 				戻り値 : "/<C1><;A1>/<C2><;A2>/.../<Cn><;An>/\n" or "" string
-		文字コード表記変換 (ASCII, JIS X 0201(8bit), JIS X 0213 / Unicode)
+		文字コード表記変換 (ASCII, JIS X 0201(片仮名, 8bit), JIS X 0213 / Unicode)
 			crvmgr.search_character_code(key)
 				key : 見出し語 string
 				戻り値 : "/<C1><;A1>/<C2><;A2>/.../<Cn><;An>/\n" or "" string

diff --git a/installer/corvusskk-x64.wxs b/installer/corvusskk-x64.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-  <?define version="1.7.10" ?>
+  <?define version="1.7.11" ?>
   <Product Id="*" Name="CorvusSKK" Language="1033" Version="$(var.version)" Manufacturer="CorvusSKK Project" UpgradeCode="DBDB315C-1F74-4051-8A67-705D0FD16497">
 
     <Package Id="*" Compressed="yes" Description="CorvusSKK" Comments="version $(var.version)" Platform="x64" InstallerVersion="405" InstallScope="perMachine" InstallPrivileges="elevated" />

diff --git a/installer/corvusskk-x86.wxs b/installer/corvusskk-x86.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-  <?define version="1.7.10" ?>
+  <?define version="1.7.11" ?>
   <Product Id="*" Name="CorvusSKK" Language="1033" Version="$(var.version)" Manufacturer="CorvusSKK Project" UpgradeCode="3F1244EC-9A5C-4041-9A33-E26B03C63C9B">
 
     <Package Id="*" Compressed="yes" Description="CorvusSKK" Comments="version $(var.version)" Platform="x86" InstallerVersion="405" InstallScope="perMachine" InstallPrivileges="elevated" />