diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2022-06-03 17:50:50 -0500 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2022-06-07 19:44:36 -0500 |
commit | 68ec803fc7f48bb0e0463dc45f6ce40e1f07dbf5 (patch) | |
tree | b40803c4ba8d5312ed3d95c66778c2bc87cf0de9 /src/libs/dutil/WixToolset.DUtil/inc/pathutil.h | |
parent | 8810aa8908ed7887616d86dd5fb821fcfa92f444 (diff) | |
download | wix-68ec803fc7f48bb0e0463dc45f6ce40e1f07dbf5.tar.gz wix-68ec803fc7f48bb0e0463dc45f6ce40e1f07dbf5.tar.bz2 wix-68ec803fc7f48bb0e0463dc45f6ce40e1f07dbf5.zip |
Make sure base paths are fully qualified in Burn.
Diffstat (limited to 'src/libs/dutil/WixToolset.DUtil/inc/pathutil.h')
-rw-r--r-- | src/libs/dutil/WixToolset.DUtil/inc/pathutil.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h index f36e6ebc..971ef887 100644 --- a/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h +++ b/src/libs/dutil/WixToolset.DUtil/inc/pathutil.h | |||
@@ -299,6 +299,16 @@ DAPI_(HRESULT) PathConcatRelativeToBase( | |||
299 | ); | 299 | ); |
300 | 300 | ||
301 | /******************************************************************* | 301 | /******************************************************************* |
302 | PathConcatRelativeToFullyQualifiedBase - ensures the base path is | ||
303 | fully qualified and then calls PathConcatRelativeToBase. | ||
304 | *******************************************************************/ | ||
305 | DAPI_(HRESULT) PathConcatRelativeToFullyQualifiedBase( | ||
306 | __in LPCWSTR wzBase, | ||
307 | __in_opt LPCWSTR wzRelative, | ||
308 | __deref_out_z LPWSTR* psczCombined | ||
309 | ); | ||
310 | |||
311 | /******************************************************************* | ||
302 | PathCompareCanonicalized - canonicalizes the two paths using PathCanonicalizeForComparison | 312 | PathCompareCanonicalized - canonicalizes the two paths using PathCanonicalizeForComparison |
303 | which does not resolve relative paths into fully qualified paths. | 313 | which does not resolve relative paths into fully qualified paths. |
304 | The strings are then compared using ::CompareStringW(). | 314 | The strings are then compared using ::CompareStringW(). |