Index: src/shared/Utils.cpp |
=================================================================== |
--- a/src/shared/Utils.cpp |
+++ b/src/shared/Utils.cpp |
@@ -25,27 +25,13 @@ |
return osvi.dwMajorVersion >= 6; |
} |
-bool IsAppContainersSupported() |
+bool IsWindows8OrLater() |
Eric
2014/06/25 16:13:00
How about combining the duplicated code to get the
|
{ |
- //Try to allocate SID of AppContainer and see if it's succesful |
- PSID allAppContainersSid = 0; |
- SID_IDENTIFIER_AUTHORITY applicationAuthority = SECURITY_APP_PACKAGE_AUTHORITY; |
- BOOL res = AllocateAndInitializeSid(&applicationAuthority, |
- SECURITY_BUILTIN_APP_PACKAGE_RID_COUNT, |
- SECURITY_APP_PACKAGE_BASE_RID, |
- SECURITY_BUILTIN_PACKAGE_ANY_PACKAGE, |
- 0, 0, 0, 0, 0, 0, |
- &allAppContainersSid); |
- |
- if (res == FALSE) |
- { |
- return false; |
- } |
- else |
- { |
- FreeSid(allAppContainersSid); |
- return true; |
- } |
+ OSVERSIONINFOEX osvi; |
+ ZeroMemory(&osvi, sizeof(OSVERSIONINFOEX)); |
+ osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); |
+ GetVersionEx(reinterpret_cast<LPOSVERSIONINFO>(&osvi)); |
+ return osvi.dwMajorVersion >= 6 && osvi.dwMinorVersion >= 2; |
Wladimir Palant
2014/05/15 07:36:18
So if dwMajorVersion is 7 and dwMinorVersion is 0
|
} |
std::string ToUtf8String(const std::wstring& str) |