This commit was manufactured by cvs2svn to create branch 'PHP_5'.PHP-5

1 files changed, 0 insertions, 855 deletions

diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c
deleted file mode 100644
index acdd6cef40..0000000000
--- a/ext/rpc/com/conversion.c
+++ /dev/null
@@ -1,855 +0,0 @@
-/*
-   +----------------------------------------------------------------------+
-   | PHP Version 4                                                        |
-   +----------------------------------------------------------------------+
-   | Copyright (c) 1997-2003 The PHP Group                                |
-   +----------------------------------------------------------------------+
-   | This source file is subject to version 2.02 of the PHP license,      |
-   | that is bundled with this package in the file LICENSE, and is        |
-   | available at through the world-wide-web at                           |
-   | http://www.php.net/license/2_02.txt.                                 |
-   | If you did not receive a copy of the PHP license and are unable to   |
-   | obtain it through the world-wide-web, please send a note to          |
-   | license@php.net so we can mail you a copy immediately.               |
-   +----------------------------------------------------------------------+
-   | Author: Harald Radi <h.radi@nme.at>                                  |
-   |         Alan Brown <abrown@pobox.com>                                |
-   |         Paul Shortis <pshortis@dataworx.com.au>                      |
-   +----------------------------------------------------------------------+
- */
-
-/*
- * 03.6.2001
- * Added SafeArray ==> Hash support
- */
-
-/* 
- * Paul Shortis June 7, 2001 <pshortis@dataworx.com.au> - Added code to support SafeArray passing
- * to COM objects. Support includes passing arrays of variants as well
- * as typed arrays.
- */
- 
-#ifdef PHP_WIN32
-
-#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
-
-#include "php.h"
-
-#include "../rpc.h"
-#include "../handler.h"
-
-#include "com.h"
-#include "com_wrapper.h"
-#include "conversion.h"
-#include "variant.h"
-
-/* prototypes */
-
-static int comval_to_variant(zval *zval_arg, VARIANT *var_arg);
-
-/* implementations */
-PHPAPI void php_zval_to_variant(zval *zval_arg, VARIANT *var_arg, int codepage)
-{
-	int type = VT_EMPTY;	/* default variant type */
-
-	switch (Z_TYPE_P(zval_arg)) {
-		case IS_NULL:
-			type = VT_NULL;
-			break;
-
-		case IS_BOOL:
-			type = VT_BOOL;
-			break;
-
-		case IS_OBJECT:
-			if (!strcmp(Z_OBJCE_P(zval_arg)->name, "VARIANT")) {
-				type = VT_VARIANT|VT_BYREF;
-			} else {
-				type = VT_DISPATCH;
-			}
-			break;
-
-		case IS_ARRAY:
-			type = VT_ARRAY;
-			break;
-
-		case IS_RESOURCE:
-		case IS_CONSTANT:
-		case IS_CONSTANT_ARRAY:
-			/* ?? */
-			break;
-
-		case IS_LONG:
-			type = VT_I4;   /* assuming 32-bit platform */
-			break;
-
-		case IS_DOUBLE:
-			type = VT_R8;   /* assuming 64-bit double precision */
-			break;
-
-		case IS_STRING:
-			type = VT_BSTR;
-			break;
-	}
-
-	php_zval_to_variant_ex(zval_arg, var_arg, type, codepage);
-}
-
-
-PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, int codepage)
-{
-	OLECHAR *unicode_str = NULL;
-
-	VariantInit(var_arg);
-	V_VT(var_arg) = type;
-
-	if (V_VT(var_arg) & VT_ARRAY) {
-		/* For now we'll just handle single dimension arrays, we'll use the data type of the first element for the
-		   output data type */
-		HashTable *ht = Z_ARRVAL(*zval_arg);
-		int numberOfElements = zend_hash_num_elements(ht);
-		SAFEARRAY *safeArray;
-		SAFEARRAYBOUND bounds[1];
-		VARIANT *v;
-		zval **entry;        /* An entry in the input array */
-		
-		type &= ~VT_ARRAY;
-
-		if (V_VT(var_arg) == (VT_ARRAY|VT_BYREF)) {		/* == is intended, because VT_*|VT_BYREF|VT_ARRAY means something diffrent */
-			type &= ~VT_BYREF;
-			V_VARIANTREF(var_arg) = (VARIANT *) emalloc(sizeof(VARIANT));
-			var_arg = V_VARIANTREF(var_arg);		/* put the array in that VARIANT */
-		}
-
-		bounds[0].lLbound = 0;
-		bounds[0].cElements = numberOfElements;
-		safeArray = SafeArrayCreate(VT_VARIANT, 1, bounds);
-		
-		if (NULL == safeArray) {
-			rpc_error(E_WARNING, "Unable to convert php array to VARIANT array - %s", numberOfElements ? "" : "(Empty input array)");
-			ZVAL_FALSE(zval_arg);
-		} else {
-			V_ARRAY(var_arg) = safeArray;
-			V_VT(var_arg) = VT_ARRAY|VT_VARIANT;                /* Now have a valid safe array allocated */
-			if (SUCCEEDED(SafeArrayLock(safeArray))) {
-				ulong i;
-
-				zend_hash_internal_pointer_reset(ht);
-				for (i = 0; i < (ulong)numberOfElements; ++i) {
-					if ((zend_hash_get_current_data(ht, (void **)&entry) == SUCCESS) && (entry != NULL)) { /* Get a pointer to the php array element */
-						/* Add another value to the safe array */
-						if (SUCCEEDED(SafeArrayPtrOfIndex( safeArray, &i, &v))) {		/* Pointer to output element entry retrieved successfully */
-							if (type) {	/* explicit type */
-							   php_zval_to_variant_ex(*entry, v, type, codepage);		/* Do the required conversion */
-							} else {
-								php_zval_to_variant(*entry, v, codepage);                    /* Do the required conversion */
-							}
-						} else {
-							rpc_error(E_WARNING, "phpArrayToSafeArray() - Unable to retrieve pointer to output element number (%d)", i);
-						}
-					}
-					zend_hash_move_forward(ht);
-				}
-				SafeArrayUnlock( safeArray);
-			} else {
-				rpc_error(E_WARNING, "phpArrayToSafeArray() - Unable to lock safeArray");
-			}
-		}
-	} else {
-		switch (V_VT(var_arg)) {
-
-			case VT_NULL:
-			case VT_VOID:
-				ZVAL_NULL(zval_arg);
-				break; 
-			
-			case VT_UI1:
-				convert_to_long_ex(&zval_arg);
-				V_UI1(var_arg) = (unsigned char) Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_I2:
-				convert_to_long_ex(&zval_arg);
-				V_I2(var_arg) = (short) Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_I4:
-				convert_to_long_ex(&zval_arg);
-				V_I4(var_arg) = Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_R4:
-				convert_to_double_ex(&zval_arg);
-				V_R4(var_arg) = (float) Z_DVAL_P(zval_arg);
-				break;
-
-			case VT_R8:
-				convert_to_double_ex(&zval_arg);
-				V_R8(var_arg) = Z_DVAL_P(zval_arg);
-				break;
-
-			case VT_BOOL:
-				convert_to_boolean_ex(&zval_arg);
-				if (Z_LVAL_P(zval_arg)) {
-					V_BOOL(var_arg) = VT_TRUE;
-				} else {
-					V_BOOL(var_arg) = VT_FALSE;
-				}
-				break;
-
-			case VT_ERROR:
-				convert_to_long_ex(&zval_arg);
-				V_ERROR(var_arg) = Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_CY:
-				convert_to_double_ex(&zval_arg);
-				VarCyFromR8(Z_DVAL_P(zval_arg), &V_CY(var_arg));
-				break;
-
-			case VT_DATE: {
-					SYSTEMTIME wintime;
-					struct tm *phptime;
-
-					switch (Z_TYPE_P(zval_arg)) {
-						case IS_DOUBLE:
-							/* already a VariantTime value */
-							V_DATE(var_arg) = Z_DVAL_P(zval_arg);
-							break;
-
-						/** @todo
-						case IS_STRING:
-						*/
-							/* string representation of a time value */
-
-						default:
-							/* a PHP time value ? */
-							convert_to_long_ex(&zval_arg);
-							phptime = gmtime(&(Z_LVAL_P(zval_arg)));
-							memset(&wintime, 0, sizeof(wintime));
-
-							wintime.wYear = phptime->tm_year + 1900;
-							wintime.wMonth = phptime->tm_mon + 1;
-							wintime.wDay = phptime->tm_mday;
-							wintime.wHour = phptime->tm_hour;
-							wintime.wMinute = phptime->tm_min;
-							wintime.wSecond = phptime->tm_sec;
-
-							SystemTimeToVariantTime(&wintime, &V_DATE(var_arg));
-							break;
-					}
-				}
-				break;
-
-			case VT_BSTR:
-				convert_to_string_ex(&zval_arg);
-				unicode_str = php_char_to_OLECHAR(Z_STRVAL_P(zval_arg), Z_STRLEN_P(zval_arg), codepage, FALSE);
-				V_BSTR(var_arg) = SysAllocStringByteLen((char *) unicode_str, Z_STRLEN_P(zval_arg) * sizeof(OLECHAR));
-				break;
-
-			case VT_DECIMAL:
-				convert_to_string_ex(&zval_arg);
-				unicode_str = php_char_to_OLECHAR(Z_STRVAL_P(zval_arg), Z_STRLEN_P(zval_arg), codepage, FALSE);
-				VarDecFromStr(unicode_str, LOCALE_SYSTEM_DEFAULT, 0, &V_DECIMAL(var_arg));
-				break;
-
-			case VT_DECIMAL|VT_BYREF:
-				convert_to_string_ex(&zval_arg);
-				unicode_str = php_char_to_OLECHAR(Z_STRVAL_P(zval_arg), Z_STRLEN_P(zval_arg), codepage, FALSE);
-				VarDecFromStr(unicode_str, LOCALE_SYSTEM_DEFAULT, 0, V_DECIMALREF(var_arg));
-				break;
-
-			case VT_UNKNOWN:
-				if (comval_to_variant(zval_arg, var_arg) == SUCCESS) {
-					V_VT(var_arg) = VT_UNKNOWN;
-					V_UNKNOWN(var_arg) = (IUnknown *) V_DISPATCH(var_arg);
-				}
-				break;
-
-			case VT_DISPATCH:
-				if (Z_OBJCE_P(zval_arg) == com_class_entry) {
-					comval_to_variant(zval_arg, var_arg);
-				} else {
-					V_DISPATCH(var_arg) = php_COM_export_object(zval_arg);
-
-					if (V_DISPATCH(var_arg)) {
-						V_VT(var_arg) = VT_DISPATCH;
-					}
-				}
-				if (V_VT(var_arg) != VT_DISPATCH) {
-					VariantInit(var_arg);
-				}
-				break;
-
-			case VT_UI1|VT_BYREF:
-				convert_to_long(zval_arg);
-				V_UI1REF(var_arg) = (unsigned char FAR*) &Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_I2|VT_BYREF:
-				convert_to_long(zval_arg);
-				V_I2REF(var_arg) = (short FAR*) &Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_I4|VT_BYREF:
-				convert_to_long(zval_arg);
-				V_I4REF(var_arg) = (long FAR*) &Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_R4|VT_BYREF:
-				convert_to_double(zval_arg);
-				V_R4REF(var_arg) = (float FAR*) &Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_R8|VT_BYREF:
-				convert_to_double(zval_arg);
-				V_R8REF(var_arg) = (double FAR*) &Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_BOOL|VT_BYREF:
-				convert_to_boolean(zval_arg);
-				/* emalloc or malloc ? */
-				V_BOOLREF(var_arg) = (short FAR*) pemalloc(sizeof(short), 1);
-				if (Z_LVAL_P(zval_arg)) {
-					*V_BOOLREF(var_arg) = VT_TRUE;
-				} else {
-					*V_BOOLREF(var_arg) = VT_FALSE;
-				}
-				break;
-
-			case VT_ERROR|VT_BYREF:
-				convert_to_long(zval_arg);
-				V_ERRORREF(var_arg) = (long FAR*) &Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_CY|VT_BYREF:
-				convert_to_double_ex(&zval_arg);
-				VarCyFromR8(Z_DVAL_P(zval_arg), var_arg->pcyVal);
-				break;
-
-			case VT_DATE|VT_BYREF: {
-					SYSTEMTIME wintime;
-					struct tm *phptime;
-
-					phptime = gmtime(&(Z_LVAL_P(zval_arg)));
-					memset(&wintime, 0, sizeof(wintime));
-
-					wintime.wYear   = phptime->tm_year + 1900;
-					wintime.wMonth  = phptime->tm_mon + 1;
-					wintime.wDay    = phptime->tm_mday;
-					wintime.wHour   = phptime->tm_hour;
-					wintime.wMinute = phptime->tm_min;
-					wintime.wSecond = phptime->tm_sec;
-
-					SystemTimeToVariantTime(&wintime, var_arg->pdate);
-				}
-				break;
-
-			case VT_BSTR|VT_BYREF:
-				convert_to_string(zval_arg);
-				V_BSTRREF(var_arg) = (BSTR FAR*) emalloc(sizeof(BSTR FAR*));
-				unicode_str = php_char_to_OLECHAR(Z_STRVAL_P(zval_arg), Z_STRLEN_P(zval_arg), codepage, FALSE);
-				*V_BSTRREF(var_arg) = SysAllocString(unicode_str);
-				break;
-
-			case VT_UNKNOWN|VT_BYREF:
-				if (comval_to_variant(zval_arg, var_arg) == SUCCESS) {
-					V_VT(var_arg) = VT_UNKNOWN|VT_BYREF;
-					V_UNKNOWNREF(var_arg) = (IUnknown **) &V_DISPATCH(var_arg);
-				}
-				break;
-
-			case VT_DISPATCH|VT_BYREF:
-				if (comval_to_variant(zval_arg, var_arg) == SUCCESS) {
-					V_VT(var_arg) = VT_DISPATCH|VT_BYREF;
-					V_DISPATCHREF(var_arg) = &V_DISPATCH(var_arg);
-				}
-				break;
-
-			case VT_VARIANT:
-				rpc_error(E_WARNING, "VT_VARIANT is invalid. Use VT_VARIANT|VT_BYREF instead.");
-				/* break missing intentionally */
-			case VT_VARIANT|VT_BYREF: {
-					variantval *var;
-					TSRMLS_FETCH();
-
-					if ((var = zend_object_store_get_object(zval_arg TSRMLS_CC)) == NULL) {
-						/* TODO exception */
-					}
-
-					V_VARIANTREF(var_arg) = var->var;
-				}
-				break;
-
-			case VT_I1:
-				convert_to_long_ex(&zval_arg);
-				V_I1(var_arg) = (char)Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_UI2:
-				convert_to_long_ex(&zval_arg);
-				V_UI2(var_arg) = (unsigned short)Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_UI4:
-				convert_to_long_ex(&zval_arg);
-				V_UI4(var_arg) = (unsigned long)Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_INT:
-				convert_to_long_ex(&zval_arg);
-				V_INT(var_arg) = (int)Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_UINT:
-				convert_to_long_ex(&zval_arg);
-				V_UINT(var_arg) = (unsigned int)Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_I1|VT_BYREF:
-				convert_to_long(zval_arg);
-				V_I1REF(var_arg) = (char FAR*) &Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_UI2|VT_BYREF:
-				convert_to_long(zval_arg);
-				V_UI2REF(var_arg) = (unsigned short FAR*) &Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_UI4|VT_BYREF:
-				convert_to_long(zval_arg);
-				V_UI4REF(var_arg) = (unsigned long FAR*) &Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_INT|VT_BYREF:
-				convert_to_long(zval_arg);
-				V_INTREF(var_arg) = (int FAR*) &Z_LVAL_P(zval_arg);
-				break;
-
-			case VT_UINT|VT_BYREF:
-				convert_to_long(zval_arg);
-				V_UINTREF(var_arg) = (unsigned int FAR*) &Z_LVAL_P(zval_arg);
-				break;
-
-			default:
-				rpc_error(E_WARNING, "Unsupported variant type: %d (0x%X)", V_VT(var_arg), V_VT(var_arg));
-		}
-
-		if (unicode_str != NULL) {
-			efree(unicode_str);
-		}
-	}
-}
-
-PHPAPI int php_variant_to_zval(VARIANT *var_arg, zval *zval_arg, int codepage)
-{
-	/* Changed the function to return a value for recursive error testing */
-	/* Existing calls will be unaffected by the change - so it */
-	/* seemed like the smallest impact on unfamiliar code */
-	int ret = SUCCESS; 
-
-	INIT_PZVAL(zval_arg);
-
-	/* Add SafeArray support */
-	if (V_ISARRAY(var_arg)) {
-		SAFEARRAY *array = V_ARRAY(var_arg);
-		LONG indices[1];
-		LONG lbound=0, ubound;
-		VARTYPE vartype;
-		register int ii;
-		UINT Dims;
-		VARIANT vv;
-		zval *element;
-		HRESULT hr;
-
-		/* TODO: Add support for multi-dimensional SafeArrays */
-		/* For now just validate that the SafeArray has one dimension */
-		if (1 != (Dims = SafeArrayGetDim(array))) {
-			rpc_error(E_WARNING, "Unsupported: multi-dimensional (%d) SafeArrays", Dims);
-			ZVAL_NULL(zval_arg);
-			return FAILURE;
-		}
-        SafeArrayLock(array);
-
-		/* This call has failed for everything I have tried */
-		/* But best leave it to be on the safe side */
-		if (FAILED(SafeArrayGetVartype(array, &vartype)) || (vartype == VT_EMPTY)) {
-			/* Fall back to what we do know */
-			/* Mask off the array bit and assume */
-			/* what is left is the type of the array */
-			/* elements */
-			vartype = V_VT(var_arg) & ~VT_ARRAY;
-		}
-		SafeArrayGetUBound(array, 1, &ubound);
-		SafeArrayGetLBound(array, 1, &lbound);
-
-		/* Since COM returned an array we set up the php */
-		/* return value to be an array */
-		array_init(zval_arg);
-
-		/* Walk the safe array */
-		for (ii=lbound;ii<=ubound;ii++) {
-			indices[0] = ii;
-			VariantInit(&vv); /* Docs say this just set the vt field, but you never know */
-			/* Set up a variant to pass to a recursive call */
-			/* So that we do not need to have two copies */
-			/* of the code */
-			if (VT_VARIANT == vartype) {
-				hr = SafeArrayGetElement(array, indices, (VOID *) &(vv));
-			} else {
-				V_VT(&vv) = vartype;
-				hr = SafeArrayGetElement(array, indices, (VOID *) &(vv.lVal));
-			}
-			if (FAILED(hr)) {
-				/* Failure to retieve an element probably means the array is sparse */
-				/* So leave the php array sparse too */
-				continue;
-			}
-			/* Create an element to be added to the array */
-			ALLOC_ZVAL(element);
-			/* Call ourself again to handle the base type conversion */
-			/* If SafeArrayGetElement proclaims to allocate */
-			/* memory for a BSTR, so the recursive call frees */
-			/* the string correctly */
-			if (FAILURE == php_variant_to_zval(&vv, element, codepage)) {
-				/* Error occurred setting up array element */
-				/* Error was displayed by the recursive call */
-				FREE_ZVAL(element);
-				/* TODO: Do we stop here, or go on and */
-				/* try to make sense of the rest of the array */
-				/* Going on leads to multiple errors displayed */
-				/* for the same conversion. For large arrays that */
-				/* could be very annoying */
-				/* And if we don't go on - what to do about */
-				/* the parts of the array that are OK? */
-				/* break; */
-			} else {
-				/* Just insert the element into our return array */
-				add_index_zval(zval_arg, ii, element);
-			}
-		}
-		SafeArrayUnlock(array);
-	} else switch (var_arg->vt & ~VT_BYREF) {
-		case VT_EMPTY:
-			ZVAL_NULL(zval_arg);
-			break;
-
-		case VT_UI1:
-			if (V_ISBYREF(var_arg)) {
-				ZVAL_LONG(zval_arg, (long)*V_UI1REF(var_arg));
-			} else {
-				ZVAL_LONG(zval_arg, (long)V_UI1(var_arg));
-			}
-			break;
-
-		case VT_I2:
-			if (V_ISBYREF(var_arg)) {
-				ZVAL_LONG(zval_arg, (long )*V_I2REF(var_arg));
-			} else {
-				ZVAL_LONG(zval_arg, (long)V_I2(var_arg));
-			}
-			break;
-
-		case VT_I4:
-			if (V_ISBYREF(var_arg)) {
-				ZVAL_LONG(zval_arg, *V_I4REF(var_arg));
-			} else {
-				ZVAL_LONG(zval_arg, V_I4(var_arg));
-			}
-			break;
-
-		case VT_R4:
-			if (V_ISBYREF(var_arg)) {
-				ZVAL_DOUBLE(zval_arg, (double)*V_R4REF(var_arg));
-			} else {
-				ZVAL_DOUBLE(zval_arg, (double)V_R4(var_arg));
-			}
-			break;
-
-		case VT_R8:
-			if (V_ISBYREF(var_arg)) {
-				ZVAL_DOUBLE(zval_arg, *V_R8REF(var_arg));
-			} else {
-				ZVAL_DOUBLE(zval_arg, V_R8(var_arg));
-			}
-			break;
-
-		/* 96bit uint */
-		case VT_DECIMAL: {
-				OLECHAR *unicode_str;
-				switch (VarBstrFromDec(&V_DECIMAL(var_arg), LOCALE_SYSTEM_DEFAULT, 0, &unicode_str)) {
-					case S_OK:
-						Z_STRVAL_P(zval_arg) = php_OLECHAR_to_char(unicode_str, &Z_STRLEN_P(zval_arg), codepage, FALSE);
-						Z_TYPE_P(zval_arg) = IS_STRING;
-						break;
-
-					default:
-						ZVAL_NULL(zval_arg);
-						ret = FAILURE;
-						rpc_error(E_WARNING, "Error converting DECIMAL value to PHP string");
-						break;
-				}
-			}
-			break;
-
-		/* Currency */
-		case VT_CY:
-			if (V_ISBYREF(var_arg)) {
-				VarR8FromCy(*V_CYREF(var_arg), &Z_DVAL_P(zval_arg));
-			} else {
-				VarR8FromCy(V_CY(var_arg), &Z_DVAL_P(zval_arg));
-			}
-			Z_TYPE_P(zval_arg) = IS_DOUBLE;
-			break;
-
-		case VT_BOOL:
-			if (V_ISBYREF(var_arg)) {
-				if (*V_BOOLREF(var_arg)) {
-					ZVAL_BOOL(zval_arg, Z_TRUE);
-				} else {
-					ZVAL_BOOL(zval_arg, Z_FALSE);
-				}
-			} else {
-				if (V_BOOL(var_arg)) {
-					ZVAL_BOOL(zval_arg, Z_TRUE);
-				} else {
-					ZVAL_BOOL(zval_arg, Z_FALSE);
-				}
-			}
-			break;
-
-		case VT_NULL:
-		case VT_VOID:
-			ZVAL_NULL(zval_arg);
-			break;
-
-		case VT_VARIANT:
-			php_variant_to_zval(V_VARIANTREF(var_arg), zval_arg, codepage);
-			break;
-
-		case VT_BSTR:
-			Z_TYPE_P(zval_arg) = IS_STRING;
-
-			if (V_ISBYREF(var_arg)) {
-				if (*V_BSTR(var_arg)) {
-					Z_STRVAL_P(zval_arg) = php_OLECHAR_to_char(*V_BSTRREF(var_arg), &Z_STRLEN_P(zval_arg), codepage, FALSE);
-				} else {
-					ZVAL_NULL(zval_arg);
-				}
-				efree(V_BSTRREF(var_arg));
-			} else {
-				if (V_BSTR(var_arg)) {
-					Z_STRVAL_P(zval_arg) = php_OLECHAR_to_char(V_BSTR(var_arg), &Z_STRLEN_P(zval_arg), codepage, FALSE);
-				} else {
-					ZVAL_NULL(zval_arg);
-				}
-			}
-
-			break;
-
-		case VT_DATE: {
-				BOOL success;
-				SYSTEMTIME wintime;
-				struct tm phptime;
-
-				if (V_ISBYREF(var_arg)) {
-					success = VariantTimeToSystemTime(*V_DATEREF(var_arg), &wintime);
-				} else {
-					success = VariantTimeToSystemTime(V_DATE(var_arg), &wintime);
-				}
-
-				if (success) {
-					memset(&phptime, 0, sizeof(phptime));
-
-					phptime.tm_year  = wintime.wYear - 1900;
-					phptime.tm_mon   = wintime.wMonth - 1;
-					phptime.tm_mday  = wintime.wDay;
-					phptime.tm_hour  = wintime.wHour;
-					phptime.tm_min   = wintime.wMinute;
-					phptime.tm_sec   = wintime.wSecond;
-					phptime.tm_isdst = -1;
-
-					tzset();
-					ZVAL_LONG(zval_arg, mktime(&phptime));
-				} else {
-					ret = FAILURE;
-				}
-			}
-			break;
-
-		case VT_UNKNOWN:
-			if (V_UNKNOWN(var_arg) == NULL) {
-				V_DISPATCH(var_arg) = NULL;
-			} else {
-				HRESULT hr;
-
-				hr = V_UNKNOWN(var_arg)->lpVtbl->QueryInterface(var_arg->punkVal, &IID_IDispatch, &V_DISPATCH(var_arg));
-
-				if (FAILED(hr)) {
-					char *error_message;
-
-					error_message = php_COM_error_message(hr);
-					rpc_error(E_WARNING, "Unable to obtain IDispatch interface:  %s", error_message);
-					LocalFree(error_message);
-
-					V_DISPATCH(var_arg) = NULL;
-				}
-			}
-			/* break missing intentionaly */
-		case VT_DISPATCH: {
-				comval *obj;
-
-				if (V_DISPATCH(var_arg) == NULL) {
-					ret = FAILURE;
-					ZVAL_NULL(zval_arg);
-				} else {
-					TSRMLS_FETCH();
-
-					ALLOC_COM(obj);
-					php_COM_set(obj, &V_DISPATCH(var_arg), FALSE);
-					
-					ZVAL_COM(zval_arg, obj);
-					VariantInit(var_arg);	/* to protect C_DISPATCH(obj) from being freed when var_result is destructed */
-				}
-			}
-			break;
-
-		case VT_I1:
-			if (V_ISBYREF(var_arg)) {
-				ZVAL_LONG(zval_arg, (long)*V_I1REF(var_arg));
-			} else {
-				ZVAL_LONG(zval_arg, (long)V_I1(var_arg));
-			}
-			break;
-
-		case VT_UI2:
-			if (V_ISBYREF(var_arg)) {
-				ZVAL_LONG(zval_arg, (long)*V_UI2REF(var_arg));
-			} else {
-				ZVAL_LONG(zval_arg, (long)V_UI2(var_arg));
-			}
-			break;
-
-		case VT_UI4:
-			if (V_ISBYREF(var_arg)) {
-				ZVAL_LONG(zval_arg, (long)*V_UI4REF(var_arg));
-			} else {
-				ZVAL_LONG(zval_arg, (long)V_UI4(var_arg));
-			}
-			break;
-
-		case VT_INT:
-			if (V_ISBYREF(var_arg)) {
-				ZVAL_LONG(zval_arg, (long)*V_INTREF(var_arg));
-			} else {
-				ZVAL_LONG(zval_arg, (long)V_INT(var_arg));
-			}
-			break;
-
-		case VT_UINT:
-			if (V_ISBYREF(var_arg)) {
-				ZVAL_LONG(zval_arg, (long)*V_UINTREF(var_arg));
-			} else {
-				ZVAL_LONG(zval_arg, (long)V_UINT(var_arg));
-			}
-			break;
-
-		default:
-			rpc_error(E_WARNING, "Unsupported variant type: %d (0x%X)", V_VT(var_arg), V_VT(var_arg));
-			ZVAL_NULL(zval_arg);
-			ret = FAILURE;
-			break;
-	}
-	return ret;
-}
-
-
-PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage, int persist)
-{
-	BOOL error = FALSE;
-	OLECHAR *unicode_str;
-
-	if (strlen == -1) {
-		/* request needed buffersize */
-		strlen = MultiByteToWideChar(codepage, (codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED | MB_ERR_INVALID_CHARS), C_str, -1, NULL, 0);
-	} else {
-		/* \0 terminator */
-		strlen++;
-	}
-
-	if (strlen >= 0) {
-		unicode_str = (OLECHAR *) pemalloc(sizeof(OLECHAR) * strlen, persist);
-
-		/* convert string */
-		error = !MultiByteToWideChar(codepage, (codepage == CP_UTF8 ? 0 : MB_PRECOMPOSED | MB_ERR_INVALID_CHARS), C_str, strlen, unicode_str, strlen);
-	} else {
-		/* return a zero-length string */
-		unicode_str = (OLECHAR *) pemalloc(sizeof(OLECHAR), persist);
-		*unicode_str = 0;
-
-		error = TRUE;
-	}
-
-	if (error) {
-		switch (GetLastError()) {
-			case ERROR_NO_UNICODE_TRANSLATION:
-				rpc_error(E_WARNING, "No unicode translation available for the specified string");
-				break;
-			case ERROR_INSUFFICIENT_BUFFER:
-				rpc_error(E_WARNING, "Internal Error: Insufficient Buffer");
-				break;
-			default:
-				rpc_error(E_WARNING, "Unknown error in php_char_to_OLECHAR()");
-		}
-	}
-
-	return unicode_str;
-}
-
-
-PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int codepage, int persist)
-{
-	char *C_str;
-	uint length = 0;
-
-	/* request needed buffersize */
-	uint reqSize = WideCharToMultiByte(codepage, codepage == CP_UTF8 ? 0 : WC_COMPOSITECHECK, unicode_str, -1, NULL, 0, NULL, NULL);
-
-	if (reqSize) {
-		C_str = (char *) pemalloc(sizeof(char) * reqSize, persist);
-
-		/* convert string */
-		length = WideCharToMultiByte(codepage, codepage == CP_UTF8 ? 0 : WC_COMPOSITECHECK, unicode_str, -1, C_str, reqSize, NULL, NULL) - 1;
-	} else {
-		C_str = (char *) pemalloc(sizeof(char), persist);
-		*C_str = 0;
-
-		rpc_error(E_WARNING, "Error in php_OLECHAR_to_char()");
-	}
-
-	if (out_length) {
-		*out_length = length;
-	}
-
-	return C_str;
-}
-
-static int comval_to_variant(zval *object, VARIANT *var_arg)
-{
-	rpc_internal *intern;
-	TSRMLS_FETCH();
-
-	if (GET_INTERNAL_EX(intern, object) != SUCCESS) {
-		/* TODO exception */
-		VariantInit(var_arg);
-
-		return FAILURE;
-	} else {
-		V_VT(var_arg) = VT_DISPATCH;
-		V_DISPATCH(var_arg) = C_DISPATCH((comval *) intern->data);
-
-		return SUCCESS;
-	}
-}
-
-#endif /* PHP_WIN32 */