cvs: php4(EXPERIMENTAL) /ext/com COM.c VARIANT.c conversion.c php_COM.h php_VARIANT.h

phanto Mon Jul 30 15:01:35 2001 EDT Modified files: (Branch: EXPERIMENTAL) /php4/ext/com COM.c conversion.c php_COM.h php_VARIANT.h VARIANT.c Log: Updated to match TSRM changes

Index: php4/ext/com/COM.c diff -u php4/ext/com/COM.c:1.29.2.5 php4/ext/com/COM.c:1.29.2.6 --- php4/ext/com/COM.c:1.29.2.5 Sun Jul 29 18:37:41 2001 +++ php4/ext/com/COM.c Mon Jul 30 15:01:34 2001 @@ -378,7 +378,6 @@ char *typelib_name_buffer; char *strtok_buf = NULL; int interactive; - TSRMLS_FETCH(); interactive = CG(interactive); if(!new_value || (typelib_file = VCWD_FOPEN(new_value, "r"))==NULL) @@ -1199,6 +1198,7 @@ int type; comval *obj, *obj_prop; VARIANT *var_result; + TSRMLS_FETCH(); INIT_ZVAL(return_value); ZVAL_NULL(&return_value); @@ -1298,7 +1298,7 @@ comval *obj, *obj_prop; int type; VARIANT *var_result; - + TSRMLS_FETCH(); /* fetch the IDispatch interface */ zend_hash_index_find(Z_OBJPROP_P(object), 0, (void **) &comval_handle); @@ -1708,11 +1708,11 @@ SysFreeString(bstr_ids); c.name_len = strlen(ids)+1; c.name = ids; - if (zend_get_constant(c.name, c.name_len-1, &exists)) + if (zend_get_constant(c.name, c.name_len-1, &exists TSRMLS_CC)) { /* Oops, it already exists. No problem if it is defined as the same value */ /* Check to see if they are the same */ - if (!compare_function(&results, &c.value, &exists) && INI_INT("com.autoregister_verbose")) + if (!compare_function(&results, &c.value, &exists TSRMLS_CC) && INI_INT("com.autoregister_verbose")) { php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name); } @@ -1768,12 +1768,14 @@ void php_register_COM_class() { + TSRMLS_FETCH(); + INIT_OVERLOADED_CLASS_ENTRY(com_class_entry, "COM", NULL, php_COM_call_function_handler, php_COM_get_property_handler, php_COM_set_property_handler); - zend_register_internal_class(&com_class_entry); + zend_register_internal_class(&com_class_entry TSRMLS_CC); } PHP_MINIT_FUNCTION(COM) Index: php4/ext/com/conversion.c diff -u php4/ext/com/conversion.c:1.22.2.6 php4/ext/com/conversion.c:1.22.2.7 --- php4/ext/com/conversion.c:1.22.2.6 Sun Jul 29 18:37:41 2001 +++ php4/ext/com/conversion.c Mon Jul 30 15:01:34 2001 @@ -37,17 +37,17 @@ /* prototypes */ -PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage); -PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage); +PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC); +PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC); PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent, int codepage); PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage); PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int persistent, int codepage); -static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage); -static void comval_to_variant(pval *pval_arg, VARIANT *var_arg); +static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC); +static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC); /* implementations */ -PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage) +PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC) { int type = VT_EMPTY; /* default variant type */ @@ -100,15 +100,15 @@ type |= VT_BYREF; } - pval_to_variant_ex(pval_arg, var_arg, type, codepage); + pval_to_variant_ex(pval_arg, var_arg, type, codepage TSRMLS_CC); } -PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage) +PHPAPI void php_pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, pval *pval_type, int codepage TSRMLS_DC) { - pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage); + pval_to_variant_ex(pval_arg, var_arg, Z_LVAL_P(pval_type), codepage TSRMLS_CC); } -static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage) +static void pval_to_variant_ex(pval *pval_arg, VARIANT *var_arg, int type, int codepage TSRMLS_DC) { OLECHAR *unicode_str; @@ -162,11 +162,11 @@ { if(type) /* explicit type */ { - pval_to_variant_ex(*entry, v, type, codepage); /* Do the required conversion */ + pval_to_variant_ex(*entry, v, type, codepage TSRMLS_CC); /* Do the required conversion */ } else { - php_pval_to_variant(*entry, v, codepage); /* Do the required conversion */ + php_pval_to_variant(*entry, v, codepage TSRMLS_CC); /* Do the required conversion */ } } else @@ -267,7 +267,7 @@ break; case VT_UNKNOWN: - comval_to_variant(pval_arg, var_arg); + comval_to_variant(pval_arg, var_arg TSRMLS_CC); if(V_VT(var_arg) != VT_DISPATCH) { VariantInit(var_arg); @@ -280,7 +280,7 @@ break; case VT_DISPATCH: - comval_to_variant(pval_arg, var_arg); + comval_to_variant(pval_arg, var_arg TSRMLS_CC); if(V_VT(var_arg) != VT_DISPATCH) { VariantInit(var_arg); @@ -355,7 +355,7 @@ break; case VT_UNKNOWN|VT_BYREF: - comval_to_variant(pval_arg, var_arg); + comval_to_variant(pval_arg, var_arg TSRMLS_CC); if(V_VT(var_arg) != VT_DISPATCH) { VariantInit(var_arg); @@ -368,7 +368,7 @@ break; case VT_DISPATCH|VT_BYREF: - comval_to_variant(pval_arg, var_arg); + comval_to_variant(pval_arg, var_arg TSRMLS_CC); if(V_VT(var_arg) != VT_DISPATCH) { VariantInit(var_arg); @@ -888,7 +888,7 @@ return C_str; } -static void comval_to_variant(pval *pval_arg, VARIANT *var_arg) +static void comval_to_variant(pval *pval_arg, VARIANT *var_arg TSRMLS_DC) { pval **comval_handle; comval *obj; Index: php4/ext/com/php_COM.h diff -u php4/ext/com/php_COM.h:1.7.2.2 php4/ext/com/php_COM.h:1.7.2.3 --- php4/ext/com/php_COM.h:1.7.2.2 Thu Jul 26 10:45:40 2001 +++ php4/ext/com/php_COM.h Mon Jul 30 15:01:35 2001 @@ -7,26 +7,26 @@ BEGIN_EXTERN_C() -extern PHP_MINIT_FUNCTION(COM); -extern PHP_MSHUTDOWN_FUNCTION(COM); +PHP_MINIT_FUNCTION(COM); +PHP_MSHUTDOWN_FUNCTION(COM); -extern PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult); -extern PHPAPI HRESULT php_COM_get_ids_of_names(comval *obj, OLECHAR FAR* FAR* rgszNames, DISPID FAR* rgDispId); -extern PHPAPI HRESULT php_COM_release(comval *obj); -extern PHPAPI HRESULT php_COM_addref(comval *obj); -extern PHPAPI HRESULT php_COM_destruct(comval *obj); -extern PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* pDisp, int cleanup); -extern PHPAPI HRESULT php_COM_clone(comval *obj, comval *clone, int cleanup); +PHPAPI HRESULT php_COM_invoke(comval *obj, DISPID dispIdMember, WORD wFlags, DISPPARAMS FAR* pDispParams, VARIANT FAR* pVarResult); +PHPAPI HRESULT php_COM_get_ids_of_names(comval *obj, OLECHAR FAR* FAR* rgszNames, DISPID FAR* rgDispId); +PHPAPI HRESULT php_COM_release(comval *obj); +PHPAPI HRESULT php_COM_addref(comval *obj); +PHPAPI HRESULT php_COM_destruct(comval *obj); +PHPAPI HRESULT php_COM_set(comval *obj, IDispatch FAR* FAR* pDisp, int cleanup); +PHPAPI HRESULT php_COM_clone(comval *obj, comval *clone, int cleanup); -extern int php_COM_get_le_comval(); +int php_COM_get_le_comval(); -extern zend_module_entry COM_module_entry; -extern zend_class_entry com_class_entry; +zend_module_entry COM_module_entry; +zend_class_entry com_class_entry; -extern pval php_COM_get_property_handler(zend_property_reference *property_reference); -extern int php_COM_set_property_handler(zend_property_reference *property_reference, pval *value); -extern char *php_COM_error_message(HRESULT hr); -extern void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference); +pval php_COM_get_property_handler(zend_property_reference *property_reference); +int php_COM_set_property_handler(zend_property_reference *property_reference, pval *value); +char *php_COM_error_message(HRESULT hr); +void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference); #ifdef DEBUG extern int resourcecounter; Index: php4/ext/com/php_VARIANT.h diff -u php4/ext/com/php_VARIANT.h:1.3 php4/ext/com/php_VARIANT.h:1.3.2.1 --- php4/ext/com/php_VARIANT.h:1.3 Sun Jun 24 17:09:07 2001 +++ php4/ext/com/php_VARIANT.h Mon Jul 30 15:01:35 2001 @@ -7,8 +7,8 @@ extern int php_VARIANT_get_le_variant(); -extern PHP_MINIT_FUNCTION(VARIANT); -extern PHP_MSHUTDOWN_FUNCTION(VARIANT); +PHP_MINIT_FUNCTION(VARIANT); +PHP_MSHUTDOWN_FUNCTION(VARIANT); extern zend_module_entry VARIANT_module_entry; Index: php4/ext/com/VARIANT.c diff -u php4/ext/com/VARIANT.c:1.15.2.1 php4/ext/com/VARIANT.c:1.15.2.2 --- php4/ext/com/VARIANT.c:1.15.2.1 Sun Jul 29 18:37:41 2001 +++ php4/ext/com/VARIANT.c Mon Jul 30 15:01:35 2001 @@ -187,6 +187,7 @@ { zend_overloaded_element *overloaded_property; int type; + TSRMLS_FETCH(); pval result, **var_handle, *object = property_reference->object; VARIANT *var_arg; @@ -239,6 +240,7 @@ { zend_overloaded_element *overloaded_property; int type; + TSRMLS_FETCH(); pval **var_handle, *object = property_reference->object; VARIANT *var_arg; @@ -434,14 +436,16 @@ FREE_VARIANT(rsrc->ptr); } -void php_register_VARIANT_class() +void php_register_VARIANT_class(void) { + TSRMLS_FETCH(); + INIT_OVERLOADED_CLASS_ENTRY(VARIANT_class_entry, "VARIANT", NULL, php_VARIANT_call_function_handler, php_VARIANT_get_property_handler, php_VARIANT_set_property_handler); - zend_register_internal_class(&VARIANT_class_entry); + zend_register_internal_class(&VARIANT_class_entry TSRMLS_CC); } #endif /* PHP_WIN32 */