diff options
author | Bob Arnson <bob@firegiant.com> | 2023-04-24 22:16:34 -0400 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2023-06-03 01:24:39 -0700 |
commit | 1da29b425658bf1ddc774154d9bccaf940d0bc66 (patch) | |
tree | dda1d3320b8d855b3840e49b37d84d542b6824b7 /src/test | |
parent | 29146461effb7798e054aa9933a88f612237df47 (diff) | |
download | wix-1da29b425658bf1ddc774154d9bccaf940d0bc66.tar.gz wix-1da29b425658bf1ddc774154d9bccaf940d0bc66.tar.bz2 wix-1da29b425658bf1ddc774154d9bccaf940d0bc66.zip |
Fix WcaErrorMessage `cArgs==-1` case.
- Count args before creating message record.
- Document terminating NULL requirement.
- Add terminating NULL in MessageExit* macros.
- Enhance tests for problems encountered fixing this nightmare.
Fixes https://github.com/wixtoolset/issues/issues/7422.
Fixes https://github.com/wixtoolset/issues/issues/7444.
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/burn/WixTestTools/MSIExec.cs | 2 | ||||
-rw-r--r-- | src/test/msi/TestData/UtilExtensionUserTests/ProductNonVitalUserGroup/NonVitalUserGroup.wxs | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/test/burn/WixTestTools/MSIExec.cs b/src/test/burn/WixTestTools/MSIExec.cs index 98f54c56..f8c73afc 100644 --- a/src/test/burn/WixTestTools/MSIExec.cs +++ b/src/test/burn/WixTestTools/MSIExec.cs | |||
@@ -111,7 +111,7 @@ namespace WixTestTools | |||
111 | this.ForceRestart = false; | 111 | this.ForceRestart = false; |
112 | this.PromptRestart = false; | 112 | this.PromptRestart = false; |
113 | this.LogFile = String.Empty; | 113 | this.LogFile = String.Empty; |
114 | this.LoggingOptions = MSIExecLoggingOptions.VOICEWARMUP; | 114 | this.LoggingOptions = MSIExecLoggingOptions.Log_All_Information | MSIExecLoggingOptions.Verbose_Output | MSIExecLoggingOptions.Extra_Debugging_Information; // `/l*vx` |
115 | this.OtherArguments = String.Empty; | 115 | this.OtherArguments = String.Empty; |
116 | } | 116 | } |
117 | 117 | ||
diff --git a/src/test/msi/TestData/UtilExtensionUserTests/ProductNonVitalUserGroup/NonVitalUserGroup.wxs b/src/test/msi/TestData/UtilExtensionUserTests/ProductNonVitalUserGroup/NonVitalUserGroup.wxs index 461648ee..7ab4bbe1 100644 --- a/src/test/msi/TestData/UtilExtensionUserTests/ProductNonVitalUserGroup/NonVitalUserGroup.wxs +++ b/src/test/msi/TestData/UtilExtensionUserTests/ProductNonVitalUserGroup/NonVitalUserGroup.wxs | |||
@@ -10,12 +10,14 @@ | |||
10 | 10 | ||
11 | <Fragment> | 11 | <Fragment> |
12 | <util:Group Id="ShouldNotExist" Name="Should Not Exist" /> | 12 | <util:Group Id="ShouldNotExist" Name="Should Not Exist" /> |
13 | <util:Group Id="AlsoShouldNotExist" Name="Also Should Not Exist" /> | ||
13 | 14 | ||
14 | <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER"> | 15 | <Component Id="Component1" Guid="00030829-0000-0000-C000-000000000046" Directory="INSTALLFOLDER"> |
15 | <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" /> | 16 | <File Source="$(sys.SOURCEFILEPATH)" KeyPath="yes" /> |
16 | 17 | ||
17 | <util:User Id="CurrentUser" Name="[LogonUser]" Domain="[%USERDOMAIN]" RemoveOnUninstall="no" Vital="no"> | 18 | <util:User Id="CurrentUser" Name="[LogonUser]" Domain="[%USERDOMAIN]" RemoveOnUninstall="no" Vital="no"> |
18 | <util:GroupRef Id="ShouldNotExist" /> | 19 | <util:GroupRef Id="ShouldNotExist" /> |
20 | <util:GroupRef Id="AlsoShouldNotExist" /> | ||
19 | </util:User> | 21 | </util:User> |
20 | </Component> | 22 | </Component> |
21 | </Fragment> | 23 | </Fragment> |