Skip to content

Commit

Permalink
3.2.3
Browse files Browse the repository at this point in the history
* インストーラーを WiX Toolset v4.0.4 にアップデートしました。

  DLLハイジャックの脆弱性が修正されています。

  https://www.firegiant.com/blog/2024/2/6/wix-security-releases-available/

* zlib 1.3.1 にアップデートしました。

* 設定ダイアログの入力文字列中にUTF-16の上位/下位サロゲートが単独で存在するとき設定ファイルの保存に失敗する不具合を修正しました。

  孤立したサロゲートは、U+FFFD (REPLACEMENT CHARACTER) に置換されます。
  • Loading branch information
nathancorvussolis committed Mar 3, 2024
1 parent b224bd6 commit f0ab462
Show file tree
Hide file tree
Showing 22 changed files with 24 additions and 13 deletions.
2 changes: 1 addition & 1 deletion LICENSE.TXT
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CorvusSKK

The MIT License

Copyright (C) 2011-2023 SASAKI Nobuyuki
Copyright (C) 2011-2024 SASAKI Nobuyuki

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
23 changes: 17 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# CorvusSKK ver. 3.2.2
# CorvusSKK ver. 3.2.3

![](installer/resource-md/logo.png) Windowsで動作するSKK風のIMEです。

Expand Down Expand Up @@ -923,7 +923,7 @@ Windows 10 (Ver.1709 から)、Windows 11 の場合

### 開発環境

Visual Studio Community 2022 17.7.6
Visual Studio Community 2022 17.9.2

* Desktop development with C++

Expand All @@ -938,23 +938,33 @@ Visual Studio Community 2022 17.7.6
* C++ ATL for latest v143 build tools (ARM64/ARM64EC)
* Windows 11 SDK (10.0.22621.0)

WiX Toolset v4.0.2
WiX Toolset v4.0.4

* .NET SDK 6.0 またはそれ以降
* requires the .NET SDK, version 6 or later.

pandoc 3.1.9
pandoc 3.1.12.2


### ビルド手順

WiX Toolset のインストール/アップデート

> installer\_wix_install.cmd

WiX Toolset のアンインストール

> installer\_wix_uninstall.cmd

ビルド

> installer\_solution_build.cmd

> installer\_build.cmd

ビルド & 署名 & 検証

> installer\_solution_build.cmd

> installer\_sign.cmd <SHA-1> <URL>

* <SHA-1> : SHA-1 thumbprint of certificate
Expand All @@ -965,11 +975,12 @@ pandoc 3.1.9
クリア

> installer\_solution_clean.cmd

> installer\_clean.cmd

---

Copyright (C) 2011-2023 SASAKI Nobuyuki
Copyright (C) 2011-2024 SASAKI Nobuyuki

[email protected]

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"3.2.2"
#define TEXTSERVICE_VER L"3.2.3"

//for resource
#define RC_AUTHOR "nathancorvussolis"
#define RC_PRODUCT "CorvusSKK"
#define RC_VERSION "3.2.2"
#define RC_VERSION_D 3,2,2,0
#define RC_VERSION "3.2.3"
#define RC_VERSION_D 3,2,3,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=3.2.2
set VERSION=3.2.3

set TARGETDIR=build
2 changes: 1 addition & 1 deletion installer/installer-version.wxi
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<Include xmlns="http://wixtoolset.org/schemas/v4/wxs">
<?define version="3.2.2" ?>
<?define version="3.2.3" ?>
</Include>
Binary file modified installer/resource-md/101_dictionary_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/102_dictionary_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/103_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/104_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/105_display_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/106_display_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/107_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/108_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/109_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/110_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/111_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/112_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/113_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/114_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/115_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/201_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.
2 changes: 1 addition & 1 deletion installer/theme-bundle/license.rtf
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ CorvusSKK\par
\par
The MIT License\par
\par
Copyright (C) 2011-2023 SASAKI Nobuyuki\par
Copyright (C) 2011-2024 SASAKI Nobuyuki\par
\par
Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:\par
\par
Expand Down

0 comments on commit f0ab462

Please sign in to comment.