From e09a129ee276457d02d19a6444657cf3a2c73905 Mon Sep 17 00:00:00 2001
From: Sean Hall <r.sean.hall@gmail.com>
Date: Fri, 16 Apr 2021 10:44:11 -0500
Subject: UX payloads are never external.
---
src/engine/apply.cpp | 2 +-
src/engine/cache.cpp | 16 ----------------
src/engine/cache.h | 1 -
src/engine/elevation.cpp | 6 ++----
src/engine/registration.cpp | 3 +--
src/engine/registration.h | 1 -
src/test/BurnUnitTest/RegistrationTest.cpp | 14 +++++++-------
7 files changed, 11 insertions(+), 32 deletions(-)
diff --git a/src/engine/apply.cpp b/src/engine/apply.cpp
index 6d1743e2..5826f513 100644
--- a/src/engine/apply.cpp
+++ b/src/engine/apply.cpp
@@ -388,7 +388,7 @@ extern "C" HRESULT ApplyRegister(
}
else
{
- hr = RegistrationSessionBegin(sczEngineWorkingPath, &pEngineState->registration, &pEngineState->variables, &pEngineState->userExperience, pEngineState->plan.dwRegistrationOperations, pEngineState->plan.dependencyRegistrationAction, pEngineState->plan.qwEstimatedSize);
+ hr = RegistrationSessionBegin(sczEngineWorkingPath, &pEngineState->registration, &pEngineState->variables, pEngineState->plan.dwRegistrationOperations, pEngineState->plan.dependencyRegistrationAction, pEngineState->plan.qwEstimatedSize);
ExitOnFailure(hr, "Failed to begin registration session.");
}
}
diff --git a/src/engine/cache.cpp b/src/engine/cache.cpp
index 84b7f131..2299d26d 100644
--- a/src/engine/cache.cpp
+++ b/src/engine/cache.cpp
@@ -776,7 +776,6 @@ extern "C" HRESULT CacheCompleteBundle(
__in BOOL fPerMachine,
__in_z LPCWSTR wzExecutableName,
__in_z LPCWSTR wzBundleId,
- __in BURN_PAYLOADS* pUxPayloads,
__in_z LPCWSTR wzSourceBundlePath
#ifdef DEBUG
, __in_z LPCWSTR wzExecutablePath
@@ -824,21 +823,6 @@ extern "C" HRESULT CacheCompleteBundle(
hr = PathGetDirectory(wzSourceBundlePath, &sczSourceDirectory);
ExitOnFailure(hr, "Failed to get directory from engine working path: %ls", wzSourceBundlePath);
- // Cache external UX payloads to completed path.
- for (DWORD i = 0; i < pUxPayloads->cPayloads; ++i)
- {
- BURN_PAYLOAD* pPayload = &pUxPayloads->rgPayloads[i];
-
- if (BURN_PAYLOAD_PACKAGING_EXTERNAL == pPayload->packaging)
- {
- hr = PathConcat(sczSourceDirectory, pPayload->sczSourcePath, &sczPayloadSourcePath);
- ExitOnFailure(hr, "Failed to build payload source path.");
-
- hr = CacheCompletePayload(fPerMachine, pPayload, wzBundleId, sczPayloadSourcePath, FALSE);
- ExitOnFailure(hr, "Failed to complete the cache of payload: %ls", pPayload->sczKey);
- }
- }
-
LExit:
ReleaseStr(sczPayloadSourcePath);
ReleaseStr(sczSourceDirectory);
diff --git a/src/engine/cache.h b/src/engine/cache.h
index eb964f58..cf062a85 100644
--- a/src/engine/cache.h
+++ b/src/engine/cache.h
@@ -101,7 +101,6 @@ HRESULT CacheCompleteBundle(
__in BOOL fPerMachine,
__in_z LPCWSTR wzExecutableName,
__in_z LPCWSTR wzBundleId,
- __in BURN_PAYLOADS* pUxPayloads,
__in_z LPCWSTR wzSourceBundlePath
#ifdef DEBUG
, __in_z LPCWSTR wzExecutablePath
diff --git a/src/engine/elevation.cpp b/src/engine/elevation.cpp
index 82d5a9b1..d37907cf 100644
--- a/src/engine/elevation.cpp
+++ b/src/engine/elevation.cpp
@@ -143,7 +143,6 @@ static HRESULT OnApplyUninitialize(
static HRESULT OnSessionBegin(
__in BURN_REGISTRATION* pRegistration,
__in BURN_VARIABLES* pVariables,
- __in BURN_USER_EXPERIENCE* pUserExperience,
__in BYTE* pbData,
__in DWORD cbData
);
@@ -1643,7 +1642,7 @@ static HRESULT ProcessElevatedChildMessage(
break;
case BURN_ELEVATION_MESSAGE_TYPE_SESSION_BEGIN:
- hrResult = OnSessionBegin(pContext->pRegistration, pContext->pVariables, pContext->pUserExperience, (BYTE*)pMsg->pvData, pMsg->cbData);
+ hrResult = OnSessionBegin(pContext->pRegistration, pContext->pVariables, (BYTE*)pMsg->pvData, pMsg->cbData);
break;
case BURN_ELEVATION_MESSAGE_TYPE_SESSION_RESUME:
@@ -1895,7 +1894,6 @@ static HRESULT OnApplyUninitialize(
static HRESULT OnSessionBegin(
__in BURN_REGISTRATION* pRegistration,
__in BURN_VARIABLES* pVariables,
- __in BURN_USER_EXPERIENCE* pUserExperience,
__in BYTE* pbData,
__in DWORD cbData
)
@@ -1930,7 +1928,7 @@ static HRESULT OnSessionBegin(
ExitOnFailure(hr, "Failed to read variables.");
// Begin session in per-machine process.
- hr = RegistrationSessionBegin(sczEngineWorkingPath, pRegistration, pVariables, pUserExperience, dwRegistrationOperations, (BURN_DEPENDENCY_REGISTRATION_ACTION)dwDependencyRegistrationAction, qwEstimatedSize);
+ hr = RegistrationSessionBegin(sczEngineWorkingPath, pRegistration, pVariables, dwRegistrationOperations, (BURN_DEPENDENCY_REGISTRATION_ACTION)dwDependencyRegistrationAction, qwEstimatedSize);
ExitOnFailure(hr, "Failed to begin registration session.");
LExit:
diff --git a/src/engine/registration.cpp b/src/engine/registration.cpp
index 7435f292..19da543c 100644
--- a/src/engine/registration.cpp
+++ b/src/engine/registration.cpp
@@ -593,7 +593,6 @@ extern "C" HRESULT RegistrationSessionBegin(
__in_z LPCWSTR wzEngineWorkingPath,
__in BURN_REGISTRATION* pRegistration,
__in BURN_VARIABLES* pVariables,
- __in BURN_USER_EXPERIENCE* pUserExperience,
__in DWORD dwRegistrationOptions,
__in BURN_DEPENDENCY_REGISTRATION_ACTION dependencyRegistrationAction,
__in DWORD64 qwEstimatedSize
@@ -609,7 +608,7 @@ extern "C" HRESULT RegistrationSessionBegin(
// Cache bundle executable.
if (dwRegistrationOptions & BURN_REGISTRATION_ACTION_OPERATIONS_CACHE_BUNDLE)
{
- hr = CacheCompleteBundle(pRegistration->fPerMachine, pRegistration->sczExecutableName, pRegistration->sczId, &pUserExperience->payloads, wzEngineWorkingPath
+ hr = CacheCompleteBundle(pRegistration->fPerMachine, pRegistration->sczExecutableName, pRegistration->sczId, wzEngineWorkingPath
#ifdef DEBUG
, pRegistration->sczCacheExecutablePath
#endif
diff --git a/src/engine/registration.h b/src/engine/registration.h
index af1b42e4..6d8a6d2a 100644
--- a/src/engine/registration.h
+++ b/src/engine/registration.h
@@ -188,7 +188,6 @@ HRESULT RegistrationSessionBegin(
__in_z LPCWSTR wzEngineWorkingPath,
__in BURN_REGISTRATION* pRegistration,
__in BURN_VARIABLES* pVariables,
- __in BURN_USER_EXPERIENCE* pUserExperience,
__in DWORD dwRegistrationOptions,
__in BURN_DEPENDENCY_REGISTRATION_ACTION dependencyRegistrationAction,
__in DWORD64 qwEstimatedSize
diff --git a/src/test/BurnUnitTest/RegistrationTest.cpp b/src/test/BurnUnitTest/RegistrationTest.cpp
index 2cb66c3f..7b126f61 100644
--- a/src/test/BurnUnitTest/RegistrationTest.cpp
+++ b/src/test/BurnUnitTest/RegistrationTest.cpp
@@ -112,7 +112,7 @@ namespace Bootstrapper
TestThrowOnFailure(hr, L"Failed to get current process path.");
// write registration
- hr = RegistrationSessionBegin(sczCurrentProcess, ®istration, &variables, &userExperience, BURN_REGISTRATION_ACTION_OPERATIONS_CACHE_BUNDLE | BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_REGISTRATION, BURN_DEPENDENCY_REGISTRATION_ACTION_REGISTER, 0);
+ hr = RegistrationSessionBegin(sczCurrentProcess, ®istration, &variables, BURN_REGISTRATION_ACTION_OPERATIONS_CACHE_BUNDLE | BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_REGISTRATION, BURN_DEPENDENCY_REGISTRATION_ACTION_REGISTER, 0);
TestThrowOnFailure(hr, L"Failed to register bundle.");
// verify that registration was created
@@ -205,7 +205,7 @@ namespace Bootstrapper
//
// write registration
- hr = RegistrationSessionBegin(sczCurrentProcess, ®istration, &variables, &userExperience, BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_REGISTRATION, BURN_DEPENDENCY_REGISTRATION_ACTION_REGISTER, 0);
+ hr = RegistrationSessionBegin(sczCurrentProcess, ®istration, &variables, BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_REGISTRATION, BURN_DEPENDENCY_REGISTRATION_ACTION_REGISTER, 0);
TestThrowOnFailure(hr, L"Failed to register bundle.");
// verify that registration was created
@@ -226,7 +226,7 @@ namespace Bootstrapper
//
// write registration
- hr = RegistrationSessionBegin(sczCurrentProcess, ®istration, &variables, &userExperience, BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_REGISTRATION, BURN_DEPENDENCY_REGISTRATION_ACTION_UNREGISTER, 0);
+ hr = RegistrationSessionBegin(sczCurrentProcess, ®istration, &variables, BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_REGISTRATION, BURN_DEPENDENCY_REGISTRATION_ACTION_UNREGISTER, 0);
TestThrowOnFailure(hr, L"Failed to register bundle.");
// verify that registration was updated
@@ -316,7 +316,7 @@ namespace Bootstrapper
//
// write registration
- hr = RegistrationSessionBegin(sczCurrentProcess, ®istration, &variables, &userExperience, BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_REGISTRATION, BURN_DEPENDENCY_REGISTRATION_ACTION_REGISTER, 0);
+ hr = RegistrationSessionBegin(sczCurrentProcess, ®istration, &variables, BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_REGISTRATION, BURN_DEPENDENCY_REGISTRATION_ACTION_REGISTER, 0);
TestThrowOnFailure(hr, L"Failed to register bundle.");
// verify that registration was created
@@ -427,7 +427,7 @@ namespace Bootstrapper
//
// write registration
- hr = RegistrationSessionBegin(sczCurrentProcess, ®istration, &variables, &userExperience, BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_REGISTRATION, BURN_DEPENDENCY_REGISTRATION_ACTION_REGISTER, 0);
+ hr = RegistrationSessionBegin(sczCurrentProcess, ®istration, &variables, BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_REGISTRATION, BURN_DEPENDENCY_REGISTRATION_ACTION_REGISTER, 0);
TestThrowOnFailure(hr, L"Failed to register bundle.");
// verify that registration was created
@@ -460,7 +460,7 @@ namespace Bootstrapper
//
// write registration
- hr = RegistrationSessionBegin(sczCurrentProcess, ®istration, &variables, &userExperience, BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_REGISTRATION, BURN_DEPENDENCY_REGISTRATION_ACTION_UNREGISTER, 0);
+ hr = RegistrationSessionBegin(sczCurrentProcess, ®istration, &variables, BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_REGISTRATION, BURN_DEPENDENCY_REGISTRATION_ACTION_UNREGISTER, 0);
TestThrowOnFailure(hr, L"Failed to register bundle.");
// verify that registration was updated
@@ -560,7 +560,7 @@ namespace Bootstrapper
Assert::Equal((int)BOOTSTRAPPER_RESUME_TYPE_NONE, (int)resumeType);
// begin session
- hr = RegistrationSessionBegin(sczCurrentProcess, ®istration, &variables, &userExperience, BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_REGISTRATION, BURN_DEPENDENCY_REGISTRATION_ACTION_REGISTER, 0);
+ hr = RegistrationSessionBegin(sczCurrentProcess, ®istration, &variables, BURN_REGISTRATION_ACTION_OPERATIONS_WRITE_REGISTRATION, BURN_DEPENDENCY_REGISTRATION_ACTION_REGISTER, 0);
TestThrowOnFailure(hr, L"Failed to register bundle.");
hr = RegistrationSaveState(®istration, rgbData, sizeof(rgbData));
--
cgit v1.2.3-55-g6feb