mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-25 19:05:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
Harald Radi 2001-10-04 18:24:44 +00:00
parent 744d1fc1ea
commit 27744e892a
4 changed files with 66 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ext/com/conversion.c
View File

@ -157,12 +157,12 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
switch (V_VT(var_arg)) {
case VT_UI1:
convert_to_long_ex(&pval_arg);
V_UI1(var_arg) = (unsigned char)Z_LVAL_P(pval_arg);
V_UI1(var_arg) = (unsigned char) Z_LVAL_P(pval_arg);
break;
case VT_I2:
convert_to_long_ex(&pval_arg);
V_I2(var_arg) = (short)Z_LVAL_P(pval_arg);
V_I2(var_arg) = (short) Z_LVAL_P(pval_arg);
break;
case VT_I4:
@ -172,7 +172,7 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
case VT_R4:
convert_to_double_ex(&pval_arg);
V_R4(var_arg) = (float)Z_DVAL_P(pval_arg);
V_R4(var_arg) = (float) Z_DVAL_P(pval_arg);
break;
case VT_R8:
@ -182,7 +182,11 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
case VT_BOOL:
convert_to_boolean_ex(&pval_arg);
V_BOOL(var_arg) = (short)Z_LVAL_P(pval_arg);
if (Z_LVAL_P(pval_arg)) {
V_BOOL(var_arg) = VT_TRUE;
} else {
V_BOOL(var_arg) = VT_FALSE;
}
break;
case VT_ERROR:
@ -278,7 +282,13 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
case VT_BOOL|VT_BYREF:
convert_to_boolean(pval_arg);
V_BOOLREF(var_arg) = (short FAR*) &Z_LVAL_P(pval_arg);
/* emalloc or malloc ? */
V_BOOLREF(var_arg) = (short FAR*) pemalloc(sizeof(short), 1);
if (Z_LVAL_P(pval_arg)) {
*V_BOOLREF(var_arg) = VT_TRUE;
} else {
*V_BOOLREF(var_arg) = VT_TRUE;
}
break;
case VT_ERROR|VT_BYREF:
@ -584,9 +594,17 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int codepage TS
case VT_BOOL:
if (V_ISBYREF(var_arg)) {
ZVAL_BOOL(pval_arg, *V_BOOLREF(var_arg));
if (*V_BOOLREF(var_arg)) {
ZVAL_BOOL(pval_arg, Z_TRUE);
} else {
ZVAL_BOOL(pval_arg, Z_FALSE);
}
} else {
ZVAL_BOOL(pval_arg, V_BOOL(var_arg));
if (V_BOOL(var_arg)) {
ZVAL_BOOL(pval_arg, Z_TRUE);
} else {
ZVAL_BOOL(pval_arg, Z_FALSE);
}
}
break;

8
ext/com/conversion.h
View File

@ -1,6 +1,14 @@
#ifndef CONVERSION_H
#define CONVERSION_H
/* isn't this defined somewhere else ? */
#define Z_TRUE 1
#define Z_FALSE 0
#define VT_TRUE -1
#define VT_FALSE 0
BEGIN_EXTERN_C()
PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC);

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

@ -157,12 +157,12 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
switch (V_VT(var_arg)) {
case VT_UI1:
convert_to_long_ex(&pval_arg);
V_UI1(var_arg) = (unsigned char)Z_LVAL_P(pval_arg);
V_UI1(var_arg) = (unsigned char) Z_LVAL_P(pval_arg);
break;
case VT_I2:
convert_to_long_ex(&pval_arg);
V_I2(var_arg) = (short)Z_LVAL_P(pval_arg);
V_I2(var_arg) = (short) Z_LVAL_P(pval_arg);
break;
case VT_I4:
@ -172,7 +172,7 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
case VT_R4:
convert_to_double_ex(&pval_arg);
V_R4(var_arg) = (float)Z_DVAL_P(pval_arg);
V_R4(var_arg) = (float) Z_DVAL_P(pval_arg);
break;
case VT_R8:
@ -182,7 +182,11 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
case VT_BOOL:
convert_to_boolean_ex(&pval_arg);
V_BOOL(var_arg) = (short)Z_LVAL_P(pval_arg);
if (Z_LVAL_P(pval_arg)) {
V_BOOL(var_arg) = VT_TRUE;
} else {
V_BOOL(var_arg) = VT_FALSE;
}
break;
case VT_ERROR:
@ -278,7 +282,13 @@ PHPAPI void php_pval_to_variant_ex2(pval *pval_arg, VARIANT *var_arg, int type,
case VT_BOOL|VT_BYREF:
convert_to_boolean(pval_arg);
V_BOOLREF(var_arg) = (short FAR*) &Z_LVAL_P(pval_arg);
/* emalloc or malloc ? */
V_BOOLREF(var_arg) = (short FAR*) pemalloc(sizeof(short), 1);
if (Z_LVAL_P(pval_arg)) {
*V_BOOLREF(var_arg) = VT_TRUE;
} else {
*V_BOOLREF(var_arg) = VT_TRUE;
}
break;
case VT_ERROR|VT_BYREF:
@ -584,9 +594,17 @@ PHPAPI int php_variant_to_pval(VARIANT *var_arg, pval *pval_arg, int codepage TS
case VT_BOOL:
if (V_ISBYREF(var_arg)) {
ZVAL_BOOL(pval_arg, *V_BOOLREF(var_arg));
if (*V_BOOLREF(var_arg)) {
ZVAL_BOOL(pval_arg, Z_TRUE);
} else {
ZVAL_BOOL(pval_arg, Z_FALSE);
}
} else {
ZVAL_BOOL(pval_arg, V_BOOL(var_arg));
if (V_BOOL(var_arg)) {
ZVAL_BOOL(pval_arg, Z_TRUE);
} else {
ZVAL_BOOL(pval_arg, Z_FALSE);
}
}
break;

8
ext/rpc/com/conversion.h
View File

@ -1,6 +1,14 @@
#ifndef CONVERSION_H
#define CONVERSION_H
/* isn't this defined somewhere else ? */
#define Z_TRUE 1
#define Z_FALSE 0
#define VT_TRUE -1
#define VT_FALSE 0
BEGIN_EXTERN_C()
PHPAPI void php_pval_to_variant(pval *pval_arg, VARIANT *var_arg, int codepage TSRMLS_DC);