a bunch of fixes

1 files changed, 15 insertions, 18 deletions

diff --git a/ext/rpc/com/conversion.c b/ext/rpc/com/conversion.c
index 1d6bcd71cf..fb61c0eeb1 100644
--- a/ext/rpc/com/conversion.c
+++ b/ext/rpc/com/conversion.c
@@ -97,7 +97,6 @@ PHPAPI void php_zval_to_variant(zval *zval_arg, VARIANT *var_arg, int codepage)
 PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, int codepage)
 {
 	OLECHAR *unicode_str = NULL;
-	TSRMLS_FETCH();
 
 	VariantInit(var_arg);
 	V_VT(var_arg) = type;
@@ -125,7 +124,7 @@ PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, i
 		safeArray = SafeArrayCreate(VT_VARIANT, 1, bounds);
 		
 		if (NULL == safeArray) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to convert php array to VARIANT array - %s", numberOfElements ? "" : "(Empty input array)");
+			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;
@@ -144,14 +143,14 @@ PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, i
 								php_zval_to_variant(*entry, v, codepage);                    /* Do the required conversion */
 							}
 						} else {
-							php_error_docref(NULL TSRMLS_CC, E_WARNING, "phpArrayToSafeArray() - Unable to retrieve pointer to output element number (%d)", i);
+							rpc_error(E_WARNING, "phpArrayToSafeArray() - Unable to retrieve pointer to output element number (%d)", i);
 						}
 					}
 					zend_hash_move_forward(ht);
 				}
 				SafeArrayUnlock( safeArray);
 			} else {
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "phpArrayToSafeArray() - Unable to lock safeArray");
+				rpc_error(E_WARNING, "phpArrayToSafeArray() - Unable to lock safeArray");
 			}
 		}
 	} else {
@@ -366,7 +365,7 @@ PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, i
 				break;
 
 			case VT_VARIANT:
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "VT_VARIANT is invalid. Use VT_VARIANT|VT_BYREF instead.");
+				rpc_error(E_WARNING, "VT_VARIANT is invalid. Use VT_VARIANT|VT_BYREF instead.");
 				/* break missing intentionally */
 			case VT_VARIANT|VT_BYREF: {
 					variantval *var;
@@ -431,7 +430,7 @@ PHPAPI void php_zval_to_variant_ex(zval *zval_arg, VARIANT *var_arg, int type, i
 				break;
 
 			default:
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported variant type: %d (0x%X)", V_VT(var_arg), V_VT(var_arg));
+				rpc_error(E_WARNING, "Unsupported variant type: %d (0x%X)", V_VT(var_arg), V_VT(var_arg));
 		}
 
 		if (unicode_str != NULL) {
@@ -446,7 +445,6 @@ PHPAPI int php_variant_to_zval(VARIANT *var_arg, zval *zval_arg, int codepage)
 	/* Existing calls will be unaffected by the change - so it */
 	/* seemed like the smallest impact on unfamiliar code */
 	int ret = SUCCESS; 
-	TSRMLS_FETCH();
 
 	INIT_PZVAL(zval_arg);
 
@@ -465,7 +463,7 @@ PHPAPI int php_variant_to_zval(VARIANT *var_arg, zval *zval_arg, int codepage)
 		/* TODO: Add support for multi-dimensional SafeArrays */
 		/* For now just validate that the SafeArray has one dimension */
 		if (1 != (Dims = SafeArrayGetDim(array))) {
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported: multi-dimensional (%d) SafeArrays", Dims);
+			rpc_error(E_WARNING, "Unsupported: multi-dimensional (%d) SafeArrays", Dims);
 			ZVAL_NULL(zval_arg);
 			return FAILURE;
 		}
@@ -586,7 +584,7 @@ PHPAPI int php_variant_to_zval(VARIANT *var_arg, zval *zval_arg, int codepage)
 					default:
 						ZVAL_NULL(zval_arg);
 						ret = FAILURE;
-						php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error converting DECIMAL value to PHP string");
+						rpc_error(E_WARNING, "Error converting DECIMAL value to PHP string");
 						break;
 				}
 			}
@@ -689,7 +687,7 @@ PHPAPI int php_variant_to_zval(VARIANT *var_arg, zval *zval_arg, int codepage)
 					char *error_message;
 
 					error_message = php_COM_error_message(hr);
-					php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to obtain IDispatch interface:  %s", error_message);
+					rpc_error(E_WARNING, "Unable to obtain IDispatch interface:  %s", error_message);
 					LocalFree(error_message);
 
 					V_DISPATCH(var_arg) = NULL;
@@ -698,12 +696,13 @@ PHPAPI int php_variant_to_zval(VARIANT *var_arg, zval *zval_arg, int codepage)
 			/* break missing intentionaly */
 		case VT_DISPATCH: {
 				comval *obj;
-				TSRMLS_FETCH();
 
 				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);
 					
@@ -754,7 +753,7 @@ PHPAPI int php_variant_to_zval(VARIANT *var_arg, zval *zval_arg, int codepage)
 			break;
 
 		default:
-			php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unsupported variant type: %d (0x%X)", V_VT(var_arg), V_VT(var_arg));
+			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;
@@ -767,7 +766,6 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage, int
 {
 	BOOL error = FALSE;
 	OLECHAR *unicode_str;
-	TSRMLS_FETCH();
 
 	if (strlen == -1) {
 		/* request needed buffersize */
@@ -793,13 +791,13 @@ PHPAPI OLECHAR *php_char_to_OLECHAR(char *C_str, uint strlen, int codepage, int
 	if (error) {
 		switch (GetLastError()) {
 			case ERROR_NO_UNICODE_TRANSLATION:
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "No unicode translation available for the specified string");
+				rpc_error(E_WARNING, "No unicode translation available for the specified string");
 				break;
 			case ERROR_INSUFFICIENT_BUFFER:
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Internal Error: Insufficient Buffer");
+				rpc_error(E_WARNING, "Internal Error: Insufficient Buffer");
 				break;
 			default:
-				php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unknown error in php_char_to_OLECHAR()");
+				rpc_error(E_WARNING, "Unknown error in php_char_to_OLECHAR()");
 		}
 	}
 
@@ -821,11 +819,10 @@ PHPAPI char *php_OLECHAR_to_char(OLECHAR *unicode_str, uint *out_length, int cod
 		/* convert string */
 		length = WideCharToMultiByte(codepage, codepage == CP_UTF8 ? 0 : WC_COMPOSITECHECK, unicode_str, -1, C_str, reqSize, NULL, NULL) - 1;
 	} else {
-		TSRMLS_FETCH();
 		C_str = (char *) pemalloc(sizeof(char), persist);
 		*C_str = 0;
 
-		php_error_docref(NULL TSRMLS_CC, E_WARNING, "Error in php_OLECHAR_to_char()");
+		rpc_error(E_WARNING, "Error in php_OLECHAR_to_char()");
 	}
 
 	if (out_length) {