From bef510ada0eda7612d7ece1d079b9a3333c1bbe2 Mon Sep 17 00:00:00 2001 From: yugui Date: Fri, 22 May 2009 09:49:09 +0000 Subject: merges r23469 from trunk into ruby_1_9_1. -- * ext/win32ole/win32ole.c (foletypelib_name): should return encoded name corresponding to WIN32OLE.codepage. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23533 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/win32ole/win32ole.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'ext') diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 51f6b58b0f..86f4f2e085 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -130,7 +130,7 @@ const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00, #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "1.3.9" +#define WIN32OLE_VERSION "1.4.0" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -5256,7 +5256,8 @@ foletypelib_guid(VALUE self) static VALUE foletypelib_name(VALUE self) { - return rb_ivar_get(self, rb_intern("name")); + VALUE name = rb_ivar_get(self, rb_intern("name")); + return rb_enc_str_new(StringValuePtr(name), strlen(StringValuePtr(name)), cWIN32OLE_enc); } /* -- cgit v1.2.3