diff options
| author | Wez Furlong <wez@php.net> | 2004-05-03 15:51:41 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2004-05-03 15:51:41 +0000 |
| commit | 8ca144bba555a9fcbe69fe4c9007407e9bfc78e3 (patch) | |
| tree | bd27767110d81f2d8bacb974811c8cf4843dc3f7 /ext/com_dotnet/com_wrapper.c | |
| parent | b39a1e5195c5c8adc6a2ddd5c233efe3347982f3 (diff) | |
| download | php-git-8ca144bba555a9fcbe69fe4c9007407e9bfc78e3.tar.gz | |
Fixup some constants and error handling.
Remove unfinished and un-needed function.
Diffstat (limited to 'ext/com_dotnet/com_wrapper.c')
| -rw-r--r-- | ext/com_dotnet/com_wrapper.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/ext/com_dotnet/com_wrapper.c b/ext/com_dotnet/com_wrapper.c index 0ca3247a45..4ca96cc8c5 100644 --- a/ext/com_dotnet/com_wrapper.c +++ b/ext/com_dotnet/com_wrapper.c @@ -314,14 +314,8 @@ static HRESULT STDMETHODCALLTYPE disp_invokeex( /* return value */ if (retval) { if (pvarRes) { - if (Z_TYPE_P(retval) == IS_OBJECT) { - /* export the object using a dispatch like ourselves */ - VariantInit(pvarRes); - V_VT(pvarRes) = VT_DISPATCH; - V_DISPATCH(pvarRes) = php_com_wrapper_export(retval TSRMLS_CC); - } else { - php_com_variant_from_zval(pvarRes, retval, COMG(code_page) TSRMLS_CC); - } + VariantInit(pvarRes); + php_com_variant_from_zval(pvarRes, retval, COMG(code_page) TSRMLS_CC); } zval_ptr_dtor(&retval); } else if (pvarRes) { @@ -344,6 +338,8 @@ static HRESULT STDMETHODCALLTYPE disp_deletememberbyname( FETCH_DISP("DeleteMemberByName"); + /* TODO: unset */ + return S_FALSE; } @@ -355,6 +351,8 @@ static HRESULT STDMETHODCALLTYPE disp_deletememberbydispid( FETCH_DISP("DeleteMemberByDispID"); + /* TODO: unset */ + return S_FALSE; } |