[前][次][番号順一覧][スレッド一覧]

ruby-changes:11814

From: suke <ko1@a...>
Date: Sun, 17 May 2009 09:37:23 +0900 (JST)
Subject: [ruby-changes:11814] Ruby:r23469 (trunk): * ext/win32ole/win32ole.c (foletypelib_name): should return

suke	2009-05-17 09:37:07 +0900 (Sun, 17 May 2009)

  New Revision: 23469

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23469

  Log:
    * ext/win32ole/win32ole.c (foletypelib_name): should return
      encoded name corresponding to WIN32OLE.codepage.

  Modified files:
    trunk/ChangeLog
    trunk/ext/win32ole/win32ole.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23468)
+++ ChangeLog	(revision 23469)
@@ -1,3 +1,8 @@
+Sun May 17 09:31:05 2009  Masaki Suketa  <masaki.suketa@n...>
+
+	* ext/win32ole/win32ole.c (foletypelib_name): should return
+	  encoded name corresponding to WIN32OLE.codepage.
+
 Sun May 17 09:02:56 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (ruby_init_loadpath_safe): support for cygwin 1.7.  see
Index: ext/win32ole/win32ole.c
===================================================================
--- ext/win32ole/win32ole.c	(revision 23468)
+++ ext/win32ole/win32ole.c	(revision 23469)
@@ -130,7 +130,7 @@
 
 #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 @@
 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);
 }
 
 /*

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]