archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-19 02:23:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

merge revision(s) b94b7965c4: [Backport #17639]

Browse source 
Fixed fallback ENABLE_VIRTUAL_TERMINAL_PROCESSING value [Bug #17639]

	---
	 ruby.c        | 2 +-
	 win32/win32.c | 4 ++--
	 2 files changed, 3 insertions(+), 3 deletions(-)
This commit is contained in:
NARUSE, Yui 2021-03-02 18:29:05 +09:00
parent a6dec2e144
commit 3e67bfe202
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ruby.c
View file

@ -1657,7 +1657,7 @@ tty_enabled(void)
DWORD m; DWORD m;
if (!GetConsoleMode(h, &m)) return 0; if (!GetConsoleMode(h, &m)) return 0;
# ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING # ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
# define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x200 # define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x4
# endif # endif
if (!(m & ENABLE_VIRTUAL_TERMINAL_PROCESSING)) return 0; if (!(m & ENABLE_VIRTUAL_TERMINAL_PROCESSING)) return 0;
return 1; return 1;

2
version.h
View file

@ -12,7 +12,7 @@
# define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 45 #define RUBY_PATCHLEVEL 46
#define RUBY_RELEASE_YEAR 2021 #define RUBY_RELEASE_YEAR 2021
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3

4
win32/win32.c
View file

@ -2693,7 +2693,7 @@ init_stdhandle(void)
DWORD m; DWORD m;
if (GetConsoleMode(h, &m)) { if (GetConsoleMode(h, &m)) {
#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING #ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x200 #define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x4
#endif #endif
SetConsoleMode(h, m | ENABLE_VIRTUAL_TERMINAL_PROCESSING); SetConsoleMode(h, m | ENABLE_VIRTUAL_TERMINAL_PROCESSING);
} }
@ -7285,7 +7285,7 @@ rb_w32_write_console(uintptr_t strarg, int fd)
break; break;
} }
reslen = 0; reslen = 0;
if (dwMode & 4) { /* ENABLE_VIRTUAL_TERMINAL_PROCESSING */ if (dwMode & ENABLE_VIRTUAL_TERMINAL_PROCESSING) {
if (!WriteConsoleW(handle, ptr, len, &reslen, NULL)) if (!WriteConsoleW(handle, ptr, len, &reslen, NULL))
reslen = (DWORD)-1L; reslen = (DWORD)-1L;
} }