Skip to content

Make <RegistrySearch> work in the repair mode #1411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yukawa wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make <RegistrySearch> work in the repair mode #1411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions src/win32/installer/installer_64bit.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,11 @@
Windows 11 22H2 22621
Windows 11 23H2 22631
Windows 11 24H2 26100

Note that this needs to be a secure property. Otherwise, it becomes an unexpected value in
the repair/uninstall mode. See https://github.com/google/mozc/issues/1410
-->
<Property Id="OS_BUILD_NUMBER">
<Property Id="OS_BUILD_NUMBER" Secure="yes">
<RegistrySearch Id="CurrentBuildNumberValue" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuildNumber" />
</Property>
<Launch Condition="(OS_BUILD_NUMBER AND (OS_BUILD_NUMBER &gt;= 10240)) OR (REMOVE=&quot;ALL&quot;)" Message="Google 日本語入力をインストールするには Windows 10 以降にアップグレードする必要があります。" />
Expand All @@ -101,7 +104,11 @@
<Media Id="1" Cabinet="GoogleJapaneseInput.cab" EmbedCab="yes" CompressionLevel="high" />

<?if $(var.MozcTIP64ArmPath) == "" and $(var.MozcTIP64XPath) == "" ?>
<Property Id="PROCESSOR_ARCHITECTURE">
<!--
This needs to be a secure property. Otherwise, it becomes an unexpected value in the
repair/uninstall mode. See https://github.com/google/mozc/issues/1410
-->
<Property Id="PROCESSOR_ARCHITECTURE" Secure="yes">
<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 環境へのインストールは未対応です" />
Expand Down
11 changes: 9 additions & 2 deletions src/win32/installer/installer_oss_64bit.wxs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,11 @@
Windows 11 22H2 22621
Windows 11 23H2 22631
Windows 11 24H2 26100

Note that this needs to be a secure property. Otherwise, it becomes an unexpected value in
the repair/uninstall mode. See https://github.com/google/mozc/issues/1410
-->
<Property Id="OS_BUILD_NUMBER">
<Property Id="OS_BUILD_NUMBER" Secure="yes">
<RegistrySearch Id="CurrentBuildNumberValue" Type="raw" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuildNumber" />
</Property>
<Launch Condition="(OS_BUILD_NUMBER AND (OS_BUILD_NUMBER &gt;= 10240)) OR (REMOVE=&quot;ALL&quot;)" Message="Mozc をインストールするには Windows 10 以降にアップグレードする必要があります。" />
Expand All @@ -102,7 +105,11 @@
<Media Id="1" Cabinet="Mozc.cab" EmbedCab="yes" CompressionLevel="high" />

<?if $(var.MozcTIP64ArmPath) == "" and $(var.MozcTIP64XPath) == "" ?>
<Property Id="PROCESSOR_ARCHITECTURE">
<!--
This needs to be a secure property. Otherwise, it becomes an unexpected value in the
repair/uninstall mode. See https://github.com/google/mozc/issues/1410
-->
<Property Id="PROCESSOR_ARCHITECTURE" Secure="yes">
<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 環境へのインストールは未対応です" />
Expand Down