thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.0047: cannot skip tests for specific MS-Windows platform

Browse Source 
Problem:    Cannot skip tests for specific MS-Windows platform.
Solution:   Add windowsversion().
This commit is contained in:
Bram Moolenaar
2019-12-27 13:49:24 +01:00
parent 5666fcd0bd
commit 0c1e3744ff
7 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/os_win32.c
View File

@@ -758,8 +758,6 @@ null_libintl_wputenv(const wchar_t *envstring UNUSED)
# define VER_PLATFORM_WIN32_WINDOWS 1
#endif
DWORD g_PlatformId;
#ifdef HAVE_ACL
# ifndef PROTO
# include <aclapi.h>
@@ -806,8 +804,7 @@ win32_enable_privilege(LPTSTR lpszPrivilege, BOOL bEnable)
#endif
/*
* Set g_PlatformId to VER_PLATFORM_WIN32_NT (NT) or
* VER_PLATFORM_WIN32_WINDOWS (Win95).
* Set "win8_or_later" and fill in "windowsVersion".
*/
void
PlatformId(void)
@@ -821,7 +818,8 @@ PlatformId(void)
ovi.dwOSVersionInfoSize = sizeof(ovi);
GetVersionEx(&ovi);
g_PlatformId = ovi.dwPlatformId;
vim_snprintf(windowsVersion, sizeof(windowsVersion), "%d.%d",
(int)ovi.dwMajorVersion, (int)ovi.dwMinorVersion);
if ((ovi.dwMajorVersion == 6 && ovi.dwMinorVersion >= 2)
|| ovi.dwMajorVersion > 6)