{ MUtils::OS::Version::WINDOWS_WIN70, "Windows 7 or Windows Server 2008 R2" }, //7
{ MUtils::OS::Version::WINDOWS_WIN80, "Windows 8 or Windows Server 2012" }, //8
{ MUtils::OS::Version::WINDOWS_WIN81, "Windows 8.1 or Windows Server 2012 R2" }, //8.1
- { MUtils::OS::Version::WINDOWS_WN100, "Windows 10 or Windows Server 2014 (Preview)" }, //10
+ { MUtils::OS::Version::WINDOWS_WN100, "Windows 10 or Windows Server 2016" }, //10
{ MUtils::OS::Version::UNKNOWN_OPSYS, "N/A" }
};
}
}
+static inline DWORD SAFE_ADD(const DWORD &a, const DWORD &b)
+{
+ const DWORD temp = a + b;
+ return ((temp >= a) && (temp >= b)) ? temp : MAXDWORD;
+}
+
+static void initialize_os_version(OSVERSIONINFOEXW *const osInfo)
+{
+ memset(osInfo, 0, sizeof(OSVERSIONINFOEXW));
+ osInfo->dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW);
+}
+
+static bool rtl_get_version(OSVERSIONINFOEXW *const osInfo)
+{
+ typedef LONG(__stdcall *RtlGetVersion)(LPOSVERSIONINFOEXW);
+ if (const HMODULE ntdll = GetModuleHandleW(L"ntdll"))
+ {
+ if (const RtlGetVersion pRtlGetVersion = (RtlGetVersion)GetProcAddress(ntdll, "RtlGetVersion"))
+ {
+ initialize_os_version(osInfo);
+ if (pRtlGetVersion(osInfo) == 0)
+ {
+ return true;
+ }
+ }
+ }
+
+ //Fallback
+ initialize_os_version(osInfo);
+ return (GetVersionExW((LPOSVERSIONINFOW)osInfo) != FALSE);
+}
+
+static bool rtl_verify_version(OSVERSIONINFOEXW *const osInfo, const ULONG typeMask, const ULONGLONG condMask)
+{
+ typedef LONG(__stdcall *RtlVerifyVersionInfo)(LPOSVERSIONINFOEXW, ULONG, ULONGLONG);
+ if (const HMODULE ntdll = GetModuleHandleW(L"ntdll"))
+ {
+ if (const RtlVerifyVersionInfo pRtlVerifyVersionInfo = (RtlVerifyVersionInfo)GetProcAddress(ntdll, "RtlVerifyVersionInfo"))
+ {
+ if (pRtlVerifyVersionInfo(osInfo, typeMask, condMask) == 0)
+ {
+ return true;
+ }
+ }
+ }
+
+ //Fallback
+ return (VerifyVersionInfoW(osInfo, typeMask, condMask) != FALSE);
+}
+
static bool verify_os_version(const DWORD major, const DWORD minor)
{
OSVERSIONINFOEXW osvi;
DWORDLONG dwlConditionMask = 0;
+ initialize_os_version(&osvi);
//Initialize the OSVERSIONINFOEX structure
- memset(&osvi, 0, sizeof(OSVERSIONINFOEXW));
- osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW);
osvi.dwMajorVersion = major;
osvi.dwMinorVersion = minor;
osvi.dwPlatformId = VER_PLATFORM_WIN32_NT;
VER_SET_CONDITION(dwlConditionMask, VER_PLATFORMID, VER_EQUAL);
// Perform the test
- const BOOL ret = VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_PLATFORMID, dwlConditionMask);
+ const BOOL ret = rtl_verify_version(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_PLATFORMID, dwlConditionMask);
//Error checking
if(!ret)
return (ret != FALSE);
}
-static bool get_real_os_version(unsigned int *major, unsigned int *minor, bool *pbOverride)
+static bool verify_os_build(const DWORD build)
+{
+ OSVERSIONINFOEXW osvi;
+ DWORDLONG dwlConditionMask = 0;
+ initialize_os_version(&osvi);
+
+ //Initialize the OSVERSIONINFOEX structure
+ osvi.dwBuildNumber = build;
+ osvi.dwPlatformId = VER_PLATFORM_WIN32_NT;
+
+ //Initialize the condition mask
+ VER_SET_CONDITION(dwlConditionMask, VER_BUILDNUMBER, VER_GREATER_EQUAL);
+ VER_SET_CONDITION(dwlConditionMask, VER_PLATFORMID, VER_EQUAL);
+
+ // Perform the test
+ const BOOL ret = rtl_verify_version(&osvi, VER_BUILDNUMBER | VER_PLATFORMID, dwlConditionMask);
+
+ //Error checking
+ if (!ret)
+ {
+ if (GetLastError() != ERROR_OLD_WIN_VERSION)
+ {
+ qWarning("VerifyVersionInfo() system call has failed!");
+ }
+ }
+
+ return (ret != FALSE);
+}
+
+static bool get_real_os_version(unsigned int *major, unsigned int *minor, unsigned int *build, bool *pbOverride)
{
- *major = *minor = 0;
+ static const DWORD MAX_VERSION = 0xFFFF;
+
+ *major = *minor = *build = 0;
*pbOverride = false;
//Initialize local variables
osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXW);
//Try GetVersionEx() first
- if(GetVersionExW((LPOSVERSIONINFOW)&osvi) == FALSE)
+ if(rtl_get_version(&osvi) == FALSE)
{
qWarning("GetVersionEx() has failed, cannot detect Windows version!");
return false;
{
*major = osvi.dwMajorVersion;
*minor = osvi.dwMinorVersion;
+ *build = osvi.dwBuildNumber;
}
else
{
- qWarning("Not running on Windows NT, unsupported operating system!");
- return false;
+ if (verify_os_version(4, 0))
+ {
+ *major = 4;
+ *build = 1381;
+ *pbOverride = true;
+ }
+ else
+ {
+ qWarning("Not running on Windows NT, unsupported operating system!");
+ return false;
+ }
}
- //Determine the real *major* version first
- forever
+ //Major Version
+ for (DWORD nextMajor = (*major) + 1; nextMajor <= MAX_VERSION; nextMajor++)
{
- const DWORD nextMajor = (*major) + 1;
- if(verify_os_version(nextMajor, 0))
+ if (verify_os_version(nextMajor, 0))
{
- *pbOverride = true;
*major = nextMajor;
*minor = 0;
+ *pbOverride = true;
continue;
}
break;
}
- //Now also determine the real *minor* version
- forever
+ //Minor Version
+ for (DWORD nextMinor = (*minor) + 1; nextMinor <= MAX_VERSION; nextMinor++)
{
- const DWORD nextMinor = (*minor) + 1;
- if(verify_os_version((*major), nextMinor))
+ if (verify_os_version((*major), nextMinor))
{
- *pbOverride = true;
*minor = nextMinor;
+ *pbOverride = true;
continue;
}
break;
}
- //Workaround for the mess that is sometimes referred to as "Windows 10"
- if(((*major) > 6) || (((*major) == 6) && ((*minor) >= 2)))
+ //Build Version
+ DWORD stepSize = 32768;
+ for (DWORD nextBuildNo = SAFE_ADD((*build), stepSize); (*build) < MAXDWORD; nextBuildNo = SAFE_ADD((*build), stepSize))
{
- quint16 kernel32_major, kernel32_minor;
- if(MUtils::OS::get_file_version(QLatin1String("kernel32"), &kernel32_major, &kernel32_minor))
+ if (verify_os_build(nextBuildNo))
{
- if((kernel32_major > (*major)) || ((kernel32_major == (*major)) && (kernel32_minor > (*minor))))
- {
- *major = kernel32_major;
- *minor = kernel32_minor;
- *pbOverride = true;
- }
+ *build = nextBuildNo;
+ *pbOverride = true;
+ continue;
}
+ if (stepSize > 1)
+ {
+ stepSize = stepSize / 2;
+ continue;
+ }
+ break;
}
return true;
}
//Detect OS version
- unsigned int major, minor; bool overrideFlg;
- if(get_real_os_version(&major, &minor, &overrideFlg))
+ unsigned int major, minor, build; bool overrideFlg;
+ if(get_real_os_version(&major, &minor, &build, &overrideFlg))
{
g_os_version_info.type = Version::OS_WINDOWS;
g_os_version_info.versionMajor = major;
g_os_version_info.versionMinor = minor;
+ g_os_version_info.versionBuild = build;
g_os_version_info.overrideFlag = overrideFlg;
}
else
// EXECUTABLE CHECK
///////////////////////////////////////////////////////////////////////////////
+static int g_library_as_image_resource_supported = -1;
+static QReadWriteLock g_library_as_image_resource_supported_lock;
+
+static bool library_as_image_resource_supported()
+{
+ QReadLocker readLocker(&g_library_as_image_resource_supported_lock);
+ if (g_library_as_image_resource_supported >= 0)
+ {
+ return (g_library_as_image_resource_supported > 0);
+ }
+
+ readLocker.unlock();
+ QWriteLocker writeLocker(&g_library_as_image_resource_supported_lock);
+
+ if (g_library_as_image_resource_supported < 0)
+ {
+ g_library_as_image_resource_supported = 0;
+ OSVERSIONINFOEXW osvi;
+ if (rtl_get_version(&osvi))
+ {
+ if ((osvi.dwPlatformId == VER_PLATFORM_WIN32_NT) && (osvi.dwMajorVersion >= 6U))
+ {
+ g_library_as_image_resource_supported = 1;
+ }
+ }
+ }
+
+ return (g_library_as_image_resource_supported > 0);
+}
+
bool MUtils::OS::is_executable_file(const QString &path)
{
- bool bIsExecutable = false;
DWORD binaryType;
if(GetBinaryType(MUTILS_WCHR(QDir::toNativeSeparators(path)), &binaryType))
{
- bIsExecutable = (binaryType == SCS_32BIT_BINARY || binaryType == SCS_64BIT_BINARY);
+ return ((binaryType == SCS_32BIT_BINARY) || (binaryType == SCS_64BIT_BINARY));
}
- return bIsExecutable;
+
+ const DWORD errorCode = GetLastError();
+ qWarning("GetBinaryType() failed with error: 0x%08X", errorCode);
+ return false;
}
bool MUtils::OS::is_library_file(const QString &path)
{
- bool bIsLibrary = false;
- const HMODULE hMod = LoadLibraryEx(MUTILS_WCHR(QDir::toNativeSeparators(path)), NULL, LOAD_LIBRARY_AS_IMAGE_RESOURCE);
- if (hMod)
+ const DWORD flags = library_as_image_resource_supported() ? (LOAD_LIBRARY_AS_DATAFILE | LOAD_LIBRARY_AS_IMAGE_RESOURCE) : (LOAD_LIBRARY_AS_DATAFILE | DONT_RESOLVE_DLL_REFERENCES);
+ if (const HMODULE hMod = LoadLibraryEx(MUTILS_WCHR(QDir::toNativeSeparators(path)), NULL, flags))
{
- bIsLibrary = true;
FreeLibrary(hMod);
+ return true;
}
- return bIsLibrary;
+
+ const DWORD errorCode = GetLastError();
+ qWarning("LoadLibraryEx() failed with error: 0x%08X", errorCode);
+ return false;
}
///////////////////////////////////////////////////////////////////////////////
OSDN Git Service
