diff --git a/ChangeLog b/ChangeLog index 9be668ad83..d12da1a4c8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Oct 31 16:58:12 2004 Masaki Suketa + + * ext/win32ole/win32ole.c: add WIN32OLE.codepage, WIN32OLE.codepage=. + + * ext/win32ole/tests/testWIN32OLE.rb: ditto. + Sun Oct 31 14:35:26 2004 WATANABE Hirofumi * ext/nkf/nkf-utf8/nkf.c: add "\075?UTF-8?Q?" for Gmail. diff --git a/ext/win32ole/tests/testWIN32OLE.rb b/ext/win32ole/tests/testWIN32OLE.rb index 7611da84ac..d0705093f3 100644 --- a/ext/win32ole/tests/testWIN32OLE.rb +++ b/ext/win32ole/tests/testWIN32OLE.rb @@ -41,7 +41,7 @@ class TestWin32OLE < RUNIT::TestCase exc = assert_exception(WIN32OLERuntimeError) { WIN32OLE.new("{000}") } - assert_match(/Unknown OLE server `\{000\}'/, exc.message) + assert_match(/Unknown OLE server: `\{000\}'/, exc.message) end def test_s_connect excel2 = WIN32OLE.connect('Excel.Application') @@ -58,6 +58,44 @@ class TestWin32OLE < RUNIT::TestCase assert_equal(-4160, CONST1::XlTop) end + def test_s_codepage + assert_equal(WIN32OLE::CP_ACP, WIN32OLE.codepage) + end + + def test_s_codepage_set + WIN32OLE.codepage = WIN32OLE::CP_UTF8 + assert_equal(WIN32OLE::CP_UTF8, WIN32OLE.codepage) + WIN32OLE.codepage = WIN32OLE::CP_ACP + end + + def test_const_CP_ACP + assert_equal(0, WIN32OLE::CP_ACP) + end + + def test_const_CP_OEMCP + assert_equal(1, WIN32OLE::CP_OEMCP) + end + + def test_const_CP_MACCP + assert_equal(2, WIN32OLE::CP_MACCP) + end + + def test_const_CP_THREAD_ACP + assert_equal(3, WIN32OLE::CP_THREAD_ACP) + end + + def test_const_CP_SYMBOL + assert_equal(42, WIN32OLE::CP_SYMBOL) + end + + def test_const_CP_UTF7 + assert_equal(65000, WIN32OLE::CP_UTF7) + end + + def test_const_CP_UTF8 + assert_equal(65001, WIN32OLE::CP_UTF8) + end + def test_get_win32ole_object workbooks = @excel.Workbooks; assert_instance_of(WIN32OLE, workbooks) diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 4715a4d44a..f2bbb3d492 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -79,7 +79,7 @@ #define WC2VSTR(x) ole_wc2vstr((x), TRUE) -#define WIN32OLE_VERSION "0.6.0" +#define WIN32OLE_VERSION "0.6.1" typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); @@ -155,6 +155,7 @@ static HINSTANCE gole32 = NULL; static FNCOCREATEINSTANCEEX *gCoCreateInstanceEx = NULL; static VALUE com_hash; static IDispatchVtbl com_vtbl; +static UINT cWIN32OLE_cp = CP_ACP; struct oledata { IDispatch *pDispatch; @@ -472,10 +473,10 @@ ole_wc2mb(pw) { int size; LPSTR pm; - size = WideCharToMultiByte(CP_ACP, 0, pw, -1, NULL, 0, NULL, NULL); + size = WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, NULL, 0, NULL, NULL); if (size) { pm = ALLOC_N(char, size); - WideCharToMultiByte(CP_ACP, 0, pw, -1, pm, size, NULL, NULL); + WideCharToMultiByte(cWIN32OLE_cp, 0, pw, -1, pm, size, NULL, NULL); } else { pm = ALLOC_N(char, 1); @@ -669,9 +670,9 @@ ole_mb2wc(pm, len) { int size; LPWSTR pw; - size = MultiByteToWideChar(CP_ACP, 0, pm, len, NULL, 0); + size = MultiByteToWideChar(cWIN32OLE_cp, 0, pm, len, NULL, 0); pw = SysAllocStringLen(NULL, size - 1); - MultiByteToWideChar(CP_ACP, 0, pm, len, pw, size); + MultiByteToWideChar(cWIN32OLE_cp, 0, pm, len, pw, size); return pw; } @@ -1758,6 +1759,55 @@ fole_s_show_help(argc, argv, self) return Qnil; } +/* + * call-seq: + * WIN32OLE.codepage + * + * Returns current codepage. + * WIN32OLE.codepage # => WIN32OLE::CP_ACP + */ +static VALUE +fole_s_get_code_page(self) + VALUE self; +{ + return INT2FIX(cWIN32OLE_cp); +} + +/* + * call-seq: + * WIN32OLE.codepage = CP + * + * Sets current codepage. + * WIN32OLE.codepage = WIN32OLE::CP_UTF8 + */ +static VALUE +fole_s_set_code_page(self, vcp) + VALUE self; + VALUE vcp; +{ + UINT cp = FIX2INT(vcp); + + switch(cp) { + case CP_ACP: + case CP_OEMCP: + case CP_MACCP: + case CP_THREAD_ACP: + case CP_SYMBOL: + case CP_UTF7: + case CP_UTF8: + cWIN32OLE_cp = cp; + break; + default: + rb_raise(eWIN32OLE_RUNTIME_ERROR, "codepage should be WIN32OLE::CP_ACP, WIN32OLE::CP_OEMCP, WIN32OLE::CP_MACCP, WIN32OLE::CP_THREAD_ACP, WIN32OLE::CP_SYMBOL, WIN32OLE::CP_UTF7, WIN32OLE::CP_UTF8"); + break; + } + + /* + * Should this method return old codepage? + */ + return Qnil; +} + /* * Document-class: WIN32OLE * @@ -6194,6 +6244,8 @@ Init_win32ole() rb_define_singleton_method(cWIN32OLE, "ole_free", fole_s_free, 1); rb_define_singleton_method(cWIN32OLE, "ole_reference_count", fole_s_reference_count, 1); rb_define_singleton_method(cWIN32OLE, "ole_show_help", fole_s_show_help, -1); + rb_define_singleton_method(cWIN32OLE, "codepage", fole_s_get_code_page, 0); + rb_define_singleton_method(cWIN32OLE, "codepage=", fole_s_set_code_page, 1); rb_define_method(cWIN32OLE, "invoke", fole_invoke, -1); rb_define_method(cWIN32OLE, "[]", fole_getproperty, 1); @@ -6224,6 +6276,13 @@ Init_win32ole() rb_define_const(cWIN32OLE, "VERSION", rb_str_new2(WIN32OLE_VERSION)); rb_define_const(cWIN32OLE, "ARGV", rb_ary_new()); + rb_define_const(cWIN32OLE, "CP_ACP" ,INT2FIX(CP_ACP)); + rb_define_const(cWIN32OLE, "CP_OEMCP" ,INT2FIX(CP_OEMCP)); + rb_define_const(cWIN32OLE, "CP_MACCP" ,INT2FIX(CP_MACCP)); + rb_define_const(cWIN32OLE, "CP_THREAD_ACP",INT2FIX(CP_THREAD_ACP)); + rb_define_const(cWIN32OLE, "CP_SYMBOL" ,INT2FIX(CP_SYMBOL)); + rb_define_const(cWIN32OLE, "CP_UTF7" ,INT2FIX(CP_UTF7)); + rb_define_const(cWIN32OLE, "CP_UTF8" ,INT2FIX(CP_UTF8)); mWIN32OLE_VARIANT = rb_define_module_under(cWIN32OLE, "VARIANT"); rb_define_const(mWIN32OLE_VARIANT, "VT_I2", INT2FIX(VT_I2));