Author: manx
Date: Wed May 22 11:08:02 2024
New Revision: 20834
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20834
Log:
Merged revision(s) 20833 from trunk/OpenMPT:
[Fix] mpt/base/detect_os.hpp: Early Windows 10 Preview versions used NT Version 6.4.
[Fix] mpt/osinfo/windows_version.hpp: Early Windows 10 Preview versions used NT Version 6.4.
........
Modified:
branches/OpenMPT-1.31/ (props changed)
branches/OpenMPT-1.31/misc/mptOS.cpp
branches/OpenMPT-1.31/src/mpt/base/detect_os.hpp
branches/OpenMPT-1.31/src/mpt/osinfo/windows_version.hpp
Modified: branches/OpenMPT-1.31/misc/mptOS.cpp
==============================================================================
--- branches/OpenMPT-1.31/misc/mptOS.cpp Wed May 22 11:07:35 2024 (r20833)
+++ branches/OpenMPT-1.31/misc/mptOS.cpp Wed May 22 11:08:02 2024 (r20834)
@@ -53,6 +53,7 @@
{ mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 14393, 0 }, UL_("Windows 10 1607"), true },
{ mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 10586, 0 }, UL_("Windows 10 1511"), true },
{ mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 10240, 0 }, UL_("Windows 10 1507"), true },
+ { mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win10Pre, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows 10 Preview"), true },
{ mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win81, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows 8.1"), true },
{ mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win8, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows 8"), true },
{ mpt::osinfo::windows::Version{ mpt::osinfo::windows::Version::Win7, mpt::osinfo::windows::Version::ServicePack{ 0, 0 }, 0, 0 }, UL_("Windows 7"), true },
Modified: branches/OpenMPT-1.31/src/mpt/base/detect_os.hpp
==============================================================================
--- branches/OpenMPT-1.31/src/mpt/base/detect_os.hpp Wed May 22 11:07:35 2024 (r20833)
+++ branches/OpenMPT-1.31/src/mpt/base/detect_os.hpp Wed May 22 11:08:02 2024 (r20834)
@@ -41,6 +41,7 @@
#define MPT_WIN_8 MPT_WIN_MAKE_VERSION(0x06, 0x02, 0x00, 0x00)
#define MPT_WIN_81 MPT_WIN_MAKE_VERSION(0x06, 0x03, 0x00, 0x00)
+#define MPT_WIN_10_PRE MPT_WIN_MAKE_VERSION(0x06, 0x04, 0x00, 0x00)
#define MPT_WIN_10 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x00) // NTDDI_WIN10 1507
#define MPT_WIN_10_1511 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x01) // NTDDI_WIN10_TH2 1511
#define MPT_WIN_10_1607 MPT_WIN_MAKE_VERSION(0x0a, 0x00, 0x00, 0x02) // NTDDI_WIN10_RS1 1607
Modified: branches/OpenMPT-1.31/src/mpt/osinfo/windows_version.hpp
==============================================================================
--- branches/OpenMPT-1.31/src/mpt/osinfo/windows_version.hpp Wed May 22 11:07:35 2024 (r20833)
+++ branches/OpenMPT-1.31/src/mpt/osinfo/windows_version.hpp Wed May 22 11:08:02 2024 (r20834)
@@ -38,6 +38,7 @@
Win7 = 0x0000000600000001ull,
Win8 = 0x0000000600000002ull,
Win81 = 0x0000000600000003ull,
+ Win10Pre = 0x0000000600000004ull,
Win10 = 0x0000000a00000000ull,
WinNewer = Win10 + 1ull
};
@@ -162,6 +163,8 @@
return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 10586, 0);
#elif MPT_WINNT_AT_LEAST(MPT_WIN_10) // 1507
return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10, mpt::osinfo::windows::Version::ServicePack(0, 0), 10240, 0);
+#elif MPT_WINNT_AT_LEAST(MPT_WIN_10_PRE)
+ return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win10Pre, mpt::osinfo::windows::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0);
#elif MPT_WINNT_AT_LEAST(MPT_WIN_81)
return mpt::osinfo::windows::Version(mpt::osinfo::windows::Version::Win81, mpt::osinfo::windows::Version::ServicePack(((NTDDI_VERSION & 0xffffu) >> 8) & 0xffu, ((NTDDI_VERSION & 0xffffu) >> 0) & 0xffu), 0, 0);
#elif MPT_WINNT_AT_LEAST(MPT_WIN_8)
|
