Skip to content

Commit

Permalink
Reorder <CustomAction> attributes
Browse files Browse the repository at this point in the history
  • Loading branch information
@yukawa
yukawa committed Mar 12, 2024
1 parent bd292a0 commit e8e3f97
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 31 deletions.
34 changes: 17 additions & 17 deletions src/win32/installer/installer_64bit.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,23 +139,23 @@

<Binary Id="GoogleIMEJaInstallerHelper.dll" SourceFile="$(var.CustomActions64Path)" />

<CustomAction Id="RegisterTIP64" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="RegisterTIP" Execute="deferred" Impersonate="no" />
<CustomAction Id="RegisterTIPRollback64" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="RegisterTIPRollback" Execute="rollback" Impersonate="no" />
<CustomAction Id="UnregisterTIP64" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="UnregisterTIP" Execute="deferred" Impersonate="no" Return="ignore" />
<CustomAction Id="UnregisterTIPRollback64" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="UnregisterTIPRollback" Execute="rollback" Impersonate="no" Return="ignore" />
<CustomAction Id="EnsureAllApplicationPackagesPermisssions" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="EnsureAllApplicationPackagesPermisssions" Execute="deferred" Impersonate="no" Return="ignore" />
<CustomAction Id="OpenUninstallSurveyPage" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="OpenUninstallSurveyPage" Impersonate="yes" Return="ignore" />
<CustomAction Id="ShutdownServer" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="ShutdownServer" Impersonate="yes" Return="ignore" />
<CustomAction Id="RestoreUserIMEEnvironment" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="RestoreUserIMEEnvironment" Impersonate="yes" Return="ignore" />
<CustomAction Id="InitialInstallation" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="InitialInstallation" Execute="deferred" Impersonate="no" />
<CustomAction Id="InitialInstallationCommit" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="InitialInstallationCommit" Execute="commit" Impersonate="no" />
<CustomAction Id="EnableTipProfile" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="EnableTipProfile" Execute="commit" Impersonate="yes" />
<CustomAction Id="HideCancelButton" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="HideCancelButton" Return="ignore" />
<CustomAction Id="SaveCustomActionData" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="SaveCustomActionData" />
<CustomAction Id="RestoreServiceState" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="RestoreServiceState" Impersonate="no" Execute="deferred" Return="ignore" />
<CustomAction Id="StopCacheServiceForRollback" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="StopCacheService" Impersonate="no" Execute="rollback" Return="ignore" />
<CustomAction Id="WriteApValue" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="WriteApValue" Execute="deferred" Impersonate="no" />
<CustomAction Id="WriteApValueRollback" BinaryKey="GoogleIMEJaInstallerHelper.dll" DllEntry="WriteApValueRollback" Execute="rollback" Impersonate="no" />
<CustomAction Id="RegisterTIP64" DllEntry="RegisterTIP" Execute="deferred" Impersonate="no" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="RegisterTIPRollback64" DllEntry="RegisterTIPRollback" Execute="rollback" Impersonate="no" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="UnregisterTIP64" DllEntry="UnregisterTIP" Execute="deferred" Impersonate="no" Return="ignore" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="UnregisterTIPRollback64" DllEntry="UnregisterTIPRollback" Execute="rollback" Impersonate="no" Return="ignore" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="EnsureAllApplicationPackagesPermisssions" DllEntry="EnsureAllApplicationPackagesPermisssions" Execute="deferred" Impersonate="no" Return="ignore" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="OpenUninstallSurveyPage" DllEntry="OpenUninstallSurveyPage" Impersonate="yes" Return="ignore" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="ShutdownServer" DllEntry="ShutdownServer" Impersonate="yes" Return="ignore" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="RestoreUserIMEEnvironment" DllEntry="RestoreUserIMEEnvironment" Impersonate="yes" Return="ignore" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="InitialInstallation" DllEntry="InitialInstallation" Execute="deferred" Impersonate="no" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="InitialInstallationCommit" DllEntry="InitialInstallationCommit" Execute="commit" Impersonate="no" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="EnableTipProfile" DllEntry="EnableTipProfile" Execute="commit" Impersonate="yes" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="HideCancelButton" DllEntry="HideCancelButton" Return="ignore" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="SaveCustomActionData" DllEntry="SaveCustomActionData" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="RestoreServiceState" DllEntry="RestoreServiceState" Impersonate="no" Execute="deferred" Return="ignore" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="StopCacheServiceForRollback" DllEntry="StopCacheService" Impersonate="no" Execute="rollback" Return="ignore" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="WriteApValue" DllEntry="WriteApValue" Execute="deferred" Impersonate="no" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="WriteApValueRollback" DllEntry="WriteApValueRollback" Execute="rollback" Impersonate="no" BinaryKey="GoogleIMEJaInstallerHelper.dll" />
<CustomAction Id="NewerVersionError" Error="4000" />

<InstallExecuteSequence>
Expand Down
28 changes: 14 additions & 14 deletions src/win32/installer/installer_oss_64bit.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,20 +120,20 @@

<Binary Id="mozc_installer_helper.dll" SourceFile="$(var.CustomActions64Path)" />

