diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-08-03 18:09:36 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-08-04 10:03:57 -0500 |
commit | 4d0798ec6311b48bfe6ee3cb4dd41379b4653528 (patch) | |
tree | 87e3a02f540a206403c5e61b242dabbe87c8363a /src/burn/engine/cache.h | |
parent | cdba28de1ee229369b254c62bc58cf2f001899a3 (diff) | |
download | wix-4d0798ec6311b48bfe6ee3cb4dd41379b4653528.tar.gz wix-4d0798ec6311b48bfe6ee3cb4dd41379b4653528.tar.bz2 wix-4d0798ec6311b48bfe6ee3cb4dd41379b4653528.zip |
Always use user's temp directory as basis for acquisition folder.
Fixes #5830
Diffstat (limited to 'src/burn/engine/cache.h')
-rw-r--r-- | src/burn/engine/cache.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/burn/engine/cache.h b/src/burn/engine/cache.h index 69d82639..8b038b99 100644 --- a/src/burn/engine/cache.h +++ b/src/burn/engine/cache.h | |||
@@ -39,7 +39,8 @@ typedef struct _BURN_CACHE | |||
39 | BOOL fInitializedCacheSources; | 39 | BOOL fInitializedCacheSources; |
40 | BOOL fRunningFromCache; | 40 | BOOL fRunningFromCache; |
41 | LPWSTR sczSourceProcessFolder; | 41 | LPWSTR sczSourceProcessFolder; |
42 | LPWSTR sczWorkingFolder; | 42 | LPWSTR sczAcquisitionFolder; |
43 | LPWSTR sczBaseWorkingFolder; | ||
43 | } BURN_CACHE; | 44 | } BURN_CACHE; |
44 | 45 | ||
45 | typedef struct _BURN_CACHE_MESSAGE | 46 | typedef struct _BURN_CACHE_MESSAGE |
@@ -80,9 +81,12 @@ HRESULT CacheInitializeSources( | |||
80 | __in BURN_VARIABLES* pVariables, | 81 | __in BURN_VARIABLES* pVariables, |
81 | __in BURN_ENGINE_COMMAND* pInternalCommand | 82 | __in BURN_ENGINE_COMMAND* pInternalCommand |
82 | ); | 83 | ); |
83 | HRESULT CacheEnsureWorkingFolder( | 84 | HRESULT CacheEnsureAcquisitionFolder( |
85 | __in BURN_CACHE* pCache | ||
86 | ); | ||
87 | HRESULT CacheEnsureBaseWorkingFolder( | ||
84 | __in BURN_CACHE* pCache, | 88 | __in BURN_CACHE* pCache, |
85 | __deref_out_z_opt LPWSTR* psczWorkingFolder | 89 | __deref_out_z_opt LPWSTR* psczBaseWorkingFolder |
86 | ); | 90 | ); |
87 | HRESULT CacheCalculateBundleWorkingPath( | 91 | HRESULT CacheCalculateBundleWorkingPath( |
88 | __in BURN_CACHE* pCache, | 92 | __in BURN_CACHE* pCache, |
@@ -228,7 +232,7 @@ HRESULT CacheVerifyPayload( | |||
228 | __in LPPROGRESS_ROUTINE pfnProgress, | 232 | __in LPPROGRESS_ROUTINE pfnProgress, |
229 | __in LPVOID pContext | 233 | __in LPVOID pContext |
230 | ); | 234 | ); |
231 | HRESULT CacheRemoveWorkingFolder( | 235 | HRESULT CacheRemoveBaseWorkingFolder( |
232 | __in BURN_CACHE* pCache | 236 | __in BURN_CACHE* pCache |
233 | ); | 237 | ); |
234 | HRESULT CacheRemoveBundle( | 238 | HRESULT CacheRemoveBundle( |