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.c: conversion to WCHAR

Browse source 
* win32/win32.c (rb_w32_write_console): use MultiByteToWideChar() for
  the last step of conversion to WCHAR, to get rid of warnings from
  rb_enc_find() in miniruby.  [ruby-dev:47584] [Bug #8733]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42385 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-08-05 08:38:39 +00:00
parent 0f6cd1bb10
commit 8d564597fa
3 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,4 +1,8 @@
Mon Aug 5 17:33:18 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Aug 5 17:38:15 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (rb_w32_write_console): use MultiByteToWideChar() for
the last step of conversion to WCHAR, to get rid of warnings from
rb_enc_find() in miniruby. [ruby-dev:47584] [Bug #8733]
* win32/win32.c (wstr_to_mbstr, mbstr_to_wstr): fix wrong trimming. * win32/win32.c (wstr_to_mbstr, mbstr_to_wstr): fix wrong trimming.
WideCharToMultiByte() and MultiByteToWideChar() do not count WideCharToMultiByte() and MultiByteToWideChar() do not count

2
common.mk
View file

@ -836,7 +836,7 @@ utf_8.$(OBJEXT): {$(VPATH)}utf_8.c {$(VPATH)}regenc.h {$(VPATH)}config.h \
{$(VPATH)}oniguruma.h {$(VPATH)}missing.h $(RUBY_H_INCLUDES) {$(VPATH)}oniguruma.h {$(VPATH)}missing.h $(RUBY_H_INCLUDES)
win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c {$(VPATH)}dln.h {$(VPATH)}dln_find.c \ win32/win32.$(OBJEXT): {$(VPATH)}win32/win32.c {$(VPATH)}dln.h {$(VPATH)}dln_find.c \
$(RUBY_H_INCLUDES) $(PLATFORM_D) {$(VPATH)}internal.h $(RUBY_H_INCLUDES) $(PLATFORM_D)
win32/file.$(OBJEXT): {$(VPATH)}win32/file.c $(RUBY_H_INCLUDES) $(PLATFORM_D) win32/file.$(OBJEXT): {$(VPATH)}win32/file.c $(RUBY_H_INCLUDES) $(PLATFORM_D)
$(NEWLINE_C): $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb $(NEWLINE_C): $(srcdir)/enc/trans/newline.trans $(srcdir)/tool/transcode-tblgen.rb

36
win32/win32.c
View file

@ -48,6 +48,7 @@
#endif #endif
#include "ruby/win32.h" #include "ruby/win32.h"
#include "win32/dir.h" #include "win32/dir.h"
#include "internal.h"
#define isdirsep(x) ((x) == '/' || (x) == '\\') #define isdirsep(x) ((x) == '/' || (x) == '\\')
#if defined _MSC_VER && _MSC_VER <= 1200 #if defined _MSC_VER && _MSC_VER <= 1200
@ -466,8 +467,6 @@ get_system_directory(WCHAR *path, UINT len)
return GetWindowsDirectoryW(path, len); return GetWindowsDirectoryW(path, len);
} }
#define numberof(array) (sizeof(array) / sizeof(*array))
/* License: Ruby's */ /* License: Ruby's */
VALUE VALUE
rb_w32_special_folder(int type) rb_w32_special_folder(int type)
@ -6397,34 +6396,51 @@ rb_w32_write_console(uintptr_t strarg, int fd)
HANDLE handle; HANDLE handle;
DWORD dwMode, reslen; DWORD dwMode, reslen;
VALUE str = strarg; VALUE str = strarg;
rb_encoding *utf16 = rb_enc_find("UTF-16LE"); int encindex;
WCHAR *wbuffer = 0;
const WCHAR *ptr, *next; const WCHAR *ptr, *next;
struct constat *s; struct constat *s;
long len; long len;
if (disable) return -1L; if (disable) return -1L;
handle = (HANDLE)_osfhnd(fd); handle = (HANDLE)_osfhnd(fd);
if (!GetConsoleMode(handle, &dwMode) || if (!GetConsoleMode(handle, &dwMode))
!rb_econv_has_convpath_p(rb_enc_name(rb_enc_get(str)), "UTF-16LE"))
return -1L; return -1L;
str = rb_str_encode(str, rb_enc_from_encoding(utf16),
ECONV_INVALID_REPLACE|ECONV_UNDEF_REPLACE, Qnil);
ptr = (const WCHAR *)RSTRING_PTR(str);
len = RSTRING_LEN(str) / sizeof(WCHAR);
s = constat_handle(handle); s = constat_handle(handle);
encindex = ENCODING_GET(str);
switch (encindex) {
default:
if (!rb_econv_has_convpath_p(rb_enc_name(rb_enc_from_index(encindex)), "UTF-8"))
return -1L;
str = rb_str_conv_enc_opts(str, NULL, rb_enc_from_index(ENCINDEX_UTF_8),
ECONV_INVALID_REPLACE|ECONV_UNDEF_REPLACE, Qnil);
/* fall through */
case ENCINDEX_US_ASCII:
case ENCINDEX_ASCII:
/* assume UTF-8 */
case ENCINDEX_UTF_8:
ptr = wbuffer = mbstr_to_wstr(CP_UTF8, RSTRING_PTR(str), RSTRING_LEN(str), &len);
break;
case ENCINDEX_UTF_16LE:
ptr = (const WCHAR *)RSTRING_PTR(str);
len = RSTRING_LEN(str) / sizeof(WCHAR);
break;
}
while (len > 0) { while (len > 0) {
long curlen = constat_parse(handle, s, (next = ptr, &next), &len); long curlen = constat_parse(handle, s, (next = ptr, &next), &len);
if (curlen > 0) { if (curlen > 0) {
if (!WriteConsoleW(handle, ptr, curlen, &reslen, NULL)) { if (!WriteConsoleW(handle, ptr, curlen, &reslen, NULL)) {
if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED) if (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)
disable = TRUE; disable = TRUE;
return -1L; reslen = (DWORD)-1L;
break;
} }
} }
ptr = next; ptr = next;
} }
RB_GC_GUARD(str); RB_GC_GUARD(str);
if (wbuffer) free(wbuffer);
return (long)reslen; return (long)reslen;
} }