mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* exception error messages updated. [ruby-core:04497]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8035 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
ba32fdd167
commit
88d5dcc8de
27 changed files with 113 additions and 109 deletions
|
@ -72,7 +72,7 @@
|
|||
#define OLEData_Get_Struct(obj, pole) {\
|
||||
Data_Get_Struct(obj, struct oledata, pole);\
|
||||
if(!pole->pDispatch) {\
|
||||
rb_raise(rb_eRuntimeError, "Failed to get Dispatch Interface");\
|
||||
rb_raise(rb_eRuntimeError, "failed to get Dispatch Interface");\
|
||||
}\
|
||||
}
|
||||
|
||||
|
@ -603,7 +603,7 @@ ole_initialize()
|
|||
if(gOLEInitialized == Qfalse) {
|
||||
hr = OleInitialize(NULL);
|
||||
if(FAILED(hr)) {
|
||||
ole_raise(hr, rb_eRuntimeError, "Fail: OLE initialize");
|
||||
ole_raise(hr, rb_eRuntimeError, "fail: OLE initialize");
|
||||
}
|
||||
gOLEInitialized = Qtrue;
|
||||
/*
|
||||
|
@ -1364,12 +1364,12 @@ ole_create_dcom(argc, argv, self)
|
|||
if (!gole32)
|
||||
gole32 = LoadLibrary("OLE32");
|
||||
if (!gole32)
|
||||
rb_raise(rb_eRuntimeError, "Failed to load OLE32");
|
||||
rb_raise(rb_eRuntimeError, "failed to load OLE32");
|
||||
if (!gCoCreateInstanceEx)
|
||||
gCoCreateInstanceEx = (FNCOCREATEINSTANCEEX*)
|
||||
GetProcAddress(gole32, "CoCreateInstanceEx");
|
||||
if (!gCoCreateInstanceEx)
|
||||
rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment.");
|
||||
rb_raise(rb_eRuntimeError, "CoCreateInstanceEx is not supported in this environment");
|
||||
rb_scan_args(argc, argv, "2*", &ole, &host, &others);
|
||||
|
||||
pbuf = ole_mb2wc(StringValuePtr(ole), -1);
|
||||
|
@ -1381,7 +1381,7 @@ ole_create_dcom(argc, argv, self)
|
|||
SysFreeString(pbuf);
|
||||
if (FAILED(hr))
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
|
||||
"Unknown OLE server: `%s'",
|
||||
"unknown OLE server: `%s'",
|
||||
StringValuePtr(ole));
|
||||
memset(&serverinfo, 0, sizeof(COSERVERINFO));
|
||||
serverinfo.pwszName = ole_mb2wc(StringValuePtr(host), -1);
|
||||
|
@ -1391,7 +1391,7 @@ ole_create_dcom(argc, argv, self)
|
|||
SysFreeString(serverinfo.pwszName);
|
||||
if (FAILED(hr))
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
|
||||
"Failed to create DCOM server `%s' in `%s'",
|
||||
"failed to create DCOM server `%s' in `%s'",
|
||||
StringValuePtr(ole),
|
||||
StringValuePtr(host));
|
||||
|
||||
|
@ -1418,7 +1418,7 @@ ole_bind_obj(moniker, argc, argv, self)
|
|||
hr = CreateBindCtx(0, &pBindCtx);
|
||||
if(FAILED(hr)) {
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
|
||||
"Failed to create bind context");
|
||||
"failed to create bind context");
|
||||
}
|
||||
|
||||
pbuf = ole_mb2wc(StringValuePtr(moniker), -1);
|
||||
|
@ -1427,7 +1427,7 @@ ole_bind_obj(moniker, argc, argv, self)
|
|||
if(FAILED(hr)) {
|
||||
OLE_RELEASE(pBindCtx);
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
|
||||
"Failed to parse display name of moniker `%s'",
|
||||
"failed to parse display name of moniker `%s'",
|
||||
StringValuePtr(moniker));
|
||||
}
|
||||
hr = pMoniker->lpVtbl->BindToObject(pMoniker, pBindCtx, NULL,
|
||||
|
@ -1438,7 +1438,7 @@ ole_bind_obj(moniker, argc, argv, self)
|
|||
|
||||
if(FAILED(hr)) {
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
|
||||
"Failed to bind moniker `%s'",
|
||||
"failed to bind moniker `%s'",
|
||||
StringValuePtr(moniker));
|
||||
}
|
||||
return create_win32ole_object(self, pDispatch, argc, argv);
|
||||
|
@ -1495,7 +1495,7 @@ fole_s_connect(argc, argv, self)
|
|||
if(FAILED(hr)) {
|
||||
OLE_RELEASE(pUnknown);
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
|
||||
"Failed to create WIN32OLE server `%s'",
|
||||
"failed to create WIN32OLE server `%s'",
|
||||
StringValuePtr(svr_name));
|
||||
}
|
||||
|
||||
|
@ -1532,19 +1532,19 @@ fole_s_const_load(argc, argv, self)
|
|||
if (TYPE(klass) != T_CLASS &&
|
||||
TYPE(klass) != T_MODULE &&
|
||||
TYPE(klass) != T_NIL) {
|
||||
rb_raise(rb_eTypeError, "2nd paramator must be Class or Module.");
|
||||
rb_raise(rb_eTypeError, "2nd parameter must be Class or Module");
|
||||
}
|
||||
if (rb_obj_is_kind_of(ole, cWIN32OLE)) {
|
||||
OLEData_Get_Struct(ole, pole);
|
||||
hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
|
||||
0, lcid, &pTypeInfo);
|
||||
if(FAILED(hr)) {
|
||||
ole_raise(hr, rb_eRuntimeError, "Failed to GetTypeInfo");
|
||||
ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
|
||||
}
|
||||
hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &index);
|
||||
if(FAILED(hr)) {
|
||||
OLE_RELEASE(pTypeInfo);
|
||||
ole_raise(hr, rb_eRuntimeError, "Failed to GetContainingTypeLib");
|
||||
ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
|
||||
}
|
||||
OLE_RELEASE(pTypeInfo);
|
||||
if(TYPE(klass) != T_NIL) {
|
||||
|
@ -1564,7 +1564,7 @@ fole_s_const_load(argc, argv, self)
|
|||
hr = LoadTypeLibEx(pBuf, REGKIND_NONE, &pTypeLib);
|
||||
SysFreeString(pBuf);
|
||||
if (FAILED(hr))
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to LoadTypeLibEx");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
|
||||
if(TYPE(klass) != T_NIL) {
|
||||
ole_const_load(pTypeLib, klass, self);
|
||||
}
|
||||
|
@ -1574,7 +1574,7 @@ fole_s_const_load(argc, argv, self)
|
|||
OLE_RELEASE(pTypeLib);
|
||||
}
|
||||
else {
|
||||
rb_raise(rb_eTypeError, "1st paramator must be WIN32OLE instance");
|
||||
rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE instance");
|
||||
}
|
||||
return Qnil;
|
||||
}
|
||||
|
@ -1720,11 +1720,11 @@ fole_s_show_help(argc, argv, self)
|
|||
helpfile = target;
|
||||
}
|
||||
if (TYPE(helpfile) != T_STRING) {
|
||||
rb_raise(rb_eTypeError, "1st parameter must be (String|WIN32OLE_TYPE|WIN32OLE_METHOD).");
|
||||
rb_raise(rb_eTypeError, "1st parameter must be (String|WIN32OLE_TYPE|WIN32OLE_METHOD)");
|
||||
}
|
||||
hwnd = ole_show_help(helpfile, helpcontext);
|
||||
if(hwnd == 0) {
|
||||
rb_raise(rb_eRuntimeError, "Failed to open help file `%s'",
|
||||
rb_raise(rb_eRuntimeError, "failed to open help file `%s'",
|
||||
StringValuePtr(helpfile));
|
||||
}
|
||||
return Qnil;
|
||||
|
@ -1769,7 +1769,7 @@ fole_initialize(argc, argv, self)
|
|||
SysFreeString(pBuf);
|
||||
if(FAILED(hr)) {
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
|
||||
"Unknown OLE server: `%s'",
|
||||
"unknown OLE server: `%s'",
|
||||
StringValuePtr(svr_name));
|
||||
}
|
||||
|
||||
|
@ -1778,7 +1778,7 @@ fole_initialize(argc, argv, self)
|
|||
&IID_IDispatch, (void**)&pDispatch);
|
||||
if(FAILED(hr)) {
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
|
||||
"Failed to create WIN32OLE object from `%s'",
|
||||
"failed to create WIN32OLE object from `%s'",
|
||||
StringValuePtr(svr_name));
|
||||
}
|
||||
|
||||
|
@ -1879,7 +1879,7 @@ ole_invoke(argc, argv, self, wFlags)
|
|||
rb_scan_args(argc, argv, "1*", &cmd, ¶mS);
|
||||
OLEData_Get_Struct(self, pole);
|
||||
if(!pole->pDispatch) {
|
||||
rb_raise(rb_eRuntimeError, "Failed to get dispatch interface");
|
||||
rb_raise(rb_eRuntimeError, "failed to get dispatch interface");
|
||||
}
|
||||
wcmdname = ole_mb2wc(StringValuePtr(cmd), -1);
|
||||
hr = pole->pDispatch->lpVtbl->GetIDsOfNames( pole->pDispatch, &IID_NULL,
|
||||
|
@ -1887,7 +1887,7 @@ ole_invoke(argc, argv, self, wFlags)
|
|||
SysFreeString(wcmdname);
|
||||
if(FAILED(hr)) {
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
|
||||
"Unknown property or method `%s'",
|
||||
"unknown property or method `%s'",
|
||||
StringValuePtr(cmd));
|
||||
}
|
||||
|
||||
|
@ -1924,7 +1924,7 @@ ole_invoke(argc, argv, self, wFlags)
|
|||
VariantClear(&op.dp.rgvarg[i]);
|
||||
}
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
|
||||
"Failed to get named argument info: `%s'",
|
||||
"failed to get named argument info: `%s'",
|
||||
StringValuePtr(cmd));
|
||||
}
|
||||
op.dp.rgdispidNamedArgs = &(pDispID[1]);
|
||||
|
@ -2343,7 +2343,7 @@ ole_propertyput(self, property, value)
|
|||
|
||||
if(FAILED(hr)) {
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR,
|
||||
"Unknown property or method: `%s'",
|
||||
"unknown property or method: `%s'",
|
||||
StringValuePtr(property));
|
||||
}
|
||||
/* set property value */
|
||||
|
@ -2436,7 +2436,7 @@ fole_each(self)
|
|||
|
||||
if (FAILED(hr)) {
|
||||
VariantClear(&result);
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to get IEnum Interface");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to get IEnum Interface");
|
||||
}
|
||||
|
||||
if (V_VT(&result) == VT_UNKNOWN)
|
||||
|
@ -2449,7 +2449,7 @@ fole_each(self)
|
|||
(void**)&pEnum);
|
||||
if (FAILED(hr) || !pEnum) {
|
||||
VariantClear(&result);
|
||||
ole_raise(hr, rb_eRuntimeError, "Failed to get IEnum Interface");
|
||||
ole_raise(hr, rb_eRuntimeError, "failed to get IEnum Interface");
|
||||
}
|
||||
|
||||
VariantClear(&result);
|
||||
|
@ -2474,7 +2474,7 @@ fole_missing(argc, argv, self)
|
|||
id = rb_to_id(argv[0]);
|
||||
mname = rb_id2name(id);
|
||||
if(!mname) {
|
||||
rb_raise(rb_eRuntimeError, "Fail: unknown method or property");
|
||||
rb_raise(rb_eRuntimeError, "fail: unknown method or property");
|
||||
}
|
||||
n = strlen(mname);
|
||||
if(mname[n-1] == '=') {
|
||||
|
@ -2504,7 +2504,7 @@ ole_method_sub(self, pOwnerTypeInfo, pTypeInfo, name)
|
|||
VALUE method = Qnil;
|
||||
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
|
||||
if (FAILED(hr)) {
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
|
||||
}
|
||||
for(i = 0; i < pTypeAttr->cFuncs && method == Qnil; i++) {
|
||||
hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, i, &pFuncDesc);
|
||||
|
@ -2543,7 +2543,7 @@ olemethod_from_typeinfo(self, pTypeInfo, name)
|
|||
VALUE method = Qnil;
|
||||
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
|
||||
if (FAILED(hr)) {
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
|
||||
}
|
||||
method = ole_method_sub(self, 0, pTypeInfo, name);
|
||||
if (method != Qnil) {
|
||||
|
@ -2579,7 +2579,7 @@ ole_methods_sub(pOwnerTypeInfo, pTypeInfo, methods, mask)
|
|||
WORD i;
|
||||
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
|
||||
if (FAILED(hr)) {
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
|
||||
}
|
||||
for(i = 0; i < pTypeAttr->cFuncs; i++) {
|
||||
pstr = NULL;
|
||||
|
@ -2620,7 +2620,7 @@ ole_methods_from_typeinfo(pTypeInfo, mask)
|
|||
VALUE methods = rb_ary_new();
|
||||
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
|
||||
if (FAILED(hr)) {
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
|
||||
}
|
||||
|
||||
ole_methods_sub(0, pTypeInfo, methods, mask);
|
||||
|
@ -2653,7 +2653,7 @@ typeinfo_from_ole(pole, ppti)
|
|||
HRESULT hr = pole->pDispatch->lpVtbl->GetTypeInfo(pole->pDispatch,
|
||||
0, lcid, &pTypeInfo);
|
||||
if(FAILED(hr)) {
|
||||
ole_raise(hr, rb_eRuntimeError, "Failed to GetTypeInfo");
|
||||
ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
|
||||
}
|
||||
hr = pTypeInfo->lpVtbl->GetDocumentation(pTypeInfo,
|
||||
-1,
|
||||
|
@ -2663,7 +2663,7 @@ typeinfo_from_ole(pole, ppti)
|
|||
hr = pTypeInfo->lpVtbl->GetContainingTypeLib(pTypeInfo, &pTypeLib, &i);
|
||||
OLE_RELEASE(pTypeInfo);
|
||||
if (FAILED(hr)) {
|
||||
ole_raise(hr, rb_eRuntimeError, "Failed to GetContainingTypeLib");
|
||||
ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
|
||||
}
|
||||
count = pTypeLib->lpVtbl->GetTypeInfoCount(pTypeLib);
|
||||
for (i = 0; i < count; i++) {
|
||||
|
@ -2772,12 +2772,12 @@ fole_obj_help( self )
|
|||
|
||||
hr = pole->pDispatch->lpVtbl->GetTypeInfo( pole->pDispatch, 0, lcid, &pTypeInfo );
|
||||
if(FAILED(hr)) {
|
||||
ole_raise(hr, rb_eRuntimeError, "Failed to GetTypeInfo");
|
||||
ole_raise(hr, rb_eRuntimeError, "failed to GetTypeInfo");
|
||||
}
|
||||
hr = pTypeInfo->lpVtbl->GetContainingTypeLib( pTypeInfo, &pTypeLib, &index );
|
||||
if(FAILED(hr)) {
|
||||
OLE_RELEASE(pTypeInfo);
|
||||
ole_raise(hr, rb_eRuntimeError, "Failed to GetContainingTypeLib");
|
||||
ole_raise(hr, rb_eRuntimeError, "failed to GetContainingTypeLib");
|
||||
}
|
||||
hr = pTypeLib->lpVtbl->GetDocumentation( pTypeLib, index,
|
||||
&bstr, NULL, NULL, NULL);
|
||||
|
@ -3010,12 +3010,12 @@ fole_method_help( self, cmdname )
|
|||
OLEData_Get_Struct(self, pole);
|
||||
hr = typeinfo_from_ole(pole, &pTypeInfo);
|
||||
if(FAILED(hr))
|
||||
ole_raise(hr, rb_eRuntimeError, "Failed to get ITypeInfo");
|
||||
ole_raise(hr, rb_eRuntimeError, "failed to get ITypeInfo");
|
||||
method = folemethod_s_allocate(cWIN32OLE_METHOD);
|
||||
obj = olemethod_from_typeinfo(method, pTypeInfo, cmdname);
|
||||
OLE_RELEASE(pTypeInfo);
|
||||
if (obj == Qnil)
|
||||
rb_raise(eWIN32OLE_RUNTIME_ERROR, "Not found %s",
|
||||
rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found %s",
|
||||
StringValuePtr(cmdname));
|
||||
return obj;
|
||||
}
|
||||
|
@ -3045,7 +3045,7 @@ foletype_s_ole_classes(self, typelib)
|
|||
pbuf = ole_mb2wc(StringValuePtr(file), -1);
|
||||
hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
|
||||
if (FAILED(hr))
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to LoadTypeLibEx");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
|
||||
SysFreeString(pbuf);
|
||||
ole_classes_from_typelib(pTypeLib, classes);
|
||||
OLE_RELEASE(pTypeLib);
|
||||
|
@ -3220,11 +3220,11 @@ foletype_initialize(self, typelib, oleclass)
|
|||
pbuf = ole_mb2wc(StringValuePtr(file), -1);
|
||||
hr = LoadTypeLibEx(pbuf, REGKIND_NONE, &pTypeLib);
|
||||
if (FAILED(hr))
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to LoadTypeLibEx");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to LoadTypeLibEx");
|
||||
SysFreeString(pbuf);
|
||||
if (oleclass_from_typelib(self, pTypeLib, oleclass) == Qfalse) {
|
||||
OLE_RELEASE(pTypeLib);
|
||||
rb_raise(eWIN32OLE_RUNTIME_ERROR, "Not found `%s` in `%s`",
|
||||
rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found `%s` in `%s`",
|
||||
StringValuePtr(oleclass), StringValuePtr(typelib));
|
||||
}
|
||||
OLE_RELEASE(pTypeLib);
|
||||
|
@ -3413,7 +3413,7 @@ ole_type_major_version(pTypeInfo)
|
|||
HRESULT hr;
|
||||
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
|
||||
if (FAILED(hr))
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
|
||||
ver = INT2FIX(pTypeAttr->wMajorVerNum);
|
||||
OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
|
||||
return ver;
|
||||
|
@ -3442,7 +3442,7 @@ ole_type_minor_version(pTypeInfo)
|
|||
HRESULT hr;
|
||||
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
|
||||
if (FAILED(hr))
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
|
||||
ver = INT2FIX(pTypeAttr->wMinorVerNum);
|
||||
OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
|
||||
return ver;
|
||||
|
@ -3471,7 +3471,7 @@ ole_type_typekind(pTypeInfo)
|
|||
HRESULT hr;
|
||||
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
|
||||
if (FAILED(hr))
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
|
||||
typekind = INT2FIX(pTypeAttr->typekind);
|
||||
OLE_RELEASE_TYPEATTR(pTypeInfo, pTypeAttr);
|
||||
return typekind;
|
||||
|
@ -3621,7 +3621,7 @@ ole_variables(pTypeInfo)
|
|||
VALUE variables = rb_ary_new();
|
||||
hr = OLE_GET_TYPEATTR(pTypeInfo, &pTypeAttr);
|
||||
if (FAILED(hr)) {
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetTypeAttr");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetTypeAttr");
|
||||
}
|
||||
|
||||
for(i = 0; i < pTypeAttr->cVars; i++) {
|
||||
|
@ -3701,7 +3701,7 @@ static ole_variable_ole_type(pTypeInfo, var_index)
|
|||
VALUE type;
|
||||
hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
|
||||
if (FAILED(hr))
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetVarDesc");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc");
|
||||
type = ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), Qnil);
|
||||
pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
|
||||
return type;
|
||||
|
@ -3730,7 +3730,7 @@ static ole_variable_ole_type_detail(pTypeInfo, var_index)
|
|||
VALUE type = rb_ary_new();
|
||||
hr = pTypeInfo->lpVtbl->GetVarDesc(pTypeInfo, var_index, &pVarDesc);
|
||||
if (FAILED(hr))
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetVarDesc");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetVarDesc");
|
||||
ole_typedesc2val(pTypeInfo, &(pVarDesc->elemdescVar.tdesc), type);
|
||||
pTypeInfo->lpVtbl->ReleaseVarDesc(pTypeInfo, pVarDesc);
|
||||
return type;
|
||||
|
@ -3936,12 +3936,12 @@ folemethod_initialize(self, oletype, method)
|
|||
Data_Get_Struct(oletype, struct oletypedata, ptype);
|
||||
obj = olemethod_from_typeinfo(self, ptype->pTypeInfo, method);
|
||||
if (obj == Qnil) {
|
||||
rb_raise(eWIN32OLE_RUNTIME_ERROR, "Not found %s",
|
||||
rb_raise(eWIN32OLE_RUNTIME_ERROR, "not found %s",
|
||||
StringValuePtr(method));
|
||||
}
|
||||
}
|
||||
else {
|
||||
rb_raise(rb_eTypeError, "1st argument should be WIN32OLE_TYPE object.");
|
||||
rb_raise(rb_eTypeError, "1st argument should be WIN32OLE_TYPE object");
|
||||
}
|
||||
return obj;
|
||||
}
|
||||
|
@ -3969,7 +3969,7 @@ ole_method_return_type(pTypeInfo, method_index)
|
|||
|
||||
hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
|
||||
if (FAILED(hr))
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetFuncDesc");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
|
||||
|
||||
type = ole_typedesc2val(pTypeInfo, &(pFuncDesc->elemdescFunc.tdesc), Qnil);
|
||||
pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
|
||||
|
@ -4001,7 +4001,7 @@ ole_method_return_vtype(pTypeInfo, method_index)
|
|||
|
||||
hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
|
||||
if (FAILED(hr))
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetFuncDesc");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
|
||||
|
||||
vt = INT2FIX(pFuncDesc->elemdescFunc.tdesc.vt);
|
||||
pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
|
||||
|
@ -4065,7 +4065,7 @@ ole_method_invkind(pTypeInfo, method_index)
|
|||
VALUE invkind;
|
||||
hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, method_index, &pFuncDesc);
|
||||
if(FAILED(hr))
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "Failed to GetFuncDesc");
|
||||
ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, "failed to GetFuncDesc");
|
||||
invkind = INT2FIX(pFuncDesc->invkind);
|
||||
pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
|
||||
return invkind;
|
||||
|
@ -5267,7 +5267,7 @@ fev_initialize(argc, argv, self)
|
|||
rb_scan_args(argc, argv, "11", &ole, &itf);
|
||||
|
||||
if (!rb_obj_is_kind_of(ole, cWIN32OLE)) {
|
||||
rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE object.");
|
||||
rb_raise(rb_eTypeError, "1st parameter must be WIN32OLE object");
|
||||
}
|
||||
|
||||
if(TYPE(itf) != T_NIL) {
|
||||
|
@ -5294,7 +5294,7 @@ fev_initialize(argc, argv, self)
|
|||
if (FAILED(hr)) {
|
||||
OLE_RELEASE(pTypeInfo);
|
||||
ole_raise(hr, rb_eRuntimeError,
|
||||
"Failed to query IConnectionPointContainer");
|
||||
"failed to query IConnectionPointContainer");
|
||||
}
|
||||
|
||||
hr = pContainer->lpVtbl->FindConnectionPoint(pContainer,
|
||||
|
@ -5303,7 +5303,7 @@ fev_initialize(argc, argv, self)
|
|||
OLE_RELEASE(pContainer);
|
||||
if (FAILED(hr)) {
|
||||
OLE_RELEASE(pTypeInfo);
|
||||
ole_raise(hr, rb_eRuntimeError, "Failed to query IConnectionPoint");
|
||||
ole_raise(hr, rb_eRuntimeError, "failed to query IConnectionPoint");
|
||||
}
|
||||
pIEV = EVENTSINK_Constructor();
|
||||
pIEV->m_iid = iid;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue