WIXFEAT:3933 - Make WixBundleManufacturer variable writable #226

Merged
merged 2 commits into from Apr 13, 2015

Projects

None yet

3 participants

@rseanhall
Member

No description provided.

@barnson barnson commented on the diff Mar 30, 2015
src/burn/engine/registration.cpp
}
// Publisher: provided by UI
- if (pRegistration->sczPublisher)
- {
- hr = RegWriteString(hkRegistration, REGISTRY_BUNDLE_PUBLISHER, pRegistration->sczPublisher);
- ExitOnFailure1(hr, "Failed to write %ls value.", REGISTRY_BUNDLE_PUBLISHER);
- }
+ hr = GetBundleManufacturer(pRegistration, pVariables, &sczPublisher);
+ hr = RegWriteString(hkRegistration, REGISTRY_BUNDLE_PUBLISHER, SUCCEEDED(hr) ? sczPublisher : pRegistration->sczPublisher);
@barnson
barnson Mar 30, 2015 Member

Any reason to skip normal ExitOnFailure handling? If GetBundleManufacturer, it's probably catastrophic anyway...

@rseanhall
rseanhall Mar 30, 2015 Member

Just handling it like GetBundleName above.

@barnson
barnson Mar 30, 2015 Member

If only I had post-commit telepathy to know why that was done that way...

@robmen
robmen Apr 7, 2015 Member

Avoid non fatal error, I think.

@barnson barnson merged commit 4a50738 into wixtoolset:develop Apr 13, 2015
@wixbot wixbot referenced this pull request in wixtoolset/issues Dec 20, 2015
Closed

Make WixBundleManufacturer variable writeable #3933

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment