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

* win32/win32.c (filecp, wstr_to_mbstr, mbstr_to_wstr):

Browse Source 
refactored.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29893 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-11-23 21:13:35 +00:00
parent 7f38397b6c
commit 3c4fecda3f
2 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Wed Nov 24 06:13:32 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/win32.c (filecp, wstr_to_mbstr, mbstr_to_wstr):
refactored.
Wed Nov 24 05:40:33 2010 NARUSE, Yui <naruse@ruby-lang.org> Wed Nov 24 05:40:33 2010 NARUSE, Yui <naruse@ruby-lang.org>
* enc/trans/utf_16_32.trans: add a convert from UTF-8 to UTF-16. * enc/trans/utf_16_32.trans: add a convert from UTF-8 to UTF-16.

58
win32/win32.c
View File

@ -1095,7 +1095,15 @@ is_batch(const char *cmd)
return 0; return 0;
} }
static WCHAR *acp_to_wstr(const char *, long *); static UINT filecp(void);
static WCHAR *mbstr_to_wstr(UINT, const char *, int, long *);
static char *wstr_to_mbstr(UINT, const WCHAR *, int, long *);
#define acp_to_wstr(str, plen) mbstr_to_wstr(CP_ACP, str, -1, plen)
#define wstr_to_acp(str, plen) wstr_to_mbstr(CP_ACP, str, -1, plen)
#define filecp_to_wstr(str, plen) mbstr_to_wstr(filecp(), str, -1, plen)
#define wstr_to_filecp(str, plen) wstr_to_mbstr(filecp(), str, -1, plen)
#define utf8_to_wstr(str, plen) mbstr_to_wstr(CP_UTF8, str, -1, plen)
#define wstr_to_utf8(str, plen) wstr_to_mbstr(CP_UTF8, str, -1, plen)
rb_pid_t rb_pid_t
rb_w32_spawn(int mode, const char *cmd, const char *prog) rb_w32_spawn(int mode, const char *cmd, const char *prog)
@ -1734,59 +1742,31 @@ opendir_internal(HANDLE fh, WIN32_FIND_DATAW *fd)
return p; return p;
} }
static WCHAR * static inline UINT
acp_to_wstr(const char *str, long *plen) filecp(void)
{ {
WCHAR *ptr; UINT cp = AreFileApisANSI() ? CP_ACP : CP_OEMCP;
int len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0) - 1; return cp;
if (!(ptr = malloc(sizeof(WCHAR) * (len + 1)))) return 0;
MultiByteToWideChar(CP_ACP, 0, str, -1, ptr, len + 1);
if (plen) *plen = len;
return ptr;
} }
static char * static char *
wstr_to_filecp(const WCHAR *wstr, long *plen) wstr_to_mbstr(UINT cp, const WCHAR *wstr, int clen, long *plen)
{ {
UINT cp = AreFileApisANSI() ? CP_ACP : CP_OEMCP;
char *ptr; char *ptr;
int len = WideCharToMultiByte(cp, 0, wstr, -1, NULL, 0, NULL, NULL) - 1; int len = WideCharToMultiByte(cp, 0, wstr, clen, NULL, 0, NULL, NULL) - 1;
if (!(ptr = malloc(len + 1))) return 0; if (!(ptr = malloc(len + 1))) return 0;
WideCharToMultiByte(cp, 0, wstr, -1, ptr, len + 1, NULL, NULL); WideCharToMultiByte(cp, 0, wstr, clen, ptr, len + 1, NULL, NULL);
if (plen) *plen = len; if (plen) *plen = len;
return ptr; return ptr;
} }
static WCHAR * static WCHAR *
filecp_to_wstr(const char *str, long *plen) mbstr_to_wstr(UINT cp, const char *str, int clen, long *plen)
{
UINT cp = AreFileApisANSI() ? CP_ACP : CP_OEMCP;
WCHAR *ptr;
int len = MultiByteToWideChar(cp, 0, str, -1, NULL, 0) - 1;
if (!(ptr = malloc(sizeof(WCHAR) * (len + 1)))) return 0;
MultiByteToWideChar(cp, 0, str, -1, ptr, len + 1);
if (plen) *plen = len;
return ptr;
}
static char *
wstr_to_utf8(const WCHAR *wstr, long *plen)
{
char *ptr;
int len = WideCharToMultiByte(CP_UTF8, 0, wstr, -1, NULL, 0, NULL, NULL) - 1;
if (!(ptr = malloc(len + 1))) return 0;
WideCharToMultiByte(CP_UTF8, 0, wstr, -1, ptr, len + 1, NULL, NULL);
if (plen) *plen = len;
return ptr;
}
static WCHAR *
utf8_to_wstr(const char *str, long *plen)
{ {
WCHAR *ptr; WCHAR *ptr;
int len = MultiByteToWideChar(CP_UTF8, 0, str, -1, NULL, 0) - 1; int len = MultiByteToWideChar(cp, 0, str, clen, NULL, 0) - 1;
if (!(ptr = malloc(sizeof(WCHAR) * (len + 1)))) return 0; if (!(ptr = malloc(sizeof(WCHAR) * (len + 1)))) return 0;
MultiByteToWideChar(CP_UTF8, 0, str, -1, ptr, len + 1); MultiByteToWideChar(cp, 0, str, clen, ptr, len + 1);
if (plen) *plen = len; if (plen) *plen = len;
return ptr; return ptr;
} }