cvs: php4 /ext/com COM.c
| From: | Harald Radi | Date: | Tue, 14 Aug 2001 13:38:35 +0000 |
| Subject: | cvs: php4 /ext/com COM.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-6839@lists.php.net to get a copy of this message | ||
phanto Tue Aug 14 09:38:35 2001 EDT
Modified files:
/php4/ext/com COM.c
Log:
fixed com_invoke retval
Index: php4/ext/com/COM.c
diff -u php4/ext/com/COM.c:1.48 php4/ext/com/COM.c:1.49
--- php4/ext/com/COM.c:1.48 Tue Aug 14 08:47:08 2001
+++ php4/ext/com/COM.c Tue Aug 14 09:38:35 2001
@@ -109,6 +109,7 @@
EXCEPINFO ExceptInfo;
*ErrString = NULL;
+ /* @todo use DispInvoke here ? */
if (C_ISREFD(obj)) {
if (C_HASTLIB(obj)) {
hr = C_TYPEINFO_VT(obj)->Invoke(C_TYPEINFO(obj), C_DISPATCH(obj), dispIdMember, wFlags,
pDispParams, pVarResult, &ExceptInfo, &ArgErr);
@@ -153,8 +154,7 @@
}
}
- if (!pVarResult) {
- VariantInit(pVarResult);
+ if (pVarResult && (V_VT(pVarResult) == VT_EMPTY)) {
V_VT(pVarResult) = VT_I4;
V_I4(pVarResult) = hr;
}