Update OSVersion.cpp
This commit is contained in:
parent
e2a1db533f
commit
ec6db575fa
1 changed files with 13 additions and 9 deletions
|
@ -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,9 +124,13 @@ bool DoesVersionMatchWindows(WindowsReleaseInfo release) {
|
|||
}
|
||||
}
|
||||
}
|
||||
else {
|
||||
return DoesVersionMatchWindows(release.major, release.minor, release.spMajor, release.spMinor, release.greater);
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
bool IsVistaOrHigher() {
|
||||
// Vista is 6.0
|
||||
return DoesVersionMatchWindows(6, 0, 0, 0, true);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue