ruby-changes:17512
From: suke <ko1@a...>
Date: Sat, 16 Oct 2010 11:14:39 +0900 (JST)
Subject: [ruby-changes:17512] Ruby:r29517 (trunk): * ext/win32ole/win32ole.c (ole_encoding2cp): set codepage 20936
suke 2010-10-16 11:14:32 +0900 (Sat, 16 Oct 2010) New Revision: 29517 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29517 Log: * ext/win32ole/win32ole.c (ole_encoding2cp): set codepage 20936 according to GB2312. [Bug #3937] [ruby-core:32758] Modified files: trunk/ChangeLog trunk/ext/win32ole/win32ole.c Index: ChangeLog =================================================================== --- ChangeLog (revision 29516) +++ ChangeLog (revision 29517) @@ -1,3 +1,8 @@ +Sat Oct 16 11:10:55 2010 Masaki Suketa <masaki.suketa@n...> + + * ext/win32ole/win32ole.c (ole_encoding2cp): set codepage 20936 + according to GB2312. [Bug #3937] [ruby-core:32758] + Sat Oct 16 10:54:57 2010 Nobuyoshi Nakada <nobu@r...> * Makefile.in (CPP): already used in .c.i rule. Index: ext/win32ole/win32ole.c =================================================================== --- ext/win32ole/win32ole.c (revision 29516) +++ ext/win32ole/win32ole.c (revision 29517) @@ -143,7 +143,7 @@ #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "1.5.2" +#define WIN32OLE_VERSION "1.5.3" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -868,7 +868,7 @@ ENC_MACHING_CP(enc, "EUC-KR", 51949); ENC_MACHING_CP(enc, "EUC-TW", 51950); ENC_MACHING_CP(enc, "GB18030", 54936); - ENC_MACHING_CP(enc, "GB2312", 51936); + ENC_MACHING_CP(enc, "GB2312", 20936); ENC_MACHING_CP(enc, "GBK", 936); ENC_MACHING_CP(enc, "IBM437", 437); ENC_MACHING_CP(enc, "IBM737", 737); -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/