aboutsummaryrefslogtreecommitdiff
path: root/src/engine/msuengine.cpp
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2021-02-07 18:54:54 -0600
committerSean Hall <r.sean.hall@gmail.com>2021-02-07 18:59:06 -0600
commit096784ea5114cb5bf99151cc047d69951035d152 (patch)
tree28adaf67c91518395ea72bfe89f835ef89f121b1 /src/engine/msuengine.cpp
parent63cf6f589a35466aa73ff3ec021b5052be733409 (diff)
downloadwix-096784ea5114cb5bf99151cc047d69951035d152.tar.gz
wix-096784ea5114cb5bf99151cc047d69951035d152.tar.bz2
wix-096784ea5114cb5bf99151cc047d69951035d152.zip
Require Vista (Server 2008) SP2 or newer.
#6318
Diffstat (limited to 'src/engine/msuengine.cpp')
-rw-r--r--src/engine/msuengine.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/engine/msuengine.cpp b/src/engine/msuengine.cpp
index b7a503ad..499e1da6 100644
--- a/src/engine/msuengine.cpp
+++ b/src/engine/msuengine.cpp
@@ -90,14 +90,10 @@ extern "C" HRESULT MsuEnginePlanCalculatePackage(
90 BOOTSTRAPPER_ACTION_STATE execute = BOOTSTRAPPER_ACTION_STATE_NONE; 90 BOOTSTRAPPER_ACTION_STATE execute = BOOTSTRAPPER_ACTION_STATE_NONE;
91 BOOTSTRAPPER_ACTION_STATE rollback = BOOTSTRAPPER_ACTION_STATE_NONE; 91 BOOTSTRAPPER_ACTION_STATE rollback = BOOTSTRAPPER_ACTION_STATE_NONE;
92 BOOL fBARequestedCache = FALSE; 92 BOOL fBARequestedCache = FALSE;
93
94 BOOL fAllowUninstall = FALSE; 93 BOOL fAllowUninstall = FALSE;
95 OS_VERSION osVersion = OS_VERSION_UNKNOWN;
96 DWORD dwServicePack = 0;
97 94
98 // We can only uninstall MSU packages if they have a KB and we are on Win7 or newer. 95 // We can only uninstall MSU packages if they have a KB and we are on Win7 or newer.
99 OsGetVersion(&osVersion, &dwServicePack); 96 fAllowUninstall = pPackage->Msu.sczKB && *pPackage->Msu.sczKB && ::IsWindows7OrGreater();
100 fAllowUninstall = (pPackage->Msu.sczKB && *pPackage->Msu.sczKB) && OS_VERSION_WIN7 <= osVersion;
101 97
102 // execute action 98 // execute action
103 switch (pPackage->currentState) 99 switch (pPackage->currentState)