Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-05 06:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use RtlVerifyVersionInfo for IsWindowsVersionOrGreater check, fixes #1294

Browse Source
This commit is contained in:
Amer Koleci 2018-07-17 20:09:58 +02:00
parent 0be4f3f75a
commit 83aefa923b
2 changed files with 39 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/win32_init.c
View File

@ -62,15 +62,42 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
#endif // _GLFW_BUILD_DLL
typedef LONG NTSTATUS, *PNTSTATUS;
#define STATUS_SUCCESS ((NTSTATUS)0x00000000)
#define STATUS_REVISION_MISMATCH ((NTSTATUS)0xC0000059)
typedef NTSTATUS(WINAPI* RtlVerifyVersionInfoFn)(PRTL_OSVERSIONINFOEXW, ULONG, ULONGLONG);
// HACK: Define versionhelpers.h functions manually as MinGW lacks the header
BOOL IsWindowsVersionOrGreater(WORD major, WORD minor, WORD sp)
BOOL IsWindowsVersionOrGreater(WORD major, WORD minor)
{
OSVERSIONINFOEXW osvi = { sizeof(osvi), major, minor, 0, 0, {0}, sp };
DWORD mask = VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR;
ULONGLONG cond = VerSetConditionMask(0, VER_MAJORVERSION, VER_GREATER_EQUAL);
cond = VerSetConditionMask(cond, VER_MINORVERSION, VER_GREATER_EQUAL);
cond = VerSetConditionMask(cond, VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL);
return VerifyVersionInfoW(&osvi, mask, cond);
static RtlVerifyVersionInfoFn RtlVerifyVersionInfoFn = NULL;
if (!RtlVerifyVersionInfoFn)
{
HMODULE ntdllModule = GetModuleHandleW(L"ntdll.dll");
if (ntdllModule)
{
RtlVerifyVersionInfoFn = GetProcAddress(ntdllModule, "RtlVerifyVersionInfo");
}
}
RTL_OSVERSIONINFOEXW versionInfo = { 0 };
NTSTATUS status;
ULONGLONG conditionMask = 0;
versionInfo.dwOSVersionInfoSize = sizeof(RTL_OSVERSIONINFOEXW);
versionInfo.dwMajorVersion = major;
versionInfo.dwMinorVersion = minor;
VER_SET_CONDITION(conditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL);
VER_SET_CONDITION(conditionMask, VER_MINORVERSION, VER_GREATER_EQUAL);
status = RtlVerifyVersionInfoFn(&versionInfo,
VER_MAJORVERSION | VER_MINORVERSION,
conditionMask);
if (status == STATUS_SUCCESS)
return TRUE;
return FALSE;
}
// Load necessary libraries (DLLs)

10
src/win32_platform.h
View File

@ -141,19 +141,19 @@ typedef enum
#endif /*DPI_ENUMS_DECLARED*/
// HACK: Define versionhelpers.h functions manually as MinGW lacks the header
BOOL IsWindowsVersionOrGreater(WORD major, WORD minor, WORD sp);
BOOL IsWindowsVersionOrGreater(WORD major, WORD minor);
#define IsWindowsVistaOrGreater() \
IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_VISTA), \
LOBYTE(_WIN32_WINNT_VISTA), 0)
LOBYTE(_WIN32_WINNT_VISTA))
#define IsWindows7OrGreater() \
IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN7), \
LOBYTE(_WIN32_WINNT_WIN7), 0)
LOBYTE(_WIN32_WINNT_WIN7))
#define IsWindows8OrGreater() \
IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WIN8), \
LOBYTE(_WIN32_WINNT_WIN8), 0)
LOBYTE(_WIN32_WINNT_WIN8))
#define IsWindows8Point1OrGreater() \
IsWindowsVersionOrGreater(HIBYTE(_WIN32_WINNT_WINBLUE), \
LOBYTE(_WIN32_WINNT_WINBLUE), 0)
LOBYTE(_WIN32_WINNT_WINBLUE))
// HACK: Define macros that some xinput.h variants don't
#ifndef XINPUT_CAPS_WIRELESS