Muldersoft/MUtilities
Muldersoft/MUtilities
1
0
Fork 0
Code Releases Activity

Some improvements to Windows version detection + require Vista with SP-2 for DLL build.

Browse Source
This commit is contained in:
LoRd_MuldeR 2018-08-20 18:49:22 +02:00
parent f513a18271
commit 6c7371b941
3 changed files with 81 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/MUtils/OSSupport.h
View File

@ -74,6 +74,7 @@ namespace MUtils
unsigned int versionMajor; ///< The *major* version of the underlaying operating system unsigned int versionMajor; ///< The *major* version of the underlaying operating system
unsigned int versionMinor; ///< The *minor* version of the underlaying operating system unsigned int versionMinor; ///< The *minor* version of the underlaying operating system
unsigned int versionBuild; ///< The *build* number of the underlaying operating system unsigned int versionBuild; ///< The *build* number of the underlaying operating system
unsigned int versionSPack; ///< The *service pack* version of the underlaying operating system
bool overrideFlag; bool overrideFlag;
MUTILS_API bool operator== (const _os_version_t &rhs) const; MUTILS_API bool operator== (const _os_version_t &rhs) const;

85
src/OSSupport_Win32.cpp
View File

@ -306,17 +306,17 @@ namespace MUtils
bool os_version_t::operator<= (const os_version_t &rhs) const { return (type == rhs.type) && ((versionMajor < rhs.versionMajor) || ((versionMajor == rhs.versionMajor) && (versionMinor <= rhs.versionMinor))); } bool os_version_t::operator<= (const os_version_t &rhs) const { return (type == rhs.type) && ((versionMajor < rhs.versionMajor) || ((versionMajor == rhs.versionMajor) && (versionMinor <= rhs.versionMinor))); }
//Known Windows NT versions //Known Windows NT versions
const os_version_t WINDOWS_WIN2K = { OS_WINDOWS, 5, 0, 2195 }; // 2000 const os_version_t WINDOWS_WIN2K = { OS_WINDOWS, 5, 0, 2195, 0 }; // 2000
const os_version_t WINDOWS_WINXP = { OS_WINDOWS, 5, 1, 2600 }; // XP const os_version_t WINDOWS_WINXP = { OS_WINDOWS, 5, 1, 2600, 0 }; // XP
const os_version_t WINDOWS_XPX64 = { OS_WINDOWS, 5, 2, 3790 }; // XP_x64 const os_version_t WINDOWS_XPX64 = { OS_WINDOWS, 5, 2, 3790, 0 }; // XP_x64
const os_version_t WINDOWS_VISTA = { OS_WINDOWS, 6, 0, 6000 }; // Vista const os_version_t WINDOWS_VISTA = { OS_WINDOWS, 6, 0, 6000, 0 }; // Vista
const os_version_t WINDOWS_WIN70 = { OS_WINDOWS, 6, 1, 7600 }; // 7 const os_version_t WINDOWS_WIN70 = { OS_WINDOWS, 6, 1, 7600, 0 }; // 7
const os_version_t WINDOWS_WIN80 = { OS_WINDOWS, 6, 2, 9200 }; // 8 const os_version_t WINDOWS_WIN80 = { OS_WINDOWS, 6, 2, 9200, 0 }; // 8
const os_version_t WINDOWS_WIN81 = { OS_WINDOWS, 6, 3, 9600 }; // 8.1 const os_version_t WINDOWS_WIN81 = { OS_WINDOWS, 6, 3, 9600, 0 }; // 8.1
const os_version_t WINDOWS_WN100 = { OS_WINDOWS, 10, 0, 10240 }; // 10 const os_version_t WINDOWS_WN100 = { OS_WINDOWS, 10, 0, 10240, 0 }; // 10
//Unknown OS //Unknown OS
const os_version_t UNKNOWN_OPSYS = { OS_UNKNOWN, 0, 0, 0 }; // N/A const os_version_t UNKNOWN_OPSYS = { OS_UNKNOWN, 0, 0, 0, 0 }; // N/A
} }
} }
} }
@ -441,12 +441,42 @@ static bool verify_os_build(const DWORD build)
return (ret != FALSE); return (ret != FALSE);
} }
static bool get_real_os_version(unsigned int *major, unsigned int *minor, unsigned int *build, bool *pbOverride) static bool verify_os_spack(const WORD spack)
{ {
static const DWORD MAX_VERSION = 0xFFFF; OSVERSIONINFOEXW osvi;
static const DWORD MAX_BUILDNO = MAXINT; DWORDLONG dwlConditionMask = 0;
initialize_os_version(&osvi);
*major = *minor = *build = 0; //Initialize the OSVERSIONINFOEX structure
osvi.wServicePackMajor = spack;
osvi.dwPlatformId = VER_PLATFORM_WIN32_NT;
//Initialize the condition mask
VER_SET_CONDITION(dwlConditionMask, VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL);
VER_SET_CONDITION(dwlConditionMask, VER_PLATFORMID, VER_EQUAL);
// Perform the test
const BOOL ret = rtl_verify_version(&osvi, VER_SERVICEPACKMAJOR | 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 *const major, unsigned int *const minor, unsigned int *const build, unsigned int *const spack, bool *const pbOverride)
{
static const DWORD MAX_VERSION = MAXWORD;
static const DWORD MAX_BUILDNO = MAXINT;
static const DWORD MAX_SRVCPCK = MAXWORD;
*major = *minor = *build = *spack = 0U;
*pbOverride = false; *pbOverride = false;
//Initialize local variables //Initialize local variables
@ -467,6 +497,7 @@ static bool get_real_os_version(unsigned int *major, unsigned int *minor, unsign
*major = osvi.dwMajorVersion; *major = osvi.dwMajorVersion;
*minor = osvi.dwMinorVersion; *minor = osvi.dwMinorVersion;
*build = osvi.dwBuildNumber; *build = osvi.dwBuildNumber;
*spack = osvi.wServicePackMajor;
} }
else else
{ {
@ -529,6 +560,27 @@ static bool get_real_os_version(unsigned int *major, unsigned int *minor, unsign
} }
} }
//Service Pack
if (verify_os_spack(SAFE_ADD((*spack), 1, MAX_SRVCPCK)))
{
DWORD stepSize = initialize_step_size(MAX_SRVCPCK);
for (DWORD nextSPackNo = SAFE_ADD((*spack), stepSize, MAX_SRVCPCK); (*spack) < MAX_SRVCPCK; nextSPackNo = SAFE_ADD((*spack), stepSize, MAX_SRVCPCK))
{
if (verify_os_spack(nextSPackNo))
{
*build = nextSPackNo;
*pbOverride = true;
continue;
}
if (stepSize > 1)
{
stepSize = stepSize / 2;
continue;
}
break;
}
}
return true; return true;
} }
@ -552,18 +604,19 @@ const MUtils::OS::Version::os_version_t &MUtils::OS::os_version(void)
} }
//Detect OS version //Detect OS version
unsigned int major, minor, build; bool overrideFlg; unsigned int major, minor, build, spack; bool overrideFlg;
if(get_real_os_version(&major, &minor, &build, &overrideFlg)) if(get_real_os_version(&major, &minor, &build, &spack, &overrideFlg))
{ {
g_os_version_info.type = Version::OS_WINDOWS; g_os_version_info.type = Version::OS_WINDOWS;
g_os_version_info.versionMajor = major; g_os_version_info.versionMajor = major;
g_os_version_info.versionMinor = minor; g_os_version_info.versionMinor = minor;
g_os_version_info.versionBuild = build; g_os_version_info.versionBuild = build;
g_os_version_info.versionSPack = spack;
g_os_version_info.overrideFlag = overrideFlg; g_os_version_info.overrideFlag = overrideFlg;
} }
else else
{ {
qWarning("Failed to determin the operating system version!"); qWarning("Failed to determine the operating system version!");
} }
//Completed //Completed

