diff options
Diffstat (limited to 'ext/com_dotnet/php_com_dotnet_internal.h')
| -rw-r--r-- | ext/com_dotnet/php_com_dotnet_internal.h | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/ext/com_dotnet/php_com_dotnet_internal.h b/ext/com_dotnet/php_com_dotnet_internal.h index e06f50c7d6..518e27af1f 100644 --- a/ext/com_dotnet/php_com_dotnet_internal.h +++ b/ext/com_dotnet/php_com_dotnet_internal.h @@ -54,7 +54,7 @@ typedef struct _php_com_dotnet_object { HashTable *id_of_name_cache; } php_com_dotnet_object; -static inline int php_com_is_valid_object(zval *zv TSRMLS_DC) +static inline int php_com_is_valid_object(zval *zv) { zend_class_entry *ce = Z_OBJCE_P(zv); return strcmp("com", ce->name->val) == 0 || @@ -64,8 +64,8 @@ static inline int php_com_is_valid_object(zval *zv TSRMLS_DC) #define CDNO_FETCH(zv) (php_com_dotnet_object*)Z_OBJ_P(zv) #define CDNO_FETCH_VERIFY(obj, zv) do { \ - if (!php_com_is_valid_object(zv TSRMLS_CC)) { \ - php_com_throw_exception(E_UNEXPECTED, "expected a variant object" TSRMLS_CC); \ + if (!php_com_is_valid_object(zv)) { \ + php_com_throw_exception(E_UNEXPECTED, "expected a variant object"); \ return; \ } \ obj = (php_com_dotnet_object*)Z_OBJ_P(zv); \ @@ -76,21 +76,21 @@ TsHashTable php_com_typelibraries; zend_class_entry *php_com_variant_class_entry, *php_com_exception_class_entry, *php_com_saproxy_class_entry; /* com_handlers.c */ -zend_object* php_com_object_new(zend_class_entry *ce TSRMLS_DC); -zend_object* php_com_object_clone(zval *object TSRMLS_DC); -void php_com_object_free_storage(zend_object *object TSRMLS_DC); +zend_object* php_com_object_new(zend_class_entry *ce); +zend_object* php_com_object_clone(zval *object); +void php_com_object_free_storage(zend_object *object); zend_object_handlers php_com_object_handlers; -void php_com_object_enable_event_sink(php_com_dotnet_object *obj, int enable TSRMLS_DC); +void php_com_object_enable_event_sink(php_com_dotnet_object *obj, int enable); /* com_saproxy.c */ -zend_object_iterator *php_com_saproxy_iter_get(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC); -int php_com_saproxy_create(zval *com_object, zval *proxy_out, zval *index TSRMLS_DC); +zend_object_iterator *php_com_saproxy_iter_get(zend_class_entry *ce, zval *object, int by_ref); +int php_com_saproxy_create(zval *com_object, zval *proxy_out, zval *index); /* com_olechar.c */ PHP_COM_DOTNET_API char *php_com_olestring_to_string(OLECHAR *olestring, - size_t *string_len, int codepage TSRMLS_DC); + size_t *string_len, int codepage); PHP_COM_DOTNET_API OLECHAR *php_com_string_to_olestring(char *string, - size_t string_len, int codepage TSRMLS_DC); + size_t string_len, int codepage); /* com_com.c */ @@ -103,20 +103,20 @@ PHP_FUNCTION(com_load_typelib); PHP_FUNCTION(com_get_active_object); HRESULT php_com_invoke_helper(php_com_dotnet_object *obj, DISPID id_member, - WORD flags, DISPPARAMS *disp_params, VARIANT *v, int silent, int allow_noarg TSRMLS_DC); + WORD flags, DISPPARAMS *disp_params, VARIANT *v, int silent, int allow_noarg); HRESULT php_com_get_id_of_name(php_com_dotnet_object *obj, char *name, - size_t namelen, DISPID *dispid TSRMLS_DC); + size_t namelen, DISPID *dispid); int php_com_do_invoke_by_id(php_com_dotnet_object *obj, DISPID dispid, - WORD flags, VARIANT *v, int nargs, zval *args, int silent, int allow_noarg TSRMLS_DC); + WORD flags, VARIANT *v, int nargs, zval *args, int silent, int allow_noarg); int php_com_do_invoke(php_com_dotnet_object *obj, char *name, size_t namelen, - WORD flags, VARIANT *v, int nargs, zval *args, int allow_noarg TSRMLS_DC); + WORD flags, VARIANT *v, int nargs, zval *args, int allow_noarg); int php_com_do_invoke_byref(php_com_dotnet_object *obj, zend_internal_function *f, - WORD flags, VARIANT *v, int nargs, zval *args TSRMLS_DC); + WORD flags, VARIANT *v, int nargs, zval *args); /* com_wrapper.c */ int php_com_wrapper_minit(INIT_FUNC_ARGS); -PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid, HashTable *id_to_name TSRMLS_DC); -PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export(zval *val TSRMLS_DC); +PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export_as_sink(zval *val, GUID *sinkid, HashTable *id_to_name); +PHP_COM_DOTNET_API IDispatch *php_com_wrapper_export(zval *val); /* com_persist.c */ int php_com_persist_minit(INIT_FUNC_ARGS); @@ -150,36 +150,36 @@ PHP_FUNCTION(variant_get_type); PHP_FUNCTION(variant_set_type); PHP_FUNCTION(variant_cast); -PHP_COM_DOTNET_API void php_com_variant_from_zval_with_type(VARIANT *v, zval *z, VARTYPE type, int codepage TSRMLS_DC); -PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC); -PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage TSRMLS_DC); -PHP_COM_DOTNET_API int php_com_copy_variant(VARIANT *dst, VARIANT *src TSRMLS_DC); +PHP_COM_DOTNET_API void php_com_variant_from_zval_with_type(VARIANT *v, zval *z, VARTYPE type, int codepage); +PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage); +PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepage); +PHP_COM_DOTNET_API int php_com_copy_variant(VARIANT *dst, VARIANT *src); /* com_dotnet.c */ PHP_FUNCTION(com_dotnet_create_instance); -void php_com_dotnet_rshutdown(TSRMLS_D); -void php_com_dotnet_mshutdown(TSRMLS_D); +void php_com_dotnet_rshutdown(void); +void php_com_dotnet_mshutdown(void); /* com_misc.c */ -void php_com_throw_exception(HRESULT code, char *message TSRMLS_DC); +void php_com_throw_exception(HRESULT code, char *message); PHP_COM_DOTNET_API void php_com_wrap_dispatch(zval *z, IDispatch *disp, - int codepage TSRMLS_DC); + int codepage); PHP_COM_DOTNET_API void php_com_wrap_variant(zval *z, VARIANT *v, - int codepage TSRMLS_DC); -PHP_COM_DOTNET_API int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1 TSRMLS_DC); + int codepage); +PHP_COM_DOTNET_API int php_com_safearray_get_elem(VARIANT *array, VARIANT *dest, LONG dim1); /* com_typeinfo.c */ PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib_via_cache(char *search_string, - int codepage, int *cached TSRMLS_DC); -PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codepage TSRMLS_DC); + int codepage, int *cached); +PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codepage); PHP_COM_DOTNET_API int php_com_import_typelib(ITypeLib *TL, int mode, - int codepage TSRMLS_DC); + int codepage); void php_com_typelibrary_dtor(void *pDest); -ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj, char *dispname, int sink TSRMLS_DC); -int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int printdef, GUID *guid, int codepage TSRMLS_DC); +ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj, char *dispname, int sink); +int php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, int printdef, GUID *guid, int codepage); /* com_iterator.c */ -zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int by_ref TSRMLS_DC); +zend_object_iterator *php_com_iter_get(zend_class_entry *ce, zval *object, int by_ref); #endif |