Refactor php_com_locate_typeinfo()

Use zend_string pointers
Use bool

Author: Girgias

ext/com_dotnet/com_com.c

@@ -677,7 +677,8 @@ PHP_FUNCTION(com_event_sink)
 	zval *object, *sinkobject;
 	zend_string *sink_str = NULL;
 	HashTable *sink_ht = NULL;
-	char *dispname = NULL, *typelibname = NULL;
+	zend_string *type_lib_name = NULL;
+	zend_string *dispatch_name = NULL;
 	php_com_dotnet_object *obj;
 	ITypeInfo *typeinfo = NULL;
 
@@ -698,14 +699,14 @@ PHP_FUNCTION(com_event_sink)
 		zval *tmp;
 
 		if ((tmp = zend_hash_index_find(sink_ht, 0)) != NULL && Z_TYPE_P(tmp) == IS_STRING)
-			typelibname = Z_STRVAL_P(tmp);
+			type_lib_name = Z_STR_P(tmp);
 		if ((tmp = zend_hash_index_find(sink_ht, 1)) != NULL && Z_TYPE_P(tmp) == IS_STRING)
-			dispname = Z_STRVAL_P(tmp);
+			dispatch_name = Z_STR_P(tmp);
 	} else if (sink_str) {
-		dispname = ZSTR_VAL(sink_str);
+		dispatch_name = sink_str;
 	}
 
