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/registration.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/registration.cpp')
| -rw-r--r-- | src/engine/registration.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/engine/registration.cpp b/src/engine/registration.cpp index bbde92b3..eace62ce 100644 --- a/src/engine/registration.cpp +++ b/src/engine/registration.cpp | |||
| @@ -426,14 +426,14 @@ extern "C" HRESULT RegistrationSetVariables( | |||
| 426 | 426 | ||
| 427 | if (pRegistration->sczActiveParent && *pRegistration->sczActiveParent) | 427 | if (pRegistration->sczActiveParent && *pRegistration->sczActiveParent) |
| 428 | { | 428 | { |
| 429 | hr = VariableSetString(pVariables, BURN_BUNDLE_ACTIVE_PARENT, pRegistration->sczActiveParent, TRUE); | 429 | hr = VariableSetString(pVariables, BURN_BUNDLE_ACTIVE_PARENT, pRegistration->sczActiveParent, TRUE, FALSE); |
| 430 | ExitOnFailure(hr, "Failed to overwrite the bundle active parent built-in variable."); | 430 | ExitOnFailure(hr, "Failed to overwrite the bundle active parent built-in variable."); |
| 431 | } | 431 | } |
| 432 | 432 | ||
| 433 | hr = VariableSetString(pVariables, BURN_BUNDLE_PROVIDER_KEY, pRegistration->sczProviderKey, TRUE); | 433 | hr = VariableSetString(pVariables, BURN_BUNDLE_PROVIDER_KEY, pRegistration->sczProviderKey, TRUE, FALSE); |
| 434 | ExitOnFailure(hr, "Failed to overwrite the bundle provider key built-in variable."); | 434 | ExitOnFailure(hr, "Failed to overwrite the bundle provider key built-in variable."); |
| 435 | 435 | ||
| 436 | hr = VariableSetString(pVariables, BURN_BUNDLE_TAG, pRegistration->sczTag, TRUE); | 436 | hr = VariableSetString(pVariables, BURN_BUNDLE_TAG, pRegistration->sczTag, TRUE, FALSE); |
| 437 | ExitOnFailure(hr, "Failed to overwrite the bundle tag built-in variable."); | 437 | ExitOnFailure(hr, "Failed to overwrite the bundle tag built-in variable."); |
| 438 | 438 | ||
| 439 | hr = VariableSetVersion(pVariables, BURN_BUNDLE_VERSION, pRegistration->qwVersion, TRUE); | 439 | hr = VariableSetVersion(pVariables, BURN_BUNDLE_VERSION, pRegistration->qwVersion, TRUE); |
| @@ -1129,7 +1129,7 @@ static HRESULT GetBundleManufacturer( | |||
| 1129 | hr = VariableGetString(pVariables, BURN_BUNDLE_MANUFACTURER, psczBundleManufacturer); | 1129 | hr = VariableGetString(pVariables, BURN_BUNDLE_MANUFACTURER, psczBundleManufacturer); |
| 1130 | if (E_NOTFOUND == hr) | 1130 | if (E_NOTFOUND == hr) |
| 1131 | { | 1131 | { |
| 1132 | hr = VariableSetLiteralString(pVariables, BURN_BUNDLE_MANUFACTURER, pRegistration->sczPublisher, FALSE); | 1132 | hr = VariableSetString(pVariables, BURN_BUNDLE_MANUFACTURER, pRegistration->sczPublisher, FALSE, FALSE); |
| 1133 | ExitOnFailure(hr, "Failed to set bundle manufacturer."); | 1133 | ExitOnFailure(hr, "Failed to set bundle manufacturer."); |
| 1134 | 1134 | ||
| 1135 | hr = StrAllocString(psczBundleManufacturer, pRegistration->sczPublisher, 0); | 1135 | hr = StrAllocString(psczBundleManufacturer, pRegistration->sczPublisher, 0); |
| @@ -1151,7 +1151,7 @@ static HRESULT GetBundleName( | |||
| 1151 | hr = VariableGetString(pVariables, BURN_BUNDLE_NAME, psczBundleName); | 1151 | hr = VariableGetString(pVariables, BURN_BUNDLE_NAME, psczBundleName); |
| 1152 | if (E_NOTFOUND == hr) | 1152 | if (E_NOTFOUND == hr) |
| 1153 | { | 1153 | { |
| 1154 | hr = VariableSetLiteralString(pVariables, BURN_BUNDLE_NAME, pRegistration->sczDisplayName, FALSE); | 1154 | hr = VariableSetString(pVariables, BURN_BUNDLE_NAME, pRegistration->sczDisplayName, FALSE, FALSE); |
| 1155 | ExitOnFailure(hr, "Failed to set bundle name."); | 1155 | ExitOnFailure(hr, "Failed to set bundle name."); |
| 1156 | 1156 | ||
| 1157 | hr = StrAllocString(psczBundleName, pRegistration->sczDisplayName, 0); | 1157 | hr = StrAllocString(psczBundleName, pRegistration->sczDisplayName, 0); |
