aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 9.0.0496: no good reason to keep supporting Windows-XP

Browse Source 
Problem:    No good reason to keep supporting Windows-XP.
Solution:   Drop Windows-XP support. (Ken Takata, closes #11089)
This commit is contained in:
K.Takata
2022-09-18 12:25:49 +01:00
committed by Bram Moolenaar
parent dbbb02bc77
commit 27b53be3a6
10 changed files with 70 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@@ -28,10 +28,10 @@ All commands are given with normal keyboard characters, so those who can type
with ten fingers can work very fast. Additionally, function keys can be with ten fingers can work very fast. Additionally, function keys can be
mapped to commands by the user, and the mouse can be used. mapped to commands by the user, and the mouse can be used.
Vim runs under MS-Windows (XP, Vista, 7, 8, 10), macOS, Haiku, VMS and almost Vim runs under MS-Windows (7, 8, 10, 11), macOS, Haiku, VMS and almost all
all flavours of UNIX. Porting to other systems should not be very difficult. flavours of UNIX. Porting to other systems should not be very difficult.
Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000, Amiga DOS, Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000/XP/Vista,
Atari MiNT, BeOS, RISC OS and OS/2. These are no longer maintained. Amiga DOS, Atari MiNT, BeOS, RISC OS and OS/2. These are no longer maintained.
For Vim9 script see [README_VIM9](README_VIM9.md). For Vim9 script see [README_VIM9](README_VIM9.md).

6
README.txt
View File

@@ -16,10 +16,10 @@ All commands are given with normal keyboard characters, so those who can type
with ten fingers can work very fast. Additionally, function keys can be with ten fingers can work very fast. Additionally, function keys can be
mapped to commands by the user, and the mouse can be used. mapped to commands by the user, and the mouse can be used.
Vim runs under MS-Windows (XP, Vista, 7, 8, 10), macOS, VMS and almost all Vim runs under MS-Windows (7, 8, 10, 11), macOS, Haiku, VMS and almost all
flavours of UNIX. Porting to other systems should not be very difficult. flavours of UNIX. Porting to other systems should not be very difficult.
Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000, Amiga DOS, Older versions of Vim run on MS-DOS, MS-Windows 95/98/Me/NT/2000/XP/Vista,
Atari MiNT, BeOS, RISC OS and OS/2. These are no longer maintained. Amiga DOS, Atari MiNT, BeOS, RISC OS and OS/2. These are no longer maintained.
DISTRIBUTION DISTRIBUTION

3
runtime/doc/gui_w32.txt
View File

@@ -106,8 +106,7 @@ when you have got a new version):
You can also install Vim in the "Send To" menu: You can also install Vim in the "Send To" menu:
1. Start a Windows Explorer 1. Start a Windows Explorer
2. Navigate to your sendto directory: 2. Navigate to your sendto directory:
Windows XP: C:\Documents and Settings\%user%\SendTo C:\Users\%user%\AppData\Roaming\Microsoft\Windows\SendTo .
Windows Vista: C:\Users\%user%\AppData\Roaming\Microsoft\Windows\SendTo .
3. Right-click in the file pane and select New->Shortcut 3. Right-click in the file pane and select New->Shortcut
4. Follow the shortcut wizard, using the full path to VIM/GVIM. 4. Follow the shortcut wizard, using the full path to VIM/GVIM.

7
runtime/doc/os_win32.txt
View File

@@ -7,8 +7,11 @@
*win32* *Win32* *MS-Windows* *win32* *Win32* *MS-Windows*
This file documents the idiosyncrasies of the Win32 version of Vim. This file documents the idiosyncrasies of the Win32 version of Vim.
The Win32 version of Vim works on Windows XP, Vista, 7, 8, 10 and 11. There are The Win32 version of Vim works on Windows 7, 8, 10 and 11. There are both
both console and GUI versions. console and GUI versions.
If you have Windows XP or Vista then Vim 9.0 up to patch level 495 can be
used.
The 32 bit version also runs on 64 bit MS-Windows systems. The 32 bit version also runs on 64 bit MS-Windows systems.

35
src/INSTALLpc.txt
View File

