Unverified Commit d0d48b42 authored by Daniel Jelinski's avatar Daniel Jelinski Committed by Marcel Raad
Browse files

system_win32: fix version checking 

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
parent 6f5ef24f

lib/system_win32.c

+6 −4
Original line number Diff line number Diff line
@@ -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;