aboutsummaryrefslogtreecommitdiff
path: root/src/engine/relatedbundle.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2020-10-18 14:05:51 -0500
committerSean Hall <r.sean.hall@gmail.com>2020-10-24 20:07:21 -0500
commitbafc4f682a798eb375d32c1f4777664aceb1e15f (patch)
treecc9bcec75252a7e4025e6efc28f1918ac8361e62 /src/engine/relatedbundle.cpp
parent273c69f34311f4f4e5f6b5896e71d0788f12d96a (diff)
downloadwix-bafc4f682a798eb375d32c1f4777664aceb1e15f.tar.gz
wix-bafc4f682a798eb375d32c1f4777664aceb1e15f.tar.bz2
wix-bafc4f682a798eb375d32c1f4777664aceb1e15f.zip
Update string versioning.
Update condition parsing to allow specific characters for versions. Log every time an invalid version is parsed.
Diffstat (limited to 'src/engine/relatedbundle.cpp')
-rw-r--r--src/engine/relatedbundle.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/engine/relatedbundle.cpp b/src/engine/relatedbundle.cpp
index e6d6516a..7b0da4a4 100644
--- a/src/engine/relatedbundle.cpp
+++ b/src/engine/relatedbundle.cpp
@@ -414,6 +414,11 @@ static HRESULT LoadRelatedBundleFromKey(
414 hr = VerParseVersion(sczBundleVersion, 0, FALSE, &pRelatedBundle->pVersion); 414 hr = VerParseVersion(sczBundleVersion, 0, FALSE, &pRelatedBundle->pVersion);
415 ExitOnFailure(hr, "Failed to parse pseudo bundle version: %ls", sczBundleVersion); 415 ExitOnFailure(hr, "Failed to parse pseudo bundle version: %ls", sczBundleVersion);
416 416
417 if (pRelatedBundle->pVersion->fInvalid)
418 {
419 LogId(REPORT_WARNING, MSG_RELATED_PACKAGE_INVALID_VERSION, wzRelatedBundleId, sczBundleVersion);
420 }
421
417 hr = RegReadString(hkBundleId, BURN_REGISTRATION_REGISTRY_BUNDLE_CACHE_PATH, &sczCachePath); 422 hr = RegReadString(hkBundleId, BURN_REGISTRATION_REGISTRY_BUNDLE_CACHE_PATH, &sczCachePath);
418 ExitOnFailure(hr, "Failed to read cache path from registry for bundle: %ls", wzRelatedBundleId); 423 ExitOnFailure(hr, "Failed to read cache path from registry for bundle: %ls", wzRelatedBundleId);
419 424