Skip to content

Commit

Permalink
3.0.0
Browse files Browse the repository at this point in the history
* キー設定(ON/OFF)のデフォルトに、VK_IME_ON(0x16)、VK_IME_OFF(0x1A)を追加しました。

    Keyboard Japan - ImeOn / ImeOff Implementation
    https://docs.microsoft.com/en-us/windows-hardware/design/component-guidelines/keyboard-japan-ime

* DllMainからuser32.dllの関数を使用しないようにしました。

    Dynamic-Link Library Best Practices
    https://docs.microsoft.com/en-us/windows/win32/dlls/dynamic-link-library-best-practices

* ARM 版において Windows 10 on ARM Insider Preview Build 21277 以降の x64 エミュレーションに対応しました。

    WOW64にあったようなファイルシステムやレジストリのリダイレクションがx64エミュレーションに無いため、
    Text Input Processor (TIP) の DLL は x64 のコードを含んだ ARM64X なバイナリとしてビルドしています。
    ARM64EC向けのビルドツールがまだ試験段階のため何か不具合があるかもしれません。ご了承ください。

    Visual Studio 2019 16.10.0 でインストールされる Windows 10 SDK (10.0.19041.0) ではビルドできないので、
    ソースをビルドする際は、別途 Windows 10 SDK (10.0.20348.0) や SDK Insider Preview をインストールする必要があります。

    Windows 10 SDK
    https://developer.microsoft.com/en-us/windows/downloads/windows-10-sdk/

    Download Windows Insider Preview SDK
    https://www.microsoft.com/en-us/software-download/windowsinsiderpreviewSDK

* TIP とリンクさせる Universal CRT をスタティックリンクからダイナミックリンクに変更しました。

    将来のバージョンでは修正される可能性もありますが、スタティックライブラリのlibucrt.libとリンクさせた場合、
    x64エミュレーションにおいてntdll.dll内のクリティカルセクションがらみの処理でアクセス違反を発生させてしまうため、
    ランタイムライブラリはマルチスレッド(/MT)のままlibucrt.libの替わりにダイナミックライブラリのucrt.libとリンクさせています。

    ユーザーモードドライバーで推奨される構成と同じなので問題ないだろうと判断し、これをARM32ビット版、x86版、x64版にも適用しました。

    Using the Microsoft C Runtime with User-Mode Drivers and Desktop Apps
    https://docs.microsoft.com/en-us/windows-hardware/drivers/develop/using-the-microsoft-c-runtime-with-user-mode-drivers-and-apps
  • Loading branch information
nathancorvussolis committed Jun 6, 2021
1 parent 21069bf commit c6382ed
Show file tree
Hide file tree
Showing 20 changed files with 9 additions and 7 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. 2.8.2
# CorvusSKK ver. 3.0.0

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

Expand Down Expand Up @@ -775,7 +775,7 @@ Windows 10 SDK version 2104 (10.0.20348.0)

WiX Toolset v3.11.2

pandoc 2.13
pandoc 2.14.0.1


### ビルド手順
Expand Down
2 changes: 2 additions & 0 deletions common/common.h
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ BOOL IsWindowsVersionOrLater(DWORD dwMajorVersion, DWORD dwMinorVersion, DWORD d
//#define IsWindowsVersion10020H1OrLater() IsWindowsVersionOrLater(10, 0, 19041)
//// Windows 10 ver.20H2 October 2020 Update
//#define IsWindowsVersion10020H2OrLater() IsWindowsVersionOrLater(10, 0, 19042)
//// Windows 10 ver.21H1 May 2021 Update
//#define IsWindowsVersion10021H1OrLater() IsWindowsVersionOrLater(10, 0, 19043)

#define C_USER_DEFAULT_SCREEN_DPI 96
#define C_FONT_LOGICAL_HEIGHT_PPI 72
Expand Down
6 changes: 3 additions & 3 deletions common/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
#define TEXTSERVICE_DESC TEXTSERVICE_NAME L"_DEBUG"
#endif
#define TEXTSERVICE_DIR L"IMCRVSKK"
#define TEXTSERVICE_VER L"2.8.2"
#define TEXTSERVICE_VER L"3.0.0"

//for resource
#define RC_AUTHOR "nathancorvussolis"
#define RC_PRODUCT "CorvusSKK"
#define RC_VERSION "2.8.2"
#define RC_VERSION_D 2,8,2,0
#define RC_VERSION "3.0.0"
#define RC_VERSION_D 3,0,0,0
2 changes: 1 addition & 1 deletion installer/_version.cmd
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@

set VERSION=2.8.2
set VERSION=3.0.0

set TARGETDIR=build
2 changes: 1 addition & 1 deletion installer/installer-version.wxi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Include>
<?define version="2.8.2" ?>
<?define version="3.0.0" ?>
</Include>
Binary file modified installer/resource-md/01_dictionary.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/02_behavior_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/03_behavior_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/04_display1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/05_display2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/06_display_attribute_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/07_display_attribute_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/08_select_key.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/09_on_off_key.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/10_key1_character.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/11_key2_virtual_key.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/12_conversion_point.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/13_kana.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/14_full_width_latin.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified installer/resource-md/21_convert_program.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit c6382ed

Please sign in to comment.