There's no point in testing for Windows 10 since the comparison is already "greater than or equals", and it identifies itself as 6.2 for backwards compatibility. Likely it was failing before because the return type was wrong. Version checks are unreliable anyways, should use feature checks, but "if it ain't broke don't fix it".
93 lines
3.4 KiB
C++
93 lines
3.4 KiB
C++
/* ScummVM - Graphic Adventure Engine
|
|
*
|
|
* ScummVM is the legal property of its developers, whose names
|
|
* are too numerous to list here. Please refer to the COPYRIGHT
|
|
* file distributed with this source distribution.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
*/
|
|
|
|
#include "common/scummsys.h"
|
|
// We need certain functions that are excluded by default
|
|
#undef NONLS
|
|
#include <windows.h>
|
|
|
|
#include "backends/platform/sdl/win32/win32_wrapper.h"
|
|
|
|
// VerSetConditionMask and VerifyVersionInfo didn't appear until Windows 2000,
|
|
// so we need to check for them at runtime
|
|
ULONGLONG VerSetConditionMaskFunc(ULONGLONG dwlConditionMask, DWORD dwTypeMask, BYTE dwConditionMask) {
|
|
typedef ULONGLONG(WINAPI *VerSetConditionMaskFunction)(ULONGLONG conditionMask, DWORD typeMask, BYTE conditionOperator);
|
|
|
|
VerSetConditionMaskFunction verSetConditionMask = (VerSetConditionMaskFunction)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "VerSetConditionMask");
|
|
if (verSetConditionMask == NULL)
|
|
return 0;
|
|
|
|
return verSetConditionMask(dwlConditionMask, dwTypeMask, dwConditionMask);
|
|
}
|
|
|
|
BOOL VerifyVersionInfoFunc(LPOSVERSIONINFOEXA lpVersionInformation, DWORD dwTypeMask, DWORDLONG dwlConditionMask) {
|
|
typedef BOOL(WINAPI *VerifyVersionInfoFunction)(LPOSVERSIONINFOEXA versionInformation, DWORD typeMask, DWORDLONG conditionMask);
|
|
|
|
VerifyVersionInfoFunction verifyVersionInfo = (VerifyVersionInfoFunction)GetProcAddress(GetModuleHandle(TEXT("kernel32.dll")), "VerifyVersionInfoA");
|
|
if (verifyVersionInfo == NULL)
|
|
return FALSE;
|
|
|
|
return verifyVersionInfo(lpVersionInformation, dwTypeMask, dwlConditionMask);
|
|
}
|
|
|
|
namespace Win32 {
|
|
|
|
bool confirmWindowsVersion(int majorVersion, int minorVersion) {
|
|
OSVERSIONINFOEXA versionInfo;
|
|
DWORDLONG conditionMask = 0;
|
|
|
|
ZeroMemory(&versionInfo, sizeof(OSVERSIONINFOEXA));
|
|
versionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEXA);
|
|
versionInfo.dwMajorVersion = majorVersion;
|
|
versionInfo.dwMinorVersion = minorVersion;
|
|
|
|
conditionMask = VerSetConditionMaskFunc(conditionMask, VER_MAJORVERSION, VER_GREATER_EQUAL);
|
|
conditionMask = VerSetConditionMaskFunc(conditionMask, VER_MINORVERSION, VER_GREATER_EQUAL);
|
|
|
|
return VerifyVersionInfoFunc(&versionInfo, VER_MAJORVERSION | VER_MINORVERSION, conditionMask);
|
|
}
|
|
|
|
wchar_t *ansiToUnicode(const char *s) {
|
|
DWORD size = MultiByteToWideChar(0, 0, s, -1, NULL, 0);
|
|
|
|
if (size > 0) {
|
|
LPWSTR result = new WCHAR[size];
|
|
if (MultiByteToWideChar(0, 0, s, -1, result, size) != 0)
|
|
return result;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
char *unicodeToAnsi(const wchar_t *s) {
|
|
DWORD size = WideCharToMultiByte(0, 0, s, -1, NULL, 0, 0, 0);
|
|
|
|
if (size > 0) {
|
|
char *result = new char[size];
|
|
if (WideCharToMultiByte(0, 0, s, -1, result, size, 0, 0) != 0)
|
|
return result;
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
}
|