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/cache.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/cache.cpp')
-rw-r--r-- | src/engine/cache.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/engine/cache.cpp b/src/engine/cache.cpp index 9338426d..315281bc 100644 --- a/src/engine/cache.cpp +++ b/src/engine/cache.cpp | |||
@@ -157,7 +157,7 @@ extern "C" HRESULT CacheInitialize( | |||
157 | hr = VariableGetString(pVariables, BURN_BUNDLE_ORIGINAL_SOURCE, &sczOriginalSource); | 157 | hr = VariableGetString(pVariables, BURN_BUNDLE_ORIGINAL_SOURCE, &sczOriginalSource); |
158 | if (E_NOTFOUND == hr) | 158 | if (E_NOTFOUND == hr) |
159 | { | 159 | { |
160 | hr = VariableSetLiteralString(pVariables, BURN_BUNDLE_ORIGINAL_SOURCE, wzSourceProcessPath, FALSE); | 160 | hr = VariableSetString(pVariables, BURN_BUNDLE_ORIGINAL_SOURCE, wzSourceProcessPath, FALSE, FALSE); |
161 | ExitOnFailure(hr, "Failed to set original source variable."); | 161 | ExitOnFailure(hr, "Failed to set original source variable."); |
162 | 162 | ||
163 | hr = StrAllocString(&sczOriginalSource, wzSourceProcessPath, 0); | 163 | hr = StrAllocString(&sczOriginalSource, wzSourceProcessPath, 0); |
@@ -170,7 +170,7 @@ extern "C" HRESULT CacheInitialize( | |||
170 | hr = PathGetDirectory(sczOriginalSource, &sczOriginalSourceFolder); | 170 | hr = PathGetDirectory(sczOriginalSource, &sczOriginalSourceFolder); |
171 | ExitOnFailure(hr, "Failed to get directory from original source path."); | 171 | ExitOnFailure(hr, "Failed to get directory from original source path."); |
172 | 172 | ||
173 | hr = VariableSetLiteralString(pVariables, BURN_BUNDLE_ORIGINAL_SOURCE_FOLDER, sczOriginalSourceFolder, FALSE); | 173 | hr = VariableSetString(pVariables, BURN_BUNDLE_ORIGINAL_SOURCE_FOLDER, sczOriginalSourceFolder, FALSE, FALSE); |
174 | ExitOnFailure(hr, "Failed to set original source directory variable."); | 174 | ExitOnFailure(hr, "Failed to set original source directory variable."); |
175 | } | 175 | } |
176 | } | 176 | } |
@@ -549,7 +549,7 @@ extern "C" HRESULT CacheSetLastUsedSource( | |||
549 | 549 | ||
550 | if (CSTR_EQUAL != nCompare) | 550 | if (CSTR_EQUAL != nCompare) |
551 | { | 551 | { |
552 | hr = VariableSetLiteralString(pVariables, BURN_BUNDLE_LAST_USED_SOURCE, sczSourceFolder, FALSE); | 552 | hr = VariableSetString(pVariables, BURN_BUNDLE_LAST_USED_SOURCE, sczSourceFolder, FALSE, FALSE); |
553 | ExitOnFailure(hr, "Failed to set last source."); | 553 | ExitOnFailure(hr, "Failed to set last source."); |
554 | } | 554 | } |
555 | } | 555 | } |