aboutsummaryrefslogtreecommitdiff
path: root/src/burn/engine/approvedexe.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2022-06-09 15:30:48 -0500
committerSean Hall <r.sean.hall@gmail.com>2022-06-13 09:28:49 -0500
commit6f6e4ced9f398ff37a44b91fdba62479cde29d06 (patch)
tree8cef5b123df7ff11cdc9be79d2e981d9d567d65d /src/burn/engine/approvedexe.cpp
parent68ec803fc7f48bb0e0463dc45f6ce40e1f07dbf5 (diff)
downloadwix-6f6e4ced9f398ff37a44b91fdba62479cde29d06.tar.gz
wix-6f6e4ced9f398ff37a44b91fdba62479cde29d06.tar.bz2
wix-6f6e4ced9f398ff37a44b91fdba62479cde29d06.zip
Implement ArpEntry flavored ExePackage.
6772
Diffstat (limited to 'src/burn/engine/approvedexe.cpp')
-rw-r--r--src/burn/engine/approvedexe.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/burn/engine/approvedexe.cpp b/src/burn/engine/approvedexe.cpp
index b9efd624..2a96868e 100644
--- a/src/burn/engine/approvedexe.cpp
+++ b/src/burn/engine/approvedexe.cpp
@@ -213,7 +213,7 @@ LExit:
213extern "C" HRESULT ApprovedExesVerifySecureLocation( 213extern "C" HRESULT ApprovedExesVerifySecureLocation(
214 __in BURN_CACHE* pCache, 214 __in BURN_CACHE* pCache,
215 __in BURN_VARIABLES* pVariables, 215 __in BURN_VARIABLES* pVariables,
216 __in BURN_LAUNCH_APPROVED_EXE* pLaunchApprovedExe 216 __in LPCWSTR wzExecutablePath
217 ) 217 )
218{ 218{
219 HRESULT hr = S_OK; 219 HRESULT hr = S_OK;
@@ -232,7 +232,7 @@ extern "C" HRESULT ApprovedExesVerifySecureLocation(
232 hr = VariableGetString(pVariables, wzSecureFolderVariable, &scz); 232 hr = VariableGetString(pVariables, wzSecureFolderVariable, &scz);
233 if (SUCCEEDED(hr)) 233 if (SUCCEEDED(hr))
234 { 234 {
235 hr = PathDirectoryContainsPath(scz, pLaunchApprovedExe->sczExecutablePath); 235 hr = PathDirectoryContainsPath(scz, wzExecutablePath);
236 if (S_OK == hr) 236 if (S_OK == hr)
237 { 237 {
238 ExitFunction(); 238 ExitFunction();
@@ -252,14 +252,14 @@ extern "C" HRESULT ApprovedExesVerifySecureLocation(
252 // If the package cache is redirected, hr is S_FALSE. 252 // If the package cache is redirected, hr is S_FALSE.
253 if (S_FALSE == hr) 253 if (S_FALSE == hr)
254 { 254 {
255 hr = PathDirectoryContainsPath(sczSecondary, pLaunchApprovedExe->sczExecutablePath); 255 hr = PathDirectoryContainsPath(sczSecondary, wzExecutablePath);
256 if (S_OK == hr) 256 if (S_OK == hr)
257 { 257 {
258 ExitFunction(); 258 ExitFunction();
259 } 259 }
260 } 260 }
261 261
262 hr = PathDirectoryContainsPath(scz, pLaunchApprovedExe->sczExecutablePath); 262 hr = PathDirectoryContainsPath(scz, wzExecutablePath);
263 if (S_OK == hr) 263 if (S_OK == hr)
264 { 264 {
265 ExitFunction(); 265 ExitFunction();