diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-20 03:07:23 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-20 03:07:23 +0000 |
commit | 0c3d96756ab470c71f3da579513a767f27fc08be (patch) | |
tree | 23777475a8a068418918cd541ed68c19e55ce6d3 | |
parent | bd0931f7b9a39dd48af48ebef5c2a13d7c3e3e56 (diff) | |
download | ruby-0c3d96756ab470c71f3da579513a767f27fc08be.tar.gz |
* win32/win32.c (rb_w32_read): Windows 8 fixed one of a bug of console
API.
based on the patch by Heesob Park at [ruby-core:49479] [Bug #7379]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37743 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | win32/win32.c | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Tue Nov 20 12:05:15 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (rb_w32_read): Windows 8 fixed one of a bug of console + API. + based on the patch by Heesob Park at [ruby-core:49479] [Bug #7379] + Tue Nov 20 11:14:33 2012 NARUSE, Yui <naruse@ruby-lang.org> * configure.in (--enable-dtrace): always call RUBY_DTRACE_BSD_BROKEN diff --git a/win32/win32.c b/win32/win32.c index 3446728a6a..d68a295f91 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -5902,7 +5902,7 @@ rb_w32_read(int fd, void *buf, size_t size) } ret = 0; - isconsole = is_console(_osfhnd(fd)); + isconsole = is_console(_osfhnd(fd)) && (osver.dwMajorVersion < 6 || (osver.dwMajorVersion == 6 && osver.dwMinorVersion < 2)); if (isconsole) { DWORD mode; GetConsoleMode((HANDLE)_osfhnd(fd),&mode); |