aboutsummaryrefslogtreecommitdiff
path: root/src/engine/registration.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/registration.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/registration.cpp')
-rw-r--r--src/engine/registration.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/engine/registration.cpp b/src/engine/registration.cpp
index 3c3dc95d..4e8c810d 100644
--- a/src/engine/registration.cpp
+++ b/src/engine/registration.cpp
@@ -136,6 +136,11 @@ extern "C" HRESULT RegistrationParseFromXml(
136 hr = VerParseVersion(scz, 0, FALSE, &pRegistration->pVersion); 136 hr = VerParseVersion(scz, 0, FALSE, &pRegistration->pVersion);
137 ExitOnFailure(hr, "Failed to parse @Version: %ls", scz); 137 ExitOnFailure(hr, "Failed to parse @Version: %ls", scz);
138 138
139 if (pRegistration->pVersion->fInvalid)
140 {
141 LogId(REPORT_WARNING, MSG_MANIFEST_INVALID_VERSION, scz);
142 }
143
139 // @ProviderKey 144 // @ProviderKey
140 hr = XmlGetAttributeEx(pixnRegistrationNode, L"ProviderKey", &pRegistration->sczProviderKey); 145 hr = XmlGetAttributeEx(pixnRegistrationNode, L"ProviderKey", &pRegistration->sczProviderKey);
141 ExitOnFailure(hr, "Failed to get @ProviderKey."); 146 ExitOnFailure(hr, "Failed to get @ProviderKey.");