summaryrefslogtreecommitdiff
path: root/ext/com_dotnet/com_variant.c
diff options
context:
space:
mode:
Diffstat (limited to 'ext/com_dotnet/com_variant.c')
-rw-r--r--ext/com_dotnet/com_variant.c128
1 files changed, 64 insertions, 64 deletions
diff --git a/ext/com_dotnet/com_variant.c b/ext/com_dotnet/com_variant.c
index 7317b8d0e4..ce919d8a03 100644
--- a/ext/com_dotnet/com_variant.c
+++ b/ext/com_dotnet/com_variant.c
@@ -32,7 +32,7 @@
* Only creates a single-dimensional array of variants.
* The keys of the PHP hash MUST be numeric. If the array
* is sparse, then the gaps will be filled with NULL variants */
-static void safe_array_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC)
+static void safe_array_from_zval(VARIANT *v, zval *z, int codepage)
{
SAFEARRAY *sa = NULL;
SAFEARRAYBOUND bound;
@@ -54,7 +54,7 @@ static void safe_array_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC)
} else if (HASH_KEY_NON_EXISTENT == keytype) {
break;
} else if (intindex > UINT_MAX) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "COM: max number %u of elements in safe array exceeded", UINT_MAX);
+ php_error_docref(NULL, E_WARNING, "COM: max number %u of elements in safe array exceeded", UINT_MAX);
break;
}
}
@@ -75,7 +75,7 @@ static void safe_array_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC)
break;
}
zend_hash_get_current_key_ex(HASH_OF(z), &strindex, &intindex, 0, &pos);
- php_com_variant_from_zval(&va[intindex], item, codepage TSRMLS_CC);
+ php_com_variant_from_zval(&va[intindex], item, codepage);
}
/* Unlock it and stuff it into our variant */
@@ -86,7 +86,7 @@ static void safe_array_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC)
return;
bogus:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "COM: converting from PHP array to VARIANT array; only arrays with numeric keys are allowed");
+ php_error_docref(NULL, E_WARNING, "COM: converting from PHP array to VARIANT array; only arrays with numeric keys are allowed");
V_VT(v) = VT_NULL;
@@ -96,7 +96,7 @@ bogus:
}
}
-PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage TSRMLS_DC)
+PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codepage)
{
OLECHAR *olestring;
php_com_dotnet_object *obj;
@@ -118,7 +118,7 @@ PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codep
break;
case IS_OBJECT:
- if (php_com_is_valid_object(z TSRMLS_CC)) {
+ if (php_com_is_valid_object(z)) {
obj = CDNO_FETCH(z);
if (V_VT(&obj->v) == VT_DISPATCH) {
/* pass the underlying object */
@@ -135,13 +135,13 @@ PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codep
} else {
/* export the PHP object using our COM wrapper */
V_VT(v) = VT_DISPATCH;
- V_DISPATCH(v) = php_com_wrapper_export(z TSRMLS_CC);
+ V_DISPATCH(v) = php_com_wrapper_export(z);
}
break;
case IS_ARRAY:
/* map as safe array */
- safe_array_from_zval(v, z, codepage TSRMLS_CC);
+ safe_array_from_zval(v, z, codepage);
break;
case IS_LONG:
@@ -161,7 +161,7 @@ PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codep
case IS_STRING:
V_VT(v) = VT_BSTR;
- olestring = php_com_string_to_olestring(Z_STRVAL_P(z), Z_STRLEN_P(z), codepage TSRMLS_CC);
+ olestring = php_com_string_to_olestring(Z_STRVAL_P(z), Z_STRLEN_P(z), codepage);
if (CP_UTF8 == codepage) {
V_BSTR(v) = SysAllocStringByteLen((char*)olestring, (UINT)(wcslen(olestring) * sizeof(OLECHAR)));
} else {
@@ -179,7 +179,7 @@ PHP_COM_DOTNET_API void php_com_variant_from_zval(VARIANT *v, zval *z, int codep
}
}
-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_zval_from_variant(zval *z, VARIANT *v, int codepage)
{
OLECHAR *olestring = NULL;
int ret = SUCCESS;
@@ -236,7 +236,7 @@ PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepa
if (olestring) {
size_t len;
char *str = php_com_olestring_to_string(olestring,
- &len, codepage TSRMLS_CC);
+ &len, codepage);
ZVAL_STRINGL(z, str, len);
// TODO: avoid reallocation???
efree(str);
@@ -248,7 +248,7 @@ PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepa
IDispatch *disp;
if (SUCCEEDED(IUnknown_QueryInterface(V_UNKNOWN(v), &IID_IDispatch, &disp))) {
- php_com_wrap_dispatch(z, disp, codepage TSRMLS_CC);
+ php_com_wrap_dispatch(z, disp, codepage);
IDispatch_Release(disp);
} else {
ret = FAILURE;
@@ -258,16 +258,16 @@ PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepa
case VT_DISPATCH:
if (V_DISPATCH(v) != NULL) {
- php_com_wrap_dispatch(z, V_DISPATCH(v), codepage TSRMLS_CC);
+ php_com_wrap_dispatch(z, V_DISPATCH(v), codepage);
}
break;
case VT_VARIANT:
/* points to another variant */
- return php_com_zval_from_variant(z, V_VARIANTREF(v), codepage TSRMLS_CC);
+ return php_com_zval_from_variant(z, V_VARIANTREF(v), codepage);
default:
- php_com_wrap_variant(z, v, codepage TSRMLS_CC);
+ php_com_wrap_variant(z, v, codepage);
}
if (olestring) {
@@ -275,14 +275,14 @@ PHP_COM_DOTNET_API int php_com_zval_from_variant(zval *z, VARIANT *v, int codepa
}
if (ret == FAILURE) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "variant->zval: conversion from 0x%x ret=%d", V_VT(v), ret);
+ php_error_docref(NULL, E_WARNING, "variant->zval: conversion from 0x%x ret=%d", V_VT(v), ret);
}
return ret;
}
-PHP_COM_DOTNET_API int php_com_copy_variant(VARIANT *dstvar, VARIANT *srcvar TSRMLS_DC)
+PHP_COM_DOTNET_API int php_com_copy_variant(VARIANT *dstvar, VARIANT *srcvar)
{
int ret = SUCCESS;
@@ -422,10 +422,10 @@ PHP_COM_DOTNET_API int php_com_copy_variant(VARIANT *dstvar, VARIANT *srcvar TSR
break;
case VT_VARIANT:
- return php_com_copy_variant(V_VARIANTREF(dstvar), srcvar TSRMLS_CC);
+ return php_com_copy_variant(V_VARIANTREF(dstvar), srcvar);
default:
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "variant->variant: failed to copy from 0x%x to 0x%x", V_VT(dstvar), V_VT(srcvar));
+ php_error_docref(NULL, E_WARNING, "variant->variant: failed to copy from 0x%x to 0x%x", V_VT(dstvar), V_VT(srcvar));
ret = FAILURE;
}
return ret;
@@ -448,19 +448,19 @@ PHP_FUNCTION(com_variant_create_instance)
obj = CDNO_FETCH(object);
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),
"z!|ll", &zvalue, &vt, &codepage)) {
- php_com_throw_exception(E_INVALIDARG, "Invalid arguments" TSRMLS_CC);
+ php_com_throw_exception(E_INVALIDARG, "Invalid arguments");
return;
}
- php_com_initialize(TSRMLS_C);
+ php_com_initialize();
if (ZEND_NUM_ARGS() == 3) {
obj->code_page = (int)codepage;
}
if (zvalue) {
- php_com_variant_from_zval(&obj->v, zvalue, obj->code_page TSRMLS_CC);
+ php_com_variant_from_zval(&obj->v, zvalue, obj->code_page);
}
/* Only perform conversion if variant not already of type passed */
@@ -490,7 +490,7 @@ PHP_FUNCTION(com_variant_create_instance)
spprintf(&msg, 0, "Variant type conversion failed: %s", werr);
LocalFree(werr);
- php_com_throw_exception(res, msg TSRMLS_CC);
+ php_com_throw_exception(res, msg);
efree(msg);
}
}
@@ -510,7 +510,7 @@ PHP_FUNCTION(variant_set)
zval *zobj, *zvalue = NULL;
php_com_dotnet_object *obj;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),
"Oz!", &zobj, php_com_variant_class_entry, &zvalue)) {
return;
}
@@ -523,14 +523,14 @@ PHP_FUNCTION(variant_set)
obj->typeinfo = NULL;
}
if (obj->sink_dispatch) {
- php_com_object_enable_event_sink(obj, FALSE TSRMLS_CC);
+ php_com_object_enable_event_sink(obj, FALSE);
IDispatch_Release(obj->sink_dispatch);
obj->sink_dispatch = NULL;
}
VariantClear(&obj->v);
- php_com_variant_from_zval(&obj->v, zvalue, obj->code_page TSRMLS_CC);
+ php_com_variant_from_zval(&obj->v, zvalue, obj->code_page);
/* remember we modified this variant */
obj->modified = 1;
}
@@ -561,33 +561,33 @@ static void variant_binary_operation(enum variant_binary_opcode op, INTERNAL_FUN
VariantInit(&vres);
if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
- ZEND_NUM_ARGS() TSRMLS_CC, "OO", &zleft, php_com_variant_class_entry,
+ ZEND_NUM_ARGS(), "OO", &zleft, php_com_variant_class_entry,
&zright, php_com_variant_class_entry)) {
obj = CDNO_FETCH(zleft);
vleft = &obj->v;
obj = CDNO_FETCH(zright);
vright = &obj->v;
} else if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
- ZEND_NUM_ARGS() TSRMLS_CC, "Oz!", &zleft, php_com_variant_class_entry,
+ ZEND_NUM_ARGS(), "Oz!", &zleft, php_com_variant_class_entry,
&zright)) {
obj = CDNO_FETCH(zleft);
vleft = &obj->v;
vright = &right_val;
- php_com_variant_from_zval(vright, zright, codepage TSRMLS_CC);
+ php_com_variant_from_zval(vright, zright, codepage);
} else if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
- ZEND_NUM_ARGS() TSRMLS_CC, "z!O", &zleft, &zright, php_com_variant_class_entry)) {
+ ZEND_NUM_ARGS(), "z!O", &zleft, &zright, php_com_variant_class_entry)) {
obj = CDNO_FETCH(zright);
vright = &obj->v;
vleft = &left_val;
- php_com_variant_from_zval(vleft, zleft, codepage TSRMLS_CC);
- } else if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+ php_com_variant_from_zval(vleft, zleft, codepage);
+ } else if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(),
"z!z!", &zleft, &zright)) {
vleft = &left_val;
- php_com_variant_from_zval(vleft, zleft, codepage TSRMLS_CC);
+ php_com_variant_from_zval(vleft, zleft, codepage);
vright = &right_val;
- php_com_variant_from_zval(vright, zright, codepage TSRMLS_CC);
+ php_com_variant_from_zval(vright, zright, codepage);
} else {
return;
@@ -639,9 +639,9 @@ static void variant_binary_operation(enum variant_binary_opcode op, INTERNAL_FUN
}
if (SUCCEEDED(result)) {
- php_com_wrap_variant(return_value, &vres, codepage TSRMLS_CC);
+ php_com_wrap_variant(return_value, &vres, codepage);
} else {
- php_com_throw_exception(result, NULL TSRMLS_CC);
+ php_com_throw_exception(result, NULL);
}
VariantClear(&vres);
@@ -768,13 +768,13 @@ static void variant_unary_operation(enum variant_unary_opcode op, INTERNAL_FUNCT
VariantInit(&vres);
if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
- ZEND_NUM_ARGS() TSRMLS_CC, "O", &zleft, php_com_variant_class_entry)) {
+ ZEND_NUM_ARGS(), "O", &zleft, php_com_variant_class_entry)) {
obj = CDNO_FETCH(zleft);
vleft = &obj->v;
- } else if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+ } else if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(),
"z!", &zleft)) {
vleft = &left_val;
- php_com_variant_from_zval(vleft, zleft, codepage TSRMLS_CC);
+ php_com_variant_from_zval(vleft, zleft, codepage);
} else {
return;
}
@@ -800,9 +800,9 @@ static void variant_unary_operation(enum variant_unary_opcode op, INTERNAL_FUNCT
}
if (SUCCEEDED(result)) {
- php_com_wrap_variant(return_value, &vres, codepage TSRMLS_CC);
+ php_com_wrap_variant(return_value, &vres, codepage);
} else {
- php_com_throw_exception(result, NULL TSRMLS_CC);
+ php_com_throw_exception(result, NULL);
}
VariantClear(&vres);
@@ -866,19 +866,19 @@ PHP_FUNCTION(variant_round)
VariantInit(&vres);
if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
- ZEND_NUM_ARGS() TSRMLS_CC, "Ol", &zleft, php_com_variant_class_entry, &decimals)) {
+ ZEND_NUM_ARGS(), "Ol", &zleft, php_com_variant_class_entry, &decimals)) {
obj = CDNO_FETCH(zleft);
vleft = &obj->v;
- } else if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+ } else if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(),
"z!l", &zleft, &decimals)) {
vleft = &left_val;
- php_com_variant_from_zval(vleft, zleft, codepage TSRMLS_CC);
+ php_com_variant_from_zval(vleft, zleft, codepage);
} else {
return;
}
if (SUCCEEDED(VarRound(vleft, (int)decimals, &vres))) {
- php_com_wrap_variant(return_value, &vres, codepage TSRMLS_CC);
+ php_com_wrap_variant(return_value, &vres, codepage);
}
VariantClear(&vres);
@@ -904,34 +904,34 @@ PHP_FUNCTION(variant_cmp)
VariantInit(&right_val);
if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
- ZEND_NUM_ARGS() TSRMLS_CC, "OO|ll", &zleft, php_com_variant_class_entry,
+ ZEND_NUM_ARGS(), "OO|ll", &zleft, php_com_variant_class_entry,
&zright, php_com_variant_class_entry, &lcid, &flags)) {
obj = CDNO_FETCH(zleft);
vleft = &obj->v;
obj = CDNO_FETCH(zright);
vright = &obj->v;
} else if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
- ZEND_NUM_ARGS() TSRMLS_CC, "Oz!|ll", &zleft, php_com_variant_class_entry,
+ ZEND_NUM_ARGS(), "Oz!|ll", &zleft, php_com_variant_class_entry,
&zright, &lcid, &flags)) {
obj = CDNO_FETCH(zleft);
vleft = &obj->v;
vright = &right_val;
- php_com_variant_from_zval(vright, zright, codepage TSRMLS_CC);
+ php_com_variant_from_zval(vright, zright, codepage);
} else if (SUCCESS == zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET,
- ZEND_NUM_ARGS() TSRMLS_CC, "z!O|ll", &zleft, &zright, php_com_variant_class_entry,
+ ZEND_NUM_ARGS(), "z!O|ll", &zleft, &zright, php_com_variant_class_entry,
&lcid, &flags)) {
obj = CDNO_FETCH(zright);
vright = &obj->v;
vleft = &left_val;
- php_com_variant_from_zval(vleft, zleft, codepage TSRMLS_CC);
- } else if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+ php_com_variant_from_zval(vleft, zleft, codepage);
+ } else if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS(),
"z!z!|ll", &zleft, &zright, &lcid, &flags)) {
vleft = &left_val;
- php_com_variant_from_zval(vleft, zleft, codepage TSRMLS_CC);
+ php_com_variant_from_zval(vleft, zleft, codepage);
vright = &right_val;
- php_com_variant_from_zval(vright, zright, codepage TSRMLS_CC);
+ php_com_variant_from_zval(vright, zright, codepage);
} else {
return;
@@ -954,7 +954,7 @@ PHP_FUNCTION(variant_date_to_timestamp)
VariantInit(&vres);
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),
"O", &zleft, php_com_variant_class_entry)) {
return;
}
@@ -993,13 +993,13 @@ PHP_FUNCTION(variant_date_from_timestamp)
struct tm *tmv;
VARIANT res;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l",
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(), "l",
&timestamp)) {
return;
}
if (timestamp < 0) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING, "Timestamp value must be a positive value.");
+ php_error_docref(NULL, E_WARNING, "Timestamp value must be a positive value.");
RETURN_FALSE;
}
@@ -1019,7 +1019,7 @@ PHP_FUNCTION(variant_date_from_timestamp)
V_VT(&res) = VT_DATE;
SystemTimeToVariantTime(&systime, &V_DATE(&res));
- php_com_wrap_variant(return_value, &res, CP_ACP TSRMLS_CC);
+ php_com_wrap_variant(return_value, &res, CP_ACP);
VariantClear(&res);
}
@@ -1032,7 +1032,7 @@ PHP_FUNCTION(variant_get_type)
zval *zobj;
php_com_dotnet_object *obj;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),
"O", &zobj, php_com_variant_class_entry)) {
return;
}
@@ -1051,7 +1051,7 @@ PHP_FUNCTION(variant_set_type)
/* VARTYPE == unsigned short */ zend_long vt;
HRESULT res;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),
"Ol", &zobj, php_com_variant_class_entry, &vt)) {
return;
}
@@ -1071,7 +1071,7 @@ PHP_FUNCTION(variant_set_type)
spprintf(&msg, 0, "Variant type conversion failed: %s", werr);
LocalFree(werr);
- php_com_throw_exception(res, msg TSRMLS_CC);
+ php_com_throw_exception(res, msg);
efree(msg);
}
}
@@ -1087,7 +1087,7 @@ PHP_FUNCTION(variant_cast)
VARIANT vres;
HRESULT res;
- if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC,
+ if (FAILURE == zend_parse_parameters(ZEND_NUM_ARGS(),
"Ol", &zobj, php_com_variant_class_entry, &vt)) {
return;
}
@@ -1097,7 +1097,7 @@ PHP_FUNCTION(variant_cast)
res = VariantChangeType(&vres, &obj->v, 0, (VARTYPE)vt);
if (SUCCEEDED(res)) {
- php_com_wrap_variant(return_value, &vres, obj->code_page TSRMLS_CC);
+ php_com_wrap_variant(return_value, &vres, obj->code_page);
} else {
char *werr, *msg;
@@ -1105,7 +1105,7 @@ PHP_FUNCTION(variant_cast)
spprintf(&msg, 0, "Variant type conversion failed: %s", werr);
LocalFree(werr);
- php_com_throw_exception(res, msg TSRMLS_CC);
+ php_com_throw_exception(res, msg);
efree(msg);
}
View Lorry Controller Status