moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-08-13 17:03:50 -04:00
Code Issues Releases Wiki Activity

system_win32: fix version checking

Browse Source 
In the current version, VERSION_GREATER_THAN_EQUAL 6.3 will return false
when run on windows 10.0. This patch addresses that error.

Closes https://github.com/curl/curl/pull/2792
This commit is contained in:
djelinski 2018-07-25 14:01:55 +02:00 committed by Marcel Raad
parent 6f5ef24f06
commit d0d48b4276
No known key found for this signature in database
GPG Key ID: 07ADACB610D796DA
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/system_win32.c
View File

@ -134,8 +134,9 @@ bool Curl_verify_windows_version(const unsigned int majorVersion,
break;
case VERSION_LESS_THAN_EQUAL:
if(osver.dwMajorVersion <= majorVersion &&
osver.dwMinorVersion <= minorVersion)
if(osver.dwMajorVersion < majorVersion ||
(osver.dwMajorVersion == majorVersion &&
osver.dwMinorVersion <= minorVersion))
matched = TRUE;
break;
@ -146,8 +147,9 @@ bool Curl_verify_windows_version(const unsigned int majorVersion,
break;
case VERSION_GREATER_THAN_EQUAL:
if(osver.dwMajorVersion >= majorVersion &&
osver.dwMinorVersion >= minorVersion)
if(osver.dwMajorVersion > majorVersion ||
(osver.dwMajorVersion == majorVersion &&
osver.dwMinorVersion >= minorVersion))
matched = TRUE;
break;