aboutsummaryrefslogtreecommitdiff
path: root/src/engine/apply.cpp
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2021-02-09 21:35:37 -0500
committerBob Arnson <bob@firegiant.com>2021-02-09 21:50:07 -0500
commit422d6e48e2f9bdcec62f9a147cb8c2f34bf73a5f (patch)
treeca44636fb3edeb99f82faae46723ceba789db46d /src/engine/apply.cpp
parent096784ea5114cb5bf99151cc047d69951035d152 (diff)
downloadwix-422d6e48e2f9bdcec62f9a147cb8c2f34bf73a5f.tar.gz
wix-422d6e48e2f9bdcec62f9a147cb8c2f34bf73a5f.tar.bz2
wix-422d6e48e2f9bdcec62f9a147cb8c2f34bf73a5f.zip
Remove BITS support. Update DUtil dependency.
Diffstat (limited to 'src/engine/apply.cpp')
-rw-r--r--src/engine/apply.cpp25
1 files changed, 6 insertions, 19 deletions
diff --git a/src/engine/apply.cpp b/src/engine/apply.cpp
index 7c47ba75..55141ef9 100644
--- a/src/engine/apply.cpp
+++ b/src/engine/apply.cpp
@@ -1509,26 +1509,13 @@ static HRESULT DownloadPayload(
1509 cacheCallback.pfnCancel = NULL; // TODO: set this 1509 cacheCallback.pfnCancel = NULL; // TODO: set this
1510 cacheCallback.pv = pProgress; 1510 cacheCallback.pv = pProgress;
1511 1511
1512 // If the protocol is specially marked, "bits" let's use that. 1512 authenticationData.pUX = pProgress->pUX;
1513 if (L'b' == pDownloadSource->sczUrl[0] && 1513 authenticationData.wzPackageOrContainerId = wzPackageOrContainerId;
1514 L'i' == pDownloadSource->sczUrl[1] && 1514 authenticationData.wzPayloadId = wzPayloadId;
1515 L't' == pDownloadSource->sczUrl[2] && 1515 authenticationCallback.pv = static_cast<LPVOID>(&authenticationData);
1516 L's' == pDownloadSource->sczUrl[3] && 1516 authenticationCallback.pfnAuthenticate = &AuthenticationRequired;
1517 (L':' == pDownloadSource->sczUrl[4] || (L's' == pDownloadSource->sczUrl[4] && L':' == pDownloadSource->sczUrl[5]))
1518 )
1519 {
1520 hr = BitsDownloadUrl(&cacheCallback, pDownloadSource, wzDestinationPath);
1521 }
1522 else // wininet handles everything else.
1523 {
1524 authenticationData.pUX = pProgress->pUX;
1525 authenticationData.wzPackageOrContainerId = wzPackageOrContainerId;
1526 authenticationData.wzPayloadId = wzPayloadId;
1527 authenticationCallback.pv = static_cast<LPVOID>(&authenticationData);
1528 authenticationCallback.pfnAuthenticate = &AuthenticationRequired;
1529 1517
1530 hr = DownloadUrl(pDownloadSource, qwDownloadSize, wzDestinationPath, &cacheCallback, &authenticationCallback); 1518 hr = DownloadUrl(pDownloadSource, qwDownloadSize, wzDestinationPath, &cacheCallback, &authenticationCallback);
1531 }
1532 ExitOnFailure(hr, "Failed attempt to download URL: '%ls' to: '%ls'", pDownloadSource->sczUrl, wzDestinationPath); 1519 ExitOnFailure(hr, "Failed attempt to download URL: '%ls' to: '%ls'", pDownloadSource->sczUrl, wzDestinationPath);
1533 1520
1534LExit: 1521LExit: