Skip to content

Commit

Permalink
Disallow Mozc to be installed on ARM64 Windows
Browse files Browse the repository at this point in the history
Before Mozc becomes available to ARM64 processes in Windows, let's
disallow Mozc64.msi to be installed into ARM64 Windows machines to avoid
unnecessary user confusions.

Note that this commit only blocks the initial installation. There is no
behavior change for those who have already installed Mozc into their
ARM64 Windows environments. This means that both upgrading from a
previous version of Mozc and uninstalling Mozc continue to be allowed.

Closes google#1127.
  • Loading branch information
yukawa committed Nov 21, 2024
1 parent df1bbd9 commit 65374b3
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 0 deletions.
5 changes: 5 additions & 0 deletions src/win32/installer/installer_64bit.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@
<Launch Condition="Privileged" Message="Google 日本語入力をインストールするには管理者権限が必要です。" />
<Media Id="1" Cabinet="GoogleJapaneseInput.cab" EmbedCab="yes" CompressionLevel="high" />

<Property Id="PROCESSOR_ARCHITECTURE">
<RegistrySearch Id="ProcessorArchitectureValue" Type="raw" Root="HKLM" Key="System\CurrentControlSet\Control\Session Manager\Environment" Name="PROCESSOR_ARCHITECTURE" />
</Property>
<Launch Condition="(NOT (PROCESSOR_ARCHITECTURE=&quot;ARM64&quot;)) OR UPGRADING OR (REMOVE=&quot;ALL&quot;)" Message="ARM64 環境へのインストールは未対応です。" />

<!-- Set Add/Remove Program Icon -->
<Icon Id="add_remove_program_icon.ico" SourceFile="$(var.AddRemoveProgramIconPath)" />
<Property Id="ARPPRODUCTICON" Value="add_remove_program_icon.ico" />
Expand Down
5 changes: 5 additions & 0 deletions src/win32/installer/installer_oss_64bit.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,11 @@
<Launch Condition="Privileged" Message="Mozc をインストールするには管理者権限が必要です。" />
<Media Id="1" Cabinet="Mozc.cab" EmbedCab="yes" CompressionLevel="high" />

<Property Id="PROCESSOR_ARCHITECTURE">
<RegistrySearch Id="ProcessorArchitectureValue" Type="raw" Root="HKLM" Key="System\CurrentControlSet\Control\Session Manager\Environment" Name="PROCESSOR_ARCHITECTURE" />
</Property>
<Launch Condition="(NOT (PROCESSOR_ARCHITECTURE=&quot;ARM64&quot;)) OR UPGRADING OR (REMOVE=&quot;ALL&quot;)" Message="ARM64 環境へのインストールは未対応です" />

<!-- Set Add/Remove Program Icon -->
<Icon Id="add_remove_program_icon.ico" SourceFile="$(var.AddRemoveProgramIconPath)" />
<Property Id="ARPPRODUCTICON" Value="add_remove_program_icon.ico" />
Expand Down

0 comments on commit 65374b3

Please sign in to comment.