@@ -12,7 +12,7 @@ this, then you will get the default behavior as is documented, which should
be fine for most people. be fine for most people.
This document assumes that you are building Vim for Win32 or later (Windows This document assumes that you are building Vim for Win32 or later (Windows
XP/2003/Vista/7/8/10). There are also instructions for pre-XP systems, but 7/8/10/11). There are also instructions for pre-Vista and pre-XP systems, but
they might no longer work. they might no longer work.
The recommended way is to build a 32 bit Vim, also on 64 bit systems. You can The recommended way is to build a 32 bit Vim, also on 64 bit systems. You can
@@ -42,9 +42,9 @@ Contents:
The currently recommended way (that means it has been verified to work) is The currently recommended way (that means it has been verified to work) is
using the "Visual Studio Community 2015" installation. This includes the SDK using the "Visual Studio Community 2015" installation. This doesn't include
needed to target Windows XP. But not older Windows versions (95, 98), see the SDK for older Windows versions (95, 98), see "OLDER VERSIONS" below for
"OLDER VERSIONS" below for that. that.
1. Microsoft Visual C++ 1. Microsoft Visual C++
@@ -57,16 +57,17 @@ execute the installer from it.
When installing "Visual Studio Community 2015 with Update 3" or "Visual C++ When installing "Visual Studio Community 2015 with Update 3" or "Visual C++
Build Tools for Visual Studio 2015 with Update 3" make sure to Build Tools for Visual Studio 2015 with Update 3" make sure to
select "custom" and check "Windows XP Support for C++" and all checkboxes select "custom" and check all checkboxes under "Universal Windows App
under "Universal Windows App Development Tools". Or whatever they are called Development Tools". Or whatever they are called now.
now. (If you still want to target Windows XP, check also "Windows XP Support for
C++". Note that this is no longer supported.)
Visual Studio Visual Studio
------------- -------------
Building with Visual Studio (VS2010, VS2012, VS2013, VS2015, VS2017 and VS2019) Building with Visual Studio (VS2010, VS2012, VS2013, VS2015, VS2017, VS2019
is straightforward. and VS2022) is straightforward.
To build Vim from the command line with MSVC, use Make_mvc.mak. To build Vim from the command line with MSVC, use Make_mvc.mak.
Visual Studio installed a batch file called vcvars32.bat, which you must Visual Studio installed a batch file called vcvars32.bat, which you must
@@ -104,6 +105,9 @@ Vim with Make_mvc.mak.
Targeting Windows XP with MSVC 2012 and later *new-msvc-windows-xp* Targeting Windows XP with MSVC 2012 and later *new-msvc-windows-xp*
--------------------------------------------- ---------------------------------------------
(The support for pre-Vista was removed in patch 9.0.0xxx. If you want to
target Windows XP, use the source code before that.)
Beginning with Visual C++ 2012, Microsoft changed the behavior of LINK.EXE Beginning with Visual C++ 2012, Microsoft changed the behavior of LINK.EXE
so that it targets Windows 6.0 (Vista) by default. In order to override so that it targets Windows 6.0 (Vista) by default. In order to override
this, the target Windows version number needs to be passed to LINK like this, the target Windows version number needs to be passed to LINK like
@@ -141,9 +145,6 @@ compiler by using the "x64" option:
The following Visual C++ team blog can serve as a reference page: The following Visual C++ team blog can serve as a reference page:
http://blogs.msdn.com/b/vcblog/archive/2012/10/08/windows-xp-targeting-with-c-in-visual-studio-2012.aspx http://blogs.msdn.com/b/vcblog/archive/2012/10/08/windows-xp-targeting-with-c-in-visual-studio-2012.aspx
VC 2019 dropped support for targeting Windows XP. If you want a binary that
targeting Windows XP, use VC 2017 or earlier.
Cross compile support for Windows on ARM64 Cross compile support for Windows on ARM64
------------------------------------------ ------------------------------------------
@@ -156,7 +157,7 @@ The ARM64 support was provided by Leendert van Doorn.
OLDER VERSIONS OLDER VERSIONS
The minimal supported version is Windows XP. Building with older compilers The minimal supported version is Windows 7. Building with older compilers
might still work, but these instructions might be outdated. might still work, but these instructions might be outdated.
If you need the executable to run on Windows 98 or ME, use the 2005 one If you need the executable to run on Windows 98 or ME, use the 2005 one
@@ -774,12 +775,12 @@ config.h and Ruby's DLL name. Here are the steps for working around them:
nmake -f Make_mvc.mak nmake -f Make_mvc.mak
RUBY=C:\Ruby24 DYNAMIC_RUBY=yes RUBY_VER=24 RUBY_API_VER_LONG=2.4.0 RUBY=C:\Ruby24 DYNAMIC_RUBY=yes RUBY_VER=24 RUBY_API_VER_LONG=2.4.0
RUBY_MSVCRT_NAME=msvcrt RUBY_MSVCRT_NAME=msvcrt
WINVER=0x501 WINVER=0x601
For 64-bit version, replace RUBY=C:\Ruby24 with RUBY=C:\Ruby24-x64. For 64-bit version, replace RUBY=C:\Ruby24 with RUBY=C:\Ruby24-x64.
If you set WINVER explicitly, it must be set to >=0x500, when building If you set WINVER explicitly, it must be set to >=0x500, when building
with Ruby 2.1 or later. (Default is 0x501.) with Ruby 2.1 or later. (Default is 0x601.)
When using this trick, you also need to set RUBY_MSVCRT_NAME to msvcrt When using this trick, you also need to set RUBY_MSVCRT_NAME to msvcrt
which is used for the Ruby's DLL name. which is used for the Ruby's DLL name.
@@ -790,11 +791,11 @@ After you install RubyInstaller, just type this (as one line):
mingw32-make -f Make_ming.mak mingw32-make -f Make_ming.mak
RUBY=C:/Ruby24 DYNAMIC_RUBY=yes RUBY_VER=24 RUBY_API_VER_LONG=2.4.0 RUBY=C:/Ruby24 DYNAMIC_RUBY=yes RUBY_VER=24 RUBY_API_VER_LONG=2.4.0
WINVER=0x600 WINVER=0x601
For 64-bit version, replace RUBY=C:/Ruby24 with RUBY=C:/Ruby24-x64. For 64-bit version, replace RUBY=C:/Ruby24 with RUBY=C:/Ruby24-x64.
If you set WINVER explicitly, it must be set to >=0x500, when building with If you set WINVER explicitly, it must be set to >=0x500, when building with
Ruby 2.1 or later. (Default is 0x600.) Ruby 2.1 or later. (Default is 0x601.)

7
src/Make_cyg_ming.mak
View File

@@ -87,10 +87,9 @@ POSTSCRIPT=no
# Set to yes to enable OLE support. # Set to yes to enable OLE support.
OLE=no OLE=no
# Set the default $(WINVER). Use 0x0501 to make it work with WinXP. # Set the default $(WINVER). Use 0x0601 to make it work with Windows 7.
ifndef WINVER ifndef WINVER
# WINVER = 0x0501 WINVER = 0x0601
WINVER = 0x0600
endif endif
# Set to yes to enable Cscope support. # Set to yes to enable Cscope support.
@@ -1321,7 +1320,7 @@ ifeq (16, $(RUBY))
endif endif
$(OUTDIR)/iscygpty.o: iscygpty.c $(CUI_INCL) $(OUTDIR)/iscygpty.o: iscygpty.c $(CUI_INCL)
$(CC) -c $(CFLAGS) iscygpty.c -o $(OUTDIR)/iscygpty.o -U_WIN32_WINNT -D_WIN32_WINNT=0x0600 -DUSE_DYNFILEID -DENABLE_STUB_IMPL $(CC) -c $(CFLAGS) iscygpty.c -o $@
$(OUTDIR)/main.o: main.c $(INCL) $(CUI_INCL) $(OUTDIR)/main.o: main.c $(INCL) $(CUI_INCL)
$(CC) -c $(CFLAGS) main.c -o $@ $(CC) -c $(CFLAGS) main.c -o $@

42
src/Make_mvc.mak
View File

@@ -1,7 +1,7 @@
# Makefile for Vim on Win32 (Windows XP/2003/Vista/7/8/10) and Win64, # Makefile for Vim on Win32 (Windows 7/8/10/11) and Win64, using the Microsoft
# using the Microsoft Visual C++ compilers. Known to work with VC10 (VS2010), # Visual C++ compilers. Known to work with VC10 (VS2010), VC11 (VS2012), VC12
# VC11 (VS2012), VC12 (VS2013), VC14 (VS2015), VC14.1 (VS2017) and # (VS2013), VC14 (VS2015), VC14.1 (VS2017), VC14.2 (VS2019) and VC14.3
# VC14.2 (VS2019). # (VS2022).
# #
# To build using other Windows compilers, see INSTALLpc.txt # To build using other Windows compilers, see INSTALLpc.txt
# #
@@ -128,13 +128,13 @@
# #
# Optimization: OPTIMIZE=[SPACE, SPEED, MAXSPEED] (default is MAXSPEED) # Optimization: OPTIMIZE=[SPACE, SPEED, MAXSPEED] (default is MAXSPEED)
# #
# Processor Version: CPUNR=[any, i586, i686, sse, sse2, avx, avx2] (default is # Processor Version: CPUNR=[any, i686, sse, sse2, avx, avx2] (default is
# any) # sse2)
# avx is available on Visual C++ 2010 and after. # avx is available on Visual C++ 2010 and after.
# avx2 is available on Visual C++ 2013 Update 2 and after. # avx2 is available on Visual C++ 2013 Update 2 and after.
# #
# Version Support: WINVER=[0x0501, 0x0502, 0x0600, 0x0601, 0x0602, # Version Support: WINVER=[0x0601, 0x0602, 0x0603, 0x0A00] (default is
# 0x0603, 0x0A00] (default is 0x0501) # 0x0601)
# Supported versions depends on your target SDK, check SDKDDKVer.h # Supported versions depends on your target SDK, check SDKDDKVer.h
# See https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt # See https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt
# #
@@ -303,9 +303,9 @@ MSVCRT_NAME = msvcr$(MSVCRT_VER)
MSVCRT_NAME = vcruntime$(MSVCRT_VER) MSVCRT_NAME = vcruntime$(MSVCRT_VER)
!endif !endif
### Set the default $(WINVER) to make it work with VC++7.0 (VS.NET) ### Set the default $(WINVER) to make it work with Windows 7
!ifndef WINVER !ifndef WINVER
WINVER = 0x0501 WINVER = 0x0601
!endif !endif
# Use multiprocess build # Use multiprocess build
@@ -523,27 +523,27 @@ OUTDIR=$(OBJDIR)
### Validate CPUNR ### Validate CPUNR
!ifndef CPUNR !ifndef CPUNR
# default to untargeted code # default to SSE2
CPUNR = any CPUNR = sse2
!elseif "$(CPUNR)" == "i386" || "$(CPUNR)" == "i486" !elseif "$(CPUNR)" == "i386" || "$(CPUNR)" == "i486" || "$(CPUNR)" == "i586"
# alias i386 and i486 to i586 # alias i386, i486 and i586 to i686
! message *** WARNING CPUNR=$(CPUNR) is not a valid target architecture. ! message *** WARNING CPUNR=$(CPUNR) is not a valid target architecture.
! message Windows XP is the minimum target OS, with a minimum target ! message Windows 7 is the minimum target OS, with a minimum target
! message architecture of i586. ! message architecture of i686.
! message Retargeting to i586 ! message Retargeting to i686
CPUNR = i586 CPUNR = i686
!elseif "$(CPUNR)" == "pentium4" !elseif "$(CPUNR)" == "pentium4"
# alias pentium4 to sse2 # alias pentium4 to sse2
! message *** WARNING CPUNR=pentium4 is deprecated in favour of sse2. ! message *** WARNING CPUNR=pentium4 is deprecated in favour of sse2.
! message Retargeting to sse2. ! message Retargeting to sse2.
CPUNR = sse2 CPUNR = sse2
!elseif "$(CPUNR)" != "any" && "$(CPUNR)" != "i586" && "$(CPUNR)" != "i686" && "$(CPUNR)" != "sse" && "$(CPUNR)" != "sse2" && "$(CPUNR)" != "avx" && "$(CPUNR)" != "avx2" !elseif "$(CPUNR)" != "any" && "$(CPUNR)" != "i686" && "$(CPUNR)" != "sse" && "$(CPUNR)" != "sse2" && "$(CPUNR)" != "avx" && "$(CPUNR)" != "avx2"
! error *** ERROR Unknown target architecture "$(CPUNR)". Make aborted. ! error *** ERROR Unknown target architecture "$(CPUNR)". Make aborted.
!endif !endif
# Convert processor ID to MVC-compatible number # Convert processor ID to MVC-compatible number
# IA32/SSE/SSE2 are only supported on x86 # IA32/SSE/SSE2 are only supported on x86
!if "$(ASSEMBLY_ARCHITECTURE)" == "i386" && ("$(CPUNR)" == "i586" || "$(CPUNR)" == "i686" || "$(CPUNR)" == "any") !if "$(ASSEMBLY_ARCHITECTURE)" == "i386" && ("$(CPUNR)" == "i686" || "$(CPUNR)" == "any")
# VC<11 generates fp87 code by default # VC<11 generates fp87 code by default
! if $(MSVC_MAJOR) < 11 ! if $(MSVC_MAJOR) < 11
CPUARG = CPUARG =
@@ -1684,7 +1684,7 @@ $(OUTDIR)/if_tcl.obj: $(OUTDIR) if_tcl.c $(INCL)
$(CC) $(CFLAGS_OUTDIR) $(TCL_INC) if_tcl.c $(CC) $(CFLAGS_OUTDIR) $(TCL_INC) if_tcl.c
$(OUTDIR)/iscygpty.obj: $(OUTDIR) iscygpty.c $(CUI_INCL) $(OUTDIR)/iscygpty.obj: $(OUTDIR) iscygpty.c $(CUI_INCL)
$(CC) $(CFLAGS_OUTDIR) iscygpty.c -D_WIN32_WINNT=0x0600 -DUSE_DYNFILEID -DENABLE_STUB_IMPL $(CC) $(CFLAGS_OUTDIR) iscygpty.c
$(OUTDIR)/job.obj: $(OUTDIR) job.c $(INCL) $(OUTDIR)/job.obj: $(OUTDIR) job.c $(INCL)

25
src/os_mswin.c
View File

@@ -1744,13 +1744,6 @@ mch_print_set_fg(long_u fgcol)
# include <shlobj.h> # include <shlobj.h>
# endif # endif
typedef BOOL (WINAPI *pfnGetFinalPathNameByHandleW)(
HANDLE hFile,
LPWSTR lpszFilePath,
DWORD cchFilePath,
DWORD dwFlags);
static pfnGetFinalPathNameByHandleW pGetFinalPathNameByHandleW = NULL;
# define is_path_sep(c) ((c) == L'\\' || (c) == L'/') # define is_path_sep(c) ((c) == L'\\' || (c) == L'/')
static int static int
@@ -1792,20 +1785,6 @@ resolve_reparse_point(char_u *fname)
WCHAR *p, *wp; WCHAR *p, *wp;
char_u *rfname = NULL; char_u *rfname = NULL;
WCHAR *buff = NULL; WCHAR *buff = NULL;
static BOOL loaded = FALSE;
if (pGetFinalPathNameByHandleW == NULL)
{
HMODULE hmod = GetModuleHandle("kernel32.dll");
if (loaded == TRUE)
return NULL;
pGetFinalPathNameByHandleW = (pfnGetFinalPathNameByHandleW)
GetProcAddress(hmod, "GetFinalPathNameByHandleW");
loaded = TRUE;
if (pGetFinalPathNameByHandleW == NULL)
return NULL;
}
p = enc_to_utf16(fname, NULL); p = enc_to_utf16(fname, NULL);
if (p == NULL) if (p == NULL)
@@ -1824,13 +1803,13 @@ resolve_reparse_point(char_u *fname)
if (h == INVALID_HANDLE_VALUE) if (h == INVALID_HANDLE_VALUE)
goto fail; goto fail;
size = pGetFinalPathNameByHandleW(h, NULL, 0, 0); size = GetFinalPathNameByHandleW(h, NULL, 0, 0);
if (size == 0) if (size == 0)
goto fail; goto fail;
buff = ALLOC_MULT(WCHAR, size); buff = ALLOC_MULT(WCHAR, size);
if (buff == NULL) if (buff == NULL)
goto fail; goto fail;
if (pGetFinalPathNameByHandleW(h, buff, size, 0) == 0) if (GetFinalPathNameByHandleW(h, buff, size, 0) == 0)
goto fail; goto fail;
if (wcsncmp(buff, L"\\\\?\\UNC\\", 8) == 0) if (wcsncmp(buff, L"\\\\?\\UNC\\", 8) == 0)

66
src/os_win32.c
View File

@@ -243,27 +243,6 @@ static char_u *exe_path = NULL;
static BOOL win8_or_later = FALSE; static BOOL win8_or_later = FALSE;
#if !defined(FEAT_GUI_MSWIN) || defined(VIMDLL)
// Dynamic loading for portability
typedef struct _DYN_CONSOLE_SCREEN_BUFFER_INFOEX
{
ULONG cbSize;
COORD dwSize;
COORD dwCursorPosition;
WORD wAttributes;
SMALL_RECT srWindow;
COORD dwMaximumWindowSize;
WORD wPopupAttributes;
BOOL bFullscreenSupported;
COLORREF ColorTable[16];
} DYN_CONSOLE_SCREEN_BUFFER_INFOEX, *PDYN_CONSOLE_SCREEN_BUFFER_INFOEX;
typedef BOOL (WINAPI *PfnGetConsoleScreenBufferInfoEx)(HANDLE, PDYN_CONSOLE_SCREEN_BUFFER_INFOEX);
static PfnGetConsoleScreenBufferInfoEx pGetConsoleScreenBufferInfoEx;
typedef BOOL (WINAPI *PfnSetConsoleScreenBufferInfoEx)(HANDLE, PDYN_CONSOLE_SCREEN_BUFFER_INFOEX);
static PfnSetConsoleScreenBufferInfoEx pSetConsoleScreenBufferInfoEx;
static BOOL has_csbiex = FALSE;
#endif
/* /*
* Get version number including build number * Get version number including build number
*/ */
@@ -7882,30 +7861,13 @@ vtp_flag_init(void)
static void static void
vtp_init(void) vtp_init(void)
{ {
HMODULE hKerneldll; CONSOLE_SCREEN_BUFFER_INFOEX csbi;
DYN_CONSOLE_SCREEN_BUFFER_INFOEX csbi;
# ifdef FEAT_TERMGUICOLORS # ifdef FEAT_TERMGUICOLORS
COLORREF fg; COLORREF fg;
# endif # endif
// Use functions supported from Vista
hKerneldll = GetModuleHandle("kernel32.dll");
if (hKerneldll != NULL)
{
pGetConsoleScreenBufferInfoEx =
(PfnGetConsoleScreenBufferInfoEx)GetProcAddress(
hKerneldll, "GetConsoleScreenBufferInfoEx");
pSetConsoleScreenBufferInfoEx =
(PfnSetConsoleScreenBufferInfoEx)GetProcAddress(
hKerneldll, "SetConsoleScreenBufferInfoEx");
if (pGetConsoleScreenBufferInfoEx != NULL
&& pSetConsoleScreenBufferInfoEx != NULL)
has_csbiex = TRUE;
}
csbi.cbSize = sizeof(csbi); csbi.cbSize = sizeof(csbi);
if (has_csbiex) GetConsoleScreenBufferInfoEx(g_hConOut, &csbi);
pGetConsoleScreenBufferInfoEx(g_hConOut, &csbi);
save_console_bg_rgb = (guicolor_T)csbi.ColorTable[g_color_index_bg]; save_console_bg_rgb = (guicolor_T)csbi.ColorTable[g_color_index_bg];
save_console_fg_rgb = (guicolor_T)csbi.ColorTable[g_color_index_fg]; save_console_fg_rgb = (guicolor_T)csbi.ColorTable[g_color_index_fg];
store_console_bg_rgb = save_console_bg_rgb; store_console_bg_rgb = save_console_bg_rgb;
@@ -8134,7 +8096,7 @@ ctermtoxterm(
set_console_color_rgb(void) set_console_color_rgb(void)
{ {
# ifdef FEAT_TERMGUICOLORS # ifdef FEAT_TERMGUICOLORS
DYN_CONSOLE_SCREEN_BUFFER_INFOEX csbi; CONSOLE_SCREEN_BUFFER_INFOEX csbi;
guicolor_T fg, bg; guicolor_T fg, bg;
int ctermfg, ctermbg; int ctermfg, ctermbg;
@@ -8154,8 +8116,7 @@ set_console_color_rgb(void)
bg = (GetRValue(bg) << 16) | (GetGValue(bg) << 8) | GetBValue(bg); bg = (GetRValue(bg) << 16) | (GetGValue(bg) << 8) | GetBValue(bg);
csbi.cbSize = sizeof(csbi); csbi.cbSize = sizeof(csbi);
if (has_csbiex) GetConsoleScreenBufferInfoEx(g_hConOut, &csbi);
pGetConsoleScreenBufferInfoEx(g_hConOut, &csbi);
csbi.cbSize = sizeof(csbi); csbi.cbSize = sizeof(csbi);
csbi.srWindow.Right += 1; csbi.srWindow.Right += 1;
@@ -8164,8 +8125,7 @@ set_console_color_rgb(void)
store_console_fg_rgb = csbi.ColorTable[g_color_index_fg]; store_console_fg_rgb = csbi.ColorTable[g_color_index_fg];
csbi.ColorTable[g_color_index_bg] = (COLORREF)bg; csbi.ColorTable[g_color_index_bg] = (COLORREF)bg;
csbi.ColorTable[g_color_index_fg] = (COLORREF)fg; csbi.ColorTable[g_color_index_fg] = (COLORREF)fg;
if (has_csbiex) SetConsoleScreenBufferInfoEx(g_hConOut, &csbi);
pSetConsoleScreenBufferInfoEx(g_hConOut, &csbi);
# endif # endif
} }
@@ -8231,22 +8191,20 @@ get_default_console_color(
reset_console_color_rgb(void) reset_console_color_rgb(void)
{ {
# ifdef FEAT_TERMGUICOLORS # ifdef FEAT_TERMGUICOLORS
DYN_CONSOLE_SCREEN_BUFFER_INFOEX csbi; CONSOLE_SCREEN_BUFFER_INFOEX csbi;
if (USE_WT) if (USE_WT)
return; return;
csbi.cbSize = sizeof(csbi); csbi.cbSize = sizeof(csbi);
if (has_csbiex) GetConsoleScreenBufferInfoEx(g_hConOut, &csbi);
pGetConsoleScreenBufferInfoEx(g_hConOut, &csbi);
csbi.cbSize = sizeof(csbi); csbi.cbSize = sizeof(csbi);
csbi.srWindow.Right += 1; csbi.srWindow.Right += 1;
csbi.srWindow.Bottom += 1; csbi.srWindow.Bottom += 1;
csbi.ColorTable[g_color_index_bg] = (COLORREF)store_console_bg_rgb; csbi.ColorTable[g_color_index_bg] = (COLORREF)store_console_bg_rgb;
csbi.ColorTable[g_color_index_fg] = (COLORREF)store_console_fg_rgb; csbi.ColorTable[g_color_index_fg] = (COLORREF)store_console_fg_rgb;
if (has_csbiex) SetConsoleScreenBufferInfoEx(g_hConOut, &csbi);
pSetConsoleScreenBufferInfoEx(g_hConOut, &csbi);
# endif # endif
} }
@@ -8257,19 +8215,17 @@ reset_console_color_rgb(void)
restore_console_color_rgb(void) restore_console_color_rgb(void)
{ {
# ifdef FEAT_TERMGUICOLORS # ifdef FEAT_TERMGUICOLORS
DYN_CONSOLE_SCREEN_BUFFER_INFOEX csbi; CONSOLE_SCREEN_BUFFER_INFOEX csbi;
csbi.cbSize = sizeof(csbi); csbi.cbSize = sizeof(csbi);
if (has_csbiex) GetConsoleScreenBufferInfoEx(g_hConOut, &csbi);
pGetConsoleScreenBufferInfoEx(g_hConOut, &csbi);
csbi.cbSize = sizeof(csbi); csbi.cbSize = sizeof(csbi);
csbi.srWindow.Right += 1; csbi.srWindow.Right += 1;
csbi.srWindow.Bottom += 1; csbi.srWindow.Bottom += 1;
csbi.ColorTable[g_color_index_bg] = (COLORREF)save_console_bg_rgb; csbi.ColorTable[g_color_index_bg] = (COLORREF)save_console_bg_rgb;
csbi.ColorTable[g_color_index_fg] = (COLORREF)save_console_fg_rgb; csbi.ColorTable[g_color_index_fg] = (COLORREF)save_console_fg_rgb;
if (has_csbiex) SetConsoleScreenBufferInfoEx(g_hConOut, &csbi);
pSetConsoleScreenBufferInfoEx(g_hConOut, &csbi);
# endif # endif
} }

2
src/version.c
View File

@@ -699,6 +699,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 */
/**/
496,
/**/ /**/
495, 495,
/**/ /**/