<CustomAction Id="RegisterTIP64" BinaryKey="mozc_installer_helper.dll" DllEntry="RegisterTIP" Execute="deferred" Impersonate="no" />
<CustomAction Id="RegisterTIPRollback64" BinaryKey="mozc_installer_helper.dll" DllEntry="RegisterTIPRollback" Execute="rollback" Impersonate="no" />
<CustomAction Id="UnregisterTIP64" BinaryKey="mozc_installer_helper.dll" DllEntry="UnregisterTIP" Execute="deferred" Impersonate="no" Return="ignore" />
<CustomAction Id="UnregisterTIPRollback64" BinaryKey="mozc_installer_helper.dll" DllEntry="UnregisterTIPRollback" Execute="rollback" Impersonate="no" Return="ignore" />
<CustomAction Id="EnsureAllApplicationPackagesPermisssions" BinaryKey="mozc_installer_helper.dll" DllEntry="EnsureAllApplicationPackagesPermisssions" Execute="deferred" Impersonate="no" Return="ignore" />
<CustomAction Id="ShutdownServer" BinaryKey="mozc_installer_helper.dll" DllEntry="ShutdownServer" Impersonate="yes" Return="ignore" />
<CustomAction Id="RestoreUserIMEEnvironment" BinaryKey="mozc_installer_helper.dll" DllEntry="RestoreUserIMEEnvironment" Impersonate="yes" Return="ignore" />
<CustomAction Id="InitialInstallation" BinaryKey="mozc_installer_helper.dll" DllEntry="InitialInstallation" Execute="deferred" Impersonate="no" />
<CustomAction Id="InitialInstallationCommit" BinaryKey="mozc_installer_helper.dll" DllEntry="InitialInstallationCommit" Execute="commit" Impersonate="no" />
<CustomAction Id="EnableTipProfile" BinaryKey="mozc_installer_helper.dll" DllEntry="EnableTipProfile" Execute="commit" Impersonate="yes" />
<CustomAction Id="HideCancelButton" BinaryKey="mozc_installer_helper.dll" DllEntry="HideCancelButton" Return="ignore" />
<CustomAction Id="SaveCustomActionData" BinaryKey="mozc_installer_helper.dll" DllEntry="SaveCustomActionData" />
<CustomAction Id="RestoreServiceState" BinaryKey="mozc_installer_helper.dll" DllEntry="RestoreServiceState" Impersonate="no" Execute="deferred" Return="ignore" />
<CustomAction Id="StopCacheServiceForRollback" BinaryKey="mozc_installer_helper.dll" DllEntry="StopCacheService" Impersonate="no" Execute="rollback" Return="ignore" />
<CustomAction Id="RegisterTIP64" DllEntry="RegisterTIP" Execute="deferred" Impersonate="no" BinaryKey="mozc_installer_helper.dll" />
<CustomAction Id="RegisterTIPRollback64" DllEntry="RegisterTIPRollback" Execute="rollback" Impersonate="no" BinaryKey="mozc_installer_helper.dll" />
<CustomAction Id="UnregisterTIP64" DllEntry="UnregisterTIP" Execute="deferred" Impersonate="no" Return="ignore" BinaryKey="mozc_installer_helper.dll" />
<CustomAction Id="UnregisterTIPRollback64" DllEntry="UnregisterTIPRollback" Execute="rollback" Impersonate="no" Return="ignore" BinaryKey="mozc_installer_helper.dll" />
<CustomAction Id="EnsureAllApplicationPackagesPermisssions" DllEntry="EnsureAllApplicationPackagesPermisssions" Execute="deferred" Impersonate="no" Return="ignore" BinaryKey="mozc_installer_helper.dll" />
<CustomAction Id="ShutdownServer" DllEntry="ShutdownServer" Impersonate="yes" Return="ignore" BinaryKey="mozc_installer_helper.dll" />
<CustomAction Id="RestoreUserIMEEnvironment" DllEntry="RestoreUserIMEEnvironment" Impersonate="yes" Return="ignore" BinaryKey="mozc_installer_helper.dll" />
<CustomAction Id="InitialInstallation" DllEntry="InitialInstallation" Execute="deferred" Impersonate="no" BinaryKey="mozc_installer_helper.dll" />
<CustomAction Id="InitialInstallationCommit" DllEntry="InitialInstallationCommit" Execute="commit" Impersonate="no" BinaryKey="mozc_installer_helper.dll" />
<CustomAction Id="EnableTipProfile" DllEntry="EnableTipProfile" Execute="commit" Impersonate="yes" BinaryKey="mozc_installer_helper.dll" />
<CustomAction Id="HideCancelButton" DllEntry="HideCancelButton" Return="ignore" BinaryKey="mozc_installer_helper.dll" />
<CustomAction Id="SaveCustomActionData" DllEntry="SaveCustomActionData" BinaryKey="mozc_installer_helper.dll" />
<CustomAction Id="RestoreServiceState" DllEntry="RestoreServiceState" Impersonate="no" Execute="deferred" Return="ignore" BinaryKey="mozc_installer_helper.dll" />
<CustomAction Id="StopCacheServiceForRollback" DllEntry="StopCacheService" Impersonate="no" Execute="rollback" Return="ignore" BinaryKey="mozc_installer_helper.dll" />
<CustomAction Id="NewerVersionError" Error="4000" />

<InstallExecuteSequence>
Expand Down

0 comments on commit e8e3f97

Please sign in to comment.