diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2018-12-15 21:46:30 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-15 21:46:30 -0600 |
| commit | f7020c0d16baf2b960e7123e233e20c519f6a340 (patch) | |
| tree | d2cd464ee15b2b3f304ff780c531b39bb292d331 /src/wixlib | |
| parent | 6ed8d107e6edf16956c778bda3573f8d7a7690fc (diff) | |
| download | wix-f7020c0d16baf2b960e7123e233e20c519f6a340.tar.gz wix-f7020c0d16baf2b960e7123e233e20c519f6a340.tar.bz2 wix-f7020c0d16baf2b960e7123e233e20c519f6a340.zip | |
Import implementation of UtilCA from old repo's WixCA/scasched/scaexec. (#3)
Diffstat (limited to 'src/wixlib')
| -rw-r--r-- | src/wixlib/UtilExtension.wxs | 40 | ||||
| -rw-r--r-- | src/wixlib/UtilExtension_Platform.wxi | 2 |
2 files changed, 21 insertions, 21 deletions
diff --git a/src/wixlib/UtilExtension.wxs b/src/wixlib/UtilExtension.wxs index ac11c788..e77b529b 100644 --- a/src/wixlib/UtilExtension.wxs +++ b/src/wixlib/UtilExtension.wxs | |||
| @@ -63,7 +63,7 @@ | |||
| 63 | </Fragment> | 63 | </Fragment> |
| 64 | 64 | ||
| 65 | <Fragment> | 65 | <Fragment> |
| 66 | <CustomAction Id="WixFailWhenDeferred" BinaryKey="WixCA" DllEntry="WixFailWhenDeferred" Execute="deferred" Return="check" SuppressModularization="yes" /> | 66 | <CustomAction Id="WixFailWhenDeferred" BinaryKey="UtilCA" DllEntry="WixFailWhenDeferred" Execute="deferred" Return="check" SuppressModularization="yes" /> |
| 67 | 67 | ||
| 68 | <InstallExecuteSequence> | 68 | <InstallExecuteSequence> |
| 69 | <Custom Action="WixFailWhenDeferred" Before="InstallFinalize" Overridable="yes">WIXFAILWHENDEFERRED=1 AND VersionNT > 400</Custom> | 69 | <Custom Action="WixFailWhenDeferred" Before="InstallFinalize" Overridable="yes">WIXFAILWHENDEFERRED=1 AND VersionNT > 400</Custom> |
| @@ -71,7 +71,7 @@ | |||
| 71 | </Fragment> | 71 | </Fragment> |
| 72 | 72 | ||
| 73 | <Fragment> | 73 | <Fragment> |
| 74 | <CustomAction Id="WixWaitForEvent" BinaryKey="WixCA" DllEntry="WixWaitForEvent" Execute="immediate" Return="check" SuppressModularization="yes" /> | 74 | <CustomAction Id="WixWaitForEvent" BinaryKey="UtilCA" DllEntry="WixWaitForEvent" Execute="immediate" Return="check" SuppressModularization="yes" /> |
| 75 | 75 | ||
| 76 | <InstallExecuteSequence> | 76 | <InstallExecuteSequence> |
| 77 | <Custom Action="WixWaitForEvent" Before="InstallFinalize" Overridable="yes" /> | 77 | <Custom Action="WixWaitForEvent" Before="InstallFinalize" Overridable="yes" /> |
| @@ -79,7 +79,7 @@ | |||
| 79 | </Fragment> | 79 | </Fragment> |
| 80 | 80 | ||
| 81 | <Fragment> | 81 | <Fragment> |
| 82 | <CustomAction Id="WixWaitForEventDeferred" BinaryKey="WixCA" DllEntry="WixWaitForEvent" Execute="deferred" Return="check" SuppressModularization="yes" /> | 82 | <CustomAction Id="WixWaitForEventDeferred" BinaryKey="UtilCA" DllEntry="WixWaitForEvent" Execute="deferred" Return="check" SuppressModularization="yes" /> |
| 83 | 83 | ||
| 84 | <InstallExecuteSequence> | 84 | <InstallExecuteSequence> |
| 85 | <Custom Action="WixWaitForEventDeferred" After="InstallInitialize" Overridable="yes" /> | 85 | <Custom Action="WixWaitForEventDeferred" After="InstallInitialize" Overridable="yes" /> |
| @@ -87,7 +87,7 @@ | |||
| 87 | </Fragment> | 87 | </Fragment> |
| 88 | 88 | ||
| 89 | <Fragment> | 89 | <Fragment> |
| 90 | <CustomAction Id="WixExitEarlyWithSuccess" BinaryKey="WixCA" DllEntry="WixExitEarlyWithSuccess" Execute="immediate" Return="check" SuppressModularization="yes" /> | 90 | <CustomAction Id="WixExitEarlyWithSuccess" BinaryKey="UtilCA" DllEntry="WixExitEarlyWithSuccess" Execute="immediate" Return="check" SuppressModularization="yes" /> |
| 91 | 91 | ||
| 92 | <InstallExecuteSequence> | 92 | <InstallExecuteSequence> |
| 93 | <Custom Action="WixExitEarlyWithSuccess" After="FindRelatedProducts" Overridable="yes">NEWERVERSIONDETECTED AND VersionNT > 400</Custom> | 93 | <Custom Action="WixExitEarlyWithSuccess" After="FindRelatedProducts" Overridable="yes">NEWERVERSIONDETECTED AND VersionNT > 400</Custom> |
| @@ -95,7 +95,7 @@ | |||
| 95 | </Fragment> | 95 | </Fragment> |
| 96 | 96 | ||
| 97 | <Fragment> | 97 | <Fragment> |
| 98 | <CustomAction Id="WixRemoveFoldersEx" BinaryKey="WixCA" DllEntry="WixRemoveFoldersEx" Execute="immediate" Return="ignore" /> | 98 | <CustomAction Id="WixRemoveFoldersEx" BinaryKey="UtilCA" DllEntry="WixRemoveFoldersEx" Execute="immediate" Return="ignore" /> |
| 99 | 99 | ||
| 100 | <InstallExecuteSequence> | 100 | <InstallExecuteSequence> |
| 101 | <Custom Action="WixRemoveFoldersEx" Before="CostInitialize" /> | 101 | <Custom Action="WixRemoveFoldersEx" Before="CostInitialize" /> |
| @@ -103,7 +103,7 @@ | |||
| 103 | </Fragment> | 103 | </Fragment> |
| 104 | 104 | ||
| 105 | <Fragment> | 105 | <Fragment> |
| 106 | <CustomAction Id="WixBroadcastSettingChange" BinaryKey="WixCA" DllEntry="WixBroadcastSettingChange" Execute="immediate" Return="ignore" SuppressModularization="yes" /> | 106 | <CustomAction Id="WixBroadcastSettingChange" BinaryKey="UtilCA" DllEntry="WixBroadcastSettingChange" Execute="immediate" Return="ignore" SuppressModularization="yes" /> |
| 107 | 107 | ||
| 108 | <InstallExecuteSequence> | 108 | <InstallExecuteSequence> |
| 109 | <Custom Action="WixBroadcastSettingChange" After="InstallFinalize" Overridable="yes" /> | 109 | <Custom Action="WixBroadcastSettingChange" After="InstallFinalize" Overridable="yes" /> |
| @@ -111,7 +111,7 @@ | |||
| 111 | </Fragment> | 111 | </Fragment> |
| 112 | 112 | ||
| 113 | <Fragment> | 113 | <Fragment> |
| 114 | <CustomAction Id="WixBroadcastEnvironmentChange" BinaryKey="WixCA" DllEntry="WixBroadcastEnvironmentChange" Execute="immediate" Return="ignore" SuppressModularization="yes" /> | 114 | <CustomAction Id="WixBroadcastEnvironmentChange" BinaryKey="UtilCA" DllEntry="WixBroadcastEnvironmentChange" Execute="immediate" Return="ignore" SuppressModularization="yes" /> |
| 115 | 115 | ||
| 116 | <InstallExecuteSequence> | 116 | <InstallExecuteSequence> |
| 117 | <Custom Action="WixBroadcastEnvironmentChange" After="InstallFinalize" Overridable="yes" /> | 117 | <Custom Action="WixBroadcastEnvironmentChange" After="InstallFinalize" Overridable="yes" /> |
| @@ -120,7 +120,7 @@ | |||
| 120 | 120 | ||
| 121 | <!-- WiX OS-detection properties and custom action --> | 121 | <!-- WiX OS-detection properties and custom action --> |
| 122 | <Fragment> | 122 | <Fragment> |
| 123 | <CustomAction Id="WixQueryOsInfo" BinaryKey="WixCA" DllEntry="WixQueryOsInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" /> | 123 | <CustomAction Id="WixQueryOsInfo" BinaryKey="UtilCA" DllEntry="WixQueryOsInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" /> |
| 124 | 124 | ||
| 125 | <InstallExecuteSequence> | 125 | <InstallExecuteSequence> |
| 126 | <Custom Action="WixQueryOsInfo" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom> | 126 | <Custom Action="WixQueryOsInfo" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom> |
| @@ -213,7 +213,7 @@ | |||
| 213 | </Fragment> | 213 | </Fragment> |
| 214 | 214 | ||
| 215 | <Fragment> | 215 | <Fragment> |
| 216 | <CustomAction Id="WixQueryOsDirs" BinaryKey="WixCA" DllEntry="WixQueryOsDirs" Execute="firstSequence" Return="check" SuppressModularization="yes" /> | 216 | <CustomAction Id="WixQueryOsDirs" BinaryKey="UtilCA" DllEntry="WixQueryOsDirs" Execute="firstSequence" Return="check" SuppressModularization="yes" /> |
| 217 | 217 | ||
| 218 | <InstallExecuteSequence> | 218 | <InstallExecuteSequence> |
| 219 | <Custom Action="WixQueryOsDirs" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom> | 219 | <Custom Action="WixQueryOsDirs" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom> |
| @@ -318,7 +318,7 @@ | |||
| 318 | </Fragment> | 318 | </Fragment> |
| 319 | 319 | ||
| 320 | <Fragment> | 320 | <Fragment> |
| 321 | <CustomAction Id="WixQueryOsWellKnownSID" BinaryKey="WixCA" DllEntry="WixQueryOsWellKnownSID" Execute="firstSequence" Return="check" SuppressModularization="yes" /> | 321 | <CustomAction Id="WixQueryOsWellKnownSID" BinaryKey="UtilCA" DllEntry="WixQueryOsWellKnownSID" Execute="firstSequence" Return="check" SuppressModularization="yes" /> |
| 322 | 322 | ||
| 323 | <InstallExecuteSequence> | 323 | <InstallExecuteSequence> |
| 324 | <Custom Action="WixQueryOsWellKnownSID" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom> | 324 | <Custom Action="WixQueryOsWellKnownSID" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom> |
| @@ -360,7 +360,7 @@ | |||
| 360 | </Fragment> | 360 | </Fragment> |
| 361 | 361 | ||
| 362 | <Fragment> | 362 | <Fragment> |
| 363 | <CustomAction Id="WixQueryOsDriverInfo" BinaryKey="WixCA" DllEntry="WixQueryOsDriverInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" /> | 363 | <CustomAction Id="WixQueryOsDriverInfo" BinaryKey="UtilCA" DllEntry="WixQueryOsDriverInfo" Execute="firstSequence" Return="check" SuppressModularization="yes" /> |
| 364 | 364 | ||
| 365 | <InstallExecuteSequence> | 365 | <InstallExecuteSequence> |
| 366 | <Custom Action="WixQueryOsDriverInfo" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom> | 366 | <Custom Action="WixQueryOsDriverInfo" After="AppSearch" Overridable="yes">VersionNT > 400 OR (VersionNT = 400 AND ServicePackLevel > 3)</Custom> |
| @@ -384,47 +384,47 @@ | |||
| 384 | <!-- ShellExec custom actions (for when only one is needed; multiple executions need their own IDs) --> | 384 | <!-- ShellExec custom actions (for when only one is needed; multiple executions need their own IDs) --> |
| 385 | <Fragment> | 385 | <Fragment> |
| 386 | <PropertyRef Id="WixShellExecBinaryId" /> | 386 | <PropertyRef Id="WixShellExecBinaryId" /> |
| 387 | <CustomAction Id="WixShellExecBinary" BinaryKey="WixCA" DllEntry="WixShellExecBinary" Execute="immediate" Return="check" Impersonate="yes" /> | 387 | <CustomAction Id="WixShellExecBinary" BinaryKey="UtilCA" DllEntry="WixShellExecBinary" Execute="immediate" Return="check" Impersonate="yes" /> |
| 388 | </Fragment> | 388 | </Fragment> |
| 389 | 389 | ||
| 390 | <Fragment> | 390 | <Fragment> |
| 391 | <PropertyRef Id="WixShellExecTarget" /> | 391 | <PropertyRef Id="WixShellExecTarget" /> |
| 392 | <CustomAction Id="WixShellExec" BinaryKey="WixCA" DllEntry="WixShellExec" Execute="immediate" Return="check" Impersonate="yes" /> | 392 | <CustomAction Id="WixShellExec" BinaryKey="UtilCA" DllEntry="WixShellExec" Execute="immediate" Return="check" Impersonate="yes" /> |
| 393 | </Fragment> | 393 | </Fragment> |
| 394 | 394 | ||
| 395 | <Fragment> | 395 | <Fragment> |
| 396 | <PropertyRef Id="WixUnelevatedShellExecTarget" /> | 396 | <PropertyRef Id="WixUnelevatedShellExecTarget" /> |
| 397 | <CustomAction Id="WixUnelevatedShellExec" BinaryKey="WixCA" DllEntry="WixUnelevatedShellExec" Execute="immediate" Return="check" Impersonate="yes" /> | 397 | <CustomAction Id="WixUnelevatedShellExec" BinaryKey="UtilCA" DllEntry="WixUnelevatedShellExec" Execute="immediate" Return="check" Impersonate="yes" /> |
| 398 | </Fragment> | 398 | </Fragment> |
| 399 | 399 | ||
| 400 | <Fragment> | 400 | <Fragment> |
| 401 | <PropertyRef Id="QtExecCmdLine" /> | 401 | <PropertyRef Id="QtExecCmdLine" /> |
| 402 | <CustomAction Id="QtExec" BinaryKey="WixCA" DllEntry="CAQuietExec" Execute="immediate" Return="check" Impersonate="yes" /> | 402 | <CustomAction Id="QtExec" BinaryKey="UtilCA" DllEntry="CAQuietExec" Execute="immediate" Return="check" Impersonate="yes" /> |
| 403 | </Fragment> | 403 | </Fragment> |
| 404 | 404 | ||
| 405 | <Fragment> | 405 | <Fragment> |
| 406 | <PropertyRef Id="QtExec64CmdLine" /> | 406 | <PropertyRef Id="QtExec64CmdLine" /> |
| 407 | <CustomAction Id="QtExec64" BinaryKey="WixCA" DllEntry="CAQuietExec64" Execute="immediate" Return="check" Impersonate="yes" /> | 407 | <CustomAction Id="QtExec64" BinaryKey="UtilCA" DllEntry="CAQuietExec64" Execute="immediate" Return="check" Impersonate="yes" /> |
| 408 | </Fragment> | 408 | </Fragment> |
| 409 | 409 | ||
| 410 | <Fragment> | 410 | <Fragment> |
| 411 | <PropertyRef Id="WixQuietExecCmdLine" /> | 411 | <PropertyRef Id="WixQuietExecCmdLine" /> |
| 412 | <CustomAction Id="WixQuietExec" BinaryKey="WixCA" DllEntry="WixQuietExec" Execute="immediate" Return="check" Impersonate="yes" /> | 412 | <CustomAction Id="WixQuietExec" BinaryKey="UtilCA" DllEntry="WixQuietExec" Execute="immediate" Return="check" Impersonate="yes" /> |
| 413 | </Fragment> | 413 | </Fragment> |
| 414 | 414 | ||
| 415 | <Fragment> | 415 | <Fragment> |
| 416 | <PropertyRef Id="WixQuietExec64CmdLine" /> | 416 | <PropertyRef Id="WixQuietExec64CmdLine" /> |
| 417 | <CustomAction Id="WixQuietExec64" BinaryKey="WixCA" DllEntry="WixQuietExec64" Execute="immediate" Return="check" Impersonate="yes" /> | 417 | <CustomAction Id="WixQuietExec64" BinaryKey="UtilCA" DllEntry="WixQuietExec64" Execute="immediate" Return="check" Impersonate="yes" /> |
| 418 | </Fragment> | 418 | </Fragment> |
| 419 | 419 | ||
| 420 | <!-- SilentExec custom actions differ from QtExec in that they do not log the commandline or output of the exe --> | 420 | <!-- SilentExec custom actions differ from QtExec in that they do not log the commandline or output of the exe --> |
| 421 | <Fragment> | 421 | <Fragment> |
| 422 | <PropertyRef Id="WixSilentExecCmdLine" /> | 422 | <PropertyRef Id="WixSilentExecCmdLine" /> |
| 423 | <CustomAction Id="WixSilentExec" BinaryKey="WixCA" DllEntry="WixSilentExec" Execute="immediate" Return="check" Impersonate="yes" /> | 423 | <CustomAction Id="WixSilentExec" BinaryKey="UtilCA" DllEntry="WixSilentExec" Execute="immediate" Return="check" Impersonate="yes" /> |
| 424 | </Fragment> | 424 | </Fragment> |
| 425 | 425 | ||
| 426 | <Fragment> | 426 | <Fragment> |
| 427 | <PropertyRef Id="WixSilentExec64CmdLine" /> | 427 | <PropertyRef Id="WixSilentExec64CmdLine" /> |
| 428 | <CustomAction Id="WixSilentExec64" BinaryKey="WixCA" DllEntry="WixSilentExec64" Execute="immediate" Return="check" Impersonate="yes" /> | 428 | <CustomAction Id="WixSilentExec64" BinaryKey="UtilCA" DllEntry="WixSilentExec64" Execute="immediate" Return="check" Impersonate="yes" /> |
| 429 | </Fragment> | 429 | </Fragment> |
| 430 | </Wix> | 430 | </Wix> |
diff --git a/src/wixlib/UtilExtension_Platform.wxi b/src/wixlib/UtilExtension_Platform.wxi index 8328577f..4f76c687 100644 --- a/src/wixlib/UtilExtension_Platform.wxi +++ b/src/wixlib/UtilExtension_Platform.wxi | |||
| @@ -31,7 +31,7 @@ | |||
| 31 | </Fragment> | 31 | </Fragment> |
| 32 | 32 | ||
| 33 | <Fragment> | 33 | <Fragment> |
| 34 | <CustomAction Id="WixRegisterRestartResources$(var.Suffix)" BinaryKey="WixCA" DllEntry="WixRegisterRestartResources$(var.Suffix)" Execute="immediate" Return="check" SuppressModularization="yes" /> | 34 | <CustomAction Id="WixRegisterRestartResources$(var.Suffix)" BinaryKey="UtilCA$(var.Suffix)" DllEntry="WixRegisterRestartResources$(var.Suffix)" Execute="immediate" Return="check" SuppressModularization="yes" /> |
| 35 | 35 | ||
| 36 | <InstallExecuteSequence> | 36 | <InstallExecuteSequence> |
| 37 | <Custom Action="WixRegisterRestartResources$(var.Suffix)" Before="InstallValidate" Overridable="yes" /> | 37 | <Custom Action="WixRegisterRestartResources$(var.Suffix)" Before="InstallValidate" Overridable="yes" /> |