From c9159797d8c5c1c3b2ac7f69d24ad4e11cc29cc9 Mon Sep 17 00:00:00 2001 From: Harald Radi Date: Sun, 3 Jun 2001 01:38:56 +0000 Subject: removed unneeded function --- ext/com/COM.c | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'ext/com/COM.c') diff --git a/ext/com/COM.c b/ext/com/COM.c index a4c5563a68..b0be9e5f44 100644 --- a/ext/com/COM.c +++ b/ext/com/COM.c @@ -93,20 +93,6 @@ static PHP_MINFO_FUNCTION(COM) DISPLAY_INI_ENTRIES(); } -PHPAPI int php_COM_check_ref(i_dispatch *obj) -{ - if(!obj->referenced) - { - php_error(E_WARNING, "Object is already released. Calling AddRef() but maybe it doesn't exist anymore."); - php_COM_addref(obj); - return FALSE; - } - else - { - return TRUE; - } -} - PHPAPI HRESULT php_COM_invoke(i_dispatch *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult) { HRESULT hr; @@ -201,16 +187,14 @@ PHPAPI HRESULT php_COM_clone(i_dispatch *obj, i_dispatch *clone, int cleanup) { HRESULT hr; - php_COM_check_ref(clone); - obj->typelib = clone->typelib; obj->i.dispatch = clone->i.dispatch; obj->i.typeinfo = clone->i.typeinfo; - if(cleanup) + if(cleanup || !obj->referenced) { obj->referenced = clone->referenced; - clone->referenced = FALSE; + clone->referenced = 0; } else { -- cgit v1.2.1