diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2022-05-26 17:33:15 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2022-05-31 13:20:44 -0500 |
| commit | fb4f8c7108f43d2341ba299424646c4963b21188 (patch) | |
| tree | 7f3c907ac5406d2000056f6bcca41d7ae4d3a925 /src/burn | |
| parent | 0f9931107ecf9e1f6714e6fd2cabc76d2ddb1153 (diff) | |
| download | wix-fb4f8c7108f43d2341ba299424646c4963b21188.tar.gz wix-fb4f8c7108f43d2341ba299424646c4963b21188.tar.bz2 wix-fb4f8c7108f43d2341ba299424646c4963b21188.zip | |
Replace PathIsAbsolute with PathIsRooted and add PathIsFullyQualified.
Diffstat (limited to 'src/burn')
| -rw-r--r-- | src/burn/engine/cache.cpp | 2 | ||||
| -rw-r--r-- | src/burn/engine/logging.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/burn/engine/cache.cpp b/src/burn/engine/cache.cpp index 5d81e1ba..2b7d6ede 100644 --- a/src/burn/engine/cache.cpp +++ b/src/burn/engine/cache.cpp | |||
| @@ -563,7 +563,7 @@ extern "C" HRESULT CacheGetLocalSourcePaths( | |||
| 563 | fPreferSourcePathLocation = !pCache->fRunningFromCache || FAILED(hr); | 563 | fPreferSourcePathLocation = !pCache->fRunningFromCache || FAILED(hr); |
| 564 | fTryLastFolder = SUCCEEDED(hr) && sczLastSourceFolder && *sczLastSourceFolder && CSTR_EQUAL != ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pCache->sczSourceProcessFolder, -1, sczLastSourceFolder, -1); | 564 | fTryLastFolder = SUCCEEDED(hr) && sczLastSourceFolder && *sczLastSourceFolder && CSTR_EQUAL != ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, pCache->sczSourceProcessFolder, -1, sczLastSourceFolder, -1); |
| 565 | fTryRelativePath = CSTR_EQUAL != ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, wzSourcePath, -1, wzRelativePath, -1); | 565 | fTryRelativePath = CSTR_EQUAL != ::CompareStringW(LOCALE_NEUTRAL, NORM_IGNORECASE, wzSourcePath, -1, wzRelativePath, -1); |
| 566 | fSourceIsAbsolute = PathIsAbsolute(wzSourcePath); | 566 | fSourceIsAbsolute = PathIsRooted(wzSourcePath); |
| 567 | 567 | ||
| 568 | // If the source path provided is a full path, try that first. | 568 | // If the source path provided is a full path, try that first. |
| 569 | if (fSourceIsAbsolute) | 569 | if (fSourceIsAbsolute) |
diff --git a/src/burn/engine/logging.cpp b/src/burn/engine/logging.cpp index 1b2bec1f..8e89957b 100644 --- a/src/burn/engine/logging.cpp +++ b/src/burn/engine/logging.cpp | |||
| @@ -140,7 +140,7 @@ extern "C" HRESULT LoggingOpen( | |||
| 140 | LPCWSTR wzPrefix = sczPrefixFormatted; | 140 | LPCWSTR wzPrefix = sczPrefixFormatted; |
| 141 | 141 | ||
| 142 | // Best effort to open default logging. | 142 | // Best effort to open default logging. |
| 143 | if (PathIsAbsolute(sczPrefixFormatted)) | 143 | if (PathIsRooted(sczPrefixFormatted)) |
| 144 | { | 144 | { |
| 145 | hr = PathGetDirectory(sczPrefixFormatted, &sczLoggingBaseFolder); | 145 | hr = PathGetDirectory(sczPrefixFormatted, &sczLoggingBaseFolder); |
| 146 | ExitOnFailure(hr, "Failed to get parent directory from '%ls'.", sczPrefixFormatted); | 146 | ExitOnFailure(hr, "Failed to get parent directory from '%ls'.", sczPrefixFormatted); |