diff options
| author | Andrei Zmievski <andrei@php.net> | 2000-10-20 18:25:16 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2000-10-20 18:25:16 +0000 |
| commit | 7b4983c8f82c4f361df787f58c6f5cf88d5def0b (patch) | |
| tree | e38e8ffceb65a0f2492b28e2b07c8668fcddeda4 /ext/rpc/com/COM.c | |
| parent | a0cfab65ea72963f81a3440a3587d11bd7800337 (diff) | |
| download | php-git-7b4983c8f82c4f361df787f58c6f5cf88d5def0b.tar.gz | |
Mega-patch to get better resource information for modules.
* Fixed a bug in zend_rsrc_list_get_rsrc_type()
* Switched register_list_destructors() to use
zend_register_list_destructors_ex() instead
* Updated all relevant modules to provide the resource type name
to register_list_destructors() call
* Updated var_dump() to output resource type name instead of number
@- Made resource type names visible, e.g. var_dump() and
@ get_resource_type() display "file" for file resources. (Andrei)
Diffstat (limited to 'ext/rpc/com/COM.c')
| -rw-r--r-- | ext/rpc/com/COM.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/rpc/com/COM.c b/ext/rpc/com/COM.c index 782a797904..3fd289f3ee 100644 --- a/ext/rpc/com/COM.c +++ b/ext/rpc/com/COM.c @@ -148,8 +148,9 @@ static char *php_string_from_clsid(CLSID *clsid) } -static void php_idispatch_destructor(IDispatch *i_dispatch) +static void php_idispatch_destructor(zend_rsrc_list_entry *rsrc) { + IDispatch *i_dispatch = (IDispatch *)rsrc->ptr; i_dispatch->lpVtbl->Release(i_dispatch); } @@ -226,7 +227,7 @@ PHP_INI_END() PHP_MINIT_FUNCTION(COM) { CoInitialize(NULL); - le_idispatch = register_list_destructors(php_idispatch_destructor, NULL); + le_idispatch = register_list_destructors(php_idispatch_destructor, NULL,"COM"); php_register_COM_class(); REGISTER_INI_ENTRIES(); return SUCCESS; |