From ec6db575fab24de7da25498ab84b0c2f86b5dfb4 Mon Sep 17 00:00:00 2001 From: Bashar Astifan Date: Thu, 17 Aug 2023 18:45:58 +0400 Subject: [PATCH] Update OSVersion.cpp --- Common/OSVersion.cpp | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/Common/OSVersion.cpp b/Common/OSVersion.cpp index ba35239cb7..f50c171094 100644 --- a/Common/OSVersion.cpp +++ b/Common/OSVersion.cpp @@ -13,11 +13,11 @@ struct WindowsReleaseInfo { - int major; - int minor; - int spMajor; - int spMinor; - int build; + uint32_t major; + uint32_t minor; + uint32_t spMajor; + uint32_t spMinor; + uint32_t build; bool greater = false; }; @@ -96,9 +96,9 @@ bool DoesVersionMatchWindows(uint32_t major, uint32_t minor, uint32_t spMajor, u bool DoesVersionMatchWindows(WindowsReleaseInfo release) { if (release.spMajor == 0 && release.spMinor == 0) { // Compare Info - int major = release.major; - int minor = release.minor; - int build = release.build; + uint32_t major = release.major; + uint32_t minor = release.minor; + uint32_t build = release.build; bool greater = release.greater; OSVERSIONINFOEX osvi; @@ -124,7 +124,11 @@ bool DoesVersionMatchWindows(WindowsReleaseInfo release) { } } } - return DoesVersionMatchWindows(release.major, release.minor, release.spMajor, release.spMinor, release.greater); + else { + return DoesVersionMatchWindows(release.major, release.minor, release.spMajor, release.spMinor, release.greater); + } + + return false; } bool IsVistaOrHigher() {