diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2021-02-22 19:58:44 -0600 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2021-02-22 20:25:06 -0600 |
commit | a98115d996d65834e7c8d593c10d2cfa66096ccd (patch) | |
tree | 11857990bfadee576b4a8d6d8ccc2db04dfafe7b /src/engine/package.h | |
parent | 4f4c85ed66f1b2dfb1bec76d54d7b50c637d5bfa (diff) | |
download | wix-a98115d996d65834e7c8d593c10d2cfa66096ccd.tar.gz wix-a98115d996d65834e7c8d593c10d2cfa66096ccd.tar.bz2 wix-a98115d996d65834e7c8d593c10d2cfa66096ccd.zip |
Fix patch registration states during plan and apply.
Add logging for slipstreamed patches.
#6297
Diffstat (limited to 'src/engine/package.h')
-rw-r--r-- | src/engine/package.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/engine/package.h b/src/engine/package.h index 283afa57..3a95852e 100644 --- a/src/engine/package.h +++ b/src/engine/package.h | |||
@@ -83,8 +83,8 @@ enum BOOTSTRAPPER_FEATURE_ACTION | |||
83 | enum BURN_PACKAGE_REGISTRATION_STATE | 83 | enum BURN_PACKAGE_REGISTRATION_STATE |
84 | { | 84 | { |
85 | BURN_PACKAGE_REGISTRATION_STATE_UNKNOWN, | 85 | BURN_PACKAGE_REGISTRATION_STATE_UNKNOWN, |
86 | BURN_PACKAGE_REGISTRATION_STATE_IGNORED, | ||
87 | BURN_PACKAGE_REGISTRATION_STATE_ABSENT, | 86 | BURN_PACKAGE_REGISTRATION_STATE_ABSENT, |
87 | BURN_PACKAGE_REGISTRATION_STATE_IGNORED, | ||
88 | BURN_PACKAGE_REGISTRATION_STATE_PRESENT, | 88 | BURN_PACKAGE_REGISTRATION_STATE_PRESENT, |
89 | }; | 89 | }; |
90 | 90 | ||
@@ -186,6 +186,9 @@ typedef struct _BURN_SLIPSTREAM_MSP | |||
186 | { | 186 | { |
187 | BURN_PACKAGE* pMspPackage; | 187 | BURN_PACKAGE* pMspPackage; |
188 | DWORD dwMsiChainedPatchIndex; // index into the Msi.rgChainedPatches | 188 | DWORD dwMsiChainedPatchIndex; // index into the Msi.rgChainedPatches |
189 | |||
190 | BOOTSTRAPPER_ACTION_STATE execute; // only valid during Plan. | ||
191 | BOOTSTRAPPER_ACTION_STATE rollback; // only valid during Plan. | ||
189 | } BURN_SLIPSTREAM_MSP; | 192 | } BURN_SLIPSTREAM_MSP; |
190 | 193 | ||
191 | typedef struct _BURN_PACKAGE_PAYLOAD | 194 | typedef struct _BURN_PACKAGE_PAYLOAD |