#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 9
CRITICAL_SECTION mono_delegate_section;
static gunichar2 process_guid [36];
static gboolean process_guid_set = FALSE;
-static MonoException *out_of_memory_ex;
+static gboolean shutting_down = FALSE;
static MonoAssembly *
mono_domain_assembly_preload (MonoAssemblyName *aname,
mono_context_set (domain->default_context);
mono_thread_init (start_cb, attach_cb);
-
- /* GC init has to happen after thread init */
- mono_gc_init ();
/*
* Create an instance early since we can't do it when there is no memory.
*/
- out_of_memory_ex = mono_exception_from_name (mono_defaults.corlib, "System", "OutOfMemoryException");
+ domain->out_of_memory_ex = mono_exception_from_name (mono_defaults.corlib, "System", "OutOfMemoryException");
+
+ /* GC init has to happen after thread init */
+ mono_gc_init ();
mono_network_init ();
return;
}
-MonoException*
-mono_runtime_get_out_of_memory_ex (void)
+static int
+mono_get_corlib_version (void)
{
- return out_of_memory_ex;
+ MonoClass *klass;
+ MonoClassField *field;
+ MonoObject *value;
+
+ klass = mono_class_from_name (mono_defaults.corlib, "System", "Environment");
+ mono_class_init (klass);
+ field = mono_class_get_field_from_name (klass, "mono_corlib_version");
+ if (!field)
+ return -1;
+ if (! (field->type->attrs & FIELD_ATTRIBUTE_STATIC))
+ return -1;
+ value = mono_field_get_value_object (mono_domain_get (), field, NULL);
+ return *(gint32*)((gchar*)value + sizeof (MonoObject));
+}
+
+const char*
+mono_check_corlib_version (void)
+{
+ int version = mono_get_corlib_version ();
+ if (version != MONO_CORLIB_VERSION)
+ return g_strdup_printf ("expected corlib version %d, found %d.", MONO_CORLIB_VERSION, version);
+ else
+ return NULL;
}
void
void
mono_runtime_cleanup (MonoDomain *domain)
{
+ shutting_down = TRUE;
+
/* This ends up calling any pending pending (for at most 2 seconds) */
mono_gc_cleanup ();
quit_function (mono_root_domain, NULL);
}
+gboolean
+mono_runtime_is_shutting_down (void)
+{
+ return shutting_down;
+}
+
gboolean
mono_domain_has_type_resolve (MonoDomain *domain)
{
data->domain = ad;
data->setup = setup;
data->friendly_name = mono_string_to_utf8 (friendly_name);
+ data->out_of_memory_ex = mono_exception_from_name_domain (data, mono_defaults.corlib, "System", "OutOfMemoryException");
mono_context_init (data);
{
gint i;
+ if (!ass->aname.name)
+ return;
+
mono_domain_lock (domain);
if (g_hash_table_lookup (domain->assemblies, ass->aname.name)) {
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);
}
static MonoAssembly *
-real_load (gchar **search_path, gchar *filename)
+real_load (gchar **search_path, const gchar *culture, gchar *filename)
{
MonoAssembly *result;
gchar **path;
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)
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);
}
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);
}
static gboolean
-get_info_from_assembly_name (MonoReflectionAssemblyName *assRef, MonoAssemblyName *aname)
+get_info_from_assembly_name (MonoString *assRef, MonoAssemblyName *aname)
{
gchar *name;
gchar *value;
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) {
}
MonoReflectionAssembly *
-ves_icall_System_AppDomain_LoadAssembly (MonoAppDomain *ad, MonoReflectionAssemblyName *assRef, MonoObject *evidence)
+ves_icall_System_AppDomain_LoadAssemblyRaw (MonoAppDomain *ad,
+ MonoArray *raw_assembly,
+ MonoArray *raw_symbol_store, MonoObject *evidence)
+{
+ MonoAssembly *ass;
+ MonoDomain *domain = ad->data;
+ MonoImageOpenStatus status;
+ guint32 raw_assembly_len = mono_array_length (raw_assembly);
+ 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 ("LoadAssemblyRaw: Raw Symbol Store not Implemented"));
+
+ if (!image) {
+ mono_raise_exception (mono_get_exception_bad_image_format (""));
+ return NULL;
+ }
+
+ ass = mono_assembly_load_from (image, "", &status);
+
+ if (!ass) {
+ mono_image_close (image);
+ mono_raise_exception (mono_get_exception_bad_image_format (""));
+ return NULL;
+ }
+
+ return mono_assembly_get_object (domain, ass);
+}
+
+MonoReflectionAssembly *
+ves_icall_System_AppDomain_LoadAssembly (MonoAppDomain *ad, MonoString *assRef, MonoObject *evidence)
{
MonoDomain *domain = ad->data;
MonoImageOpenStatus status = MONO_IMAGE_OK;
/* 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);
}
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;
domain->state = MONO_APPDOMAIN_UNLOADED;
+ //printf ("UNLOADED %s.\n", domain->friendly_name);
+
mono_domain_free (domain, FALSE);
#ifdef HAVE_BOEHM_GC
projects / mono.git / blobdiff