diff options
Diffstat (limited to 'ext/com')
| -rw-r--r-- | ext/com/COM.c | 12 | ||||
| -rw-r--r-- | ext/com/VARIANT.c | 6 | ||||
| -rw-r--r-- | ext/com/conversion.c | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/ext/com/COM.c b/ext/com/COM.c index e67084523b..93f296280d 100644 --- a/ext/com/COM.c +++ b/ext/com/COM.c @@ -433,7 +433,7 @@ PHP_INI_ENTRY_EX("com.allow_dcom", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_di PHP_INI_ENTRY_EX("com.autoregister_typelib", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) PHP_INI_ENTRY_EX("com.autoregister_verbose", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) PHP_INI_ENTRY_EX("com.autoregister_casesensitive", "1", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) -PHP_INI_ENTRY("com.typelib_file", "", PHP_INI_SYSTEM, OnTypelibFileChange) +PHP_INI_ENTRY("Z_TYPE(com)lib_file", "", PHP_INI_SYSTEM, OnTypelibFileChange) PHP_INI_END() @@ -467,7 +467,7 @@ PHP_FUNCTION(com_load) zend_get_parameters(ht, 3, &module_name, &server_name, &code_page); convert_to_long_ex(&code_page); - codepage = code_page->value.lval; + codepage = Z_LVAL_P(code_page); break; case 4: @@ -1123,7 +1123,7 @@ PHP_FUNCTION(com_load_typelib) case 2: zend_get_parameters(ht, 2, &arg_typelib, &arg_cis); convert_to_boolean_ex(&arg_cis); - if (arg_cis->value.lval) { + if (Z_LVAL_P(arg_cis)) { mode &= ~CONST_CS; } break; @@ -1171,7 +1171,7 @@ PHPAPI pval php_COM_get_property_handler(zend_property_reference *property_refer for (element=property_reference->elements_list->head; element; element=element->next) { overloaded_property = (zend_overloaded_element *) element->data; - switch (overloaded_property->type) { + switch (Z_TYPE_P(overloaded_property)) { case OE_IS_ARRAY: if (do_COM_offget(var_result, obj, &overloaded_property->element, FALSE TSRMLS_CC) == FAILURE) { FREE_VARIANT(var_result); @@ -1261,7 +1261,7 @@ PHPAPI int php_COM_set_property_handler(zend_property_reference *property_refere for (element=property_reference->elements_list->head; element != property_reference->elements_list->tail; element=element->next) { overloaded_property = (zend_overloaded_element *) element->data; - switch (overloaded_property->type) { + switch (Z_TYPE_P(overloaded_property)) { case OE_IS_ARRAY: if (do_COM_offget(var_result, obj, &overloaded_property->element, FALSE TSRMLS_CC) == FAILURE) { FREE_VARIANT(var_result); @@ -1347,7 +1347,7 @@ PHPAPI void php_COM_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_pro } property = php_COM_get_property_handler(property_reference); - if (property.type == IS_NULL) { + if (Z_TYPE(property) == IS_NULL) { if (property.refcount == 1) { pval_destructor(&property); } diff --git a/ext/com/VARIANT.c b/ext/com/VARIANT.c index 4f521cdd4c..80b48550e6 100644 --- a/ext/com/VARIANT.c +++ b/ext/com/VARIANT.c @@ -133,7 +133,7 @@ static void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend zend_get_parameters(ht, 3, &data, &type, &code_page); php_pval_to_variant_ex(data, pVar, type, codepage TSRMLS_CC); convert_to_long(code_page); - codepage = code_page->value.lval; + codepage = Z_LVAL_P(code_page); break; default: ZEND_WRONG_PARAM_COUNT(); @@ -174,13 +174,13 @@ static pval php_VARIANT_get_property_handler(zend_property_reference *property_r ZVAL_FALSE(&result); } else { overloaded_property = (zend_overloaded_element *) property_reference->elements_list->head->data; - switch (overloaded_property->type) { + switch (Z_TYPE_P(overloaded_property)) { case OE_IS_ARRAY: ZVAL_FALSE(&result); break; case OE_IS_OBJECT: - if (!strcmp(overloaded_property->element.value.str.val, "value")) { + if (!strcmp(overloaded_property->Z_STRVAL(element), "value")) { php_variant_to_pval(var_arg, &result, codepage TSRMLS_CC); } else if (!strcmp(Z_STRVAL(overloaded_property->element), "type")) { ZVAL_LONG(&result, V_VT(var_arg)) diff --git a/ext/com/conversion.c b/ext/com/conversion.c index ea5cde6188..8449e41461 100644 --- a/ext/com/conversion.c +++ b/ext/com/conversion.c @@ -199,7 +199,7 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type, SYSTEMTIME wintime; struct tm *phptime; - phptime = gmtime(&(pval_arg->value.lval)); + phptime = gmtime(&(Z_LVAL_P(pval_arg))); memset(&wintime, 0, sizeof(wintime)); wintime.wYear = phptime->tm_year + 1900; @@ -288,14 +288,14 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type, case VT_CY|VT_BYREF: convert_to_double_ex(&pval_arg); - VarCyFromR8(pval_arg->value.dval, var_arg->pcyVal); + VarCyFromR8(Z_DVAL_P(pval_arg), var_arg->pcyVal); break; case VT_DATE|VT_BYREF: { SYSTEMTIME wintime; struct tm *phptime; - phptime = gmtime(&(pval_arg->value.lval)); + phptime = gmtime(&(Z_LVAL_P(pval_arg))); memset(&wintime, 0, sizeof(wintime)); wintime.wYear = phptime->tm_year + 1900; |