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/condition.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/condition.cpp')
| -rw-r--r-- | src/engine/condition.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/engine/condition.cpp b/src/engine/condition.cpp index 06591567..316224db 100644 --- a/src/engine/condition.cpp +++ b/src/engine/condition.cpp | |||
| @@ -187,13 +187,9 @@ extern "C" HRESULT ConditionGlobalCheck( | |||
| 187 | HRESULT hr = S_OK; | 187 | HRESULT hr = S_OK; |
| 188 | BOOL fSuccess = TRUE; | 188 | BOOL fSuccess = TRUE; |
| 189 | HRESULT hrError = HRESULT_FROM_WIN32(ERROR_OLD_WIN_VERSION); | 189 | HRESULT hrError = HRESULT_FROM_WIN32(ERROR_OLD_WIN_VERSION); |
| 190 | OS_VERSION osv = OS_VERSION_UNKNOWN; | ||
| 191 | DWORD dwServicePack = 0; | ||
| 192 | 190 | ||
| 193 | OsGetVersion(&osv, &dwServicePack); | 191 | // Only run on Windows Vista SP2 or newer, or Windows Server 2008 SP2 or newer. |
| 194 | 192 | if (!::IsWindowsVistaSP2OrGreater()) | |
| 195 | // Always error on Windows 2000 or lower | ||
| 196 | if (OS_VERSION_WIN2000 >= osv) | ||
| 197 | { | 193 | { |
| 198 | fSuccess = FALSE; | 194 | fSuccess = FALSE; |
| 199 | } | 195 | } |