-	typeinfo = php_com_locate_typeinfo(typelibname, obj, dispname, 1);
+	typeinfo = php_com_locate_typeinfo(type_lib_name, obj, dispatch_name, /* sink */ true);
 
 	if (typeinfo) {
 		HashTable *id_to_name;
@@ -737,29 +738,25 @@ PHP_FUNCTION(com_event_sink)
 PHP_FUNCTION(com_print_typeinfo)
 {
 	zend_object *object_zpp;
-	zend_string *typelib_name_zpp = NULL;
-	char *ifacename = NULL;
-	char *typelibname = NULL;
-	size_t ifacelen;
-	bool wantsink = 0;
+	zend_string *type_lib_name = NULL;
+	zend_string *interface_name = NULL;
+	bool want_sink = false;
 	php_com_dotnet_object *obj = NULL;
 	ITypeInfo *typeinfo;
 
 	ZEND_PARSE_PARAMETERS_START(1, 3)
-		Z_PARAM_OBJ_OF_CLASS_OR_STR(object_zpp, php_com_variant_class_entry, typelib_name_zpp)
+		Z_PARAM_OBJ_OF_CLASS_OR_STR(object_zpp, php_com_variant_class_entry, type_lib_name)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_STRING_OR_NULL(ifacename, ifacelen)
-		Z_PARAM_BOOL(wantsink)
+		Z_PARAM_STR_OR_NULL(interface_name)
+		Z_PARAM_BOOL(want_sink)
 	ZEND_PARSE_PARAMETERS_END();
 
 	php_com_initialize();
 	if (object_zpp) {
 		obj = (php_com_dotnet_object*)object_zpp;
-	} else {
-		typelibname = ZSTR_VAL(typelib_name_zpp);
 	}
 
-	typeinfo = php_com_locate_typeinfo(typelibname, obj, ifacename, wantsink ? 1 : 0);
+	typeinfo = php_com_locate_typeinfo(type_lib_name, obj, interface_name, want_sink);
 	if (typeinfo) {
 		php_com_process_typeinfo(typeinfo, NULL, 1, NULL, obj ? obj->code_page : COMG(code_page));
 		ITypeInfo_Release(typeinfo);

ext/com_dotnet/com_typeinfo.c

@@ -302,15 +302,16 @@ PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib_via_cache(const char *search_s
 	return TL;
 }
 
-ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj, char *dispname, int sink)
+ITypeInfo *php_com_locate_typeinfo(zend_string *type_lib_name, php_com_dotnet_object *obj,
+	zend_string *dispatch_name, bool sink)
 {
 	ITypeInfo *typeinfo = NULL;
 	ITypeLib *typelib = NULL;
 	int gotguid = 0;
 	GUID iid;
 
 	if (obj) {
-		if (dispname == NULL && sink) {
+		if (dispatch_name == NULL && sink) {
 			if (V_VT(&obj->v) == VT_DISPATCH) {
 				IProvideClassInfo2 *pci2;
 				IProvideClassInfo *pci;
@@ -326,7 +327,7 @@ ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj
 					IProvideClassInfo_Release(pci);
 				}
 			}
-		} else if (dispname == NULL) {
+		} else if (dispatch_name == NULL) {
 			if (obj->typeinfo) {
 				ITypeInfo_AddRef(obj->typeinfo);
 				return obj->typeinfo;
@@ -336,14 +337,14 @@ ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj
 					return typeinfo;
 				}
 			}
-		} else if (dispname && obj->typeinfo) {
+		} else if (dispatch_name && obj->typeinfo) {
 			unsigned int idx;
 			/* get the library from the object; the rest will be dealt with later */
 			ITypeInfo_GetContainingTypeLib(obj->typeinfo, &typelib, &idx);
-		} else if (typelibname == NULL) {
+		} else if (type_lib_name == NULL) {
 			if (V_VT(&obj->v) == VT_DISPATCH) {
 				IDispatch_GetTypeInfo(V_DISPATCH(&obj->v), 0, LANG_NEUTRAL, &typeinfo);
-				if (dispname) {
+				if (dispatch_name) {
 					unsigned int idx;
 					/* get the library from the object; the rest will be dealt with later */
 					ITypeInfo_GetContainingTypeLib(typeinfo, &typelib, &idx);
@@ -355,15 +356,15 @@ ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj
 				}
 			}
 		}
-	} else if (typelibname) {
+	} else if (type_lib_name) {
 		/* Fetch the typelibrary and use that to look things up */
-		typelib = php_com_load_typelib(typelibname, CP_THREAD_ACP);
+		typelib = php_com_load_typelib(ZSTR_VAL(type_lib_name), CP_THREAD_ACP);
 	}
 
-	if (!gotguid && dispname && typelib) {
+	if (!gotguid && dispatch_name && typelib) {
 		unsigned short cfound;
 		MEMBERID memid;
-		OLECHAR *olename = php_com_string_to_olestring(dispname, strlen(dispname), CP_ACP);
+		OLECHAR *olename = php_com_string_to_olestring(ZSTR_VAL(dispatch_name), ZSTR_LEN(dispatch_name), CP_ACP);
 
 		cfound = 1;
 		if (FAILED(ITypeLib_FindName(typelib, olename, 0, &typeinfo, &memid, &cfound)) || cfound == 0) {

ext/com_dotnet/php_com_dotnet_internal.h

@@ -135,7 +135,8 @@ PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib_via_cache(const char *search_s
 PHP_COM_DOTNET_API ITypeLib *php_com_load_typelib(char *search_string, int codepage);
 PHP_COM_DOTNET_API zend_result php_com_import_typelib(ITypeLib *TL, int mode, int codepage);
 void php_com_typelibrary_dtor(zval *pDest);
-ITypeInfo *php_com_locate_typeinfo(char *typelibname, php_com_dotnet_object *obj, char *dispname, int sink);
+ITypeInfo *php_com_locate_typeinfo(zend_string *type_lib_name, php_com_dotnet_object *obj,
+		zend_string *dispatch_name, bool sink);
 bool php_com_process_typeinfo(ITypeInfo *typeinfo, HashTable *id_to_name, bool printdef, GUID *guid, int codepage);
 ITypeLib *php_com_cache_typelib(ITypeLib* TL, char *cache_key, zend_long cache_key_len);
 PHP_MINIT_FUNCTION(com_typeinfo);