1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* win32/win32.c (rb_w32_write_console): should return the count of

Browse Source 
actually eaten characters, include escape sequences.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50610 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2015-05-22 18:13:32 +00:00
parent 3f4aab1621
commit 7ceb9ecc31
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat May 23 03:10:58 2015 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (rb_w32_write_console): should return the count of
actually eaten characters, include escape sequences.
Fri May 22 22:36:14 2015 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/prime.rb: Remove obsolete Prime.new

5
win32/win32.c
View File

@ -6813,10 +6813,13 @@ rb_w32_write_console(uintptr_t strarg, int fd)
len = RSTRING_LEN(str) / sizeof(WCHAR);
break;
}
reslen = 0;
while (len > 0) {
long curlen = constat_parse(handle, s, (next = ptr, &next), &len);
reslen += next - ptr;
if (curlen > 0) {
if (!WriteConsoleW(handle, ptr, curlen, &reslen, NULL)) {
long written;
if (!WriteConsoleW(handle, ptr, curlen, &written, NULL)) {
if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
disable = TRUE;
reslen = (DWORD)-1L;