archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* ext/win32ole/win32ole.c (load_conv_function51932): check

Browse source 
having IMultiLanguage2 or IMultiLanguage. [ruby-dev:36716]

* ext/win32ole/extconf.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19782 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
suke 2008-10-14 12:44:37 +00:00
parent 1288965f4e
commit f457364cae
3 changed files with 36 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Tue Oct 14 21:36:29 2008 Masaki Suketa <masaki.suketa@nifty.ne.jp>
* ext/win32ole/win32ole.c (load_conv_function51932): check
having IMultiLanguage2 or IMultiLanguage. [ruby-dev:36716]
* ext/win32ole/extconf.rb: ditto.
Tue Oct 14 20:45:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Oct 14 20:45:29 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (Init_IO): $FILENAME and $* must be read-only. [ruby-dev:36698] * io.c (Init_IO): $FILENAME and $* must be read-only. [ruby-dev:36698]

3
ext/win32ole/extconf.rb
View file

@ -24,6 +24,9 @@ def create_win32ole_makefile
have_library("kernel32") and have_library("kernel32") and
have_library("advapi32") and have_library("advapi32") and
have_header("windows.h") have_header("windows.h")
unless have_type("IMultiLanguage2", "mlang.h")
have_type("IMultiLanguage", "mlang.h")
end
create_makefile("win32ole") create_makefile("win32ole")
create_docfile(SRCFILES) create_docfile(SRCFILES)
else else

40
ext/win32ole/win32ole.c
View file

