Refactor php_com_do_invoke()

Use zend_string*
Return zend_result

Author: Girgias

ext/com_dotnet/com_com.c

@@ -633,14 +633,14 @@ int php_com_do_invoke_by_id(php_com_dotnet_object *obj, DISPID dispid,
 	return SUCCEEDED(hr) ? SUCCESS : FAILURE;
 }
 
-int php_com_do_invoke(php_com_dotnet_object *obj, char *name, size_t namelen,
-		WORD flags,	VARIANT *v, int nargs, zval *args, int allow_noarg)
+zend_result php_com_do_invoke(php_com_dotnet_object *obj, zend_string *name,
+		WORD flags,	VARIANT *v, int nargs, zval *args, bool allow_noarg)
 {
 	DISPID dispid;
 	HRESULT hr;
 	char *msg = NULL;
 
-	hr = php_com_get_id_of_name(obj, name, namelen, &dispid);
+	hr = php_com_get_id_of_name(obj, ZSTR_VAL(name), ZSTR_LEN(name), &dispid);
 
 	if (FAILED(hr)) {
 		char *winerr = php_win32_error_to_msg(hr);

ext/com_dotnet/com_handlers.c

@@ -38,8 +38,8 @@ static zval *com_property_read(zend_object *object, zend_string *member, int typ
 	if (V_VT(&obj->v) == VT_DISPATCH) {
 		VariantInit(&v);
 
-		res = php_com_do_invoke(obj, ZSTR_VAL(member), ZSTR_LEN(member),
-				DISPATCH_METHOD|DISPATCH_PROPERTYGET, &v, 0, NULL, 1);
+		res = php_com_do_invoke(obj, member, DISPATCH_METHOD|DISPATCH_PROPERTYGET,
+			&v, 0, NULL, 1);
 
 		if (res == SUCCESS) {
 			php_com_zval_from_variant(rv, &v, obj->code_page);
@@ -67,7 +67,7 @@ static zval *com_property_write(zend_object *object, zend_string *member, zval *
 	if (V_VT(&obj->v) == VT_DISPATCH) {
 		VariantInit(&v);
 
-		if (SUCCESS == php_com_do_invoke(obj, ZSTR_VAL(member), ZSTR_LEN(member),
+		if (SUCCESS == php_com_do_invoke(obj, member,
 				DISPATCH_PROPERTYPUT|DISPATCH_PROPERTYPUTREF, &v, 1, value, 0)) {
 			VariantClear(&v);
 		}

ext/com_dotnet/com_saproxy.c

@@ -111,8 +111,8 @@ static zval *saproxy_read_dimension(zend_object *object, zval *offset, int type,
 		}
 		VariantInit(&v);
 
-		res = php_com_do_invoke(proxy->obj, Z_STRVAL(proxy->indices[0]),
-			   	Z_STRLEN(proxy->indices[0]), DISPATCH_METHOD|DISPATCH_PROPERTYGET, &v,
+		res = php_com_do_invoke(proxy->obj, Z_STR(proxy->indices[0]),
+				DISPATCH_METHOD|DISPATCH_PROPERTYGET, &v,
 			   	proxy->dimensions, args, 0);
 
 		efree(args);
@@ -228,8 +228,8 @@ static void saproxy_write_dimension(zend_object *object, zval *offset, zval *val
 			return;
 		}
 		VariantInit(&v);
-		if (SUCCESS == php_com_do_invoke(proxy->obj, Z_STRVAL(proxy->indices[0]),
-					Z_STRLEN(proxy->indices[0]), DISPATCH_PROPERTYPUT, &v, proxy->dimensions + 1,
+		if (SUCCESS == php_com_do_invoke(proxy->obj, Z_STR(proxy->indices[0]),
+					DISPATCH_PROPERTYPUT, &v, proxy->dimensions + 1,
 					args, 0)) {
 			VariantClear(&v);
 		}

ext/com_dotnet/php_com_dotnet_internal.h

@@ -97,8 +97,8 @@ HRESULT php_com_get_id_of_name(php_com_dotnet_object *obj, char *name,
 		size_t namelen, DISPID *dispid);
 int php_com_do_invoke_by_id(php_com_dotnet_object *obj, DISPID dispid,
 		WORD flags,	VARIANT *v, int nargs, zval *args, int silent, int allow_noarg);
-int php_com_do_invoke(php_com_dotnet_object *obj, char *name, size_t namelen,
-		WORD flags,	VARIANT *v, int nargs, zval *args, int allow_noarg);
+zend_result php_com_do_invoke(php_com_dotnet_object *obj, zend_string *name,
+		WORD flags,	VARIANT *v, int nargs, zval *args, bool allow_noarg);
 int php_com_do_invoke_byref(php_com_dotnet_object *obj, zend_internal_function *f,
 		WORD flags,	VARIANT *v, int nargs, zval *args);