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

3 files changed, 9 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index 1786716c10..9d85637de5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
+
 Sat May 16 18:26:42 2009  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/parser.rb, test/test_parser_1.0.rb: fix foaf:Image
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);
 }
 
 /*
diff --git a/version.h b/version.h
index 26f8dd1827..bab2e12bda 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "1.9.1"
 #define RUBY_RELEASE_DATE "2009-05-12"
-#define RUBY_PATCHLEVEL 147
+#define RUBY_PATCHLEVEL 148
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1