2004-01-19 Zoltan Varga <vargaz@freemail.hu>

[mono.git] / mono / metadata / appdomain.c

diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index 15986e6a506e849f0db5259b8df129eb5e032f78..383887ae23f11ebbfbca30d262e2bf46ddf3c86d 100644 (file)
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -24,8 +24,9 @@
 #include <mono/metadata/tabledefs.h>
 #include <mono/metadata/gc-internal.h>
 #include <mono/metadata/marshal.h>
+#include <mono/utils/mono-uri.h>
 
-#define MONO_CORLIB_VERSION 3
+#define MONO_CORLIB_VERSION 9
 
 CRITICAL_SECTION mono_delegate_section;
 
@@ -577,13 +578,18 @@ set_domain_search_path (MonoDomain *domain)
                if (strncmp (*tmp, "file://", 7) == 0) {
                        gchar *file = *tmp;
                        gchar *uri = *tmp;
+                       gchar *tmpuri;
 
                        if (uri [7] != '/')
                                uri = g_strdup_printf ("file:///%s", uri + 7);
 
+                       tmpuri = uri;
+                       uri = mono_escape_uri_string (tmpuri);
                        *tmp = g_filename_from_uri (uri, NULL, &error);
-                       if (uri != file)
-                               g_free (uri);
+                       g_free (uri);
+
+                       if (tmpuri != file)
+                               g_free (tmpuri);
 
                        if (error != NULL) {
                                g_warning ("%s\n", error->message);
@@ -618,7 +624,7 @@ set_domain_search_path (MonoDomain *domain)
 }
 
 static MonoAssembly *
-real_load (gchar **search_path, gchar *filename)
+real_load (gchar **search_path, const gchar *culture, gchar *filename)
 {
        MonoAssembly *result;
        gchar **path;
@@ -627,7 +633,10 @@ real_load (gchar **search_path, gchar *filename)
        for (path = search_path; *path; path++) {
                if (**path == '\0')
                        continue; /* Ignore empty ApplicationBase */
-               fullpath = g_build_filename (*path, filename, NULL);
+               if (culture && (strlen (culture) > 0))
+                       fullpath = g_build_filename (*path, culture, filename, NULL);
+               else
+                       fullpath = g_build_filename (*path, filename, NULL);
                result = mono_assembly_open (fullpath, NULL);
                g_free (fullpath);
                if (result)
@@ -658,14 +667,14 @@ mono_domain_assembly_preload (MonoAssemblyName *aname,
 
        if (domain->search_path && domain->search_path [0] != NULL) {
                /* TODO: should also search in name/name.dll and name/name.exe from appbase */
-               result = real_load (domain->search_path, dll);
+               result = real_load (domain->search_path, aname->culture, dll);
                if (result) {
                        g_free (dll);
                        g_free (exe);
                        return result;
                }
 
-               result = real_load (domain->search_path, exe);
+               result = real_load (domain->search_path, aname->culture, exe);
                if (result) {
                        g_free (dll);
                        g_free (exe);
@@ -674,14 +683,14 @@ mono_domain_assembly_preload (MonoAssemblyName *aname,
        }
 
        if (assemblies_path && assemblies_path [0] != NULL) {
-               result = real_load (assemblies_path, dll);
+               result = real_load (assemblies_path, aname->culture, dll);
                if (result) {
                        g_free (dll);
                        g_free (exe);
                        return result;
                }
 
-               result = real_load (assemblies_path, exe);
+               result = real_load (assemblies_path, aname->culture, exe);
                if (result) {
                        g_free (dll);
                        g_free (exe);
@@ -735,7 +744,7 @@ free_assembly_name (MonoAssemblyName *aname)
 }
 
 static gboolean
-get_info_from_assembly_name (MonoReflectionAssemblyName *assRef, MonoAssemblyName *aname)
+get_info_from_assembly_name (MonoString *assRef, MonoAssemblyName *aname)
 {
        gchar *name;
        gchar *value;
@@ -745,7 +754,7 @@ get_info_from_assembly_name (MonoReflectionAssemblyName *assRef, MonoAssemblyNam
 
        memset (aname, 0, sizeof (MonoAssemblyName));
 
-       name = mono_string_to_utf8 (assRef->name);
+       name = mono_string_to_utf8 (assRef);
        parts = tmp = g_strsplit (name, ",", 4);
        g_free (name);
        if (!tmp || !*tmp) {
@@ -853,7 +862,7 @@ ves_icall_System_AppDomain_LoadAssemblyRaw (MonoAppDomain *ad,
        MonoImage *image = mono_image_open_from_data (mono_array_addr (raw_assembly, gchar, 0), raw_assembly_len, TRUE, NULL);
 
        if (raw_symbol_store)
-               mono_raise_exception (mono_get_exception_not_implemented ());
+               mono_raise_exception (mono_get_exception_not_implemented ("LoadAssemblyRaw: Raw Symbol Store not Implemented"));
   
        if (!image) {
                mono_raise_exception (mono_get_exception_bad_image_format (""));
@@ -872,7 +881,7 @@ ves_icall_System_AppDomain_LoadAssemblyRaw (MonoAppDomain *ad,
 }
 
 MonoReflectionAssembly *
-ves_icall_System_AppDomain_LoadAssembly (MonoAppDomain *ad,  MonoReflectionAssemblyName *assRef, MonoObject *evidence)
+ves_icall_System_AppDomain_LoadAssembly (MonoAppDomain *ad,  MonoString *assRef, MonoObject *evidence)
 {
        MonoDomain *domain = ad->data; 
        MonoImageOpenStatus status = MONO_IMAGE_OK;
@@ -887,23 +896,22 @@ ves_icall_System_AppDomain_LoadAssembly (MonoAppDomain *ad,  MonoReflectionAssem
        /* FIXME : examine evidence? */
 
        g_assert (assRef != NULL);
-       g_assert (assRef->name != NULL);
 
        if (!get_info_from_assembly_name (assRef, &aname)) {
                MonoException *exc;
 
                free_assembly_name (&aname);
                /* This is a parse error... */
-               exc = mono_get_exception_file_not_found (assRef->name);
+               exc = mono_get_exception_file_not_found (assRef);
                mono_raise_exception (exc);
        }
 
        ass = mono_assembly_load (&aname, NULL, &status);
        free_assembly_name (&aname);
 
-       if (!ass && (refass = try_assembly_resolve (domain, assRef->name)) == NULL){
+       if (!ass && (refass = try_assembly_resolve (domain, assRef)) == NULL){
                /* FIXME: it doesn't make much sense since we really don't have a filename ... */
-               MonoException *exc = mono_get_exception_file_not_found (assRef->name);
+               MonoException *exc = mono_get_exception_file_not_found (assRef);
                mono_raise_exception (exc);
        }
 
@@ -1009,7 +1017,7 @@ ves_icall_System_AppDomain_InternalSetDomainByID (gint32 domainid)
 
        MONO_ARCH_SAVE_REGS;
 
-       if (!mono_domain_set (domain, FALSE))   
+       if (!domain || !mono_domain_set (domain, FALSE))        
                mono_raise_exception (mono_get_exception_appdomain_unloaded ());
 
        return current_domain->domain;
@@ -1141,6 +1149,8 @@ unload_thread_main (void *arg)
 
        domain->state = MONO_APPDOMAIN_UNLOADED;
 
+       //printf ("UNLOADED %s.\n", domain->friendly_name);
+
        mono_domain_free (domain, FALSE);
 
 #ifdef HAVE_BOEHM_GC