oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Windows: Avoid using deprecated function.

Browse Source 
In VC15 GetVersionEx has been deprecated. In order to continue to
support Win2K use the undeprecated VerifyVersionInfoW API
(available since Win2K).

Inline helper functions used in latest Win10 SDK to simplify code.
This commit is contained in:
Rod Widdowson
2018-03-03 15:22:55 +00:00
committed by Jeffrey Altman
parent e21866f7a2
commit 136f8fb550
1 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
lib/roken/rand.c
View File

@@ -36,6 +36,33 @@
#ifdef HAVE_WIN32_RAND_S
static int hasRand_s = 1;
// The Following is BackPorted from VersionHelpers.h in the 10.0.15063.0 SDK
static FORCEINLINE BOOL
IsWindowsVersionOrGreater(WORD wMajorVersion, WORD wMinorVersion, WORD wServicePackMajor)
{
OSVERSIONINFOEXW osvi ={ sizeof(osvi), 0, 0, 0, 0,{ 0 }, 0, 0 };
DWORDLONG const dwlConditionMask = VerSetConditionMask(
VerSetConditionMask(
VerSetConditionMask(
0, VER_MAJORVERSION, VER_GREATER_EQUAL),
VER_MINORVERSION, VER_GREATER_EQUAL),
VER_SERVICEPACKMAJOR, VER_GREATER_EQUAL);
osvi.dwMajorVersion = wMajorVersion;
osvi.dwMinorVersion = wMinorVersion;
osvi.wServicePackMajor = wServicePackMajor;
return VerifyVersionInfoW(&osvi, VER_MAJORVERSION | VER_MINORVERSION | VER_SERVICEPACKMAJOR, dwlConditionMask) != FALSE;
}
static FORCEINLINE BOOL
IsWindowsXPOrGreater()
{
// Assume that _WIN32_WINNT_WINXP (0x0501) not available so use contants.
return IsWindowsVersionOrGreater(5, 1, 0);
}
#endif
void ROKEN_LIB_FUNCTION
@@ -49,13 +76,7 @@ rk_random_init(void)
srandom(time(NULL));
#else
# ifdef HAVE_WIN32_RAND_S
OSVERSIONINFO osInfo;
osInfo.dwOSVersionInfoSize = sizeof(osInfo);
hasRand_s =
(GetVersionEx(&osInfo)
&& ((osInfo.dwMajorVersion > 5) ||
(osInfo.dwMajorVersion == 5) && (osInfo.dwMinorVersion >= 1)));
hasRand_s = IsWindowsXPOrGreater();
# endif
srand (time(NULL));
#endif