usa	2013-04-02 12:59:50 +0900 (Tue, 02 Apr 2013)

  New Revision: 40051

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=40051

  Log:
    merge revision(s) 37743: [Backport #7379]
    
    * 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]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/version.h
    branches/ruby_1_9_3/win32/win32.c

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 40050)
+++ ruby_1_9_3/ChangeLog	(revision 40051)
@@ -1,3 +1,9 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Tue Apr  2 12:59:35 2013  NAKAMURA Usaku  <usa@r...>
+
+	* 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 Apr  2 12:56:15 2013  Naohisa Goto  <ngotogenome@g...>
 
 	* signal.c (ruby_abort): fix typo in r39354 [Bug #5014]
Index: ruby_1_9_3/win32/win32.c
===================================================================
--- ruby_1_9_3/win32/win32.c	(revision 40050)
+++ ruby_1_9_3/win32/win32.c	(revision 40051)
@@ -5216,7 +5216,7 @@ rb_w32_read(int fd, void *buf, size_t si https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/win32/win32.c#L5216
     }
 
     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);
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 40050)
+++ ruby_1_9_3/version.h	(revision 40051)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 402
+#define RUBY_PATCHLEVEL 403
 
 #define RUBY_RELEASE_DATE "2013-04-02"
 #define RUBY_RELEASE_YEAR 2013

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r37743


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/