diff options
| -rw-r--r-- | bin10/lib/mir_core.lib | bin | 297744 -> 298390 bytes | |||
| -rw-r--r-- | bin10/lib/mir_core64.lib | bin | 299130 -> 299714 bytes | |||
| -rw-r--r-- | bin12/lib/mir_core.lib | bin | 297744 -> 298390 bytes | |||
| -rw-r--r-- | bin12/lib/mir_core64.lib | bin | 299130 -> 299714 bytes | |||
| -rw-r--r-- | bin14/lib/mir_core.lib | bin | 297744 -> 298390 bytes | |||
| -rw-r--r-- | bin14/lib/mir_core64.lib | bin | 299130 -> 299714 bytes | |||
| -rw-r--r-- | include/m_core.h | 3 | ||||
| -rw-r--r-- | include/win2k.h | 12 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core.def | 4 | ||||
| -rw-r--r-- | src/mir_core/src/mir_core64.def | 4 | ||||
| -rw-r--r-- | src/mir_core/src/winver.cpp | 15 |
11 files changed, 38 insertions, 0 deletions
diff --git a/bin10/lib/mir_core.lib b/bin10/lib/mir_core.lib Binary files differindex 09fac02fed..8c6019c2af 100644 --- a/bin10/lib/mir_core.lib +++ b/bin10/lib/mir_core.lib diff --git a/bin10/lib/mir_core64.lib b/bin10/lib/mir_core64.lib Binary files differindex 64e229b2c8..144b3bedb0 100644 --- a/bin10/lib/mir_core64.lib +++ b/bin10/lib/mir_core64.lib diff --git a/bin12/lib/mir_core.lib b/bin12/lib/mir_core.lib Binary files differindex 09fac02fed..8c6019c2af 100644 --- a/bin12/lib/mir_core.lib +++ b/bin12/lib/mir_core.lib diff --git a/bin12/lib/mir_core64.lib b/bin12/lib/mir_core64.lib Binary files differindex 64e229b2c8..144b3bedb0 100644 --- a/bin12/lib/mir_core64.lib +++ b/bin12/lib/mir_core64.lib diff --git a/bin14/lib/mir_core.lib b/bin14/lib/mir_core.lib Binary files differindex 09fac02fed..8c6019c2af 100644 --- a/bin14/lib/mir_core.lib +++ b/bin14/lib/mir_core.lib diff --git a/bin14/lib/mir_core64.lib b/bin14/lib/mir_core64.lib Binary files differindex 64e229b2c8..144b3bedb0 100644 --- a/bin14/lib/mir_core64.lib +++ b/bin14/lib/mir_core64.lib diff --git a/include/m_core.h b/include/m_core.h index e812be9e2b..f8626f975a 100644 --- a/include/m_core.h +++ b/include/m_core.h @@ -635,6 +635,9 @@ MIR_CORE_DLL(void) KillModuleSubclassing(HMODULE hInst); MIR_CORE_DLL(BOOL) IsWinVerVistaPlus();
MIR_CORE_DLL(BOOL) IsWinVer7Plus();
+MIR_CORE_DLL(BOOL) IsWinVer8Plus();
+MIR_CORE_DLL(BOOL) IsWinVer81Plus();
+MIR_CORE_DLL(BOOL) IsWinVer10Plus();
MIR_CORE_DLL(BOOL) IsFullScreen();
MIR_CORE_DLL(BOOL) IsWorkstationLocked();
diff --git a/include/win2k.h b/include/win2k.h index 88fdf78807..b7c5203289 100644 --- a/include/win2k.h +++ b/include/win2k.h @@ -54,6 +54,18 @@ File created by Christian Kostner, and tweaked a bit by Richard Hughes*/ #define BIGI(x) x##LL
#endif
+#ifndef _WIN32_WINNT_WIN8
+#define _WIN32_WINNT_WIN8 0x0602 // Windows 8
+#endif
+
+#ifndef _WIN32_WINNT_WINBLUE
+#define _WIN32_WINNT_WINBLUE 0x0603 // Windows 8.1
+#endif
+
+#ifndef _WIN32_WINNT_WIN10
+#define _WIN32_WINNT_WIN10 0x0A00 // Windows 10
+#endif
+
// collapsible groups for Vista
#ifndef LVGS_COLLAPSIBLE
#define LVGS_COLLAPSIBLE 0x00000008
diff --git a/src/mir_core/src/mir_core.def b/src/mir_core/src/mir_core.def index fed657fd09..8412723e7f 100644 --- a/src/mir_core/src/mir_core.def +++ b/src/mir_core/src/mir_core.def @@ -973,3 +973,7 @@ Utils_ResizeDialog @1130 Utils_GetRandom @1131
Utils_OpenUrl @1132
Utils_OpenUrlW @1133
+GetOSDisplayString @1134
+IsWinVer10Plus @1135
+IsWinVer81Plus @1136
+IsWinVer8Plus @1137
diff --git a/src/mir_core/src/mir_core64.def b/src/mir_core/src/mir_core64.def index af4a9a45d7..b29f37541d 100644 --- a/src/mir_core/src/mir_core64.def +++ b/src/mir_core/src/mir_core64.def @@ -973,3 +973,7 @@ Utils_ResizeDialog @1130 Utils_GetRandom @1131
Utils_OpenUrl @1132
Utils_OpenUrlW @1133
+GetOSDisplayString @1134
+IsWinVer10Plus @1135
+IsWinVer81Plus @1136
+IsWinVer8Plus @1137
diff --git a/src/mir_core/src/winver.cpp b/src/mir_core/src/winver.cpp index 71b7969f77..0a08891244 100644 --- a/src/mir_core/src/winver.cpp +++ b/src/mir_core/src/winver.cpp @@ -35,6 +35,21 @@ MIR_CORE_DLL(BOOL) IsWinVer7Plus() return dwWinVer >= _WIN32_WINNT_WIN7;
}
+MIR_CORE_DLL(BOOL) IsWinVer8Plus()
+{
+ return dwWinVer >= _WIN32_WINNT_WIN8;
+}
+
+MIR_CORE_DLL(BOOL) IsWinVer81Plus()
+{
+ return dwWinVer >= _WIN32_WINNT_WINBLUE;
+}
+
+MIR_CORE_DLL(BOOL) IsWinVer10Plus()
+{
+ return dwWinVer >= _WIN32_WINNT_WIN10;
+}
+
MIR_CORE_DLL(BOOL) IsFullScreen()
{
RECT rcScreen = { 0 };
|