diff options
| author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-17 00:37:07 +0000 |
|---|---|---|
| committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-17 00:37:07 +0000 |
| commit | 85215a12abb28a8bc433fa13ef6b54baf0348aee (patch) | |
| tree | 8283025f1b0e1494ad57a8895eafc965f083ca19 | |
| parent | 21c33d471b0525dc661941cde8ed4d500a42578e (diff) | |
| download | ruby-85215a12abb28a8bc433fa13ef6b54baf0348aee.tar.gz ruby-85215a12abb28a8bc433fa13ef6b54baf0348aee.tar.xz ruby-85215a12abb28a8bc433fa13ef6b54baf0348aee.zip | |
* ext/win32ole/win32ole.c (foletypelib_name): should return
encoded name corresponding to WIN32OLE.codepage.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/win32ole/win32ole.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Sun May 17 09:31:05 2009 Masaki Suketa <masaki.suketa@nifty.ne.jp> + + * ext/win32ole/win32ole.c (foletypelib_name): should return + encoded name corresponding to WIN32OLE.codepage. + Sun May 17 09:02:56 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * 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 51f6b58b0..86f4f2e08 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); } /* |