static char **assemblies_path = NULL;
static int env_checked = 0;
+#ifdef PLATFORM_WIN32
+static gboolean path_inited = FALSE;
+
+static void
+init_default_path (void)
+{
+ int i;
+
+ if (path_inited)
+ return;
+
+ path_inited = TRUE;
+ default_path [0] = g_strdup (MONO_ASSEMBLIES);
+ for (i = strlen (MONO_ASSEMBLIES) - 1; i >= 0; i--) {
+ if (default_path [0][i] == '/')
+ default_path [0][i] = '\\';
+ }
+}
+#endif
+
static void
check_env (void) {
const char *path;
for (tmp = loaded_assemblies; tmp; tmp = tmp->next) {
ass = tmp->data;
+ if (!ass->aname.name)
+ continue;
/* we just compare the name, but later we'll do all the checks */
/* g_print ("compare %s %s\n", aname->name, ass->aname.name); */
if (strcmp (aname->name, ass->aname.name))
return NULL;
}
-/**
- * g_concat_dir_and_file:
- * @dir: directory name
- * @file: filename.
- *
- * returns a new allocated string that is the concatenation of dir and file,
- * takes care of the exact details for concatenating them.
- */
-static char *
-g_concat_dir_and_file (const char *dir, const char *file)
-{
- g_return_val_if_fail (dir != NULL, NULL);
- g_return_val_if_fail (file != NULL, NULL);
-
- /*
- * If the directory name doesn't have a / on the end, we need
- * to add one so we get a proper path to the file
- */
- if (dir [strlen(dir) - 1] != G_DIR_SEPARATOR)
- return g_strconcat (dir, G_DIR_SEPARATOR_S, file, NULL);
- else
- return g_strconcat (dir, file, NULL);
-}
-
static MonoAssembly *
load_in_path (const char *basename, const char** search_path, MonoImageOpenStatus *status)
{
MonoAssembly *result;
for (i = 0; search_path [i]; ++i) {
- fullpath = g_concat_dir_and_file (search_path [i], basename);
+ fullpath = g_build_filename (search_path [i], basename, NULL);
result = mono_assembly_open (fullpath, status);
g_free (fullpath);
if (result)
* Override the MONO_ASSEMBLIES directory configured at compile time.
*/
default_path [0] = g_strdup (root_dir);
+#ifdef PLATFORM_WIN32
+ path_inited = TRUE;
+#endif
}
-static void
-load_references (MonoImage *image, MonoImageOpenStatus *status) {
+void
+mono_image_load_references (MonoImage *image, MonoImageOpenStatus *status) {
MonoTableInfo *t;
guint32 cols [MONO_ASSEMBLYREF_SIZE];
const char *hash;
AssemblyLoadHook *assembly_load_hook = NULL;
-static void
-invoke_assembly_hook (MonoAssembly *ass)
+void
+mono_assembly_invoke_load_hook (MonoAssembly *ass)
{
AssemblyLoadHook *hook;
assembly_load_hook = hook;
}
+typedef struct AssemblyPreLoadHook AssemblyPreLoadHook;
+struct AssemblyPreLoadHook {
+ AssemblyPreLoadHook *next;
+ MonoAssemblyPreLoadFunc func;
+ gpointer user_data;
+};
+
+AssemblyPreLoadHook *assembly_preload_hook = NULL;
+
+static MonoAssembly *
+invoke_assembly_preload_hook (MonoAssemblyName *aname, gchar **assemblies_path)
+{
+ AssemblyPreLoadHook *hook;
+ MonoAssembly *assembly;
+
+ for (hook = assembly_preload_hook; hook; hook = hook->next) {
+ assembly = hook->func (aname, assemblies_path, hook->user_data);
+ if (assembly != NULL)
+ return assembly;
+ }
+
+ return NULL;
+}
+
+void
+mono_install_assembly_preload_hook (MonoAssemblyPreLoadFunc func, gpointer user_data)
+{
+ AssemblyPreLoadHook *hook;
+
+ g_return_if_fail (func != NULL);
+
+ hook = g_new0 (AssemblyPreLoadHook, 1);
+ hook->func = func;
+ hook->user_data = user_data;
+ hook->next = assembly_preload_hook;
+ assembly_preload_hook = hook;
+}
+
static gchar *
absolute_dir (const gchar *filename)
{
int i;
char *base_dir, *aot_name;
MonoImageOpenStatus def_status;
+ gchar *fname;
g_return_val_if_fail (filename != NULL, NULL);
status = &def_status;
*status = MONO_IMAGE_OK;
- /* g_print ("file loading %s\n", filename); */
- image = mono_image_open (filename, status);
+ if (strncmp (filename, "file://", 7) == 0) {
+ GError *error = NULL;
+ gchar *uri = (gchar *) filename;
+
+ /*
+ * MS allows file://c:/... and fails on file://localhost/c:/...
+ * They also throw an IndexOutOfRangeException if "file://"
+ */
+ if (uri [7] != '/')
+ uri = g_strdup_printf ("file:///%s", uri + 7);
+
+ fname = g_filename_from_uri (uri, NULL, &error);
+ if (uri != filename)
+ g_free (uri);
+
+ if (error != NULL) {
+ g_warning ("%s\n", error->message);
+ g_error_free (error);
+ fname = g_strdup (filename);
+ }
+ } else {
+ fname = g_strdup (filename);
+ }
+
+ /* g_print ("file loading %s\n", fname); */
+ image = mono_image_open (fname, status);
if (!image){
*status = MONO_IMAGE_ERROR_ERRNO;
+ g_free (fname);
return NULL;
}
#if defined (PLATFORM_WIN32)
{
gchar *tmp_fn;
- tmp_fn = g_strdup (filename);
+ tmp_fn = g_strdup (fname);
for (i = strlen (tmp_fn) - 1; i >= 0; i--) {
if (tmp_fn [i] == '/')
tmp_fn [i] = '\\';
g_free (tmp_fn);
}
#else
- base_dir = absolute_dir (filename);
+ base_dir = absolute_dir (fname);
#endif
/*
ass->image = image;
/* load aot compiled module */
- aot_name = g_strdup_printf ("%s.so", filename);
+ aot_name = g_strdup_printf ("%s.so", fname);
+ g_free (fname);
ass->aot_module = g_module_open (aot_name, G_MODULE_BIND_LAZY);
g_free (aot_name);
if (ass->aot_module) {
char *saved_guid = NULL;
- g_module_symbol (ass->aot_module, "mono_assembly_guid", &saved_guid);
+ g_module_symbol (ass->aot_module, "mono_assembly_guid", (gpointer *) &saved_guid);
if (!saved_guid || strcmp (image->guid, saved_guid)) {
g_module_close (ass->aot_module);
/* register right away to prevent loops */
loaded_assemblies = g_list_prepend (loaded_assemblies, ass);
- load_references (image, status);
+ mono_image_load_references (image, status);
if (*status != MONO_IMAGE_OK) {
mono_assembly_close (ass);
return NULL;
}
-
+
+ /* resolve assembly references for modules */
t = &image->tables [MONO_TABLE_MODULEREF];
- ass->modules = g_new0 (MonoImage *, t->rows);
for (i = 0; i < t->rows; i++){
- char *module_ref;
- const char *name;
- guint32 cols [MONO_MODULEREF_SIZE];
-
- mono_metadata_decode_row (t, i, cols, MONO_MODULEREF_SIZE);
- name = mono_metadata_string_heap (image, cols [MONO_MODULEREF_NAME]);
- module_ref = g_concat_dir_and_file (base_dir, name);
- ass->modules [i] = mono_image_open (module_ref, status);
- if (ass->modules [i]) {
- ass->modules [i]->assembly = ass;
- load_references (ass->modules [i], status);
+ if (image->modules [i]) {
+ image->modules [i]->assembly = ass;
+ mono_image_load_references (image->modules [i], status);
}
/*
* FIXME: what do we do here? it could be a native dll...
* We should probably do lazy-loading of modules.
*/
*status = MONO_IMAGE_OK;
- g_free (module_ref);
}
- invoke_assembly_hook (ass);
+ mono_assembly_invoke_load_hook (ass);
return ass;
}
MonoAssembly *result;
char *fullpath, *filename;
+#ifdef PLATFORM_WIN32
+ init_default_path ();
+#endif
check_env ();
+ result = invoke_assembly_preload_hook (aname, assemblies_path);
+ if (result)
+ return result;
+
/* g_print ("loading %s\n", aname->name); */
/* special case corlib */
if ((strcmp (aname->name, "mscorlib") == 0) || (strcmp (aname->name, "corlib") == 0)) {
else
filename = g_strconcat (aname->name, ".dll", NULL);
if (basedir) {
- fullpath = g_concat_dir_and_file (basedir, filename);
+ fullpath = g_build_filename (basedir, filename, NULL);
result = mono_assembly_open (fullpath, status);
g_free (fullpath);
if (result) {
projects / mono.git / blobdiff