diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-07-31 17:06:35 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-08-09 10:33:49 -0600 |
| commit | d21eed76c48960707561c45c492c10a6a23c052e (patch) | |
| tree | ebab09d099a699a24801fcfb4d7152cf82cc4a06 /src/engine/variable.h | |
| parent | ad80d6dc10f9bd6cb6a084857a8fb546cc55e756 (diff) | |
| download | wix-d21eed76c48960707561c45c492c10a6a23c052e.tar.gz wix-d21eed76c48960707561c45c492c10a6a23c052e.tar.bz2 wix-d21eed76c48960707561c45c492c10a6a23c052e.zip | |
WIXFEAT:4763 Change "string" variable type to literal and add "formatted".
Diffstat (limited to 'src/engine/variable.h')
| -rw-r--r-- | src/engine/variable.h | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/engine/variable.h b/src/engine/variable.h index 63f12cdf..648c5daf 100644 --- a/src/engine/variable.h +++ b/src/engine/variable.h | |||
| @@ -39,8 +39,7 @@ typedef struct _BURN_VARIABLE | |||
| 39 | { | 39 | { |
| 40 | LPWSTR sczName; | 40 | LPWSTR sczName; |
| 41 | BURN_VARIANT Value; | 41 | BURN_VARIANT Value; |
| 42 | BOOL fHidden; | 42 | BOOL fHidden; |
| 43 | BOOL fLiteral; // if fLiteral, then when formatting this variable its value should be used as is (don't continue recursively formatting). | ||
| 44 | BOOL fPersisted; | 43 | BOOL fPersisted; |
| 45 | 44 | ||
| 46 | // used for late initialization of built-in variables | 45 | // used for late initialization of built-in variables |
| @@ -104,17 +103,12 @@ HRESULT VariableSetNumeric( | |||
| 104 | __in LONGLONG llValue, | 103 | __in LONGLONG llValue, |
| 105 | __in BOOL fOverwriteBuiltIn | 104 | __in BOOL fOverwriteBuiltIn |
| 106 | ); | 105 | ); |
| 107 | HRESULT VariableSetLiteralString( | ||
| 108 | __in BURN_VARIABLES* pVariables, | ||
| 109 | __in_z LPCWSTR wzVariable, | ||
| 110 | __in_z_opt LPCWSTR wzValue, | ||
| 111 | __in BOOL fOverwriteBuiltIn | ||
| 112 | ); | ||
| 113 | HRESULT VariableSetString( | 106 | HRESULT VariableSetString( |
| 114 | __in BURN_VARIABLES* pVariables, | 107 | __in BURN_VARIABLES* pVariables, |
| 115 | __in_z LPCWSTR wzVariable, | 108 | __in_z LPCWSTR wzVariable, |
| 116 | __in_z_opt LPCWSTR wzValue, | 109 | __in_z_opt LPCWSTR wzValue, |
| 117 | __in BOOL fOverwriteBuiltIn | 110 | __in BOOL fOverwriteBuiltIn, |
| 111 | __in BOOL fFormatted | ||
| 118 | ); | 112 | ); |
| 119 | HRESULT VariableSetVersion( | 113 | HRESULT VariableSetVersion( |
| 120 | __in BURN_VARIABLES* pVariables, | 114 | __in BURN_VARIABLES* pVariables, |
| @@ -122,11 +116,6 @@ HRESULT VariableSetVersion( | |||
| 122 | __in DWORD64 qwValue, | 116 | __in DWORD64 qwValue, |
| 123 | __in BOOL fOverwriteBuiltIn | 117 | __in BOOL fOverwriteBuiltIn |
| 124 | ); | 118 | ); |
| 125 | HRESULT VariableSetLiteralVariant( | ||
| 126 | __in BURN_VARIABLES* pVariables, | ||
| 127 | __in_z LPCWSTR wzVariable, | ||
| 128 | __in BURN_VARIANT* pVariant | ||
| 129 | ); | ||
| 130 | HRESULT VariableSetVariant( | 119 | HRESULT VariableSetVariant( |
| 131 | __in BURN_VARIABLES* pVariables, | 120 | __in BURN_VARIABLES* pVariables, |
| 132 | __in_z LPCWSTR wzVariable, | 121 | __in_z LPCWSTR wzVariable, |
