diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-08-01 10:20:31 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-08-09 10:47:30 -0600 |
| commit | a37013d41f0702cbdf2aee6dce95d26dafc069b4 (patch) | |
| tree | 16cc67c99f5319279a32a07c1fd1b52dccd13867 /src/WixToolset.Mba.Core | |
| parent | 2ded319a01a9ec42b637a677813d394cd7eda6b9 (diff) | |
| download | wix-a37013d41f0702cbdf2aee6dce95d26dafc069b4.tar.gz wix-a37013d41f0702cbdf2aee6dce95d26dafc069b4.tar.bz2 wix-a37013d41f0702cbdf2aee6dce95d26dafc069b4.zip | |
WIXFEAT:4763 Change "string" variable type to literal and add "formatted".
Diffstat (limited to 'src/WixToolset.Mba.Core')
| -rw-r--r-- | src/WixToolset.Mba.Core/Engine.cs | 4 | ||||
| -rw-r--r-- | src/WixToolset.Mba.Core/IBootstrapperEngine.cs | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/WixToolset.Mba.Core/Engine.cs b/src/WixToolset.Mba.Core/Engine.cs index 408278ed..2c544f29 100644 --- a/src/WixToolset.Mba.Core/Engine.cs +++ b/src/WixToolset.Mba.Core/Engine.cs | |||
| @@ -79,7 +79,7 @@ namespace WixToolset.Mba.Core | |||
| 79 | IntPtr pValue = Marshal.SecureStringToCoTaskMemUnicode(value); | 79 | IntPtr pValue = Marshal.SecureStringToCoTaskMemUnicode(value); |
| 80 | try | 80 | try |
| 81 | { | 81 | { |
| 82 | this.engine.SetVariableString(name, pValue); | 82 | this.engine.SetVariableString(name, pValue, true); |
| 83 | } | 83 | } |
| 84 | finally | 84 | finally |
| 85 | { | 85 | { |
| @@ -115,7 +115,7 @@ namespace WixToolset.Mba.Core | |||
| 115 | IntPtr pValue = Marshal.StringToCoTaskMemUni(value); | 115 | IntPtr pValue = Marshal.StringToCoTaskMemUni(value); |
| 116 | try | 116 | try |
| 117 | { | 117 | { |
| 118 | this.engine.SetVariableString(name, pValue); | 118 | this.engine.SetVariableString(name, pValue, true); |
| 119 | } | 119 | } |
| 120 | finally | 120 | finally |
| 121 | { | 121 | { |
diff --git a/src/WixToolset.Mba.Core/IBootstrapperEngine.cs b/src/WixToolset.Mba.Core/IBootstrapperEngine.cs index d070998e..85ca8693 100644 --- a/src/WixToolset.Mba.Core/IBootstrapperEngine.cs +++ b/src/WixToolset.Mba.Core/IBootstrapperEngine.cs | |||
| @@ -106,7 +106,8 @@ namespace WixToolset.Mba.Core | |||
| 106 | 106 | ||
| 107 | void SetVariableString( | 107 | void SetVariableString( |
| 108 | [MarshalAs(UnmanagedType.LPWStr)] string wzVariable, | 108 | [MarshalAs(UnmanagedType.LPWStr)] string wzVariable, |
| 109 | IntPtr wzValue | 109 | IntPtr wzValue, |
| 110 | [MarshalAs(UnmanagedType.Bool)] bool fFormatted | ||
| 110 | ); | 111 | ); |
| 111 | 112 | ||
| 112 | void SetVariableVersion( | 113 | void SetVariableVersion( |
