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/core.cpp | |
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/core.cpp')
-rw-r--r-- | src/engine/core.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/engine/core.cpp b/src/engine/core.cpp index 26e74588..c34024fd 100644 --- a/src/engine/core.cpp +++ b/src/engine/core.cpp | |||
@@ -113,13 +113,13 @@ extern "C" HRESULT CoreInitialize( | |||
113 | 113 | ||
114 | if (sczSourceProcessPath) | 114 | if (sczSourceProcessPath) |
115 | { | 115 | { |
116 | hr = VariableSetLiteralString(&pEngineState->variables, BURN_BUNDLE_SOURCE_PROCESS_PATH, sczSourceProcessPath, TRUE); | 116 | hr = VariableSetString(&pEngineState->variables, BURN_BUNDLE_SOURCE_PROCESS_PATH, sczSourceProcessPath, TRUE, FALSE); |
117 | ExitOnFailure(hr, "Failed to set source process path variable."); | 117 | ExitOnFailure(hr, "Failed to set source process path variable."); |
118 | 118 | ||
119 | hr = PathGetDirectory(sczSourceProcessPath, &sczSourceProcessFolder); | 119 | hr = PathGetDirectory(sczSourceProcessPath, &sczSourceProcessFolder); |
120 | ExitOnFailure(hr, "Failed to get source process folder from path."); | 120 | ExitOnFailure(hr, "Failed to get source process folder from path."); |
121 | 121 | ||
122 | hr = VariableSetLiteralString(&pEngineState->variables, BURN_BUNDLE_SOURCE_PROCESS_FOLDER, sczSourceProcessFolder, TRUE); | 122 | hr = VariableSetString(&pEngineState->variables, BURN_BUNDLE_SOURCE_PROCESS_FOLDER, sczSourceProcessFolder, TRUE, FALSE); |
123 | ExitOnFailure(hr, "Failed to set source process folder variable."); | 123 | ExitOnFailure(hr, "Failed to set source process folder variable."); |
124 | } | 124 | } |
125 | 125 | ||
@@ -127,7 +127,7 @@ extern "C" HRESULT CoreInitialize( | |||
127 | // Needs to be done after ManifestLoadXmlFromBuffer. | 127 | // Needs to be done after ManifestLoadXmlFromBuffer. |
128 | if (sczOriginalSource) | 128 | if (sczOriginalSource) |
129 | { | 129 | { |
130 | hr = VariableSetLiteralString(&pEngineState->variables, BURN_BUNDLE_ORIGINAL_SOURCE, sczOriginalSource, FALSE); | 130 | hr = VariableSetString(&pEngineState->variables, BURN_BUNDLE_ORIGINAL_SOURCE, sczOriginalSource, FALSE, FALSE); |
131 | ExitOnFailure(hr, "Failed to set original source variable."); | 131 | ExitOnFailure(hr, "Failed to set original source variable."); |
132 | } | 132 | } |
133 | 133 | ||
@@ -258,7 +258,7 @@ extern "C" HRESULT CoreDetect( | |||
258 | } | 258 | } |
259 | else | 259 | else |
260 | { | 260 | { |
261 | hr = VariableSetString(&pEngineState->variables, BURN_BUNDLE_INSTALLED, NULL, TRUE); | 261 | hr = VariableSetString(&pEngineState->variables, BURN_BUNDLE_INSTALLED, NULL, TRUE, FALSE); |
262 | ExitOnFailure(hr, "Failed to unset the bundle installed built-in variable."); | 262 | ExitOnFailure(hr, "Failed to unset the bundle installed built-in variable."); |
263 | } | 263 | } |
264 | 264 | ||