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

win32ole.c: store directly

Browse Source 
* ext/win32ole/win32ole.c (ole_wc2vstr): store converted multibyte
  string to string value directly.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42664 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-08-23 08:17:59 +00:00
parent dcdde335a6
commit f539e9cbf3
1 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
ext/win32ole/win32ole.c
View File

@ -1064,7 +1064,7 @@ ole_cp2encoding(UINT cp)
} }
static char * static char *
ole_wc2mb(LPWSTR pw) ole_wc2mb_alloc(LPWSTR pw, char *(alloc)(UINT size, void *arg), void *arg)
{ {
LPSTR pm; LPSTR pm;
UINT size = 0; UINT size = 0;
@ -1076,7 +1076,7 @@ ole_wc2mb(LPWSTR pw)
if (FAILED(hr)) { if (FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError, "fail to convert Unicode to CP%d", cWIN32OLE_cp); ole_raise(hr, eWIN32OLERuntimeError, "fail to convert Unicode to CP%d", cWIN32OLE_cp);
} }
pm = ALLOC_N(char, size + 1); pm = alloc(size, arg);
hr = pIMultiLanguage->lpVtbl->ConvertStringFromUnicode(pIMultiLanguage, hr = pIMultiLanguage->lpVtbl->ConvertStringFromUnicode(pIMultiLanguage,
&dw, cWIN32OLE_cp, pw, NULL, pm, &size); &dw, cWIN32OLE_cp, pw, NULL, pm, &size);
if (FAILED(hr)) { if (FAILED(hr)) {
@ -1088,17 +1088,29 @@ ole_wc2mb(LPWSTR pw)
} }
size = WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, NULL, 0, NULL, NULL); size = WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, NULL, 0, NULL, NULL);
if (size) { if (size) {
pm = ALLOC_N(char, size + 1); pm = alloc(size, arg);
WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, pm, size, NULL, NULL); WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, pm, size, NULL, NULL);
pm[size] = '\0'; pm[size] = '\0';
} }
else { else {
pm = ALLOC_N(char, 1); pm = alloc(0, arg);
*pm = '\0'; *pm = '\0';
} }
return pm; return pm;
} }
static char *
ole_alloc_str(UINT size, void *arg)
{
return ALLOC_N(char, size + 1);
}
static char *
ole_wc2mb(LPWSTR pw)
{
return ole_wc2mb_alloc(pw, ole_alloc_str, NULL);
}
static VALUE static VALUE
ole_hresult2msg(HRESULT hr) ole_hresult2msg(HRESULT hr)
{ {
@ -1383,15 +1395,22 @@ ole_mb2wc(char *pm, int len)
return pw; return pw;
} }
static char *
ole_alloc_vstr(UINT size, void *arg)
{
VALUE str = rb_enc_str_new(NULL, size, cWIN32OLE_enc);
*(VALUE *)arg = str;
return RSTRING_PTR(str);
}
static VALUE static VALUE
ole_wc2vstr(LPWSTR pw, BOOL isfree) ole_wc2vstr(LPWSTR pw, BOOL isfree)
{ {
char *p = ole_wc2mb(pw); VALUE vstr;
VALUE vstr = rb_str_new_cstr(p); ole_wc2mb_alloc(pw, ole_alloc_vstr, &vstr);
rb_enc_associate(vstr, cWIN32OLE_enc); rb_str_set_len(vstr, (long)strlen(RSTRING_PTR(vstr)));
if(isfree) if(isfree)
SysFreeString(pw); SysFreeString(pw);
free(p);
return vstr; return vstr;
} }