1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-04-30 15:49:41 +02:00

Per comments, these 2 functions, redefinitions of WINAPI fns, are no longer necessary, as we dropped pre-Win2k support with Audacity 2.0. Gale reported that since the patch to them in r12160, they have caused problems. So instead, just rely on the ones in WINAPI.

This commit is contained in:
v.audacity 2013-08-10 01:23:07 +00:00
parent 3af5844730
commit 3da08380d7

View File

@ -68,53 +68,6 @@ static void dprintf(const char *format, ...)
}
#endif
// The VerSetConditionMask() function did not appear until Windows 2000,
// so check for it at runtime. However, post 2.0, this can be deleted
// since pre-Win2k support will be dropped.
#define VerSetConditionMask VerSetConditionMaskThunk
ULONGLONG
VerSetConditionMaskThunk(ULONGLONG ConditionMask,
DWORD TypeMask,
BYTE Condition)
{
// The VerifyVersionInfo() function did not appear until Windows 2000,
// so check for it at runtime. However, post 2.0, this can be dropped
// since pre-Win2k support will be dropped.
typedef ULONGLONG (WINAPI *versetconditionask)(ULONGLONG ConditionMask,
DWORD TypeMask,
BYTE Condition);
versetconditionask vscm =
(versetconditionask) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")),
"VerSetConditionMask");
if (vscm == NULL) {
return 0;
}
return vscm(ConditionMask, TypeMask, Condition);
}
// The VerifyVersionInfo() function did not appear until Windows 2000,
// so check for it at runtime. However, post 2.0, this can be deleted
// since pre-Win2k support will be dropped.
#define VerifyVersionInfoA VerifyVersionInfoAThunk
BOOL
VerifyVersionInfoAThunk(LPOSVERSIONINFOEXA lpVersionInformation,
DWORD dwTypeMask,
DWORDLONG dwlConditionMask)
{
typedef BOOL (WINAPI *verifyversioninfo)(LPOSVERSIONINFOEXA lpVersionInformation,
DWORD dwTypeMask,
DWORDLONG dwlConditionMask);
verifyversioninfo vvi =
(verifyversioninfo) GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")),
"VerifyVersionInfoA");
if (vvi == NULL) {
return FALSE;
}
return vvi(lpVersionInformation, dwTypeMask, dwlConditionMask);
}
static BOOL is_vista_or_later()
{
OSVERSIONINFOEX osvi;