From 8ea0786da1843a3a88605d05f337289f01fa63a9 Mon Sep 17 00:00:00 2001 From: suke Date: Sun, 17 May 2009 00:37:07 +0000 Subject: * ext/win32ole/win32ole.c (foletypelib_name): should return encoded name corresponding to WIN32OLE.codepage. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/win32ole/win32ole.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 456a68954b..1cb046310e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sun May 17 09:31:05 2009 Masaki Suketa + + * ext/win32ole/win32ole.c (foletypelib_name): should return + encoded name corresponding to WIN32OLE.codepage. + Sun May 17 09:02:56 2009 Nobuyoshi Nakada * ruby.c (ruby_init_loadpath_safe): support for cygwin 1.7. see 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