@ -128,7 +128,7 @@ const IID IID_IMultiLanguage2 = {0xDCCFC164, 0x2B38, 0x11d2, {0xB7, 0xEC, 0x00,
#define WC2VSTR(x) ole_wc2vstr((x), TRUE) #define WC2VSTR(x) ole_wc2vstr((x), TRUE)
#define WIN32OLE_VERSION "1.3.6" #define WIN32OLE_VERSION "1.3.7"
typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX) typedef HRESULT (STDAPICALLTYPE FNCOCREATEINSTANCEEX)
(REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*); (REFCLSID, IUnknown*, DWORD, COSERVERINFO*, DWORD, MULTI_QI*);
@ -217,7 +217,14 @@ static st_table *enc2cp_table;
static IMessageFilterVtbl message_filter; static IMessageFilterVtbl message_filter;
static IMessageFilter imessage_filter = { &message_filter }; static IMessageFilter imessage_filter = { &message_filter };
static IMessageFilter* previous_filter; static IMessageFilter* previous_filter;
static IMultiLanguage2 *pIMultiLanguage2 = NULL;
#if defined(HAVE_TYPE_IMULTILANGUAGE2)
static IMultiLanguage2 *pIMultiLanguage = NULL;
#elif defined(HAVE_TYPE_IMULTILANGUAGE)
static IMultiLanguage *pIMultiLanguage = NULL;
#else
static void *pIMultiLanguage = NULL; /* dummy */
#endif
struct oledata { struct oledata {
IDispatch *pDispatch; IDispatch *pDispatch;
@ -971,15 +978,23 @@ static UINT ole_encoding2cp(rb_encoding *enc)
static void static void
load_conv_function51932() load_conv_function51932()
{ {
HRESULT hr; HRESULT hr = E_NOINTERFACE;
void *p; void *p;
if (!pIMultiLanguage2) { if (!pIMultiLanguage) {
#if defined(HAVE_TYPE_IMULTILANGUAGE2)
hr = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER, hr = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER,
&IID_IMultiLanguage2, &p); &IID_IMultiLanguage2, &p);
#elif defined(HAVE_TYPE_IMULTILANGUAGE)
hr = CoCreateInstance(&CLSID_CMultiLanguage, NULL, CLSCTX_INPROC_SERVER,
&IID_IMultiLanguage, &p);
#else
hr = E_NOINTERFACE;
p = NULL;
#endif
if (FAILED(hr)) { if (FAILED(hr)) {
rb_raise(eWIN32OLERuntimeError, "fail to load convert function for CP51932"); rb_raise(eWIN32OLERuntimeError, "fail to load convert function for CP51932");
} }
pIMultiLanguage2 = p; pIMultiLanguage = p;
} }
} }
@ -1098,13 +1113,13 @@ ole_wc2mb(LPWSTR pw)
DWORD dw = 0; DWORD dw = 0;
if (cWIN32OLE_cp == 51932) { if (cWIN32OLE_cp == 51932) {
load_conv_function51932(); load_conv_function51932();
hr = pIMultiLanguage2->lpVtbl->ConvertStringFromUnicode(pIMultiLanguage2, hr = pIMultiLanguage->lpVtbl->ConvertStringFromUnicode(pIMultiLanguage,
&dw, cWIN32OLE_cp, pw, NULL, NULL, &size); &dw, cWIN32OLE_cp, pw, NULL, NULL, &size);
if (FAILED(hr)) { if (FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError, "fail to convert Unicode to CP%d", cWIN32OLE_cp); ole_raise(hr, eWIN32OLERuntimeError, "fail to convert Unicode to CP%d", cWIN32OLE_cp);
} }
pm = ALLOC_N(char, size + 1); pm = ALLOC_N(char, size + 1);
hr = pIMultiLanguage2->lpVtbl->ConvertStringFromUnicode(pIMultiLanguage2, hr = pIMultiLanguage->lpVtbl->ConvertStringFromUnicode(pIMultiLanguage,
&dw, cWIN32OLE_cp, pw, NULL, pm, &size); &dw, cWIN32OLE_cp, pw, NULL, pm, &size);
if (FAILED(hr)) { if (FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError, "fail to convert Unicode to CP%d", cWIN32OLE_cp); ole_raise(hr, eWIN32OLERuntimeError, "fail to convert Unicode to CP%d", cWIN32OLE_cp);
@ -1340,14 +1355,14 @@ ole_vstr2wc(VALUE vstr)
load_conv_function51932(); load_conv_function51932();
len = RSTRING_LEN(vstr); len = RSTRING_LEN(vstr);
size = 0; size = 0;
hr = pIMultiLanguage2->lpVtbl->ConvertStringToUnicode(pIMultiLanguage2, hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
&dw, cp, RSTRING_PTR(vstr), &len, NULL, &size); &dw, cp, RSTRING_PTR(vstr), &len, NULL, &size);
if (FAILED(hr)) { if (FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cp); ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cp);
} }
pw = SysAllocStringLen(NULL, size); pw = SysAllocStringLen(NULL, size);
len = RSTRING_LEN(vstr); len = RSTRING_LEN(vstr);
hr = pIMultiLanguage2->lpVtbl->ConvertStringToUnicode(pIMultiLanguage2, hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
&dw, cp, RSTRING_PTR(vstr), &len, pw, &size); &dw, cp, RSTRING_PTR(vstr), &len, pw, &size);
if (FAILED(hr)) { if (FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cp); ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cp);
@ -1372,13 +1387,13 @@ ole_mb2wc(char *pm, int len)
if (cWIN32OLE_cp == 51932) { if (cWIN32OLE_cp == 51932) {
load_conv_function51932(); load_conv_function51932();
size = 0; size = 0;
hr = pIMultiLanguage2->lpVtbl->ConvertStringToUnicode(pIMultiLanguage2, hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
&dw, cWIN32OLE_cp, pm, &n, NULL, &size); &dw, cWIN32OLE_cp, pm, &n, NULL, &size);
if (FAILED(hr)) { if (FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cWIN32OLE_cp); ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cWIN32OLE_cp);
} }
pw = SysAllocStringLen(NULL, size); pw = SysAllocStringLen(NULL, size);
hr = pIMultiLanguage2->lpVtbl->ConvertStringToUnicode(pIMultiLanguage2, hr = pIMultiLanguage->lpVtbl->ConvertStringToUnicode(pIMultiLanguage,
&dw, cWIN32OLE_cp, pm, &n, pw, &size); &dw, cWIN32OLE_cp, pm, &n, pw, &size);
if (FAILED(hr)) { if (FAILED(hr)) {
ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cWIN32OLE_cp); ole_raise(hr, eWIN32OLERuntimeError, "fail to convert CP%d to Unicode", cWIN32OLE_cp);
@ -9139,7 +9154,4 @@ Init_win32ole()
init_enc2cp(); init_enc2cp();
atexit((void (*)(void))free_enc2cp); atexit((void (*)(void))free_enc2cp);
ole_init_cp(); ole_init_cp();
/*
cWIN32OLE_enc = ole_cp2encoding(cWIN32OLE_cp);
*/
} }