diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-05-19 11:42:22 -0500 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-05-19 12:15:13 -0500 |
| commit | f7ac7fe6cc4d7f24c893a81f3e6823b0bba0781b (patch) | |
| tree | 2e0236b35e48d595a534165bf77e8701c61e9a7f /src/burn | |
| parent | e295e2aa3c04f14705e38d149f73be88431034b9 (diff) | |
| download | wix-f7ac7fe6cc4d7f24c893a81f3e6823b0bba0781b.tar.gz wix-f7ac7fe6cc4d7f24c893a81f3e6823b0bba0781b.tar.bz2 wix-f7ac7fe6cc4d7f24c893a81f3e6823b0bba0781b.zip | |
Make IgnoreRollbackError set HRESULT to S_OK.
Diffstat (limited to 'src/burn')
| -rw-r--r-- | src/burn/engine/apply.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/burn/engine/apply.cpp b/src/burn/engine/apply.cpp index c32f4c84..a99a3987 100644 --- a/src/burn/engine/apply.cpp +++ b/src/burn/engine/apply.cpp | |||
| @@ -4,9 +4,9 @@ | |||
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | #ifdef DEBUG | 6 | #ifdef DEBUG |
| 7 | #define IgnoreRollbackError(x, f, ...) if (FAILED(x)) { TraceError(x, f, __VA_ARGS__); } | 7 | #define IgnoreRollbackError(x, f, ...) if (FAILED(x)) { TraceError(x, f, __VA_ARGS__); }; x = S_OK |
| 8 | #else | 8 | #else |
| 9 | #define IgnoreRollbackError(x, f, ...) | 9 | #define IgnoreRollbackError(x, f, ...) x = S_OK |
| 10 | #endif | 10 | #endif |
| 11 | 11 | ||
| 12 | const DWORD BURN_CACHE_MAX_RECOMMENDED_VERIFY_TRYAGAIN_ATTEMPTS = 2; | 12 | const DWORD BURN_CACHE_MAX_RECOMMENDED_VERIFY_TRYAGAIN_ATTEMPTS = 2; |