wez Mon Feb 10 08:13:27 2003 EDT
Modified files:
/php4/ext/rpc/com com_wrapper.c
Log:
Error reporting clean up
Index: php4/ext/rpc/com/com_wrapper.c
diff -u php4/ext/rpc/com/com_wrapper.c:1.87 php4/ext/rpc/com/com_wrapper.c:1.88
--- php4/ext/rpc/com/com_wrapper.c:1.87 Mon Feb 10 07:33:14 2003
+++ php4/ext/rpc/com/com_wrapper.c Mon Feb 10 08:13:27 2003
@@ -18,7 +18,7 @@
| Wez Furlong <[EMAIL PROTECTED]> |
+----------------------------------------------------------------------+
*/
-/* $Id: com_wrapper.c,v 1.87 2003/02/10 12:33:14 wez Exp $ */
+/* $Id: com_wrapper.c,v 1.88 2003/02/10 13:13:27 wez Exp $ */
/*
* This module implements support for COM components that support the IDispatch
* interface. Both local (COM) and remote (DCOM) components can be accessed.
@@ -76,19 +76,22 @@
int resourcecounter = 1;
#endif
-ZEND_API HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags,
DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult, char **ErrString)
+ZEND_API HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags,
+ DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult, char **ErrString)
{
HRESULT hr;
int failed = FALSE;
- unsigned int ArgErr;
+ unsigned int ArgErr = 0;
EXCEPINFO ExceptInfo;
*ErrString = NULL;
/* @todo use DispInvoke here ? */
if (C_HASTLIB(obj)) {
- hr = C_TYPEINFO_VT(obj)->Invoke(C_TYPEINFO(obj), C_DISPATCH(obj),
dispIdMember, wFlags, pDispParams, pVarResult, &ExceptInfo, &ArgErr);
+ hr = C_TYPEINFO_VT(obj)->Invoke(C_TYPEINFO(obj), C_DISPATCH(obj),
+ dispIdMember, wFlags, pDispParams, pVarResult, &ExceptInfo,
+&ArgErr);
if (FAILED(hr)) {
- hr = C_DISPATCH_VT(obj)->Invoke(C_DISPATCH(obj), dispIdMember,
&IID_NULL, LOCALE_SYSTEM_DEFAULT, wFlags, pDispParams, pVarResult, &ExceptInfo,
&ArgErr);
+ hr = C_DISPATCH_VT(obj)->Invoke(C_DISPATCH(obj), dispIdMember,
+&IID_NULL,
+ LOCALE_SYSTEM_DEFAULT, wFlags, pDispParams,
+pVarResult, &ExceptInfo, &ArgErr);
if (SUCCEEDED(hr)) {
/*
* ITypLib doesn't work
@@ -100,7 +103,8 @@
}
}
} else {
- hr = C_DISPATCH_VT(obj)->Invoke(C_DISPATCH(obj), dispIdMember,
&IID_NULL, LOCALE_SYSTEM_DEFAULT, wFlags, pDispParams, pVarResult, &ExceptInfo,
&ArgErr);
+ hr = C_DISPATCH_VT(obj)->Invoke(C_DISPATCH(obj), dispIdMember,
+&IID_NULL,
+ LOCALE_SYSTEM_DEFAULT, wFlags, pDispParams, pVarResult,
+&ExceptInfo, &ArgErr);
}
if (FAILED(hr)) {
@@ -137,7 +141,7 @@
break;
case DISP_E_PARAMNOTFOUND:
case DISP_E_TYPEMISMATCH:
- spprintf(ErrString, 0, "<b>Argument</b>: %d",
pDispParams->cArgs-ArgErr+1);
+ spprintf(ErrString, 0, "<b>Argument</b>: %d",
+pDispParams->cArgs - ArgErr);
break;
}
}
@@ -555,7 +559,7 @@
ret = 1;
} else {
- zend_error(E_WARNING, "Thats not a dispatchable interface!! type kind
= %08x", attr->typekind);
+ zend_error(E_WARNING, "That's not a dispatchable interface!! type kind
+= %08x", attr->typekind);
}
typeinfo->lpVtbl->ReleaseTypeAttr(typeinfo, attr);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
