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/engine.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/engine.cpp')
-rw-r--r-- | src/engine/engine.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/engine/engine.cpp b/src/engine/engine.cpp index 7e6e2922..458386d4 100644 --- a/src/engine/engine.cpp +++ b/src/engine/engine.cpp | |||
@@ -95,7 +95,7 @@ extern "C" HRESULT EngineRun( | |||
95 | BOOL fWiuInitialized = FALSE; | 95 | BOOL fWiuInitialized = FALSE; |
96 | BOOL fXmlInitialized = FALSE; | 96 | BOOL fXmlInitialized = FALSE; |
97 | SYSTEM_INFO si = { }; | 97 | SYSTEM_INFO si = { }; |
98 | OSVERSIONINFOEXW ovix = { }; | 98 | RTL_OSVERSIONINFOEXW ovix = { }; |
99 | LPWSTR sczExePath = NULL; | 99 | LPWSTR sczExePath = NULL; |
100 | BOOL fRunNormal = FALSE; | 100 | BOOL fRunNormal = FALSE; |
101 | BOOL fRestart = FALSE; | 101 | BOOL fRestart = FALSE; |
@@ -150,12 +150,8 @@ extern "C" HRESULT EngineRun( | |||
150 | ExitOnFailure(hr, "Failed to initialize XML util."); | 150 | ExitOnFailure(hr, "Failed to initialize XML util."); |
151 | fXmlInitialized = TRUE; | 151 | fXmlInitialized = TRUE; |
152 | 152 | ||
153 | ovix.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW); | 153 | hr = OsRtlGetVersion(&ovix); |
154 | #pragma warning(suppress: 4996) | 154 | ExitOnFailure(hr, "Failed to get OS info."); |
155 | if (!::GetVersionExW((LPOSVERSIONINFOW)&ovix)) | ||
156 | { | ||
157 | ExitWithLastError(hr, "Failed to get OS info."); | ||
158 | } | ||
159 | 155 | ||
160 | #if defined(_M_ARM64) | 156 | #if defined(_M_ARM64) |
161 | LPCSTR szBurnPlatform = "ARM64"; | 157 | LPCSTR szBurnPlatform = "ARM64"; |