diff options
| author | Cameron Cawley <ccawley2011@gmail.com> | 2020-07-31 20:39:33 +0100 |
|---|---|---|
| committer | Marcel Raad <Marcel.Raad@teamviewer.com> | 2020-08-02 17:59:52 +0200 |
| commit | 2646be0dc0feba9289405baaf7d51c2fc1ac9b72 (patch) | |
| tree | 1918f32e9f8d99202b0a9d09c4a468320dbf7926 | |
| parent | 790137b0f701fc9dc8e40d903b89be9f1ecadd00 (diff) | |
| download | curl-2646be0dc0feba9289405baaf7d51c2fc1ac9b72.tar.gz | |
tool_doswin: Simplify Windows version detection
Closes https://github.com/curl/curl/pull/5754
| -rw-r--r-- | src/tool_doswin.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/src/tool_doswin.c b/src/tool_doswin.c index 78285a21b..dd8341ae3 100644 --- a/src/tool_doswin.c +++ b/src/tool_doswin.c @@ -707,22 +707,11 @@ bool tool_isVistaOrGreater; CURLcode win32_init(void) { - OSVERSIONINFOEX osvi; - unsigned __int64 mask = 0; - unsigned char op = VER_GREATER_EQUAL; - - memset(&osvi, 0, sizeof(osvi)); - osvi.dwOSVersionInfoSize = sizeof(osvi); - osvi.dwMajorVersion = 6; - VER_SET_CONDITION(mask, VER_MAJORVERSION, op); - VER_SET_CONDITION(mask, VER_MINORVERSION, op); - - if(VerifyVersionInfo(&osvi, (VER_MAJORVERSION | VER_MINORVERSION), mask)) + if(curlx_verify_windows_version(6, 0, PLATFORM_WINNT, + VERSION_GREATER_THAN_EQUAL)) tool_isVistaOrGreater = true; - else if(GetLastError() == ERROR_OLD_WIN_VERSION) - tool_isVistaOrGreater = false; else - return CURLE_FAILED_INIT; + tool_isVistaOrGreater = false; QueryPerformanceFrequency(&tool_freq); return CURLE_OK; |