aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-08 08:34:35 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-08 08:34:35 +0000
commitb0b2df253f676e747a338848485ed58111782df2 (patch)
tree7b5fa06bd484738a78fbb6489f4d50c11c410fb3
parent693b3353260e03d20752f28fdb5f3bfabac8a8c1 (diff)
downloadruby-b0b2df253f676e747a338848485ed58111782df2.tar.gz
* win32/win32.c (rb_w32_write_console): now no need to check
ERROR_CALL_NOT_IMPLEMENTED because it is for old Win9X. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/win32.c7
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 3c6fe83403..87717a5779 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 8 17:33:38 2016 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_write_console): now no need to check
+ ERROR_CALL_NOT_IMPLEMENTED because it is for old Win9X.
+
Tue Mar 8 16:54:29 2016 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_write_console): stop the VT100 emulation if the
diff --git a/win32/win32.c b/win32/win32.c
index ff314d380a..45c2f86a6d 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -7071,11 +7071,8 @@ rb_w32_write_console(uintptr_t strarg, int fd)
reslen = 0;
if (dwMode & 4) { /* ENABLE_VIRTUAL_TERMINAL_PROCESSING */
DWORD written;
- if (!WriteConsoleW(handle, ptr, len, &written, NULL)) {
- if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
- disable = TRUE;
+ if (!WriteConsoleW(handle, ptr, len, &written, NULL))
reslen = (DWORD)-1L;
- }
}
else {
while (len > 0) {
@@ -7084,8 +7081,6 @@ rb_w32_write_console(uintptr_t strarg, int fd)
if (curlen > 0) {
DWORD written;
if (!WriteConsoleW(handle, ptr, curlen, &written, NULL)) {
- if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
- disable = TRUE;
reslen = (DWORD)-1L;
break;
}