15
src/Startup.cpp
View File

@ -308,19 +308,26 @@ QApplication *MUtils::Startup::create_qt(int &argc, char **argv, const QString &
//Check the Windows version //Check the Windows version
const MUtils::OS::Version::os_version_t &osVersion = MUtils::OS::os_version(); const MUtils::OS::Version::os_version_t &osVersion = MUtils::OS::os_version();
if((osVersion.type != MUtils::OS::Version::OS_WINDOWS) || (osVersion < MUtils::OS::Version::WINDOWS_WINXP)) #ifdef QT_NODLL
if ((osVersion.type != MUtils::OS::Version::OS_WINDOWS) || (osVersion < MUtils::OS::Version::WINDOWS_WINXP) || ((osVersion == MUtils::OS::Version::WINDOWS_WINXP) && (osVersion.versionSPack < 3)))
{ {
qFatal("%s", QApplication::tr("Executable '%1' requires Windows XP or later.").arg(executableName).toLatin1().constData()); qFatal("%s", QApplication::tr("Executable '%1' requires Windows XP with SP-3 or later.").arg(executableName).toLatin1().constData());
} }
#else
if ((osVersion.type != MUtils::OS::Version::OS_WINDOWS) || (osVersion < MUtils::OS::Version::WINDOWS_VISTA) || ((osVersion == MUtils::OS::Version::WINDOWS_VISTA) && (osVersion.versionSPack < 2)))
{
qFatal("%s", QApplication::tr("Executable '%1' requires Windows Vista with SP-2 or later.").arg(executableName).toLatin1().constData());
}
#endif
//Check whether we are running on a supported Windows version //Check whether we are running on a supported Windows version
if(const char *const friendlyName = MUtils::OS::os_friendly_name(osVersion)) if(const char *const friendlyName = MUtils::OS::os_friendly_name(osVersion))
{ {
qDebug("Running on %s (NT v%u.%u.%u).\n", friendlyName, osVersion.versionMajor, osVersion.versionMinor, osVersion.versionBuild); qDebug("Running on %s (NT v%u.%u.%u, SP-%u).\n", friendlyName, osVersion.versionMajor, osVersion.versionMinor, osVersion.versionBuild, osVersion.versionSPack);
} }
else else
{ {
const QString message = QString().sprintf("Running on an unknown WindowsNT-based system (v%u.%u.%u).", osVersion.versionMajor, osVersion.versionMinor, osVersion.versionBuild); const QString message = QString().sprintf("Running on an unknown WindowsNT-based system (NT v%u.%u.%u, SP-%u).", osVersion.versionMajor, osVersion.versionMinor, osVersion.versionBuild, osVersion.versionSPack);
qWarning("%s\n", MUTILS_UTF8(message)); qWarning("%s\n", MUTILS_UTF8(message));
MUtils::OS::system_message_wrn(MUTILS_WCHR(executableName), MUTILS_WCHR(message)); MUtils::OS::system_message_wrn(MUTILS_WCHR(executableName), MUTILS_WCHR(message));
} }