Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update OSVersion.cpp

Browse source 
- Re-adding `GetVersionFromKernel32` to the original function as it's used in settings (will find better way later to merge two functions in one).
- UWP should always return true when `greater` is true.
This commit is contained in:
Bashar Astifan 2023-08-15 23:42:37 +04:00
parent 6522a490e0
commit b546ee15e4
1 changed files with 14 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Common/OSVersion.cpp
View file

@ -48,6 +48,17 @@ bool GetVersionFromKernel32(uint32_t &major, uint32_t &minor, uint32_t &build) {
bool DoesVersionMatchWindows(uint32_t major, uint32_t minor, uint32_t spMajor, uint32_t spMinor, bool greater) {
#if !PPSSPP_PLATFORM(UWP)
if (spMajor == 0 && spMinor == 0) {
// "Applications not manifested for Windows 10 will return the Windows 8 OS version value (6.2)."
// Try to use kernel32.dll instead, for Windows 10+. Doesn't do SP versions.
uint32_t actualMajor, actualMinor, actualBuild;
if (GetVersionFromKernel32(actualMajor, actualMinor, actualBuild)) {
if (greater)
return actualMajor > major || (major == actualMajor && actualMinor >= minor);
return major == actualMajor && minor == actualMinor;
}
}
uint64_t conditionMask = 0;
OSVERSIONINFOEX osvi;
ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX));
@ -75,6 +86,9 @@ bool DoesVersionMatchWindows(uint32_t major, uint32_t minor, uint32_t spMajor, u
return VerifyVersionInfo(&osvi, typeMask, conditionMask) != FALSE;
#else
if (greater) {
return true;
}
return false;
#endif
}