OSDN Git Service
(root)
/
mutilities
/
MUtilities.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6b44e71
)
Small improvement in OS detection code.
author
LoRd_MuldeR
<mulder2@gmx.de>
Fri, 24 Dec 2021 19:02:34 +0000
(20:02 +0100)
committer
LoRd_MuldeR
<mulder2@gmx.de>
Fri, 24 Dec 2021 19:02:34 +0000
(20:02 +0100)
src/OSSupport_Win32.cpp
patch
|
blob
|
history
diff --git
a/src/OSSupport_Win32.cpp
b/src/OSSupport_Win32.cpp
index
78bdcb3
..
cf9cee9
100644
(file)
--- a/
src/OSSupport_Win32.cpp
+++ b/
src/OSSupport_Win32.cpp
@@
-450,14
+450,13
@@
const MUtils::OS::Version::os_version_t &MUtils::OS::os_version(void)
const char *MUtils::OS::os_friendly_name(const MUtils::OS::Version::os_version_t &os_version)
{
const char *friendly_name = NULL;
const char *MUtils::OS::os_friendly_name(const MUtils::OS::Version::os_version_t &os_version)
{
const char *friendly_name = NULL;
- for(size_t i = 0; g_os_version_lut[i].version.type != MUtils::OS::Version::OS_UNKNOWN; i++)
+ for
(size_t i = 0; g_os_version_lut[i].version.type != MUtils::OS::Version::OS_UNKNOWN; i++)
{
{
- if(os_version >= g_os_version_lut[i].version)
+ const MUtils::OS::Version::os_version_t &version = g_os_version_lut[i].version;
+ if ((os_version.versionMajor == version.versionMajor) && (os_version.versionMinor == version.versionMinor) && (os_version.versionBuild >= version.versionBuild))
{
friendly_name = g_os_version_lut[i].friendlyName;
{
friendly_name = g_os_version_lut[i].friendlyName;
- continue;
}
}
- break;
}
return friendly_name;
}
return friendly_name;
@@
-1785,7
+1784,7
@@
const QLatin1String &MUtils::OS::null_device(void)
// DEBUGGER CHECK
///////////////////////////////////////////////////////////////////////////////
// DEBUGGER CHECK
///////////////////////////////////////////////////////////////////////////////
-#if (!(MUTILS_DEBUG))
+#if
0//
(!(MUTILS_DEBUG))
static __forceinline bool is_debugger_present(void)
{
__try
static __forceinline bool is_debugger_present(void)
{
__try