aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.4.163

Browse Source 
Problem:    MS-Windows input doesn't work properly on Windows 7 and earlier.
Solution:   Add a check for Windows 8. (Yasuhiro Matsumoto)
This commit is contained in:
Bram Moolenaar 2014-02-05 13:36:54 +01:00
parent 09edc46d01
commit f50eb7882e
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/os_win32.c
View File

@ -232,6 +232,8 @@ static int suppress_winsize = 1; /* don't fiddle with console */
static char_u *exe_path = NULL; static char_u *exe_path = NULL;
static BOOL win8_or_later = FALSE;
/* /*
* Version of ReadConsoleInput() that works with IME. * Version of ReadConsoleInput() that works with IME.
* Works around problems on Windows 8. * Works around problems on Windows 8.
@ -252,6 +254,13 @@ read_console_input(
static DWORD s_dwMax = 0; static DWORD s_dwMax = 0;
DWORD dwEvents; DWORD dwEvents;
if (!win8_or_later)
{
if (nLength == -1)
return PeekConsoleInput(hInput, lpBuffer, 1, lpEvents);
return ReadConsoleInput(hInput, lpBuffer, 1, &dwEvents);
}
if (s_dwMax == 0) if (s_dwMax == 0)
{ {
if (nLength == -1) if (nLength == -1)
@ -617,6 +626,10 @@ PlatformId(void)
g_PlatformId = ovi.dwPlatformId; g_PlatformId = ovi.dwPlatformId;
if ((ovi.dwMajorVersion == 6 && ovi.dwMinorVersion >= 2)
|| ovi.dwMajorVersion > 6)
win8_or_later = TRUE;
#ifdef HAVE_ACL #ifdef HAVE_ACL
/* /*
* Load the ADVAPI runtime if we are on anything * Load the ADVAPI runtime if we are on anything

2
src/version.c
View File

@ -738,6 +738,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
163,
/**/ /**/
162, 162,
/**/ /**/