Merge pull request #834 from Unity-Technologies/unity-master-path-remapping

Implement path remapping support (case 992909)

This was previously stubbed out when rebasing
onto mono master branch.

case 992909 - Fix FileNotFoundException encountered when using packages

Author: joncham

mono/metadata/image.c

@@ -1360,8 +1360,9 @@ do_mono_image_open (const char *fname, MonoImageOpenStatus *status,
 	MonoCLIImageInfo *iinfo;
 	MonoImage *image;
 	MonoFileMap *filed;
-
-	gboolean remapped = mono_unity_file_remap_path(&fname);
+	const char *fname_remap;
+	if (fname_remap = mono_unity_remap_path (fname))
+		fname = fname_remap;
 
 	if ((filed = mono_file_map_open (fname)) == NULL){
 		if (IS_PORTABILITY_SET) {
@@ -1375,8 +1376,7 @@ do_mono_image_open (const char *fname, MonoImageOpenStatus *status,
 		if (filed == NULL) {
 			if (status)
 				*status = MONO_IMAGE_ERROR_ERRNO;
-			if (remapped)
-				g_free((void*)fname);
+			g_free((void*)fname_remap);
 			return NULL;
 		}
 	}
@@ -1396,8 +1396,7 @@ do_mono_image_open (const char *fname, MonoImageOpenStatus *status,
 		g_free (image);
 		if (status)
 			*status = MONO_IMAGE_IMAGE_INVALID;
-		if (remapped)
-			g_free((void*)fname);
+		g_free((void*)fname_remap);
 		return NULL;
 	}
 	iinfo = g_new0 (MonoCLIImageInfo, 1);
@@ -1411,8 +1410,7 @@ do_mono_image_open (const char *fname, MonoImageOpenStatus *status,
 	image->core_clr_platform_code = mono_security_core_clr_determine_platform_image (image);
 
 	mono_file_map_close (filed);
-	if (remapped)
-		g_free((void*)fname);
+	g_free((void*)fname_remap);
 	return do_mono_image_load (image, status, care_about_cli, care_about_pecoff);
 }
 

mono/metadata/loader.c

@@ -1115,26 +1115,26 @@ static MonoDl*
 cached_module_load (const char *name, int flags, char **err)
 {
 	MonoDl *res;
+	const char *name_remap;
 
 	if (err)
 		*err = NULL;
-	gboolean remapped = mono_unity_file_remap_path(&name);
+	if (name_remap = mono_unity_remap_path (name))
+		name = name_remap;
 	global_loader_data_lock ();
 	if (!global_module_map)
 		global_module_map = g_hash_table_new (g_str_hash, g_str_equal);
 	res = (MonoDl *)g_hash_table_lookup (global_module_map, name);
 	if (res) {
 		global_loader_data_unlock ();
-		if (remapped)
-			g_free((void*)name);
+		g_free((void*)name_remap);
 		return res;
 	}
 	res = mono_dl_open (name, flags, err);
 	if (res)
 		g_hash_table_insert (global_module_map, g_strdup (name), res);
 	global_loader_data_unlock ();
-	if (remapped)
-		g_free((void*)name);
+	g_free((void*)name_remap);
 	return res;
 }
 

mono/metadata/unity-utils.c

@@ -1197,14 +1197,20 @@ size_t RemapPathFunction (const char* path, char* buffer, size_t buffer_len)
 */
 static RemapPathFunction g_RemapPathFunc = NULL;
 
+void
+mono_unity_register_path_remapper (RemapPathFunction func)
+{
+	g_RemapPathFunc = func;
+}
+
 /* calls remapper function if registered; allocates memory if remapping is available */
 static inline size_t
 call_remapper(const char* path, char** buf)
 {
 	size_t len;
 
 	if (!g_RemapPathFunc)
-		return FALSE;
+		return 0;
 
 	*buf = NULL;
 	len = g_RemapPathFunc(path, *buf, 0);
@@ -1218,80 +1224,67 @@ call_remapper(const char* path, char** buf)
 	return len;
 }
 
-/* updates 'path' if remapping is available; returns TRUE if updated (path must be free()'d) */
-gboolean 
-mono_unity_file_remap_path(const char** path)
+MonoBoolean
+ves_icall_System_IO_MonoIO_RemapPath  (MonoString *path, MonoString **new_path)
 {
-	size_t len;
-	char * buf;
+	MonoError error;
+	const gunichar2* path_remapped;
 
-	len = call_remapper(*path, &buf);
-	if (len == 0)
+	if (!g_RemapPathFunc)
+		return 0;
+
+	path_remapped = mono_unity_remap_path_utf16 (mono_string_chars (path));
+
+	if (!path_remapped)
 		return FALSE;
 
-	*path = buf;
+	mono_gc_wbarrier_generic_store (new_path, (MonoObject*)mono_string_from_utf16_checked (path_remapped, &error));
+
+	g_free (path_remapped);
+
+	mono_error_set_pending_exception (&error);
+
 	return TRUE;
 }
 
+const char*
+mono_unity_remap_path (const char* path)
+{
+	const char* path_remap = NULL;
+	call_remapper (path, &path_remap);
 
+	return path_remap;
+}
 
-/* sets 'new_path', and returns TRUE, if remapping is available */
-static gboolean
-remap_path (MonoString *path, MonoString** new_path)
+const gunichar2*
+mono_unity_remap_path_utf16 (const gunichar2* path)
 {
-	MonoError error;
-	MonoString * str;
+	const gunichar2* path_remap = NULL;
 	char * utf8_path;
 	char * buf;
 	char * path_end;
 	size_t len;
 
-	*new_path = NULL;
-
 	if (!g_RemapPathFunc)
-		return FALSE;
+		return path_remap;
 
-	utf8_path = mono_string_to_utf8_ignore(path);
-	len = call_remapper(utf8_path, &buf);
+	utf8_path = g_utf16_to_utf8 (path, -1, NULL, NULL, NULL);
+	len = call_remapper (utf8_path, &buf);
 	if (len == 0)
 	{
-		g_free(utf8_path);
-		return FALSE;
+		g_free (utf8_path);
+		return path_remap;
 	}
 
-	path_end = memchr(buf, '\0', len);
-	len = path_end ? (size_t) (path_end - buf) : len;
-	str = mono_string_new_len_checked (mono_domain_get (), buf, (guint)len, &error);
+	path_end = memchr (buf, '\0', len);
+	len = path_end ? (size_t)(path_end - buf) : len;
 
-	g_free(utf8_path);
-	g_free (buf);
+	path_remap = g_utf8_to_utf16 (buf, len, NULL, NULL, NULL);
 
-	mono_gc_wbarrier_generic_store(new_path, (MonoObject*)str);
-	mono_error_set_pending_exception (&error);
-
-	return *new_path ? TRUE : FALSE;
-}
-
-/* returns remapped path, if remapping is available. otherwise returns original path */
-const gunichar2 *
-mono_unity_get_remapped_path (const gunichar2 *path)
-{
-	// JON TODO:
-	return path;
-	//MonoString * new_path;
-	//return remap_path(path, &new_path) ? new_path : path;
-}
-
-MonoBoolean
-ves_icall_System_IO_MonoIO_RemapPath  (MonoString *path, MonoString **new_path)
-{
-	return remap_path(path, new_path);
-}
+	g_free (utf8_path);
+	g_free (buf);
 
-void
-mono_unity_register_path_remapper(RemapPathFunction func)
-{
-	g_RemapPathFunc = func;
+	return path_remap;
 }
 
 MonoMethod*

mono/metadata/unity-utils.h

@@ -172,12 +172,15 @@ MONO_API MonoClass* mono_custom_attrs_get_attrs (MonoCustomAttrInfo *ainfo, gpoi
 
 typedef size_t (*RemapPathFunction)(const char* path, char* buffer, size_t buffer_len);
 MONO_API void mono_unity_register_path_remapper (RemapPathFunction func);
-gboolean 
-mono_unity_file_remap_path(const char** path);
+
+const char*
+mono_unity_remap_path (const char* path);
+
+const gunichar2*
+mono_unity_remap_path_utf16 (const gunichar2* path);
+
 MonoBoolean
 ves_icall_System_IO_MonoIO_RemapPath  (MonoString *path, MonoString **new_path);
-const gunichar2 *
-mono_unity_get_remapped_path (const gunichar2 *path);
 
 MonoMethod*
 mono_method_get_method_definition(MonoMethod *method);