[前][次][番号順一覧][スレッド一覧]

ruby-changes:17939

From: luislavena <ko1@a...>
Date: Sun, 28 Nov 2010 04:50:06 +0900 (JST)
Subject: [ruby-changes:17939] Ruby:r29955 (trunk): * io.c (io_fwrite): use rb_w32_write_console under Windows.

luislavena	2010-11-28 04:49:58 +0900 (Sun, 28 Nov 2010)

  New Revision: 29955

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

  Log:
    * io.c (io_fwrite): use rb_w32_write_console under Windows.
    
      * win32/win32.c (rb_w32_write_console): added to write to write
        Unicode using WriteConsoleW for stdout/stderr. [ruby-core:33166]

  Modified files:
    trunk/ChangeLog
    trunk/io.c
    trunk/win32/win32.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29954)
+++ ChangeLog	(revision 29955)
@@ -1,3 +1,10 @@
+Sun Nov 28 04:40:00 2010  Luis Lavena  <luislavena@g...>
+
+	* io.c (io_fwrite): use rb_w32_write_console under Windows.
+
+	* win32/win32.c (rb_w32_write_console): added to write to write
+	  Unicode using WriteConsoleW for stdout/stderr. [ruby-core:33166]
+
 Sun Nov 28 03:58:47 2010  NARUSE, Yui  <naruse@r...>
 
 	* lib/net/http.rb: improve rdoc.
Index: io.c
===================================================================
--- io.c	(revision 29954)
+++ io.c	(revision 29955)
@@ -961,6 +961,10 @@
 static long
 io_fwrite(VALUE str, rb_io_t *fptr, int nosync)
 {
+#ifdef _WIN32
+    long len = rb_w32_write_console(str, fptr->fd);
+    if (len > 0) return len;
+#endif
     str = do_writeconv(str, fptr);
     return io_binwrite(str, RSTRING_PTR(str), RSTRING_LEN(str),
 		       fptr, nosync);
Index: win32/win32.c
===================================================================
--- win32/win32.c	(revision 29954)
+++ win32/win32.c	(revision 29955)
@@ -5286,6 +5286,29 @@
     return ret;
 }
 
+long
+rb_w32_write_console(VALUE str, int fd)
+{
+    static int disable;
+    HANDLE handle;
+    DWORD dwMode, reslen;
+
+    if (disable) return -1L;
+    handle = (HANDLE)_osfhnd(fd);
+    if (!GetConsoleMode(handle, &dwMode) ||
+    !rb_econv_has_convpath_p(rb_enc_name(rb_enc_get(str)), "UTF-16LE"))
+    return -1L;
+
+    str = rb_str_encode(str, rb_enc_from_encoding(rb_enc_find("UTF-16LE")), 0,
+            Qnil);
+    if (!WriteConsoleW(handle, (LPWSTR)RSTRING_PTR(str), RSTRING_LEN(str)/2, &reslen, NULL)) {
+        if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
+            disable = TRUE;
+        return -1L;
+    }
+    return (long)reslen;
+}
+
 static int
 unixtime_to_filetime(time_t time, FILETIME *ft)
 {

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

[前][次][番号順一覧][スレッド一覧]