kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* win32/win32.c (rb_w32_write_console): don't raise exception when

Browse source 
the conversion is for writing to console.
  Patched by Heesob Park [ruby-core:33999]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30440 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2010-12-31 19:26:30 +00:00
parent 74b08ff339
commit 4a744b3d78
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Jan 1 04:20:11 2011 NARUSE, Yui <naruse@ruby-lang.org>
* win32/win32.c (rb_w32_write_console): don't raise exception when
the conversion is for writing to console.
Patched by Heesob Park [ruby-core:33999]
Fri Dec 31 12:02:06 2010 Tanaka Akira <akr@fsij.org>
* enum.c (enum_sort_by): use less temporary objects.

4
win32/win32.c
View file

@ -5312,8 +5312,8 @@ rb_w32_write_console(uintptr_t strarg, int fd)
!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);
str = rb_str_encode(str, rb_enc_from_encoding(rb_enc_find("UTF-16LE")),
ECONV_INVALID_REPLACE|ECONV_UNDEF_REPLACE, Qnil);
if (!WriteConsoleW(handle, (LPWSTR)RSTRING_PTR(str), RSTRING_LEN(str)/2,
&reslen, NULL)) {
if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)