mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 20:34:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Harald Radi 2001-06-24 21:09:32 +00:00
parent 3949658942
commit 750fee8fa0
4 changed files with 224 additions and 232 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

189
ext/com/VARIANT.c
View File

@ -28,12 +28,16 @@
#include "php.h"
#include "php_ini.h"
#include "php_VARIANT.h"
#include "variant.h"
#include "conversion.h"
#include "ext/standard/info.h"
#include <unknwn.h>
PHP_MINIT_FUNCTION(VARIANT);
PHP_MSHUTDOWN_FUNCTION(VARIANT);
int php_VARIANT_get_le_variant();
void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference);
pval php_VARIANT_get_property_handler(zend_property_reference *property_reference);
static int do_VARIANT_propset(VARIANT *var_arg, pval *arg_property, pval *value);
@ -108,18 +112,23 @@ PHP_MSHUTDOWN_FUNCTION(VARIANT)
return SUCCESS;
}
int php_VARIANT_get_le_variant()
{
return le_variant;
}
void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference)
{
pval *object = property_reference->object;
zend_overloaded_element *function_name = (zend_overloaded_element *) property_reference->elements_list->tail->data;
VARIANT *pVar;
if((zend_llist_count(property_reference->elements_list)==1) && !strcmp(function_name->element.value.str.val, "variant"))
if((zend_llist_count(property_reference->elements_list)==1) && !strcmp(Z_STRVAL(function_name->element), "variant"))
{
/* constructor */
pval *object_handle, *data, *type, *code_page;
pVar = emalloc(sizeof(VARIANT));
ALLOC_VARIANT(pVar);
VariantInit(pVar);
switch(ZEND_NUM_ARGS())
@ -148,8 +157,7 @@ void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_proper
break;
}
return_value->type = IS_LONG;
return_value->value.lval = zend_list_insert(pVar, le_variant);
RETVAL_LONG(zend_list_insert(pVar, IS_VARIANT));
if(!zend_is_true(return_value))
{
@ -177,9 +185,9 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
/* fetch the VARIANT structure */
zend_hash_index_find(object->value.obj.properties, 0, (void **) &var_handle);
var_arg = zend_list_find((*var_handle)->value.lval, &type);
var_arg = zend_list_find(Z_LVAL_PP(var_handle), &type);
if(!var_arg || (type != le_variant))
if(!var_arg || (type != IS_VARIANT))
{
var_reset(&result);
}
@ -197,10 +205,9 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
{
php_variant_to_pval(var_arg, &result, 0, codepage);
}
else if(!strcmp(overloaded_property->element.value.str.val, "type"))
else if(!strcmp(Z_STRVAL(overloaded_property->element), "type"))
{
result.value.lval = var_arg->vt;
result.type = IS_LONG;
ZVAL_LONG(&result, V_VT(var_arg))
}
else
{
@ -230,9 +237,9 @@ int php_VARIANT_set_property_handler(zend_property_reference *property_reference
/* fetch the VARIANT structure */
zend_hash_index_find(object->value.obj.properties, 0, (void **) &var_handle);
var_arg = zend_list_find((*var_handle)->value.lval, &type);
var_arg = zend_list_find(Z_LVAL_PP(var_handle), &type);
if(!var_arg || (type != le_variant))
if(!var_arg || (type != IS_VARIANT))
return FAILURE;
overloaded_property = (zend_overloaded_element *) property_reference->elements_list->head->data;
@ -245,163 +252,163 @@ static int do_VARIANT_propset(VARIANT *var_arg, pval *arg_property, pval *value)
{
pval type;
type.type = IS_STRING;
Z_TYPE(type) = IS_STRING;
if(!strcmp(arg_property->value.str.val, "bVal"))
if(!strcmp(Z_STRVAL_P(arg_property), "bVal"))
{
type.value.lval = VT_UI1;
Z_LVAL(type) = VT_UI1;
}
else if(!strcmp(arg_property->value.str.val, "iVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "iVal"))
{
type.value.lval = VT_I2;
Z_LVAL(type) = VT_I2;
}
else if(!strcmp(arg_property->value.str.val, "lVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "lVal"))
{
type.value.lval = VT_I4;
Z_LVAL(type) = VT_I4;
}
else if(!strcmp(arg_property->value.str.val, "fltVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "fltVal"))
{
type.value.lval = VT_R4;
Z_LVAL(type) = VT_R4;
}
else if(!strcmp(arg_property->value.str.val, "dblVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "dblVal"))
{
type.value.lval = VT_R8;
Z_LVAL(type) = VT_R8;
}
else if(!strcmp(arg_property->value.str.val, "boolVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "boolVal"))
{
type.value.lval = VT_BOOL;
Z_LVAL(type) = VT_BOOL;
}
else if(!strcmp(arg_property->value.str.val, "scode"))
else if(!strcmp(Z_STRVAL_P(arg_property), "scode"))
{
type.value.lval = VT_ERROR;
Z_LVAL(type) = VT_ERROR;
}
else if(!strcmp(arg_property->value.str.val, "cyVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "cyVal"))
{
type.value.lval = VT_CY;
Z_LVAL(type) = VT_CY;
}
else if(!strcmp(arg_property->value.str.val, "date"))
else if(!strcmp(Z_STRVAL_P(arg_property), "date"))
{
type.value.lval = VT_DATE;
Z_LVAL(type) = VT_DATE;
}
else if(!strcmp(arg_property->value.str.val, "bstrVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "bstrVal"))
{
type.value.lval = VT_BSTR;
Z_LVAL(type) = VT_BSTR;
}
else if(!strcmp(arg_property->value.str.val, "pdecVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pdecVal"))
{
type.value.lval = VT_DECIMAL|VT_BYREF;
Z_LVAL(type) = VT_DECIMAL|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "punkVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "punkVal"))
{
type.value.lval = VT_UNKNOWN;
Z_LVAL(type) = VT_UNKNOWN;
}
else if(!strcmp(arg_property->value.str.val, "pdispVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pdispVal"))
{
type.value.lval = VT_DISPATCH;
Z_LVAL(type) = VT_DISPATCH;
}
else if(!strcmp(arg_property->value.str.val, "parray"))
else if(!strcmp(Z_STRVAL_P(arg_property), "parray"))
{
type.value.lval = VT_ARRAY;
Z_LVAL(type) = VT_ARRAY;
}
else if(!strcmp(arg_property->value.str.val, "pbVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pbVal"))
{
type.value.lval = VT_UI1|VT_BYREF;
Z_LVAL(type) = VT_UI1|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "piVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "piVal"))
{
type.value.lval = VT_I2|VT_BYREF;
Z_LVAL(type) = VT_I2|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "plVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "plVal"))
{
type.value.lval = VT_I4|VT_BYREF;
Z_LVAL(type) = VT_I4|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pfltVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pfltVal"))
{
type.value.lval = VT_R4|VT_BYREF;
Z_LVAL(type) = VT_R4|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pdblVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pdblVal"))
{
type.value.lval = VT_R8|VT_BYREF;
Z_LVAL(type) = VT_R8|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pboolVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pboolVal"))
{
type.value.lval = VT_BOOL|VT_BYREF;
Z_LVAL(type) = VT_BOOL|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pscode"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pscode"))
{
type.value.lval = VT_ERROR|VT_BYREF;
Z_LVAL(type) = VT_ERROR|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pcyVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pcyVal"))
{
type.value.lval = VT_CY|VT_BYREF;
Z_LVAL(type) = VT_CY|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pdate"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pdate"))
{
type.value.lval = VT_DATE|VT_BYREF;
Z_LVAL(type) = VT_DATE|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pbstrVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pbstrVal"))
{
type.value.lval = VT_BSTR|VT_BYREF;
Z_LVAL(type) = VT_BSTR|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "ppunkVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "ppunkVal"))
{
type.value.lval = VT_UNKNOWN|VT_BYREF;
Z_LVAL(type) = VT_UNKNOWN|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "ppdispVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "ppdispVal"))
{
type.value.lval = VT_DISPATCH|VT_BYREF;
Z_LVAL(type) = VT_DISPATCH|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pparray"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pparray"))
{
type.value.lval = VT_ARRAY|VT_BYREF;
Z_LVAL(type) = VT_ARRAY|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pvarVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pvarVal"))
{
type.value.lval = VT_VARIANT|VT_BYREF;
Z_LVAL(type) = VT_VARIANT|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "byref"))
else if(!strcmp(Z_STRVAL_P(arg_property), "byref"))
{
type.value.lval = VT_BYREF;
Z_LVAL(type) = VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "cVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "cVal"))
{
type.value.lval = VT_I1;
Z_LVAL(type) = VT_I1;
}
else if(!strcmp(arg_property->value.str.val, "uiVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "uiVal"))
{
type.value.lval = VT_UI2;
Z_LVAL(type) = VT_UI2;
}
else if(!strcmp(arg_property->value.str.val, "ulVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "ulVal"))
{
type.value.lval = VT_UI4;
Z_LVAL(type) = VT_UI4;
}
else if(!strcmp(arg_property->value.str.val, "intVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "intVal"))
{
type.value.lval = VT_INT;
Z_LVAL(type) = VT_INT;
}
else if(!strcmp(arg_property->value.str.val, "uintVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "uintVal"))
{
type.value.lval = VT_UINT|VT_BYREF;
Z_LVAL(type) = VT_UINT|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pcVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pcVal"))
{
type.value.lval = VT_I1|VT_BYREF;
Z_LVAL(type) = VT_I1|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "puiVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "puiVal"))
{
type.value.lval = VT_UI2|VT_BYREF;
Z_LVAL(type) = VT_UI2|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pulVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pulVal"))
{
type.value.lval = VT_UI4|VT_BYREF;
Z_LVAL(type) = VT_UI4|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pintVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pintVal"))
{
type.value.lval = VT_INT|VT_BYREF;
Z_LVAL(type) = VT_INT|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "puintVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "puintVal"))
{
type.value.lval = VT_UINT|VT_BYREF;
Z_LVAL(type) = VT_UINT|VT_BYREF;
}
else
{

39
ext/com/conversion.c
View File

@ -33,9 +33,9 @@
#include "php.h"
#include "php_COM.h"
#include "unknwn.h"
#include "php_VARIANT.h"
// prototypes
/* 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);
@ -43,7 +43,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
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);
// implementations
/* implementations */
PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
{
@ -76,14 +76,14 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
}
else if(!strcmp(pval_arg->value.obj.ce->name, "COM"))
{
pval **idispatch_handle;
pval **comval_handle;
comval *obj;
int type;
/* fetch the IDispatch interface */
zend_hash_index_find(pval_arg->value.obj.properties, 0, (void **) &idispatch_handle);
obj = (comval *)zend_list_find(Z_LVAL_P(*idispatch_handle), &type);
if(!obj || (type != php_COM_get_le_idispatch()) || !C_ISREFD(obj))
zend_hash_index_find(pval_arg->value.obj.properties, 0, (void **) &comval_handle);
obj = (comval *)zend_list_find(Z_LVAL_P(*comval_handle), &type);
if(!obj || (type != IS_COM) || !C_ISREFD(obj))
{
VariantInit(var_arg);
}
@ -115,7 +115,7 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
if(pval_arg->is_ref)
{
V_VT(var_arg) = VT_VARIANT|VT_BYREF; /* Create a VARIANT to reference */
V_VARIANTREF(var_arg) = emalloc(sizeof(VARIANT));
ALLOC_VARIANT(V_VARIANTREF(var_arg));
var_arg = V_VARIANTREF(var_arg); /* & put the array in that VARIANT */
}
@ -731,7 +731,6 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
/* break missing intentionaly */
case VT_DISPATCH:
{
pval *handle;
comval *obj;
if(V_DISPATCH(var_arg) == NULL)
@ -741,20 +740,10 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
}
else
{
obj = emalloc(sizeof(comval));
ALLOC_COM(obj);
php_COM_set(obj, V_DISPATCH(var_arg), TRUE);
Z_TYPE_P(pval_arg) = IS_OBJECT;
pval_arg->value.obj.ce = &com_class_entry;
ALLOC_HASHTABLE(pval_arg->value.obj.properties);
zend_hash_init(pval_arg->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
ALLOC_ZVAL(handle);
INIT_PZVAL(handle);
ZVAL_LONG(handle, zend_list_insert(obj, php_COM_get_le_idispatch()));
pval_copy_constructor(handle);
zend_hash_index_update(pval_arg->value.obj.properties, 0, &handle, sizeof(pval *), NULL);
ZVAL_COM(pval_arg, obj);
}
}
break;
@ -827,14 +816,14 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage)
{
OLECHAR *unicode_str;
//request needed buffersize
/* request needed buffersize */
uint reqSize = MultiByteToWideChar(codepage, MB_PRECOMPOSED | MB_ERR_INVALID_CHARS, C_str, -1, NULL, 0);
if(reqSize)
{
unicode_str = (OLECHAR *) emalloc(sizeof(OLECHAR) * reqSize);
//convert string
/* convert string */
MultiByteToWideChar(codepage, MB_PRECOMPOSED | MB_ERR_INVALID_CHARS, C_str, -1, unicode_str, reqSize);
}
else
@ -860,14 +849,14 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int per
char *C_str;
uint length = 0;
//request needed buffersize
/* request needed buffersize */
uint reqSize = WideCharToMultiByte(codepage, WC_COMPOSITECHECK, unicode_str, -1, NULL, 0, NULL, NULL);
if(reqSize)
{
C_str = (char *) pemalloc(sizeof(char) * reqSize, persistent);
//convert string
/* convert string */
length = WideCharToMultiByte(codepage, WC_COMPOSITECHECK, unicode_str, -1, C_str, reqSize, NULL, NULL) - 1;
}
else

39
ext/rpc/com/conversion.c
View File

@ -33,9 +33,9 @@
#include "php.h"
#include "php_COM.h"
#include "unknwn.h"
#include "php_VARIANT.h"
// prototypes
/* 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);
@ -43,7 +43,7 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
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);
// implementations
/* implementations */
PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
{
@ -76,14 +76,14 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
}
else if(!strcmp(pval_arg->value.obj.ce->name, "COM"))
{
pval **idispatch_handle;
pval **comval_handle;
comval *obj;
int type;
/* fetch the IDispatch interface */
zend_hash_index_find(pval_arg->value.obj.properties, 0, (void **) &idispatch_handle);
obj = (comval *)zend_list_find(Z_LVAL_P(*idispatch_handle), &type);
if(!obj || (type != php_COM_get_le_idispatch()) || !C_ISREFD(obj))
zend_hash_index_find(pval_arg->value.obj.properties, 0, (void **) &comval_handle);
obj = (comval *)zend_list_find(Z_LVAL_P(*comval_handle), &type);
if(!obj || (type != IS_COM) || !C_ISREFD(obj))
{
VariantInit(var_arg);
}
@ -115,7 +115,7 @@ PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage)
if(pval_arg->is_ref)
{
V_VT(var_arg) = VT_VARIANT|VT_BYREF; /* Create a VARIANT to reference */
V_VARIANTREF(var_arg) = emalloc(sizeof(VARIANT));
ALLOC_VARIANT(V_VARIANTREF(var_arg));
var_arg = V_VARIANTREF(var_arg); /* & put the array in that VARIANT */
}
@ -731,7 +731,6 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
/* break missing intentionaly */
case VT_DISPATCH:
{
pval *handle;
comval *obj;
if(V_DISPATCH(var_arg) == NULL)
@ -741,20 +740,10 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int persistent,
}
else
{
obj = emalloc(sizeof(comval));
ALLOC_COM(obj);
php_COM_set(obj, V_DISPATCH(var_arg), TRUE);
Z_TYPE_P(pval_arg) = IS_OBJECT;
pval_arg->value.obj.ce = &com_class_entry;
ALLOC_HASHTABLE(pval_arg->value.obj.properties);
zend_hash_init(pval_arg->value.obj.properties, 0, NULL, ZVAL_PTR_DTOR, 0);
ALLOC_ZVAL(handle);
INIT_PZVAL(handle);
ZVAL_LONG(handle, zend_list_insert(obj, php_COM_get_le_idispatch()));
pval_copy_constructor(handle);
zend_hash_index_update(pval_arg->value.obj.properties, 0, &handle, sizeof(pval *), NULL);
ZVAL_COM(pval_arg, obj);
}
}
break;
@ -827,14 +816,14 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage)
{
OLECHAR *unicode_str;
//request needed buffersize
/* request needed buffersize */
uint reqSize = MultiByteToWideChar(codepage, MB_PRECOMPOSED | MB_ERR_INVALID_CHARS, C_str, -1, NULL, 0);
if(reqSize)
{
unicode_str = (OLECHAR *) emalloc(sizeof(OLECHAR) * reqSize);
//convert string
/* convert string */
MultiByteToWideChar(codepage, MB_PRECOMPOSED | MB_ERR_INVALID_CHARS, C_str, -1, unicode_str, reqSize);
}
else
@ -860,14 +849,14 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int per
char *C_str;
uint length = 0;
//request needed buffersize
/* request needed buffersize */
uint reqSize = WideCharToMultiByte(codepage, WC_COMPOSITECHECK, unicode_str, -1, NULL, 0, NULL, NULL);
if(reqSize)
{
C_str = (char *) pemalloc(sizeof(char) * reqSize, persistent);
//convert string
/* convert string */
length = WideCharToMultiByte(codepage, WC_COMPOSITECHECK, unicode_str, -1, C_str, reqSize, NULL, NULL) - 1;
}
else

189
ext/rpc/com/variant.c
View File

@ -28,12 +28,16 @@
#include "php.h"
#include "php_ini.h"
#include "php_VARIANT.h"
#include "variant.h"
#include "conversion.h"
#include "ext/standard/info.h"
#include <unknwn.h>
PHP_MINIT_FUNCTION(VARIANT);
PHP_MSHUTDOWN_FUNCTION(VARIANT);
int php_VARIANT_get_le_variant();
void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference);
pval php_VARIANT_get_property_handler(zend_property_reference *property_reference);
static int do_VARIANT_propset(VARIANT *var_arg, pval *arg_property, pval *value);
@ -108,18 +112,23 @@ PHP_MSHUTDOWN_FUNCTION(VARIANT)
return SUCCESS;
}
int php_VARIANT_get_le_variant()
{
return le_variant;
}
void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference)
{
pval *object = property_reference->object;
zend_overloaded_element *function_name = (zend_overloaded_element *) property_reference->elements_list->tail->data;
VARIANT *pVar;
if((zend_llist_count(property_reference->elements_list)==1) && !strcmp(function_name->element.value.str.val, "variant"))
if((zend_llist_count(property_reference->elements_list)==1) && !strcmp(Z_STRVAL(function_name->element), "variant"))
{
/* constructor */
pval *object_handle, *data, *type, *code_page;
pVar = emalloc(sizeof(VARIANT));
ALLOC_VARIANT(pVar);
VariantInit(pVar);
switch(ZEND_NUM_ARGS())
@ -148,8 +157,7 @@ void php_VARIANT_call_function_handler(INTERNAL_FUNCTION_PARAMETERS, zend_proper
break;
}
return_value->type = IS_LONG;
return_value->value.lval = zend_list_insert(pVar, le_variant);
RETVAL_LONG(zend_list_insert(pVar, IS_VARIANT));
if(!zend_is_true(return_value))
{
@ -177,9 +185,9 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
/* fetch the VARIANT structure */
zend_hash_index_find(object->value.obj.properties, 0, (void **) &var_handle);
var_arg = zend_list_find((*var_handle)->value.lval, &type);
var_arg = zend_list_find(Z_LVAL_PP(var_handle), &type);
if(!var_arg || (type != le_variant))
if(!var_arg || (type != IS_VARIANT))
{
var_reset(&result);
}
@ -197,10 +205,9 @@ pval php_VARIANT_get_property_handler(zend_property_reference *property_referenc
{
php_variant_to_pval(var_arg, &result, 0, codepage);
}
else if(!strcmp(overloaded_property->element.value.str.val, "type"))
else if(!strcmp(Z_STRVAL(overloaded_property->element), "type"))
{
result.value.lval = var_arg->vt;
result.type = IS_LONG;
ZVAL_LONG(&result, V_VT(var_arg))
}
else
{
@ -230,9 +237,9 @@ int php_VARIANT_set_property_handler(zend_property_reference *property_reference
/* fetch the VARIANT structure */
zend_hash_index_find(object->value.obj.properties, 0, (void **) &var_handle);
var_arg = zend_list_find((*var_handle)->value.lval, &type);
var_arg = zend_list_find(Z_LVAL_PP(var_handle), &type);
if(!var_arg || (type != le_variant))
if(!var_arg || (type != IS_VARIANT))
return FAILURE;
overloaded_property = (zend_overloaded_element *) property_reference->elements_list->head->data;
@ -245,163 +252,163 @@ static int do_VARIANT_propset(VARIANT *var_arg, pval *arg_property, pval *value)
{
pval type;
type.type = IS_STRING;
Z_TYPE(type) = IS_STRING;
if(!strcmp(arg_property->value.str.val, "bVal"))
if(!strcmp(Z_STRVAL_P(arg_property), "bVal"))
{
type.value.lval = VT_UI1;
Z_LVAL(type) = VT_UI1;
}
else if(!strcmp(arg_property->value.str.val, "iVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "iVal"))
{
type.value.lval = VT_I2;
Z_LVAL(type) = VT_I2;
}
else if(!strcmp(arg_property->value.str.val, "lVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "lVal"))
{
type.value.lval = VT_I4;
Z_LVAL(type) = VT_I4;
}
else if(!strcmp(arg_property->value.str.val, "fltVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "fltVal"))
{
type.value.lval = VT_R4;
Z_LVAL(type) = VT_R4;
}
else if(!strcmp(arg_property->value.str.val, "dblVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "dblVal"))
{
type.value.lval = VT_R8;
Z_LVAL(type) = VT_R8;
}
else if(!strcmp(arg_property->value.str.val, "boolVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "boolVal"))
{
type.value.lval = VT_BOOL;
Z_LVAL(type) = VT_BOOL;
}
else if(!strcmp(arg_property->value.str.val, "scode"))
else if(!strcmp(Z_STRVAL_P(arg_property), "scode"))
{
type.value.lval = VT_ERROR;
Z_LVAL(type) = VT_ERROR;
}
else if(!strcmp(arg_property->value.str.val, "cyVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "cyVal"))
{
type.value.lval = VT_CY;
Z_LVAL(type) = VT_CY;
}
else if(!strcmp(arg_property->value.str.val, "date"))
else if(!strcmp(Z_STRVAL_P(arg_property), "date"))
{
type.value.lval = VT_DATE;
Z_LVAL(type) = VT_DATE;
}
else if(!strcmp(arg_property->value.str.val, "bstrVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "bstrVal"))
{
type.value.lval = VT_BSTR;
Z_LVAL(type) = VT_BSTR;
}
else if(!strcmp(arg_property->value.str.val, "pdecVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pdecVal"))
{
type.value.lval = VT_DECIMAL|VT_BYREF;
Z_LVAL(type) = VT_DECIMAL|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "punkVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "punkVal"))
{
type.value.lval = VT_UNKNOWN;
Z_LVAL(type) = VT_UNKNOWN;
}
else if(!strcmp(arg_property->value.str.val, "pdispVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pdispVal"))
{
type.value.lval = VT_DISPATCH;
Z_LVAL(type) = VT_DISPATCH;
}
else if(!strcmp(arg_property->value.str.val, "parray"))
else if(!strcmp(Z_STRVAL_P(arg_property), "parray"))
{
type.value.lval = VT_ARRAY;
Z_LVAL(type) = VT_ARRAY;
}
else if(!strcmp(arg_property->value.str.val, "pbVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pbVal"))
{
type.value.lval = VT_UI1|VT_BYREF;
Z_LVAL(type) = VT_UI1|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "piVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "piVal"))
{
type.value.lval = VT_I2|VT_BYREF;
Z_LVAL(type) = VT_I2|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "plVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "plVal"))
{
type.value.lval = VT_I4|VT_BYREF;
Z_LVAL(type) = VT_I4|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pfltVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pfltVal"))
{
type.value.lval = VT_R4|VT_BYREF;
Z_LVAL(type) = VT_R4|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pdblVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pdblVal"))
{
type.value.lval = VT_R8|VT_BYREF;
Z_LVAL(type) = VT_R8|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pboolVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pboolVal"))
{
type.value.lval = VT_BOOL|VT_BYREF;
Z_LVAL(type) = VT_BOOL|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pscode"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pscode"))
{
type.value.lval = VT_ERROR|VT_BYREF;
Z_LVAL(type) = VT_ERROR|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pcyVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pcyVal"))
{
type.value.lval = VT_CY|VT_BYREF;
Z_LVAL(type) = VT_CY|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pdate"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pdate"))
{
type.value.lval = VT_DATE|VT_BYREF;
Z_LVAL(type) = VT_DATE|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pbstrVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pbstrVal"))
{
type.value.lval = VT_BSTR|VT_BYREF;
Z_LVAL(type) = VT_BSTR|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "ppunkVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "ppunkVal"))
{
type.value.lval = VT_UNKNOWN|VT_BYREF;
Z_LVAL(type) = VT_UNKNOWN|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "ppdispVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "ppdispVal"))
{
type.value.lval = VT_DISPATCH|VT_BYREF;
Z_LVAL(type) = VT_DISPATCH|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pparray"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pparray"))
{
type.value.lval = VT_ARRAY|VT_BYREF;
Z_LVAL(type) = VT_ARRAY|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pvarVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pvarVal"))
{
type.value.lval = VT_VARIANT|VT_BYREF;
Z_LVAL(type) = VT_VARIANT|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "byref"))
else if(!strcmp(Z_STRVAL_P(arg_property), "byref"))
{
type.value.lval = VT_BYREF;
Z_LVAL(type) = VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "cVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "cVal"))
{
type.value.lval = VT_I1;
Z_LVAL(type) = VT_I1;
}
else if(!strcmp(arg_property->value.str.val, "uiVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "uiVal"))
{
type.value.lval = VT_UI2;
Z_LVAL(type) = VT_UI2;
}
else if(!strcmp(arg_property->value.str.val, "ulVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "ulVal"))
{
type.value.lval = VT_UI4;
Z_LVAL(type) = VT_UI4;
}
else if(!strcmp(arg_property->value.str.val, "intVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "intVal"))
{
type.value.lval = VT_INT;
Z_LVAL(type) = VT_INT;
}
else if(!strcmp(arg_property->value.str.val, "uintVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "uintVal"))
{
type.value.lval = VT_UINT|VT_BYREF;
Z_LVAL(type) = VT_UINT|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pcVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pcVal"))
{
type.value.lval = VT_I1|VT_BYREF;
Z_LVAL(type) = VT_I1|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "puiVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "puiVal"))
{
type.value.lval = VT_UI2|VT_BYREF;
Z_LVAL(type) = VT_UI2|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pulVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pulVal"))
{
type.value.lval = VT_UI4|VT_BYREF;
Z_LVAL(type) = VT_UI4|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "pintVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "pintVal"))
{
type.value.lval = VT_INT|VT_BYREF;
Z_LVAL(type) = VT_INT|VT_BYREF;
}
else if(!strcmp(arg_property->value.str.val, "puintVal"))
else if(!strcmp(Z_STRVAL_P(arg_property), "puintVal"))
{
type.value.lval = VT_UINT|VT_BYREF;
Z_LVAL(type) = VT_UINT|VT_BYREF;
}
else
{