diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2021-02-07 18:54:54 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2021-02-07 18:59:06 -0600 |
| commit | 096784ea5114cb5bf99151cc047d69951035d152 (patch) | |
| tree | 28adaf67c91518395ea72bfe89f835ef89f121b1 /src/engine/registration.cpp | |
| parent | 63cf6f589a35466aa73ff3ec021b5052be733409 (diff) | |
| download | wix-096784ea5114cb5bf99151cc047d69951035d152.tar.gz wix-096784ea5114cb5bf99151cc047d69951035d152.tar.bz2 wix-096784ea5114cb5bf99151cc047d69951035d152.zip | |
Require Vista (Server 2008) SP2 or newer.
#6318
Diffstat (limited to 'src/engine/registration.cpp')
| -rw-r--r-- | src/engine/registration.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/engine/registration.cpp b/src/engine/registration.cpp index d3732e74..a2ed2a0d 100644 --- a/src/engine/registration.cpp +++ b/src/engine/registration.cpp | |||
| @@ -1178,20 +1178,9 @@ static HRESULT UpdateResumeMode( | |||
| 1178 | HKEY hkRun = NULL; | 1178 | HKEY hkRun = NULL; |
| 1179 | LPWSTR sczResumeCommandLine = NULL; | 1179 | LPWSTR sczResumeCommandLine = NULL; |
| 1180 | LPCWSTR sczResumeKey = REGISTRY_RUN_ONCE_KEY; | 1180 | LPCWSTR sczResumeKey = REGISTRY_RUN_ONCE_KEY; |
| 1181 | OS_VERSION osv = OS_VERSION_UNKNOWN; | ||
| 1182 | DWORD dwServicePack = 0; | ||
| 1183 | 1181 | ||
| 1184 | LogId(REPORT_STANDARD, MSG_SESSION_UPDATE, pRegistration->sczRegistrationKey, LoggingResumeModeToString(resumeMode), LoggingBoolToString(fRestartInitiated), LoggingBoolToString(pRegistration->fDisableResume)); | 1182 | LogId(REPORT_STANDARD, MSG_SESSION_UPDATE, pRegistration->sczRegistrationKey, LoggingResumeModeToString(resumeMode), LoggingBoolToString(fRestartInitiated), LoggingBoolToString(pRegistration->fDisableResume)); |
| 1185 | 1183 | ||
| 1186 | // On Windows XP and Server 2003, write the resume information to the Run key | ||
| 1187 | // instead of RunOnce. That avoids the problem that driver installation might | ||
| 1188 | // trigger RunOnce commands to be executed before the reboot. | ||
| 1189 | OsGetVersion(&osv, &dwServicePack); | ||
| 1190 | if (osv < OS_VERSION_VISTA) | ||
| 1191 | { | ||
| 1192 | sczResumeKey = REGISTRY_RUN_KEY; | ||
| 1193 | } | ||
| 1194 | |||
| 1195 | // write resume information | 1184 | // write resume information |
| 1196 | if (hkRegistration) | 1185 | if (hkRegistration) |
| 1197 | { | 1186 | { |
