[msitools: 3/11] wixl: add user interface actions
- From: Marc-André Lureau <malureau src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [msitools: 3/11] wixl: add user interface actions
- Date: Mon, 20 Sep 2021 08:48:08 +0000 (UTC)
commit e0b14576cc18e78761f9b14e6705dd724a23ac01
Author: Brendon Jones <brendon jones gmail com>
Date: Sun Sep 19 23:17:50 2021 +1200
wixl: add user interface actions
tools/wixl/builder.vala | 16 ++++++++++++++++
tools/wixl/msi-default.vala | 18 ++++++++++++++++++
tools/wixl/wix.vala | 16 ++++++++++++++--
3 files changed, 48 insertions(+), 2 deletions(-)
---
diff --git a/tools/wixl/builder.vala b/tools/wixl/builder.vala
index 9254b72..4ef9b4d 100644
--- a/tools/wixl/builder.vala
+++ b/tools/wixl/builder.vala
@@ -128,6 +128,11 @@ namespace Wixl {
add (MSIDefault.Action.FileCost);
add (MSIDefault.Action.CostFinalize);
add (MSIDefault.Action.ExecuteAction);
+ if (Extension.UI in extensions) {
+ add (MSIDefault.Action.FatalError);
+ add (MSIDefault.Action.UserExit);
+ add (MSIDefault.Action.ExitDialog);
+ }
table.add_sorted_actions ();
// AdvtExecuteSequence
@@ -200,6 +205,17 @@ namespace Wixl {
add (MSIDefault.Action.FileCost);
add (MSIDefault.Action.CostFinalize);
add (MSIDefault.Action.ExecuteAction);
+ if (Extension.UI in extensions) {
+ add (MSIDefault.Action.FatalError);
+ add (MSIDefault.Action.UserExit);
+ add (MSIDefault.Action.ExitDialog);
+ add (MSIDefault.Action.PrepareDlg);
+ add (MSIDefault.Action.ProgressDlg);
+ add (MSIDefault.Action.ResumeDlg);
+ add (MSIDefault.Action.WelcomeDlg);
+ add (MSIDefault.Action.WelcomeEulaDlg);
+ add (MSIDefault.Action.MaintenanceWelcomeDlg);
+ }
if (db.table_upgrade.records.length () > 0) {
add (MSIDefault.Action.FindRelatedProducts);
add (MSIDefault.Action.MigrateFeatureStates);
diff --git a/tools/wixl/msi-default.vala b/tools/wixl/msi-default.vala
index 42c0999..653c089 100644
--- a/tools/wixl/msi-default.vala
+++ b/tools/wixl/msi-default.vala
@@ -47,16 +47,21 @@ namespace Wixl {
CreateFolders,
DeleteServices,
DuplicateFiles,
+ ExitDialog,
+ FatalError,
FindRelatedProducts,
InstallODBC,
InstallServices,
+ MaintenanceWelcomeDlg,
MsiConfigureServices,
IsolateComponents,
LaunchConditions,
MigrateFeatureStates,
MoveFiles,
PatchFiles,
+ PrepareDlg,
ProcessComponents,
+ ProgressDlg,
RegisterComPlus,
RegisterFonts,
RegisterProduct,
@@ -70,6 +75,7 @@ namespace Wixl {
RemoveODBC,
RemoveRegistryValues,
RemoveShortcuts,
+ ResumeDlg,
RMCCPSearch,
SelfRegModules,
SelfUnregModules,
@@ -86,7 +92,10 @@ namespace Wixl {
UnregisterMIMEInfo,
UnregisterProgIdInfo,
UnregisterTypeLibraries,
+ UserExit,
ValidateProductID,
+ WelcomeDlg,
+ WelcomeEulaDlg,
WriteEnvironmentStrings,
WriteIniValues,
WriteRegistryValues,
@@ -120,16 +129,21 @@ namespace Wixl {
{ "CreateFolders", null, 3700, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
{ "DeleteServices", "VersionNT", 2000, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
{ "DuplicateFiles", null, 4210, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
+ { "ExitDialog", null, -1, ActionFlags.ADMIN_UI_SEQUENCE|ActionFlags.INSTALL_UI_SEQUENCE },
+ { "FatalError", null, -3, ActionFlags.ADMIN_UI_SEQUENCE|ActionFlags.INSTALL_UI_SEQUENCE },
{ "FindRelatedProducts", null, 25,
ActionFlags.INSTALL_EXECUTE_SEQUENCE|ActionFlags.INSTALL_UI_SEQUENCE },
{ "InstallODBC", null, 5400, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
{ "InstallServices", "VersionNT", 5800, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
+ { "MaintenanceWelcomeDlg", null, 1295, ActionFlags.INSTALL_UI_SEQUENCE },
{ "MsiConfigureServices", "VersionNT>=600", 5850, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
{ "IsolateComponents", null, 950,
ActionFlags.INSTALL_EXECUTE_SEQUENCE|ActionFlags.INSTALL_UI_SEQUENCE },
{ "LaunchConditions", null, 100,
ActionFlags.ADMIN_EXECUTE_SEQUENCE|ActionFlags.ADMIN_UI_SEQUENCE|ActionFlags.INSTALL_EXECUTE_SEQUENCE|ActionFlags.INSTALL_UI_SEQUENCE
},
{ "MigrateFeatureStates", null, 1200,
ActionFlags.INSTALL_EXECUTE_SEQUENCE|ActionFlags.INSTALL_UI_SEQUENCE },
{ "MoveFiles", null, 3800, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
{ "PatchFiles", null, 4090,
ActionFlags.ADMIN_EXECUTE_SEQUENCE|ActionFlags.INSTALL_EXECUTE_SEQUENCE },
+ { "PrepareDlg", null, 49, ActionFlags.INSTALL_UI_SEQUENCE },
{ "ProcessComponents", null, 1600, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
+ { "ProgressDlg", null, 1299, ActionFlags.INSTALL_UI_SEQUENCE },
{ "RegisterComPlus", null, 5700, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
{ "RegisterFonts", null, 5300, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
{ "RegisterProduct", null, 6100, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
@@ -143,6 +157,7 @@ namespace Wixl {
{ "RemoveODBC", null, 2400, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
{ "RemoveRegistryValues", null, 2600, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
{ "RemoveShortcuts", null, 3200, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
+ { "ResumeDlg", null, 1296, ActionFlags.INSTALL_UI_SEQUENCE },
{ "RMCCPSearch", "NOT Installed", 600,
ActionFlags.INSTALL_EXECUTE_SEQUENCE|ActionFlags.INSTALL_UI_SEQUENCE },
{ "SelfRegModules", null, 5600, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
{ "SelfUnregModules", null, 2200, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
@@ -159,7 +174,10 @@ namespace Wixl {
{ "UnregisterMIMEInfo", null, 3000, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
{ "UnregisterProgIdInfo", null, 2900, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
{ "UnregisterTypeLibraries", null, 2300, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
+ { "UserExit", null, -2, ActionFlags.ADMIN_UI_SEQUENCE|ActionFlags.INSTALL_UI_SEQUENCE },
{ "ValidateProductID", null, 700,
ActionFlags.INSTALL_EXECUTE_SEQUENCE|ActionFlags.INSTALL_UI_SEQUENCE },
+ { "WelcomeDlg", null, 1297, ActionFlags.INSTALL_UI_SEQUENCE },
+ { "WelcomeEulaDlg", null, 1298, ActionFlags.INSTALL_UI_SEQUENCE },
{ "WriteEnvironmentStrings", null, 5200, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
{ "WriteIniValues", null, 5100, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
{ "WriteRegistryValues", null, 5000, ActionFlags.INSTALL_EXECUTE_SEQUENCE },
diff --git a/tools/wixl/wix.vala b/tools/wixl/wix.vala
index 09f47cf..6f28254 100644
--- a/tools/wixl/wix.vala
+++ b/tools/wixl/wix.vala
@@ -801,16 +801,25 @@ namespace Wixl {
"CostInitialize",
"Custom",
"ExecuteAction",
+ "ExitDialog",
+ "FatalError",
"FileCost",
"FindRelatedProducts",
"IsolateComponents",
"LaunchConditions",
+ "MaintenanceWelcomeDlg",
"MigrateFeatureStates",
+ "PrepareDlg",
+ "ProgressDlg",
"ResolveSource",
+ "ResumeDlg",
"RMCCPSearch",
"ScheduleReboot",
"Show",
- "ValidateProductID" })
+ "UserExit",
+ "ValidateProductID",
+ "WelcomeDlg",
+ "WelcomeEulaDlg" })
child_types->insert (action, typeof (WixAction));
}
}
@@ -845,6 +854,8 @@ namespace Wixl {
"CostInitialize",
"Custom",
"ExecuteAction",
+ "ExitDialog",
+ "FatalError",
"FileCost",
"InstallAdminPackage",
"InstallFiles",
@@ -852,7 +863,8 @@ namespace Wixl {
"InstallInitialize",
"InstallValidate",
"LaunchConditions",
- "Show" })
+ "Show",
+ "UserExit" })
child_types->insert (action, typeof (WixAction));
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]