diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-10-17 19:12:21 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-10-24 20:07:21 -0500 |
commit | 273c69f34311f4f4e5f6b5896e71d0788f12d96a (patch) | |
tree | 4cf8f42f3ecfa9341a41686b74aa5e48068ede87 /src/engine/dependency.cpp | |
parent | 3f8e35223216ebbe7f6683a5031a5a97bbc66d5a (diff) | |
download | wix-273c69f34311f4f4e5f6b5896e71d0788f12d96a.tar.gz wix-273c69f34311f4f4e5f6b5896e71d0788f12d96a.tar.bz2 wix-273c69f34311f4f4e5f6b5896e71d0788f12d96a.zip |
WIXFEAT:6210 Change data type of versions to strings.
Diffstat (limited to 'src/engine/dependency.cpp')
-rw-r--r-- | src/engine/dependency.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/engine/dependency.cpp b/src/engine/dependency.cpp index c7c6e024..c01449b6 100644 --- a/src/engine/dependency.cpp +++ b/src/engine/dependency.cpp | |||
@@ -593,20 +593,14 @@ extern "C" HRESULT DependencyRegisterBundle( | |||
593 | ) | 593 | ) |
594 | { | 594 | { |
595 | HRESULT hr = S_OK; | 595 | HRESULT hr = S_OK; |
596 | LPWSTR sczVersion = NULL; | ||
597 | 596 | ||
598 | hr = FileVersionToStringEx(pRegistration->qwVersion, &sczVersion); | 597 | LogId(REPORT_VERBOSE, MSG_DEPENDENCY_BUNDLE_REGISTER, pRegistration->sczProviderKey, pRegistration->pVersion->sczVersion); |
599 | ExitOnFailure(hr, "Failed to format the registration version string."); | ||
600 | |||
601 | LogId(REPORT_VERBOSE, MSG_DEPENDENCY_BUNDLE_REGISTER, pRegistration->sczProviderKey, sczVersion); | ||
602 | 598 | ||
603 | // Register the bundle provider key. | 599 | // Register the bundle provider key. |
604 | hr = DepRegisterDependency(pRegistration->hkRoot, pRegistration->sczProviderKey, sczVersion, pRegistration->sczDisplayName, pRegistration->sczId, 0); | 600 | hr = DepRegisterDependency(pRegistration->hkRoot, pRegistration->sczProviderKey, pRegistration->pVersion->sczVersion, pRegistration->sczDisplayName, pRegistration->sczId, 0); |
605 | ExitOnFailure(hr, "Failed to register the bundle dependency provider."); | 601 | ExitOnFailure(hr, "Failed to register the bundle dependency provider."); |
606 | 602 | ||
607 | LExit: | 603 | LExit: |
608 | ReleaseStr(sczVersion); | ||
609 | |||
610 | return hr; | 604 | return hr; |
611 | } | 605 | } |
612 | 606 | ||