From: Jos Backus Date: 2004-07-20T03:53:00+09:00 Subject: Typo and grammar/style fixes for ext/win32ole/win32ole.c --3V7upXqbjpZ4EhLz Content-Type: text/plain; charset=us-ascii Content-Disposition: inline The attached patch attempts to create a more consistent style for error messages in ext/win32ole/win32ole.c by: - replacing the word `Faile' with `Failed'; - uppercasing the first word of sentences (notably `failed' -> `Failed'); - removing a stray `.'; - improving the use of quoting and colons. Please consider incorporating these changes. Thank you. -- Jos Backus _/ _/_/_/ Sunnyvale, CA _/ _/ _/ _/ _/_/_/ _/ _/ _/ _/ jos at catnook.com _/_/ _/_/_/ require 'std/disclaimer' --3V7upXqbjpZ4EhLz Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="win32ole.c.diff" Index: ext/win32ole/win32ole.c =================================================================== RCS file: /src/ruby/ext/win32ole/win32ole.c,v retrieving revision 1.24 diff -u -r1.24 win32ole.c --- ext/win32ole/win32ole.c 22 Jun 2004 15:16:46 -0000 1.24 +++ ext/win32ole/win32ole.c 19 Jul 2004 18:46:12 -0000 @@ -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 @@ 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,7 +1364,7 @@ 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"); @@ -1381,7 +1381,7 @@ 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 @@ 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 @@ 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 @@ if(FAILED(hr)) { OLE_RELEASE(pBindCtx); ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Faile 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 @@ if(FAILED(hr)) { ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Faile to bind moniker:%s", + "Failed to bind moniker `%s'", StringValuePtr(moniker)); } return create_win32ole_object(self, pDispatch, argc, argv); @@ -1488,14 +1488,14 @@ hr = GetActiveObject(&clsid, 0, &pUnknown); if (FAILED(hr)) { ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Not Running OLE server : `%s'", StringValuePtr(svr_name)); + "OLE server `%s' not running", StringValuePtr(svr_name)); } hr = pUnknown->lpVtbl->QueryInterface(pUnknown, &IID_IDispatch, (void **)&pDispatch); 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)); } @@ -1539,12 +1539,12 @@ 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 @@ 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); } @@ -1724,7 +1724,7 @@ } 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; @@ -1733,7 +1733,7 @@ /* * Document-class: WIN32OLE * - * WIN32OLE objects represent OLE Automation object in the Ruby. + * WIN32OLE objects represent OLE Automation object in Ruby. */ /* @@ -1787,7 +1787,7 @@ SysFreeString(pBuf); if(FAILED(hr)) { ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Unknown OLE server : `%s'", + "Unknown OLE server: `%s'", StringValuePtr(svr_name)); } @@ -1796,7 +1796,7 @@ &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)); } @@ -1897,7 +1897,7 @@ 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, @@ -1905,7 +1905,7 @@ SysFreeString(wcmdname); if(FAILED(hr)) { ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Unknown property or method : `%s'", + "Unknown property or method: `%s'", StringValuePtr(cmd)); } @@ -1942,7 +1942,7 @@ VariantClear(&op.dp.rgvarg[i]); } ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "FAIL to get named argument info : `%s'", + "Failed to get named argument info: `%s'", StringValuePtr(cmd)); } op.dp.rgdispidNamedArgs = &(pDispID[1]); @@ -2369,7 +2369,7 @@ if(FAILED(hr)) { ole_raise(hr, eWIN32OLE_RUNTIME_ERROR, - "Unknown property or method : `%s'", + "Unknown property or method: `%s'", StringValuePtr(property)); } /* set property value */ @@ -2471,7 +2471,7 @@ 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) @@ -2484,7 +2484,7 @@ (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); @@ -2509,7 +2509,7 @@ 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] == '=') { @@ -2539,7 +2539,7 @@ 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); @@ -2578,7 +2578,7 @@ 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) { @@ -2614,7 +2614,7 @@ 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; @@ -2655,7 +2655,7 @@ 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); @@ -2688,7 +2688,7 @@ 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, @@ -2698,7 +2698,7 @@ 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++) { @@ -2813,12 +2813,12 @@ 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); @@ -3051,7 +3051,7 @@ 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); @@ -3086,7 +3086,7 @@ 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); @@ -3278,7 +3278,7 @@ 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); @@ -3476,7 +3476,7 @@ 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; @@ -3506,7 +3506,7 @@ 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; @@ -3536,7 +3536,7 @@ 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; @@ -3691,7 +3691,7 @@ 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++) { @@ -3776,7 +3776,7 @@ 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; @@ -3805,7 +3805,7 @@ 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; @@ -4054,7 +4054,7 @@ 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); @@ -4086,7 +4086,7 @@ 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); @@ -4150,7 +4150,7 @@ 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; @@ -5417,7 +5417,7 @@ if (FAILED(hr)) { OLE_RELEASE(pTypeInfo); ole_raise(hr, rb_eRuntimeError, - "failed to query IConnectionPointContainer"); + "Failed to query IConnectionPointContainer"); } hr = pContainer->lpVtbl->FindConnectionPoint(pContainer, @@ -5426,7 +5426,7 @@ 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; --3V7upXqbjpZ4EhLz--